mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-01 20:30:39 +02:00
Code Issues Releases Wiki Activity

Ability to order media items.

Browse Source
This commit is contained in:
Lóna Lore
2016-03-29 11:44:50 +02:00
parent 6b9838ae99
commit c54cc47832
4 changed files with 27 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
e107_handlers/media_class.php
View File

@@ -437,7 +437,7 @@ class e_media
* @param $search
* @return array
*/
public function getImages($cat='', $from=0, $amount=null,$search=null)
public function getImages($cat='', $from=0, $amount=null, $search=null, $orderby=null)
{
$inc = array();
$searchinc = array();
@@ -490,8 +490,15 @@ class e_media
{
$query .= " AND ( ".implode(" OR ",$searchinc)." ) " ;
}
$query .= " ORDER BY media_id DESC";
if($orderby)
{
$query .= " ORDER BY " . $orderby;
}
else
{
$query .= " ORDER BY media_id DESC";
}
if($amount == 'all')
{

7
e107_plugins/gallery/controllers/index.php
View File

@@ -165,8 +165,11 @@ class plugin_gallery_index_controller extends eControllerFront
$sc->amount = e107::getPlugPref('gallery','perpage', 12); // TODO Add Pref. amount per page.
$sc->curCat = $cid;
$sc->from = $request->getRequestParam('frm', 0);
$list = e107::getMedia()->getImages($cid,$sc->from,$sc->amount);
$plugPrefs = e107::getPlugConfig('gallery')->getPref();
$orderBy = varset($plugPrefs['orderby'], 'media_id DESC');
$list = e107::getMedia()->getImages($cid,$sc->from,$sc->amount,null,$orderBy);
$catname = $tp->toHtml($this->catList[$cid]['media_cat_title'],false,'defs');
$cat = $this->catList[$cid];

11
e107_plugins/gallery/e_shortcode.php
View File

@@ -183,8 +183,8 @@ class gallery_shortcodes extends e_shortcode
*/
function sc_gallery_portfolio($parms='')
{
$plugPrefs = e107::getPlugConfig('gallery')->getPref();
$orderBy = varset($plugPrefs['orderby'], 'media_id DESC');
$ns = e107::getRender();
$parm = eHelper::scParams($parms);
@@ -193,7 +193,7 @@ class gallery_shortcodes extends e_shortcode
$tmpl = e107::getTemplate('gallery','gallery');
$limit = vartrue($parm['limit'], 6);
$list = e107::getMedia()->getImages('gallery_image|gallery_'.$cat.'|gallery_image_'.$cat, 0, $limit);
$list = e107::getMedia()->getImages('gallery_image|gallery_'.$cat.'|gallery_image_'.$cat, 0, $limit, null, $orderBy);
if(count($list) < 1 && vartrue($parm['placeholder']))
{
@@ -228,13 +228,16 @@ class gallery_shortcodes extends e_shortcode
*/
function sc_gallery_slides($parm)
{
$plugPrefs = e107::getPlugConfig('gallery')->getPref();
$orderBy = varset($plugPrefs['orderby'], 'media_id DESC');
$tp = e107::getParser();
$this->slideMode = TRUE;
$parms = eHelper::scDualParams($parm);
$amount = $parms[1] ? intval($parms[1]) : 3; // vartrue(e107::getPlugPref('gallery','slideshow_perslide'),3);
$parms = $parms[2];
$limit = (integer) vartrue($parms['limit'], 16);
$list = e107::getMedia()->getImages('gallery_image|gallery_'.$this->sliderCat.'|gallery_image_'.$this->sliderCat,0,$limit);
$list = e107::getMedia()->getImages('gallery_image|gallery_'.$this->sliderCat.'|gallery_image_'.$this->sliderCat,0,$limit,null,$orderBy);
$tmpl = e107::getTemplate('gallery','gallery');
$tmpl = array_change_key_case($tmpl); // change template key to lowercase (BC fix)
$tmpl_key = vartrue($parms['template'],'slideshow_slide_item');

7
e107_plugins/gallery/gallery.php
View File

@@ -99,8 +99,11 @@ class gallery
$sc->amount = 12; // TODO Add Pref. amount per page.
$sc->curCat = $cat;
$sc->from = ($_GET['frm']) ? intval($_GET['frm']) : 0;
$list = e107::getMedia()->getImages($cat,$sc->from,$sc->amount);
$plugPrefs = e107::getPlugConfig('gallery')->getPref();
$orderBy = varset($plugPrefs['orderby'], 'media_id DESC');
$list = e107::getMedia()->getImages($cat, $sc->from, $sc->amount, null, $orderBy);
$catname = $tp->toHtml($this->catList[$cat]['media_cat_title'],false,'defs');
$inner = "";