Changeset 464:e6b2db1d228a for inc

Timestamp:

07/01/11 09:20:53 (14 years ago)

Author:

Dsls <dsls@…>

Branch:

default

Message:

• New way of registering modules/themes, more extensible (backward compatible with previous method)
• small fix on attachments plugin template tags

Closes #1223.

Location:

inc/core

Files:

• class.dc.modules.php (modified) (2 diffs)
• class.dc.themes.php (modified) (1 diff)

inc/core/class.dc.modules.php

@@ -159 +159 @@
      @param    author         <b>string</b>       Module author name
      @param    version        <b>string</b>       Module version
-     @param    permissions    <b>string</b>       Module permissions
-     @param    priority       <b>integer</b>      Module priority
-     */
-     public function registerModule($name,$desc,$author,$version,$permissions=null,$priority=1000)
-     {
+     @param    properties     <b>array</b>        extra properties (currently available keys : permissions, priority)
+     */
+     public function registerModule($name,$desc,$author,$version, $properties = array())
+     {
+          if (!is_array($properties)) {
+               //Fallback to legacy registerModule parameters
+               $args = func_get_args();
+               $properties = array();
+               if (isset($args[4])) {
+                    $properties['permissions']=$args[4];
+               }
+               if (isset($args[5])) {
+                    $properties['priority']= (integer)$args[5];
+               }
+          }
+          $properties = array_merge(
+               array(
+                    'permissions' => null,
+                    'priority' => 1000
+               ), $properties
+          );
+          $permissions = $properties['permissions'];
           if ($this->ns == 'admin') {
                if ($permissions == '' && !$this->core->auth->isSuperAdmin()) {
@@ -177 +194 @@
                if (!$module_exists || ($module_exists && $module_overwrite)) {
                     $this->modules_names[$name] = $version;
-                    $this->modules[$this->id] = array(
-                         'root' => $this->mroot,
-                         'name' => $name,
-                         'desc' => $desc,
-                         'author' => $author,
-                         'version' => $version,
-                         'permissions' => $permissions,
-                         'priority' => $priority === null ? 1000 : (integer) $priority,
-                         'root_writable' => is_writable($this->mroot)
+                    $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)
+                         )
                     );
                }

inc/core/class.dc.themes.php

@@ -39 +39 @@
      @param    author         <b>string</b>       Module author name
      @param    version        <b>string</b>       Module version
-     @param    parent         <b>string</b>       Module parent
-     @param    priority       <b>integer</b>      Module priority
+     @param    properties     <b>array</b>        extra properties (currently available keys : parent, priority)
      */
-     public function registerModule($name,$desc,$author,$version,$parent = null,$priority = 1000)
+     public function registerModule($name,$desc,$author,$version,$properties = array())
      {
+          if (!is_array($properties)) {
+               //Fallback to legacy registerModule parameters
+               $args = func_get_args();
+               $properties = array();
+               if (isset($args[4])) {
+                    $properties['parent']=$args[4];
+               }
+               if (isset($args[5])) {
+                    $properties['priority']= (integer)$args[5];
+               }
+          }
+          $properties = array_merge(
+               array(
+                    'parent' => null,
+                    'priority' => 1000
+               ), $properties
+          );
           if ($this->id) {
-               $this->modules[$this->id] = array(
-               'root' => $this->mroot,
-               'name' => $name,
-               'desc' => $desc,
-               'author' => $author,
-               'version' => $version,
-               'parent' => $parent,
-               'priority' => 1000,
-               'root_writable' => is_writable($this->mroot)
+               $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)
+                    )
                );
           }