mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-07-12 02:26:21 +02:00
Code Issues Releases Wiki Activity

Fixes #541 - banner plugin to be installed by default on upgrade.

Browse Source
This commit is contained in:
Cameron
2014-05-22 14:54:56 -07:00
parent 8030b6114e
commit a324e0324c
2 changed files with 48 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
e107_admin/update_routines.php
View File

@ -1359,6 +1359,13 @@ function update_706_to_800($type='')
// e107::getSingleton('e107plugin')->save_addon_prefs(); //XXX Needed? Uncomment if SQL update does not occur. // e107::getSingleton('e107plugin')->save_addon_prefs(); //XXX Needed? Uncomment if SQL update does not occur.
} }
if (!e107::isInstalled('banner') && $sql->gen("SELECT * FROM #banner LIMIT 1"))
{
if ($just_check) return update_needed('Banner Table found, but plugin not installed. Needs to be refreshed.');
e107::getSingleton('e107plugin')->refresh('banner');
// e107::getSingleton('e107plugin')->save_addon_prefs(); //XXX Needed? Uncomment if SQL update does not occur.
}
// --------------------------------- // ---------------------------------

42
e107_handlers/plugin_class.php
View File

@ -1537,7 +1537,7 @@ class e107plugin
$p_installed = e107::getPref('plug_installed', array()); // load preference; $p_installed = e107::getPref('plug_installed', array()); // load preference;
if ($function == 'install' || $function == 'upgrade') if ($function == 'install' || $function == 'upgrade' || $function == 'refresh')
{ {
$sql->update('plugin', "plugin_installflag = 1, plugin_addons = '{$eplug_addons}', plugin_version = '{$plug_vars['@attributes']['version']}', plugin_category ='".$this->manage_category($plug_vars['category'])."' WHERE plugin_id = ".$id); $sql->update('plugin', "plugin_installflag = 1, plugin_addons = '{$eplug_addons}', plugin_version = '{$plug_vars['@attributes']['version']}', plugin_category ='".$this->manage_category($plug_vars['category'])."' WHERE plugin_id = ".$id);
$p_installed[$plug['plugin_path']] = $plug_vars['@attributes']['version']; $p_installed[$plug['plugin_path']] = $plug_vars['@attributes']['version'];
@ -2429,6 +2429,46 @@ class e107plugin
} }
/**
* Refresh Plugin Info, Install flag, e_xxx, ignore existing tables. etc.
*
* @param int $dir - plugin folder.
*/
function refresh($dir)
{
if(empty($dir))
{
return;
}
global $sysprefs, $mySQLprefix;
$ns = e107::getRender();
$sql = e107::getDb();
$tp = e107::getParser();
$plug = $this->getinfo($dir);
$this->options = array('nolinks'=>true);
if(!is_array($plug))
{
return "'{$id}' is missing from the plugin db table";
}
$_path = e_PLUGIN.$plug['plugin_path'].'/';
if (file_exists($_path.'plugin.xml'))
{
$text = $this->install_plugin_xml($plug, 'refresh');
}
else
{
$text = EPL_ADLAN_21;
}
return $text;
}
/** /**