mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-05-03 02:38:06 +02:00
Code Issues Releases Wiki Activity

Issue - some work on downloads pagination

Browse Source
This commit is contained in:
Cameron 2013-12-30 03:17:20 -08:00
parent 7fa6fb4daa
commit d34623a043
5 changed files with 34 additions and 15 deletions

2
e107_plugins/download/download_shortcodes.php

@ -855,7 +855,7 @@ class download_shortcodes extends e_shortcode
function sc_download_back_to_category_list()
{
return "<a class='btn btn-default' href='".e_SELF."'>".LAN_dl_9."</a>";
return "<a class='btn btn-default btn-xs btn-mini' href='".e_SELF."'>".LAN_dl_9."</a>";
}

26
e107_plugins/download/handlers/download_class.php

@ -59,9 +59,9 @@ class download
if(varset($_GET['action']))
{
$this->qry['action'] = (string) $_GET['action'];
$this->qry['view'] = varset($_GET['view']) ? intval($_GET['view']) : 10;
$this->qry['view'] = varset($_GET['view']) ? intval($_GET['view']) : $this->qry['view'];
$this->qry['id'] = intval($_GET['id']);
$this->qry['order'] = vartrue($_GET['order']) && in_array("download_".$_GET['order'],$this->orderOptions) ? $_GET['order'] : 'datestamp';
$this->qry['order'] = vartrue($_GET['order']) && in_array("download_".$_GET['order'],$this->orderOptions) ? $_GET['order'] : $this->qry['order'];
$this->qry['sort'] = (varset($_GET['sort']) == 'asc') ? "asc" : 'desc';
$this->qry['from'] = vartrue($_GET['from'],0);
}
@ -84,6 +84,8 @@ class download
}
// v1.x
if(varset($_POST['view']))
{
@ -92,7 +94,7 @@ class download
$this->qry['sort'] = (strtolower($_POST['sort']) == 'asc') ? "asc" : 'desc';
}
}
@ -455,11 +457,14 @@ class download
//if (!isset($this->qry['from'])) $this->qry['from'] = 0;
// Get category type, page title
if ($sql->select("download_category", "download_category_name,download_category_description,download_category_parent,download_category_class", "(download_category_id='{$this->qry['id']}') AND (download_category_class IN (".USERCLASS_LIST."))") )
if ($sql->select("download_category", "download_category_name,download_category_sef,download_category_description,download_category_parent,download_category_class", "(download_category_id='{$this->qry['id']}') AND (download_category_class IN (".USERCLASS_LIST."))") )
{
$dlrow = $sql->fetch();
$sc->setVars($dlrow); // Used below for header / breadcrumb.
$type = $dlrow['download_category_name'];
$this->qry['name'] = $dlrow['download_category_sef'];
define("e_PAGETITLE", PAGE_NAME." / ".$dlrow['download_category_name']);
}
else
@ -519,6 +524,7 @@ class download
{
$sc->dlsubsubrow = $dlsubsubrow;
$dl_text .= $tp->parseTemplate($DOWNLOAD_CAT_SUBSUB_TABLE, TRUE, $sc);
}
$dl_text .= $tp->parseTemplate($DOWNLOAD_CAT_TABLE_END, TRUE, $sc);
@ -585,6 +591,7 @@ class download
$dltdownloads += $dlrow['download_requested'];
$dl_text .= $tp->parseTemplate($template, TRUE, $sc);
}
@ -619,8 +626,15 @@ class download
}
global $nextprev_parms;
$nextprev_parms = $total_downloads . "," . $this->qry['view'] . "," . $this->qry['from'] . "," . e_SELF . "?[FROM].list.{$this->qry['id']}.{$this->qry['view']}.{$this->qry['order']}.{$this->qry['sort']}.";
// $newUrl = e_SELF . "?action=list&id={$this->qry['id']}&from=[FROM]&view={$this->qry['view']}&order={$this->qry['order']}&sort={$this->qry['sort']}.";
$nextprevQry = $this->qry;
$nextprevQry['from'] = '[FROM]';
$newUrl = e107::getUrl()->create('download/list/category',$nextprevQry);
$nextprev_parms = $total_downloads . "," . $this->qry['view'] . "," . $this->qry['from'] . "," . $newUrl;
$text .= $tp->parseTemplate($DOWNLOAD_LIST_NEXTPREV, TRUE, $sc);

8
e107_plugins/download/templates/download_template.php

@ -573,7 +573,8 @@ $DOWNLOAD_TEMPLATE['list']['item'] = "
$DOWNLOAD_TEMPLATE['list']['end'] = "
<tr>
<td colspan='7' style='text-align:right;'><small class='muted text-muted'>{DOWNLOAD_LIST_TOTAL_AMOUNT} {DOWNLOAD_LIST_TOTAL_FILES}</small></td>
<td colspan='3'>{DOWNLOAD_BACK_TO_CATEGORY_LIST}</td>
<td colspan='4' style='text-align:right;'><small class='muted text-muted'>{DOWNLOAD_LIST_TOTAL_AMOUNT} {DOWNLOAD_LIST_TOTAL_FILES}</small></td>
</tr>
</table>
</div>
@ -584,10 +585,7 @@ $DOWNLOAD_TEMPLATE['list']['end'] = "
$DOWNLOAD_TEMPLATE['list']['nextprev'] = "
<div class='text-center'>
{DOWNLOAD_BACK_TO_CATEGORY_LIST}
<br />
<br />
{DOWNLOAD_LIST_NEXTPREV}
{DOWNLOAD_LIST_NEXTPREV}
</div>";
/*

2
e107_plugins/download/url/sef_url.php

@ -32,7 +32,7 @@ class plugin_download_sef_url extends eUrlConfig
'rules' => array(
'/' => array('list/index', 'legacyQuery' => '', ),
'Category/<id:{number}>/<name:{sefsecure}>' => array('list/category', 'legacyQuery' => 'list.{id}.{page}', ),
'Category/<id:{number}>/<name:{sefsecure}>' => array('list/category', 'allowVars'=> array('order','view','sort'), 'legacyQuery' => 'list.{id}.{view}.{order}.{sort}', ),
'<id:{number}>/<name:{sefsecure}>' => array('view/item', 'legacyQuery' => 'view.{id}' ),
'Get/<id:{number}>/<name:{sefsecure}>' => array('request/item', 'legacy'=> '{e_PLUGIN}download/request.php', 'legacyQuery' => 'view.{id}' ),
) // rule set array

11
e107_plugins/download/url/url.php

@ -61,8 +61,15 @@ class plugin_download_url extends eUrlConfig
break;
case 'category':
$this->legacyQueryString = 'action=list&id='.$params['id'];
return $base.'download.php?action=list&id='.$params['id'];
$url = 'action=list&id='.$params['id'];
if(isset($params['from']))
{
$url .= "&from=".$params['from']."&view=".$params['view']."&order=".$params['order']."&sort=".$params['sort'];
}
$this->legacyQueryString = $url;
return $base.'download.php?'.$url;
break;
}