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

Timestamp:

Mar 28, 2006, 4:16:34 AM (18 years ago)

Author:

rvelices

Message:

moved category.php to index.php

split url functions from functions.inc.php to functions_url.inc.php

File:

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

trunk/include/section_init.inc.php

@@ -85 +85 @@
 $next_token = 0;
 if (basename($_SERVER['SCRIPT_FILENAME']) == 'picture.php')
-{ // the last token must be the identifier for the picture
-  $token = array_pop($tokens);
+{ // the first token must be the identifier for the picture
+  if ( isset($_GET['image_id'])
+       and isset($_GET['cat']) and is_numeric($_GET['cat']) )
+  {// url compatibility with versions below 1.6
+    $url = make_picture_url( array(
+        'section' => 'categories',
+        'category' => $_GET['cat'],
+        'image_id' => $_GET['image_id']
+      ) );
+    redirect($url);
+  }
+  $token = $tokens[$next_token];
+  $next_token++;
   if ( is_numeric($token) )
   {
@@ -93 +104 @@
   else
   {
-    preg_match('/^(\d+-)?((.*)[_\.]html?)?$/', $token, $matches);
+    preg_match('/^(\d+-)?(.*)?$/', $token, $matches);
     if (isset($matches[1]) and is_numeric($matches[1]=rtrim($matches[1],'-')) )
     {
       $page['image_id'] = $matches[1];
-      if ( !empty($matches[3]) )
+      if ( !empty($matches[2]) )
       {
-        $page['image_file'] = $matches[3];
+        $page['image_file'] = $matches[2];
       }
 
@@ -105 +116 @@
     else
     {
-      if ( !empty($matches[3]) )
+      if ( !empty($matches[2]) )
       {
-        $page['image_file'] = $matches[3];
+        $page['image_file'] = $matches[2];
       }
       else
@@ -117 +128 @@
 }
 
-if (0 === strpos($tokens[$next_token], 'cat'))
+if (0 === strpos($tokens[$next_token], 'categor'))
 {
   $page['section'] = 'categories';
@@ -214 +225 @@
   $next_token++;
 }
-else
-{
-  $page['section'] = 'categories';
-  $next_token++;
-}
 
 for ($i = $next_token; ; $i++)