iarv/Piwigo
1
0
Fork 0
mirror of https://github.com/Piwigo/Piwigo.git synced 2026-05-02 03:22:50 +02:00
Code Issues Packages Projects Releases Wiki Activity

feature:2260

Browse Source 
Keep only two states for plugins (active and inactive)

git-svn-id: http://piwigo.org/svn/trunk@10293 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
patdenice
2011-04-11 10:30:56 +00:00
parent 7282a52838
commit b5592c8228
3 changed files with 22 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
admin/include/plugins.class.php
View File

@@ -78,14 +78,8 @@ class plugins
switch ($action)
{
case 'install':
if (!empty($crt_db_plugin))
if (!empty($crt_db_plugin) or !isset($this->fs_plugins[$plugin_id]))
{
array_push($errors, 'CANNOT INSTALL - ALREADY INSTALLED');
break;
}
if (!isset($this->fs_plugins[$plugin_id]))
{
array_push($errors, 'CANNOT INSTALL - NO SUCH PLUGIN');
break;
}
if (file_exists($file_to_include))
@@ -109,15 +103,13 @@ INSERT INTO ' . PLUGINS_TABLE . ' (id,version) VALUES (\''
case 'activate':
if (!isset($crt_db_plugin))
{
array_push($errors, 'CANNOT ACTIVATE - NOT INSTALLED');
break;
$errors = $this->perform_action('install', $plugin_id);
}
if ($crt_db_plugin['state'] != 'inactive')
elseif ($crt_db_plugin['state'] == 'active')
{
array_push($errors, 'invalid current state ' . $crt_db_plugin['state']);
break;
}
if (file_exists($file_to_include))
if (empty($errors) and file_exists($file_to_include))
{
include_once($file_to_include);
if (function_exists('plugin_activate'))
@@ -136,13 +128,9 @@ WHERE id=\'' . $plugin_id . '\'';
break;
case 'deactivate':
if (!isset($crt_db_plugin))
if (!isset($crt_db_plugin) or $crt_db_plugin['state'] != 'active')
{
die ('CANNOT DEACTIVATE - NOT INSTALLED');
}
if ($crt_db_plugin['state'] != 'active')
{
die('invalid current state ' . $crt_db_plugin['state']);
break;
}
$query = '
UPDATE ' . PLUGINS_TABLE . ' SET state=\'inactive\' WHERE id=\'' . $plugin_id . '\'';
@@ -160,7 +148,11 @@ UPDATE ' . PLUGINS_TABLE . ' SET state=\'inactive\' WHERE id=\'' . $plugin_id .
case 'uninstall':
if (!isset($crt_db_plugin))
{
die ('CANNOT UNINSTALL - NOT INSTALLED');
break;
}
if ($crt_db_plugin['state'] == 'active')
{
$this->perform_action('deactivate', $plugin_id);
}
$query = '
DELETE FROM ' . PLUGINS_TABLE . ' WHERE id=\'' . $plugin_id . '\'';
@@ -175,15 +167,19 @@ DELETE FROM ' . PLUGINS_TABLE . ' WHERE id=\'' . $plugin_id . '\'';
}
break;
case 'restore':
$this->perform_action('uninstall', $plugin_id);
unset($this->db_plugins_by_id[$plugin_id]);
$errors = $this->perform_action('activate', $plugin_id);
break;
case 'delete':
if (!empty($crt_db_plugin))
{
array_push($errors, 'CANNOT DELETE - PLUGIN IS INSTALLED');
break;
$this->perform_action('uninstall', $plugin_id);
}
if (!isset($this->fs_plugins[$plugin_id]))
{
array_push($errors, 'CANNOT DELETE - NO SUCH PLUGIN');
break;
}
if (!$this->deltree(PHPWG_PLUGINS_PATH . $plugin_id))