Changeset 414

Timestamp:

Apr 20, 2013 6:55:12 PM (11 years ago)

Author:

anonymous

Message:

 

Files:

• branches/1.1dev/lib/App.inc.php (modified) (1 diff)
• trunk/lib/App.inc.php (modified) (1 diff)
• trunk/lib/Utilities.inc.php (modified) (3 diffs)

branches/1.1dev/lib/App.inc.php

@@ -100 +100 @@
         'date'      => date('Y-m-d H:i:s'),
         'remote ip' => getRemoteAddr(),
-        'pid'       => (substr(PHP_OS, 0, 3) != 'WIN' ? posix_getpid() : ''),
+        'pid'       => getmypid(),
         'type'      => priorityToString($priority),
         'file:line' => "$file : $line",

trunk/lib/App.inc.php

@@ -651 +651 @@
             'date'      => date('Y-m-d H:i:s'),
             'remote ip' => getRemoteAddr(),
-            'pid'       => (mb_substr(PHP_OS, 0, 3) != 'WIN' ? posix_getpid() : ''),
+            'pid'       => getmypid(),
             'type'      => $this->logPriorityToString($priority),
             'file:line' => "$file : $line",

trunk/lib/Utilities.inc.php

@@ -301 +301 @@
 *
 * @access   public
-* @param    string  $strong The string
-* @return   string          String with uper-cased first character.
+* @param    string  $string The string
+* @return   string          String with upper-cased first character.
 * @author   Quinn Comendant <quinn@strangecode.com>
 * @version  1.0
@@ -311 +311 @@
     {
         return mb_strtoupper(mb_substr($string, 0, 1)) . mb_substr($string, 1, mb_strlen($string));
+    }
+}
+
+/*
+* A substitution for the missing mb_strtr function.
+*
+* @access   public
+* @param    string  $string The string
+* @param    string  $from   String of characters to translate from
+* @param    string  $to     String of characters to translate to
+* @return   string          String with translated characters.
+* @author   Quinn Comendant <quinn@strangecode.com>
+* @version  1.0
+* @since    20 Jan 2013 12:33:26
+*/
+if (!function_exists('mb_strtr')) {    
+    function mb_strtr($string, $from, $to)
+    {
+        return str_replace(mb_split('.', $from), mb_split('.', $to), $string);
     }
 }
@@ -1070 +1089 @@
 }
 
-/**
- * Stub functions used when installation does not have
- * GNU gettext extension installed
- */
-if (!extension_loaded('gettext')) {
-    /**
-    * Translates text
-    *
-    * @access public
-    * @param string $text the text to be translated
-    * @return string translated text
-    */
-    function gettext($text) {
-        return $text;
-    }
-
-    /**
-    * Translates text
-    *
-    * @access public
-    * @param string $text the text to be translated
-    * @return string translated text
-    */
-    function _($text) {
-        return $text;
-    }
-
-    /**
-    * Translates text by domain
-    *
-    * @access public
-    * @param string $domain the language to translate the text into
-    * @param string $text the text to be translated
-    * @return string translated text
-    */
-    function dgettext($domain, $text) {
-        return $text;
-    }
-
-    /**
-    * Translates text by domain and category
-    *
-    * @access public
-    * @param string $domain the language to translate the text into
-    * @param string $text the text to be translated
-    * @param string $category the language dialect to use
-    * @return string translated text
-    */
-    function dcgettext($domain, $text, $category) {
-        return $text;
-    }
-
-    /**
-    * Binds the text domain
-    *
-    * @access public
-    * @param string $domain the language to translate the text into
-    * @param string
-    * @return string translated text
-    */
-    function bindtextdomain($domain, $directory) {
-        return $domain;
-    }
-
-    /**
-    * Sets the text domain
-    *
-    * @access public
-    * @param string $domain the language to translate the text into
-    * @return string translated text
-    */
-    function textdomain($domain) {
-        return $domain;
-    }
-}
 
 ?>