* finish task #7277.

framework/base/helper.class.php

@@ -220,7 +220,7 @@ class baseHelper
             return "IN ('" . join("','", $idList) . "')";
         }
 
-        if(!function_exists('get_magic_quotes_gpc') or !get_magic_quotes_gpc()) $idList = addslashes($idList);
+        if((!function_exists('get_magic_quotes_gpc') or !get_magic_quotes_gpc()) and is_string($idList)) $idList = addslashes($idList);
         return "IN ('" . str_replace(',', "','", str_replace(' ', '', $idList)) . "')";
     }
 

lib/base/dao/dao.class.php

@@ -1067,8 +1067,9 @@ class baseDAO
         {
             $table = strtolower($this->table);
         }
-        $fieldLabel = isset($lang->$table->$fieldName) ? $lang->$table->$fieldName : $fieldName;
-        $value = isset($this->sqlobj->data->$fieldName) ? $this->sqlobj->data->$fieldName : null;
+        $fieldLabel   = isset($lang->$table->$fieldName)       ? $lang->$table->$fieldName       : $fieldName;
+        $selectFields = isset($config->$table->selectFields)   ? $config->$table->selectFields   : '';
+        $value        = isset($this->sqlobj->data->$fieldName) ? $this->sqlobj->data->$fieldName : null;
 
         /* 
          * 检查唯一性。
@@ -1103,6 +1104,8 @@ class baseDAO
             {
                 ${"arg$i"} = isset($funcArgs[$i + 2]) ? $funcArgs[$i + 2] : null;
             }
+            if(strtolower($funcName) == 'notempty' and !empty($selectFields) and strpos(",{$selectFields},", ",{$fieldName},") !== false) $arg0 = $fieldName;
+
             $checkFunc = 'check' . $funcName;
             if(validater::$checkFunc($value, $arg0, $arg1, $arg2) === false)
             {

lib/base/filter/filter.class.php

@@ -324,12 +324,14 @@ class baseValidater
      * Not empty checking.
      * 
      * @param  mixed $var 
+     * @param  string $fieldName 
      * @static
      * @access public
      * @return bool
      */
-    public static function checkNotEmpty($var)
+    public static function checkNotEmpty($var, $fieldName = '')
     {
+        if($fieldName) return !empty($var);
         return strlen(trim($var)) != 0;
     }
 

module/bug/config.php

@@ -1,7 +1,8 @@
 <?php
 $config->bug = new stdClass();
-$config->bug->batchCreate = 10;
-$config->bug->longlife    = 7;
+$config->bug->batchCreate  = 10;
+$config->bug->longlife     = 7;
+$config->bug->selectFields = 'module,project,pri,severity,type,story,task,os,browser,plan,assignedTo,resolvedBuild';
 
 $config->bug->create  = new stdclass();
 $config->bug->edit    = new stdclass();

module/caselib/config.php

@@ -1,6 +1,6 @@
 <?php
 $config->caselib = new stdclass();
-$config->caselib->create  = new stdclass();
+$config->caselib->create = new stdclass();
 $config->caselib->createcase = new stdclass();
 $config->caselib->create->requiredFields     = 'name';
 $config->caselib->createcase->requiredFields = 'title,type';

module/product/config.php

@@ -1,6 +1,7 @@
 <?php
 $config->product = new stdclass();
-$config->product->orderBy = 'isClosed,order_desc';
+$config->product->orderBy      = 'isClosed,order_desc';
+$config->product->selectFields = 'line,PO,QD,RD,type';
 
 $config->product->customBatchEditFields = 'line,PO,QD,RD,status,type,desc';
 

module/story/config.php

@@ -4,6 +4,7 @@ $config->story = new stdclass();
 $config->story->batchCreate      = 10;
 $config->story->affectedFixedNum = 7;
 $config->story->needReview       = 1;
+$config->story->selectFields     = 'module,plan,source,pri';
 
 $config->story->batchClose = new stdclass();
 $config->story->batchClose->columns = 10;

module/task/config.php

@@ -1,6 +1,7 @@
 <?php
 $config->task = new stdclass();
-$config->task->batchCreate = 10;
+$config->task->batchCreate  = 10;
+$config->task->selectFields = 'story,pri,assignedTo';
 
 $config->task->create   = new stdclass();
 $config->task->edit     = new stdclass();

module/testcase/config.php

@@ -3,6 +3,7 @@ $config->testcase = new stdclass();
 $config->testcase->defaultSteps = 3;
 $config->testcase->batchCreate  = 10;
 $config->testcase->needReview   = 0;
+$config->testcase->selectFields = 'lib,stage,story,pri,status';
 
 $config->testcase->create = new stdclass();
 $config->testcase->edit   = new stdclass();

module/upgrade/model.php

@@ -2586,7 +2586,7 @@ class upgradeModel extends model
     {
         if($this->app->getModuleName() == 'upgrade' and $this->session->upgrading) return false;
         $statusFile = $this->app->getAppRoot() . 'www' . DIRECTORY_SEPARATOR . 'ok.txt';
-        return (!file_exists($statusFile) or (time() - filemtime($statusFile)) > 3600) ? $statusFile : false;
+        return (!is_file($statusFile) or (time() - filemtime($statusFile)) > 3600) ? $statusFile : false;
     }
 
     /**

module/user/config.php

@@ -17,3 +17,4 @@ $config->user->contactField = 'mobile,phone,qq,dingding,weixin,skype,whatsapp,sl
 $config->user->failTimes    = 6;
 $config->user->lockMinutes  = 10;
 $config->user->batchCreate  = 10;
+$config->user->selectFields = 'dept,role';