From 933fd5e7fdcedf8309f57b35731cd66c15734d5b Mon Sep 17 00:00:00 2001
From: Kjartan Mannes <kjartan@2.no-reply.drupal.org>
Date: Fri, 12 Apr 2002 19:17:12 +0000
Subject: - removing robots.txt and cvs.module - commiting patch to
 cloud.module from Remco.

---
 modules/cloud.module | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'modules/cloud.module')

diff --git a/modules/cloud.module b/modules/cloud.module
index 16ea99b0a..5390b44fb 100644
--- a/modules/cloud.module
+++ b/modules/cloud.module
@@ -47,11 +47,11 @@ function cloud_update($site) {
   ** Check whether the site is properly configured:
   */
 
-  if (!ereg("^http://|ftp://", $site[link])) {
+  if (!ereg("^http://|https://|ftp://", $site[link])) {
     watchdog("warning", "cloud: invalid or missing URL for '". $site["name"] ."'");
   }
 
-  if (!ereg("^http://|ftp://", $site[feed])) {
+  if (!ereg("^http://|https://|ftp://", $site[feed])) {
     watchdog("warning", "cloud: invalid or missing URL to monitor for '". $site["name"] ."'");
   }
 
@@ -135,7 +135,11 @@ function cloud_list($limit = 10) {
     if ($hour != floor((time() - $site->timestamp) / 3600)) {
       $hour = floor((time() - $site->timestamp) / 3600);
       if ($hour < 12) {
-        $output .= "<br />". strtr(t("Updated %a ago:"), array("%a" => format_plural($hour, "hour", "hours")));
+        if ($hour == 0) {
+          $output .= "<br />". t("Updated < 1 hours ago:");
+      } else {
+          $output .= "<br />". strtr(t("Updated %a ago:"), array("%a" => format_plural($hour, "hour", "hours")));
+        }
       }
       else if ($list) {
         $output .= "<br />". strtr(t("Updated more than %a ago:"), array("%a" => format_plural($hour, "hour", "hours")));
-- 
cgit v1.2.3