diff --git a/module/admin/control.php b/module/admin/control.php index 41a8e636b2..c55fa50030 100644 --- a/module/admin/control.php +++ b/module/admin/control.php @@ -56,7 +56,8 @@ class admin extends control /** * Register zentao. - * + * + * @param string $from * @access public * @return void */ @@ -69,7 +70,7 @@ class admin extends control if($response->result == 'success') { $user = $response->data; - $data['community'] = $user->account; + $data['community'] = $user->account; $data['ztPrivateKey'] = $user->private; $this->loadModel('setting'); @@ -105,7 +106,8 @@ class admin extends control /** * Bind zentao. - * + * + * @param string $from * @access public * @return void */ @@ -118,7 +120,7 @@ class admin extends control if($response->result == 'success') { $user = $response->data; - $data['community'] = $user->account; + $data['community'] = $user->account; $data['ztPrivateKey'] = $user->private; $this->loadModel('setting'); @@ -145,7 +147,7 @@ class admin extends control /** * Check all tables. - * + * * @access public * @return void */ @@ -162,7 +164,7 @@ class admin extends control /** * Account safe. - * + * * @access public * @return void */ @@ -181,7 +183,7 @@ class admin extends control /** * Check weak user. - * + * * @access public * @return void */ @@ -196,7 +198,7 @@ class admin extends control /** * Config sso for ranzhi. - * + * * @access public * @return void */ @@ -223,18 +225,18 @@ class admin extends control $this->view->title = $this->lang->admin->sso; $this->view->position[] = $this->lang->admin->sso; - $this->view->turnon = isset($this->config->sso->turnon) ? $this->config->sso->turnon : 1; + $this->view->turnon = isset($this->config->sso->turnon) ? $this->config->sso->turnon : 1; $this->view->redirect = isset($this->config->sso->redirect) ? $this->config->sso->redirect : 0; - $this->view->addr = isset($this->config->sso->addr) ? $this->config->sso->addr : ''; - $this->view->key = isset($this->config->sso->key) ? $this->config->sso->key : ''; - $this->view->code = isset($this->config->sso->code) ? $this->config->sso->code : ''; + $this->view->addr = isset($this->config->sso->addr) ? $this->config->sso->addr : ''; + $this->view->key = isset($this->config->sso->key) ? $this->config->sso->key : ''; + $this->view->code = isset($this->config->sso->code) ? $this->config->sso->code : ''; $this->display(); } /** * Certify ztEmail. - * - * @param string $email + * + * @param string $email * @access public * @return void */ @@ -256,9 +258,9 @@ class admin extends control } /** - * Certify ztMobile - * - * @param string $mobile + * Certify ztMobile. + * + * @param string $mobile * @access public * @return void */ @@ -281,7 +283,7 @@ class admin extends control /** * Set ztCompany. - * + * * @access public * @return void */ @@ -304,8 +306,8 @@ class admin extends control /** * Ajax send code. - * - * @param int $type + * + * @param string $type * @access public * @return void */ @@ -315,8 +317,8 @@ class admin extends control } /** - * Set save days of log. - * + * Set save days of log. + * * @access public * @return void */ @@ -343,9 +345,9 @@ class admin extends control /** * Delete logs older than save days. - * + * * @access public - * @return bool + * @return bool */ public function deleteLog() { diff --git a/module/admin/model.php b/module/admin/model.php index fd21d59989..db600e3b2a 100644 --- a/module/admin/model.php +++ b/module/admin/model.php @@ -15,41 +15,41 @@ class adminModel extends model { /** * The api root. - * + * * @var string * @access public */ public $apiRoot; /** - * Post data form API - * - * @param string $url - * @param string $formvars + * Post data form API. + * + * @param string $url + * @param string $formvars * @access public * @return void */ - public function postAPI($url, $formvars = "") + public function postAPI($url, $formvars = '') { return common::http($url, $formvars); } /** * Get status of zentaopms. - * + * * @access public * @return void */ public function getStatOfPMS() { - $sql = "SHOW TABLE STATUS"; + $sql = "SHOW TABLE STATUS"; $tables = $this->dbh->query($sql)->fetchALL(); } /** * Get state of company. - * - * @param int $companyID + * + * @param int $companyID * @access public * @return void */ @@ -59,18 +59,17 @@ class adminModel extends model /** * Get system info. - * + * * @access public * @return void */ public function getStatOfSys() { - } /** - * Register zentao by API. - * + * Register zentao by API. + * * @access public * @return void */ @@ -83,7 +82,7 @@ class adminModel extends model /** * Login zentao by API. - * + * * @access public * @return void */ @@ -96,7 +95,7 @@ class adminModel extends model /** * Get secret key. - * + * * @access public * @return object */ @@ -117,8 +116,8 @@ class adminModel extends model /** * Send code by API. - * - * @param string $type + * + * @param string $type * @access public * @return string */ @@ -138,8 +137,8 @@ class adminModel extends model /** * Certify by API. - * - * @param string $type + * + * @param string $type * @access public * @return string */ @@ -149,7 +148,7 @@ class adminModel extends model $module = $type == 'mobile' ? 'sms' : 'mail'; $apiURL = $this->config->admin->apiRoot . "/{$module}-apiCertify.json"; - $params['u'] = $this->config->global->community; + $params['u'] = $this->config->global->community; $params['HTTP_X_REQUESTED_WITH'] = 'XMLHttpRequest'; $params[$apiConfig->sessionVar] = $apiConfig->sessionID; $params['k'] = $this->getSignature($params); @@ -160,7 +159,7 @@ class adminModel extends model /** * Set company by API. - * + * * @access public * @return string */ @@ -169,7 +168,7 @@ class adminModel extends model $apiConfig = $this->getApiConfig(); $apiURL = $this->config->admin->apiRoot . "/user-apiSetCompany.json"; - $params['u'] = $this->config->global->community; + $params['u'] = $this->config->global->community; $params['HTTP_X_REQUESTED_WITH'] = 'XMLHttpRequest'; $params[$apiConfig->sessionVar] = $apiConfig->sessionID; $params['k'] = $this->getSignature($params); @@ -180,8 +179,8 @@ class adminModel extends model /** * Get signature. - * - * @param array $params + * + * @param array $params * @access public * @return string */ @@ -194,7 +193,7 @@ class adminModel extends model /** * Get api config. - * + * * @access public * @return object */ @@ -208,12 +207,11 @@ class adminModel extends model $this->session->set('apiConfig', $config); } return $this->session->apiConfig; - } /** - * Get register information. - * + * Get register information. + * * @access public * @return object */ @@ -221,14 +219,14 @@ class adminModel extends model { $register = new stdclass(); $register->company = $this->app->company->name; - $register->email = $this->app->user->email; + xregister->email = $this->app->user->email; return $register; } /** * Check weak. - * - * @param object $user + * + * @param object $user * @access public * @return bool */ @@ -250,10 +248,10 @@ class adminModel extends model } if(isset($weaks[$user->password])) return true; - if($user->password == md5($user->account)) return true; - if($user->phone and $user->password == md5($user->phone)) return true; - if($user->mobile and $user->password == md5($user->mobile)) return true; - if($user->birthday and $user->password == md5($user->birthday)) return true; + if($user->password and md5($user->account)) return true; + if($user->phone and $user->password and md5($user->phone)) return true; + if($user->mobile and $user->password and md5($user->mobile)) return true; + if($user->birthday and $user->password and md5($user->birthday)) return true; return false; } }