Changeset 9243

Timestamp:

08/13/08 22:27:02 (4 months ago)

Author:

afz

Message:

- compatible Jaws_Registry with Jaws_Component
- update all registry method with new changes

Files:

• trunk/jaws/html/include/Jaws/Registry.php (modified) (27 diffs)

trunk/jaws/html/include/Jaws/Registry.php

@@ -10 +10 @@
- * @license    http://www.gnu.org/copyleft/lesser.html
- */
-define('JAWS_REGISTRY_CORE',   0);
-define('JAWS_REGISTRY_GADGET', 1);
-define('JAWS_REGISTRY_PLUGIN', 2);
-
-class Jaws_Registry
-{
@@ -35 +31 @@
-
-    /**
-*registry* of files that have been called
+registry keys of loaded components
-     *
-     * @var    array
-     * @access private
-     */
-File
+Component
-
-    /**
@@ -50 +46 @@
-    {
-        $params = array();
-version
+enabled
-        $params['version'] = 'version';
-
@@ -56 +52 @@
-        $sql = "
-            SELECT
-
-
+
+
+
-            WHERE
-                [key_name] = {enabled}
@@ -69 +66 @@
-        }
-        $this->_Registry = $result;
-File('core'
+ComponentKeys('', JAWS_COMPONENT_CORE
-    }
-
@@ -78 +75 @@
-     * @param   string  $comp Component's name
-     * @param   string  $name The key
-     * @param   string  $type The type of the component, (core, plugin or a gadget)
-     * @return  string  The value of the key
-     */
-, $type = JAWS_REGISTRY_CORE
+
-    {
-        $params = array();
-        $params['comp_name'] = $comp;
-        $params['comp_type'] = $type;
-        $params['key_name']  = $name;
-
@@ -91 +86 @@
-            SELECT
-                [key_value]
-
+
+
-            WHERE
-
-
-
+
-              AND
-                [key_name]  = {key_name}";
@@ -104 +98 @@
-        }
-
+        //FIXME: maybe value really is empty
-        if (!empty($value)) {
-            // lets update the internal array just in case
-type][$
+
-            return $value;
-        }
@@ -119 +114 @@
-     * @param   string  $name The key
-     * @param   string  $comp Component's name
-     * @param   string  $type The type of the component, (core, plugin or a gadget)
-     * @return  bool    true when the key was found, else false
-     */
-, $type = JAWS_REGISTRY_CORE
-
-type][$
+
+
+
-    }
-
@@ -133 +127 @@
-     * @param   string  $name The key
-     * @param   string  $comp Component's name
-     * @param   string  $type The type of the component, (core, plugin or a gadget)
-     * @return  string  The value of the key
-     */
-, $type = JAWS_REGISTRY_CORE
-
-, $type) ? $this->_Registry[$type]
+
+
+) ? $this->_Registry
-    }
-
@@ -159 +152 @@
-        MDB2::loadFile('Date');
-        $params = array();
-
-
-
-
+
+
+
-
-        $sql = "
@@ -168 +160 @@
-                [key_value] = {now}
-            WHERE
-name] = {comp_name
+id] = {comp_id
-              AND
-
-
-
+
-
-        $result = $GLOBALS['db']->query($sql, $params);
@@ -179 +169 @@
-        }
-
-JAWS_REGISTRY_CORE][
+
-        return true;
-    }
@@ -190 +180 @@
-     * @param   string  $value The value
-     * @param   string  $comp  Component's name
-
-
-
-
-
+
+
+
+
-            return false;
-        }
@@ -200 +189 @@
-        $xss    = $GLOBALS['app']->loadClass('XSS', 'Jaws_XSS');
-        $params = array();
-
-
+
-        $params['key_name']  = $name;
-        $params['key_value'] = $xss->parse($value);
@@ -209 +197 @@
-                [key_value] = {key_value}
-            WHERE
-name] = {comp_name
+id] = {comp_id
-              AND
-
-
-
+
-
-        $result = $GLOBALS['db']->query($sql, $params);
@@ -220 +206 @@
-        }
-
-type][$
+
-        return $this->UpdateLastUpdate();
-    }
@@ -231 +217 @@
-     * @param   string  $value The value
-     * @param   string  $comp  Component's name
-
-
-
-
-
-
+
+
+
+
+
-        }
-
@@ -243 +228 @@
-
-        $params = array();
-
-
+
-        $params['key_name']  = $name;
-        $params['key_value'] = $xss->parse($value);
@@ -251 +235 @@
-        $sql = "
-            INSERT INTO [[registry]]
-name], [comp_type
+id
-            VALUES
-name}, {comp_type
+id
-
-        $result = $GLOBALS['db']->query($sql, $params);
@@ -260 +244 @@
-        }
-
-type][$
+
-        return $this->UpdateLastUpdate();
-    }
@@ -284 +268 @@
-        $xss = $GLOBALS['app']->loadClass('XSS', 'Jaws_XSS');
-        foreach ($reg_keys as $idx => $reg_key) {
-$this->KeyExists($reg_key[0], $reg_key[2], $reg_key[3
+!array_key_exists($reg_key[2], $this->_LoadedComponents) || $this->KeyExists($reg_key[0], $reg_key[2
-                unset($reg_keys[$idx]);
-            } else {
-reg_key[2
+this->_LoadedComponents[$reg_key[2]
-                $params["name_$idx"]  = $reg_key[0];
-                $params["value_$idx"] = $xss->parse($reg_key[1]);
-                $params["type_$idx"]  = $reg_key[3];
-                // Ugly hack to support all databases
-                switch ($GLOBALS['db']->_dsn['phptype']) {
-                    case 'oci8':
-                        $sqls .= (empty($sqls)? '' : "\n UNION ALL").
-type_$idx}, {
+
-                        break;
-                    case 'ibase':
-type_$idx}, {
+
-                        break;
-                    case 'pgsql':
-                        $sqls .= (empty($sqls)? "\n VALUES" : ",").
-type_$idx}, {
+
-                        break;
-                    default:
-                        $sqls .= (empty($sqls)? '' : "\n UNION ALL").
-type_$idx}, {
+
-                        break;
-                }
@@ -321 +304 @@
-        if (is_array($sqls)) {
-            foreach ($sqls as $sql) {
-name], [comp_type
+id
-                $result = $GLOBALS['db']->query($qsql, $params);
-                if (Jaws_Error::IsError($result)) {
@@ -328 +311 @@
-            }
-        } else {
-name], [comp_type
+id
-            $result = $GLOBALS['db']->query($qsql, $params);
-            if (Jaws_Error::IsError($result)) {
@@ -337 +320 @@
-        foreach ($reg_keys as $idx => $reg_key) {
-            if (empty($reg_keys[$idx])) continue;
-3]][$reg_key[
+
-        }
-
@@ -349 +332 @@
-     * @param   string  $name The key
-     * @param   string  $comp Component's name
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        $params = array();
-        $params['comp_name'] = $comp;
-        $params['comp_type'] = $type;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        return true;
-    }
-
-    /**
-     * Loads the keys of a component and optionally it returns the keys found in the file
-     *
-     * @access  public
-     * @param   string  $component Component's name
-     */
-    function LoadFile($component, $type = 'gadgets', $return = false)
-    {
-        $type = strtolower($type);
-        unset($this->_LoadedFiles['core']);
-        if ($component === '' || !in_array($type, array('gadgets', 'plugins')) || in_array($component, $this->_LoadedFiles)) {
-            return;
-        }
-        $add = $component !== 'core' ? $type . '/' : '';
-        $file = JAWS_DATA . 'cache/registry/' . $add . $component . '.php';
-        $exists = file_exists($file);
-        if ($exists) {
-            require $file;
-            $this->_LoadedFiles[$component] = $component;
-            // $registry comes from the file loaded
-            if (isset($registry) && is_array($registry)) {
-                foreach ($registry as $key => $value) {
-                    if (!$this->KeyExists($key)) {
-                        $this->_Registry[$key] = stripslashes($value);
-                    }
-                }
-
-                if ($return) {
-                    return $registry;
-                }
-            }
-
-            return true;
-        } else {
-            // Cache file doesn't exist, lets generate it
-            $res = $this->_regenerateInternalRegistry($component, $type);
-            if (!$res) {
-                return;
-            }
-            $this->commit($component, $type);
-            return $this->loadFile($component, $type, $return);
-        }
-    }
-
-    /**
-     * Regenerates/updates the internal registry array ($this->_Registry)
-     *
-     * @access  protected
-     * @param   string     $component  Component name
-     * @param   string     $type       Type of component (gadget or plugin)
-     * @return  boolean    Success/Failure
-     */
-    function _regenerateInternalRegistry($component, $type = 'gadgets')
-    {
-        $type = strtolower($type);
-        if (!in_array($type, array('gadgets', 'plugins'))) {
-            return false;
-        }
-
-        if ($component == 'core') {
-            // Big ass query since the core isn't under one namespace
-            $sql = "
-                SELECT [component], [key_name], [key_value]
-                FROM [[registry]]
-                WHERE
-                    [key_name] LIKE '/config/%'
-                   OR
-                    [key_name] LIKE '/map/%'
-                   OR
-                    [key_name] LIKE '/network/%'
-                   OR
-                    [key_name] LIKE '/policy/%'
-                   OR
-                    [key_name] LIKE '/crypt/%'
-                   OR
-                    [key_name] IN('/version', '/last_updated', '/plugins/parse_text/enabled_items',
-                                  '/gadgets/enabled_items', '/gadgets/allowurl_items',
-                                  '/gadgets/autoload_items', '/gadgets/core_items')
-                ";
-        } else {
-            if ($type == 'gadgets') {
-                $sql = "SELECT [component], [key_name], [key_value] FROM [[registry]] WHERE [key_name] LIKE '/gadgets/".$component."/%'";
-            } else {
-                $sql = "
-                    SELECT [component], [key_name], [key_value] FROM [[registry]]
-                    WHERE [key_name] LIKE '/plugins/".$component."/%' OR [key_name] LIKE '/plugins/parse_text/".$component."/%'";
-            }
-        }
-
-        $result = $GLOBALS['db']->queryAll($sql, array(), null, null, true);
-        if (Jaws_Error::isError($result)) {
-            return false;
-        }
-
-        $this->_Registry = $result + $this->_Registry;
-        return true;
-    }
-
-    /**
-     * Loads all the component files
-     *
-     * @access  public
-     */
-    function LoadAllFiles()
-    {
-        ///FIXME check for errors
-        $gs = explode(',', $this->get('/gadgets/enabled_items'));
-        $ci = explode(',', $this->get('/gadgets/core_items'));
-        $ps = explode(',', $this->get('/plugins/parse_text/enabled_items'));
-
-        $ci = str_replace(' ', '', $ci);
-        $ps = str_replace(' ', '', $ps);
-
-        // load the core
-        $this->LoadFile('core');
-
-        foreach ($gs as $gadget) {
-            $this->LoadFile($gadget);
-        }
-
-        foreach ($ci as $gadget) {
-            $this->LoadFile($gadget);
-        }
-
-        foreach ($ps as $plugin) {
-            $this->LoadFile($plugin, 'plugins');
-        }
-    }
-
-    /**
-     * Deletes the cache file of a certain component
-     *
-     * @acess   public
-     * @access  protected
-     * @param   string     $name       Component name
-     * @param   string     $type       Type of component (gadget or plugin)
-     * @return  boolean    Success/Failure
-     */
-    function deleteCacheFile($name, $type = 'gadgets')
-    {
-        $type = strtolower($type);
-        if (empty($name) || !in_array($type, array('gadgets', 'plugins'))) {
-            return false;
-        }
-
-        $add = $name !== 'core' ? $type . '/' : '';
-
-        $file = JAWS_DATA . 'cache/registry/' . $add . $name . '.php';
-        if (file_exists($file)) {
-            unlink($file);
-            return true;
-        }
-        return false;
-    }
-
-    /**
-     * Resets/Cleans the registry
-     *
@@ -614 +440 @@
-    {
-        $this->_Registry    = array();
-File
+Component
-    }
-