Changeset 2175:44a940977175 for admin/plugins.php

Timestamp:

09/30/13 21:16:20 (12 years ago)

Author:

Denis Jean-Chirstian <contact@…>

Branch:

dcRepo

Parents:

2174:6ed25e45a14e (diff), 2173:94520262a1b8 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge from default

Files:

• admin/plugins.php (modified) (2 diffs)
• admin/plugins.php (modified) (1 diff)

admin/plugins.php

@@ -13 +13 @@
 require dirname(__FILE__).'/../inc/admin/prepend.php';
 
-dcPage::checkSuper();
-
-$default_tab = !empty($_REQUEST['tab']) ? html::escapeHTML($_REQUEST['tab']) : 'plugins';
-
-$p_paths = explode(PATH_SEPARATOR, DC_PLUGINS_ROOT);
-$p_path = array_pop($p_paths);
-unset($p_paths);
-
-$is_writable = false;
-if (is_dir($p_path) && is_writeable($p_path)) {
-     $is_writable = true;
-     $p_path_pat = preg_quote($p_path,'!');
-}
-
-$plugin_id = !empty($_POST['plugin_id']) ? $_POST['plugin_id'] : null;
-
-if ($is_writable)
-{
-     # Delete plugin
-     if ($plugin_id && !empty($_POST['delete']))
-     {
-          try
-          {
-               if (empty($_POST['deactivated']))
-               {
-                    if (!$core->plugins->moduleExists($plugin_id)) {
-                         throw new Exception(__('No such plugin.'));
-                    }
-                    
-                    $plugin = $core->plugins->getModules($plugin_id);
-                    $plugin['id'] = $plugin_id;
-                    
-                    if (!preg_match('!^'.$p_path_pat.'!', $plugin['root'])) {
-                         throw new Exception(__('You don\'t have permissions to delete this plugin.'));
-                    }
-                    
-                    # --BEHAVIOR-- pluginBeforeDelete
-                    $core->callBehavior('pluginsBeforeDelete', $plugin);
-                    
-                    $core->plugins->deleteModule($plugin_id);
-                    
-                    # --BEHAVIOR-- pluginAfterDelete
-                    $core->callBehavior('pluginsAfterDelete', $plugin);
-               }
-               else
-               {
-                    $core->plugins->deleteModule($plugin_id,true);
-               }
-               
-               http::redirect('plugins.php?removed=1');
+dcPage::check('admin');
+
+# --------------------------------------------------
+# @todo Add settings to Dotclear update features
+if ($core->blog->settings->system->plugins_allow_multi_install === null) {
+     $core->blog->settings->system->put(
+          'plugins_allow_multi_install', false, 'boolean', 'Allow multi-installation for plugins', true, true
+     );
+}
+if ($core->blog->settings->system->repository_plugin_url === null) {
+     $core->blog->settings->system->put(
+          'repository_plugin_url', 'http://update.dotaddict.org/dc2/plugins.xml', 'string', 'Plugins XML feed location', true, true
+     );
+}
+# --------------------------------------------------
+
+# -- Repository helper --
+$repository = new dcRepository(
+     $core->plugins, 
+     $core->blog->settings->system->repository_plugin_url
+);
+$repository->check();
+
+# -- Page helper --
+$list = new adminModulesList(
+     $core, 
+     DC_PLUGINS_ROOT,
+     $core->blog->settings->system->plugins_allow_multi_install
+);
+
+$list::setDistributedModules(array(
+     'aboutConfig',
+     'akismet',
+     'antispam',
+     'attachments',
+     'blogroll',
+     'blowupConfig',
+     'daInstaller',
+     'fairTrackbacks',
+     'importExport',
+     'maintenance',
+     'pages',
+     'pings',
+     'simpleMenu',
+     'tags',
+     'themeEditor',
+     'userPref',
+     'widgets'
+));
+
+# -- Check for module configuration --
+$conf_file = false;
+if (!empty($_REQUEST['conf']) && !empty($_REQUEST['module'])) {
+     if (!$core->plugins->moduleExists($_REQUEST['module'])) {
+          $core->error->add(__('Unknow module ID'));
+     }
+     else {
+          $module = $core->plugins->getModules($_REQUEST['module']);
+          $module = adminModulesList::parseModuleInfo($_REQUEST['module'], $module);
+
+          if (!file_exists(path::real($module['root'].'/_config.php'))) {
+               $core->error->add(__('This module has no configuration file.'));
           }
-          catch (Exception $e)
-          {
-               $core->error->add($e->getMessage());
+          else {
+               $conf_file = path::real($module['root'].'/_config.php');
           }
      }
-     # Deactivate plugin
-     elseif ($plugin_id && !empty($_POST['deactivate']))
-     {
-          try
-          {
-               if (!$core->plugins->moduleExists($plugin_id)) {
-                    throw new Exception(__('No such plugin.'));
-               }
-               
-               $plugin = $core->plugins->getModules($plugin_id);
-               $plugin['id'] = $plugin_id;
-               
-               if (!$plugin['root_writable']) {
-                    throw new Exception(__('You don\'t have permissions to deactivate this plugin.'));
-               }
-               
-               # --BEHAVIOR-- pluginBeforeDeactivate
-               $core->callBehavior('pluginsBeforeDeactivate', $plugin);
-                    
-               $core->plugins->deactivateModule($plugin_id);
-
-               # --BEHAVIOR-- pluginAfterDeactivate
-               $core->callBehavior('pluginsAfterDeactivate', $plugin);
-                    
-               http::redirect('plugins.php');
+}
+
+# -- Display module configuration page --
+if ($conf_file) {
+     dcPage::open(__('Plugins management'),
+
+          # --BEHAVIOR-- pluginsToolsHeaders
+          $core->callBehavior('pluginsToolsHeaders', $core, $module['id']),
+
+          dcPage::breadcrumb(
+               array(
+                    html::escapeHTML($core->blog->name) => '',
+                    '<a href="'.$list->getPageURL().'">'.__('Plugins management').'</a>' => '',
+                    '<span class="page-title">'.__('Plugin configuration').'</span>' => ''
+               ))
+     );
+
+     if (!empty($_GET['done'])){
+          dcPage::success(__('Plugin successfully configured.'));
+     }
+
+     try {
+          if (!$module['standalone_config']) {
+               echo
+               '<form id="module_config" action="'.$list->getPageURL('conf=1').'" method="post" enctype="multipart/form-data">'.
+               '<h3>'.sprintf(__('Configure plugin "%s"'), html::escapeHTML($module['name'])).'</h3>'.
+               '<p><a class="back" href="'.$list->getPageURL().'#plugins">'.__('Back').'</a></p>';
           }
-          catch (Exception $e)
-          {
-               $core->error->add($e->getMessage());
+          define('DC_CONTEXT_PLUGIN', true);
+
+          include $conf_file;
+
+          if (!$module['standalone_config']) {
+               echo
+               '<p class="clear"><input type="submit" name="save" value="'.__('Save').'" />'.
+               form::hidden('module', $module['id']).
+               $core->formNonce().'</p>'.
+               '</form>';
           }
      }
-     # Activate plugin
-     elseif ($plugin_id && !empty($_POST['activate']))
-     {
-          try
-          {
-               $p = $core->plugins->getDisabledModules();
-               if (!isset($p[$plugin_id])) {
-                    throw new Exception(__('No such plugin.'));
-               }
-
-               # --BEHAVIOR-- pluginBeforeActivate
-               $core->callBehavior('pluginsBeforeActivate', $plugin_id);
-               
-               $core->plugins->activateModule($plugin_id);
-
-               # --BEHAVIOR-- pluginAfterActivate
-               $core->callBehavior('pluginsAfterActivate', $plugin_id);
-               
-               http::redirect('plugins.php');
-          }
-          catch (Exception $e)
-          {
-               $core->error->add($e->getMessage());
-          }
-     }
-     # Plugin upload
-     elseif ((!empty($_POST['upload_pkg']) && !empty($_FILES['pkg_file'])) ||
-          (!empty($_POST['fetch_pkg']) && !empty($_POST['pkg_url'])))
-     {
-          try
-          {
-               if (empty($_POST['your_pwd']) || !$core->auth->checkPassword(crypt::hmac(DC_MASTER_KEY,$_POST['your_pwd']))) {
-                    throw new Exception(__('Password verification failed'));
-               }
-               
-               if (!empty($_POST['upload_pkg']))
-               {
-                    files::uploadStatus($_FILES['pkg_file']);
-                    
-                    $dest = $p_path.'/'.$_FILES['pkg_file']['name'];
-                    if (!move_uploaded_file($_FILES['pkg_file']['tmp_name'],$dest)) {
-                         throw new Exception(__('Unable to move uploaded file.'));
-                    }
-               }
-               else
-               {
-                    $url = urldecode($_POST['pkg_url']);
-                    $dest = $p_path.'/'.basename($url);
-                    
-                    try
-                    {
-                         $client = netHttp::initClient($url,$path);
-                         $client->setUserAgent('Dotclear - http://www.dotclear.org/');
-                         $client->useGzip(false);
-                         $client->setPersistReferers(false);
-                         $client->setOutput($dest);
-                         $client->get($path);
-                    }
-                    catch( Exception $e)
-                    {
-                         throw new Exception(__('An error occurred while downloading the file.'));
-                    }
-                    
-                    unset($client);
-               }
-
-               # --BEHAVIOR-- pluginBeforeAdd
-               $core->callBehavior('pluginsBeforeAdd', $plugin_id);
-                              
-               $ret_code = $core->plugins->installPackage($dest,$core->plugins);
-
-               # --BEHAVIOR-- pluginAfterAdd
-               $core->callBehavior('pluginsAfterAdd', $plugin_id);
-               
-               http::redirect('plugins.php?added='.$ret_code);
-          }
-          catch (Exception $e)
-          {
-               $core->error->add($e->getMessage());
-               $default_tab = 'addplugin';
-          }
-     }
-}
-
-# Plugin install
-$plugins_install = $core->plugins->installModules();
-
-/* DISPLAY Main page
--------------------------------------------------------- */
+     catch (Exception $e) {
+          echo '<div class="error"><p>'.$e->getMessage().'</p></div>';
+     }
+
+     dcPage::close();
+
+     # Stop reading code here
+     return;
+}
+
+# -- Execute actions --
+if (!empty($_POST) && empty($_REQUEST['conf']) && $core->auth->isSuperAdmin() && $list->isPathWritable()) {
+     try {
+          $list->executeAction('plugins', $core->plugins, $repository);
+     }
+     catch (Exception $e) {
+          $core->error->add($e->getMessage());
+     }
+}
+
+# -- Plugin install --
+$plugins_install = null;
+if (!$core->error->flag()) {
+     $plugins_install = $core->plugins->installModules();
+}
+
+# -- Page header --
 dcPage::open(__('Plugins management'),
      dcPage::jsLoad('js/_plugins.js').
-     dcPage::jsPageTabs($default_tab),
+     dcPage::jsPageTabs().
+
+     # --BEHAVIOR-- pluginsToolsHeaders
+     $core->callBehavior('pluginsToolsHeaders', $core, false),
+
      dcPage::breadcrumb(
           array(
@@ -199 +161 @@
 );
 
-if (!empty($_GET['removed'])) {
-     dcPage::success(__('Plugin has been successfully deleted.'));
-}
-if (!empty($_GET['added'])) {
-     dcPage::success(($_GET['added'] == 2 ? __('Plugin has been successfully upgraded') : __('Plugin has been successfully installed.')));
-}
-
-# Plugins install messages
-if (!empty($plugins_install['success']))
-{
-     echo '<div class="static-msg">'.__('Following plugins have been installed:').'<ul>';
+# -- Succes messages --
+if (!empty($_GET['msg'])) {
+     $list->displayMessage($_GET['msg']);
+}
+
+# -- Plugins install messages --
+if (!empty($plugins_install['success'])) {
+     echo 
+     '<div class="static-msg">'.__('Following plugins have been installed:').'<ul>';
      foreach ($plugins_install['success'] as $k => $v) {
-          echo '<li>'.$k.'</li>';
-     }
-     echo '</ul></div>';
-}
-if (!empty($plugins_install['failure']))
-{
-     echo '<div class="error">'.__('Following plugins have not been installed:').'<ul>';
+          echo 
+          '<li>'.$k.'</li>';
+     }
+     echo 
+     '</ul></div>';
+}
+if (!empty($plugins_install['failure'])) {
+     echo 
+     '<div class="error">'.__('Following plugins have not been installed:').'<ul>';
      foreach ($plugins_install['failure'] as $k => $v) {
-          echo '<li>'.$k.' ('.$v.')</li>';
-     }
-     echo '</ul></div>';
+          echo 
+          '<li>'.$k.' ('.$v.')</li>';
+     }
+     echo 
+     '</ul></div>';
+}
+
+# -- Display modules lists --
+if ($core->auth->isSuperAdmin() && $list->isPathWritable()) {
+
+     # Updated modules from repo
+     $modules = $repository->get(true);
+     if (!empty($modules)) {
+          echo 
+          '<div class="multi-part" id="update" title="'.html::escapeHTML(__('Update plugins')).'">'.
+          '<h3>'.html::escapeHTML(__('Update plugins')).'</h3>'.
+          '<p>'.sprintf(
+               __('There is one plugin to update available from %2$s.', 'There are %s plugins to update available from %s.', count($modules)),
+               count($modules),
+               '<a href="http://dotaddict.org/dc2/plugins">Dotaddict</a>'
+          ).'</p>';
+
+          $list
+               ->newList('plugin-update')
+               ->setModules($modules)
+               ->setPageTab('update')
+               ->displayModulesList(
+                    /*cols */      array('icon', 'name', 'version', 'current_version', 'desc'),
+                    /* actions */  array('update')
+               );
+
+          echo
+          '</div>';
+     }
 }
 
 # List all active plugins
-echo '<p>'.__('Plugins add new functionalities to Dotclear. '.
-'Here you can activate or deactivate installed plugins.').'</p>';
-
-echo (!$core->plugins->moduleExists('daInstaller') ?
-     sprintf('<p><strong>'.__('You can find additional plugins for your blog on %s.').'</strong></p>',
-          '<a href="http://plugins.dotaddict.org/dc2/">Dotaddict</a>') :
-     sprintf('<p><strong>'.__('You can find additional plugins for your blog on %s or using the %s.').'</strong></p>',
-          '<a href="http://plugins.dotaddict.org/dc2/">Dotaddict</a>',
-          '<a href="plugin.php?p=daInstaller">'.__('DotAddict.org Installer').'</a>'));
-
-if ($is_writable) {
-     echo '<p>'.__('To install or upgrade a plugin you generally just need to upload it '.
-     'in "Install or upgrade a plugin" section.');
-} else {
-     echo '<p>'.__('To install or upgrade a plugin you just need to extract it in your plugins directory.');
-}
-echo '</p>';
-
 echo
-'<div class="multi-part" id="plugins" title="'.__('Plugins').'">';
-
-$p_available = $core->plugins->getModules();
-uasort($p_available,create_function('$a,$b','return strcasecmp($a["name"],$b["name"]);'));
-if (!empty($p_available)) 
-{
+'<div class="multi-part" id="plugins" title="'.__('Installed plugins').'">';
+
+$modules = $core->plugins->getModules();
+if (!empty($modules)) {
+
      echo
      '<h3>'.__('Activated plugins').'</h3>'.
-     '<div class="table-outer clear">'.
-     '<table class="plugins"><tr>'.
-     '<th>'.__('Plugin').'</th>'.
-     '<th class="nowrap">'.__('Version').'</th>'.
-     '<th class="nowrap">'.__('Details').'</th>'.
-     '<th class="nowrap">'.__('Action').'</th>'.
-     '</tr>';
-     
-     $distrib_plugins = array('aboutConfig','akismet','antispam','attachments','blogroll','blowupConfig','daInstaller',
-          'fairTrackbacks','importExport','maintenance','pages','pings','simpleMenu','tags','themeEditor','userPref','widgets');
-     $distrib_img = '<img src="images/dotclear_pw.png"'.
-          ' alt="'.__('Plugin from official distribution').'" title="'.__('Plugin from official distribution').'" />';
-
-     foreach ($p_available as $k => $v)
-     {
-          $is_deletable = $is_writable && preg_match('!^'.$p_path_pat.'!',$v['root']);
-          $is_deactivable = $v['root_writable'];
-          $is_distrib = in_array($k, $distrib_plugins);
-          
-          echo
-          '<tr class="line wide">'.
-          '<td class="minimal nowrap"><strong>'.html::escapeHTML($k).'</strong></td>'.
-          '<td class="minimal">'.html::escapeHTML($v['version']).'</td>'.
-          '<td class="maximal'.($is_distrib ? ' distrib' : '').'"><strong>'.html::escapeHTML(__($v['name'])).'</strong> '.
-          '<br />'.html::escapeHTML(__($v['desc'])).($is_distrib ? ' '.$distrib_img : '').'</td>'.
-          '<td class="nowrap action">';
-          
-          if ($is_deletable || $is_deactivable)
-          {
-               echo
-               '<form action="plugins.php" method="post">'.
-               '<div>'.
-               $core->formNonce().
-               form::hidden(array('plugin_id'),html::escapeHTML($k)).
-               ($is_deactivable ? '<input type="submit" name="deactivate" value="'.__('Deactivate').'" /> ' : '').
-               ($is_deletable ? '<input type="submit" class="delete" name="delete" value="'.__('Delete').'" /> ' : '').
-               '</div>'.
-               '</form>';
-          }
-          
-          echo
-          '</td>'.
-          '</tr>';
-     }
-     echo
-     '</table></div>';
-}
-
-$p_disabled = $core->plugins->getDisabledModules();
-uksort($p_disabled,create_function('$a,$b','return strcasecmp($a,$b);'));
-if (!empty($p_disabled))
-{
+     '<p>'.__('Manage installed plugins from this list.').'</p>';
+
+     $list
+          ->newList('plugin-activate')
+          ->setModules($modules)
+          ->setPageTab('plugins')
+          ->displayModulesList(
+               /* cols */          array('expander', 'icon', 'name', 'config', 'version', 'desc', 'distrib'),
+               /* actions */  array('deactivate', 'delete')
+          );
+}
+
+# Deactivated modules
+$modules = $core->plugins->getDisabledModules();
+if (!empty($modules)) {
+
      echo
      '<h3>'.__('Deactivated plugins').'</h3>'.
-     '<div class="clear table-outer">'.
-     '<table class="plugins"><tr>'.
-     '<th>'.__('Plugin').'</th>'.
-     '<th class="nowrap">'.__('Action').'</th>'.
-     '</tr>';
-     
-     foreach ($p_disabled as $k => $v)
-     {
-          $is_deletable = $is_writable && preg_match('!^'.$p_path_pat.'!',$v['root']);
-          $is_activable = $v['root_writable'];
-          
-          echo
-          '<tr class="line wide">'.
-          '<td class="maximal nowrap"><strong>'.html::escapeHTML($k).'</strong></td>'.
-          '<td class="nowrap action">';
-          
-          if ($is_deletable || $is_activable)
-          {
-               echo
-               '<form action="plugins.php" method="post">'.
-               '<div>'.
-               $core->formNonce().
-               form::hidden(array('plugin_id'),html::escapeHTML($k)).
-               form::hidden(array('deactivated'),1).
-               ($is_activable ? '<input type="submit" name="activate" value="'.__('Activate').'" /> ' : '').
-               ($is_deletable ? '<input type="submit" class="delete" name="delete" value="'.__('Delete').'" /> ' : '').
-               '</div>'.
-               '</form>';
-          }
-          
-          echo
-          '</td>'.
-          '</tr>';
-     }
-     echo
-     '</table></div>';
-}
-
-echo '</div>';
-
-# Add a new plugin
-echo
-'<div class="multi-part" id="addplugin" title="'.__('Install or upgrade a plugin').'">';
-
-if ($is_writable)
-{
+     '<p>'.__('Deactivated plugins are installed but not usable. You can activate them from here.').'</p>';
+
+     $list
+          ->newList('plugin-deactivate')
+          ->setModules($modules)
+          ->setPageTab('plugins')
+          ->displayModulesList(
+               /* cols */          array('icon', 'name', 'distrib'),
+               /* actions */  array('activate', 'delete')
+          );
+}
+
+echo 
+'</div>';
+
+if ($core->auth->isSuperAdmin() && $list->isPathWritable()) {
+
+     # New modules from repo
+     $search = $list->getSearchQuery();
+     $modules = $search ? $repository->search($search) : $repository->get();
+
+     echo
+     '<div class="multi-part" id="new" title="'.__('Add plugins from Dotaddict').'">'.
+     '<h3>'.__('Add plugins from Dotaddict repository').'</h3>';
+
+     $list
+          ->newList('plugin-new')
+          ->setModules($modules)
+          ->setPageTab('new')
+          ->displaySearchForm()
+          ->displayNavMenu()
+          ->displayModulesList(
+               /* cols */          array('expander', 'name', 'version', 'desc'),
+               /* actions */  array('install'),
+               /* nav limit */     true
+          );
+
+     echo
+     '<p class="info vertical-separator">'.sprintf(
+          __("Visit %s repository, the resources center for Dotclear."),
+          '<a href="http://dotaddict.org/dc2/plugins">Dotaddict</a>'
+          ).
+     '</p>'.
+
+     '</div>';
+
+     # Add a new plugin
+     echo
+     '<div class="multi-part" id="addplugin" title="'.__('Install or upgrade manually').'">';
+
      echo '<p>'.__('You can install plugins by uploading or downloading zip files.').'</p>';
      
-     # 'Upload plugin' form
-     echo
-     '<form method="post" action="plugins.php" id="uploadpkg" enctype="multipart/form-data" class="fieldset">'.
-     '<h3>'.__('Upload a zip file').'</h3>'.
-     '<p class="field"><label for="pkg_file" class="classic required"><abbr title="'.__('Required field').'">*</abbr> '.__('Plugin zip file:').'</label> '.
-     '<input type="file" id="pkg_file" name="pkg_file" /></p>'.
-     '<p class="field"><label for="your_pwd1" class="classic required"><abbr title="'.__('Required field').'">*</abbr> '.__('Your password:').'</label> '.
-     form::password(array('your_pwd','your_pwd1'),20,255).'</p>'.
-     '<p><input type="submit" name="upload_pkg" value="'.__('Upload plugin').'" />'.
-     $core->formNonce().
-     '</p>'.
-     '</form>';
-     
-     # 'Fetch plugin' form
-     echo
-     '<form method="post" action="plugins.php" id="fetchpkg" class="fieldset">'.
-     '<h3>'.__('Download a zip file').'</h3>'.
-     '<p class="field"><label for="pkg_url" class="classic required"><abbr title="'.__('Required field').'">*</abbr> '.__('Plugin zip file URL:').'</label> '.
-     form::field(array('pkg_url','pkg_url'),40,255).'</p>'.
-     '<p class="field"><label for="your_pwd2" class="classic required"><abbr title="'.__('Required field').'">*</abbr> '.__('Your password:').'</label> '.
-     form::password(array('your_pwd','your_pwd2'),20,255).'</p>'.
-     '<p><input type="submit" name="fetch_pkg" value="'.__('Download plugin').'" />'.
-     $core->formNonce().'</p>'.
-     '</form>';
-}
-else
-{
-     echo
-     '<p class="static-msg">'.
-     __('To enable this function, please give write access to your plugins directory.').
-     '</p>';
-}
-echo '</div>';
+     $list->displayManualForm();
+
+     echo
+     '</div>';
+}
 
 # --BEHAVIOR-- pluginsToolsTabs
-$core->callBehavior('pluginsToolsTabs',$core);
+$core->callBehavior('pluginsToolsTabs', $core);
+
+# -- Notice for super admin --
+if ($core->auth->isSuperAdmin() && !$list->isPathWritable()) {
+     echo 
+     '<p class="warning">'.__('Some functions are disabled, please give write access to your plugins directory to enable them.').'</p>';
+}
 
 dcPage::close();

admin/plugins.php

@@ -157 +157 @@
           array(
                __('System') => '',
-               '<span class="page-title">'.__('Plugins management').'</span>' => ''
+               __('Plugins management') => ''
           ))
 );