Changeset 2239:cd7100fa57db

Timestamp:

10/04/13 00:53:07 (12 years ago)

Author:

Denis Jean-Chirstian <contact@…>

Branch:

default

Children:

2240:2553775ae2fe, 2242:f31162da2395

Message:

Prevent install theme as plugin and vice versa by adding property "type" to modules definition, fixes #1713

Files:

• admin/index.php (modified) (1 diff)
• inc/core/class.dc.modules.php (modified) (5 diffs)
• inc/core/class.dc.themes.php (modified) (2 diffs)

admin/index.php

@@ -258 +258 @@
 if ($core->auth->isSuperAdmin())
 {
-     $list = array();
-     foreach ($core->plugins->getErrors() as $k => $error) {
-          $list[] = '<li>'.$error.'</li>';
-     }
-     
-     if (count($list) > 0) {
+     $list = $core->plugins->getErrors();
+     if (!empty($list)) {
           echo 
-          '<div class="error" id="module-errors" class="error"><p>'.__('Some plugins are installed twice:').'</p> '.
-          '<ul>'.implode("\n",$list).'</ul></div>';
+          '<div class="error" id="module-errors" class="error"><p>'.__('Errors have occured with following plugins:').'</p> '.
+          '<ul><li>'.implode("</li>\n<li>", $list).'</li></ul></div>';
      }
 }

inc/core/class.dc.modules.php

@@ -35 +35 @@
      protected static $_k;
      protected static $_n;
+
+     protected static $type = 'plugin';
      
      public $core;  ///< <b>dcCore</b>  dcCore instance
@@ -177 +179 @@
                array(
                     'permissions' => null,
-                    'priority' => 1000
+                    'priority' => 1000,
+                    'standalone_config' => false,
+                    'type' => null
                ), $properties
           );
+
+          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;
+          }
+
           $permissions = $properties['permissions'];
           if ($this->ns == 'admin') {
@@ -210 +225 @@
                     $path2 = path::real($this->mroot);
                     $this->errors[] = sprintf(
-                         __('%s: in [%s] and [%s]'),
+                         __('Module "%s" is installed twice in "%s" and "%s".'),
                          '<strong>'.$name.'</strong>',
                          '<em>'.$path1.'</em>',
@@ -223 +238 @@
           $this->modules = array();
           $this->modules_names = array();
+          $this->errors = array();
      }    
      
@@ -258 +274 @@
           $ret_code = 1;
           
-          if (is_dir($destination))
+          if (!is_dir($destination))
+          {
+               try {
+                    files::makeDir($destination,true);
+                    
+                    $sandbox = clone $modules;
+                    $zip->unzip($define, $target.'/_define.php');
+                    
+                    $sandbox->resetModulesList();
+                    $sandbox->requireDefine($target,basename($destination));
+                    unlink($target.'/_define.php');
+                    
+                    $new_errors = $sandbox->getErrors();
+                    if (!empty($new_errors)) {
+                         $new_errors = is_array($new_errors) ? implode(" \n",$new_errors) : $new_errors;
+                         throw new Exception($new_errors);
+                    }
+                    
+                    files::deltree($destination);
+               }
+               catch(Exception $e)
+               {
+                    $zip->close();
+                    unlink($zip_file);
+                    files::deltree($destination);
+                    throw new Exception($e->getMessage());       
+               }
+          }
+          else
           {
                # test for update

inc/core/class.dc.themes.php

@@ -23 +23 @@
 class dcThemes extends dcModules
 {    
+     protected static $type = 'theme';
+
      /**
      This method registers a theme in modules list. You should use this to
@@ -58 +60 @@
                     'parent' => null,
                     'priority' => 1000,
-                    'standalone_config' => false
+                    'standalone_config' => false,
+                    'type' => null
                ), $properties
           );
+
+          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(