Changeset 1606 for branches/multiuser/cls

Timestamp:

10/16/06 08:11:03 (2 years ago)

Author:

mdodoo

Message:

This was really annoying, and took more time than the previous commit. For some reason, "svn diff" does not work correctly on my machine.

Location:

branches/multiuser/cls

Files:

• db/db.mysql.php (modified) (6 diffs)
• l10n.php (modified) (6 diffs)
• wrappers/item.php (modified) (1 diff)

branches/multiuser/cls/db/db.mysql.php

@@ -31 +31 @@
 class MysqlDB extends DB {
 
+    var $resource;
+
     function  MysqlDB() {
         parent::DB();
@@ -41 +43 @@
     
     function DBConnect($dbserver, $dbuname, $dbpass) {
-         if (!mysql_connect($dbserver, $dbuname, $dbpass)) {
+    $this -> resource = mysql_connect($dbserver, $dbuname, $dbpass);
+
+        if(!$this -> resource) {
               die( "<h1>Error connecting to the database!</h1>\n"
                      ."<p>Have you edited dbinit.php and correctly defined "
@@ -49 +53 @@
     
     function DBSelectDB($dbname) {
-        if (!mysql_select_db($dbname)) {
+        if (!mysql_select_db($dbname, $this -> resource)) {
               die( "<h1>Error selecting the database!</h1>\n"
                      ."<p>Does your database exist?"
@@ -60 +64 @@
     
     function rss_query ($query, $dieOnError=true, $preventRecursion=false) {
-         $ret =  mysql_query($query);
+         $ret =  mysql_query($query, $this -> resource);
     
          if ($error = $this -> rss_sql_error()) {
@@ -101 +105 @@
     
     function rss_sql_error() {
-         return mysql_errno();
+         return mysql_errno($this -> resource);
     }
     
     function rss_sql_error_message () {
-         return mysql_error();
+         return mysql_error($this -> resource);
     }
     
     function rss_insert_id() {
-        return mysql_insert_id();
+        return mysql_insert_id($this -> resource);
     }
     
@@ -125 +129 @@
         switch ($kind) {
             case RSS_SQL_ERROR_NO_ERROR:
-                return (mysql_errno() == 0);
+                return (mysql_errno($this -> resource) == 0);
                 break;
             case RSS_SQL_ERROR_DUPLICATE_ROW:
-                return (mysql_errno() == 1062);
+                return (mysql_errno($this -> resource) == 1062);
                 break;
             default:

branches/multiuser/cls/l10n.php

@@ -38 +38 @@
     function RSSl10n() {
         $this -> locale = preg_replace('#[^a-zA-Z_]#','',$this -> __detectUserLang());
-        
-        $ll=explode('_',$this -> locale);
-        $this->isloang=$ll[0].'-'.strtoupper($ll[1]);
-        
-        if (function_exists('version_compare') && version_compare("4.3.0",PHP_VERSION, "<=") && preg_match('#([a-z]{2})_([A-Z]{2})#',$this -> locale,$m)) {
+        $this -> isolang=str_replace('_','-',$this -> locale);
+        if (function_exists('version_compare') && version_compare("4.3.0",PHP_VERSION, "<=") && preg_match('#([a-z]{2})_?([A-Z]{2})?#',$this -> locale,$m)) {
             $locales=array(
-                $m[0].'UTF-8',
-                $m[0].'utf-8',
+                $m[0].'.UTF-8',
+                $m[0].'.utf-8',
                 $m[0],
-                $m[1].'_'.strtoupper($m[1]),
-                $m[1],
-                $m[2]
+                $m[1],              
+                $m[1].'_'.strtoupper($m[1])
+                //$m[2]
             );
             setlocale(LC_ALL, $locales);    
@@ -75 +72 @@
     }
     function getISOLang() {
-        return $this ->isloang;
+        return $this ->isolang;
     }
     /**
@@ -81 +78 @@
      */
     function __detectUserLang() {
-       if (isset($_REQUEST['lang']) && preg_match('#^[a-z]{2}_[A-Z]{2}$#',$_REQUEST['lang']) && file_exists(GREGARIUS_HOME .'intl/'.$_REQUEST['lang'])) {
-            setcookie(RSS_LOCALE_COOKIE,$_REQUEST['lang'],time()+3600*6,getPath());
+       if (isset($_REQUEST['lang']) && preg_match('#^[a-z]{2}_?([A-Z]{2})?$#',$_REQUEST['lang']) && ($_REQUEST['lang'] == 'en' || file_exists(GREGARIUS_HOME .'intl/'.$_REQUEST['lang']))) {
+            $this -> __setLocaleCookie($_REQUEST['lang']);
             return  $_REQUEST['lang'];
         } elseif (isset($_COOKIE[RSS_LOCALE_COOKIE])) {
@@ -99 +96 @@
                 if (preg_match('#^([a-z]{2})[\-_]?([a-z]{2})?$#i',$ll,$pm)) {
                     $ret =null;
-                    if (isset($pm[2])){
-                        if (file_exists(GREGARIUS_HOME .'intl/'.$pm[1] ."_".strtoupper($pm[2]))) {
-                            // xx-yy -> xx_YY
-                            $ret= $pm[1] ."_".strtoupper($pm[2]);
-                        } elseif(file_exists(GREGARIUS_HOME .'intl/'.$pm[1] ."_".strtoupper($pm[1]))) {
-                            // xx-yy -> xx_XX
-                            $ret= $pm[1] ."_".strtoupper($pm[1]);
-                        }
-                    } elseif(file_exists(GREGARIUS_HOME .'intl/'.$pm[1] ."_".strtoupper($pm[1]))) {
-                        // xx  -> xx_XX
-                        $ret= $pm[1] ."_".strtoupper($pm[1]);
+                    if (isset($pm[2]) && file_exists(GREGARIUS_HOME .'intl/'.$pm[1] ."_".strtoupper($pm[2]))) {
+                        // xx-yy -> xx_YY
+                        $ret= $pm[1] ."_".strtoupper($pm[2]);
+                    } elseif(file_exists(GREGARIUS_HOME .'intl/'.$pm[1] )) {
+                        // xx  -> xx
+                        $ret= $pm[1];
                     } elseif($pm[1] == 'en') {
                         // ugly: a better way would be to look up all the available locales
@@ -117 +109 @@
                     if ($ret) {
                         // remember the detected locale for a couple hours
-                        setcookie(RSS_LOCALE_COOKIE,$ret,time()+3600*6,getPath());
+                        $this -> __setLocaleCookie($ret);
                         return $ret;
                     }
@@ -127 +119 @@
         return getConfig('rss.output.lang');
     }
+
+    function __setLocaleCookie($value) {
+        setcookie(RSS_LOCALE_COOKIE,$value,time()+3600*6,getPath());
+    }
 }
     

branches/multiuser/cls/wrappers/item.php

@@ -74 +74 @@
     return $url;
   }
-  return "http://" . $_SERVER['HTTP_HOST'] . rss_item_pl_url();
+  return guessTransportProto() . $_SERVER['HTTP_HOST'] . getPath() . rss_item_pl_url();
 }