Misc code improvements

library/ajax/manage_admin.php

@@ -18,11 +18,7 @@ $mode = (string)$this->request['mode'];
 switch ($mode) {
     case 'clear_cache':
 
-        foreach ($bb_cfg['cache']['engines'] as $cache_name => $cache_val) {
+        clean_cache();
-            if (!in_array('db_sqlite', $cache_val)) {
-                CACHE($cache_name)->rm();
-            }
-        }
 
         $this->response['cache_html'] = '<span class="seed bold">' . $lang['ALL_CACHE_CLEARED'] . '</span>';
 
@@ -30,9 +26,7 @@ switch ($mode) {
 
     case 'clear_datastore':
 
-        global $datastore;
+        clean_datastore();
-
-        $datastore->clean();
 
         $this->response['datastore_html'] = '<span class="seed bold">' . $lang['DATASTORE_CLEARED'] . '</span>';
 
@@ -40,18 +34,7 @@ switch ($mode) {
 
     case 'clear_template_cache':
 
-        global $template;
+        clean_tpl_cache();
-
-        $match = 'tpl_';
-        $match_len = strlen($match);
-        $dir = $template->cachedir;
-        $res = @opendir($dir);
-        while (($file = readdir($res)) !== false) {
-            if (0 === strpos($file, $match)) {
-                @unlink($dir . $file);
-            }
-        }
-        closedir($res);
 
         $this->response['template_cache_html'] = '<span class="seed bold">' . $lang['ALL_TEMPLATE_CLEARED'] . '</span>';
 

library/includes/functions.php

@@ -11,6 +11,56 @@ if (!defined('BB_ROOT')) {
     die(basename(__FILE__));
 }
 
+/**
+ * Clean all template cache
+ *
+ * @return void
+ */
+function clean_tpl_cache(): void
+{
+    global $template;
+
+    $match = XS_TPL_PREFIX;
+    $dir = $template->cachedir;
+    $res = @opendir($dir);
+
+    while (($file = readdir($res)) !== false) {
+        if (0 === strpos($file, $match)) {
+            @unlink($dir . $file);
+        }
+    }
+
+    closedir($res);
+}
+
+/**
+ * Clean all datastore items
+ *
+ * @return void
+ */
+function clean_datastore(): void
+{
+    global $datastore;
+
+    $datastore->clean();
+}
+
+/**
+ * Clean all cache items
+ *
+ * @return void
+ */
+function clean_cache(): void
+{
+    global $bb_cfg;
+
+    foreach ($bb_cfg['cache']['engines'] as $cache_name => $cache_val) {
+        if (!in_array('db_sqlite', $cache_val)) {
+            CACHE($cache_name)->rm();
+        }
+    }
+}
+
 function get_path_from_id($id, $ext_id, $base_path, $first_div, $sec_div)
 {
     global $bb_cfg;