Changeset 1086 for trunk/include/functions.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/functions.inc.php (modified) (37 diffs)

trunk/include/functions.inc.php

@@ -224 +224 @@
   $height = $original_height;
   $is_original_size = true;
-                
+
   if ( $max_width != "" )
   {
@@ -250 +250 @@
     {
       if ( $ratioWidth < $ratioHeight )
-      { 
+      {
         $width = floor( $original_width / $ratioHeight );
         $height = $max_height;
       }
       else
-      { 
-        $width = $max_width; 
+      {
+        $width = $max_width;
         $height = floor( $original_height / $ratioWidth );
       }
@@ -331 +331 @@
                              $remaining );
   $return_string.= $treatment;
-                
+
   return $return_string;
 }
@@ -341 +341 @@
   // FIXME : with new advanced search, this function needs a rewrite
   return $string;
-  
+
   $words = explode( ',', $search );
   $style = 'background-color:white;color:red;';
@@ -360 +360 @@
     $login = ($user['id'] == $conf['guest_id'])
       ? 'guest' : addslashes($user['username']);
-    
+
     $query = '
 INSERT INTO '.HISTORY_TABLE.'
@@ -388 +388 @@
 
   list($year,$month,$day,$hour,$minute,$second) = array(0,0,0,0,0,0);
-  
+
   switch ( $type )
   {
@@ -433 +433 @@
 {
   global $conf,$page,$debug,$t2;
-  
+
   $start = get_moment();
   $result = mysql_query($query) or my_error($query."\n");
-  
+
   $time = get_moment() - $start;
 
@@ -444 +444 @@
     $page['queries_time'] = 0;
   }
-  
+
   $page['count_queries']++;
   $page['queries_time']+= $time;
-  
+
   if ($conf['show_queries'])
   {
@@ -460 +460 @@
     $output.= number_format( ($time+$start-$t2), 3, '.', ' ').' s)';
     $output.= "</pre>\n";
-    
+
     $debug .= $output;
   }
-  
+
   return $result;
 }
@@ -501 +501 @@
 
   include( PHPWG_ROOT_PATH.'include/page_header.php' );
-  
+
   $template->set_filenames( array( 'redirect' => 'redirect.tpl' ) );
   $template->parse('redirect');
-  
+
   include( PHPWG_ROOT_PATH.'include/page_tail.php' );
 
@@ -519 +519 @@
 {
   $query_string = '';
-  
+
   $str = $_SERVER['QUERY_STRING'];
   parse_str($str, $vars);
-  
+
   $is_first = true;
   foreach ($vars as $key => $value)
@@ -554 +554 @@
 
   $template_dir = PHPWG_ROOT_PATH.'template';
-  
+
   foreach (get_dirs($template_dir) as $template)
   {
@@ -596 +596 @@
     $src.= strtolower(get_extension($path)).'.png';
   }
-  
+
   return $src;
 }
@@ -623 +623 @@
 {
   $array = array();
-  
+
   $result = pwg_query($query);
   while ($row = mysql_fetch_array($result))
@@ -642 +642 @@
 {
   global $template;
-  
+
   $template->assign_block_vars(
     $blockname, array('SELECTED' => '', 'VALUE' => 0, 'OPTION' => '--'));
-  
+
   for ($i = 1; $i <= 31; $i++)
   {
@@ -669 +669 @@
 {
   global $template, $lang;
-  
+
   $template->assign_block_vars(
     $blockname, array('SELECTED' => '',
@@ -698 +698 @@
 {
   global $user;
-  
+
   include_once(PHPWG_ROOT_PATH.'admin/include/functions.php');
-  
+
   $query = '
 SELECT element_id
@@ -750 +750 @@
     echo '[l10n] language key "'.$key.'" is not defined<br />';
   }
-  
+
   return isset($lang[$key]) ? $lang[$key] : $key;
 }
@@ -798 +798 @@
     die('Search id must be an integer');
   }
-  
+
   $query = '
 SELECT rules
@@ -805 +805 @@
 ;';
   list($serialized_rules) = mysql_fetch_row(pwg_query($query));
-  
+
   return unserialize($serialized_rules);
 }
@@ -821 +821 @@
 {
   $search = get_search_array($search_id);
-  
+
   // SQL where clauses are stored in $clauses array during query
   // construction
   $clauses = array();
-  
+
   foreach (array('file','name','comment','keywords','author') as $textfield)
   {
@@ -848 +848 @@
     }
   }
-  
+
   if (isset($search['fields']['allwords']))
   {
@@ -876 +876 @@
         );
     }
-    
+
     array_walk(
       $word_clauses,
       create_function('&$s','$s="(".$s.")";')
       );
-    
+
     array_push(
       $clauses,
@@ -893 +893 @@
       );
   }
-  
+
   foreach (array('date_available', 'date_creation') as $datefield)
   {
@@ -903 +903 @@
         );
     }
-    
+
     foreach (array('after','before') as $suffix)
     {
       $key = $datefield.'-'.$suffix;
-      
+
       if (isset($search['fields'][$key]))
       {
         array_push(
           $clauses,
-          
+
           $datefield.
           ($suffix == 'after'             ? ' >' : ' <').
           ($search['fields'][$key]['inc'] ? '='  : '').
           " '".$search['fields'][$key]['date']."'"
-          
+
           );
       }
     }
   }
-  
+
   if (isset($search['fields']['cat']))
   {
@@ -934 +934 @@
       $cat_ids = $search['fields']['cat']['words'];
     }
-    
+
     $local_clause = 'category_id IN ('.implode(',', $cat_ids).')';
     array_push($clauses, $local_clause);
   }
-  
+
   // adds brackets around where clauses
   $clauses = prepend_append_array_items($clauses, '(', ')');
-  
+
   $where_separator =
     implode(
@@ -947 +947 @@
       $clauses
       );
-  
+
   $search_clause = $where_separator;
-  
+
   if (isset($forbidden))
   {
@@ -987 +987 @@
 
   $available_upgrade_ids = array();
-  
+
   if ($contents = opendir($upgrades_path))
   {
@@ -1016 +1016 @@
     .'/'.make_section_in_URL($params)
     ;
-  
-  if (isset($params['start']) and $params['start'] > 0)
-  {
-    $url.= '/start-'.$params['start'];
-  }
+
+  $url = add_well_known_params_in_url($url, $params);
 
   return $url;
@@ -1107 +1104 @@
     die('make_picture_URL: image_id is a required parameter');
   }
-  
+
   $url =
     PHPWG_ROOT_PATH.'picture.php?'
@@ -1114 +1111 @@
     ;
 
-  // first comment to start on
+  $url = add_well_known_params_in_url($url, $params);
+  return $url;
+}
+
+/**
+ *adds to the url the chronology and start parameters
+*/
+function add_well_known_params_in_url($url, $params)
+{
+  if ( isset($params['chronology']) )
+  {
+    $url .= '/'. $params['chronology']['field'];
+    $url .= '-'. $params['chronology']['style'];
+    if ( isset($params['chronology']['view']) )
+    {
+      $url .= '-'. $params['chronology']['view'];
+    }
+    if ( isset($params['chronology_date']) )
+    {
+      $url .= '-'. implode('-', $params['chronology_date'] );
+    }
+  }
+
   if (isset($params['start']) and $params['start'] > 0)
   {
     $url.= '/start-'.$params['start'];
   }
-
   return $url;
 }
@@ -1135 +1153 @@
 {
   $section_string = '';
-  
+
   if (!isset($params['section']))
   {
@@ -1160 +1178 @@
     $params['section'] = 'categories';
   }
-  
+
   switch($params['section'])
   {
@@ -1173 +1191 @@
         $section_string.= 'category/'.$params['category'];
       }
-      
+
       break;
     }
@@ -1189 +1207 @@
         $section_string.= '/'.$tag;
       }
-      
+
       break;
     }
@@ -1198 +1216 @@
         die('make_section_in_URL: require a search identifier');
       }
-      
+
       $section_string.= 'search/'.$params['search'];
 
@@ -1211 +1229 @@
 
       $section_string.= 'list/'.implode(',', $params['list']);
-      
+
       break;
     }