Changeset 18606 for branches/version-2_4-dev/data/class/pages/LC_Page_Sitemap.php

Timestamp:

2010/03/10 15:26:23 (14 years ago)

Author:

shutta

Message:

#598 対応の続き。
コミュニティ版の r17416, r17487, r17602 を取り込んだ。(少々差異あり)

File:

• branches/version-2_4-dev/data/class/pages/LC_Page_Sitemap.php (modified) (7 diffs)

branches/version-2_4-dev/data/class/pages/LC_Page_Sitemap.php

@@ -105 +105 @@
         print("<urlset xmlns='http://www.sitemaps.org/schemas/sitemap/0.9'>\n");
 
-        // 静的なページを処理
-        foreach($this->staticURL as $url) {
-            $this->createSitemap($url, '', 'daily', 1.0);
-        }
-
         // TOPページを処理
         $topPage = $this->getTopPage($this->arrPageList);
@@ -116 +111 @@
                              'daily', 1.0);
 
+        // 静的なページを処理
+        foreach ($this->staticURL as $url) {
+            $this->createSitemap($url, '', 'daily', 1.0);
+        }
+
         // 編集可能ページを処理
         $editablePages = $this->getEditablePage($this->arrPageList);
-        foreach($editablePages as $editablePage) {
+        foreach ($editablePages as $editablePage) {
             $this->createSitemap($editablePage['url'],
                                  $this->date2W3CDatetime($editablePage['update_date']));
@@ -125 +125 @@
         // 商品一覧ページを処理
         $products = $this->getAllProducts();
-        foreach($products as $product) {
+        foreach ($products as $product) {
             $this->createSitemap($product['url'], '', 'daily');
         }
         $mobileProducts = $this->getAllProducts(true);
-        foreach($mobileProducts as $mobileProduct) {
+        foreach ($mobileProducts as $mobileProduct) {
             $this->createSitemap($mobileProduct['url'], '', 'daily');
         }
@@ -135 +135 @@
         // 商品詳細ページを処理
         $details = $this->getAllDetail();
-        foreach($details as $detail) {
+        foreach ($details as $detail) {
             $this->createSitemap($detail['url'],
                                  $this->date2W3CDatetime($detail['update_date']));
         }
         $mobileDetails = $this->getAllDetail(true);
-        foreach($mobileDetails as $mobileDetail) {
+        foreach ($mobileDetails as $mobileDetail) {
             $this->createSitemap($mobileDetail['url'], 
                                  $this->date2W3CDatetime($mobileDetail['update_date']));
@@ -192 +192 @@
     function getTopPage($pageData) {
         $arrRet = array();
-        foreach($pageData as $page) {
+        foreach ($pageData as $page) {
             if ($page['page_id'] == "1") {
-                $page['url'] = SITE_URL . $page['url'];
                 $arrRet[0] = $page;
                 return $arrRet;
@@ -209 +208 @@
     function getEditablePage($pageData) {
         $arrRet = array();
-        $i = 0;
-        foreach($pageData as $page) {
+        foreach ($pageData as $page) {
             if ($page['page_id'] > 4) {
-                $arrRet[$i] = $page;
-                $i++;
+                $arrRet[] = $page;
             }
         }
@@ -310 +307 @@
         $sql .= " ORDER BY  page_id";
 
-        return $objDBConn->getAll($sql, $arrVal);
+        $pageData = $objDBConn->getAll($sql, $arrVal);
+        // URL にプロトコルの記載が無い場合、SITE_URL を前置する。
+        foreach (array_keys($pageData) as $key) {
+            $page =& $pageData[$key];
+            if (!preg_match('|^https?://|i', $page['url'])) {
+                $page['url'] = SITE_URL . $page['url'];
+            }
+        }
+        unset($page);
+
+        return $pageData;
     }