From 43c7b978c31bcbf9e8e5202ecbb7b6fccba6a7fa Mon Sep 17 00:00:00 2001 From: Maryana Rozhankivska Date: Tue, 22 Apr 2014 20:58:40 +0300 Subject: config.inc.php.new renamed in config.inc.default.php --- inc/poche/Poche.class.php | 9 +-------- inc/poche/global.inc.php | 2 +- install/index.php | 2 +- 3 files changed, 3 insertions(+), 10 deletions(-) mode change 100644 => 100755 install/index.php diff --git a/inc/poche/Poche.class.php b/inc/poche/Poche.class.php index dcfdc167..66710ecb 100755 --- a/inc/poche/Poche.class.php +++ b/inc/poche/Poche.class.php @@ -101,7 +101,7 @@ class Poche public function configFileIsAvailable() { if (! self::$configFileAvailable) { - $this->notInstalledMessage[] = 'You have to rename inc/poche/config.inc.php.new to inc/poche/config.inc.php.'; + $this->notInstalledMessage[] = 'You have to copy (don\'t just rename!) inc/poche/config.inc.default.php to inc/poche/config.inc.php.'; return false; } @@ -834,13 +834,6 @@ class Poche */ public function import() { - if (!defined('IMPORT_LIMIT')) { - define('IMPORT_LIMIT', 5); - } - if (!defined('IMPORT_DELAY')) { - define('IMPORT_DELAY', 5); - } - if ( isset($_FILES['file']) ) { Tools::logm('Import stated: parsing file'); diff --git a/inc/poche/global.inc.php b/inc/poche/global.inc.php index a77081a2..14e9dd93 100755 --- a/inc/poche/global.inc.php +++ b/inc/poche/global.inc.php @@ -43,7 +43,7 @@ if (! file_exists(INCLUDES . '/poche/config.inc.php')) { Poche::$configFileAvailable = false; } else { require_once INCLUDES . '/poche/config.inc.php'; - require_once INCLUDES . '/poche/config.inc.php.new'; + require_once INCLUDES . '/poche/config.inc.default.php'; } if (Poche::$configFileAvailable && DOWNLOAD_PICTURES) { diff --git a/install/index.php b/install/index.php old mode 100644 new mode 100755 index e02952e0..b6c6abec --- a/install/index.php +++ b/install/index.php @@ -53,7 +53,7 @@ else if (isset($_POST['install'])) { else { $continue = true; // Create config.inc.php - if (!copy('inc/poche/config.inc.php.new', 'inc/poche/config.inc.php')) { + if (!copy('inc/poche/config.inc.default.php', 'inc/poche/config.inc.php')) { $errors[] = 'Installation aborted, impossible to create inc/poche/config.inc.php file. Maybe you don\'t have write access to create it.'; $continue = false; } -- cgit v1.2.3