Changeset 1291 in ExiteCMS

Timestamp:

02/19/08 22:26:25 (4 years ago)

Author:

hverton

Message:

added datediff() function which returns the difference between two timestamps in text
updated the wikilink detection code in parsemessage()
added a "vertical-align:text-top" to the imagelink smarty function, to align the image properly

Location:

trunk

Files:

• administration/tools/language_pack_English.php (modified) (1 diff)
• files/locales/en.main.global.php (modified) (2 diffs)
• includes/core_functions.php (modified) (1 diff)
• includes/forum_functions_include.php (modified) (1 diff)
• includes/template-plugins/function.imagelink.php (modified) (1 diff)

trunk/administration/tools/language_pack_English.php

@@ -2507 +2507 @@
         $localestrings['065'] = "Not a member yet?<br /><a href='%sregister.php' class='side'>Click here</a> to register.";
         $localestrings['066'] = "Forgotten your password?<br />Request a new one <a href='%slostpassword.php' class='side'>here</a>.";
+        $localestrings['070'] = "Online";
+        $localestrings['071'] = "< 5 mins";
+        $localestrings['072'] = "week";
+        $localestrings['073'] = "weeks";
+        $localestrings['074'] = "day";
+        $localestrings['075'] = "days";
+        $localestrings['076'] = "month";
+        $localestrings['077'] = "months";
+        $localestrings['078'] = "year";
+        $localestrings['079'] = "years";
         $localestrings['080'] = "Edit Profile";
         $localestrings['081'] = "Private Messages";

trunk/files/locales/en.main.global.php

@@ -3 +3 @@
 // locale       : English
 // locale name  : main.global
-// generated on : Thu Feb 14 2008, 15:05:23 CET
+// generated on : Mon Feb 18 2008, 14:35:18 CET
 // translators  : ExiteCMS team,WanWizard
 // ----------------------------------------------------------
@@ -65 +65 @@
 $locale['065'] = "Not a member yet?<br /><a href='%sregister.php' class='side'>Click here</a> to register.";
 $locale['066'] = "Forgotten your password?<br />Request a new one <a href='%slostpassword.php' class='side'>here</a>.";
+$locale['070'] = "Online";
+$locale['071'] = "< 5 mins";
+$locale['072'] = "week";
+$locale['073'] = "weeks";
+$locale['074'] = "day";
+$locale['075'] = "days";
+$locale['076'] = "month";
+$locale['077'] = "months";
+$locale['078'] = "year";
+$locale['079'] = "years";
 $locale['080'] = "Edit Profile";
 $locale['081'] = "Private Messages";

trunk/includes/core_functions.php

@@ -746 +746 @@
 }
 
-// Translate bytes into kb, mb, gb or tb by CrappoMan
+
+// translate a timestamp into a date relative to now
+function datediff($datefrom,$dateto=-1)
+{
+    global $locale;
+    
+    // validate parameters
+    if ($datefrom == 0) { return ""; }
+    if ($dateto == -1) { $dateto = time(); }
+
+    // calculate the difference in seconds betweeen the two timestamps
+    $difference = $dateto - $datefrom;
+
+    // determine the interface
+    if ($difference < 60) {
+        // if difference is less than 60 seconds, seconds is a good interval of choice
+        $interval = "h";
+    } elseif ($difference >= 60 && $difference<60*60) {
+        // if difference is between 60 seconds and 60 minutes, minutes is a good interval
+      $interval = "h";
+    } elseif ($difference >= 60*60 && $difference<60*60*24) {
+        // if difference is between 1 hour and 24 hours, hours is a good interval
+        $interval = "h";
+    } elseif ($difference >= 60*60*24 && $difference<60*60*24*7) {
+        // if difference is between 1 day and 7 days, days is a good interval
+        $interval = "d";
+    } elseif ($difference >= 60*60*24*7 && $difference < 60*60*24*30) {
+        // if difference is between 1 week and 30 days, weeks is a good interval
+        $interval = "w";
+    } elseif ($difference >= 60*60*24*30 && $difference < 60*60*24*365) {
+        // if difference is between 30 days and 365 days, months is a good interval, again, the same thing
+        // applies, if the 29th February happens to exist between your 2 dates, the function will return
+        // the 'incorrect' value for a day
+        $interval = "m";
+    } elseif ($difference >= 60*60*24*365) {
+        // if difference is greater than or equal to 365 days, return year. This will be incorrect if
+        // for example, you call the function on the 28th April 2008 passing in 29th April 2007. It will
+        // return 1 year ago when in actual fact (yawn!) not quite a year has gone by
+        $interval = "y";
+    }
+
+    // based on the interval, determine the number of units between the two dates
+    // from this point on, you would be hard pushed telling the difference between
+    // this function and DateDiff. If the $datediff returned is 1, be sure to return
+    // the singular of the unit, e.g. 'day' rather 'days'
+    $res = "";
+    switch($interval) {
+        case "w":
+            $datediff = floor($difference / 60 / 60 / 24 / 7);
+            $res = $datediff . " " . (($datediff==1) ? $locale['072'] : $locale['073']);
+            break;
+
+        case "y":
+            $datediff = floor($difference / 60 / 60 / 24 / 365);
+            $res = $datediff . " " . (($datediff==1) ? $locale['078'] : $locale['079']);
+            break;
+
+        case "m":
+            $months_difference = floor($difference / 60 / 60 / 24 / 29);
+            while (mktime(date("H", $datefrom), date("i", $datefrom), date("s", $datefrom), date("n", $datefrom)+($months_difference), date("j", $dateto), date("Y", $datefrom)) < $dateto) {
+                $months_difference++;
+            }
+            $datediff = $months_difference;
+            // we need this in here because it is possible to have an 'm' interval and a months
+            // difference of 12 because we are using 29 days in a month
+            if ($datediff==12) {
+                $datediff--;
+            }
+            $res .= $datediff . " " . (($datediff==1) ? $locale['076'] : $locale['077']);
+            break;
+
+        case "d":
+            $datediff = floor($difference / 60 / 60 / 24);
+            $res .= $datediff . " " . (($datediff==1) ? $locale['074'] : $locale['075']);
+            break;
+
+        case "h":
+            $datediff = floor($difference / 60 / 60);
+            $res .= sprintf("%02d:", $datediff);
+
+        case "n":
+            $datediff = floor($difference / 60);
+            $res .= sprintf("%02d:", $datediff);
+
+        case "s":
+            $datediff = $difference;
+            $res .= sprintf("%02d", $datediff);
+            break;
+    }
+    return $res;
+}
+
+// translate bytes into kb, mb, gb or tb by CrappoMan
 function parsebytesize($size,$digits=2,$dir=false) {
     $kb=1024; $mb=1024*$kb; $gb=1024*$mb; $tb=1024*$gb;

trunk/includes/forum_functions_include.php

@@ -400 +400 @@
         $result = dbquery("SELECT DISTINCT tag FROM ".$db_prefix."wiki_pages");
         while ($data = dbarray($result)) {
-            $search[] = "/(\s)(".$data['tag'].")(\s)/is";
+            $search[] = "/([[:space:]]|=|^)?(".$data['tag'].")([[:space:]]+?|\]|$)/i";
             $replace[] = "\\1[wiki]\\2[/wiki]\\3";
         }

trunk/includes/template-plugins/function.imagelink.php

@@ -60 +60 @@
         $alt = $params['alt'];
     }
-    if (!isset($params['style'])) {
-        $style = false;
-    } else {
-        $style = $params['style'];
+    $style = "vertical-align:text-top;";
+    if (isset($params['style'])) {
+        $style .= $params['style'];
     }
     if (!isset($params['onclick'])) {