Changeset 2134 for trunk/include/functions.inc.php

Timestamp:

Oct 11, 2007, 2:10:41 AM (17 years ago)

Author:

rvelices

Message:

• changed htmlentities to htmlspecialchars in comments.php (utf-8 issue)
• web service explorer in utf-8
• removed warning in function load_language
• feature: show_queries also shows number of selected rows or number of affected rows

File:

• trunk/include/functions.inc.php (modified) (5 diffs)

trunk/include/functions.inc.php

@@ -517 +517 @@
       }
       else
-      { // probably english that is the same in all ISO-xxx and UTF-8
+      { // UTF-8
+        $language_name = convert_charset($language_name,
+              'utf-8', $target_charset);
         $languages[$file] = $language_name;
       }
@@ -700 +702 @@
     $output.= "\n".'(total time      : ';
     $output.= number_format( ($time+$start-$t2), 3, '.', ' ').' s)';
+    if ( $result!=null and preg_match('/\s*SELECT\s+/i',$query) )
+    {
+      $output.= "\n".'(num rows        : ';
+      $output.= mysql_num_rows($result).' )';
+    }
+    elseif ( $result!=null
+      and preg_match('/\s*INSERT|UPDATE|REPLACE|DELETE\s+/i',$query) )
+    {
+      $output.= "\n".'(affected rows   : ';
+      $output.= mysql_affected_rows().' )';
+    }
     $output.= "</pre>\n";
 
@@ -1530 +1543 @@
     }
 
-    // universal language (like Eng) no conversion required
+    // UTF-8 ?
     $f = $dir.'/'.$filename;
     if (file_exists($f))
     {
+      $source_charset = 'utf-8';
       $source_file = $f;
       break;
@@ -1544 +1558 @@
       {
         $source_charset = 'iso-8859-1';
-        $source_file = $f;
-        break;
-      }
-    }
-
-    if ($target_charset=='iso-8859-1' and
-      in_array( substr($language,2), array('en','fr','de','es','it','nl') )
-      )
-    { // we accept conversion from UTF-8 to ISO-8859-1 for backward compatibility ONLY
-      $f = $dir.'.utf-8/'.$filename;
-      if (file_exists($f))
-      {
-        $source_charset = 'utf-8';
         $source_file = $f;
         break;
@@ -1600 +1601 @@
       else
       {
-        $lang = array_merge( $lang, $load_lang );
-        $lang_info = array_merge( $lang_info, $load_lang_info );
+        $lang = array_merge( $lang, (array)$load_lang );
+        $lang_info = array_merge( $lang_info, (array)$load_lang_info );
       }
       return true;