Changeset 2192:511c654d4adb for inc/admin

Timestamp:

10/01/13 21:54:38 (12 years ago)

Author:

Denis Jean-Chirstian <contact@…>

Branch:

dcRepo

Message:

Next step for themes manager, to be continued

File:

• inc/admin/lib.moduleslist.php (modified) (13 diffs)

inc/admin/lib.moduleslist.php

@@ -442 +442 @@
           '</table></div>';
 
-          if(!$count) {
+          if(!$count && $this->getSearchQuery() === null) {
                echo 
                '<p class="message">'.__('No module matches your search.').'</p>';
@@ -451 +451 @@
      {
           $submits = array();
+
+          # Update (from repository)
+          if (in_array('update', $actions) && $this->path_writable) {
+               $submits[] = '<input type="submit" name="update" value="'.__('Update').'" />';
+          }
+
+          # Install (form repository)
+          if (in_array('install', $actions) && $this->path_writable) {
+               $submits[] = '<input type="submit" name="install" value="'.__('Install').'" />';
+          }
+          
+          $tmp = $this->displayOtherLineAction($id, $module, $actions);
+          if (!empty($tmp) && is_array($tmp)) {
+               $submits = array_merge($submits, $tmp);
+          }
 
           # Activate
@@ -465 +480 @@
           if (in_array('delete', $actions) && $this->isPathDeletable($module['root'])) {
                $submits[] = '<input type="submit" class="delete" name="delete" value="'.__('Delete').'" />';
-          }
-
-          # Install (form repository)
-          if (in_array('install', $actions) && $this->path_writable) {
-               $submits[] = '<input type="submit" name="install" value="'.__('Install').'" />';
-          }
-
-          # Update (from repository)
-          if (in_array('update', $actions) && $this->path_writable) {
-               $submits[] = '<input type="submit" name="update" value="'.__('Update').'" />';
-          }
-
-          # Select (from repository)
-          if (in_array('choose', $actions) && $this->path_writable) {
-               $submits[] = '<input type="submit" name="choose" value="'.__('Choose').'" />';
           }
 
@@ -501 +501 @@
      }
 
+     protected function displayOtherLineAction($id, $module, $actions)
+     {
+          return null;
+     }
+
      public function executeAction($prefix, dcModules $modules, dcRepository $repository)
      {
@@ -520 +525 @@
 
                     # --BEHAVIOR-- moduleBeforeActivate
-                    $this->core->callBehavior($type.'BeforeActivate', $id);
+                    $this->core->callBehavior($prefix.'BeforeActivate', $id);
 
                     $modules->activateModule($id);
 
                     # --BEHAVIOR-- moduleAfterActivate
-                    $this->core->callBehavior($type.'AfterActivate', $id);
+                    $this->core->callBehavior($prefix.'AfterActivate', $id);
 
                     http::redirect($this->getPageURL('msg=activate'));
                }
 
-               if (!empty($_POST['deactivate'])) {
+               elseif (!empty($_POST['deactivate'])) {
 
                     if (!$modules->moduleExists($id)) {
@@ -554 +559 @@
                }
 
-               if (!empty($_POST['delete'])) {
+               elseif (!empty($_POST['delete'])) {
 
                     $disabled = $modules->getDisabledModules();
@@ -585 +590 @@
                }
 
-               if (!empty($_POST['update'])) {
+               elseif (!empty($_POST['update'])) {
 
                     $updated = $repository->get();
@@ -610 +615 @@
 
                     # --BEHAVIOR-- moduleBeforeUpdate
-                    $this->core->callBehavior($type.'BeforeUpdate', $module);
+                    $this->core->callBehavior($prefix.'BeforeUpdate', $module);
 
                     $repository->process($module['file'], $dest);
 
                     # --BEHAVIOR-- moduleAfterUpdate
-                    $this->core->callBehavior($type.'AfterUpdate', $module);
+                    $this->core->callBehavior($prefix.'AfterUpdate', $module);
 
                     http::redirect($this->getPageURL('msg=upadte'));
                }
 
-               if (!empty($_POST['install'])) {
+               elseif (!empty($_POST['install'])) {
 
                     $updated = $repository->get();
@@ -633 +638 @@
 
                     # --BEHAVIOR-- moduleBeforeAdd
-                    $this->core->callBehavior($type.'BeforeAdd', $module);
+                    $this->core->callBehavior($prefix.'BeforeAdd', $module);
 
                     $ret_code = $repository->process($module['file'], $dest);
 
                     # --BEHAVIOR-- moduleAfterAdd
-                    $this->core->callBehavior($type.'AfterAdd', $module);
+                    $this->core->callBehavior($prefix.'AfterAdd', $module);
 
                     http::redirect($this->getPageURL('msg='.($ret_code == 2 ? 'update' : 'install')));
@@ -675 +680 @@
                http::redirect($this->getPageURL('msg='.($ret_code == 2 ? 'update' : 'install')).'#'.$prefix);
           }
+
+          return $this->executeOtherAction($prefix, $modules, $repository);
+     }
+
+     /**
+      * 
+      * Way for child class to execute their own actions 
+      * whitout rewriting all standard actions.
+      */
+     protected function executeOtherAction($prefix, dcModules $modules, dcRepository $repository)
+     {
           return null;
      }
@@ -863 +879 @@
                '<div class="box small '.($current ? 'current-theme' : 'theme').'">';
 
+               if (in_array('name', $cols)) {
+                    $line .= 
+                    '<h4 class="module-name">'.html::escapeHTML($module['name']).'</h4>';
+               }
+
+               $line .= 
+               '<div class="module-infos">'.
+               '<p>';
+
+               if (in_array('desc', $cols)) {
+                    $line .= 
+                    '<span class="module-desc">'.html::escapeHTML($module['desc']).'</span> ';
+               }
+
+               if (in_array('author', $cols)) {
+                    $line .= 
+                    '<span class="module-author">'.sprintf(__('by %s'),html::escapeHTML($module['author'])).'</span> ';
+               }
+
+               if (in_array('version', $cols)) {
+                    $line .= 
+                    '<span class="module-version">'.sprintf(__('version %s'),html::escapeHTML($module['version'])).'</span> ';
+               }
+
+               if (in_array('parent', $cols) && $has_parent) {
+                    if ($is_parent_present) {
+                         $line .= 
+                         '<span class="module-parent-ok">'.sprintf(__('(built on "%s")'),html::escapeHTML($parent)).'</span> ';
+                    }
+                    else {
+                         $line .= 
+                         '<span class="module-parent-missing">'.sprintf(__('(requires "%s")'),html::escapeHTML($parent)).'</span> ';
+                    }
+               }
+
+               $line .= 
+               '</p>'.
+               '</div>';
+
                if (in_array('sshot', $cols)) {
                     # Screenshot from url
@@ -881 +936 @@
                }
 
-               if (in_array('name', $cols)) {
-                    $line .= 
-                    '<h4 class="module-name">'.html::escapeHTML($module['name']).'</h4>';
-               }
-
-               $line .= 
-               '<div class="module-infos">'.
-               '<p>';
-
-               if (in_array('desc', $cols)) {
-                    $line .= 
-                    '<span class="module-desc">'.html::escapeHTML($module['desc']).'</span> ';
-               }
-
-               if (in_array('author', $cols)) {
-                    $line .= 
-                    '<span class="module-author">'.sprintf(__('by %s'),html::escapeHTML($module['author'])).'</span> ';
-               }
-
-               if (in_array('version', $cols)) {
-                    $line .= 
-                    '<span class="module-version">'.sprintf(__('version %s'),html::escapeHTML($module['version'])).'</span> ';
-               }
-
-               if (in_array('parent', $cols) && $has_parent) {
-                    if ($is_parent_present) {
-                         $line .= 
-                         '<span class="module-parent-ok">'.sprintf(__('(built on "%s")'),html::escapeHTML($parent)).'</span> ';
-                    }
-                    else {
-                         $line .= 
-                         '<span class="module-parent-missing">'.sprintf(__('(requires "%s")'),html::escapeHTML($parent)).'</span> ';
-                    }
-               }
-
-               $line .= 
-               '</p>'.
-               '</div>';
-
                $line .= 
                '<div class="modules-actions">';
                
                # _GET actions
-               $line .= 
-               '<p>';
 
                if ($current && $has_css) {
                     $line .= 
-                    '<a href="'.$theme_url.'/style.css" class="button">'.__('View stylesheet').'</a> ';
+                    '<p><a href="'.$theme_url.'/style.css" class="button">'.__('View stylesheet').'</a></p>';
                }
                if ($current && $has_conf) {
                     $line .= 
-                    '<a href="'.$this->getPageURL('module='.$id.'&conf=1', false).'" class="button">'.__('Configure theme').'</a> ';
-               }
-               $line .= 
-               '</p>';
+                    '<p><a href="'.$this->getPageURL('module='.$id.'&conf=1', false).'" class="button">'.__('Configure theme').'</a></p>';
+               }
 
                # Plugins actions
@@ -965 +977 @@
           '</div>';
 
-          if(!$count) {
+          if(!$count && $this->getSearchQuery() === null) {
                echo 
                '<p class="message">'.__('No module matches your search.').'</p>';
           }
      }
+
+     protected function displayOtherLineAction($id, $module, $actions)
+     {
+          $submits = array();
+
+          $this->core->blog->settings->addNamespace('system');
+          if ($id == $this->core->blog->settings->system->theme) {
+               return null;
+          }
+
+          # Select theme to use on curent blog
+          if (in_array('select', $actions) && $this->path_writable) {
+               $submits[] = '<input type="submit" name="select" value="'.__('Choose').'" />';
+          }
+
+          return $submits;
+     }
+     
+     protected function executeOtherAction($prefix, dcModules $modules, dcRepository $repository)
+     {
+          # Select theme to use on curent blog
+          if (!empty($_POST['module']) && !empty($_POST['select'])) {
+               $id = $_POST['module'];
+
+               if (!$modules->moduleExists($id)) {
+                    throw new Exception(__('No such module.'));
+               }
+
+               $this->core->blog->settings->addNamespace('system');
+               $this->core->blog->settings->system->put('theme',$id);
+               $this->core->blog->triggerBlog();
+
+               http::redirect($this->getPageURL('msg=select').'#themes');
+          }
+
+          return null;
+     }
 }