Changeset 2492:8a25f7bf147d for inc/core/class.dc.themes.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.themes.php (modified) (3 diffs)

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 @@
      }
 }
-?>