archive/piwigo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fetaure 2542 replace $conf['local_data_dir'] with $conf['data_location'] and move combined files and image derivatives from local to _data

Browse source 
git-svn-id: http://piwigo.org/svn/trunk@12802 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
rvelices 2011-12-29 05:48:16 +00:00
commit 1e1b71c6f6
14 changed files with 94 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

54
install/db/112-database.php Normal file
View file

@ -0,0 +1,54 @@
<?php
// +-----------------------------------------------------------------------+
// | Piwigo - a PHP based photo gallery |
// +-----------------------------------------------------------------------+
// | Copyright(C) 2008-2011 Piwigo Team http://piwigo.org |
// | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net |
// | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick |
// +-----------------------------------------------------------------------+
// | This program is free software; you can redistribute it and/or modify |
// | it under the terms of the GNU General Public License as published by |
// | the Free Software Foundation |
// | |
// | This program is distributed in the hope that it will be useful, but |
// | WITHOUT ANY WARRANTY; without even the implied warranty of |
// | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
// | General Public License for more details. |
// | |
// | You should have received a copy of the GNU General Public License |
// | along with this program; if not, write to the Free Software |
// | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, |
// | USA. |
// +-----------------------------------------------------------------------+
if (!defined('PHPWG_ROOT_PATH'))
{
die('Hacking attempt!');
}
$upgrade_description = 'Change combined dir';
// Add column
$query = 'DELETE FROM '.CONFIG_TABLE.'
WHERE param IN (\'local_data_dir_checked\', \'combined_dir_checked\') ';
pwg_query($query);
$dir=PHPWG_ROOT_PATH.'local/combined/';
if (is_dir($dir))
{
foreach (glob($dir.'*.css') as $file)
{
@unlink($file);
}
foreach (glob($dir.'*.js') as $file)
@unlink($file);
@unlink($dir.'index.htm');
@rmdir($dir);
}
echo
"\n"
. $upgrade_description
."\n"
;
?>

4
install/db/94-database.php
View file

@ -60,7 +60,7 @@ while ($row = pwg_db_fetch_assoc($result)) {
}
// save configuration for a future use by the Community plugin
$backup_filepath = $conf['local_data_dir'].'/plugins/core_user_upload_to_community.php';
$backup_filepath = PHPWG_ROOT_PATH.$conf['data_location'].'plugins/core_user_upload_to_community.php';
$save_conf = true;
if (is_dir(dirname($backup_filepath)))
{
@ -69,7 +69,7 @@ if (is_dir(dirname($backup_filepath)))
$save_conf = false;
}
}
elseif (!is_writable($conf['local_data_dir']))
elseif (!is_writable( PHPWG_ROOT_PATH.$conf['data_location'] ))
{
$save_conf = false;
}