Make category function work with enabled shorturl mode. Refs #19. Pagination not yet working with this function

Author: hvorragend

src/modules/Feeds/lib/Feeds/Api/User.php

@@ -250,6 +250,14 @@ public function encodeurl($args)
             }
         }
 
+        // category function
+        if ($args['func'] == 'category' && isset($args['args']['cat'])) {
+            $vars .= $args['args']['cat'];
+            if (isset($args['args']['startnum'])) {
+                $vars .= '/startnum/'.$args['args']['startnum'];
+            }
+        }
+
         // for the display function use either the title (if present) or the page id
         if ($args['func'] == 'display') {
             // check for the generic object id parameter
@@ -276,6 +284,9 @@ public function encodeurl($args)
         } else {
             return $args['modname'] . '/' . $args['func'] . '/' . $vars . '/';
         }
+
+
+
     }
 
     /**
@@ -292,7 +303,7 @@ public function decodeurl($args)
         }
 
         // define the available user functions
-        $funcs = array('main', 'view', 'display');
+        $funcs = array('main', 'view', 'display', 'category');
         // set the correct function name based on our input
         if (empty($args['vars'][2])) {
             System::queryStringSetVar('func', 'main');
@@ -322,6 +333,13 @@ public function decodeurl($args)
             }
         }
 
+        // category function
+        if (FormUtil::getPassedValue('func') == 'category') {
+            if (is_numeric($args['vars'][$nextvar])) {
+                System::queryStringSetVar('cat', $args['vars'][$nextvar]);
+            }
+        }
+        
         // identify the correct parameter to identify the page
         if (FormUtil::getPassedValue('func') == 'display') {
             if (is_numeric($args['vars'][$nextvar])) {

src/modules/Feeds/lib/Feeds/Controller/User.php

@@ -255,6 +255,9 @@ function category($args)
             return LogUtil::registerError($this->__('Invalid category'));
         }
 
+        $rootCat = CategoryUtil::getCategoryByID($catregistry[$prop]);
+        $rootCat['path'] .= '/'; // add this to make the relative paths of the subcategories with ease
+
         // Get all matching feeds
         $items = ModUtil::apiFunc('Feeds', 'user', 'getall', array('category' => isset($catFilter) ? $catFilter : null,
                     'catregistry' => isset($catregistry) ? $catregistry : null));
@@ -270,17 +273,17 @@ function category($args)
                 $feed = ModUtil::apiFunc('Feeds', 'user', 'get', array('fid' => $item['fid']));
                 if ($feed != false) {
                     $furls[] = $feed['url'];
-                    $FeedLinkBack[$feed['url']] = array('name' => $feed['name'], 'fid' => $feed['fid'], 'url' => $feed['url']);
+                    $FeedLinkBack[DataUtil::formatForDisplayHTML($feed['url'])] = array('name' => $feed['name'], 'fid' => $feed['fid'], 'url' => $feed['url']);
                 }
             }
-
             // read the feed sources
             $FeedInfo = ModUtil::apiFunc('Feeds', 'user', 'getfeed', array('furl' => $furls, 'limit' => $modvars['multifeedlimit']));
         }
 
         // Display details of the item.
         $this->view->assign('lang', ZLanguage::getLanguageCode());
         $this->view->assign('catID', $cat);
+        $this->view->assign('rootCat', $rootCat);
         $this->view->assign('FeedLinkBack', $FeedLinkBack);
         $this->view->assign('category', $catInfo);
         $this->view->assign('property', $prop);

src/modules/Feeds/templates/user/category.tpl

@@ -12,7 +12,6 @@
 </div>
 
 <div class="feed-list">
-    <p>&nbsp;</p>
     {foreach from=$feeditems item='feeditem'}
     <div class="feeditem">
         {assign var='feeditemlink' value=$feeditem->get_link()}
@@ -26,12 +25,13 @@
         {if $feeditemauthorid}
             {assign var='feeditemauthor' value=$feeditemauthorid->get_name()}
         {/if}
+
         <div class="feeditem-title">
-            <a href="{$feeditemlink|safetext}" {if $modvars.Feeds.openinnewwindow eq 1}target="_blank"{/if}>{$feeditemtitle|safetext}</a>
+            <a href="{$feeditemlink}" {if $modvars.Feeds.openinnewwindow eq 1}target="_blank"{/if}>{$feeditemtitle|safetext}</a>
         </div>
         <div class="feeditem-info">
             {$feeditemdate|dateformat:'%I:%M %p %A, %B %e, %Y'}
-            &nbsp;-&nbsp;
+            &nbsp;
             <a href="{modurl modname='Feeds' type='user' func='display' fid=$FeedLinkInfo.fid}" title="{$FeedLinkInfo.name|safetext}">{$FeedLinkInfo.name|safetext}</a>
             &nbsp;
             {if $feeditemauthor neq ''}
@@ -40,9 +40,9 @@
         </div>
         <div class="feeditem-text">
             {if $feeditemdescription neq ''}
-                <p>{$feeditemdescription|safehtml}</p>
+                <div>{$feeditemdescription|safehtml}</div>
                 <div class="feeditem-more">
-                    <a href="{$feeditemlink|safetext}" {if $modvars.Feeds.openinnewwindow eq 1}target="_blank"{/if}>{gt text='Read more'}</a>
+                    <a href="{$feeditemlink}" {if $modvars.Feeds.openinnewwindow eq 1}target="_blank"{/if}>{gt text='Read more'}</a>
                 </div>
             {/if}
         </div>

src/modules/Feeds/templates/user/display.tpl

@@ -7,9 +7,9 @@
     {assign var='image' value=$feed->get_image_url()}
     {assign var='title' value=$feed->get_image_title()}
     {if $link neq ''}
-    <a href="{$link|safetext}"><img src="{$image}" alt="{$title|safetext}" /></a>
+    <a href="{$link}"><img src="{$image}" alt="{$title|safetext}" /></a>
     {else}
-    <img src="{$link|safetext}" alt="{$title|safetext}" />
+    <img src="{$link}" alt="{$title|safetext}" />
     {/if}
 </div>
 {/if}
@@ -32,7 +32,7 @@
         {assign var='feeditemauthor' value=$feeditemauthorid->get_name()}
         {/if}
         <h4 class="feeditem-title">
-            <a href="{$feeditemlink|safetext}" {if $modvars.Feeds.openinnewwindow eq 1}target="_blank"{/if}>{$feeditemtitle|safetext}</a>
+            <a href="{$feeditemlink}" {if $modvars.Feeds.openinnewwindow eq 1}target="_blank"{/if}>{$feeditemtitle|safetext}</a>
         </h4>
         <span class="feeditem-info" >
             {$feeditemdate|dateformat:'%I:%M %p %A, %B %e, %Y'}
@@ -44,7 +44,7 @@
         {if $feeditemdescription neq ''}
         <div class="feeditem-text">{$feeditemdescription|safehtml}</div>
         <span class="feeditem-more">
-            <a href="{$feeditemlink|safetext}" {if $modvars.Feeds.openinnewwindow eq 1}target="_blank"{/if}>{gt text='Read more'}</a>
+            <a href="{$feeditemlink}" {if $modvars.Feeds.openinnewwindow eq 1}target="_blank"{/if}>{gt text='Read more'}</a>
         </span>
         {/if}
     </div>