BUG: Fixed recent items cookie.

Author: Charles Marion

core/AppController.php

@@ -31,23 +31,24 @@ public function preDispatch()
       }
     $user->setExpirationSeconds(60*Zend_Registry::get('configGlobal')->session->lifetime);
     $this->userSession=$user;
+    $this->view->recentItems=array();
     if ($user->Dao!=null)
       {
       $this->logged=true;
       $this->view->logged=true;
       $this->view->userDao=$user->Dao;
+      $cookieData =  $this->getRequest()->getCookie('recentItems'.$this->userSession->Dao->getKey());
+      $this->view->recentItems=array();
+      if(isset($cookieData))
+        {
+        $this->view->recentItems= unserialize($cookieData); 
+        } 
       }
     else
       {
       $this->view->logged=false;
       $this->logged=false;
       }
-    $cookieData =  $this->getRequest()->getCookie('recentItems');
-    $this->view->recentItems=array();
-    if(isset($cookieData))
-      {
-      $this->view->recentItems= unserialize($cookieData); 
-      } 
 
     $this->view->lang=Zend_Registry::get('configGlobal')->application->lang;
    //create a global javascript json array

core/controllers/InstallController.php

@@ -41,7 +41,6 @@ function indexAction()
     $this->view->writable=is_writable(BASE_PATH.'/core/configs');  
     $this->view->convertfound=$this->Component->Utility->IsImageMagickWorking();   
     $this->view->basePath=BASE_PATH;
-    setcookie("recentItems", '', time()+60*60*24*30,'/'); //30 days
     if(!empty($_POST)&&$this->view->writable)
       {
       $this->_redirect("/install/step2");

core/controllers/ItemController.php

@@ -42,32 +42,35 @@ function viewAction()
     $this->view->isAdmin=$this->Item->policyCheck($itemDao,$this->userSession->Dao,MIDAS_POLICY_ADMIN);
     $this->view->isModerator=$this->Item->policyCheck($itemDao,$this->userSession->Dao,MIDAS_POLICY_WRITE);
 
-    $request = $this->getRequest();
-    $cookieData = $request->getCookie('recentItems');
-    $recentItems=array();
-    if(isset($cookieData))
+    if($this->logged)
       {
-      $recentItems= unserialize($cookieData); 
-      }    
-    $tmp=array_reverse($recentItems);
-    $i=0;
-    foreach($tmp as $key=>$t)
-      {
-      if($t->getKey()==$itemDao->getKey())
+      $request = $this->getRequest();
+      $cookieData = $request->getCookie('recentItems'.$this->userSession->Dao->getKey());
+      $recentItems=array();
+      if(isset($cookieData))
         {
-        unset($tmp[$key]);
-        continue;
-        }
-      $i++;
-      if($i>10)
+        $recentItems= unserialize($cookieData); 
+        }    
+      $tmp=array_reverse($recentItems);
+      $i=0;
+      foreach($tmp as $key=>$t)
         {
-        unset($tmp[$key]);
+        if($t->getKey()==$itemDao->getKey())
+          {
+          unset($tmp[$key]);
+          continue;
+          }
+        $i++;
+        if($i>10)
+          {
+          unset($tmp[$key]);
+          }
         }
-      }
-    $recentItems=array_reverse($tmp);
-    $recentItems[]=$itemDao;
+      $recentItems=array_reverse($tmp);
+      $recentItems[]=$itemDao;
 
-    setcookie("recentItems", serialize($recentItems), time()+60*60*24*30,'/'); //30 days
+      setcookie('recentItems'.$this->userSession->Dao->getKey(), serialize($recentItems), time()+60*60*24*30,'/'); //30 days
+      }
     $itemRevision=$this->Item->getLastRevision($itemDao);
     $itemDao->lastrevision=$itemRevision;
     $itemDao->revisions=$itemDao->getRevisions();

core/models/cassandra/ItemModel.php

@@ -63,7 +63,7 @@ function getRandomItems($userDao=null,$policy=0,$limit=10,$thumbnailFilter=false
           ip.item_id is not null or
           ipg.item_id is not null)'
           )
-        ->limit($limit*2)
+        ->limit($limit)
         ;
     if($thumbnailFilter)
       {

core/models/pdo/ItemModel.php

@@ -174,7 +174,7 @@ function getRandomItems($userDao=null,$policy=0,$limit=10,$thumbnailFilter=false
           ip.item_id is not null or
           ipg.item_id is not null)'
           )
-        ->limit($limit*2)
+        ->limit($limit)
         ;
     if($thumbnailFilter)
       {