configV2.php -> config.php (suppression de l'historicité du fichier)

AnaelMobilia · AnaelMobilia · commit 679d9c8b386f · 2019-10-24T17:01:27.000+02:00
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,2 @@
-/config/configV2.php
+/config/config.php
 /nbproject/
diff --git a/.travis.yml b/.travis.yml
@@ -45,7 +45,7 @@ before_script:
   # Injection des tables de base
   - mysql imageheberg < database.sql
   # Copie du fichier de configuration
-  - sh -c "mv __tests/config/configV2.php config/"
+  - sh -c "mv __tests/config/config.php config/"
   # Insertion d'un jeu de données de test
   - mysql imageheberg < __tests/data.sql
 
diff --git a/README.md b/README.md
@@ -11,7 +11,7 @@ Service d'hébergement d'images en ligne
 # Installation
   - Créer une base de données à partir du fichier database.sql
   - Copier les fichiers dans le répertoire du serveur web
-  - Renommer le fichier configV2_empty.php en configV2.php et compléter les différents champs
+  - Renommer le fichier config_empty.php en config.php et compléter les différents champs
   - Configurer l'URL du site dans le fichier .htaccess
   - Se connecter avec le compte admin / password. Ce compte est le compte de l'administrateur du site. (pensez à mettre à jour l'adresse mail associée !)
 
diff --git a/__tests/config/config.php b/__tests/config/config.php
diff --git a/__tests/imageObjectTest.php b/__tests/imageObjectTest.php
@@ -28,7 +28,7 @@ class imageObjectTest extends TestCase {
      * @runInSeparateProcess
      */
     public function testRotationImages() {
-        require 'config/configV2.php';
+        require 'config/config.php';
 
         $monImage = new imageObject();
         // JPG
@@ -106,7 +106,7 @@ public function testRotationImages() {
      * @runInSeparateProcess
      */
     public function testRedimensionnementImages() {
-        require 'config/configV2.php';
+        require 'config/config.php';
 
         $monImage = new imageObject();
 
diff --git a/__tests/imageUploadAndDeleteTest.php b/__tests/imageUploadAndDeleteTest.php
@@ -102,7 +102,7 @@ private static function setNbPlus($nomFichier) {
     * Test de l'envoi simple : présence BDD et HDD
     */
    public function testEnvoi() {
-      require_once 'config/configV2.php';
+      require_once 'config/config.php';
       unset($_POST);
       unset($_FILES);
       unset($_GET);
@@ -128,7 +128,7 @@ public function testEnvoi() {
     * @depends testEnvoi
     */
    public function testEnvoiMiniature() {
-      require_once 'config/configV2.php';
+      require_once 'config/config.php';
       unset($_POST);
       unset($_FILES);
       unset($_GET);
@@ -158,7 +158,7 @@ public function testEnvoiMiniature() {
     * @depends testEnvoiMiniature
     */
    public function testEnvoiMiniatureRotation() {
-      require_once 'config/configV2.php';
+      require_once 'config/config.php';
       unset($_POST);
       unset($_FILES);
       unset($_GET);
@@ -189,7 +189,7 @@ public function testEnvoiMiniatureRotation() {
     * @depends testEnvoiMiniatureRotation
     */
    public function testRenvoiImageDemandeMiniature() {
-      require_once 'config/configV2.php';
+      require_once 'config/config.php';
       unset($_POST);
       unset($_FILES);
       unset($_GET);
@@ -218,7 +218,7 @@ public function testRenvoiImageDemandeMiniature() {
     * @depends testRenvoiImageDemandeMiniature
     */
    public function testRenvoiImageDemandeNouvelleMiniature() {
-      require_once 'config/configV2.php';
+      require_once 'config/config.php';
       unset($_POST);
       unset($_FILES);
       unset($_GET);
diff --git a/__tests/membreTest.php b/__tests/membreTest.php
@@ -41,7 +41,7 @@ public function getDataSet() {
 
    public function testConnexionMembreExistant() {
       // Chargement de la configuration
-      require_once 'config/configV2.php';
+      require_once 'config/config.php';
       unset($_POST);
       /**
        *  Injection des valeurs du formulaire
diff --git a/a_propos.php b/a_propos.php
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with image-heberg.fr. If not, see <http://www.gnu.org/licenses/>
  */
-require 'config/configV2.php';
+require 'config/config.php';
 require _TPL_TOP_;
 ?>
 <h1><small>A propos</small></h1>
diff --git a/admin/cleanErrors.php b/admin/cleanErrors.php
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with image-heberg.fr. If not, see <http://www.gnu.org/licenses/>
  */
-require '../config/configV2.php';
+require '../config/config.php';
 // Vérification des droits d'accès
 metaObject::checkUserAccess(utilisateurObject::levelAdmin);
 require _TPL_TOP_;
diff --git a/admin/cleanFilesNeverUsed.php b/admin/cleanFilesNeverUsed.php
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with image-heberg.fr. If not, see <http://www.gnu.org/licenses/>
  */
-require '../config/configV2.php';
+require '../config/config.php';
 // Vérification des droits d'accès
 metaObject::checkUserAccess(utilisateurObject::levelAdmin);
 require _TPL_TOP_;
diff --git a/admin/cleanInactiveFiles.php b/admin/cleanInactiveFiles.php
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with image-heberg.fr. If not, see <http://www.gnu.org/licenses/>
  */
-require '../config/configV2.php';
+require '../config/config.php';
 // Vérification des droits d'accès
 metaObject::checkUserAccess(utilisateurObject::levelAdmin);
 require _TPL_TOP_;
diff --git a/admin/index.php b/admin/index.php
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with image-heberg.fr. If not, see <http://www.gnu.org/licenses/>
  */
-require '../config/configV2.php';
+require '../config/config.php';
 // Vérification des droits d'accès
 metaObject::checkUserAccess(utilisateurObject::levelAdmin);
 require _TPL_TOP_;
diff --git a/admin/listeFichiers.php b/admin/listeFichiers.php
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with image-heberg.fr. If not, see <http://www.gnu.org/licenses/>
  */
-require '../config/configV2.php';
+require '../config/config.php';
 // Vérification des droits d'accès
 metaObject::checkUserAccess(utilisateurObject::levelAdmin);
 require _TPL_TOP_;
diff --git a/cgu.php b/cgu.php
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with image-heberg.fr. If not, see <http://www.gnu.org/licenses/>
  */
-require 'config/configV2.php';
+require 'config/config.php';
 require _TPL_TOP_;
 ?>
 <h1><small>Conditions Générales d'Utilisation</small></h1>
diff --git a/changelog.php b/changelog.php
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with image-heberg.fr. If not, see <http://www.gnu.org/licenses/>
  */
-require 'config/configV2.php';
+require 'config/config.php';
 require _TPL_TOP_;
 ?>
 <h1><small>Historique des versions</small></h1>
diff --git a/config/config_empty.php b/config/config_empty.php
diff --git a/contact.php b/contact.php
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with image-heberg.fr. If not, see <http://www.gnu.org/licenses/>
  */
-require 'config/configV2.php';
+require 'config/config.php';
 require _TPL_TOP_;
 
 // En cas de validation du formulaire
diff --git a/delete.php b/delete.php
@@ -18,7 +18,7 @@
  * along with image-heberg.fr. If not, see <http://www.gnu.org/licenses/>
  */
 if (!defined('_TRAVIS_')) {
-   require 'config/configV2.php';
+   require 'config/config.php';
 }
 require _TPL_TOP_;
 
diff --git a/displayPics.php b/displayPics.php
@@ -20,7 +20,7 @@
 /**
  * Affichage d'une image & mise à jour des stats
  */
-require 'config/configV2.php';
+require 'config/config.php';
 
 // URL demandée
 $url = $_SERVER['REQUEST_URI'];
diff --git a/index.php b/index.php
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with image-heberg.fr. If not, see <http://www.gnu.org/licenses/>
  */
-require 'config/configV2.php';
+require 'config/config.php';
 require _TPL_TOP_;
 
 // Anti-flood
diff --git a/membre/connexionCompte.php b/membre/connexionCompte.php
@@ -18,7 +18,7 @@
  * along with image-heberg.fr. If not, see <http://www.gnu.org/licenses/>
  */
 if (!defined('_TRAVIS_')) {
-   require __DIR__ . '/../config/configV2.php';
+   require __DIR__ . '/../config/config.php';
 }
 
 // Un utilisateur...
diff --git a/membre/creerCompte.php b/membre/creerCompte.php
@@ -18,7 +18,7 @@
  * along with image-heberg.fr. If not, see <http://www.gnu.org/licenses/>
  */
 if (!defined('_TRAVIS_')) {
-   require '../config/configV2.php';
+   require '../config/config.php';
 }
 require _TPL_TOP_;
 
diff --git a/membre/deconnexionCompte.php b/membre/deconnexionCompte.php
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with image-heberg.fr. If not, see <http://www.gnu.org/licenses/>
  */
-require __DIR__ . '/../config/configV2.php';
+require __DIR__ . '/../config/config.php';
 
 // On se déconnecte
 $maSession = new sessionObject();
diff --git a/membre/mesImages.php b/membre/mesImages.php
@@ -20,7 +20,7 @@
 // TODO : affichage des images dans la page en javascript ?
 // TODO : navigation entre les images
 
-require __DIR__ . '/../config/configV2.php';
+require __DIR__ . '/../config/config.php';
 // Vérification des droits d'accès
 metaObject::checkUserAccess(utilisateurObject::levelUser);
 require _TPL_TOP_;
diff --git a/membre/monCompte.php b/membre/monCompte.php
@@ -18,7 +18,7 @@
  * along with image-heberg.fr. If not, see <http://www.gnu.org/licenses/>
  */
 if (!defined('_TRAVIS_')) {
-   require '../config/configV2.php';
+   require '../config/config.php';
 }
 metaObject::checkUserAccess(utilisateurObject::levelUser);
 require _TPL_TOP_;
diff --git a/stats.php b/stats.php
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with image-heberg.fr. If not, see <http://www.gnu.org/licenses/>
  */
-require 'config/configV2.php';
+require 'config/config.php';
 require _TPL_TOP_;
 
 // Stats Images
diff --git a/template/js/js.php b/template/js/js.php
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with image-heberg.fr. If not, see <http://www.gnu.org/licenses/>
  */
-require '../../config/configV2.php';
+require '../../config/config.php';
 $visiteur = new sessionObject();
 // Utilisateur non connecté : Menu mon-compte caché + bouton pour l'afficher
 if ($visiteur->getLevel() === utilisateurObject::levelGuest) :
diff --git a/upload.php b/upload.php
@@ -18,7 +18,7 @@
  * along with image-heberg.fr. If not, see <http://www.gnu.org/licenses/>
  */
 if (!defined('_TRAVIS_')) {
-   require 'config/configV2.php';
+   require 'config/config.php';
 }
 require _TPL_TOP_;
 

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`		`-/config/configV2.php`
	`1`	`+/config/config.php`
`2`	`2`	`/nbproject/`