Auth完善文件格式和对象的读取

breath-co2 · Oct 8, 2013 · f7c4c5a · f7c4c5a
1 parent 529a165
commit f7c4c5a
Showing 1 changed file with 61 additions and 23 deletions.
diff --git a/core/classes/auth.class.php b/core/classes/auth.class.php
@@ -26,6 +26,14 @@ class Core_Auth
      */
     const DRIVER_FILE = 'File';
 
+    /**
+     * 默认配置名
+     *
+     * @var string
+     */
+    const DEFAULT_CONFIG_NAME = 'default';
+
+
     /**
      * 当前配置
      *
@@ -36,29 +44,48 @@ class Core_Auth
     protected $config_name;
 
     /**
-     * @var Auth
+     * @var array
      */
-    protected static $instance;
+    protected static $instances = array();
 
     protected static $user_info = array();
 
     /**
      * @return Auth
      */
-    public static function instance($config_name='default')
+    public static function instance($config_name=null)
     {
-        if (null===Auth::$instance)
+        if (null===$config_name)
+        {
+            $config_name = Auth::DEFAULT_CONFIG_NAME;
+        }
+
+        if (is_string($config_name))
         {
-            // Create a new instance
-            Auth::$instance = new Auth($config_name);
+            $i_name = $config_name;
         }
-        return Auth::$instance;
+        else
+        {
+            $i_name = '.config_'.md5(serialize($config_name));
+        }
+
+        if (!isset(Auth::$instances[$i_name]))
+        {
+            Auth::$instances[$i_name] = new Auth($config_name);
+        }
+
+        return Auth::$instances[$i_name];
     }
 
-    public function __construct($config_name='default')
+    public function __construct($config_name=null)
     {
+        if (null===$config_name)
+        {
+            $config_name = Auth::DEFAULT_CONFIG_NAME;
+        }
+
         $this->config_name = $config_name;
-        $this->config = Core::config('auth.'.$config_name);
+        $this->config      = Core::config('auth.'.$config_name);
     }
 
     /**
@@ -78,7 +105,7 @@ public function check_user($username, $password)
             throw new Exception(__('The user does not exist'));
         }
 
-        if ( $member->check_password($password) )
+        if ($member->check_password($password))
         {
             return $member;
         }
@@ -98,22 +125,33 @@ public function get_member_by_username($username)
     {
         if (!isset(Auth::$user_info[$this->config_name][$username]))
         {
-            if ( $this->config['driver']==Auth::DRIVER_DATABASE )
+            if ($this->config['driver']==Auth::DRIVER_DATABASE)
             {
                 # 数据库类型
-                $tables = $this->config['tablename'];
-                $user_field = $this->config['username_field'];
-                $password_field = $this->config['password_field'];
-                $data = Database::instance($this->config['database'])
-                ->from($tables)
-                ->where($user_field,$username)
-                ->limit(1)
-                ->get()
-                ->current();
+                $tables         = $this->config['tablename'];
+                $user_field     = $this->config['username_field']?$this->config['username_field']:'username';
+                $password_field = $this->config['password_field']?$this->config['password_field']:'password';
+                $data           = Database::instance($this->config['database'])->from($tables)->where($user_field, $username)->limit(1)->get()->current();
             }
-            elseif ( $this->config['driver']==Auth::DRIVER_FILE )
+            elseif ($this->config['driver']==Auth::DRIVER_FILE)
             {
-                //TODO 文件格式
+                $file = DIR_DATA . 'auth-data-of-project-' . Core::$project . '.json';
+                if (is_file($file))
+                {
+                    $data = @json_decode(file_get_contents($file), true);
+                    if ($data && isset($data[$username]))
+                    {
+                        $data = $data[$username];
+                    }
+                    else
+                    {
+                        $data = array();
+                    }
+                }
+                else
+                {
+                    $data = array();
+                }
             }
 
             if ($data)
@@ -123,7 +161,7 @@ public function get_member_by_username($username)
             }
             else
             {
-                Auth::$user_info[$this->config_name][$username] = False;
+                Auth::$user_info[$this->config_name][$username] = false;
             }
         }