Changeset 2492:8a25f7bf147d for inc/core/class.dc.modules.php

Timestamp:

10/26/13 00:17:52 (12 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

File:

• inc/core/class.dc.modules.php (modified) (7 diffs)

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);