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

Speed up admin Plugin-Manager page refresh. Add support for e_help() function.

Browse Source
This commit is contained in:
Cameron 2013-04-17 15:22:47 -07:00
parent a25287055a
commit af1a88ef30
2 changed files with 37 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
e107_admin/plugin.php
View File

@ -91,6 +91,7 @@ e107::coreLan('plugin', true);
$e_sub_cat = 'plug_manage';
define('PLUGIN_SHOW_REFRESH', FALSE);
define('PLUGIN_SCAN_INTERVAL', 900);
global $user_pref;
@ -205,6 +206,15 @@ $pman->pluginObserver();
$mes = e107::getMessage();
$frm = e107::getForm();
function e_help()
{
return array(
'caption' => "Scan for Changes",
'text' => "Plugin folders are scanned every ".(PLUGIN_SCAN_INTERVAL / 60) ." minutes for changes. Click the button below to scan now.
<p><a class='btn btn-mini btn-primary' href='".e_SELF."?refresh'>Refresh</a></p>"
);
}
require_once("footer.php");
exit;
@ -319,8 +329,13 @@ class pluginManager{
{
$this -> pluginUninstall();
}
if($this->action == "refresh")
{
$this -> pluginCheck(true); // forced
}
if($this->action == "install")
if($this->action == "install" || $this->action == "refresh")
{
$this -> pluginInstall();
$this -> action = "installed";
@ -894,10 +909,18 @@ class pluginManager{
// -----------------------------------------------------------------------------
// Check for new plugins, create entry in plugin table ...
function pluginCheck()
function pluginCheck($force=false)
{
global $plugin;
$plugin->update_plugins_table('update');
if((time() > vartrue($_SESSION['nextPluginFolderScan'],0)) || $force == true)
{
$plugin->update_plugins_table('update');
}
$_SESSION['nextPluginFolderScan'] = time() + 360;
//echo "TIME = ".$_SESSION['nextPluginFolderScan'];
}
// ----------------------------------------------------------
// render plugin information ...

14
e107_core/shortcodes/batch/admin_shortcodes.php
View File

@ -57,10 +57,18 @@ class admin_shortcodes
function sc_admin_help()
{
if (!ADMIN) { return ''; }
$ns = e107::getRender();
$pref = e107::getPref();
if(function_exists('e_help')) // new in v2.x for non-admin-ui admin pages.
{
$tmp = e_help();
return $ns->tablerender($tmp['caption'],$tmp['text'],'',true);
}
$helpfile = '';
global $ns, $pref; // Used by the help renderer
if(strpos(e_SELF, e_ADMIN_ABS) !== FALSE)
{
if (is_readable(e_LANGUAGEDIR.e_LANGUAGE.'/admin/help/'.e_PAGE))