From b9c964d4cd5a8db9768622c846eb7e2c5205b52b Mon Sep 17 00:00:00 2001
From: wangchunsheng <chunsheng@cnezsoft.com>
Date: Thu, 21 Jan 2010 08:05:48 +0000
Subject: [PATCH]  * remove the myrouter.class.php.

---
 trunk/module/common/control.php | 28 ++++++++++----------
 trunk/module/user/control.php   |  2 +-
 trunk/www/index.php             |  3 +--
 trunk/www/myrouter.class.php    | 45 ---------------------------------
 4 files changed, 17 insertions(+), 61 deletions(-)
 delete mode 100644 trunk/www/myrouter.class.php

diff --git a/trunk/module/common/control.php b/trunk/module/common/control.php
index b65f2b75c9..422e55e192 100644
--- a/trunk/module/common/control.php
+++ b/trunk/module/common/control.php
@@ -299,13 +299,16 @@ EOT;
     {
         if(isset($_SESSION['company']) and $_SESSION['company']->pms == $_SERVER['HTTP_HOST'])
         {
-            $this->app->setSessionCompany($_SESSION['company']);
+            $this->app->company = $_SESSION['company'];
+        }
+        else
+        {
+            $company = $this->company->getByDomain();
+            if(!$company) $company = $this->company->getByDomain($this->config->default->domain);
+            if(!$company) $this->app->error(sprintf($this->lang->error->companyNotFound, $_SERVER['HTTP_HOST']), __FILE__, __LINE__, $exit = true);
+            $_SESSION['company'] = $company;
+            $this->app->company  = $company;
         }
-        $company = $this->company->getByDomain();
-        if(!$company) $company = $this->company->getByDomain($this->config->default->domain);
-        if(!$company) $this->app->error(sprintf($this->lang->error->companyNotFound, $_SERVER['HTTP_HOST']), __FILE__, __LINE__, $exit = true);
-        $_SESSION['company'] = $company;
-        $this->app->setSessionCompany($company);
     }
 
     /**
@@ -318,17 +321,16 @@ EOT;
     {
         if(isset($_SESSION['user']))
         {
-            $this->app->setSessionUser($_SESSION['user']);
+            $this->app->user = $_SESSION['user'];
         }
         elseif($this->app->company->guest)
         {
-            $user = new stdClass();
-            $user->account  = 'guest';
-            $user->realname = 'guest';
-            $this->loadModel('user');
-            $user->rights = $this->user->authorize('guest');
+            $user             = new stdClass();
+            $user->account    = 'guest';
+            $user->realname   = 'guest';
+            $user->rights     = $this->loadModel('user')->authorize('guest');
             $_SESSION['user'] = $user;
-            $this->app->setSessionUser($_SESSION['user']);
+            $this->app->user = $_SESSION['user'];
         }
     }
 
diff --git a/trunk/module/user/control.php b/trunk/module/user/control.php
index 33a6c0533f..51f099eefd 100644
--- a/trunk/module/user/control.php
+++ b/trunk/module/user/control.php
@@ -280,7 +280,7 @@ class user extends control
             {
                 $user->rights = $this->user->authorize($_POST['account']);
                 $_SESSION['user'] = $user;
-                $this->app->setSessionUser($user);
+                $this->app->user = $_SESSION['user'];
 
                 /* POST变量中设置了referer信息，且非user/login.html, 非user/deny.html，并且包含当前系统的域名。*/
                 if(isset($_POST['referer'])  and 
diff --git a/trunk/www/index.php b/trunk/www/index.php
index 9e20d310c6..298842d3d2 100644
--- a/trunk/www/index.php
+++ b/trunk/www/index.php
@@ -31,10 +31,9 @@ include '../../../framework/router.class.php';
 include '../../../framework/control.class.php';
 include '../../../framework/model.class.php';
 include '../../../framework/helper.class.php';
-include './myrouter.class.php';
 
 /* 实例化路由对象，加载配置，连接到数据库。*/
-$app    = router::createApp('pms', '', 'myRouter');
+$app    = router::createApp('pms');
 $config = $app->loadConfig('common');
 
 /* 检查是否已经安装。*/
diff --git a/trunk/www/myrouter.class.php b/trunk/www/myrouter.class.php
deleted file mode 100644
index 7100a6cada..0000000000
--- a/trunk/www/myrouter.class.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-/**
- * The router class file of ZenTaoMS.
- *
- * ZenTaoMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
-
- * ZenTaoMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- * 
- * You should have received a copy of the GNU Lesser General Public License
- * along with ZenTaoMS.  If not, see <http://www.gnu.org/licenses/>.
- *
- * @copyright   Copyright: 2009 Chunsheng Wang
- * @author      Chunsheng Wang <wwccss@263.net>
- * @package     ZenTaoMS
- * @version     $Id$
- * @link        http://www.zentao.cn
- */
-/**
- * 浠巖outer绫讳腑缁ф壙锛屽鍔犱簡鑻ュ共鍜宲ms搴旂敤鐩稿叧鐨勬柟娉曘��
- * 
- * @package ZenTaoMS
- */
-class myRouter extends router
-{
-    private $configCached = false;
-    private $langCached   = false;
-
-    /* 璁剧疆浼氳瘽鏈熼棿鐨刢ompany淇℃伅銆�*/
-    public function setSessionCompany($company)
-    {
-        $this->company = $company;
-    }
-
-    /* 璁剧疆浼氳瘽鏈熼棿鐨勭敤鎴蜂俊鎭��*/
-    public function setSessionUser($user)
-    {
-        $this->user = $user;
-    }
-}