diff options
-rwxr-xr-x | inc/poche/Poche.class.php | 9 | ||||
-rwxr-xr-x | inc/poche/global.inc.php | 2 | ||||
-rwxr-xr-x[-rw-r--r--] | install/index.php | 2 |
3 files changed, 3 insertions, 10 deletions
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 | |||
101 | 101 | ||
102 | public function configFileIsAvailable() { | 102 | public function configFileIsAvailable() { |
103 | if (! self::$configFileAvailable) { | 103 | if (! self::$configFileAvailable) { |
104 | $this->notInstalledMessage[] = 'You have to rename inc/poche/config.inc.php.new to inc/poche/config.inc.php.'; | 104 | $this->notInstalledMessage[] = 'You have to copy (don\'t just rename!) inc/poche/config.inc.default.php to inc/poche/config.inc.php.'; |
105 | 105 | ||
106 | return false; | 106 | return false; |
107 | } | 107 | } |
@@ -834,13 +834,6 @@ class Poche | |||
834 | */ | 834 | */ |
835 | public function import() { | 835 | public function import() { |
836 | 836 | ||
837 | if (!defined('IMPORT_LIMIT')) { | ||
838 | define('IMPORT_LIMIT', 5); | ||
839 | } | ||
840 | if (!defined('IMPORT_DELAY')) { | ||
841 | define('IMPORT_DELAY', 5); | ||
842 | } | ||
843 | |||
844 | if ( isset($_FILES['file']) ) { | 837 | if ( isset($_FILES['file']) ) { |
845 | Tools::logm('Import stated: parsing file'); | 838 | Tools::logm('Import stated: parsing file'); |
846 | 839 | ||
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')) { | |||
43 | Poche::$configFileAvailable = false; | 43 | Poche::$configFileAvailable = false; |
44 | } else { | 44 | } else { |
45 | require_once INCLUDES . '/poche/config.inc.php'; | 45 | require_once INCLUDES . '/poche/config.inc.php'; |
46 | require_once INCLUDES . '/poche/config.inc.php.new'; | 46 | require_once INCLUDES . '/poche/config.inc.default.php'; |
47 | } | 47 | } |
48 | 48 | ||
49 | if (Poche::$configFileAvailable && DOWNLOAD_PICTURES) { | 49 | if (Poche::$configFileAvailable && DOWNLOAD_PICTURES) { |
diff --git a/install/index.php b/install/index.php index e02952e0..b6c6abec 100644..100755 --- a/install/index.php +++ b/install/index.php | |||
@@ -53,7 +53,7 @@ else if (isset($_POST['install'])) { | |||
53 | else { | 53 | else { |
54 | $continue = true; | 54 | $continue = true; |
55 | // Create config.inc.php | 55 | // Create config.inc.php |
56 | if (!copy('inc/poche/config.inc.php.new', 'inc/poche/config.inc.php')) { | 56 | if (!copy('inc/poche/config.inc.default.php', 'inc/poche/config.inc.php')) { |
57 | $errors[] = 'Installation aborted, impossible to create inc/poche/config.inc.php file. Maybe you don\'t have write access to create it.'; | 57 | $errors[] = 'Installation aborted, impossible to create inc/poche/config.inc.php file. Maybe you don\'t have write access to create it.'; |
58 | $continue = false; | 58 | $continue = false; |
59 | } | 59 | } |