Changeset 5176

Timestamp:

Mar 18, 2010, 3:30:04 PM (14 years ago)

Author:

rvelices

Message:

• removed compatibility with php4 (file_put_contents exists in php5)
• when synchronizing local files , sort them alphabetically

Location:

trunk

Files:

• admin/site_reader_local.php (modified) (2 diffs)
• include/common.inc.php (modified) (3 diffs)
• include/php_compat/file_put_contents.php (deleted)

trunk/admin/site_reader_local.php

@@ -115 +115 @@
       $fs = array_merge($fs, $tmp_fs);
     }
+    ksort($fs);
   } //end if is_dir
   return $fs;
@@ -199 +200 @@
   {
     $high_file = dirname($file).'/pwg_high/'.basename($file);
-    
+
     $data['high_filesize'] = floor(filesize($high_file)/1024);
   }
-  
+
   if ($conf['use_exif'])
   {

trunk/include/common.inc.php

@@ -82 +82 @@
   'hash_hmac', //(hash) - enabled by default as of PHP 5.1.2
   'preg_last_error', // PHP 5 >= 5.2.0
-  'file_put_contents', //PHP5
   ) as $func)
 {
@@ -106 +105 @@
 
 // Database connection
-$pwg_db_link = pwg_db_connect($conf['db_host'], $conf['db_user'], 
-                              $conf['db_password'], $conf['db_base']) 
+$pwg_db_link = pwg_db_connect($conf['db_host'], $conf['db_user'],
+                              $conf['db_password'], $conf['db_base'])
   or my_error('pwg_db_connect', true);
 
@@ -117 +116 @@
 include(PHPWG_ROOT_PATH.'include/user.inc.php');
 
-if ('fr_FR' == $user['language']) {
-  define('PHPWG_DOMAIN', 'fr.piwigo.org');
-}
-else if ('de_DE' == $user['language']) {
-  define('PHPWG_DOMAIN', 'de.piwigo.org');
-}
-else if ('es_ES' == $user['language']) {
-  define('PHPWG_DOMAIN', 'es.piwigo.org');
-}
-else if ('pl_PL' == $user['language']) {
-  define('PHPWG_DOMAIN', 'pl.piwigo.org');
-}
-else if ('zh_CN' == $user['language']) {
+if (in_array( substr($user['language'],0,2), array('fr','de','es','pl') ) )
+{
+  define('PHPWG_DOMAIN', substr($user['language'],0,2).'.piwigo.org');
+}
+elseif ('zh_CN' == $user['language']) {
   define('PHPWG_DOMAIN', 'cn.piwigo.org');
 }