Cache class rewritten to better convention

[mailer.git] / inc / modules / admin / admin-inc.php

diff --git a/inc/modules/admin/admin-inc.php b/inc/modules/admin/admin-inc.php
index 970dd69ff5ef87e460c4a93bc1f47ab8bf20ea4a..9c8a1810224cdf5f4222744371b83063dce32483 100644 (file)
--- a/inc/modules/admin/admin-inc.php
+++ b/inc/modules/admin/admin-inc.php
@@ -389,9 +389,9 @@ function ADD_ADMIN_MENU($act, $wht, $return=false) {
                $cacheName = "admin_".$act."_".$wht."_".GET_LANGUAGE()."_".strtolower(get_session('admin_login'));
 
                // Is that cache there?
                $cacheName = "admin_".$act."_".$wht."_".GET_LANGUAGE()."_".strtolower(get_session('admin_login'));
 
                // Is that cache there?

-               if ($cacheInstance->cache_file($cacheName)) {
+               if ($cacheInstance->loadCacheFile($cacheName)) {

                        // Then load it
                        // Then load it

-                       $data = $cacheInstance->cache_load();
+                       $data = $cacheInstance->getArrayFromCache();

 
                        // Extract all parts
                        $OUT = base64_decode($data['output'][0]);
 
                        // Extract all parts
                        $OUT = base64_decode($data['output'][0]);


@@ -540,7 +540,7 @@ function ADD_ADMIN_MENU($act, $wht, $return=false) {
        // Is there a cache instance again?
        if ((is_object($cacheInstance)) && (isset($_CONFIG['cache_admin_menu'])) && ($_CONFIG['cache_admin_menu'] == "Y")) {
                // Init cache
        // Is there a cache instance again?
        if ((is_object($cacheInstance)) && (isset($_CONFIG['cache_admin_menu'])) && ($_CONFIG['cache_admin_menu'] == "Y")) {
                // Init cache

-               $cacheInstance->cache_init($cacheName);
+               $cacheInstance->init($cacheName);

 
                // Prepare cache data
                $data = array(
 
                // Prepare cache data
                $data = array(


@@ -550,10 +550,10 @@ function ADD_ADMIN_MENU($act, $wht, $return=false) {
                );
 
                // Write the data away
                );
 
                // Write the data away

-               $cacheInstance->add_row($data);
+               $cacheInstance->addRow($data);

 
                // Close cache
 
                // Close cache

-               $cacheInstance->cache_close();
+               $cacheInstance->finalize();

        } // END - if
 
        // Return or output content?
        } // END - if
 
        // Return or output content?