Changeset 1086 for trunk/include/section_init.inc.php

Timestamp:

Mar 17, 2006, 5:13:19 AM (18 years ago)

Author:

rvelices

Message:

URL rewrite for chronology: uses $pagechronology and
$pagechronology_date. $pagechronology is an array with 'field',
'style' and 'view' keys. This is step 1.

File:

• trunk/include/section_init.inc.php (modified) (17 diffs)

trunk/include/section_init.inc.php

@@ -79 +79 @@
       }
       $page['image_id'] = $matches[1];
-      
-      $next_token++;
-    }
-    
+
+      $next_token++;
+    }
+
     if (0 === strpos($tokens[$next_token], 'cat'))
     {
       $page['section'] = 'categories';
       $next_token++;
-      
+
       if (isset($tokens[$next_token])
-          and preg_match('/(\d+)/', $tokens[$next_token], $matches))
+          and preg_match('/^(\d+)/', $tokens[$next_token], $matches))
       {
         $page['category'] = $matches[1];
@@ -99 +99 @@
       $page['section'] = 'tags';
       $page['tags'] = array();
-      
-      $next_token++;
-      
+
+      $next_token++;
+
       for ($i = $next_token; ; $i++)
       {
@@ -108 +108 @@
           break;
         }
-        
+
         preg_match('/^(\d+)/', $tokens[$i], $matches);
         if (!isset($matches[1]))
@@ -123 +123 @@
         array_push($page['tags'], $matches[1]);
       }
-      
+
       $next_token = $i;
     }
@@ -155 +155 @@
       $page['section'] = 'search';
       $next_token++;
-      
+
       preg_match('/(\d+)/', $tokens[$next_token], $matches);
       if (!isset($matches[1]))
@@ -185 +185 @@
       $next_token++;
     }
-    
+
     for ($i = $next_token; ; $i++)
     {
@@ -192 +192 @@
         break;
       }
-      
+
       if (preg_match('/^start-(\d+)/', $tokens[$i], $matches))
       {
@@ -198 +198 @@
       }
 
-      if (preg_match('/^calendar-(.+)$/', $tokens[$i], $matches))
-      {
-        // TODO: decide with rvelices how we name calendar/chronology is the
-        // URL
-        $_GET['calendar'] = $matches[1];
+      if (preg_match('/^posted|created/', $tokens[$i] ))
+      {
+        $chronology_tokens = explode('-', $tokens[$i] );
+        $page['chronology']['field'] = $chronology_tokens[0];
+        array_shift($chronology_tokens);
+        $page['chronology']['style'] = $chronology_tokens[0];
+        array_shift($chronology_tokens);
+        if ( count($chronology_tokens)>0 )
+        {
+          if ('list'==$chronology_tokens[0] or
+              'calendar'==$chronology_tokens[0])
+          {
+            $page['chronology']['view'] = $chronology_tokens[0];
+            array_shift($chronology_tokens);
+          }
+          $page['chronology_date'] = $chronology_tokens;
+        }
       }
     }
@@ -220 +232 @@
   $conf['order_by'] = str_replace(
     'ORDER BY ',
-    'ORDER BY '.$orders[ $_COOKIE['pwg_image_order'] ][1].',', 
+    'ORDER BY '.$orders[ $_COOKIE['pwg_image_order'] ][1].',',
     $conf['order_by']
     );
@@ -234 +246 @@
   {
     $result = get_cat_info($page['category']);
-    
+
     $page = array_merge(
       $page,
@@ -247 +259 @@
         'cat_id_uppercat'  => $result['id_uppercat'],
         'uppercats'        => $result['uppercats'],
-        
+
         'title' => get_cat_display_name($result['name'], '', false),
         )
       );
-    
+
     if (!isset($_GET['calendar']))
     {
@@ -262 +274 @@
 ;';
       $page['items'] = array_from_query($query, 'image_id');
-      
+
       $page['thumbnails_include'] =
         $result['nb_images'] > 0
@@ -388 +400 @@
   LIMIT 0, '.$conf['top_number'].'
 ;';
-    
+
     $page = array_merge(
       $page,
@@ -405 +417 @@
     $page['super_order_by'] = true;
     $conf['order_by'] = ' ORDER BY average_rate DESC, id ASC';
-    
+
     $query ='
 SELECT DISTINCT(id)
@@ -437 +449 @@
   '.$conf['order_by'].'
 ;';
-      
+
     $page = array_merge(
       $page,
@@ -447 +459 @@
       );
   }
-  
+
   if (!isset($page['cat_nb_images']))
   {
@@ -458 +470 @@
 // +-----------------------------------------------------------------------+
 
-if (isset($_GET['calendar']))
+if (isset($page['chronology']))
 {
   include_once( PHPWG_ROOT_PATH.'include/functions_calendar.inc.php' );