Changeset 21684 for branches/version-2_12-dev/data/class/SC_SelectSql.php

Timestamp:

2012/03/26 21:44:52 (12 years ago)

Author:

Seasoft

Message:

#1613 (typo修正・ソース整形・ソースコメントの改善)

File:

• branches/version-2_12-dev/data/class/SC_SelectSql.php (modified) (3 diffs)

branches/version-2_12-dev/data/class/SC_SelectSql.php

@@ -108 +108 @@
 
         //　開始～終了
-        if( ($from_year != '') && ($from_month != '') && ($from_day != '') &&
-            ($to_year != '') && ($to_month != '') && ($to_day != '')) {
+        if (($from_year != '') && ($from_month != '') && ($from_day != '')
+            && ($to_year != '') && ($to_month != '') && ($to_day != '')
+        ) {
             $this->setWhere($column . ' >= ? AND ' . $column . ' < date(?)');
             $return[] = $date1;
@@ -130 +131 @@
 
             if (count($arr) > 1) {
-                if(! is_null($data)) $item .= $ItemStr . ' = ? OR ';
+                if (!is_null($data)) {
+                    $item .= $ItemStr . ' = ? OR ';
+                }
             } else {
-                if(! is_null($data)) $item = $ItemStr . ' = ?';
+                if (!is_null($data)) {
+                    $item = $ItemStr . ' = ?';
+                }
             }
             $return[] = $data;
         }
 
-        if( count($arr) > 1)  $item = '(' . rtrim($item, ' OR ') . ')';
+        if (count($arr) > 1) {
+            // FIXME 多分この rtrim の使い方は不適切(偶然動作しそうだが)
+            $item = '(' . rtrim($item, ' OR ') . ')';
+        }
         $this->setWhere($item);
         return $return;
@@ -190 +198 @@
 
         for ($i = 0; $i < $count; $i++) {
-
-            if( isset($arrWhere[$i]['value'])) $statement .= $arrWhere[$i]['column'] .' = ' . SC_Utils_Ex::sfQuoteSmart($arrWhere[$i]['value']) .' OR '  ;
+            if (isset($arrWhere[$i]['value'])) {
+                $statement .= $arrWhere[$i]['column'] .' = ' . SC_Utils_Ex::sfQuoteSmart($arrWhere[$i]['value']) .' OR ';
+            }
         }