mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-04 13:47:31 +02:00
Code Issues Releases Wiki Activity

Small bugfix in uninstall functionality, hard-coded LAN

Browse Source
This commit is contained in:
e107steved
2009-09-21 20:57:55 +00:00
parent 72bfadb1cc
commit c5ae938501
2 changed files with 18 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
e107_admin/plugin.php
View File

@@ -11,9 +11,9 @@
| GNU General Public License (http://gnu.org). | GNU General Public License (http://gnu.org).
| |
| $Source: /cvs_backup/e107_0.8/e107_admin/plugin.php,v $ | $Source: /cvs_backup/e107_0.8/e107_admin/plugin.php,v $
| $Revision: 1.44 $ | $Revision: 1.45 $
| $Date: 2009-09-19 17:43:18 $ | $Date: 2009-09-21 20:57:54 $
| $Author: e107coders $ | $Author: e107steved $
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
@@ -206,6 +206,7 @@ class pluginManager{
if ($plug['plugin_installflag'] == TRUE ) if ($plug['plugin_installflag'] == TRUE )
{ {
$_path = e_PLUGIN.$plug['plugin_path'].'/'; $_path = e_PLUGIN.$plug['plugin_path'].'/';
$eplug_folder = $plug['plugin_path'];
if(file_exists($_path.'plugin.xml')) if(file_exists($_path.'plugin.xml'))
{ {
$options = array( $options = array(
@@ -216,9 +217,9 @@ class pluginManager{
$text .= $plugin->manage_plugin_xml($this->id, 'uninstall', $options); $text .= $plugin->manage_plugin_xml($this->id, 'uninstall', $options);
} }
else else
{ { // Deprecated - plugin uses plugin.php
include(e_PLUGIN.$plug['plugin_path'].'/plugin.php'); include(e_PLUGIN.$plug['plugin_path'].'/plugin.php');
$func = $eplug_folder.'_uninstall'; $func = $eplug_folder.'_uninstall';
if (function_exists($func)) if (function_exists($func))
{ {
@@ -256,21 +257,6 @@ class pluginManager{
$text .= ($plugin->manage_comments('remove', $eplug_comment_ids)) ? EPL_ADLAN_50."<br />" : ""; $text .= ($plugin->manage_comments('remove', $eplug_comment_ids)) ? EPL_ADLAN_50."<br />" : "";
} }
/* Not used in 0.8
if ($eplug_module)
{
$plugin->manage_plugin_prefs('remove', 'modules', $eplug_folder);
}
if ($eplug_status)
{
$plugin->manage_plugin_prefs('remove', 'plug_status', $eplug_folder);
}
if ($eplug_latest)
{
$plugin->manage_plugin_prefs('remove', 'plug_latest', $eplug_folder);
}
*/
if (is_array($eplug_array_pref)) if (is_array($eplug_array_pref))
{ {
foreach($eplug_array_pref as $key => $val) foreach($eplug_array_pref as $key => $val)
@@ -279,20 +265,9 @@ class pluginManager{
} }
} }
/* Not used in 0.8
if (is_array($eplug_sc))
{
$plugin->manage_plugin_prefs('remove', 'plug_sc', $eplug_folder, $eplug_sc);
}
if (is_array($eplug_bb))
{
$plugin->manage_plugin_prefs('remove', 'plug_bb', $eplug_folder, $eplug_bb);
}
*/
if ($eplug_menu_name) if ($eplug_menu_name)
{ {
$sql->db_Delete('menus', "menu_name='$eplug_menu_name' "); $sql->db_Delete('menus', "menu_name='{$eplug_menu_name}' ");
} }
if ($eplug_link) if ($eplug_link)
@@ -330,10 +305,10 @@ class pluginManager{
if($_POST['delete_files']) if($_POST['delete_files'])
{ {
include_once(e_HANDLER."file_class.php"); include_once(e_HANDLER.'file_class.php');
$fi = new e_file; $fi = new e_file;
$result = $fi->rmtree(e_PLUGIN.$eplug_folder); $result = $fi->rmtree(e_PLUGIN.$eplug_folder);
$text .= ($result ? "<br />All files removed from ".e_PLUGIN.$eplug_folder : '<br />File deletion failed<br />'.EPL_ADLAN_31.' <b>'.e_PLUGIN.$eplug_folder.'</b> '.EPL_ADLAN_32); $text .= ($result ? '<br />'.EPL_ADLAN_86.e_PLUGIN.$eplug_folder : '<br />'.EPL_ADLAN_87.'<br />'.EPL_ADLAN_31.' <b>'.e_PLUGIN.$eplug_folder.'</b> '.EPL_ADLAN_32);
} }
else else
{ {
@@ -345,7 +320,7 @@ class pluginManager{
$this->show_message($text, E_MESSAGE_SUCCESS); $this->show_message($text, E_MESSAGE_SUCCESS);
// $ns->tablerender(EPL_ADLAN_1.' '.$tp->toHtml($plug['plugin_name'], "", "defs,emotes_off,no_make_clickable"), $text); // $ns->tablerender(EPL_ADLAN_1.' '.$tp->toHtml($plug['plugin_name'], "", "defs,emotes_off,no_make_clickable"), $text);
$text = ''; $text = '';
$this->action = "installed"; $this->action = 'installed';
return; return;
} }

14
e107_languages/English/admin/lan_plugin.php
View File

@@ -4,9 +4,9 @@
| e107 website system - Language File. | e107 website system - Language File.
| |
| $Source: /cvs_backup/e107_0.8/e107_languages/English/admin/lan_plugin.php,v $ | $Source: /cvs_backup/e107_0.8/e107_languages/English/admin/lan_plugin.php,v $
| $Revision: 1.10 $ | $Revision: 1.11 $
| $Date: 2009-07-07 06:26:51 $ | $Date: 2009-09-21 20:57:55 $
| $Author: e107coders $ | $Author: e107steved $
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
define("EPL_ADLAN_0", "Install"); define("EPL_ADLAN_0", "Install");
@@ -82,9 +82,9 @@ define("EPL_ADLAN_58", "If the tables are not removed, the plugin can be reinsta
define("EPL_ADLAN_59", "Delete plugin files"); define("EPL_ADLAN_59", "Delete plugin files");
define("EPL_ADLAN_60", "e107 will attempt to remove all plugin related files."); define("EPL_ADLAN_60", "e107 will attempt to remove all plugin related files.");
// define("EPL_ADLAN_61", "Confirm uninstall"); // duplicated. can be deleted. // define("EPL_ADLAN_61", "Confirm uninstall"); // duplicated. can be deleted.
define("EPL_ADLAN_62", "Cancel uninstall"); define('EPL_ADLAN_62', 'Cancel uninstall');
define("EPL_ADLAN_63", "Uninstall:"); define('EPL_ADLAN_63', 'Uninstall:');
define("EPL_ADLAN_64", "Folder"); define('EPL_ADLAN_64', 'Folder');
define ('EPL_ADLAN_70','Required plugin not installed: '); define ('EPL_ADLAN_70','Required plugin not installed: ');
define ('EPL_ADLAN_71','Newer plugin version required: '); define ('EPL_ADLAN_71','Newer plugin version required: ');
@@ -102,6 +102,8 @@ define ('EPL_ADLAN_82','Icon');
define ('EPL_ADLAN_83','Notes'); define ('EPL_ADLAN_83','Notes');
define ('EPL_ADLAN_84','Install Selected'); define ('EPL_ADLAN_84','Install Selected');
define ('EPL_ADLAN_85','Uninstall Selected'); define ('EPL_ADLAN_85','Uninstall Selected');
define ('EPL_ADLAN_86','All files removed from ');
define ('EPL_ADLAN_87','File deletion failed ');
define('LAN_UPGRADE_SUCCESSFUL', 'Upgrade Successful'); define('LAN_UPGRADE_SUCCESSFUL', 'Upgrade Successful');