Changeset 22823

Timestamp:

2013/05/19 20:34:20 (11 years ago)

Author:

Seasoft

Message:

#2248 (PHP 警告撲滅 for 2.13.0)

Location:

branches/version-2_13-dev/data/class/helper

Files:

• SC_Helper_PageLayout.php (modified) (2 diffs)
• SC_Helper_Transform.php (modified) (7 diffs)

branches/version-2_13-dev/data/class/helper/SC_Helper_PageLayout.php

@@ -162 +162 @@
     {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
+
         $table = <<< __EOF__
         dtb_blocposition AS pos
@@ -174 +175 @@
             $this->setBlocPathTo($device_type_id, $arrBlocs);
         }
-        
+
         //全ページ設定と各ページのブロックの重複を削除
+        $arrUniqBlocIds = array();
         foreach ($arrBlocs as $index => $arrBloc) {
-            if($arrBloc['anywhere'] == 1){
+            if ($arrBloc['anywhere'] == 1){
                 $arrUniqBlocIds[] = $arrBloc['bloc_id'];
             }
         }
         foreach ($arrBlocs as $bloc_index => $arrBlocData) {
-            if(in_array($arrBlocData['bloc_id'], $arrUniqBlocIds) && $arrBlocData['anywhere'] == 0){
+            if (in_array($arrBlocData['bloc_id'], $arrUniqBlocIds) && $arrBlocData['anywhere'] == 0){
                 unset($arrBlocs[$bloc_index]);
             }
         }
+
         return $arrBlocs;
     }

branches/version-2_13-dev/data/class/helper/SC_Helper_Transform.php

@@ -236 +236 @@
     public function insertBefore($html_snip)
     {
-        foreach ($this->arrSelectElements[$this->search_depth] as $key => $objElement) {
-            $this->lfSetTransform('insertBefore', $objElement[0], $html_snip);
+        if (isset($this->arrSelectElements[$this->search_depth])) {
+            foreach ($this->arrSelectElements[$this->search_depth] as $key => $objElement) {
+                $this->lfSetTransform('insertBefore', $objElement[0], $html_snip);
+            }
         }
         return $this;
@@ -251 +253 @@
     public function insertAfter($html_snip)
     {
-        foreach ($this->arrSelectElements[$this->search_depth] as $key => $objElement) {
-            $this->lfSetTransform('insertAfter', $objElement[0], $html_snip);
+        if (isset($this->arrSelectElements[$this->search_depth])) {
+            foreach ($this->arrSelectElements[$this->search_depth] as $key => $objElement) {
+                $this->lfSetTransform('insertAfter', $objElement[0], $html_snip);
+            }
         }
         return $this;
@@ -266 +270 @@
     public function appendFirst($html_snip)
     {
-        foreach ($this->arrSelectElements[$this->search_depth] as $key => $objElement) {
-            $this->lfSetTransform('appendFirst', $objElement[0], $html_snip);
+        if (isset($this->arrSelectElements[$this->search_depth])) {
+            foreach ($this->arrSelectElements[$this->search_depth] as $key => $objElement) {
+                $this->lfSetTransform('appendFirst', $objElement[0], $html_snip);
+            }
         }
         return $this;
@@ -281 +287 @@
     public function appendChild($html_snip)
     {
-        foreach ($this->arrSelectElements[$this->search_depth] as $key => $objElement) {
-            $this->lfSetTransform('appendChild', $objElement[0], $html_snip);
+        if (isset($this->arrSelectElements[$this->search_depth])) {
+            foreach ($this->arrSelectElements[$this->search_depth] as $key => $objElement) {
+                $this->lfSetTransform('appendChild', $objElement[0], $html_snip);
+            }
         }
         return $this;
@@ -296 +304 @@
     public function replaceElement($html_snip)
     {
-        foreach ($this->arrSelectElements[$this->search_depth] as $key => &$objElement) {
-            $this->lfSetTransform('replaceElement', $objElement[0], $html_snip);
+        if (isset($this->arrSelectElements[$this->search_depth])) {
+            foreach ($this->arrSelectElements[$this->search_depth] as $key => &$objElement) {
+                $this->lfSetTransform('replaceElement', $objElement[0], $html_snip);
+            }
         }
         return $this;
@@ -310 +320 @@
     public function removeElement()
     {
-        foreach ($this->arrSelectElements[$this->search_depth] as $key => &$objElement) {
-            $this->lfSetTransform('replaceElement', $objElement[0], '');
+        if (isset($this->arrSelectElements[$this->search_depth])) {
+            foreach ($this->arrSelectElements[$this->search_depth] as $key => &$objElement) {
+                $this->lfSetTransform('replaceElement', $objElement[0], '');
+            }
         }
         return $this;
@@ -579 +591 @@
             $this->arrSelectElements[$this->search_depth][$arrElement[0]] = array($elementNo, &$arrElement[1]);
         }
-
     }