improv. add function to get db type

MineWeb · Dec 6, 2021 · 7920748 · 7920748
1 parent a77ee83
commit 7920748
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/app/Controller/AppController.php b/app/Controller/AppController.php
@@ -555,9 +555,9 @@ public function __initSeoConfiguration()
         $get_page = [];
         $condition = ["'" . $current_url . "' LIKE CONCAT(page, '%')"];
 
-        $db_type = $this->Util->getDBType();
+        $use_sqlite = $this->Util->useSqlite();
 
-        if (strpos(strtolower($db_type), "sqlite"))
+        if ($use_sqlite)
             $condition = ["'" . $current_url . "' LIKE 'page' || '%' "];
         $check = $this->Seo->find('all', ['conditions' => $condition]);
 

diff --git a/app/Controller/Component/UtilComponent.php b/app/Controller/Component/UtilComponent.php
@@ -356,5 +356,11 @@ public function getDBType()
         return $this->db_type;
     }
 
+    public function useSqlite() {
+        if (strpos(strtolower($this->getDBType()), "sqlite"))
+            return true;
+        return false;
+    }
+
 
 }
diff --git a/app/Model/Maintenance.php b/app/Model/Maintenance.php
@@ -4,11 +4,11 @@ class Maintenance extends AppModel
 {
     function checkMaintenance($url, $utilComponent)
     {
-        $db_type = $utilComponent->getDBType();
+        $use_sqlite = $utilComponent->useSqlite();
 
         $condition = ["'" . $url . "' LIKE CONCAT(Maintenance.url, '%')", "active" => 1];
 
-        if (strpos(strtolower($db_type), "sqlite"))
+        if ($use_sqlite)
             $condition = ["'" . $url . "' LIKE 'Maintenance.url' || '%')", "active" => 1];
 
         $check = $this->find("first", ["conditions" => $condition]);