Merge pull request #33 from nebojsatomic/new-default-templates

New default responsive templates updated
nebojsatomic · Jun 28, 2024 · 0530ec7 · 0530ec7
2 parents 8f798b6 + 08f03d7
commit 0530ec7
Show file tree

Hide file tree

Showing 42 changed files with 1,124 additions and 1,325 deletions.
diff --git a/data/cms_ide/contacts.MYI b/data/cms_ide/contacts.MYI
diff --git a/data/cms_ide/menu_items.MYD b/data/cms_ide/menu_items.MYD
diff --git a/data/cms_ide/menu_items.MYI b/data/cms_ide/menu_items.MYI
diff --git a/data/cms_ide/mod_forms.MYD b/data/cms_ide/mod_forms.MYD
diff --git a/data/cms_ide/mod_forms.MYI b/data/cms_ide/mod_forms.MYI
diff --git a/data/cms_ide/mod_forms_fields.MYD b/data/cms_ide/mod_forms_fields.MYD
diff --git a/data/cms_ide/mod_forms_fields.MYI b/data/cms_ide/mod_forms_fields.MYI
diff --git a/data/cms_ide/pages_en.MYD b/data/cms_ide/pages_en.MYD
diff --git a/data/cms_ide/pages_en.MYI b/data/cms_ide/pages_en.MYI
diff --git a/data/cms_ide/pages_sr.MYD b/data/cms_ide/pages_sr.MYD
diff --git a/data/cms_ide/pages_sr.MYI b/data/cms_ide/pages_sr.MYI
diff --git a/data/cms_ide/templates_en.MYD b/data/cms_ide/templates_en.MYD
diff --git a/data/cms_ide/templates_en.MYI b/data/cms_ide/templates_en.MYI
diff --git a/data/cms_ide/templates_sr.MYD b/data/cms_ide/templates_sr.MYD
diff --git a/data/cms_ide/templates_sr.MYI b/data/cms_ide/templates_sr.MYI
diff --git a/data/cms_ide/users.MYD b/data/cms_ide/users.MYD
diff --git a/data/cms_ide/users.MYI b/data/cms_ide/users.MYI
diff --git a/src/app/Http/Middleware/VerifyCsrfToken.php b/src/app/Http/Middleware/VerifyCsrfToken.php
@@ -24,6 +24,7 @@ class VerifyCsrfToken extends Middleware
         'tables/*',
         'user/*',
         'search',
+        'forms',
         'public/*'
     ];
 }
diff --git a/src/composer.lock b/src/composer.lock
diff --git a/src/legacy/dev-application/controllers/CreatorController.php b/src/legacy/dev-application/controllers/CreatorController.php
@@ -1314,15 +1314,26 @@ private function _fillTable($table, $array)
     public function deleteLanguageAction()
     {
         $this->_checkAccess();
+
         if($this->_sesija->superadmin != "1") {
             echo $this->_translate->_("Only superadministrator can delete this!");
             return;
         }
         // turn off ViewRenderer
         $this->_helper->viewRenderer->setNoRender();
         $values = $this->_request->getParams();
+
         if ($values['id'] != "" ) {
-            $result = $this->_db->fetchAll("SELECT code, name FROM " . $this->_tblprefix . "languages WHERE id= ?", array($values['id']));
+            $result = $this->_db->fetchAll("SELECT code, name, isDefault FROM " . $this->_tblprefix . "languages WHERE id= ?", array($values['id']));
+
+            if($result[0]['isDefault'] === 1) { // nobody should be able to delete the default language
+                $jsonResponse = json_encode([
+                    "success" => false,
+                    "message" => $this->_translate->_("Default language cannot be deleted!")
+                ]);
+                echo $jsonResponse;
+                return;
+            }
 
             //Drop table
             $this->_db->query("DROP TABLE " . $this->_tblprefix . "pages_" . $result[0]['code']);
@@ -1342,8 +1353,12 @@ public function deleteLanguageAction()
             $this->_db->query("DELETE FROM " . $this->_tblprefix . "tableregistry  WHERE name = ?", array('pages_' . $result[0]['code']) );
             //clean cache
             $this->cleanCache();
-            echo $this->translate("The selected language has been deleted!");
-            echo '<script type="text/javascript">$("#langName option:contains(' . "'" . $langName . "'" . ')").remove();</script>';//js for removing the lng frm combo
+
+            $jsonResponse = json_encode([
+                "success" => true,
+                "message" => $this->_translate->_("The selected language has been deleted!")
+            ]);
+            echo $jsonResponse;
         } else {
             echo $this->translate("No Language specified!");
         }