config.inc.php.new renamed in config.inc.default.php

diff --git a/inc/poche/Poche.class.php b/inc/poche/Poche.class.php
index dcfdc167da34611c581efea18cf18619e438c0b7..66710ecb1a9181febe148621b7779441df0683e9 100755 (executable)
--- 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 a77081a237eb55e7bc6dbc5e98680be2b8bf336e..14e9dd9322ef0a54c5bf5691fa15cee6d25070a3 100755 (executable)
--- 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 (file)
new mode 100755 (executable)
index e02952e..b6c6abe
--- 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;
         }