Changeset 6fd857ae18691442649d201cc1db549a7a348834

Timestamp:

07/10/10 14:23:07 (23 months ago)

Author:

pierre-alain <pierre-alain@…>

Parents:

b65617dfb78dbab5bbde209f510df899295f4b8f

Children:

91feee5fac0d14e679f6d7d780772e59897fb8b4

git-committer:

pierre-alain <pierre-alain@openwebreader.org> / 2010-07-10T14:23:07Z+0200

Message:

conventions renaming

Location:

OWR

Files:

• CLI/Controller.php (modified) (4 diffs)
• Controller.php (modified) (40 diffs)
• Interfaces/Model.php (moved) (moved from OWR/Interfaces/Logic.php) (2 diffs)
• Interfaces/Model/Response.php (moved) (moved from OWR/Interfaces/Logic/Response.php) (2 diffs)
• Model.php (moved) (moved from OWR/Logic.php) (6 diffs)
• Model/News.php (moved) (moved from OWR/Logic/News.php) (3 diffs)
• Model/News/Tags.php (moved) (moved from OWR/Logic/News/Tags.php) (2 diffs)
• Model/Objects.php (moved) (moved from OWR/Logic/Objects.php) (4 diffs)
• Model/Response.php (moved) (moved from OWR/Logic/Response.php) (4 diffs)
• Model/Streams.php (moved) (moved from OWR/Logic/Streams.php) (16 diffs)
• Model/Streams/Groups.php (moved) (moved from OWR/Logic/Streams/Groups.php) (4 diffs)
• Model/Users.php (moved) (moved from OWR/Logic/Users.php) (4 diffs)
• REST/Controller.php (modified) (16 diffs)
• Request.php (modified) (4 diffs)
• locale/en_US/LC_MESSAGES/messages.mo (modified) (previous)
• locale/en_US/LC_MESSAGES/messages.po (modified) (2 diffs)
• locale/fr_FR/LC_MESSAGES/messages.mo (modified) (previous)
• locale/fr_FR/LC_MESSAGES/messages.po (modified) (2 diffs)

OWR/CLI/Controller.php

@@ -54 +54 @@
     OWR\DAO as DAO,
     OWR\DB as DB,
-    OWR\Logic as Logic,
+    OWR\Model as Model,
     OWR\Threads as Threads,
     OWR\View\Utilities as Utilities;
@@ -236 +236 @@
     protected function do_checkStreamsAvailability()
     {
-        Logic::getCachedLogic('streams')->checkAvailability($this->_request);
+        Model::getCachedModel('streams')->checkAvailability($this->_request);
         $this->processResponse($this->_request->getResponse());
         return $this;
@@ -253 +253 @@
     protected function do_manageFavicons()
     {
-        Logic::getCachedLogic('streams')->manageFavicons($this->_request);
+        Model::getCachedModel('streams')->manageFavicons($this->_request);
         $this->processResponse($this->_request->getResponse());
         return $this;
@@ -267 +267 @@
     protected function do_refreshStream()
     {
-        Logic::getCachedLogic('streams')->refreshAll($this->_request);
+        Model::getCachedModel('streams')->refreshAll($this->_request);
         $this->processResponse($this->_request->getResponse());
         return $this;

OWR/Controller.php

@@ -37 +37 @@
 namespace OWR;
 use OWR\DB\Request as DBRequest,
-    OWR\Logic\Response as LogicResponse,
+    OWR\Model\Response as ModelResponse,
     OWR\View\Utilities;
 if(!defined('INC_CONFIG')) die('Please include config file');
@@ -584 +584 @@
 
     /**
-     * Process the response of a Logic call
+     * Process the response of a Model call
      *
      * @author Pierre-Alain Mignot <contact@openwebreader.org>
      * @access public
-     * @param mixed LogicResponse the response of the
-     */
-    public function processResponse(LogicResponse $response)
+     * @param mixed ModelResponse the response of the
+     */
+    public function processResponse(ModelResponse $response)
     {
         $status = $response->getStatus();
@@ -623 +623 @@
 
             default:
-                throw new Exception('Invalid return from Logic', Exception::E_OWR_DIE);
+                throw new Exception('Invalid return from Model', Exception::E_OWR_DIE);
                 break;
         }
@@ -699 +699 @@
             case 'new_contents':
                 $request = new Request(array('id' => $datas['id']));
-                Logic::getCachedLogic('news')->view($request);
+                Model::getCachedModel('news')->view($request);
                 $response = $request->getResponse();
                 if('error' !== $response->getNext())
@@ -727 +727 @@
                 $datas['details'] = array();
                 $request = new Request(array('id' => $datas['id']));
-                Logic::getCachedLogic('news')->view($request);
+                Model::getCachedModel('news')->view($request);
                 $response = $request->getResponse();
                 if('error' !== $response->getNext())
@@ -783 +783 @@
                     $streams = array($streams);
                 $request = new Request(array('id'=>null));
-                Logic::getCachedLogic('streams_groups')->view($request, array(), 'name');
+                Model::getCachedModel('streams_groups')->view($request, array(), 'name');
                 $response = $request->getResponse();
                 $groups = array();
@@ -803 +803 @@
                 {
                     $request->id = $s->rssid;
-                    Logic::getCachedLogic('streams')->view($request);
+                    Model::getCachedModel('streams')->view($request);
                     $response = $request->getResponse();
                     if('error' !== $response->getNext())
@@ -856 +856 @@
             case 'news_tags_contents':
                 $request = new Request(array(), true);
-                Logic::getCachedLogic('news_tags')->view($request, array('newsid' => $datas['id']));
+                Model::getCachedModel('news_tags')->view($request, array('newsid' => $datas['id']));
                 $response = $request->getResponse();
                 if('error' !== $response->getNext())
@@ -886 +886 @@
             case 'menu_part_stream':
                 $request = new Request(array('id' => $datas['id']));
-                Logic::getCachedLogic('streams')->view($request);
+                Model::getCachedModel('streams')->view($request);
                 $response = $request->getResponse();
                 if('error' !== $response->getNext())
@@ -950 +950 @@
                     }
                     $request = new Request(array('ids' => $datas['id'], 'getContents' => $datas['abstract']));
-                    Logic::getCachedLogic('news')->view($request, array(), $order, 'news.id', $offset);
+                    Model::getCachedModel('news')->view($request, array(), $order, 'news.id', $offset);
                     $datas['nbNews'] = count($datas['id']);
                 }
@@ -956 +956 @@
                 {
                     $request = new Request(array('id' => null, 'getContents' => $datas['abstract']));
-                    Logic::getCachedLogic('news')->view($request, array('status' => 1), $order, 'news.id', $offset);
+                    Model::getCachedModel('news')->view($request, array('status' => 1), $order, 'news.id', $offset);
                     $datas['nbNews'] = isset($this->_request->unreads[0]) ? $this->_request->unreads[0] : 0;
                 }
@@ -962 +962 @@
                 { // all news
                     $request = new Request(array('id' => null, 'getContents' => $datas['abstract']));
-                    Logic::getCachedLogic('news')->view($request, array(), $order, 'news.id', $offset);
+                    Model::getCachedModel('news')->view($request, array(), $order, 'news.id', $offset);
                     $nb = DAO::getCachedDAO('news_relations')->count(array(), 'newsid');
                     $datas['nbNews'] = $nb ? $nb->nb : 0;
@@ -989 +989 @@
                     if('streams' === $table)
                     {
-                        Logic::getCachedLogic('news')->view($request, array('rssid' => $datas['id']), $order, 'news.id', $offset);
+                        Model::getCachedModel('news')->view($request, array('rssid' => $datas['id']), $order, 'news.id', $offset);
                         $nb = DAO::getCachedDAO('news_relations')->count(array('rssid' => $datas['id']), 'newsid');
                         $datas['nbNews'] = $nb ? $nb->nb : 0;
@@ -995 +995 @@
                     elseif('streams_groups' === $table)
                     {
-                        Logic::getCachedLogic('news')->view($request, array('gid' => $datas['id']), $order, 'news.id', $offset);
+                        Model::getCachedModel('news')->view($request, array('gid' => $datas['id']), $order, 'news.id', $offset);
                         $nb = DAO::getCachedDAO('news_relations')->count(array('gid' => $datas['id']), 'newsid');
                         $datas['nbNews'] = $nb ? $nb->nb : 0;
@@ -1001 +1001 @@
                     elseif('news_tags' === $table)
                     {
-                        Logic::getCachedLogic('news')->view($request, array('tid' => $datas['id']), $order, 'news.id', $offset);
+                        Model::getCachedModel('news')->view($request, array('tid' => $datas['id']), $order, 'news.id', $offset);
                         $nb = DAO::getCachedDAO('news_relations_tags')->count(array('tid' => $datas['id']), 'newsid');
                         $datas['nbNews'] = $nb ? $nb->nb : 0;
@@ -1084 +1084 @@
 
                 $request = new Request(array('id'=>null));
-                Logic::getCachedLogic('streams_groups')->view($request, array(), 'name');
+                Model::getCachedModel('streams_groups')->view($request, array(), 'name');
                 $response = $request->getResponse();
                 $groups = array();
@@ -1165 +1165 @@
             case 'menu_tags_contents':
                 $request = new Request(array('id' => isset($datas['id']) ? $datas['id'] : null, 'ids' => isset($datas['ids']) ? $datas['ids'] : null));
-                Logic::getCachedLogic('news_tags')->view($request, array(), 'name');
+                Model::getCachedModel('news_tags')->view($request, array(), 'name');
                 $response = $request->getResponse();
                 if('error' !== $response->getNext())
@@ -1212 +1212 @@
                 $datas['streams'] = array();
                 $request = new Request(array('id'=>null));
-                Logic::getCachedLogic('streams')->view($request);
+                Model::getCachedModel('streams')->view($request);
                 $response = $request->getResponse();
                 if('error' !== $response->getNext())
@@ -1256 +1256 @@
                 $datas['timezones'] = $this->_user->getTimeZones();
                 $datas['userrights'] = $this->_user->getRights();
-                Logic::getCachedLogic('users')->view($request);
+                Model::getCachedModel('users')->view($request);
                 $response = $request->getResponse();
                 if('error' !== $response->getNext())
@@ -1276 +1276 @@
                 $datas['users'] = array();
                 $datas['nbusers'] = 0;
-                Logic::getCachedLogic('users')->view($request, array(), 'login');
+                Model::getCachedModel('users')->view($request, array(), 'login');
                 $response = $request->getResponse();
                 if('error' !== $response->getNext())
@@ -1307 +1307 @@
                     $args['rssid'] = $datas['id'];
                 $datas['news'] = $ids = array();
-                Logic::getCachedLogic('news')->view($request, $args);
+                Model::getCachedModel('news')->view($request, $args);
                 $response = $request->getResponse();
                 if('error' !== $response->getNext())
@@ -1421 +1421 @@
 
     /**
-     * Now functions that do not require a logic call
+     * Now functions that do not require a model call
      */
 
@@ -2066 +2066 @@
 
     /**
-     * Requires a call to a logic from here
+     * Requires a call to a model from here
      */
 
@@ -2078 +2078 @@
     protected function do_changeLang()
     {
-        Logic::getCachedLogic('users')->changeLang($this->_request);
+        Model::getCachedModel('users')->changeLang($this->_request);
         $this->processResponse($this->_request->getResponse());
         return $this;
@@ -2092 +2092 @@
     protected function do_stats()
     {
-        Logic::getCachedLogic('users')->stat($this->_request);
+        Model::getCachedModel('users')->stat($this->_request);
         $this->processResponse($this->_request->getResponse());
         return $this;
@@ -2273 +2273 @@
     protected function do_move()
     {
-        Logic::getCachedLogic('streams')->move($this->_request);
+        Model::getCachedModel('streams')->move($this->_request);
         $this->processResponse($this->_request->getResponse());
         return $this;
@@ -2290 +2290 @@
         if(!$this->_request->id)
         {
-            Logic::getCachedLogic('users')->deleteRelated($this->_request);
+            Model::getCachedModel('users')->deleteRelated($this->_request);
             if(!$this->processResponse($this->_request->getResponse())) return $this;
         }
@@ -2300 +2300 @@
             {
                 case 'users':
-                    Logic::getCachedLogic('users')->delete($this->_request);
+                    Model::getCachedModel('users')->delete($this->_request);
                     if(!$this->processResponse($this->_request->getResponse())) return $this;
                     $escape = true;
@@ -2309 +2309 @@
                 case 'streams_groups':
                 case 'news_tags':
-                    Logic::getCachedLogic($type)->delete($this->_request);
+                    Model::getCachedModel($type)->delete($this->_request);
                     if(!$this->processResponse($this->_request->getResponse())) return $this;
                     break;
@@ -2358 +2358 @@
         $this->_request->escape = isset($url);
 
-        Logic::getCachedLogic('streams')->edit($this->_request);
+        Model::getCachedModel('streams')->edit($this->_request);
         $this->processResponse($this->_request->getResponse());
 
@@ -2378 +2378 @@
         $this->_request->escape = isset($name);
 
-        Logic::getCachedLogic('streams_groups')->edit($this->_request);
+        Model::getCachedModel('streams_groups')->edit($this->_request);
         if(!$this->processResponse($this->_request->getResponse())) return $this;
 
@@ -2409 +2409 @@
         $this->_request->escape = isset($url);
 
-        Logic::getCachedLogic('streams')->editOPML($this->_request);
+        Model::getCachedModel('streams')->editOPML($this->_request);
         if(!$this->processResponse($this->_request->getResponse())) return $this;
 
@@ -2498 +2498 @@
     protected function do_refreshStream()
     {
-        Logic::getCachedLogic('streams')->refresh($this->_request);
+        Model::getCachedModel('streams')->refresh($this->_request);
         $this->processResponse($this->_request->getResponse());
 
@@ -2513 +2513 @@
     protected function do_upNew()
     {
-        Logic::getCachedLogic('news')->update($this->_request);
+        Model::getCachedModel('news')->update($this->_request);
         $this->processResponse($this->_request->getResponse());
 
@@ -2528 +2528 @@
     protected function do_clearStream()
     {
-        Logic::getCachedLogic('streams')->clear($this->_request);
+        Model::getCachedModel('streams')->clear($this->_request);
         $this->processResponse($this->_request->getResponse());
 
@@ -2545 +2545 @@
     protected function do_editUser()
     {
-        Logic::getCachedLogic('users')->edit($this->_request);
+        Model::getCachedModel('users')->edit($this->_request);
         $this->processResponse($this->_request->getResponse());
 
@@ -2560 +2560 @@
     protected function do_editTag()
     {
-        Logic::getCachedLogic('news_tags')->edit($this->_request);
+        Model::getCachedModel('news_tags')->edit($this->_request);
         $this->processResponse($this->_request->getResponse());
 
@@ -2575 +2575 @@
     protected function do_editTagsRelations()
     {
-        Logic::getCachedLogic('news_tags')->editRelations($this->_request);
+        Model::getCachedModel('news_tags')->editRelations($this->_request);
         $this->processResponse($this->_request->getResponse());
 
@@ -2592 +2592 @@
         if(!$this->_request->id)
         {
-            $this->processResponse(new LogicResponse(array(
+            $this->processResponse(new ModelResponse(array(
                 'do'        => 'error',
                 'error'     => 'Invalid id',
@@ -2607 +2607 @@
             case 'streams_groups':
             case 'news_tags':
-                Logic::getCachedLogic($type)->rename($this->_request);
+                Model::getCachedModel($type)->rename($this->_request);
                 if(!$this->processResponse($this->_request->getResponse())) return $this;
                 break;
 
             default:
-                $this->processResponse(new LogicResponse(array(
+                $this->processResponse(new ModelResponse(array(
                     'do'        => 'error',
                     'error'     => 'Invalid id',

OWR/Interfaces/Model.php

@@ -1 +1 @@
 <?php
 /**
- * Interface for all logics
+ * Interface for all models
  *
  * PHP 5
@@ -42 +42 @@
  * @subpackage Interfaces
  */
-interface Logic
+interface Model
 {
     /**
-     * Returns the specified Logic object
+     * Returns the specified Model object
      *
      * @access public
      * @static
      * @author Pierre-Alain Mignot <contact@openwebreader.org>
-     * @param string $logic the name of the Logic
-     * @return mixed the Logic object
+     * @param string $model the name of the Model
+     * @return mixed the Model object
      */
-    static public function getLogic($logic);
+    static public function getModel($model);
 
     /**
-     * Returns the specified Logic object from cache
+     * Returns the specified Model object from cache
      *
      * @access public
      * @static
      * @author Pierre-Alain Mignot <contact@openwebreader.org>
-     * @param string $logic the name of the Logic
-     * @return mixed the Logic object
+     * @param string $model the name of the Model
+     * @return mixed the Model object
      */
-    static public function getCachedLogic($logic);
+    static public function getCachedModel($model);
 
     /**

OWR/Interfaces/Model/Response.php

@@ -1 +1 @@
 <?php
 /**
- * Interface for all ResponseLogic
+ * Interface for all ResponseModel
  *
  * PHP 5
@@ -35 +35 @@
  * @subpackage Interfaces
  */
-namespace OWR\Interfaces\Logic;
+namespace OWR\Interfaces\Model;
 /**
  * This class is used to declare public functions

OWR/Model.php

@@ -1 +1 @@
 <?php
 /**
- * Logic Object base class
+ * Model Object base class
  *
  * PHP 5
@@ -35 +35 @@
  */
 namespace OWR;
-use OWR\Interfaces\Logic as iLogic,
+use OWR\Interfaces\Model as iModel,
     OWR\User;
 /**
@@ -42 +42 @@
  *
  * @abstract
- * @uses OWR\Interfaces\Logic implements the Logic interface
+ * @uses OWR\Interfaces\Model implements the Model interface
  * @uses OWR\DB the database link
  * @uses OWR\Request a request sent to the database
@@ -50 +50 @@
  * @package OWR
  */
-abstract class Logic implements iLogic
+abstract class Model implements iModel
 {
     /**
@@ -77 +77 @@
 
     /**
-    * @var array stored already processed logic names
+    * @var array stored already processed model names
     * @access private
     * @static
     */
-    static private $_logics = array();
+    static private $_models = array();
 
     /**
-    * @var array stored already processed logics objects
+    * @var array stored already processed models objects
     * @access private
     * @static
     */
-    static private $_cachedLogics = array();
+    static private $_cachedModels = array();
 
     /**
@@ -100 +100 @@
         $this->_db = DB::iGet(); // we assume here that the connexion has already been done, be carefull
         $this->_fullName = get_called_class();
-        $this->_name = str_replace('\\', '_', substr($this->_fullName, strlen(__NAMESPACE__.'_Logic_')));
+        $this->_name = str_replace('\\', '_', substr($this->_fullName, strlen(__NAMESPACE__.'_Model_')));
         $this->_dao = DAO::getDAO($this->_name);
     }
 
     /**
-     * Returns the specified Logic object
+     * Returns the specified Model object
      *
      * @access public
      * @static
      * @author Pierre-Alain Mignot <contact@openwebreader.org>
-     * @param string $logic the name of the Logic
-     * @return mixed the Logic object
+     * @param string $model the name of the Model
+     * @return mixed the Model object
      */
-    static public function getLogic($logic)
+    static public function getModel($model)
     {
-        if(!isset(self::$_logics[$logic]))
+        if(!isset(self::$_models[$model]))
         {
-            $c = __NAMESPACE__.'\Logic\\'.join('\\', array_map('ucfirst', explode('_', (string) $logic)));;
-            self::$_logics[$logic] = $c;
+            $c = __NAMESPACE__.'\Model\\'.join('\\', array_map('ucfirst', explode('_', (string) $model)));;
+            self::$_models[$model] = $c;
         }
-        return new self::$_logics[$logic];
+        return new self::$_models[$model];
     }
 
     /**
-     * Returns the specified Logic object from cache
+     * Returns the specified Model object from cache
      *
      * @access public
      * @static
      * @author Pierre-Alain Mignot <contact@openwebreader.org>
-     * @param string $logic the name of the Logic
-     * @return mixed the Logic object
+     * @param string $model the name of the Model
+     * @return mixed the Model object
      */
-    static public function getCachedLogic($logic)
+    static public function getCachedModel($model)
     {
-        $logic = ucfirst((string) $logic);
-        isset(self::$_cachedLogics[$logic]) || (self::$_cachedLogics[$logic] = self::getLogic($logic));
+        $model = ucfirst((string) $model);
+        isset(self::$_cachedModels[$model]) || (self::$_cachedModels[$model] = self::getModel($model));
 
-        return self::$_cachedLogics[$logic];
+        return self::$_cachedModels[$model];
     }
 }

OWR/Model/News.php

@@ -1 +1 @@
 <?php
 /**
- * Logic for 'news' object
+ * Model for 'news' object
  *
  * PHP 5
@@ -33 +33 @@
  * @license http://www.gnu.org/copyleft/gpl.html
  * @package OWR
- * @subpackage Logic
+ * @subpackage Model
  */
-namespace OWR\Logic;
-use OWR\Logic,
+namespace OWR\Model;
+use OWR\Model,
     OWR\Request,
     OWR\Exception,
@@ -46 +46 @@
  * This class is used to add/edit/delete news
  * @package OWR
- * @subpackage Logic
- * @uses OWR\Logic extends the base class
+ * @subpackage Model
+ * @uses OWR\Model extends the base class
  * @uses OWR\Request the request
  * @uses OWR\Exception the exception handler
  * @uses OWR\DAO the DAO
  * @uses OWR\Logs the log object
- * @subpackage Logic
+ * @subpackage Model
  */
-class News extends Logic
+class News extends Model
 {
     /**

OWR/Model/News/Tags.php

@@ -1 +1 @@
 <?php
 /**
- * Logic for 'news_tags' object
+ * Model for 'news_tags' object
  *
  * PHP 5
@@ -33 +33 @@
  * @license http://www.gnu.org/copyleft/gpl.html
  * @package OWR
- * @subpackage Logic
+ * @subpackage Model
  */
-namespace OWR\Logic\News;
-use OWR\Logic,
+namespace OWR\Model\News;
+use OWR\Model,
     OWR\Request,
     OWR\Exception,
     OWR\DAO,
-    OWR\Logic\Response,
+    OWR\Model\Response,
     OWR\Config;
 /**
  * This class is used to add/edit/delete tags
  * @package OWR
- * @subpackage Logic
- * @uses OWR\Logic extends the base class
+ * @subpackage Model
+ * @uses OWR\Model extends the base class
  * @uses OWR\Request the request
  * @uses OWR\Exception the exception handler
  * @uses OWR\DAO the DAO
- * @subpackage Logic
+ * @subpackage Model
  */
-class Tags extends Logic
+class Tags extends Model
 {
     /**

OWR/Model/Objects.php

@@ -1 +1 @@
 <?php
 /**
- * Logic for 'objects' object
+ * Model for 'objects' object
  *
  * PHP 5
@@ -33 +33 @@
  * @license http://www.gnu.org/copyleft/gpl.html
  * @package OWR
- * @subpackage Logic
+ * @subpackage Model
  */
-namespace OWR\Logic;
-use OWR\Logic,
+namespace OWR\Model;
+use OWR\Model,
     OWR\Request,
     OWR\Exception,
@@ -43 +43 @@
  * This class is used to add/delete objects
  * @package OWR
- * @subpackage Logic
- * @uses OWR\Logic extends the base class
+ * @subpackage Model
+ * @uses OWR\Model extends the base class
  * @uses OWR\Request the request
  * @uses OWR\Exception the exception handler
  * @uses OWR\DAO the DAO
- * @uses OWR\Request a request sent to the logic
- * @subpackage Logic
+ * @uses OWR\Request a request sent to the model
+ * @subpackage Model
  */
-class Objects extends Logic
+class Objects extends Model
 {
     /**
@@ -156 +156 @@
         {
             $r->id = $type['id'];
-            parent::getCachedLogic($type['type'])->view($r, $args, $order, $groupby, 1);
+            parent::getCachedModel($type['type'])->view($r, $args, $order, $groupby, 1);
             $response = $r->getResponse();
             if('error' !== $response->getNext())

OWR/Model/Response.php

@@ -1 +1 @@
 <?php
 /**
- * Class representing a response from every call to a Logic
- * If we a logic returns this object, it means that no blocking errors have been encountered
- * Else the Logic will throw an Exception
+ * Class representing a response from every call to a Model
+ * If we a model returns this object, it means that no blocking errors have been encountered
+ * Else the Model will throw an Exception
  *
  * PHP 5
@@ -35 +35 @@
  * @license http://www.gnu.org/copyleft/gpl.html
  * @package OWR
- * @subpackage Logic
+ * @subpackage Model
  */
-namespace OWR\Logic;
-use OWR\Interfaces\Logic\Response as iResponse,
+namespace OWR\Model;
+use OWR\Interfaces\Model\Response as iResponse,
     OWR\Exception,
     OWR\View\Utilities as ViewUtilities;
 /**
- * This class is an object response of every logic call
+ * This class is an object response of every model call
  * @package OWR
- * @subpackage Logic
+ * @subpackage Model
  */
 class Response implements iResponse
@@ -94 +94 @@
 
     /**
-     * @var boolean true if the logic returns datas and if it contains more than one row
+     * @var boolean true if the model returns datas and if it contains more than one row
      * @access protected
      */
@@ -136 +136 @@
 
                 default:
-                    throw new Exception('Invalid return from Logic', Exception::E_OWR_DIE);
+                    throw new Exception('Invalid return from Model', Exception::E_OWR_DIE);
                     break;
             }

OWR/Model/Streams.php

@@ -1 +1 @@
 <?php
 /**
- * Logic for 'streams' object
+ * Model for 'streams' object
  *
  * PHP 5
@@ -33 +33 @@
  * @license http://www.gnu.org/copyleft/gpl.html
  * @package OWR
- * @subpackage Logic
+ * @subpackage Model
  */
-namespace OWR\Logic;
-use OWR\Logic,
+namespace OWR\Model;
+use OWR\Model,
     OWR\Request,
     OWR\Exception,
@@ -53 +53 @@
  * This class is used to add/edit/delete stream and his related tables
  * @package OWR
- * @subpackage Logic
- * @uses OWR\Logic extends the base class
+ * @subpackage Model
+ * @uses OWR\Model extends the base class
  * @uses OWR\Request the request
  * @uses OWR\Exception the exception handler
@@ -62 +62 @@
  * @uses OWR\Logs the logs object
  * @uses OWR\Cron add/modify crontab
- * @subpackage Logic
+ * @subpackage Model
  */
-class Streams extends Logic
+class Streams extends Model
 {
     /**
@@ -85 +85 @@
         }
 
-        parent::getCachedLogic('streams_groups')->checkGroupById($request); // fill gid and gname
+        parent::getCachedModel('streams_groups')->checkGroupById($request); // fill gid and gname
 
         $request->url = html_entity_decode($request->url, ENT_COMPAT, 'UTF-8');
@@ -150 +150 @@
                 if(is_array($news))
                 {
-                    $logic = parent::getCachedLogic('news');
+                    $model = parent::getCachedModel('news');
 
                     foreach($news as $new)
                     {
                         $r->id = $new->id;
-                        $logic->insertNewsRelations($r);
+                        $model->insertNewsRelations($r);
                         $response = $r->getResponse();
                         if('error' === $response->getNext())
@@ -165 +165 @@
                 {
                     $r->id = $news->id;
-                    parent::getCachedLogic('news')->insertNewsRelations($r);
+                    parent::getCachedModel('news')->insertNewsRelations($r);
                     $response = $r->getResponse();
                     if('error' === $response->getNext())
@@ -408 +408 @@
         if(empty($request->escapeNews))
         { // save the news
-            $logic = parent::getCachedLogic('news');
+            $model = parent::getCachedModel('news');
             $r = clone($request);
             $r->streamid = $request->id;
@@ -416 +416 @@
                 try
                 {
-                    $logic->edit($r);
+                    $model->edit($r);
                     $response = $r->getResponse();
                     if('error' === $response->getNext())
@@ -618 +618 @@
         }
 
-        parent::getCachedLogic('streams_groups')->checkGroupById($request);
+        parent::getCachedModel('streams_groups')->checkGroupById($request);
 
         $stream->gid = $request->gid;
@@ -732 +732 @@
 
         $r = clone($request);
-        $logic = parent::getCachedLogic('news');
+        $model = parent::getCachedModel('news');
         $ids = array();
         while($r->item = $stream->get('item'))
@@ -739 +739 @@
             {
                 $r->streamid = $request->id;
-                $logic->edit($r);
+                $model->edit($r);
                 $ids[] = $r->id;
                 $response = $r->getResponse();
@@ -1423 +1423 @@
         User::iGet()->checkToken();
 
-        parent::getCachedLogic('streams_groups')->checkGroupById($request);
+        parent::getCachedModel('streams_groups')->checkGroupById($request);
         $erase = false;
 
@@ -1477 +1477 @@
         $r = clone($request);
         $r->gid = 0;
-        parent::getCachedLogic('streams_groups')->checkGroupById($r);
+        parent::getCachedModel('streams_groups')->checkGroupById($r);
         $gidRoot = $r->gid;
         unset($r);
@@ -1485 +1485 @@
         $ids = array();
 
-        $streamsGroupsLogic = parent::getCachedLogic('streams_groups');
+        $streamsGroupsModel = parent::getCachedModel('streams_groups');
         $r = clone($request);
         $sr = clone($request);
@@ -1519 +1519 @@
                             $r->id = 0;
                             $r->name = $stream['folder'];
-                            $streamsGroupsLogic->edit($r);
+                            $streamsGroupsModel->edit($r);
                             $response = $r->getResponse();
                             if('error' === $response->getNext())

OWR/Model/Streams/Groups.php

@@ -1 +1 @@
 <?php
 /**
- * Logic for 'streams_groups' object
+ * Model for 'streams_groups' object
  *
  * PHP 5
@@ -33 +33 @@
  * @license http://www.gnu.org/copyleft/gpl.html
  * @package OWR
- * @subpackage Logic
+ * @subpackage Model
  */
-namespace OWR\Logic\Streams;
-use OWR\Logic,
+namespace OWR\Model\Streams;
+use OWR\Model,
     OWR\Request,
     OWR\Exception,
     OWR\DAO,
-    OWR\Logic\Response,
+    OWR\Model\Response,
     OWR\Config;
 /**
  * This class is used to add/edit/delete groups
  * @package OWR
- * @subpackage Logic
- * @uses OWR\Logic extends the base class
+ * @subpackage Model
+ * @uses OWR\Model extends the base class
  * @uses OWR\Request the request
  * @uses OWR\Exception the exception handler
  * @uses OWR\DAO the DAO
- * @subpackage Logic
+ * @subpackage Model
  */
-class Groups extends Logic
+class Groups extends Model
 {
     /**
@@ -147 +147 @@
                 if(is_array($streamids))
                 {
-                    $logic = parent::getCachedLogic('streams');
+                    $model = parent::getCachedModel('streams');
                     foreach($streamids as $rss)
                     {
                         $r->id = $rss->rssid;
-                        $logic->delete($r);
+                        $model->delete($r);
                         $response = $r->getResponse();
                         if('error' === $response->getNext())
@@ -160 +160 @@
                 {
                     $r->id = $streamids->rssid;
-                    parent::getCachedLogic('streams')->delete($r);
+                    parent::getCachedModel('streams')->delete($r);
                     $response = $r->getResponse();
                     if('error' === $response->getNext())

OWR/Model/Users.php

@@ -1 +1 @@
 <?php
 /**
- * Logic for 'users' object
+ * Model for 'users' object
  *
  * PHP 5
@@ -33 +33 @@
  * @license http://www.gnu.org/copyleft/gpl.html
  * @package OWR
- * @subpackage Logic
+ * @subpackage Model
  */
-namespace OWR\Logic;
-use OWR\Logic,
+namespace OWR\Model;
+use OWR\Model,
     OWR\Request,
     OWR\Exception,
@@ -46 +46 @@
  * This class is used to add/edit/delete users and his related tables ()
  * @package OWR
- * @uses OWR\Logic extends the base class
+ * @uses OWR\Model extends the base class
  * @uses OWR\Request the request
  * @uses OWR\Exception the exception handler
@@ -53 +53 @@
  * @uses OWR\DB\Request a request sent to DB
  * @uses OWR\Object transforms an object to an array
- * @subpackage Logic
+ * @subpackage Model
  */
-class Users extends Logic
+class Users extends Model
 {
     /**

OWR/REST/Controller.php

@@ -50 +50 @@
     OWR\DAO,
     OWR\XML,
-    OWR\Logic\Response as LogicResponse,
+    OWR\Model\Response as ModelResponse,
     OWR\Cron,
-    OWR\Logic;
+    OWR\Model;
 if(!defined('INC_CONFIG')) die('Please include config file');
 /**
@@ -70 +70 @@
  * @uses OWR\XML serialize/unserialize XML datas
  * @uses OWR\Cron adds/modify crontab
- * @uses OWR\Logic the main Logic object
+ * @uses OWR\Model the main Model object
  * @package OWR
  * @subpackage Rest
@@ -258 +258 @@
 
     /**
-     * Process the response of a Logic call
+     * Process the response of a Model call
      *
      * @author Pierre-Alain Mignot <contact@openwebreader.org>
      * @access public
-     * @param mixed LogicResponse the response of the
+     * @param mixed ModelResponse the response of the
      */
-    public function processResponse(LogicResponse $response = null)
+    public function processResponse(ModelResponse $response = null)
     {
         $status = $response->getStatus();
@@ -311 +311 @@
 
             default:
-                throw new Exception('Invalid return from Logic', Exception::E_OWR_DIE);
+                throw new Exception('Invalid return from Model', Exception::E_OWR_DIE);
                 break;
         }
@@ -445 +445 @@
             case 'new_contents':
                 $request = new Request($datas);
-                Logic::getCachedLogic('news')->view($request);
+                Model::getCachedModel('news')->view($request);
                 $response = $request->getResponse();
                 if('error' !== $response->getNext())
@@ -462 +462 @@
                 $page['details'] = array();
                 $request = new Request($datas);
-                Logic::getCachedLogic('news')->view($request);
+                Model::getCachedModel('news')->view($request);
                 $response = $request->getResponse();
                 if('error' !== $response->getNext())
@@ -517 +517 @@
                     $streams = array($streams);
                 $request = new Request(array('id'=>null));
-                Logic::getCachedLogic('streams_groups')->view($request);
+                Model::getCachedModel('streams_groups')->view($request);
                 $response = $request->getResponse();
                 $groups = array();
@@ -540 +540 @@
                 {
                     $request->id = $s->rssid;
-                    Logic::getCachedLogic('streams')->view($request);
+                    Model::getCachedModel('streams')->view($request);
                     $response = $request->getResponse();
                     if('error' !== $response->getNext())
@@ -565 +565 @@
             case 'menu_part_stream':
                 $request = new Request($datas);
-                Logic::getCachedLogic('streams')->view($request);
+                Model::getCachedModel('streams')->view($request);
                 $response = $request->getResponse();
                 if('error' !== $response->getNext())
@@ -624 +624 @@
                     }
                     $request = new Request(array('ids' => $datas['id']));
-                    Logic::getCachedLogic('news')->view($request, array(), $order, 'news.id', $offset);
+                    Model::getCachedModel('news')->view($request, array(), $order, 'news.id', $offset);
                     $page['nbNews'] = count($datas['id']);
                 }
@@ -630 +630 @@
                 {
                     $request = new Request(array('id' => null));
-                    Logic::getCachedLogic('news')->view($request, array('status' => 1), $order, 'news.id', $offset);
+                    Model::getCachedModel('news')->view($request, array('status' => 1), $order, 'news.id', $offset);
                     $page['nbNews'] = $this->_request->unreads[0];
                 }
@@ -656 +656 @@
                     if('streams' === $table)
                     {
-                        Logic::getCachedLogic('news')->view($request, array('rssid' => $datas['id']), $order, 'news.id', $offset);
+                        Model::getCachedModel('news')->view($request, array('rssid' => $datas['id']), $order, 'news.id', $offset);
                         $nb = DAO::getCachedDAO('news_relations')->count(array('rssid' => $datas['id']), 'newsid');
                         $page['nbNews'] = $nb ? $nb->nb : 0;
@@ -662 +662 @@
                     elseif('streams_groups' === $table)
                     {
-                        Logic::getCachedLogic('news')->view($request, array('gid' => $datas['id']), $order, 'news.id', $offset);
+                        Model::getCachedModel('news')->view($request, array('gid' => $datas['id']), $order, 'news.id', $offset);
                         $nb = DAO::getCachedDAO('news_relations')->count(array('streams_relations.gid' => $datas['id']), 'newsid');
                         $page['nbNews'] = $nb ? $nb->nb : 0;
@@ -743 +743 @@
                 $page['userrights'] = $this->_user->getRights();
                 $cacheTime = 0;
-                Logic::getCachedLogic('users')->view($request);
+                Model::getCachedModel('users')->view($request);
                 $response = $request->getResponse();
                 if('error' !== $response->getNext())
@@ -761 +761 @@
                 $cacheTime = 0;
                 $datas['surl'] = $this->_cfg->get('surl');
-                Logic::getCachedLogic('users')->view($request, array(), 'login');
+                Model::getCachedModel('users')->view($request, array(), 'login');
                 $response = $request->getResponse();
                 if('error' !== $response->getNext())
@@ -863 +863 @@
         }
 
-        $this->_request->page = Logic::getCachedLogic($type)->view($this->_request, array(), $order, '', $offset);
+        $this->_request->page = Model::getCachedModel($type)->view($this->_request, array(), $order, '', $offset);
         $this->processResponse($this->_request->getResponse());
 

OWR/Request.php

@@ -36 +36 @@
  */
 namespace OWR;
-use OWR\Logic\Response as LogicResponse;
+use OWR\Model\Response as ModelResponse;
 /**
  * This object is sent to the Controller to be executed
@@ -52 +52 @@
 
     /**
-    * @var mixed the Logic\Response instance
+    * @var mixed the Model\Response instance
     * @access protected
     */
@@ -282 +282 @@
 
     /**
-     * Sets the response of a Logic call
+     * Sets the response of a Model call
      *
      * @access public
      * @static
      * @author Pierre-Alain Mignot <contact@openwebreader.org>
-     * @param mixed $response the Logic\Response instance
-     */
-    public function setResponse(LogicResponse $response)
+     * @param mixed $response the Model\Response instance
+     */
+    public function setResponse(ModelResponse $response)
     {
         $this->_response = $response;
@@ -295 +295 @@
 
     /**
-     * Returns the response of a Logic call
+     * Returns the response of a Model call
      *
      * @access public
      * @static
      * @author Pierre-Alain Mignot <contact@openwebreader.org>
-     * @return mixed $response the Logic\Response instance
+     * @return mixed $response the Model\Response instance
      */
     public function getResponse()

OWR/locale/en_US/LC_MESSAGES/messages.po

@@ -27 +27 @@
 "Report-Msgid-Bugs-To: pierre-alain@openwebreader.org\n"
 "POT-Creation-Date: 2009-03-21 17:52+0100\n"
-"PO-Revision-Date: 2010-06-05 13:22+0100\n"
+"PO-Revision-Date: 2010-07-10 14:11+0100\n"
 "Last-Translator: Pierre-Alain Mignot <pierre-alain@openwebreader.org>\n"
 "Language-Team: en_US\n"
@@ -424 +424 @@
 msgstr "Invalid action \"%s\""
 
-msgid "Invalid return from Logic"
-msgstr "Invalid return from Logic"
+msgid "Invalid return from Model"
+msgstr "Invalid return from Model"
 
 msgid "Missing id"

OWR/locale/fr_FR/LC_MESSAGES/messages.po

@@ -27 +27 @@
 "Report-Msgid-Bugs-To: pierre-alain@openwebreader.org\n"
 "POT-Creation-Date: 2009-03-21 17:52+0100\n"
-"PO-Revision-Date: 2010-06-05 13:22+0100\n"
+"PO-Revision-Date: 2010-07-10 14:11+0100\n"
 "Last-Translator: Pierre-Alain Mignot <pierre-alain@openwebreader.org>\n"
 "Language-Team: fr_FR\n"
@@ -424 +424 @@
 msgstr "Action \"%s\" invalide"
 
-msgid "Invalid return from Logic"
-msgstr "Retour de la Logic invalide"
+msgid "Invalid return from Model"
+msgstr "Retour du modèle invalide"
 
 msgid "Missing id"