Changeset 2492:8a25f7bf147d

Timestamp:

10/26/13 00:17:52 (10 years ago)

Author:

Denis Jean-Chirstian <contact@…>

Branch:

2.6

Message:

New class dcPlugins, fix backward compatibility with generic dcModules class and un-type modules

Location:

inc

Files:

• core/class.dc.core.php (modified) (1 diff)
• core/class.dc.modules.php (modified) (7 diffs)
• core/class.dc.plugins.php (added)
• core/class.dc.themes.php (modified) (3 diffs)
• prepend.php (modified) (1 diff)

inc/core/class.dc.core.php

@@ -87 +87 @@
           $this->url = new dcUrlHandlers();
           
-          $this->plugins = new dcModules($this);
+          $this->plugins = new dcPlugins($this);
           
           $this->rest = new dcRestServer($this);

inc/core/class.dc.modules.php

@@ -16 +16 @@
 @brief Modules handler
 
-Provides an object to handle modules (themes or plugins). An instance of this
-class is provided by dcCore $plugins property and used for plugins.
+Provides an object to handle modules (themes or plugins). 
 */
 class dcModules
@@ -36 +35 @@
      protected static $_n;
 
-     protected static $type = 'plugin';
+     protected static $type = null;
      
      public $core;  ///< <b>dcCore</b>  dcCore instance
@@ -161 +160 @@
      @param    author         <b>string</b>       Module author name
      @param    version        <b>string</b>       Module version
-     @param    properties     <b>array</b>        extra properties (currently available keys : permissions, priority)
+     @param    properties     <b>array</b>        extra properties 
+     (currently available keys : permissions, priority, type)
      */
      public function registerModule($name,$desc,$author,$version, $properties = array())
      {
+          # Fallback to legacy registerModule parameters
           if (!is_array($properties)) {
-               //Fallback to legacy registerModule parameters
                $args = func_get_args();
                $properties = array();
@@ -176 +176 @@
                }
           }
+
+          # Default module properties
           $properties = array_merge(
                array(
@@ -185 +187 @@
           );
 
-          if ($properties['type'] !== null && $properties['type'] != self::$type) {
+          # Check module type
+          if (self::$type !== null && $properties['type'] !== null && $properties['type'] != self::$type) {
                $this->errors[] = sprintf(
                     __('Module "%s" has type "%s" that mismatch required module type "%s".'),
@@ -195 +198 @@
           }
 
+          # Check module perms on admin side
           $permissions = $properties['permissions'];
           if ($this->ns == 'admin') {
@@ -204 +208 @@
           }
           
+          # Check module install on multiple path
           if ($this->id) {
                $module_exists = array_key_exists($name,$this->modules_names);

inc/core/class.dc.themes.php

@@ -41 +41 @@
      @param    author         <b>string</b>       Module author name
      @param    version        <b>string</b>       Module version
-     @param    properties     <b>array</b>        extra properties (currently available keys : parent, priority, standalone_config)
+     @param    properties     <b>array</b>        extra properties 
+     (currently available keys : parent, priority, standalone_config, type)
      */
      public function registerModule($name,$desc,$author,$version,$properties = array())
      {
+          # Fallback to legacy registerModule parameters
           if (!is_array($properties)) {
-               //Fallback to legacy registerModule parameters
                $args = func_get_args();
                $properties = array();
@@ -56 +57 @@
                }
           }
+          # Themes specifics properties
           $properties = array_merge(
-               array(
-                    'parent' => null,
-                    'priority' => 1000,
-                    'standalone_config' => false,
-                    'type' => null
-               ), $properties
+               array('parent' => null),
+               $properties,
+               array('permissions' => 'admin') // force themes perms
           );
 
-          if ($properties['type'] !== null && $properties['type'] != self::$type) {
-               $this->errors[] = sprintf(
-                    __('Module "%s" has type "%s" that mismatch required module type "%s".'),
-                    '<strong>'.html::escapeHTML($name).'</strong>',
-                    '<em>'.html::escapeHTML($properties['type']).'</em>',
-                    '<em>'.html::escapeHTML(self::$type).'</em>'
-               );
-               return;
-          }
-
-          if ($this->id) {
-               $this->modules[$this->id] = array_merge(
-                    $properties,
-                    array(
-                         'root' => $this->mroot,
-                         'name' => $name,
-                         'desc' => $desc,
-                         'author' => $author,
-                         'version' => $version,
-                         'root_writable' => is_writable($this->mroot)
-                    )
-               );
-          }
+          parent::registerModule($name, $desc, $author, $version, $properties);
      }    
      
@@ -114 +91 @@
      }
 }
-?>

inc/prepend.php

@@ -35 +35 @@
 $__autoload['dcPostMedia']                   = dirname(__FILE__).'/core/class.dc.postmedia.php';
 $__autoload['dcModules']                = dirname(__FILE__).'/core/class.dc.modules.php';
+$__autoload['dcPlugins']                = dirname(__FILE__).'/core/class.dc.plugins.php';
 $__autoload['dcThemes']                 = dirname(__FILE__).'/core/class.dc.themes.php';
 $__autoload['dcRestServer']             = dirname(__FILE__).'/core/class.dc.rest.php';