Merge pull request #79 from damares86/dev

Dev
damares86 · Nov 16, 2022 · 5471fe5 · 5471fe5
2 parents b53ca09 + c8dd84f
commit 5471fe5
Show file tree

Hide file tree

Showing 6 changed files with 61 additions and 6 deletions.
diff --git a/admin/inc/func/allSettings.php b/admin/inc/func/allSettings.php
@@ -341,6 +341,43 @@
 </div>
 
 
+    <!-- Project Card Example -->
+    <div class="card shadow mb-4">
+        <div class="card-header py-3">
+            <h6 class="m-0 font-weight-bold text-primary"><?=$site_box_4_title?></h6>
+        </div>
+        <div class="card-body">
+            <div class="row">
+                <div class="col">
+                    <br>
+                    <?php
+                    $checked="";
+
+                    if($dm==0){
+                        $checked="checked";
+                    }
+
+                    ?>
+                <form class="form-horizontal row-fluid" action="core/mngSettings.php" method="POST" enctype="multipart/form-data">
+
+                    <input type="hidden" name="id" value="1" />
+                    <input type="checkbox" name="dm" value="1" <?=$checked?>> <?=$site_maintenance_active?><br><br>
+                    <div class="control-group">
+                        <div class="controls">
+
+                            <input type="submit" class="btn btn-primary" name="subRegCheck" value="Invia">
+                        </div>
+                    </div>
+                </form>
+                </div>
+                <div class="col rounded guide mx-3">
+                    <?=$site_box_4_desc?>
+                </div>
+            </div>
+    </div>
+
+        </div>
+
 <?php
 }else if($man=="menu"){
 ?>

diff --git a/admin/inc/func/check.php b/admin/inc/func/check.php
@@ -5,16 +5,26 @@
 require "admin/core/site.php";
 
 
-if($dm==0){
+if(($dm==0)&&(!isset($_SESSION['loggedin']))&&($file!="login.php")){
     ?>
 </head>
 
 <body>
     <div id="siteContainer">
-        <div id="bottomContainer" class="mt-5 p-5">  
+        <div id="bottomContainer" class="mt-5 p-5"> 
+            <div class="text-center">
+                <img src="admin/assets/img/logo.svg" style="width:15%; margin-bottom:3em;">
+            </div>
             <h1 style="text-align:center; font-size:3em;">Site under maintenance</h1>
             <br><br>
             <h1 style="text-align:center; font-size:3em;">Sito in manutenzione</h1>
+            <div class="text-center my-5">
+                <p class="font-weight-bold">Made with Mini Cms <?=$mc_version?> - a project by &nbsp; &nbsp; 
+                    <a href="https://www.dmweblab.com">
+                        <img src="admin/assets/img/dmweblab_logo.png" style="vertical-align:middle;">
+                    </a>
+                </p>
+            </div>
         </div>
     </div>
 </body>
@@ -25,6 +35,7 @@
     exit;
 }
 
+
 if(!in_array($_SERVER['SERVER_NAME'],$site)){
     ?>
     </head>

diff --git a/admin/inc/version.php b/admin/inc/version.php
@@ -1,3 +1,3 @@
 <?php
-    $mc_version="6.2";
+    $mc_version="6.3";
 ?>
diff --git a/admin/locale/en/site_en.php b/admin/locale/en/site_en.php
@@ -240,6 +240,9 @@
 $site_box3_desc .= "<a href=\"https://www.google.com/recaptcha/admin\" target=\"_blank\">this page</a>, then you can select the \"Use Recaptcha\" checkbox";
 $site_box3_desc .= "and paste the two keys given by Google.<br><br> Discover more about ";
 $site_box3_desc .= "<a href=\"https://developers.google.com/search/blog/2018/10/introducing-recaptcha-v3-new-way-to\" target=\"_blank\">Google reCAPTCHA v3</a>";
+$site_box_4_title="Maintenance Mode";
+$site_box_4_desc="Activate the \"Maintenance Mode\" (only logged users will see the pages)";
+$site_maintenance_active="Activate";
 
 
 // MENU SETTINGS

diff --git a/admin/locale/it/site_it.php b/admin/locale/it/site_it.php
@@ -233,7 +233,9 @@
 $site_box3_desc .= "<a href=\"https://www.google.com/recaptcha/admin\" target=\"_blank\">in questa pagina</a>, quindi potrai selezionare la checkbox \"Usa reCAPTCHA v3\" ";
 $site_box3_desc .= "e incollare le 2 chiavi  fornite da Google.<br><br> Scopri di più su ";
 $site_box3_desc .= "<a href=\"https://developers.google.com/search/blog/2018/10/introducing-recaptcha-v3-new-way-to\" target=\"_blank\">Google reCAPTCHA v3</a>";
-
+$site_box_4_title="Modalità Manutenzione";
+$site_box_4_desc="Attiva la \"Modalità manutenzione\" (solo gli utenti loggati potranno vedere le pagine)";
+$site_maintenance_active="Attiva";
 
 // MENU SETTINGS
 

diff --git a/admin/template/inc/header.php b/admin/template/inc/header.php
@@ -187,9 +187,9 @@ function autoloader($class){
 <script src="assets/<?=$theme?>/js/bootstrap.min.js"></script>
 
 <?php
-foreach (glob("admin/template/inc/css/*.css") as $file){
+foreach (glob("admin/template/inc/css/*.css") as $cssfile){
     ?>
-    <link href='<?=$file?>' rel='stylesheet' type='text/css'>
+    <link href='<?=$cssfile?>' rel='stylesheet' type='text/css'>
 <?php
 }
 
@@ -206,6 +206,7 @@ function autoloader($class){
 	<body>
 
     <?php
+    if(is_file("admin/class/Popup.php")){
     $popup->page_popup=$name;
     $popup->id_popup=0;
     $popup_exist=$popup->showPopupByPage();
@@ -234,6 +235,7 @@ function autoloader($class){
 
     <?php
 }
+    }
 
     ?>
             <script type='text/javascript'>