Changeset 22796 for branches/version-2_12-dev/data/class/helper/SC_Helper_PageLayout.php

Timestamp:

2013/05/02 18:11:36 (13 years ago)

Author:

h_yoshimoto

Message:

#2236 2.12.3リリース以降の2.12-devへのコミット差し戻し

File:

• branches/version-2_12-dev/data/class/helper/SC_Helper_PageLayout.php (modified) (14 diffs)

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

@@ -29 +29 @@
  * @version $Id:SC_Helper_PageLayout.php 15532 2007-08-31 14:39:46Z nanasess $
  */
-class SC_Helper_PageLayout 
-{
+class SC_Helper_PageLayout {
 
     // }}}
@@ -48 +47 @@
      * @return void
      */
-    function sfGetPageLayout(&$objPage, $preview = false, $url = '', $device_type_id = DEVICE_TYPE_PC)
-    {
+    function sfGetPageLayout(&$objPage, $preview = false, $url = '', $device_type_id = DEVICE_TYPE_PC) {
 
         // URLを元にページ情報を取得
@@ -89 +87 @@
                         . 'tpl_path: ' . $arrBloc['tpl_path'] . "\n"
                         . 'php_path: ' . $arrBloc['php_path'];
-                    trigger_error($error, E_USER_WARNING);
+                    GC_Utils_Ex::gfPrintLog($error);
                 }
             }
@@ -111 +109 @@
      * @return array ページ属性の配列
      */
-    function getPageProperties($device_type_id = DEVICE_TYPE_PC, $page_id = null, $where = '', $arrParams = array())
-    {
+    function getPageProperties($device_type_id = DEVICE_TYPE_PC, $page_id = null, $where = '', $arrParams = array()) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         $where = 'device_type_id = ? ' . (SC_Utils_Ex::isBlank($where) ? $where : 'AND ' . $where);
@@ -136 +133 @@
      * @return array ブロック情報の配列
      */
-    function getBlocs($device_type_id = DEVICE_TYPE_PC, $where = '', $arrParams = array(), $has_realpath = true)
-    {
-        $objBloc = new SC_Helper_Bloc_Ex($device_type_id);
-        $arrBlocs = $objBloc->getWhere($where, $arrParams);
+    function getBlocs($device_type_id = DEVICE_TYPE_PC, $where = '', $arrParams = array(), $has_realpath = true) {
+        $objQuery =& SC_Query_Ex::getSingletonInstance();
+        $where = 'device_type_id = ? ' . (SC_Utils_Ex::isBlank($where) ? $where : 'AND ' . $where);
+        $arrParams = array_merge(array($device_type_id), $arrParams);
+        $objQuery->setOrder('bloc_id');
+        $arrBlocs = $objQuery->select('*', 'dtb_bloc', $where, $arrParams);
         if ($has_realpath) {
             $this->setBlocPathTo($device_type_id, $arrBlocs);
@@ -155 +154 @@
      * @return array 配置情報を含めたブロックの配列
      */
-    function getBlocPositions($device_type_id, $page_id, $has_realpath = true)
-    {
+    function getBlocPositions($device_type_id, $page_id, $has_realpath = true) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         $table = <<< __EOF__
@@ -170 +168 @@
             $this->setBlocPathTo($device_type_id, $arrBlocs);
         }
-        
-        //全ページ設定と各ページのブロックの重複を削除
-        foreach ($arrBlocs as $index => $arrBloc) {
-            if($arrBloc['anywhere'] == 1){
-                $arrUniqBlocIds[] = $arrBloc['bloc_id'];
-            }
-        }
-        foreach ($arrBlocs as $bloc_index => $arrBlocData) {
-            if(in_array($arrBlocData['bloc_id'], $arrUniqBlocIds) && $arrBlocData['anywhere'] == 0){
-                unset($arrBlocs[$bloc_index]);
-            }
-        }
         return $arrBlocs;
     }
@@ -195 +181 @@
      * @return integer 削除数
      */
-    function lfDelPageData($page_id, $device_type_id = DEVICE_TYPE_PC)
-    {
+    function lfDelPageData($page_id, $device_type_id = DEVICE_TYPE_PC) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         // page_id が空でない場合にはdeleteを実行
@@ -218 +203 @@
      * @return void // TODO boolean にするべき?
      */
-    function lfDelFile($filename, $device_type_id)
-    {
+    function lfDelFile($filename, $device_type_id) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
 
@@ -251 +235 @@
      * @return 編集可能ページの場合 true
      */
-    function isEditablePage($device_type_id, $page_id)
-    {
+    function isEditablePage($device_type_id, $page_id) {
         if ($page_id == 0) {
             return false;
@@ -271 +254 @@
      * @return string テンプレートのパス
      */
-    function getTemplatePath($device_type_id = DEVICE_TYPE_PC, $isUser = false)
-    {
+    function getTemplatePath($device_type_id = DEVICE_TYPE_PC, $isUser = false) {
         $templateName = '';
         switch ($device_type_id) {
@@ -309 +291 @@
      * @return string 端末に応じた DocumentRoot から user_data までのパス
      */
-    function getUserDir($device_type_id = DEVICE_TYPE_PC, $hasPackage = false)
-    {
+    function getUserDir($device_type_id = DEVICE_TYPE_PC, $hasPackage = false) {
         switch ($device_type_id) {
         case DEVICE_TYPE_MOBILE:
@@ -342 +323 @@
      * @return void
      */
-    function setBlocPathTo($device_type_id = DEVICE_TYPE_PC, &$arrBlocs = array())
-    {
+    function setBlocPathTo($device_type_id = DEVICE_TYPE_PC, &$arrBlocs = array()) {
         foreach ($arrBlocs as $key => $value) {
             $arrBloc =& $arrBlocs[$key];
@@ -359 +339 @@
      * @return integer $col_num カラム数
      */
-    function getColumnNum($arrPageLayout)
-    {
+    function getColumnNum($arrPageLayout) {
         // メインは確定
         $col_num = 1;