[xoops-svn] SF.net SVN: xoops-svn:[10874] XoopsModules/extgallery/trunk/modules/ extgallery

[<be...@us...>]

Revision: 10874
          http://sourceforge.net/p/xoops/svn/10874
Author:   beckmi
Date:     2013-01-23 17:23:02 +0000 (Wed, 23 Jan 2013)
Log Message:
-----------
Adding missed $attributes['rel'] (Cesag/Mamba)

Modified Paths:
--------------
    XoopsModules/extgallery/trunk/modules/extgallery/public-album.php
    XoopsModules/extgallery/trunk/modules/extgallery/public-categories.php
    XoopsModules/extgallery/trunk/modules/extgallery/public-photo.php
    XoopsModules/extgallery/trunk/modules/extgallery/public-sendecard.php
    XoopsModules/extgallery/trunk/modules/extgallery/public-slideshow.php
    XoopsModules/extgallery/trunk/modules/extgallery/public-userphoto.php
    XoopsModules/extgallery/trunk/modules/extgallery/public-viewecard.php

Modified: XoopsModules/extgallery/trunk/modules/extgallery/public-album.php
===================================================================
--- XoopsModules/extgallery/trunk/modules/extgallery/public-album.php	2013-01-23 11:51:16 UTC (rev 10873)
+++ XoopsModules/extgallery/trunk/modules/extgallery/public-album.php	2013-01-23 17:23:02 UTC (rev 10874)
@@ -35,36 +35,36 @@
 	$start = intval($_GET['start']);
 }
 
-// HACK BLUETEEN TO SORT PHOTO BY USERS
-//photo_date - photo_title - photo_hits - photo_rating
-if((isset($_GET['sortby']) && ($_GET['sortby']=="photo_date" || $_GET['sortby']=="photo_title" || $_GET['sortby']=="photo_hits" || $_GET['sortby']=="photo_rating")  )) {
-        $sortby = $_GET['sortby'];
-} else {
-        $sortby = "photo_date";
-}
-
-//ASC ou DESC
-if((isset($_GET['orderby']) && ($_GET['orderby']=="DESC" || $_GET['orderby']=="ASC")  )) {
-        $orderby = $_GET['orderby'];
-} else {
-        $orderby = $GLOBALS['xoopsModuleConfig']['display_set_order'];
-}
-
-$SortbyOrderby = $sortby." ".$orderby;
-
+// HACK BLUETEEN TO SORT PHOTO BY USERS
+//photo_date - photo_title - photo_hits - photo_rating
+if((isset($_GET['sortby']) && ($_GET['sortby']=="photo_date" || $_GET['sortby']=="photo_title" || $_GET['sortby']=="photo_hits" || $_GET['sortby']=="photo_rating")  )) {
+        $sortby = $_GET['sortby'];
+} else {
+        $sortby = "photo_date";
+}
+
+//ASC ou DESC
+if((isset($_GET['orderby']) && ($_GET['orderby']=="DESC" || $_GET['orderby']=="ASC")  )) {
+        $orderby = $_GET['orderby'];
+} else {
+        $orderby = $GLOBALS['xoopsModuleConfig']['display_set_order'];
+}
+
+$SortbyOrderby = $sortby." ".$orderby;
+
 function convertorderbytrans($SortbyOrderby) {
-	         $orderbyTrans = array();
-            if ($SortbyOrderby == "photo_date DESC")   $orderbyTrans = _MD_EXTGALLERY_ORDERBY_DATEASC;
-            if ($SortbyOrderby == "photo_date ASC")    $orderbyTrans = _MD_EXTGALLERY_ORDERBY_DATEDESC;
-            if ($SortbyOrderby == "photo_title ASC")    $orderbyTrans = _MD_EXTGALLERY_ORDERBY_TITREASC;
-            if ($SortbyOrderby == "photo_title DESC")   $orderbyTrans = _MD_EXTGALLERY_ORDERBY_TITREDESC;
-            if ($SortbyOrderby == "uid ASC")    $orderbyTrans = _MD_EXTGALLERY_ORDERBY_DESIGNERASC;
-            if ($SortbyOrderby == "uid DESC")   $orderbyTrans = _MD_EXTGALLERY_ORDERBY_DESIGNERDESC;
-            if ($SortbyOrderby == "photo_hits DESC") $orderbyTrans = _MD_EXTGALLERY_ORDERBY_HITSASC;
-            if ($SortbyOrderby == "photo_hits ASC")   $orderbyTrans = _MD_EXTGALLERY_ORDERBY_HITSDESC;
-            if ($SortbyOrderby == "photo_rating DESC")  $orderbyTrans = _MD_EXTGALLERY_ORDERBY_NOTEASC;
-            if ($SortbyOrderby == "photo_rating ASC") $orderbyTrans = _MD_EXTGALLERY_ORDERBY_NOTEDESC;
-            return $orderbyTrans;
+	         $orderbyTrans = array();
+            if ($SortbyOrderby == "photo_date DESC")   $orderbyTrans = _MD_EXTGALLERY_ORDERBY_DATEASC;
+            if ($SortbyOrderby == "photo_date ASC")    $orderbyTrans = _MD_EXTGALLERY_ORDERBY_DATEDESC;
+            if ($SortbyOrderby == "photo_title ASC")    $orderbyTrans = _MD_EXTGALLERY_ORDERBY_TITREASC;
+            if ($SortbyOrderby == "photo_title DESC")   $orderbyTrans = _MD_EXTGALLERY_ORDERBY_TITREDESC;
+            if ($SortbyOrderby == "uid ASC")    $orderbyTrans = _MD_EXTGALLERY_ORDERBY_DESIGNERASC;
+            if ($SortbyOrderby == "uid DESC")   $orderbyTrans = _MD_EXTGALLERY_ORDERBY_DESIGNERDESC;
+            if ($SortbyOrderby == "photo_hits DESC") $orderbyTrans = _MD_EXTGALLERY_ORDERBY_HITSASC;
+            if ($SortbyOrderby == "photo_hits ASC")   $orderbyTrans = _MD_EXTGALLERY_ORDERBY_HITSDESC;
+            if ($SortbyOrderby == "photo_rating DESC")  $orderbyTrans = _MD_EXTGALLERY_ORDERBY_NOTEASC;
+            if ($SortbyOrderby == "photo_rating ASC") $orderbyTrans = _MD_EXTGALLERY_ORDERBY_NOTEDESC;
+            return $orderbyTrans;
 }
 
 // Check the access permission
@@ -93,7 +93,7 @@
 $catPath = $photoHandler->objectToArray($catHandler->getPath($catId));
 $xoopsTpl->assign('catPath', $catPath);
 
-$photos = $photoHandler->objectToArray($photoHandler->getAlbumPhotoPage($catId, $start, $sortby, $orderby),array('uid')); //xoops - blueteen - tri de l'affichage
+$photos = $photoHandler->objectToArray($photoHandler->getAlbumPhotoPage($catId, $start, $sortby, $orderby),array('uid')); //xoops - blueteen - tri de l'affichage
 
 // Plugin traitement
 $plugin = xoops_getmodulehandler('plugin', 'extgallery');
@@ -113,10 +113,10 @@
 
 // HACK DATE BY MAGE : DISPLAY PUBLICATION DATE
 foreach (array_keys($photos) as $i) {
-	if(isset($photos[$i]['photo_date'])){
-		$photos[$i]['photo_date'] = date(_SHORTDATESTRING, $photos[$i]['photo_date']);
+	if(isset($photos[$i]['photo_date'])){
+		$photos[$i]['photo_date'] = date(_SHORTDATESTRING, $photos[$i]['photo_date']);
 	}
-}
+}
 // END HACK DATE BY MAGE : DISPLAY PUBLICATION DATE
 
 $xoopsTpl->assign('photos', $photos);
@@ -163,6 +163,7 @@
 }
 
 $rel = "alternate";
+$attributes['rel'] = $rel;
 $attributes['type'] = "application/rss+xml";
 $attributes['title'] = _MD_EXTGALLERY_RSS;
 $attributes['href'] = XOOPS_URL."/modules/extgallery/public-rss.php";
@@ -178,8 +179,8 @@
 $xoopsTpl->assign('extgalleryName', $xoopsModule->getVar('name'));
 $xoopsTpl->assign('disp_ph_title', $xoopsModuleConfig['disp_ph_title']);
 
-$xoopsTpl->assign('extgalleryID', $catId); //xoops - blueteen - tri de l'affichage
-$xoopsTpl->assign('extgalleryStart', $start); //xoops -blueteen - tri de l'affichage
+$xoopsTpl->assign('extgalleryID', $catId); //xoops - blueteen - tri de l'affichage
+$xoopsTpl->assign('extgalleryStart', $start); //xoops -blueteen - tri de l'affichage
 $xoopsTpl->assign('extgallerySortbyOrderby', _MD_EXTGALLERY_ORDERBY.convertorderbytrans($SortbyOrderby)); //xoops - blueteen - tri de l'affichage
 
 //DNPROSSI - VOLTAN - added preferences option

Modified: XoopsModules/extgallery/trunk/modules/extgallery/public-categories.php
===================================================================
--- XoopsModules/extgallery/trunk/modules/extgallery/public-categories.php	2013-01-23 11:51:16 UTC (rev 10873)
+++ XoopsModules/extgallery/trunk/modules/extgallery/public-categories.php	2013-01-23 17:23:02 UTC (rev 10874)
@@ -53,6 +53,7 @@
 }
 
 $rel = "alternate";
+$attributes['rel'] = $rel;
 $attributes['type'] = "application/rss+xml";
 $attributes['title'] = _MD_EXTGALLERY_RSS;
 $attributes['href'] = XOOPS_URL."/modules/extgallery/public-rss.php";

Modified: XoopsModules/extgallery/trunk/modules/extgallery/public-photo.php
===================================================================
--- XoopsModules/extgallery/trunk/modules/extgallery/public-photo.php	2013-01-23 11:51:16 UTC (rev 10873)
+++ XoopsModules/extgallery/trunk/modules/extgallery/public-photo.php	2013-01-23 17:23:02 UTC (rev 10874)
@@ -98,6 +98,7 @@
 $xoTheme->addMeta('meta','description',$photo['photo_title']." - ".$cat['cat_desc']);
 
 $rel = "alternate";
+$attributes['rel'] = $rel;
 $attributes['type'] = "application/rss+xml";
 $attributes['title'] = _MD_EXTGALLERY_RSS;
 $attributes['href'] = XOOPS_URL."/modules/extgallery/public-rss.php";
@@ -171,7 +172,7 @@
 
 	// For xoops tag
 	if (($xoopsModuleConfig['usetag'] == 1) and (is_dir('../tag'))){
-		include_once XOOPS_ROOT_PATH."/modules/tag/include/tagbar.php";
+		include_once XOOPS_ROOT_PATH."/modules/tag/include/tagbar.php";
 		$xoopsTpl->assign('tagbar', tagBar($photo['photo_id'], $catid = 0));
 		$xoopsTpl->assign('tags', true);
 	} else {

Modified: XoopsModules/extgallery/trunk/modules/extgallery/public-sendecard.php
===================================================================
--- XoopsModules/extgallery/trunk/modules/extgallery/public-sendecard.php	2013-01-23 11:51:16 UTC (rev 10873)
+++ XoopsModules/extgallery/trunk/modules/extgallery/public-sendecard.php	2013-01-23 17:23:02 UTC (rev 10874)
@@ -122,6 +122,7 @@
 		$xoTheme->addMeta('meta','description',$photo->getVar('photo_desc'));
 		
 		$rel = "alternate";
+        $attributes['rel'] = $rel;
 		$attributes['type'] = "application/rss+xml";
 		$attributes['title'] = _MD_EXTGALLERY_RSS;
 		$attributes['href'] = XOOPS_URL."/modules/extgallery/public-rss.php";

Modified: XoopsModules/extgallery/trunk/modules/extgallery/public-slideshow.php
===================================================================
--- XoopsModules/extgallery/trunk/modules/extgallery/public-slideshow.php	2013-01-23 11:51:16 UTC (rev 10873)
+++ XoopsModules/extgallery/trunk/modules/extgallery/public-slideshow.php	2013-01-23 17:23:02 UTC (rev 10874)
@@ -62,6 +62,7 @@
 $xoopsTpl->assign('extgalleryName', $xoopsModule->getVar('name'));
 
 $rel = "alternate";
+$attributes['rel'] = $rel;
 $attributes['type'] = "application/rss+xml";
 $attributes['title'] = _MD_EXTGALLERY_RSS;
 $attributes['href'] = XOOPS_URL."/modules/extgallery/public-rss.php";

Modified: XoopsModules/extgallery/trunk/modules/extgallery/public-userphoto.php
===================================================================
--- XoopsModules/extgallery/trunk/modules/extgallery/public-userphoto.php	2013-01-23 11:51:16 UTC (rev 10873)
+++ XoopsModules/extgallery/trunk/modules/extgallery/public-userphoto.php	2013-01-23 17:23:02 UTC (rev 10874)
@@ -86,6 +86,7 @@
 $xoTheme->addMeta('meta','description', $photo['photo_title']." - ".$albumName);
 
 $rel = "alternate";
+$attributes['rel'] = $rel;
 $attributes['type'] = "application/rss+xml";
 $attributes['title'] = _MD_EXTGALLERY_RSS;
 $attributes['href'] = XOOPS_URL."/modules/extgallery/public-rss.php";
@@ -159,7 +160,7 @@
 
 	// For xoops tag
 	if (($xoopsModuleConfig['usetag'] == 1) and (is_dir('../tag'))){
-		include_once XOOPS_ROOT_PATH."/modules/tag/include/tagbar.php";
+		include_once XOOPS_ROOT_PATH."/modules/tag/include/tagbar.php";
 		$xoopsTpl->assign('tagbar', tagBar($photo['photo_id'], $catid = 0));
 		$xoopsTpl->assign('tags', true);
 	} else {

Modified: XoopsModules/extgallery/trunk/modules/extgallery/public-viewecard.php
===================================================================
--- XoopsModules/extgallery/trunk/modules/extgallery/public-viewecard.php	2013-01-23 11:51:16 UTC (rev 10873)
+++ XoopsModules/extgallery/trunk/modules/extgallery/public-viewecard.php	2013-01-23 17:23:02 UTC (rev 10874)
@@ -51,6 +51,7 @@
 $xoopsTpl->assign('ecard', $ecard);
 
 $rel = "alternate";
+$attributes['rel'] = $rel;
 $attributes['type'] = "application/rss+xml";
 $attributes['title'] = _MD_EXTGALLERY_RSS;
 $attributes['href'] = XOOPS_URL."/modules/extgallery/public-rss.php";