mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-01-18 05:09:05 +01:00
Code Issues Releases Wiki Activity

Argument detection logic and phpdoc fix

Browse Source
This commit is contained in:
SecretR 2015-10-02 13:40:44 +03:00
parent 970070fa62
commit 0a74c3612b
1 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
e107_handlers/plugin_class.php
View File

@ -188,7 +188,8 @@ class e107plugin
/** /**
* Returns an array containing details of all plugins in the plugin table - should normally use e107plugin::update_plugins_table() first to * Returns an array containing details of all plugins in the plugin table - should normally use e107plugin::update_plugins_table() first to
* make sure the table is up to date. (Primarily called from plugin manager to get lists of installed and uninstalled plugins. * make sure the table is up to date. (Primarily called from plugin manager to get lists of installed and uninstalled plugins.
* @return array plugin details * @param string $path
* @return int
*/ */
function getId($path) function getId($path)
{ {
@ -1355,17 +1356,17 @@ class e107plugin
/** /**
* Install routine for XML file * Install routine for XML file
* @param object $id (the number of the plugin in the DB) or the path to the plugin folder. eg. 'forum' * @param mixed $id (the number of the plugin in the DB) or the path to the plugin folder. eg. 'forum'
* @param object $function install|upgrade|uninstall|refresh (adds things that are missing, but doesn't change any existing settings) * @param string $function install|upgrade|uninstall|refresh (adds things that are missing, but doesn't change any existing settings)
* @param object $options [optional] an array of possible options - ATM used only for uninstall: * @param array $options [optional] an array of possible options - ATM used only for uninstall:
* 'delete_userclasses' - to delete userclasses created * 'delete_userclasses' - to delete userclasses created
* 'delete_tables' - to delete DB tables * 'delete_tables' - to delete DB tables
* 'delete_xfields' - to delete extended fields * 'delete_xfields' - to delete extended fields
* 'delete_ipool' - to delete icon pool entry * 'delete_ipool' - to delete icon pool entry
* + any defined in <pluginname>_setup.php in the uninstall_options() method. * + any defined in <pluginname>_setup.php in the uninstall_options() method.
* @return TBD * @return void
*/ */
function install_plugin_xml($id, $function = '', $options = FALSE) function install_plugin_xml($id, $function = '', $options = null)
{ {
$pref = e107::getPref(); $pref = e107::getPref();
@ -1376,21 +1377,21 @@ class e107plugin
$error = array(); // Array of error messages $error = array(); // Array of error messages
$canContinue = TRUE; // Clear flag if must abort part way through $canContinue = TRUE; // Clear flag if must abort part way through
if(is_string($id)) // Plugin Path. if(is_array($id)) // plugin info array
{
$id = $this->getId($id);
$plug = $this->getinfo($id); // Get plugin info from DB
}
elseif(is_array($id))
{ {
$plug = $id; $plug = $id;
$id = $plug['plugin_id']; $id = (int) $plug['plugin_id'];
} }
else elseif(is_numeric($id)) // plugin database id
{ {
$id = (int) $id; $id = (int) $id;
$plug = $this->getinfo($id); // Get plugin info from DB $plug = $this->getinfo($id); // Get plugin info from DB
} }
else // Plugin Path.
{
$id = $this->getId($id);
$plug = $this->getinfo($id); // Get plugin info from DB
}
$this->current_plug = $plug; $this->current_plug = $plug;