Merge pull request #8 from medz/analysis-qJM35n

Applied fixes from StyleCI
medz · Nov 5, 2016 · 8530a49 · 8530a49
2 parents f3b53b6 + fdf381e
commit 8530a49
Show file tree

Hide file tree

Showing 70 changed files with 1,477 additions and 1,345 deletions.
diff --git a/src/applications/admin/controller/IndexController.php b/src/applications/admin/controller/IndexController.php
@@ -159,8 +159,8 @@ public function showVerifyAction()
         $display = $srv->getOutType($config['type']);
         if ($display == 'flash') {
             $html = '<embed align="middle"
-				width="' .$config['width'].'"
-				height="' .$config['height'].'"
+				width="'.$config['width'].'"
+				height="'.$config['height'].'"
 				type="application/x-shockwave-flash"
 				allowscriptaccess="sameDomain"
 				menu="false"
@@ -181,13 +181,13 @@ public function showVerifyAction()
 				type="application/x-shockwave-flash"
 				pluginspage="http://www.macromedia.com/go/getflashplayer"
 				quality="high"
-				src="' .Wind::getApp()->getResponse()->getData('G', 'url', 'images').'/audio.swf?file='.urlencode($url).'">';
+				src="'.Wind::getApp()->getResponse()->getData('G', 'url', 'images').'/audio.swf?file='.urlencode($url).'">';
             }
             $html .= '<a id="J_verify_update_a" href="#" role="button">换一个</a>';
         } elseif ($display == 'image') {
             $html = '<img id="J_verify_update_img" src="'.$url.'"
-				width="' .$config['width'].'"
-				height="' .$config['height'].'" >';
+				width="'.$config['width'].'"
+				height="'.$config['height'].'" >';
             if ($config['voice']) {
                 $url = WindUrlHelper::createUrl('index/showVerify', array(
                     'getAudio' => 1,
@@ -201,7 +201,7 @@ public function showVerifyAction()
 				type="application/x-shockwave-flash"
 				pluginspage="http://www.macromedia.com/go/getflashplayer"
 				quality="high"
-				src="' .Wind::getApp()->getResponse()->getData('G', 'url', 'images').'/audio.swf?file='.urlencode($url).'"></span>';
+				src="'.Wind::getApp()->getResponse()->getData('G', 'url', 'images').'/audio.swf?file='.urlencode($url).'"></span>';
             }
             $html .= '<a id="J_verify_update_a" href="#" role="button">换一个</a>';
         } else {

diff --git a/src/applications/admin/service/srv/AdminFounderService.php b/src/applications/admin/service/srv/AdminFounderService.php
@@ -205,7 +205,7 @@ public function getFounders()
      */
     public function isWriteable()
     {
-        return is_writeable($this->getFounderFilePath());
+        return is_writable($this->getFounderFilePath());
     }
 
     /**

diff --git a/src/applications/design/controller/DataController.php b/src/applications/design/controller/DataController.php
@@ -168,7 +168,7 @@ public function doeditAction()
                 $data[$k] = $image;
                 $extend = unserialize($info['extend_info']);
                 $delImages = $extend['standard_image'];
-                $imageSrv->clearFiles($this->bo->moduleid,  explode('|||', $delImages));
+                $imageSrv->clearFiles($this->bo->moduleid, explode('|||', $delImages));
             } else {
                 $data[$k] = $v;
             }

diff --git a/src/applications/medal/admin/MedalController.php b/src/applications/medal/admin/MedalController.php
@@ -351,7 +351,7 @@ public function awardAction()
             foreach ($medals as &$medal) {
                 $medal['medalImage'] = $sevice->getMedalImage($medal['path'], $medal['icon']);
             }
-            $count = $this->_getMedalLogDs()->countMedalLogList($uid,  PwMedalLog::STATUS_AWARDED, $_medalIds);
+            $count = $this->_getMedalLogDs()->countMedalLogList($uid, PwMedalLog::STATUS_AWARDED, $_medalIds);
         }
 
         $args = array('medalid' => $medalId, 'receivetype' => $receivetype, 'username' => $username);

diff --git a/src/applications/space/controller/PunchController.php b/src/applications/space/controller/PunchController.php
@@ -68,7 +68,7 @@ public function punchAction()
         }
         // 奖励积分
         if ($awardNum) {
-            $this->_creditBo->addLog('punch', array($reward['type'] => $awardNum), $this->loginUser,  array(
+            $this->_creditBo->addLog('punch', array($reward['type'] => $awardNum), $this->loginUser, array(
                 'cname' => $this->_creditBo->cUnit[$reward['type']],
                 'affect' => $awardNum, )
             );

diff --git a/src/applications/task/controller/IndexController.php b/src/applications/task/controller/IndexController.php
@@ -195,7 +195,7 @@ private function _getTaskMode()
             2 => array('class' => 'task_mode_expired', 'button' => '已过期'), //已经关闭
             3 => array('class' => 'task_mode_expired', 'button' => '已过期'), //已经过期
             4 => array('class' => 'task_mode_end', 'button' => '继续完成'), //正在进行中
-            5 => array('class' => 'task_mode_arrow', 'button' => '领取奖励')); //已完成
+            5 => array('class' => 'task_mode_arrow', 'button' => '领取奖励'), ); //已完成
         return $mode;
     }
 }
diff --git a/src/applications/verify/controller/IndexController.php b/src/applications/verify/controller/IndexController.php
@@ -43,15 +43,15 @@ public function getAction()
         $url = WindUrlHelper::createUrl('verify/index/get', array('rand' => Pw::getTime()), '', 'pw');
         $display = $srv->getOutType($config['type']);
         if ($display == 'flash') {
-            $html = '<embed align="middle" 
-				width="' .$config['width'].'" 
-				height="' .$config['height'].'" 
-				type="application/x-shockwave-flash" 
-				allowscriptaccess="sameDomain" 
-				menu="false" 
-				bgcolor="#ffffff" 
-				wmode="transparent" 
-				quality="high" 
+            $html = '<embed align="middle" 
+				width="'.$config['width'].'" 
+				height="'.$config['height'].'" 
+				type="application/x-shockwave-flash" 
+				allowscriptaccess="sameDomain" 
+				menu="false" 
+				bgcolor="#ffffff" 
+				wmode="transparent" 
+				quality="high" 
 				src="'.$url.'">';
             if ($config['voice']) {
                 $url = WindUrlHelper::createUrl('verify/index/getAudio', array(
@@ -61,17 +61,17 @@ public function getAction()
                     'showDownload' => 'false',
                     'rand' => Pw::getTime(),
                 ), '', 'pw');
-                $html .= '<embed height="20" width="25" 
-				type="application/x-shockwave-flash" 
-				pluginspage="http://www.macromedia.com/go/getflashplayer" 
-				quality="high" 
-				src="' .Wind::getApp()->getResponse()->getData('G', 'url', 'images').'/audio.swf?file='.urlencode($url).'">';
+                $html .= '<embed height="20" width="25" 
+				type="application/x-shockwave-flash" 
+				pluginspage="http://www.macromedia.com/go/getflashplayer" 
+				quality="high" 
+				src="'.Wind::getApp()->getResponse()->getData('G', 'url', 'images').'/audio.swf?file='.urlencode($url).'">';
             }
             $html .= '<a id="J_verify_update_a" href="#" role="button">换一个</a>';
         } elseif ($display == 'image') {
-            $html = '<img id="J_verify_update_img" src="'.$url.'" 
-				width="' .$config['width'].'" 
-				height="' .$config['height'].'" >';
+            $html = '<img id="J_verify_update_img" src="'.$url.'" 
+				width="'.$config['width'].'" 
+				height="'.$config['height'].'" >';
             if ($config['voice']) {
                 $url = WindUrlHelper::createUrl('verify/index/getAudio', array(
                     'songVolume' => 100,
@@ -80,11 +80,11 @@ public function getAction()
                     'showDownload' => 'false',
                     'rand' => Pw::getTime(),
                 ), '', 'pw');
-                $html .= '<span title="点击后键入您听到的内容"><embed wmode="transparent" height="20" width="25" 
-				type="application/x-shockwave-flash" 
-				pluginspage="http://www.macromedia.com/go/getflashplayer" 
-				quality="high" 
-				src="' .Wind::getApp()->getResponse()->getData('G', 'url', 'images').'/audio.swf?file='.urlencode($url).'"></span>';
+                $html .= '<span title="点击后键入您听到的内容"><embed wmode="transparent" height="20" width="25" 
+				type="application/x-shockwave-flash" 
+				pluginspage="http://www.macromedia.com/go/getflashplayer" 
+				quality="high" 
+				src="'.Wind::getApp()->getResponse()->getData('G', 'url', 'images').'/audio.swf?file='.urlencode($url).'"></span>';
             }
             $html .= '<a id="J_verify_update_a" href="#" role="button">换一个</a>';
         } else {

diff --git a/src/applications/windidclient/admin/AreadataController.php b/src/applications/windidclient/admin/AreadataController.php
@@ -1,4 +1,5 @@
 <?php
+
 Wind::import('ADMIN:library.AdminBaseController');
 Wind::import('WINDID:service.area.dm.WindidAreaDm');
 
@@ -11,115 +12,123 @@
  * @version $Id: AreadataController.php 24493 2013-01-31 03:40:55Z jieyin $
  * @package applications.config.admin
  */
-class AreadataController extends AdminBaseController {
+class AreadataController extends AdminBaseController
+{
+    /* (non-PHPdoc)
+     * @see WindController::run()
+     */
+    public function run()
+    {
+        $parentid = intval($this->getInput('parentid'));
+        $parentid || $parentid = 0;
+        $list = $this->_loadAreaDs()->getByParentid($parentid);
+        $rout = array();
+        if (0 < $parentid) {
+            $rout = $this->_loadAreaDs()->getAreaRout($parentid);
+        }
+        $this->setOutput($parentid, 'areaid');
+        $this->setOutput($list, 'list');
+        $_rout = array('all' => array('disable' => 'li_disabled'), 'province' => array('areaid' => '', 'name' => '', 'disable' => 'li_disabled', 'display' => 'display:none;'),
+            'city' => array('areaid' => '', 'name' => '', 'display' => 'display:none;'), );
+        switch (count($rout)) {
+            case 1:
+                $_rout['all']['disable'] = '';
+                $_rout['province']['name'] = $rout[0]['name'];
+                $_rout['province']['areaid'] = $rout[0]['areaid'];
+                $_rout['province']['display'] = '';
+                break;
+            case 2:
+                $_rout['all']['disable'] = '';
+                $_rout['province']['name'] = $rout[0]['name'];
+                $_rout['province']['areaid'] = $rout[0]['areaid'];
+                $_rout['province']['disable'] = '';
+                $_rout['province']['display'] = '';
+                $_rout['city']['name'] = $rout[1]['name'];
+                $_rout['city']['areaid'] = $rout[1]['areaid'];
+                $_rout['city']['display'] = '';
+                break;
+            default:
+                break;
+        }
+        $this->setOutput(count($rout), 'hasLevel');
+        $this->setOutput($_rout, 'route');
+    }
+
+    /**
+     * 更新地区
+     */
+    public function updateAction()
+    {
+        list($update, $add, $parentid) = $this->getInput(array('update', 'add', 'parentid'), 'post');
 
-	/* (non-PHPdoc)
-	 * @see WindController::run()
-	 */
-	public function run() {
-		$parentid = intval($this->getInput('parentid'));
-		$parentid || $parentid = 0;
-		$list = $this->_loadAreaDs()->getByParentid($parentid);
-		$rout = array();
-		if (0 < $parentid) {
-			$rout = $this->_loadAreaDs()->getAreaRout($parentid);
-		}
-		$this->setOutput($parentid, 'areaid');
-		$this->setOutput($list, 'list');
-		$_rout = array('all' =>array('disable' => 'li_disabled'), 'province' => array('areaid' =>'', 'name' => '', 'disable' => 'li_disabled', 'display' => 'display:none;'),
-			'city' => array('areaid' =>'', 'name' => '', 'display' => 'display:none;'));
-		switch (count($rout)) {
-			case 1:
-				$_rout['all']['disable'] = '';
-				$_rout['province']['name'] = $rout[0]['name'];
-				$_rout['province']['areaid'] = $rout[0]['areaid'];
-				$_rout['province']['display'] = '';
-				break;
-			case 2:
-				$_rout['all']['disable'] = '';
-				$_rout['province']['name'] = $rout[0]['name'];
-				$_rout['province']['areaid'] = $rout[0]['areaid'];
-				$_rout['province']['disable'] = '';
-				$_rout['province']['display'] = '';
-				$_rout['city']['name'] = $rout[1]['name'];
-				$_rout['city']['areaid'] = $rout[1]['areaid'];
-				$_rout['city']['display'] = '';
-				break;
-			default:
-				break;
-		}
-		$this->setOutput(count($rout), 'hasLevel');
-		$this->setOutput($_rout, 'route');
-	}
+        is_array($update) || $update = array();
+        is_array($add) || $add = array();
 
-	/**
-	 * 更新地区
-	 */
-	public function updateAction() {
-		list($update, $add, $parentid) = $this->getInput(array('update', 'add', 'parentid'), 'post');
+        $joinname = '';
+        if ($parentid) {
+            $rout = $this->_loadAreaDs()->getAreaRout($parentid);
+            switch (count($rout)) {
+                case 0:
+                    $this->showError('ADMIN:area.parentid.error');
+                    break;
+                case 3:
+                    $this->showError('ADMIN:area.level.limit');
+                    break;
+            }
+            $joinnames = array();
+            foreach ($rout as $i) {
+                $joinnames[] = $i['name'];
+            }
+            $joinname = implode('|', $joinnames);
+        }
+        foreach ($update as $id => $name) {
+            $dm = new WindidAreaDm();
+            $dm->setAreaid($id)->setName($name)
+                ->setJoinname($joinname ? $joinname.'|'.$name : $name);
+            if (true !== ($r = $this->_loadAreaDs()->updateArea($dm))) {
+                $this->showError(array('ADMIN:area.error.'.$r->getCode(), array('{flag}' => "“& \" ' < > \ / ”")));
+            }
+        }
+        $addDms = array();
+        foreach ($add as $name) {
+            $dm = new WindidAreaDm();
+            $dm->setName($name)
+                ->setParentid($parentid)
+                ->setJoinname($joinname ? $joinname.'|'.$name : $name);
+            if (true !== ($r = $dm->beforeAdd())) {
+                $this->showError(array('ADMIN:area.error.'.$r->getCode(), array('{flag}' => "“& \" ' < > \ / ”")));
+            }
+            $addDms[] = $dm;
+        }
+        $this->_loadAreaDs()->batchAddArea($addDms);
+        //$this->_loadAreaService()->updateCache();
+        $this->showMessage('success', 'admin/windidclient/areadata/run?parentid='.$parentid);
+    }
 
-		is_array($update) || $update = array();
-		is_array($add) || $add = array();
+    /**
+     * 删除地区
+     */
+    public function deleteAction()
+    {
+        $areaid = $this->getInput('areaid');
+        if (!$areaid) {
+            $this->showError('ADMIN:area.areaid.error');
+        }
+        $childs = $this->_loadAreaDs()->getByParentid($areaid);
+        if ($childs) {
+            $this->showError('ADMIN:area.delete.error.has.children');
+        }
+        $this->_loadAreaDs()->deleteArea($areaid);
+        $this->showMessage('ADMIN:area.delete.success');
+    }
 
-		$joinname = '';
-		if ($parentid) {
-			$rout = $this->_loadAreaDs()->getAreaRout($parentid);
-			switch (count($rout)) {
-				case 0:
-					$this->showError('ADMIN:area.parentid.error');
-					break;
-				case 3:
-					$this->showError('ADMIN:area.level.limit');
-					break;
-			}
-			$joinnames = array();
-			foreach ($rout as $i) {
-				$joinnames[] = $i['name'];
-			}
-			$joinname = implode('|', $joinnames);
-		}
-		foreach ($update as $id => $name) {
-			$dm = new WindidAreaDm();
-			$dm->setAreaid($id)->setName($name)
-				->setJoinname($joinname ? $joinname . '|' . $name : $name);
-			if (true !== ($r = $this->_loadAreaDs()->updateArea($dm))) {
-				$this->showError(array('ADMIN:area.error.' . $r->getCode(), array('{flag}' => "“& \" ' < > \ / ”")));
-			}
-		}
-		$addDms = array();
-		foreach ($add as $name) {
-			$dm = new WindidAreaDm();
-			$dm->setName($name)
-				->setParentid($parentid)
-				->setJoinname($joinname ? $joinname . '|' . $name : $name);
-			if (true !== ($r = $dm->beforeAdd())) {
-				$this->showError(array('ADMIN:area.error.' . $r->getCode(), array('{flag}' => "“& \" ' < > \ / ”")));
-			}
-			$addDms[] = $dm;
-		}
-		$this->_loadAreaDs()->batchAddArea($addDms);
-		//$this->_loadAreaService()->updateCache();
-		$this->showMessage('success', 'admin/windidclient/areadata/run?parentid=' . $parentid);
-	}
-
-	/**
-	 * 删除地区
-	 */
-	public function deleteAction() {
-		$areaid = $this->getInput('areaid');
-		if (!$areaid) $this->showError('ADMIN:area.areaid.error');
-		$childs = $this->_loadAreaDs()->getByParentid($areaid);
-		if ($childs) $this->showError('ADMIN:area.delete.error.has.children');
-		$this->_loadAreaDs()->deleteArea($areaid);
-		$this->showMessage('ADMIN:area.delete.success');
-	}
-
-	/**
-	 * 获得area的DS
-	 *
-	 * @return WindidArea
-	 */
-	private function _loadAreaDs() {
-		return WindidApi::api('area');
-	}
-}
+    /**
+     * 获得area的DS
+     *
+     * @return WindidArea
+     */
+    private function _loadAreaDs()
+    {
+        return WindidApi::api('area');
+    }
+}