adam/Piwigo
1
0
Fork 0
mirror of https://github.com/Piwigo/Piwigo.git synced 2026-06-02 04:15:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

- removed compatibility with php4 (file_put_contents exists in php5)

Browse Source 
- when synchronizing local files , sort them alphabetically

git-svn-id: http://piwigo.org/svn/trunk@5176 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
rvelices
2010-03-18 14:30:04 +00:00
parent 7d7f20e804
commit 15fdea6925
3 changed files with 9 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin/site_reader_local.php
+3 -2
View File
@@ -114,6 +114,7 @@ function get_elements($path)
$tmp_fs = $this->get_elements($path.'/'.$subdir);
$fs = array_merge($fs, $tmp_fs);
}
ksort($fs);
} //end if is_dir
return $fs;
}
@@ -198,10 +199,10 @@ function get_element_metadata($file, $has_high = false)
if ($has_high)
{
$high_file = dirname($file).'/pwg_high/'.basename($file);
$data['high_filesize'] = floor(filesize($high_file)/1024);
}
if ($conf['use_exif'])
{
$data = array_merge($data, get_sync_exif_data($file) );
include/common.inc.php
+6 -15
View File
@@ -81,7 +81,6 @@ foreach( array(
'array_intersect_key', //PHP 5 >= 5.1.0RC1
'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)
{
if (!function_exists($func))
@@ -105,8 +104,8 @@ include(PHPWG_ROOT_PATH . 'include/functions.inc.php');
include( PHPWG_ROOT_PATH .'include/template.class.php');
// 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);
pwg_db_check_charset();
@@ -116,19 +115,11 @@ load_plugins();
include(PHPWG_ROOT_PATH.'include/user.inc.php');
if ('fr_FR' == $user['language']) {
define('PHPWG_DOMAIN', 'fr.piwigo.org');
if (in_array( substr($user['language'],0,2), array('fr','de','es','pl') ) )
{
define('PHPWG_DOMAIN', substr($user['language'],0,2).'.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']) {
elseif ('zh_CN' == $user['language']) {
define('PHPWG_DOMAIN', 'cn.piwigo.org');
}
else {
include/php_compat/file_put_contents.php
-14
View File
@@ -1,14 +0,0 @@
<?php
//php 5
function file_put_contents($filename, $data)
{
$fp = fopen($filename, 'w');
if ($fp)
{
$ret = fwrite($fp, $data);
fclose($fp);
return $ret;
}
return false;
}
?>