[Phpfreechat-svn] SF.net SVN: phpfreechat: [473] trunk/src

[<ne...@us...>]

Revision: 473
Author:   nemako
Date:     2006-04-25 06:00:45 -0700 (Tue, 25 Apr 2006)
ViewCVS:  http://svn.sourceforge.net/phpfreechat/?rev=473&view=rev

Log Message:
-----------
Replace preg_match("/^\..*/", $file) by strpos($file,".")===0. It is faster.

Modified Paths:
--------------
    trunk/admin/index.php
    trunk/admin/themes.class.php
    trunk/src/pfci18n.class.php
Modified: trunk/admin/index.php
===================================================================
--- trunk/admin/index.php	2006-04-25 12:16:50 UTC (rev 472)
+++ trunk/admin/index.php	2006-04-25 13:00:45 UTC (rev 473)
@@ -22,7 +22,7 @@
       <li><form action="<?php echo $_SERVER['PHP_SELF']; ?>" method="post">
           <select name="lang">
         <?php 
-        $available_admin_lang = pfcI18N::GetAcceptedAdminLanguage();
+        $available_admin_lang = pfcI18N::GetAcceptedLanguage("admin");
         for($i=0;$i<count($available_admin_lang);$i++) {
           if ($lang==$available_admin_lang[$i])
             $selected ="selected=\"selected\"";

Modified: trunk/admin/themes.class.php
===================================================================
--- trunk/admin/themes.class.php	2006-04-25 12:16:50 UTC (rev 472)
+++ trunk/admin/themes.class.php	2006-04-25 13:00:45 UTC (rev 473)
@@ -22,7 +22,7 @@
        $i=0;
        $dir = opendir($this->dir_themes);
        while ($f = readdir($dir)) {
-         if(is_dir($this->dir_themes.$f) && $f!="." && $f!=".." && strpos($f,".")===false) {
+         if(is_dir($this->dir_themes.$f) && $f!="." && $f!=".." && strpos($f,".")!==0) {
             $themes_list[$i] = $f;
             $i++;
           }

Modified: trunk/src/pfci18n.class.php
===================================================================
--- trunk/src/pfci18n.class.php	2006-04-25 12:16:50 UTC (rev 472)
+++ trunk/src/pfci18n.class.php	2006-04-25 13:00:45 UTC (rev 473)
@@ -33,10 +33,10 @@
 
 class pfcI18N
 {
-  function Init($language,$type='main')
+  function Init($language,$type="main")
   {
     if ($type=="admin")
-      if (!in_array($language, pfcI18N::GetAcceptedAdminLanguage()))
+      if (!in_array($language, pfcI18N::GetAcceptedLanguage("admin")))
         $language = pfcI18N::GetDefaultLanguage();
     if (!in_array($language, pfcI18N::GetAcceptedLanguage()))
       $language = pfcI18N::GetDefaultLanguage();
@@ -79,41 +79,37 @@
    * Return the language list supported bye i18n system
    * (content of the i18n directory)
    */
-  function GetAcceptedLanguage()
+  function GetAcceptedLanguage($type="main")
   {
-    if (isset($GLOBALS["accepted_languages"]))
-      return $GLOBALS["accepted_languages"]; // restore the cached languages list
-    $GLOBALS["accepted_languages"] = array();
-    $dir_handle = opendir(dirname(__FILE__)."/../i18n");
-    while (false !== ($file = readdir($dir_handle)))
-    {
-      // skip . and .. generic files
-      // skip also .svn directory
-      if ($file == "." || $file == ".." || preg_match("/^\..*/", $file)) continue;
-      $GLOBALS["accepted_languages"][] = $file;
+    if ($type=="admin"){
+      if (isset($GLOBALS["accepted_admin_languages"]))
+        return $GLOBALS["accepted_admin_languages"]; // restore the cached languages list
+      $GLOBALS["accepted_admin_languages"] = array();
+      $dir_handle = opendir(dirname(__FILE__)."/../i18n");
+      while (false !== ($file = readdir($dir_handle)))
+      {
+        // skip . and .. generic files
+        // skip also .svn directory
+        if ($file == "." || $file == ".." || strpos($file,".")===0) continue;
+        if (file_exists(dirname(__FILE__)."/../i18n/".$file."/admin.php"))
+        $GLOBALS["accepted_admin_languages"][] = $file;
+      }
+      return $GLOBALS["accepted_admin_languages"];
     }
-    return $GLOBALS["accepted_languages"];
-  }
-
-  /**
-   * Return the language list supported bye i18n system
-   * (content of the i18n directory)
-   */
-  function GetAcceptedAdminLanguage()
-  {
-    if (isset($GLOBALS["accepted_admin_languages"]))
-      return $GLOBALS["accepted_admin_languages"]; // restore the cached languages list
-    $GLOBALS["accepted_admin_languages"] = array();
-    $dir_handle = opendir(dirname(__FILE__)."/../i18n");
-    while (false !== ($file = readdir($dir_handle)))
-    {
-      // skip . and .. generic files
-      // skip also .svn directory
-      if ($file == "." || $file == ".." || preg_match("/^\..*/", $file)) continue;
-      if (file_exists(dirname(__FILE__)."/../i18n/".$file."/admin.php"))
-          $GLOBALS["accepted_admin_languages"][] = $file;
+    else{
+      if (isset($GLOBALS["accepted_languages"]))
+        return $GLOBALS["accepted_languages"]; // restore the cached languages list
+      $GLOBALS["accepted_languages"] = array();
+      $dir_handle = opendir(dirname(__FILE__)."/../i18n");
+      while (false !== ($file = readdir($dir_handle)))
+      {
+        // skip . and .. generic files
+        // skip also .svn directory
+        if ($file == "." || $file == ".." || strpos($file,".")===0) continue;
+        $GLOBALS["accepted_languages"][] = $file;
+      }
+      return $GLOBALS["accepted_languages"];
     }
-    return $GLOBALS["accepted_admin_languages"];
   }
   
   /**


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.