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

Timestamp:

Mar 23, 2006, 2:49:04 AM (19 years ago)

Author:

rvelices

Message:

URL rewrite: 3 options in the config file define behaviour (question mark
removal, file name for picture and .php extension removal)

fix: added unsigned for column in install sql - for the sake of uniformization

change: add_url_param is now add_url_params and takes an array as parameter
instead of a string

File:

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

trunk/include/section_init.inc.php

@@ -84 +84 @@
 
 $next_token = 0;
-if (basename($_SERVER['SCRIPT_NAME']) == 'picture.php')
+if (basename($_SERVER['SCRIPT_FILENAME']) == 'picture.php')
 { // the last token must be the identifier for the picture
   $token = array_pop($tokens);
@@ -94 +94 @@
   {
     preg_match('/^(\d+-)?((.*)[_\.]html?)?$/', $token, $matches);
-    if ( isset($matches[1]) and is_numeric($matches[1]) )
+    if (isset($matches[1]) and is_numeric($matches[1]=rtrim($matches[1],'-')) )
     {
       $page['image_id'] = $matches[1];
@@ -101 +101 @@
         $page['image_file'] = $matches[3];
       }
+
     }
     else
@@ -508 +509 @@
 }
 
-if (basename($_SERVER['SCRIPT_NAME']) == 'picture.php'
+if (basename($_SERVER['SCRIPT_FILENAME']) == 'picture.php'
     and !isset($page['image_id']) )
 {
-  $query = '
+  if ( !empty($page['items']) )
+  {
+    $query = '
 SELECT id,file
   FROM '.IMAGES_TABLE .'
@@ -517 +520 @@
   AND file LIKE "' . $page['image_file'] . '.%" ESCAPE "|"'
 ;
-  $result = pwg_query($query);
-  if (mysql_num_rows($result)>0)
-  {
-    list($page['image_id'], $page['image_file']) = mysql_fetch_row($result);
+    $result = pwg_query($query);
+    if (mysql_num_rows($result)>0)
+    {
+      list($page['image_id'], $page['image_file']) = mysql_fetch_row($result);
+    }
+  }
+  if ( !isset($page['image_id']) )
+  {
+    $page['image_id'] = -1; // will fail in picture.php
   }
 }