Changeset 7385

Timestamp:

Oct 25, 2010, 10:31:09 AM (13 years ago)

Author:

plg

Message:

bug 1932: use core functions to create URLs.

Make the use of query_string more explicit (show_xml_list)

Warning: PhotoWidget currently doesn't work with $confquestion_mark_in_urls = false

File:

• extensions/photoWidget/include/photoWidgetContent.class.php (modified) (5 diffs)

extensions/photoWidget/include/photoWidgetContent.class.php

@@ -22 +22 @@
 class photoWidgetContent
 {
-  private $query_string = null, $applicable = false;
+  private $show_xml_list = false, $applicable = false;
   
   public function __construct($config) {
     $this->plugin_config = $config;
-
-    $this->fmt_xml = make_index_url() . '/category/%s/pw.xml';
-    $xml_pattern = '`category/([^/]*)/pw\.xml$`';
-    
-    if (preg_match($xml_pattern, $_SERVER['QUERY_STRING'], $matches)) {
-      $this->query_string = $matches[1];
-    }
   }
 
@@ -48 +41 @@
       }
     }
+
+    $match_content = $_SERVER['QUERY_STRING'];
+    if (PHPWG_ROOT_PATH != $page['root_path']) {
+      $match_content = $_SERVER['PATH_INFO'];
+    }
+
+    $xml_pattern = '#/pw\.xml$#';
+    if (preg_match($xml_pattern, $match_content)) {
+      $this->show_xml_list = true;
+    }
   }
 
@@ -57 +60 @@
     }
 
-    if ($this->query_string!=null)
+    if ($this->show_xml_list)
     {
       foreach ($images as &$image) {
@@ -85 +88 @@
     }
 
-    if ($this->query_string!=null)
+    if ($this->show_xml_list)
     {
       $image_ids = array();
@@ -119 +122 @@
 
   private function getXmlPath($category) {
-    if (!empty($category['permalink'])) {
-      return sprintf($this->fmt_xml, $category['permalink']);
-    } elseif ( $GLOBALS['conf']['category_url_style']=='id-name' ) {
-      $id_name = $category['id'] . '-' . str2url($category['name']);
-      return sprintf($this->fmt_xml, $id_name);
-    } else {
-      return sprintf($this->fmt_xml, $category['id']);
-    }    
+    global $page;
+
+    return sprintf(
+      '%s/pw.xml',
+      make_index_url(
+        array(
+          'section' => 'categories',
+          'category' => $page['category']
+          )
+        )
+      );
   }