Merge branch 'development' into 'master'

Development to master

优化内核中的细节，提高稳定性，新增数据中心核心业务的若干服务

See merge request !5

Westdc/Authentication/AuthenticationService.php

@@ -2,11 +2,9 @@
 namespace Westdc\Authentication;
 
 use Zend\Permissions\Acl\Acl;
-use Zend\Permissions\Acl\Role\GenericRole as Role;
-use Zend\Permissions\Acl\Resource\GenericResource as Resource;
 use Westdc\Helpers\Assist as view;
 use Westdc\Member\Cookie;
-use Zend\Mvc\MvcEvent;
+use Westdc\User\Account;
 
 class AuthenticationService
 {
@@ -17,6 +15,7 @@ class AuthenticationService
 	protected $role;
 	
 	public $loginRouterName = "login";
+	public $logoutRouterName = "logout";
 	
 	function __construct()
 	{
@@ -47,9 +46,12 @@ class AuthenticationService
             return true;
         }
 		
-//		view::Dump($e->getRouteMatch()->getMatchedRouteName() . ":" . $controller."-".$action,false);
+		//view::Dump($e->getRouteMatch()->getMatchedRouteName() . ":" . $controller."-".$action,false);
 
-		$this->preCookieCheck();
+		if($rsp = $this->preCookieCheck($e) !== false)
+		{
+			return $rsp;
+		}
 		
 		try{
 			if(!$this->acl->hasResource($controller))
@@ -70,14 +72,13 @@ class AuthenticationService
 				}
 			}
 		}catch (Exception $e) {
-			//echo 'Caught exception: ',  $e->getMessage(), "\n";
 			$this->badRequest($e);
 			return;
 		}
 		
 	}
 	
-	public function preCookieCheck()
+	public function preCookieCheck($e)
 	{
 		if(!view::User())
 		{
@@ -86,9 +87,39 @@ class AuthenticationService
 			if($mb->checkcookie())
 			{
 				$account = new Account();
-				$account->cookieLogin(array($mb->FieldUsername=>$mb->user,$mb->FieldPasword=>$mb->srpwd));
+				$account->cookieLogin(array('username'=>$mb->user));
+
+				$response = $e->getResponse();
+				$response->setStatusCode(200);
+				$response->sendHeaders();
+
+				$layout = $e->getViewModel();
+
+				$viewHelperManager = $e->getApplication()->getServiceManager()->get('viewHelperManager');
+				$partial = $viewHelperManager->get('partial');
+
+				$page_content = $partial(
+					'layout/layout/message',
+					array(
+						'message' => '您的账号已自动登陆',
+						'url'=> [
+							['title' => '立即跳转', 'url' => $_SERVER['REQUEST_URI']],
+							['title'=>'退出登陆','url'=>$e->getRouter()->assemble(array(), array('name' => $this->logoutRouterName))]
+						],
+					)
+				);
+
+				$layout->setVariable('content',$page_content);
+				$layout->setTemplate('layout/layout');
+
+				$e->stopPropagation();
+
+				return $response;
+
 			}
 		}
+
+		return false;
 	}
 	
 	public function response($e)

Westdc/Db/Db.php

@@ -1,43 +1,37 @@
 <?php
 namespace Westdc\Db;
 
-use Westdc\Service\AbstractServiceManager;
 use Zend\Db\Adapter\Adapter;
+use Zend\Config\Config as Zend_Config;
 
-class Db extends AbstractServiceManager
+class Db
 {
-    private $db;
 
-	function __construct(&$db = "",$param = array())
+	private static $_instance = NULL;
-	{
-		$configService = $this->getServiceManager()->get('Config');
-        $config_local = $configService->get("local.php");
 
-		if(is_array($param) && count($param)>0)
+	private function __construct(){
-		{
+
-			$this->db = new Adapter($param);
+	}
-		}else{
+
-			$this->db = new Adapter(array(
+	public static function getInstance(){
+
+		if (self::$_instance === NULL) {
+
+			$config_local = new Zend_Config(include "config/autoload/local.php");
+
+			self::$_instance = new Adapter(array(
 				'driver' => $config_local->db->driver,
 				'hostname' => $config_local->db->hostname,
-                'port' => $config_local->db->port,
+				'port' => $config_local->db->port,
 				'database' => $config_local->db->database,
 				'username' => $config_local->db->username,
 				'password' => $config_local->db->password
 			));
+
 		}
 
-        $db = $this->db;
+		return self::$_instance;
+
 	}
 	
-    public function getAdapter()
-    {
-        return $this->db;
-    }
-
-    public function setConfig()
-    {
-
-    }
-	
 }

Westdc/Db/Dbh.php

@@ -11,7 +11,7 @@ class Dbh
 	function __construct($db = NULL)
 	{
         if($db == NULL)
-		    $this->db = new PDO();
+		    $this->db = PDO::getInstance();
         else
             $this->db = $db;
 	}

Westdc/Db/Pdo.php

@@ -3,26 +3,31 @@ namespace Westdc\Db;
 
 use Zend\Config\Config as Zend_Config;
 
-class Pdo extends \PDO
+class Pdo
 {
-	private $debug = 0;		//调试模式
 
-	private $config_local_path = "config/autoload/local.php";
+    private static $_instance = NULL;
 	
-	function __construct($DSN = NULL)
+	private function __construct($DSN = NULL)
     {
-        if (!empty($DSN)) {
+
-            parent::__construct($DSN);
+    }
-        } else {
+
-            $config_local = new Zend_Config(include $this->config_local_path);
+    public static function getInstance()
+    {
+
+        if (self::$_instance === null) {
+            $config_local = new Zend_Config(include "config/autoload/local.php");
 
             $dsn = "pgsql:host={$config_local->db->hostname};"
                 . "port={$config_local->db->port};"
                 . "dbname={$config_local->db->database};"
                 . "user={$config_local->db->username};"
                 . "password={$config_local->db->password}";
-            parent::__construct($dsn);
+            self::$_instance = new \PDO($dsn);
         }
+
+        return self::$_instance;
     }
 
 }

Westdc/File/Upload.php

@@ -16,6 +16,8 @@ use Westdc\File\Listener\DefaultFileUploadListener;
 class Upload extends AbstractEventManager implements ServiceManagerAwareInterface{
 
     protected $serviceManager;
+    protected $defaultListener = false;
+    protected $returnInPreCheckTrigger = true;
 
     private $uploadPath = "";
     private $relativePath = "";
@@ -39,9 +41,6 @@ class Upload extends AbstractEventManager implements ServiceManagerAwareInterfac
 
     public function init()
     {
-        $Listener = new DefaultFileUploadListener;
-        $this->getEventManager()->attachAggregate($Listener);
-
         $configService = $this->serviceManager->get('ConfigService');
         $this->config = $configService->get('file.php');
     }
@@ -51,6 +50,16 @@ class Upload extends AbstractEventManager implements ServiceManagerAwareInterfac
         return $this->upload($files,$rootDir,$childDir,$fileName,$dateDirModel);
     }
 
+    /**
+     * 添加默认侦听器，会将信息保存到Attachments数据表
+     */
+    public function attachDefaultListener()
+    {
+        $Listener = new DefaultFileUploadListener;
+        $this->getEventManager()->attachAggregate($Listener);
+        $this->defaultListener = true;
+    }
+
     /**
      * 上传文件
      * @param $files                    上传文件的信息 e.g.$_FILE['fileData']
@@ -73,11 +82,15 @@ class Upload extends AbstractEventManager implements ServiceManagerAwareInterfac
         $file = $files;
 
         $results = $this->getEventManager()->trigger('upload.pre', $this, compact('file'));
-        $cache_data = $results->last();
 
-        if($cache_data !== true)
+        if($this->returnInPreCheckTrigger === true)
         {
-            return $cache_data;
+            $cache_data = $results->last();
+
+            if($cache_data !== true)
+            {
+                return $cache_data;
+            }
         }
 
         $fileService = $this->serviceManager->get('File');
@@ -88,7 +101,11 @@ class Upload extends AbstractEventManager implements ServiceManagerAwareInterfac
         if($dateDirModel !== false)
             $this->makeDateDir($dateDirModel);
 
-        $this->setFileName($fileName , $fileService->getFileTextExt($files['name']));
+        if(empty($this->fileName) || empty($fileName))
+            $this->setFileName(NULL , $fileService->getFileTextExt($files['name']));
+
+        if(!empty($fileName))
+            $this->setFileName($fileName , $fileService->getFileTextExt($files['name']));
 
         //移动文件
         $file_path = $this->getUploadPath() . $this->getFileName();
@@ -106,7 +123,7 @@ class Upload extends AbstractEventManager implements ServiceManagerAwareInterfac
         $file_data['file_ext'] = $fileService->getFileTextExt($files['name']);
         $file_data['file_mime'] = $fileService->getFileMime($file_path);
 
-        if(!empty($file_data) && is_array($file_data))
+        if(!empty($this->params) && is_array($this->params))
         {
             $file_data = array_merge($file_data,$this->params);
         }
@@ -203,26 +220,52 @@ class Upload extends AbstractEventManager implements ServiceManagerAwareInterfac
      * @param $fileName
      * @param $fileExt
      */
-    public function setFileName($fileName,$fileExt)
+    public function setFileName($fileName,$fileExt = "")
     {
         if(!empty($fileName)){
-            $this->fileName = $fileName . "." .$fileExt;
+
+            if(empty($fileExt))
+            {
+                $fileExt = pathinfo($fileName,PATHINFO_EXTENSION);
+            }
+
+            if(empty($fileExt))
+                $this->fileName = $fileName;
+            else
+                $this->fileName = $fileName . "." .$fileExt;
+
             return;
         }
 
         $tools = $this->serviceManager->get('Tools');
         $uuid = $tools->uuid();
 
-        $this->fileName = $uuid . "." . $fileExt;
+        if(empty($fileExt))
+            $this->fileName = $uuid;
+        else
+            $this->fileName = $uuid . "." . $fileExt;
 
+        return;
     }
 
 
+    /**
+     * @param $params
+     */
     public function setParams($params)
     {
         $this->params = $params;
     }
 
+    /**
+     * 强制关闭文件上传前的钩子，默认是所有上传必须执行此钩子已避免上传文件不符合规格
+     * 除了后台中特殊的文件操作之外不建议关闭
+     */
+    public function forceDetachPreCheckTrigger()
+    {
+        $this->returnInPreCheckTrigger = false;
+    }
+
     /**
      * @return string
      */

Westdc/Helpers/Auth.php

@@ -1,13 +1,13 @@
 <?php
 namespace Westdc\Helpers;
 
-use \Zend\Authentication\AuthenticationService;
+use Zend\Authentication\AuthenticationService;
-use \Zend\Authentication\Storage\Session as SessionStorage;
+use Zend\Authentication\Storage\Session as SessionStorage;
-use \Westdc\Helpers\Config;
 
 class Auth
 {
 	public $auth;
+
 	function __construct($getAuthService = false)
 	{
 		$config = Config::get();
@@ -23,14 +23,27 @@ class Auth
 	
 	public function clearIndentity()
 	{
-		return $this->auth->clearIdentity();
+		$this->auth->clearIdentity();
+		return true;
 	}
 	
-	public function getIdentity($field)
+	public function getIdentity($field = "")
 	{
+        if(empty($field))
+            return $this->auth->getIdentity();
+
         if(isset($this->auth->getIdentity()->$field))
 		    return $this->auth->getIdentity()->$field;
         else
             return null;
 	}
+
+    public function write($user)
+    {
+
+        if(is_array($user))
+            $user = (object)$user;
+
+        $this->auth->getStorage()->write($user);
+    }
 }

Westdc/Helpers/Captcha.php

@@ -0,0 +1,65 @@
+<?php
+namespace Westdc\Helpers;
+
+class Captcha
+{
+	public $captcha;
+	
+	private $sessionName = "captcha";
+	private $imgDir = "./public/images/captcha";
+	
+	function __construct($db = NULL)
+	{
+		$this->loadCaptcha();
+	}
+	
+	public function loadCaptcha()
+	{
+		$this->captcha = new \Zend\Captcha\Image(array(  
+			  'captcha' => 'Image',
+			  'wordLen' => 4,
+			  'fontsize'=>16,
+			  'width' => 100,
+			  'height' => 38,
+			  'dotNoiseLevel'=>2,
+			  'lineNoiseLevel'=>1,
+			  'timeout' => 300,
+			  'font' => './data/fonts/ggbi.ttf',
+			  'imgDir' => $this->imgDir,
+			  'imgUrl' => '/images/captcha',
+		   ));
+	}
+	
+	public function setCaptcha(){
+		if(!is_dir($this->imgDir))
+		{
+			mkdir($this->imgDir);
+		}
+		
+		$this->captcha->generate();
+		$_SESSION[$this->sessionName] = $this->captcha->getWord();
+		$url = $this->captcha->getImgUrl()
+			  .$this->captcha->getId()
+			  .$this->captcha->getSuffix();
+		
+		return $url;
+	}
+	
+	public function isValid($captchaword)
+	{
+		if($captchaword == $_SESSION[$this->sessionName])
+		{
+			return true;
+		}else{
+			return false;
+		}
+	}
+	
+	//资源回收
+	//删除目录中创建时间比超时时间久的
+	public function recycle()
+	{
+		
+	}
+	
+}

Westdc/Helpers/Config.php

@@ -3,10 +3,6 @@ namespace Westdc\Helpers;
 
 class Config
 {
-	private $config_path = array(
-		'local' => "config/autoload/local.php",
-		'global' => "config/autoload/global.php"
-	);
 
 	function __construct()
 	{
@@ -14,15 +10,36 @@ class Config
 		//$data   = $reader->fromFile('config/config.ini');
 	}
 	
-	static function get($type = 'global')
+	static function get($configName = 'global')
 	{
-		$config_path = array(
+        if(defined(CONFIG_PATH))
-			'local' => "config/autoload/local.php",
+        {
-			'global' => "config/autoload/global.php",
+            throw new \RuntimeException('Not found the config files path');
-			'file' => "config/autoload/file.php"
+        }
+
+        $config_path = CONFIG_PATH;
+
+        if(empty($configName))
+            $configName = "global.php";
+
+        if(!preg_match("/(\\/|\\\)$/",$config_path))
+        {
+            $config_path .= "/";
+        }
+
+		$config_names = array(
+			'local' => "local.php",
+			'global' => "global.php",
+			'file' => "file.php"
 		);
 
-		$config = new \Zend\Config\Config(include $config_path[$type]);
+        $configFile = $config_path .'autoload/' . $config_names[$configName];
+
+        unset($config_path);
+        unset($configName);
+	
+		$config = new \Zend\Config\Config(include $configFile);
+
 		return $config;
 	}
 	

Westdc/Helpers/Layout.php

@@ -3,17 +3,15 @@ namespace Westdc\Helpers;
 
 use \Zend\Authentication\AuthenticationService;
 use \Zend\Authentication\Storage\Session as SessionStorage;
-use \Westdc\Helpers\Config;
-use Westdc\Helpers\MobileDetect;
 use View as view;
 
 class Layout
 {
-	public $config;
+
 	
 	function __construct()
 	{
-		$this->config = Config::get();
+
 	}
 	
 	//设置网页标题
@@ -26,8 +24,8 @@ class Layout
 			return;
 		}
 		
-        $action     = $matches->getParam('action');
+//        $action     = $matches->getParam('action');
-        $controller = $matches->getParam('controller');
+//        $controller = $matches->getParam('controller');
 
         $viewHelperManager = $e->getApplication()->getServiceManager()->get('viewHelperManager');
 
@@ -36,15 +34,7 @@ class Layout
         // Setting a separator string for segments
         $headTitleHelper->setSeparator(' - ');
 
-		if(isset($this->config->title_map->$controller->action->$action))
+		return;
-		{
-			$headTitleHelper->append($this->config->title_map->$controller->action->$action->title);
-		}
-		
-		if(isset($this->config->title_map->$controller))
-		{
-			$headTitleHelper->append($this->config->title_map->$controller->title);
-		}
     }
 	
 	//导航条按钮激活
@@ -59,17 +49,14 @@ class Layout
         $inlineScriptHelper   = $viewHelperManager->get('inlineScript');
 		
 		$inlineScriptHelper ->captureStart();
-		echo "$('#page-nav-".$this->getControllerNavName($controller)."-".$action."').addClass('active');";
+		echo "$('#Nav-".$this->getControllerNavName($controller)."-".$action."').addClass('active');";
 		$inlineScriptHelper ->captureEnd();
 	}
 	
 	public function getControllerNavName($invokename)
 	{
-		$ctl = array(
+		$controller_spell = explode("\\",$invokename);
-			'Application\Controller\Index' => 'index',
+		return strtolower(end($controller_spell));
-			'Application\Controller\Account' => 'account'
-		);
-		return isset($ctl[$invokename]) ? $ctl[$invokename]:"";
 	}
 	
 	//添加用户Ajax脚本

Westdc/Helpers/Paginator.php

@@ -16,7 +16,7 @@ use Zend\Paginator\Adapter\DbSelect;
 use Zend\Paginator\Adapter\DbTableGateway;
 use Zend\Paginator\Paginator as Zend_Paginator;
 use Zend\Db\Sql\Select;
-use Zend\Db\TableGateway\TableGateway;
+use Zend\Db\TableGateway;
 
 class Paginator implements ServiceManagerAwareInterface{
 
@@ -30,10 +30,6 @@ class Paginator implements ServiceManagerAwareInterface{
     {
         $this->serviceManager = $serviceManager;
 
-        $this->setPageLimit();
-        $this->setPageRange();
-        $this->setRoute();
-
         return $this;
     }
 
@@ -97,6 +93,16 @@ class Paginator implements ServiceManagerAwareInterface{
     {
         $page = $ctl->params()->fromRoute('page');
 
+        if(empty($this->pageLimit))
+            $this->setPageLimit();
+
+        if(empty($this->pageRange))
+            $this->setPageRange();
+
+        if(empty($this->route))
+            $this->setRoute();
+
+
         if(is_array($data))
             $data = new ArrayAdapter($data);
 
@@ -107,7 +113,7 @@ class Paginator implements ServiceManagerAwareInterface{
             $data = new DbSelect($data,$zendDb);
         }
 
-        if($data instanceof TableGateway)
+        if($data instanceof TableGateway\TableGatewayInterface || $data instanceof TableGateway\AbstractTableGateway)
             $data = new DbTableGateway($data,$this->sqlQuery,$this->sqlOrder,$this->sqlGroup,$this->sqlHaving);
 
         $paginator = new Zend_Paginator($data);

Westdc/Helpers/Tools.php

@@ -45,8 +45,12 @@ class Tools {
     {
         $response = array();
         $handle = popen("$cmd 2>&1", 'r');
-        $read = '';
+
         while ($read = fread($handle, 20096)) {
+
+            if(!mb_detect_encoding($read, 'UTF-8', true))
+                iconv("GB2312","UTF-8",$read);
+
             $response[] = trim($read);
         }
         pclose($handle);

Westdc/Mail/Sender.php

@@ -10,6 +10,7 @@ namespace Westdc\Mail;
 
 use Zend\ServiceManager\ServiceManager;
 use Zend\ServiceManager\ServiceManagerAwareInterface;
+use Westdc\Service\ServiceManager as WestdcServiceManager;
 
 class Sender implements ServiceManagerAwareInterface{
 
@@ -24,6 +25,15 @@ class Sender implements ServiceManagerAwareInterface{
         return $this;
     }
 
+    public function __construct()
+    {
+        if(!$this->serviceManager instanceof ServiceManager)
+        {
+            $serviceManager = new WestdcServiceManager();
+            $this->serviceManager = $serviceManager->getServiceManager();
+        }
+    }
+
     /**
      * 发送即时邮件
      * @param $options

Westdc/Member/Account.php

@@ -10,11 +10,7 @@ use Zend\Authentication\Adapter\DbTable;
 use Westdc\Helpers\Assist as view;
 use Westdc\Helpers\Config;
 use Westdc\Helpers\Dbh as dbh;
-use Westdc\Db\Pdo as Db;
 use Westdc\Db\Db as Zend_Db;
-use Westdc\Mail\Mail;
-use Westdc\User\Member;
-
 
 class Account extends AbstractEventManager implements ServiceManagerAwareInterface
 {	
@@ -64,24 +60,15 @@ class Account extends AbstractEventManager implements ServiceManagerAwareInterfa
 		return $rs->fetch();
 	}
 
-	//注册
+    /**
+     * 用户注册
+     * @param $data
+     * @return array
+     */
 	public function register($data)
 	{
 		$params = compact('data');
-        $results = $this->getEventManager()->trigger('register.checkParam', $this, $params);
+        $results = $this->getEventManager()->trigger('register.pre', $this, $params);
-		$cache_data = $results->last();
-		
-		if($cache_data !== true)
-		{
-			if(!is_array($cache_data))
-			{
-				return array('error'=>$cache_data);
-			}else{
-				return $cache_data;
-			}
-		}
-		
-        $results = $this->getEventManager()->trigger('register.checkUser', $this, $params);
 		$cache_data = $results->last();
 		
 		if($cache_data !== true)
@@ -94,29 +81,38 @@ class Account extends AbstractEventManager implements ServiceManagerAwareInterfa
 			}
 		}
 
+        /**
+         * 将数据分为两组，一组用于做注册成功后的登陆，一组用于写入数据库
+         * 写入数据库的数据需要完全重建一个新的，防止因为前端传入时有人恶意增加字段造成破坏
+         */
 		$loginData = array(
 			'username'=>$data['username'],
 			'password'=>$data['password']
 		);
 
-		$data['password'] = md5($data['password']);
+        $registerData = [
-		$data['usertype'] = "guest";
+            'username' => $data['username'],
-		unset($data['confirm_password']);
+            'password' => md5($data['password']),
+            'usertype' => $this->RoleMember,
+            'email' => $data['email'],
+        ];
 		
 		$dbh = new dbh();
 		
-		$id = $dbh->insert($this->memberTable,$data,true);
+		$id = $dbh->insert($this->memberTable,$registerData,true);
 		
 		if(!empty($id) && is_numeric($id))
 		{
 			$this->storeLogin($loginData);
+
 			if(isset($state['success']))
 			{
-				//$mb = new Member();
+				$mb = new Member();
-				//$mb->putcookie($data[$this->FieldUsername],$data[$this->FieldPasword]);
+				$mb->putcookie($data[$this->FieldUsername],$data[$this->FieldPasword]);
 			}
+
 			$params = compact('data','id');
-        	$results = $this->getEventManager()->trigger('register.success', $this, $params);
+        	$this->getEventManager()->trigger('register.success', $this, $params);
 			return array("success" => 1);
 		}else{
 			if($id === false)
@@ -129,10 +125,14 @@ class Account extends AbstractEventManager implements ServiceManagerAwareInterfa
 		
 	}//register
 
-	//登陆
+    /**
+     * 用户登陆
+     * @param $data
+     * @return array
+     */
 	public function login($data)
 	{
-        $results = $this->getEventManager()->trigger('login.checkParam', $this, compact('data'));
+        $results = $this->getEventManager()->trigger('login.pre', $this, compact('data'));
 		$cache_data = $results->last();
 		
 		if($cache_data !== true)
@@ -149,20 +149,31 @@ class Account extends AbstractEventManager implements ServiceManagerAwareInterfa
 		
 		if(isset($state['success']))
 		{
-			//$mb = new Member();
+            $mb = new Cookie();
-			//$mb->putcookie($data[$this->FieldUsername],md5($data[$this->FieldPasword]));
+            $mb->putcookie($data[$this->FieldUsername],$data[$this->FieldPasword]);
-		}
+
+            $user = (array)$state['user'];
+            $this->getEventManager()->trigger('login.success', $this, compact('user'));
+		}else{
+            $this->getEventManager()->trigger('login.failed', $this, compact('data'));
+        }
 			
 		return $state;
 	}//login
 
-	//storeLogin
+    /**
+     * 存储用户登陆信息
+     * 为了防止login中的用户信息检查不规范，再加入一层内置的数据库权限检查，以防通过漏洞登入系统
+     * @param $data
+     * @param bool $md5     是否对密码进行md5加密再校验
+     * @return array
+     */
 	private function storeLogin($data,$md5 = true)
 	{	
 		$auth = new AuthenticationService();
 		$auth->setStorage(new SessionStorage($this->config->session_namespace));
 
-		new Zend_Db($dbAdapter);
+		$dbAdapter = Zend_Db::getInstance();
 
 		$authAdapter = new DbTable(
 			$dbAdapter,
@@ -185,23 +196,19 @@ class Account extends AbstractEventManager implements ServiceManagerAwareInterfa
 
 		$result = $authAdapter->authenticate();
 
-		$user = $authAdapter->getResultRowObject(null,array('password'));
-		
 		if(!$result->isValid())
 		{
 			return array("error"=>"用户信息验证失败");
 		}
 
-		$email = $user->email;
+        $user = $authAdapter->getResultRowObject(null,array('password'));
-		$results = $this->getEventManager()->trigger('login.success.createAvatar', $this, compact('email'));
+        $auth->getStorage()->write($user);
-		$user->avatar = $results->last();
-		$auth->getStorage()->write($user);
 		 
-		$id = $user->id;
+		return array(
-		$results = $this->getEventManager()->trigger('login.success.updateStatus', $this, compact('id'));
+            'success'=>1,
-		 
+            'user' => $user
-		return array('success'=>1);
+        );
-	}
+	}//storeLogin
 	
 	public function cookieLogin($data)
 	{

Westdc/Member/Cookie.php

@@ -2,11 +2,11 @@
 namespace Westdc\Member;
 
 use Westdc\Helpers\Config;
-use Westdc\Db\PDO as Db;
+use Westdc\Db\Pdo as Db;
 
 class Cookie
 {
-	var $ck='Dxe8SqIcmyUf';
+	var $ck='ff08XearZpUkjl3H';
 	var $db;  //传入PDO对象
 	var $mid; //会员ID
 	
@@ -27,14 +27,14 @@ class Cookie
 
 	function __construct()
 	{
-		$this->db = new Db();
+		$this->db = Db::getInstance();
 		$this->config = Config::get();
 
-		if(!empty($_COOKIE['scr']))
+		if(isset($_COOKIE['scr']) && !empty($_COOKIE['scr']))
 		{
 			$this->scr = $_COOKIE['scr'];
 		}
-		if(!empty($_COOKIE['user']))
+		if(isset($_COOKIE['user']) && !empty($_COOKIE['user']))
 		{
 			$this->user= $_COOKIE['user'];
 		}	
@@ -76,19 +76,20 @@ class Cookie
 	    }//exit
 	}//function checkcookie
 
-   /**
+	/**
-	* putcookie
+	 * putcookie
-	*
+	 *
-	* 登陆成功后放置cookie，包含安全码
+	 * 登陆成功后放置cookie，包含安全码
-	*
+	 *
-	* @param String $uname
+	 * @param $uname
-	* @param String $pwd
+	 * @param $pwd
-	* @param Int 	$time
+	 * @param int $time
-	*/
+	 * @return bool
+	 */
 	public function putcookie($uname,$pwd,$time = 604800)
 	{
 		try {
-		    $scrString = $this->makescr($uname,$pwd);//加密验证串:防止用户密码被盗；防止伪造cookie。
+		    $scrString = $this->makescr($uname,md5($pwd));//加密验证串:防止用户密码被盗；防止伪造cookie。
 
 		    if(!is_numeric($time))
 		    {
@@ -110,6 +111,7 @@ class Cookie
 	 * 
 	 * @param String $u
 	 * @param String $p
+	 * @return string
 	 */
 	public function makescr($u,$p)
 	{

Westdc/Reference/Reference.php

@@ -97,6 +97,7 @@ class Reference extends AbstractEventManager implements ServiceManagerAwareInter
         $appConfig = $configService->get('application.ini');
 
 		$fileUploadService = $this->serviceManager->get('File/Upload');
+        $fileUploadService->attachDefaultListener();
         $fileUploadService->setParams(['file_type' => 'literature']);
 		$file_info = $fileUploadService($file,$appConfig['reference_save_path'],"","",$fileUploadService::DATETIME_MODEL_Y);
 		

Westdc/Review/Review.php

@@ -10,6 +10,7 @@ namespace Westdc\Review;
 use Zend\ServiceManager\ServiceManager;
 use Zend\ServiceManager\ServiceManagerAwareInterface;
 use Westdc\EventModel\AbstractEventManager;
+use Zend\Db\Sql;
 
 class Review extends AbstractEventManager implements ServiceManagerAwareInterface{
 
@@ -36,6 +37,8 @@ class Review extends AbstractEventManager implements ServiceManagerAwareInterfac
 
     private function init(){
         $dbService = $this->serviceManager->get('Db');
+
+        /** @var \PDO $this->db */
         $this->db = $dbService->getPdo();
         unset($dbService);
 
@@ -119,23 +122,294 @@ class Review extends AbstractEventManager implements ServiceManagerAwareInterfac
 				RIGHT JOIN metadata md ON md.uuid=m.uuid
 				LEFT JOIN users u ON u.id=m.userid
 				LEFT JOIN geonetworkmetadata gn ON m.uuid=gn.uuid
-				WHERE m.status=0 $searchJoin
+				WHERE m.status=".self::REVIEW_STATUS_DEFAULT." $searchJoin
 				{$this->orderSql} {$this->sortSql}
 				{$this->limitSql}";
 
         $rs = $this->db->query($sql);
-        return $rs->fetchAll();
+        return $rs->fetchAll(\PDO::FETCH_ASSOC);
     }//getDraft()
 
+    /**
+     * 获取被取消评审的元数据
+     * @return mixed
+     */
+    public function getCanceled()
+    {
+        $this->processOptions();
+
+        $searchJoin = "";
+        if(isset($this->opt->keyword) && !empty($this->opt->keyword))
+        {
+            $searchJoin = " AND md.title LIKE '%{$this->opt->keyword}%'";
+        }
+
+        if(empty($this->orderSql))
+        {
+            $this->orderSql = "ORDER BY m.ts_created DESC";
+        }
+
+        $sql = "SELECT m.id,md.title,md.uuid,m.status,m.ts_created FROM mdstatus m
+				RIGHT JOIN metadata md ON md.uuid=m.uuid
+				WHERE m.status=".self::REVIEW_STATUS_CANCELED." $searchJoin
+				{$this->orderSql} {$this->sortSql}
+				{$this->limitSql}";
+
+        $rs = $this->db->query($sql);
+        return $rs->fetchAll(\PDO::FETCH_ASSOC);
+    }
+
+    /**
+     * 获取需要分配编辑的评审
+     * @param string $filter
+     * @return mixed
+     * filter参数帮助生成sql语句中的where、order、sort条件
+     */
+    public function getEditor($filter = ""){
+        $wheresql = array();
+        $ordersql = array();
+
+        $wheresql[] = " m.status in (".self::REVIEW_STATUS_ACCEPT.",".self::REVIEW_STATUS_EXPERT_INVITED.",".self::REVIEW_STATUS_EXPERT_ACCEPT.",".self::REVIEW_STATUS_EXPERT_FEEDBACK.") ";
+        $wheresql[] = " (m.userid IS NULL OR u.usertype != 'administrator') ";
+
+
+        if(isset($filter['keyword']) && !empty($filter['keyword']))
+        {
+            $wheresql[] = " (md.title like '%".$filter['keyword']."%' OR u.username LIKE '%".$filter['keyword']."%' OR u.realname LIKE '%".$filter['keyword']."%') ";
+        }
+
+        if(count($wheresql)>0)
+        {
+            $wheresql = " WHERE ".join(" AND ",$wheresql);
+        }else{
+            $wheresql = "";
+        }
+
+        if(isset($filter['order']) && !empty($filter['order']))
+        {
+            $sort = "DESC";
+            if(isset($filter['sort']) && !empty($filter['sort']) && in_array( strtolower($filter['sort']),array('desc','asc')))
+            {
+                $sort = $filter['sort'];
+            }
+            $ordersql[] = " {$filter['order']} $sort ";
+        }
+
+        if(count($ordersql)>0)
+        {
+            $ordersql = " ORDER BY ".join(',',$ordersql);
+        }else{
+            $ordersql = " ORDER BY m.ts_created desc ";
+        }
+
+        $sql = "select m.*,md.title,u.username,u.realname from mdstatus m
+				right join metadata md on md.uuid=m.uuid
+				left join users u on u.id=m.userid
+				$wheresql
+				$ordersql";
+        $re = $this->db->query($sql);
+        $rows = $re->fetchAll();
+
+        return $rows;
+    }//getEditor();
+
+    /**
+     * 待审核元数据
+     * @return mixed
+     */
+    public function getAccept(){
+
+        //调试sql时需要输入adapter环境
+//        $dbService = $this->serviceManager->get('Db');
+//        $adapter = $dbService->getZendDb();
+//        $sql = new Sql\Sql($adapter);
+//        $select = $sql->select();
+
+        $select = new Sql\Select;
+
+        $select->from(['m'=>'mdstatus']);
+        $select->columns(array('*'));
+
+        $select->join(
+            ["md"=>"metadata"],
+            "md.uuid=m.uuid",
+            ["title"],
+            $select::JOIN_RIGHT);
+
+        $select->join(
+            ["u"=>"users"],
+            "m.userid=u.id",
+            ["username","realname"],
+            $select::JOIN_LEFT);
+
+        $select->where(function(Sql\Where $where){
+            $where->AND->in("m.status",[
+                self::REVIEW_STATUS_ACCEPT,
+                self::REVIEW_STATUS_EXPERT_INVITED,
+                self::REVIEW_STATUS_EXPERT_ACCEPT,
+                self::REVIEW_STATUS_EXPERT_FEEDBACK
+            ]);
+        },Sql\Predicate\PredicateSet::OP_AND);
+
+        if(!empty($this->opt->keyword))
+        {
+            $keyword = $this->opt->keyword;
+
+            $tools = $this->serviceManager->get('Tools');
+
+            if($tools->isUUID($keyword)) {
+                $select->where("md.uuid = '$keyword'");
+            }else{
+                $whereSql = function(Sql\Where $where) use ($keyword){
+                    $where->AND->like('md.title',"%".$keyword."%");
+                    $where->OR->like('md.title_en',"%".$keyword."%");
+                };
+                $select->where($whereSql,Sql\Predicate\PredicateSet::OP_AND);
+            }
+
+        }
+
+        $select->order("md.id DESC");
+
+//        echo $sql->getSqlStringForSqlObject($select); //带环境的sql
+//        echo $select->getSqlString(); //普通级别的sql
+//        exit();
+
+        return $select;
+
+    }//getAccept()
+
+    /**
+     * 获得我负责的元数据
+     * @param string $filter
+     * @return null
+     */
+    public function getAdminReviews($filter = "")
+    {
+        $authService = $this->serviceManager->get('Auth');
+        $user_id = $authService->getIdentity('id');
+
+        if(empty($user_id))
+            return false;
+
+        $wheresql = array();
+        $ordersql = array();
+
+        $wheresql[] = " m.status in (1,2,3,4) ";
+        $wheresql[] = " u.id=$user_id ";
+
+        if(isset($filter['keyword']) && !empty($filter['keyword']))
+        {
+            $wheresql[] = " md.title like '%".$filter['keyword']."%' ";
+        }
+        if(isset($filter['code']) && !empty($filter['code']))
+        {
+            $wheresql[] = " s.sourceid=".$filter['code']." ";
+        }
+        if(isset($filter['order']) && !empty($filter['order']))
+        {
+            $sort = "DESC";
+            if(isset($filter['sort']) && !empty($filter['sort']) && in_array( strtolower($filter['sort']),array('desc','asc')))
+            {
+                $sort = $filter['sort'];
+            }
+            $ordersql[] = " {$filter['order']} $sort ";
+        }
+
+        if(count($wheresql)>0)
+        {
+            $wheresql = " WHERE ".join(" AND ",$wheresql);
+        }else{
+            $wheresql = "";
+        }
+
+        if(count($ordersql)>0)
+        {
+            $ordersql = " ORDER BY ".join(',',$ordersql);
+        }else{
+            $ordersql = " ORDER BY m.status desc,m.ts_accepted desc ";
+        }
+
+        $sql = "select m.id,g.id as gid, md.uuid,md.title,u.username,u.realname,m.status,md.id as mdid,md.author,m.ts_accepted,count(r.id) as reviews
+				FROM mdstatus m
+				right join metadata md on md.uuid=m.uuid
+				left join geonetworkmetadata g on m.uuid=g.uuid
+				left join users u on u.id=m.userid
+				left join datasource s on s.uuid=md.uuid
+				left join mdreview r ON r.uuid=md.uuid
+				$wheresql
+				GROUP BY m.id,g.id, md.uuid,md.title,u.username,u.realname,m.status,md.id,md.author,m.ts_accepted
+				$ordersql";
+        $re = $this->db->query($sql);
+        $rows = $re->fetchAll();
+
+        return $rows;
+
+    }//getAdminReviews
+
+    /**
+     * 获取通过评审的元数据
+     * @return Sql\Select
+     */
+    public function getReviewed(){
+
+        $select = new Sql\Select;
+
+        $select->from(['m'=>'mdstatus']);
+        $select->columns(['id','status','ts_finished']);
+
+        $select->join(["md"=>"metadata"], "md.uuid=m.uuid", ["title","uuid"], $select::JOIN_RIGHT);
+        $select->join(["u"=>"users"], "u.id=m.userid", ["username","realname"], $select::JOIN_LEFT);
+
+        $select->where("m.status = ".self::REVIEW_STATUS_PUBLISH);
+
+        if(!empty($this->opt->keyword))
+        {
+            $keyword = $this->opt->keyword;
+
+            $tools = $this->serviceManager->get('Tools');
+
+            if($tools->isUUID($keyword)) {
+                $select->where("md.uuid = '$keyword'");
+            }else{
+                $whereSql = function(Sql\Where $where) use ($keyword){
+                    $where->AND->like('md.title',"%".$keyword."%");
+                    $where->OR->like('md.title_en',"%".$keyword."%");
+                };
+                $select->where($whereSql,Sql\Predicate\PredicateSet::OP_AND);
+            }
+
+        }
+
+        $select->order("m.ts_finished DESC");
+
+        return $select;
+
+    }//getReviewed();
+
     /**
      * 取消评审
      * @param $id
      * @return bool
      */
     public function cancel($id){
-        if(!is_numeric($id) || $id<1)
+
-            return false;
+        if(is_numeric($id))
-        return $this->changeStatus($id,self::REVIEW_STATUS_CANCELED);
+        {
+            $this->getEventManager()->trigger('review.canceled', $this, compact('id'));
+
+            return $this->changeStatus($id,self::REVIEW_STATUS_CANCELED);
+        }elseif(is_array($id)){
+            foreach($id as $item){
+                $item = (int)$item;
+                if($this->changeStatus($item,self::REVIEW_STATUS_CANCELED) === false)
+                    return "ID:$item:取消失败";
+            }
+            $this->getEventManager()->trigger('review.canceled', $this, compact('id'));
+            return true;
+        }
+
+        return false;
     }
 
     /**
@@ -159,46 +433,123 @@ class Review extends AbstractEventManager implements ServiceManagerAwareInterfac
             return false;
         }
 
-        $authorEmail = $this->getAuthor($id);
+        $this->getEventManager()->trigger('review.accepted', $this, compact('id'));
-
-        foreach($authorEmail as $v)
-        {
-            $mailSender = $this->serviceManager->get('Mail/Sender');
-            $mailSender->backend([
-                'email' => $v['email'],
-                'name' => !empty($v['realname']) ? $v['realname']:$v['username'],
-                'template' => 'review-new-accept',
-                'data' => [
-                    'uuid' => $v['uuid'],
-                    'title' => $v['title'],
-                ]
-            ]);
-        }
 
         return true;
 
     }//accept($id)
 
     /**
-     * 获得某条评审涉及的元数据相关作者信息（email,元数据标题，uuid)
+     * 重置评审，将评审的状态设置为投稿元数据状态
      * @param $id
-     * @return mixed
+     * @return array|bool
      */
-    public function getAuthor($id){
-        $sql = "SELECT DISTINCT u.email,u.realname,u.username,m.title,m.uuid FROM mdstatus s
-                LEFT JOIN metadata m ON s.uuid=m.uuid
-                RIGHT JOIN mdauthor a ON s.uuid=a.uuid
-                LEFT JOIN users u ON a.userid=u.id
-                WHERE s.id=$id
-                ORDER BY u.email";
-
-        $rs = $this->db->query($sql);
-        return $rs->fetchAll(\PDO::FETCH_ASSOC);
-    }
-
     public function reset($id){
 
-    }
+        if(!is_array($id))
+        {
+            if($this->getStatus($id) != self::REVIEW_STATUS_CANCELED)
+                return [
+                    '此条评审的当前状态已经不属于被取消的评审，可能已经由其他管理人员重置',
+                ];
+
+            $status = $this->changeStatus($id,self::REVIEW_STATUS_DEFAULT);
+
+            if(false === $status)
+                return false;
+
+        }else{
+            $message = [];
+            foreach($id as $item)
+            {
+                $item = (int)$item;
+                if($this->getStatus($item) != self::REVIEW_STATUS_CANCELED){
+                    $message[] = "ID:$item:此条评审的当前状态已经不属于被取消的评审，可能已经由其他管理人员重置";
+                    continue;
+                }
+
+                $status = $this->changeStatus($item,self::REVIEW_STATUS_DEFAULT);
+
+                if(false === $status)
+                    $message[] = "ID:$item:重置失败";
+            }
+
+            if(count($message) > 0)
+                return $message;
+        }
+
+
+        $this->getEventManager()->trigger('review.reset', $this, compact('id'));
+
+        return true;
+    }//reset()
+
+    /**
+     * 更改管理员
+     * @param $id   array|int 可以输入数组
+     * @param $user_id  int : 不能输入数组
+     * @return bool|string
+     */
+    public function changeAdmin($id,$user_id)
+    {
+        if((!is_numeric($id) && !is_array($id)) || !is_numeric($user_id))
+            return false;
+
+        if(is_numeric($id)){
+            return $this->db->exec("UPDATE mdstatus SET userid=$user_id WHERE id=$id");
+        }
+
+        if(is_array($id))
+        {
+            try{
+                $this->db->setAttribute(\PDO::ATTR_ERRMODE, \PDO::ERRMODE_EXCEPTION);
+                $this->db->beginTransaction();
+                foreach($id as $item_id){
+                    $item_id = $item_id+0;
+                    $this->db->exec("UPDATE mdstatus SET userid=$user_id WHERE id=$item_id");
+                }
+                $this->db->commit();
+                return true;
+
+            }catch (\Exception $e){
+                $this->db->rollBack();
+                return $e->getMessage();
+            }
+
+        }
+        return false;
+    }//changeAdmin();
+
+    /**
+     * 重新评审
+     * @param $id
+     * @return bool|string
+     */
+    public function restart($id)
+    {
+        if((!is_numeric($id) && !is_array($id)))
+            return false;
+
+        if(is_numeric($id))
+            return $this->changeStatus($id,self::REVIEW_STATUS_EXPERT_ACCEPT);
+
+        if(is_array($id))
+        {
+            try{
+                $this->db->setAttribute(\PDO::ATTR_ERRMODE, \PDO::ERRMODE_EXCEPTION);
+                $this->db->beginTransaction();
+                foreach($id as $item_id){
+                    $item_id = $item_id+0;
+                    $this->db->exec("UPDATE mdstatus SET status=".self::REVIEW_STATUS_EXPERT_ACCEPT." WHERE id=$item_id");
+                }
+                $this->db->commit();
+                return true;
+            }catch (\Exception $e){
+                $this->db->rollBack();
+                return $e->getMessage();
+            }
+        }
+    }//restart()
 
     /**
      * 更改mdstatus中的status字段
@@ -206,7 +557,7 @@ class Review extends AbstractEventManager implements ServiceManagerAwareInterfac
      * @param $status
      * @return bool
      */
-    function changeStatus($id,$status){
+    protected function changeStatus($id,$status){
         $statusValues = array(
             self::REVIEW_STATUS_CANCELED,       //取消评审
             self::REVIEW_STATUS_DEFAULT,	    //初始状态

Westdc/Service/ServiceAgent/Account.php

@@ -1,17 +0,0 @@
-<?php
-/**
- * Created by PhpStorm.
- * User: Administrator
- * Date: 2014/11/4
- * Time: 11:23
- */
-
-namespace Westdc\Service\ServiceAgent;
-
-use Westdc\Member\Account as Westdc_Account;
-
-class Account extends Westdc_Account{
-
-
-
-} 

Westdc/Service/ServiceAgent/Db.php

@@ -13,15 +13,12 @@ use Westdc\Db as WestdcDb;
 class Db {
 
     public function getZendDb(){
-
+        return WestdcDb\Db::getInstance();
-        $dbObject = new WestdcDb\Db($adapter);
-
-        return $dbObject->getAdapter();
     }
 
     public function getPdo()
     {
-        return new WestdcDb\Pdo;
+        return WestdcDb\Pdo::getInstance();
     }
 
     public function getDbh()

Westdc/User/Account.php

@@ -8,9 +8,9 @@ use Zend\Authentication\AuthenticationService;
 use Zend\Authentication\Storage\Session as SessionStorage;
 use Westdc\Helpers\View as view;
 use Westdc\Helpers\Config;
-use Westdc\Helpers\Dbh as dbh;
+use Westdc\Db\Dbh as dbh;
-use Westdc\Helpers\PDO as Db;
+use Westdc\Db\Pdo as Db;
-use Westdc\Helpers\Db as Zend_Db;
+use Westdc\Db\Db as Zend_Db;
 use Westdc\Mail\Mail;
 use Westdc\User\Listener\AccountListener as Listener;
 use Westdc\User\Listener\PwdListener;
@@ -18,7 +18,7 @@ use Westdc\User\Member;
 
 class Account implements EventManagerAwareInterface
 {	
-	public $memberTable = "tbl_member";
+	public $memberTable = "users";
 	public $FieldUsername = "username";
 	public $FieldPasword = "password";
 	public $FieldLastlogin = "ts_last_login";
@@ -34,7 +34,7 @@ class Account implements EventManagerAwareInterface
 
 	function __construct()
 	{
-		$this->db = new Db();
+		$this->db = Db::getInstance();
 		$this->config = Config::get();
 		
 		$Listener = new Listener();
@@ -60,16 +60,21 @@ class Account implements EventManagerAwareInterface
     }
 	
 	//获取账号信息,数组
-	public function getAccountInfo($id = 0)
+    public function getAccountInfo($id = 0)
-	{
+    {
-		if($id == 0)
+
-		{
+        if(is_string($id))
-			$id = view::User('id');
+            $sql = "SELECT * FROM ".$this->memberTable." WHERE username='$id'";
-		}
+        elseif(is_numeric($id))
-		$sql = "SELECT * FROM {$this->memberTable} WHERE id=$id";
+        {
-		$rs = $this->db->query($sql);
+            if($id == 0)
-		return $rs->fetch();
+                $id == view::User('id');
-	}
+            $sql = "SELECT * FROM {$this->memberTable} WHERE id=$id";
+        }
+
+        $rs = $this->db->query($sql);
+        return $rs->fetch(\PDO::FETCH_ASSOC);
+    }
 
 	//注册
 	public function register($data)
@@ -169,7 +174,7 @@ class Account implements EventManagerAwareInterface
 		$auth = new AuthenticationService();
 		$auth->setStorage(new SessionStorage($this->config->session_namespace));
 
-		new Zend_Db($dbAdapter);
+		$dbAdapter = Zend_Db::getInstance();
 		
 		$authAdapter = new \Zend\Authentication\Adapter\DbTable(
 			$dbAdapter,
@@ -212,7 +217,14 @@ class Account implements EventManagerAwareInterface
 	
 	public function cookieLogin($data)
 	{
-		return $this->storeLogin($data,false);
+        $data = $this->getAccountInfo($data['username']);
+
+        if(!$data)
+        {
+            return false;
+        }
+
+        return $this->storeLogin($data,false);
 	}
 	
 	//注册信息参数

Westdc/User/Event/EditEvent.php

@@ -1,13 +0,0 @@
-<?php
-namespace Sookon\User\Event;
-
-use Zend\EventManager\EventInterface;
-
-interface EditEvent
-{
-	
-	public function checkParam(EventInterface $e);
-	
-	public function editSuccess(EventInterface $e);
-	
-}

Westdc/User/Event/LoginEvent.php

@@ -1,14 +0,0 @@
-<?php
-namespace Sookon\User\Event;
-
-use Zend\EventManager\EventInterface;
-
-interface LoginEvent
-{
-	
-	public function checkParam(EventInterface $e);
-	
-	public function updateStatus(EventInterface $e);
-	
-	public function createAvatar(EventInterface $e);
-}

Westdc/User/Event/PwdEvent.php

@@ -1,15 +0,0 @@
-<?php
-namespace Sookon\User\Event;
-
-use Zend\EventManager\EventInterface;
-
-interface PwdEvent
-{
-	
-	public function forgotPwdCheckParam(EventInterface $e);
-	
-	public function sendGetPasswordMail(EventInterface $e);
-	
-	public function resetPwdCheckParam(EventInterface $e);
-	
-}

Westdc/User/Event/RegisterEvent.php

@@ -1,15 +0,0 @@
-<?php
-namespace Sookon\User\Event;
-
-use Zend\EventManager\EventInterface;
-
-interface RegisterEvent
-{
-	
-	public function checkParam(EventInterface $e);
-	
-	public function checkUser(EventInterface $e);
-	
-	public function registerSuccess(EventInterface $e);
-	
-}

Westdc/User/Gravatar.php

@@ -1,5 +1,5 @@
 <?php
-namespace Sookon\User;
+namespace Westdc\User;
 
 class Gravatar{
 	

Westdc/User/Group.php

@@ -0,0 +1,45 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: Li Jianxuan
+ * Date: 14-9-19
+ * Time: 下午3:21
+ */
+
+namespace Westdc\User;
+
+use Zend\ServiceManager\ServiceManager;
+use Zend\ServiceManager\ServiceManagerAwareInterface;
+
+class Group implements ServiceManagerAwareInterface {
+
+	protected $serviceManager;
+
+	private $db;
+
+	public function setServiceManager (ServiceManager $serviceManager) {
+		$this->serviceManager = $serviceManager;
+
+		$this->init();
+
+		return $this;
+	}
+
+	private function init () {
+		$dbService = $this->serviceManager->get('Db');
+		$this->db = $dbService->getPdo();
+	}
+
+
+	/**
+	 * @return mixed
+	 */
+	public function fetchAll () {
+
+		$sql = "SELECT * FROM groups";
+		$rs = $this->db->query($sql);
+
+		return $rs->fetchAll(\PDO::FETCH_ASSOC);
+	}
+
+}

Westdc/User/Handle/EditHandle.php

@@ -1,13 +1,12 @@
 <?php
-namespace Sookon\User\Handle;
+namespace Westdc\User\Handle;
 
-use Sookon\Mail\Mail;
+use Westdc\Helpers\View as view;
-use Sookon\Helpers\View as view;
+use Westdc\Helpers\Pdo;
-use Sookon\Helpers\Pdo;
+use Westdc\Helpers\Config;
-use Sookon\Helpers\Config;
 use Zend\EventManager\EventInterface;
 
-class EditHandle implements \Sookon\User\Event\EditEvent
+class EditHandle
 {
 	private $db;  			//传入PDO对象
 	public $tbl_member = "tbl_member";

Westdc/User/Handle/LoginHandle.php

@@ -1,13 +1,12 @@
 <?php
-namespace Sookon\User\Handle;
+namespace Westdc\User\Handle;
 
-use Sookon\Helpers\Dbh as dbh;
+use Westdc\Db\Dbh as dbh;
-use Sookon\Helpers\PDO as Db;
+use Westdc\Db\Pdo as Db;
-use Sookon\User\Gravatar;
+use Westdc\User\Gravatar;
-use Sookon\Helpers\View as view;
 use Zend\EventManager\EventInterface;
 
-class LoginHandle implements \Sookon\User\Event\LoginEvent
+class LoginHandle
 {
 	private $db;  			//传入PDO对象
 	public $tbl_member = "tbl_member";
@@ -17,12 +16,10 @@ class LoginHandle implements \Sookon\User\Event\LoginEvent
 	public $FieldEmail = "email";
 	public $FieldLastloginIp = "last_login_ip";
 	public $FieldGravatarEmail = "gravatar_email";
-	private $DefaultFetchMode = \PDO::FETCH_BOTH;	//默认检索模式，防止出现sdtClass错误
-	private $config;		//全局配置
 	
 	function __construct()
 	{
-		$this->db = new Db();
+		$this->db = Db::getInstance();
 	}
 	
 	public function checkParam(EventInterface $e){
@@ -55,7 +52,7 @@ class LoginHandle implements \Sookon\User\Event\LoginEvent
 		$sql = "SELECT id,{$this->FieldPasword},status FROM {$this->tbl_member} WHERE {$this->FieldUsername}=?";
 		$sth = $this->db->prepare($sql);
 		$rs = $sth->execute(array($data[$this->FieldUsername]));
-		$row = $sth->fetch();
+		$row = $sth->fetch(\PDO::FETCH_ASSOC);
 		
 		if(isset($row['id']) && !empty($row['id']))
 		{

Westdc/User/Handle/PwdHandle.php

@@ -1,12 +1,10 @@
 <?php
-namespace Sookon\User\Handle;
+namespace Westdc\User\Handle;
 
-use Sookon\Mail\Mail;
+use Westdc\Db\Pdo;
-use Sookon\Helpers\View as view;
+use Westdc\Helpers\Config;
-use Sookon\Helpers\Pdo;
-use Sookon\Helpers\Config;
 
-class PwdHandle implements \Sookon\User\Event\PwdEvent
+class PwdHandle
 {
 	private $db;  			//传入PDO对象
 	public $tbl_member = "tbl_member";
@@ -21,7 +19,7 @@ class PwdHandle implements \Sookon\User\Event\PwdEvent
 	
 	function __construct($db = NULL)
 	{
-		$this->db = new Pdo;
+		$this->db = Pdo::getInstance();
 		$this->config = Config::get();
 	}
 	

Westdc/User/Handle/RegisterHandle.php

@@ -1,14 +1,12 @@
 <?php
-namespace Sookon\User\Handle;
+namespace Westdc\User\Handle;
 
-use Sookon\Mail\Mail;
+use Westdc\Mail\Mail;
-use Sookon\Helpers\Config;
+use Westdc\Helpers\Config;
-use Sookon\Helpers\View as view;
+use Westdc\Db\Pdo as Db;
-use Sookon\Helpers\PDO as Db;
-use Sookon\User\Event\RegisterEvent as Event;
 use Zend\EventManager\EventInterface;
 
-class RegisterHandle implements Event
+class RegisterHandle
 {
 	private $db;  			//传入PDO对象
 	public $tbl_member = "tbl_member";
@@ -23,7 +21,7 @@ class RegisterHandle implements Event
 	
 	function __construct($db = NULL)
 	{
-		$this->db = new Db();
+		$this->db = Db::getInstance();
 		$this->config = Config::get();
 	}
 	

Westdc/User/Listener/AccountListener.php

@@ -1,8 +1,8 @@
 <?php
-namespace Sookon\User\Listener;
+namespace Westdc\User\Listener;
 
-use Sookon\User\Handle\RegisterHandle;
+use Westdc\User\Handle\RegisterHandle;
-use Sookon\User\Handle\LoginHandle;
+use Westdc\User\Handle\LoginHandle;
 use Zend\EventManager\EventCollection;
 use Zend\EventManager\ListenerAggregateInterface;
 use Zend\EventManager\EventInterface;

Westdc/User/Listener/EditListener.php

@@ -1,7 +1,7 @@
 <?php
-namespace Sookon\User\Listener;
+namespace Westdc\User\Listener;
 
-use Sookon\User\Handle\EditHandle;
+use Westdc\User\Handle\EditHandle;
 use Zend\EventManager\EventCollection;
 use Zend\EventManager\ListenerAggregateInterface;
 use Zend\EventManager\EventInterface;

Westdc/User/Listener/PwdListener.php

@@ -1,7 +1,7 @@
 <?php
-namespace Sookon\User\Listener;
+namespace Westdc\User\Listener;
 
-use Sookon\User\Handle\PwdHandle;
+use Westdc\User\Handle\PwdHandle;
 use Zend\EventManager\EventCollection;
 use Zend\EventManager\ListenerAggregateInterface;
 use Zend\EventManager\EventInterface;

Westdc/User/User.php

@@ -12,35 +12,63 @@ use Zend\ServiceManager\ServiceManager;
 use Zend\ServiceManager\ServiceManagerAwareInterface;
 use Westdc\EventModel\AbstractEventManager;
 
-class User extends AbstractEventManager implements ServiceManagerAwareInterface{
+class User extends AbstractEventManager implements ServiceManagerAwareInterface {
 
-    protected $serviceManager;
+	protected $serviceManager;
 
-    private $db;
+	private $db;
 
-    public function setServiceManager(ServiceManager $serviceManager)
+	public function setServiceManager (ServiceManager $serviceManager) {
-    {
+		$this->serviceManager = $serviceManager;
-        $this->serviceManager = $serviceManager;
 
-        $this->init();
+		$this->init();
-
-        return $this;
-    }
-
-    private function init()
-    {
-        $dbService = $this->serviceManager->get('Db');
-        $this->db = $dbService->getPdo();
-    }
-
-	public function fetchAll(){
-		$sql = "select * from users where usertype = 'member'";
-		$rs = $this->db->query($sql);
-		return $rs->fetchAll(\PDO::FETCH_ASSOC);
 
+		return $this;
+	}
 
+	private function init () {
+		$dbService = $this->serviceManager->get('Db');
+		$this->db = $dbService->getPdo();
 	}
 
 
+	/**
+	 * @param $usertype
+	 * @return mixed
+	 */
+	public function fetchAll ($usertype) {
+
+		$sql = "SELECT * FROM users WHERE usertype = '$usertype'";
+		$rs = $this->db->query($sql);
+
+		return $rs->fetchAll(\PDO::FETCH_ASSOC);
+	}
+
+
+	/**
+	 * @return bool
+	 */
+	public function fetchAllHeiHe () {
+
+		$sql = "SELECT * FROM heiheuser ORDER BY id DESC";
+		$rs = $this->db->query($sql);
+
+		return $rs->fetchAll(\PDO::FETCH_ASSOC);
+
+		return true;
+	}
+
+
+	public function fetchAllSendmail () {
+
+		$time = date("Y-m-d H:i:s", time() - 3 * 365 * 24 * 3600);
+
+		$sql = "SELECT * FROM users
+					WHERE ts_last_login<'$time'
+					ORDER BY ts_last_login DESC";
+		$rs = $this->db->query($sql);
+
+		return $rs->fetchAll(\PDO::FETCH_ASSOC);
+	}
 
 }