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

Use perPage instead of constant.

Browse Source
This commit is contained in:
Lóna Lore
2017-12-26 08:46:22 +01:00
parent 48124b6610
commit dc1a99c806
1 changed files with 8 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
e107_admin/plugin.php
View File

@@ -24,7 +24,6 @@ $e_sub_cat = 'plug_manage';
define('PLUGIN_SHOW_REFRESH', FALSE); define('PLUGIN_SHOW_REFRESH', FALSE);
define('PLUGIN_SCAN_INTERVAL', !empty($_SERVER['E_DEV']) ? 0 : 360); define('PLUGIN_SCAN_INTERVAL', !empty($_SERVER['E_DEV']) ? 0 : 360);
define('PLUGIN_ITEMS_PER_PAGE', 10);
define("ADMIN_GITSYNC_ICON", e107::getParser()->toGlyph('fa-refresh', array('size'=>'2x', 'fw'=>1))); define("ADMIN_GITSYNC_ICON", e107::getParser()->toGlyph('fa-refresh', array('size'=>'2x', 'fw'=>1)));
@@ -174,7 +173,7 @@ class plugin_ui extends e_admin_ui
// protected $eventName = 'plugman-plugin'; // remove comment to enable event triggers in admin. // protected $eventName = 'plugman-plugin'; // remove comment to enable event triggers in admin.
protected $table = 'plugin'; protected $table = 'plugin';
protected $pid = 'plugin_id'; protected $pid = 'plugin_id';
protected $perPage = PLUGIN_ITEMS_PER_PAGE; protected $perPage = 10;
protected $batchDelete = false; protected $batchDelete = false;
protected $batchExport = false; protected $batchExport = false;
@@ -1001,7 +1000,7 @@ class plugin_online_ui extends e_admin_ui
// protected $eventName = 'plugman-plugin'; // remove comment to enable event triggers in admin. // protected $eventName = 'plugman-plugin'; // remove comment to enable event triggers in admin.
protected $table = false; protected $table = false;
protected $pid = ''; protected $pid = '';
protected $perPage = PLUGIN_ITEMS_PER_PAGE; protected $perPage = 10;
protected $batchDelete = true; protected $batchDelete = true;
protected $batchExport = true; protected $batchExport = true;
protected $batchCopy = true; protected $batchCopy = true;
@@ -1291,7 +1290,7 @@ class plugin_online_ui extends e_admin_ui
// do the request, retrieve and parse data // do the request, retrieve and parse data
$xdata = $mp->call('getList', array( $xdata = $mp->call('getList', array(
'type' => 'plugin', 'type' => 'plugin',
'params' => array('limit' => PLUGIN_ITEMS_PER_PAGE, 'search' => $srch, 'from' => $from) 'params' => array('limit' => $this->perPage, 'search' => $srch, 'from' => $from)
)); ));
$total = $xdata['params']['count']; $total = $xdata['params']['count'];
@@ -1409,12 +1408,9 @@ class plugin_online_ui extends e_admin_ui
</form> </form>
"; ";
$amount = PLUGIN_ITEMS_PER_PAGE; if($total > $this->perPage)
if($total > $amount)
{ {
$parms = $total.",".$amount.",".$from.",".e_SELF.'?mode=online&amp;action=list&amp;frm=[FROM]'; $parms = $total.",".$this->perPage.",".$from.",".e_SELF.'?mode=online&amp;action=list&amp;frm=[FROM]';
if(!empty($srch)) if(!empty($srch))
{ {
@@ -2525,12 +2521,9 @@ class pluginManager{
</form> </form>
"; ";
$amount = PLUGIN_ITEMS_PER_PAGE; if($total > $this->perPage)
if($total > $amount)
{ {
$parms = $total.",".$amount.",".$from.",".e_SELF.'?mode=online&amp;frm=[FROM]'; $parms = $total.",".$this->perPage.",".$from.",".e_SELF.'?mode=online&amp;frm=[FROM]';
if(!empty($srch)) if(!empty($srch))
{ {
@@ -4213,7 +4206,7 @@ $content .= '}';
$frm = e107::getForm(); $frm = e107::getForm();
list($cat,$type) = explode("-",$info); list($cat,$type) = explode("-",$info);
$size = PLUGIN_ITEMS_PER_PAGE; $size = 30; // Textbox size.
$help = ''; $help = '';
$pattern = ""; $pattern = "";
$required = false; $required = false;