Changeset 1955 for branches/branch-1_7

Timestamp:

Apr 14, 2007, 1:57:55 AM (18 years ago)

Author:

rvelices

Message:

flat view small improvements (picture page on root category sorter urls and works in several cases)
correction in permalinks admin (error was assignment in if instead of comparison)

Location:

branches/branch-1_7

Files:

• admin/permalinks.php (modified) (1 diff)
• include/functions_url.inc.php (modified) (1 diff)
• include/section_init.inc.php (modified) (4 diffs)

branches/branch-1_7/admin/permalinks.php

@@ -138 +138 @@
 }
 
-if ( !count($sort_by) or $sort_by[0]='name')
+if ( !count($sort_by) or $sort_by[0]=='name')
 {
   usort($categories, 'global_rank_compare');

branches/branch-1_7/include/functions_url.inc.php

@@ -247 +247 @@
       $url .= $params['image_id'];
   }
+  if ( !isset($params['category'] ) )
+  {// make urls shorter ...
+    unset( $params['flat'] );
+  }
   $url .= make_section_in_url($params);
   $url = add_well_known_params_in_url($url, $params);

branches/branch-1_7/include/section_init.inc.php

@@ -141 +141 @@
       if ( strpos($tokens[$next_token], 'created-')!==0
           and strpos($tokens[$next_token], 'posted-')!==0
+          and strpos($tokens[$next_token], 'start-')!==0
           and $tokens[$next_token] != 'flat')
       {// try a permalink
@@ -160 +161 @@
         $next_token++;
       }
-    }
+      elseif ( script_basename()=='picture' )
+      { //access a picture only by id, file or id-file without given section
+        $page['flat']=true;
+      }
+    }
+  }
+  elseif ( script_basename()=='picture' )
+  { //access a picture only by id, file or id-file without given section
+    $page['flat']=true;
   }
 }
@@ -315 +324 @@
 
   if ('categories' == $page['section'] and
-      'flat' == $tokens[$i])
+      'flat' == $tokens[$i] and
+      !isset($page['chronology_field']) )
   {
     // indicate a special list of images
@@ -341 +351 @@
       $page['chronology_date'] = $chronology_tokens;
     }
+    unset($page['flat']);
   }