completed: prefix for table, for multiple installation on a single da…

…tabase | minor code fix | upgrade to version 6.8
damares86 · Dec 19, 2022 · 2df021f · 2df021f
1 parent 7e82551
commit 2df021f
Show file tree

Hide file tree

Showing 34 changed files with 154 additions and 216 deletions.
diff --git a/admin/assets/css/bootstrap.min.css b/admin/assets/css/bootstrap.min.css
diff --git a/assets/damares/js/bootstrap.min.js → admin/assets/js/bootstrap.min.js b/assets/damares/js/bootstrap.min.js → admin/assets/js/bootstrap.min.js
diff --git a/admin/class/Database.php b/admin/class/Database.php
diff --git a/admin/class/File.php b/admin/class/File.php
@@ -122,7 +122,7 @@ function showAll($from_record_num, $records_per_page,$where){
         $query = "SELECT
         *
     FROM
-        " . $this->table_name . " ".$where."
+        " .$this->prx. $this->table_name . " ".$where."
     ORDER BY
         id 
         LIMIT
@@ -136,7 +136,7 @@ function showAll($from_record_num, $records_per_page,$where){
 
     public function countAll(){
 
-        $query = "SELECT id FROM files";
+        $query = "SELECT id FROM " .$this->prx."files";
 
         $stmt = $this->conn->prepare( $query );
         $stmt->execute();
@@ -148,7 +148,7 @@ public function countAll(){
 
     public function countFetch($where){
 
-        $query = "SELECT id FROM files".$where."";
+        $query = "SELECT id FROM " .$this->prx."files".$where."";
 
         $stmt = $this->conn->prepare( $query );
         $stmt->execute();
@@ -302,21 +302,6 @@ function showById(){
 
     }
 
-    // function rolename_id(){
-    //     //select all data
-    //     $query = "SELECT
-    //                 id, rolename
-    //             FROM
-    //                 " . $this->table_name . "
-    //             WHERE
-    //                 rolename = :rolename";  
-
-    //     $stmt = $this->conn->prepare( $query );
-    //     $stmt->execute();
-
-    //     return $stmt;
-    // }
-
 
 
 }

diff --git a/admin/class/Page.php b/admin/class/Page.php
@@ -173,7 +173,7 @@ function initCheckSessVar(){
                 if($_FILES['info'.$i_real.'']['name']){
                     $this->img_info=$_FILES['info'.$i_real.'']['name'];
                     $this->img_tmp_info=$_FILES['info'.$i_real.'']['tmp_name'];
-                    $this->uploadPicture();
+                    $this->uploadInfo();
                     $_SESSION['sess_pict_info_'.$i_real.'']=$_FILES['info'.$i_real.'']['name'];
                 }else{
                     $_SESSION['sess_pict_info_'.$i_real.'']=$_POST['old_info_'.$i_real.''];
@@ -279,11 +279,11 @@ function destroyCheckSessVar(){
 
 
     function insert(){
-    // if($this->type=="default"){
-    //     $this->table="default_page";
-    // }else if($this->type=="custom"){
-    //     $this->table="page";
-    // }
+    if($this->type=="default"){
+        $this->table="default_page";
+    }else if($this->type=="custom"){
+        $this->table="page";
+    }
 
     // insert query
     $query = "INSERT INTO
@@ -410,13 +410,14 @@ function update(){
                     $stmt->bindParam(':use_desc', $this->use_desc);      
                     $stmt->bindParam(':id', $this->id);   
 
-                    if($stmt->execute()){  
+                    if($stmt->execute()){ 
                         $query1="SELECT * FROM ".$this->prx.$this->table." WHERE page_name = :page_name LIMIT 0,1";
                         $stmt1 = $this->conn->prepare($query1);
                         $stmt1->bindParam(':page_name', $this->page_name);       
                         $stmt1->execute();
                         $row1 = $stmt1->fetch(PDO::FETCH_ASSOC);
                         $actualImage=$row1['img'];
+
                         if($this->header!=0){
                             if(($this->img)==$actualImage){
                                 return true;

diff --git a/admin/class/User.php b/admin/class/User.php
@@ -186,11 +186,10 @@ function showAll($from_record_num, $records_per_page, $where){
     function showById(){
         $query = "SELECT *
         FROM " .$this->prx. $this->table_name . "
-        WHERE id = ?
+        WHERE id = :id
         LIMIT 0,1";
-
         $stmt = $this->conn->prepare( $query );
-        $stmt->bindParam(1, $this->id);
+        $stmt->bindParam(":id", $this->id);
         $stmt->execute();
 
         $row = $stmt->fetch(PDO::FETCH_ASSOC);

diff --git a/admin/core/fetchFile.php b/admin/core/fetchFile.php
@@ -16,15 +16,17 @@
 }
 
 // loading class
-include("../class/Database.php");
-include("../class/File.php");
-include("../class/Settings.php");
+spl_autoload_register('autoloader');
+    function autoloader($class){
+        include("../class/$class.php");
+    }
+
 
 $database = new Database();
 $db = $database->getConnection();
 
-$file = new File($db);
-$settings = new Settings($db);
+include "../inc/class_initialize.php";
+
 
 $stmt=$settings->showLangAndName();
 $lang=$settings->dashboard_language;

diff --git a/admin/core/fetchPage.php b/admin/core/fetchPage.php
@@ -17,7 +17,7 @@
 
 spl_autoload_register('autoloader');
     function autoloader($class){
-        include("admin/class/$class.php");
+        include("../class/$class.php");
     }
 
 

diff --git a/admin/core/fetchUser.php b/admin/core/fetchUser.php
@@ -15,16 +15,17 @@
     exit;
 }
 
-// loading class
-include("../class/Database.php");
-include("../class/User.php");
-include("../class/Settings.php");
+spl_autoload_register('autoloader');
+    function autoloader($class){
+        include("../class/$class.php");
+    }
+
 
 $database = new Database();
 $db = $database->getConnection();
 
-$user = new User($db);
-$settings = new Settings($db);
+include "../inc/class_initialize.php";
+
 
 $stmt=$settings->showLangAndName();
 $lang=$settings->dashboard_language;
@@ -86,7 +87,7 @@
                 <td>'.$last_login.'</td>
                 <td>
 
-                <a href="index.php?man=user&op=edit&idToMod='.$row['id'].'" class="btn btn-warning btn-icon-split">
+                <a href="index.php?man=users&op=edit&idToMod='.$row['id'].'" class="btn btn-warning btn-icon-split">
                             <span class="icon text-white-50">
                                 <i class="fas fa-pen"></i>
                             </span>

diff --git a/admin/core/mngColor.php b/admin/core/mngColor.php
@@ -15,15 +15,16 @@
     exit;
 }
 
-	// loading class
-	include("../class/Database.php");
-	include("../class/Colors.php");
+spl_autoload_register('autoloader');
+    function autoloader($class){
+        include("../class/$class.php");
+    }
 
 
-	$database = new Database();
-	$db = $database->getConnection();
+$database = new Database();
+$db = $database->getConnection();
 
-	$colors = new Colors($db);
+include "../inc/class_initialize.php";
 
 if(filter_input(INPUT_GET,"idToDel")){
 

diff --git a/admin/core/mngFile.php b/admin/core/mngFile.php
@@ -16,14 +16,17 @@
 }
 
 	// loading class
-	include("../class/Database.php");
-	include("../class/File.php");
+	spl_autoload_register('autoloader');
+    function autoloader($class){
+        include("../class/$class.php");
+    }
 
 
-	$database = new Database();
-	$db = $database->getConnection();
+$database = new Database();
+$db = $database->getConnection();
+
+include "../inc/class_initialize.php";
 
-	$file = new File($db);
 
 if(filter_input(INPUT_GET,"idToDel")){
 

diff --git a/admin/core/mngGallery.php b/admin/core/mngGallery.php
@@ -16,14 +16,16 @@
 }
 
 	// loading class
-	include("../class/Database.php");
-	include("../class/File.php");
+	spl_autoload_register('autoloader');
+    function autoloader($class){
+        include("../class/$class.php");
+    }
 
 
-	$database = new Database();
-	$db = $database->getConnection();
+$database = new Database();
+$db = $database->getConnection();
 
-	$file = new File($db);
+include "../inc/class_initialize.php";
 
 if(filter_input(INPUT_GET,"gallToDel")){
 	function removeFolder($folderName) {

diff --git a/admin/core/mngMail.php b/admin/core/mngMail.php
@@ -9,22 +9,19 @@
 
 
 session_start();
-// if (!isset($_SESSION['loggedin'])) {
-// 	header('Location: ../');
-//     exit;
-// }
 
 // loading class
-	include("../class/Database.php");
-	include("../class/Contact.php");
-	include("../class/Verify.php");
+spl_autoload_register('autoloader');
+    function autoloader($class){
+        include("../class/$class.php");
+    }
+
+
+$database = new Database();
+$db = $database->getConnection();
+
+include "../inc/class_initialize.php";
 
-
-	$database = new Database();
-	$db = $database->getConnection();
-
-	$contact = new Contact($db);
-	$verify = new Verify($db);
 
 
 	if(!$_POST['name']||!$_POST['email']||!$_POST['message']||!$_POST['subject']){

diff --git a/admin/core/mngMailRecap.php b/admin/core/mngMailRecap.php
@@ -15,16 +15,17 @@
 // }
 
 // loading class
-	include("../class/Database.php");
-	include("../class/Contact.php");
-	include("../class/Verify.php");
+spl_autoload_register('autoloader');
+    function autoloader($class){
+        include("../class/$class.php");
+    }
+
+
+$database = new Database();
+$db = $database->getConnection();
+
+include "../inc/class_initialize.php";
 
-
-	$database = new Database();
-	$db = $database->getConnection();
-
-	$contact = new Contact($db);
-	$verify = new Verify($db);
 
 
 	if ($_SERVER['REQUEST_METHOD'] === 'POST' && isset($_POST['recaptcha_response'])) {

diff --git a/admin/core/mngPage.php b/admin/core/mngPage.php
@@ -16,16 +16,17 @@
 }
 
 	// loading class
-	include("../class/Database.php");
-	include("../class/Page.php");
-	include("../class/Menu.php");
+	spl_autoload_register('autoloader');
+    function autoloader($class){
+        include("../class/$class.php");
+    }
 
 
-	$database = new Database();
-	$db = $database->getConnection();
+$database = new Database();
+$db = $database->getConnection();
+
+include "../inc/class_initialize.php";
 
-	$page = new Page($db);
-	$menu = new Menu($db);
 
 	if(filter_input(INPUT_GET,"idToDel")){
 
@@ -180,12 +181,15 @@
 			$page->header=0;
 		}
 
+
 		if($_POST['visual'][0]=="visual_img"){
 			$page->visual_img=1;
 			if($_FILES['myfile']['name']){
+				print_r("file caricato: err");
+				exit;
 				$page->img=$_FILES['myfile']['name'];
 			}else{
-				$query1="SELECT * FROM default_page WHERE page_name = :page_name LIMIT 0,1";
+				$query1="SELECT * FROM ".$page->prx."default_page WHERE page_name = :page_name LIMIT 0,1";
 				$stmt1 = $db->prepare($query1);
 				$stmt1->bindParam(':page_name', $page->page_name);       
 				$stmt1->execute();

diff --git a/admin/core/mngPass.php b/admin/core/mngPass.php
@@ -9,24 +9,22 @@
 
 
 session_start();
-// if (!isset($_SESSION['loggedin'])) {
-// 	header('Location: ../');
-//     exit;
-// }
+
+$lang=$_POST['lang'];
+require "../locale/$lang.php";
 
 // loading class
-	include("../class/Database.php");
-	include("../class/User.php");
-	include("../class/Contact.php");
+	spl_autoload_register('autoloader');
+    function autoloader($class){
+        include("../class/$class.php");
+    }
+
+
+$database = new Database();
+$db = $database->getConnection();
+
+include "../inc/class_initialize.php";
 
-	$lang=$_POST['lang'];
-	require "../locale/$lang.php";
-
-	$database = new Database();
-	$db = $database->getConnection();
-
-	$user = new User($db);
-	$contact = new Contact($db);
 
 	$resetForm = filter_input(INPUT_POST, "resetForm");
 	$resetMail = filter_input(INPUT_POST, "resetMail");