Changeset 21925 for branches/version-2_12-dev/data/class/SC_CheckError.php

Timestamp:

2012/06/19 16:15:24 (12 years ago)

Author:

pineray

Message:

#1669 #1859 初期化漏れ、無駄な変数等

File:

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

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

@@ -59 +59 @@
         $this->createParam($value);
         // HTMLに含まれているタグを抽出する
-        preg_match_all('/<\/?([a-z]+)/i', $this->arrParam[$value[1]], $arrTagIncludedHtml);
+        preg_match_all('/<\/?([a-z]+)/i', $this->arrParam[$value[1]], $arrTagIncludedHtml = array());
 
         $arrDiffTag = array_diff($arrTagIncludedHtml[1], $value[2]);
@@ -630 +630 @@
         $quoted_string = "\"$qcontent*\"";
         $atext         = '[a-zA-Z0-9!#$%&\'*+\-\/\=?^_`{|}~]';
-        $dot_atom_text = "$atext+(?:[.]$atext+)*";
-        $dot_atom      = $dot_atom_text;
+        $dot_atom      = "$atext+(?:[.]$atext+)*";
         $local_part    = "(?:$dot_atom|$quoted_string)";
         $domain        = $dot_atom;
-        $addr_spec     = "${local_part}[@]$domain";
+        $addr_spec     = "{$local_part}[@]$domain";
 
         $dot_atom_loose   = "$atext+(?:[.]|$atext)*";
         $local_part_loose = "(?:$dot_atom_loose|$quoted_string)";
-        $addr_spec_loose  = "${local_part_loose}[@]$domain";
+        $addr_spec_loose  = "{$local_part_loose}[@]$domain";
 
         if (RFC_COMPLIANT_EMAIL_CHECK) {
-            $regexp = "/\A${addr_spec}\z/";
+            $regexp = "/\A{$addr_spec}\z/";
         } else {
             // 携帯メールアドレス用に、..や.@を許容する。
-            $regexp = "/\A${addr_spec_loose}\z/";
+            $regexp = "/\A{$addr_spec_loose}\z/";
         }
 
@@ -932 +931 @@
         }
         $this->createParam($value);
-        $error = 0;
         if ((strlen($this->arrParam[$value[2]]) > 0 || strlen($this->arrParam[$value[3]]) > 0 || strlen($this->arrParam[$value[4]]) > 0) && ! checkdate($this->arrParam[$value[3]], $this->arrParam[$value[4]], $this->arrParam[$value[2]])) {
             $this->arrErr[$value[2]] = '※ ' . $value[0] . 'を正しく指定してください。<br />';
@@ -983 +981 @@
         }
         $this->createParam($value);
-        $error = 0;
         if ((strlen($this->arrParam[$value[2]]) > 0 || strlen($this->arrParam[$value[3]]) > 0 || strlen($this->arrParam[$value[4]]) > 0 || strlen($this->arrParam[$value[5]]) > 0) && ! checkdate($this->arrParam[$value[3]], $this->arrParam[$value[4]], $this->arrParam[$value[2]])) {
             $this->arrErr[$value[2]] = '※ ' . $value[0] . 'を正しく指定してください。<br />';
@@ -1027 +1024 @@
         }
         $this->createParam($value);
-        $error = 0;
         if ((strlen($this->arrParam[$value[2]]) > 0 || strlen($this->arrParam[$value[3]]) > 0) && ! checkdate($this->arrParam[$value[3]], 1, $this->arrParam[$value[2]])) {
             $this->arrErr[$value[2]] = '※ ' . $value[0] . 'を正しく指定してください。<br />';
@@ -1123 +1119 @@
 
         $pattern = '/' . join('|', $prohibitedStr) . '/i';
-        if (preg_match_all($pattern, $this->arrParam[$value[1]], $matches)) {
+        if (preg_match_all($pattern, $targetStr, $matches = array())) {
             $this->arrErr[$value[1]] = '※ ' . $value[0] . 'は入力できません。<br />';
         }