Localisation updates Cantonese, Chinese and Old/Late Time Chinese

[lhc/web/wiklou.git] / includes / GlobalFunctions.php

diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php
index 3825f08..a9bf015 100644 (file)
--- a/includes/GlobalFunctions.php
+++ b/includes/GlobalFunctions.php
@@ -989,100 +989,20 @@ function wfSetBit( &$dest, $bit, $state = true ) {
  */
 function wfArrayToCGI( $array1, $array2 = NULL )
 {
-    if ( !is_null( $array2 ) ) {
-        $array1 = $array1 + $array2;
-    }
-       
-    $cgi = '';
-    foreach ( $array1 as $key => $value ) {
-        if ( '' !== $value ) {
-            if ( '' != $cgi ) {
-                $cgi .= '&';
-            }
-            $cgi .= urlencode( $key ) . '=' . urlencode( $value );
-        }
-    }
-    return $cgi;
-}
-/**
- * Build a query string from complex data input and return.
- * 
- * @param mixed $query The query data to build the string from
- * @param string $prefix A prefix to add to numeric keys to make them valid
- * @param string $dataKey A key name to use on the data
- * @return string The query string
- */
-function wfBuildQuery( $query, $prefix = null, $dataKey = null ) {
-       # Passthrough strings and blank data
-       if( is_null($query) || is_string($query) ) return (string) $query;
-       
-       # Recursively build the query.
-       $data = array();
-       $keyNum = 0;
-       foreach( (array) $query as $key => $value ) {
-               if( is_int($key) && $prefix != null ) {
-                       # Prefix numeric keys when given a prefix.
-                       $key = "{$prefix}{$key}";
-               }
-               if( isset($dataKey) && $dataKey != '' ) {
-                       # Add array type data to keys when needed
-                       # but don't add the key inside the [] when they are sequential
-                       if( $keyNum === $key ) $key = "{$dataKey}[]"; 
-                       else $key = "{$dataKey}[{$key}]";
-                       
-               }
-               # Push the data onto the end of the array recursing if needed.
-               array_push($data,
-                       is_array($value) || is_object($value)
-                       ? wfBuildQuery($value,null,$key)
-                       : urlencode($key)."=".urlencode($value) );
-               $keyNum++;
-       };
-       # Implode and return.
-       return implode('&', $data);
-};
-
-/**
- * Parse a query string into an array.
- * 
- * @param mixed $query The query string to parse
- * @return array The array data for the query
- */
-function wfParseQuery( $query ) {
-       # Passthrough non-strings.
-       if( !is_string($query) ) return $query;
-       
-       $data = array();
-       # Separate all name-value pairs
-       $pairs = explode('&', $query);
-       foreach($pairs as $pair) {
-               # Pull out the names and the values
-               list($name, $value) = explode('=', $pair, 2);
-               # Decode the variable name and look for arrays
-               $m = array();
-               $name = urldecode($name);
-               if( preg_match('/^(.*?)((\[.*?\])+)$/S', $name, $m) !== 0 ) {
-                       $name  = $m[1];
-                       $braces = $m[2];
-                       $indexes = explode( '][', substr( $braces, 1, -1 ) );
-                       
-                       if(!isset($data[$name])) $data[$name] = array();
-                       $recursive =& $data[$name];
-                       foreach( $indexes as $index ) {
-                               if( $index != "" ) {
-                                       if(!isset($recursive[$index])) $recursive[$index] = array();
-                                       $recursive =& $recursive[$index];
-                               } else {
-                                       $i = array_push( $recursive, array() ) - 1;
-                                       $recursive =& $recursive[$i];
-                               }
+       if ( !is_null( $array2 ) ) {
+               $array1 = $array1 + $array2;
+       }
+
+       $cgi = '';
+       foreach ( $array1 as $key => $value ) {
+               if ( '' !== $value ) {
+                       if ( '' != $cgi ) {
+                               $cgi .= '&';
                        }
-                       $recursive = urldecode($value);
-               } else {
-                       $data[$name] = urldecode($value);
+                       $cgi .= urlencode( $key ) . '=' . urlencode( $value );
                }
        }
-       return $data;
+       return $cgi;
 }
 
 /**
@@ -2416,6 +2336,14 @@ function wfMemcKey( /*... */ ) {
        return $key;
 }
 
+function wfMemcKeyLang( $key, $code ) {
+       if ( !is_string($code) ) {
+               return $key;
+       } else {
+               return $key . ';L:' . $code;
+       }
+}
+
 /**
  * Get a cache key for a foreign DB
  */
@@ -2458,7 +2386,7 @@ function wfSplitWikiID( $wiki ) {
 }
 
 /*
- * Get a Database object
+ * Get a Database object.
  * @param integer $db Index of the connection to get. May be DB_MASTER for the
  *                master (for write queries), DB_SLAVE for potentially lagged
  *                read queries, or an integer >= 0 for a particular server.
@@ -2468,6 +2396,10 @@ function wfSplitWikiID( $wiki ) {
  *              in one group.
  *
  * @param string $wiki The wiki ID, or false for the current wiki
+ *
+ * Note: multiple calls to wfGetDB(DB_SLAVE) during the course of one request 
+ * will always return the same object, unless the underlying connection or load 
+ * balancer is manually destroyed. 
  */
 function &wfGetDB( $db = DB_LAST, $groups = array(), $wiki = false ) {
        return wfGetLB( $wiki )->getConnection( $db, $groups, $wiki );
@@ -2677,7 +2609,7 @@ function wfWaitForSlaves( $maxLag ) {
 /** Generate a random 32-character hexadecimal token.
  * @param mixed $salt Some sort of salt, if necessary, to add to random characters before hashing.
  */
- function wfGenerateToken( $salt = '' ) {
+function wfGenerateToken( $salt = '' ) {
        $salt = serialize($salt);
 
        return md5( mt_rand( 0, 0x7fffffff ) . $salt );