diff options
Diffstat (limited to '')
| -rw-r--r-- | install.php | 6 | ||||
| -rw-r--r-- | install/db/112-database.php | 54 | ||||
| -rw-r--r-- | install/db/94-database.php | 4 |
3 files changed, 59 insertions, 5 deletions
diff --git a/install.php b/install.php index 1ba8ab5ca..17c1c578f 100644 --- a/install.php +++ b/install.php @@ -110,9 +110,9 @@ include(PHPWG_ROOT_PATH . 'include/config_default.inc.php'); defined('PWG_LOCAL_DIR') or define('PWG_LOCAL_DIR', 'local/'); // download database config file if exists -if (!empty($_GET['dl']) && file_exists($conf['local_data_dir'].'/pwg_'.$_GET['dl'])) +if (!empty($_GET['dl']) && file_exists(PHPWG_ROOT_PATH.$conf['data_location'].'pwg_'.$_GET['dl'])) { - $filename = $conf['local_data_dir'].'/pwg_'.$_GET['dl']; + $filename = PHPWG_ROOT_PATH.$conf['data_location'].'pwg_'.$_GET['dl']; header('Cache-Control: no-cache, must-revalidate'); header('Pragma: no-cache'); header('Content-Disposition: attachment; filename="database.inc.php"'); @@ -281,7 +281,7 @@ define(\'DB_COLLATE\', \'\'); if ( !($fp = @fopen( $config_file, 'w' ))) { $tmp_filename = md5(uniqid(time())); - $fh = @fopen( $conf['local_data_dir'] . '/pwg_' . $tmp_filename, 'w' ); + $fh = @fopen( PHPWG_ROOT_PATH.$conf['data_location'] . 'pwg_' . $tmp_filename, 'w' ); @fputs($fh, $file_content, strlen($file_content)); @fclose($fh); diff --git a/install/db/112-database.php b/install/db/112-database.php new file mode 100644 index 000000000..9034981c2 --- /dev/null +++ b/install/db/112-database.php @@ -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" +; +?>
\ No newline at end of file diff --git a/install/db/94-database.php b/install/db/94-database.php index 1121e22f4..854b9d4d9 100644 --- a/install/db/94-database.php +++ b/install/db/94-database.php @@ -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; } |