[Sciret-svn] SF.net SVN: sciret:[670] trunk/models

[<al...@us...>]

Revision: 670
          http://sciret.svn.sourceforge.net/sciret/?rev=670&view=rev
Author:   alpeb
Date:     2008-09-15 11:31:44 +0000 (Mon, 15 Sep 2008)

Log Message:
-----------
added some logic to handle scenario when some preferences haven't been set

Modified Paths:
--------------
    trunk/models/User.php
    trunk/models/Users.php

Modified: trunk/models/User.php
===================================================================
--- trunk/models/User.php	2008-09-15 11:15:00 UTC (rev 669)
+++ trunk/models/User.php	2008-09-15 11:31:44 UTC (rev 670)
@@ -46,12 +46,16 @@
 
     private function _initPreferencesArr($preferences)
     {
+        $defaultPreferences = Users::$preferences;
         $this->_preferencesArr = unserialize($preferences);
         if ($this->_preferencesArr['language'] == '') {
             $this->_preferencesArr['language'] = Zend_Registry::get('config')->general->language_default;
         }
+        if (!isset($this->_preferencesArr['startBrowsing'])) {
+            $this->_preferencesArr['startBrowsing'] = $defaultPreferences['startBrowsing'];
+        }
         if (!isset($this->_preferencesArr['hiddenCategories'])) {
-            $this->_preferencesArr['hiddenCategories'] = '';
+            $this->_preferencesArr['hiddenCategories'] = $defaultPreferences['hiddenCategories'];
         }
     }
 

Modified: trunk/models/Users.php
===================================================================
--- trunk/models/Users.php	2008-09-15 11:15:00 UTC (rev 669)
+++ trunk/models/Users.php	2008-09-15 11:31:44 UTC (rev 670)
@@ -6,21 +6,22 @@
     protected $_primary = 'id';
     protected $_rowClass = 'User';
 
+    public static $preferences = array(
+        'startBrowsing'     => 'all',
+        'articlesPerPage'   => 10,
+        'dateFormat'        => 'Month Day, Year',
+        'language'          => '',  // set in the constructor
+        'navigationType'    => 'catAndSubCats',
+        'hiddenCategories'  => '',
+    );
+
     public function createRow()
     {
-        $preferences = array(
-            'startBrowsing'     => 'all',
-            'articlesPerPage'   => 10,
-            'dateFormat'        => 'Month Day, Year',
-            'language'          => '',  // set in the constructor
-            'navigationType'    => 'catAndSubCats',
-            'hiddenCategories'  => '',
-        );
 
         return parent::createRow(array(
             'password_changed'       => '0000-00-00',
             'admin'                  => 0,
-            'preferences'            => serialize($preferences),
+            'preferences'            => serialize(self::$preferences),
         ));
     }
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.