4 files changed, 494 insertions, 434 deletions
diff --git a/include/calendar_base.class.php b/include/calendar_base.class.php
index 1f120c811..26472bf1b 100644
--- a/include/calendar_base.class.php
+++ b/include/calendar_base.class.php
@@ -1,165 +1,179 @@
-<?php
-// +-----------------------------------------------------------------------+
-// | PhpWebGallery - a PHP based picture gallery                           |
-// | Copyright (C) 2003-2006 PhpWebGallery Team - http://phpwebgallery.net |
-// +-----------------------------------------------------------------------+
-// | branch        : BSF (Best So Far)
-// | file          : $RCSfile$
-// | last update   : $Date: 2006-01-27 02:11:43 +0100 (ven, 27 jan 2006) $
-// | last modifier : $Author: rvelices $
-// | revision      : $Revision: 1014 $
-// +-----------------------------------------------------------------------+
-// | This program is free software; you can redistribute it and/or modify  |
-// | it under the terms of the GNU General Public License as published by  |
-// | the Free Software Foundation                                          |
-// |                                                                       |
-// | This program is distributed in the hope that it will be useful, but   |
-// | WITHOUT ANY WARRANTY; without even the implied warranty of            |
-// | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU      |
-// | General Public License for more details.                              |
-// |                                                                       |
-// | You should have received a copy of the GNU General Public License     |
-// | along with this program; if not, write to the Free Software           |
-// | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, |
-// | USA.                                                                  |
-// +-----------------------------------------------------------------------+
-
-/**
- * Base class for monthly and weekly calendar styles
- */
-class CalendarBase
-{
-// db column on which this calendar works
-var $date_field;
-// used for queries (INNER JOIN or normal)
-var $inner_sql;
-// base url used when generating html links
-var $url_base;
-
-function get_date_where()
-{
-  die("get_date_where not extended");
-}
-
-/**
- * Initialize the calendar
- * @param string date_field db column on which this calendar works
- * @param string inner_sql used for queries (INNER JOIN or normal)
- */
-function initialize($date_field, $inner_sql)
-{
-  $this->date_field = $date_field;
-  $this->inner_sql = $inner_sql;
-}
-
-//--------------------------------------------------------- private members ---
-/**
- * Creates a calendar navigation bar.
- * @param string url_base - links start with this root
- * @param array items - hash of items to put in the bar (e.g. 2005,2006)
- * @param array selected_item - item currently selected (e.g. 2005)
- * @param string class_prefix - html class attribute prefix for span elements
- * @param bool allow_any - adds any to the end of the bar
- * @param array labels - optional labels for items (e.g. Jan,Feb,...)
- * @return string the navigation bar
- */
-function get_nav_bar_from_items($url_base, $items, $selected_item,
-                                $class_prefix, $allow_any, $labels=null)
-{
-  $nav_bar='';
-  foreach ($items as $item => $nb_images)
-  {
-    $label = $item;
-    if (isset($labels[$item]))
-    {
-      $label = $labels[$item];
-    }
-    if ( isset($selected_item) and $item==$selected_item )
-    {
-      $nav_bar .= '<span class="'.$class_prefix.'Sel">';
-      $nav_bar .= $label;
-    }
-    else
-    {
-      $nav_bar .= '<span class="'.$class_prefix.'">';
-      $url = $url_base . $item;
-      $nav_bar .= '<a href="'.$url.'">';
-      $nav_bar .= $label;
-      $nav_bar .= '</a>';
-    }
-    if ($nb_images>0)
-    {
-      $nav_bar .= '('.$nb_images.')';
-    }
-    $nav_bar.= '</span>';
-  }
-
-  if ($allow_any and count($items)>1 )
-  {
-    $label = l10n('calendar_any');
-    if ( isset($selected_item) and 'any'==$selected_item )
-    {
-      $nav_bar .= '<span class="'.$class_prefix.'Sel">';
-      $nav_bar .= $label;
-    }
-    else
-    {
-      $nav_bar .= '<span class="'.$class_prefix.'">';
-      $url = $url_base . 'any';
-      $nav_bar .= '<a href="'.$url.'">';
-      $nav_bar .= $label;
-      $nav_bar .= '</a>';
-    }
-    $nav_bar.= '</span>';
-  }
-  return $nav_bar;
-}
-
-
-/**
- * Creates a calendar navigation bar for a given level.
- * @param string view_type - list or calendar (e.g. 'l' or 'c')
- * @param array requested - array of current selected elements (e.g. 2005,10)
- * @param string sql_func - YEAR/MONTH/DAY/WEEK/DAYOFWEEK ...
- * @param string sql_offset - (e.g. +1 for WEEK - first in year is 1)
- * @param array labels - optional labels to show in the navigation bar
- * @return void
- */
-function build_nav_bar($view_type, $requested, $level, $sql_func,
-                       $sql_offset='', $labels=null)
-{
-  global $template;
-  $query = 'SELECT DISTINCT('.$sql_func.'('.$this->date_field.')'.$sql_offset
-            .') as period';
-  $query.= $this->inner_sql;
-  $query.= $this->get_date_where($requested, $level);
-  $query.= '
-  GROUP BY period';
-
-  $level_items=array();
-  $result = pwg_query($query);
-  while ($row = mysql_fetch_array($result))
-  {
-    $level_items[$row['period']] = 0;
-  }
-
-  $url_base = $this->url_base;
-  $url_base .= $view_type.'-';
-  for ($i=0; $i<$level; $i++)
-  {
-    if (isset($requested[$i]))
-    {
-      $url_base .= $requested[$i].'-';
-    }
-  }
-
-  $nav_bar = $this->get_nav_bar_from_items( $url_base, $level_items,
-              $requested[$level], 'cal', true, $labels);
-
-  $template->assign_block_vars( 'calendar.navbar',
-         array( 'BAR' => $nav_bar)
-         );
-}
-}
-
+<?php
+// +-----------------------------------------------------------------------+
+// | PhpWebGallery - a PHP based picture gallery                           |
+// | Copyright (C) 2003-2006 PhpWebGallery Team - http://phpwebgallery.net |
+// +-----------------------------------------------------------------------+
+// | branch        : BSF (Best So Far)
+// | file          : $RCSfile$
+// | last update   : $Date: 2006-01-27 02:11:43 +0100 (ven, 27 jan 2006) $
+// | last modifier : $Author: rvelices $
+// | revision      : $Revision: 1014 $
+// +-----------------------------------------------------------------------+
+// | This program is free software; you can redistribute it and/or modify  |
+// | it under the terms of the GNU General Public License as published by  |
+// | the Free Software Foundation                                          |
+// |                                                                       |
+// | This program is distributed in the hope that it will be useful, but   |
+// | WITHOUT ANY WARRANTY; without even the implied warranty of            |
+// | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU      |
+// | General Public License for more details.                              |
+// |                                                                       |
+// | You should have received a copy of the GNU General Public License     |
+// | along with this program; if not, write to the Free Software           |
+// | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, |
+// | USA.                                                                  |
+// +-----------------------------------------------------------------------+
+
+/**
+ * Base class for monthly and weekly calendar styles
+ */
+class CalendarBase
+{
+  // db column on which this calendar works
+  var $date_field;
+  // used for queries (INNER JOIN or normal)
+  var $inner_sql;
+  // base url used when generating html links
+  var $url_base;
+
+  function get_date_where()
+  {
+    die("get_date_where not extended");
+  }
+
+  /**
+   * Initialize the calendar
+   * @param string date_field db column on which this calendar works
+   * @param string inner_sql used for queries (INNER JOIN or normal)
+   */
+  function initialize($date_field, $inner_sql)
+  {
+    $this->date_field = $date_field;
+    $this->inner_sql = $inner_sql;
+  }
+
+//--------------------------------------------------------- private members ---
+
+  /**
+   * Creates a calendar navigation bar.
+   *
+   * @param string url_base - links start with this root
+   * @param array items - hash of items to put in the bar (e.g. 2005,2006)
+   * @param array selected_item - item currently selected (e.g. 2005)
+   * @param string class_prefix - html class attribute prefix for span elements
+   * @param bool allow_any - adds any to the end of the bar
+   * @param array labels - optional labels for items (e.g. Jan,Feb,...)
+   * @return string the navigation bar
+   */
+  function get_nav_bar_from_items($url_base, $items, $selected_item,
+                                  $class_prefix, $allow_any, $labels=null)
+  {
+    $nav_bar = '';
+      
+    foreach ($items as $item => $nb_images)
+    {
+      $label = $item;
+      if (isset($labels[$item]))
+      {
+        $label = $labels[$item];
+      }
+      if (isset($selected_item) and $item == $selected_item)
+      {
+        $nav_bar .= '<span class="'.$class_prefix.'Sel">';
+        $nav_bar .= $label;
+      }
+      else
+      {
+        $nav_bar .= '<span class="'.$class_prefix.'">';
+        $url = $url_base . $item;
+        $nav_bar .= '<a href="'.$url.'">';
+        $nav_bar .= $label;
+        $nav_bar .= '</a>';
+      }
+      if ($nb_images > 0)
+      {
+        $nav_bar .= '('.$nb_images.')';
+      }
+      $nav_bar.= '</span>';
+    }
+
+    if ($allow_any and count($items) > 1)
+    {
+      $label = l10n('calendar_any');
+      if (isset($selected_item) and 'any' == $selected_item)
+      {
+        $nav_bar .= '<span class="'.$class_prefix.'Sel">';
+        $nav_bar .= $label;
+      }
+      else
+      {
+        $nav_bar .= '<span class="'.$class_prefix.'">';
+        $url = $url_base . 'any';
+        $nav_bar .= '<a href="'.$url.'">';
+        $nav_bar .= $label;
+        $nav_bar .= '</a>';
+      }
+      $nav_bar.= '</span>';
+    }
+    return $nav_bar;
+  }
+
+  /**
+   * Creates a calendar navigation bar for a given level.
+   *
+   * @param string view_type - list or calendar (e.g. 'l' or 'c')
+   * @param array requested - array of current selected elements (e.g. 2005,10)
+   * @param string sql_func - YEAR/MONTH/DAY/WEEK/DAYOFWEEK ...
+   * @param string sql_offset - (e.g. +1 for WEEK - first in year is 1)
+   * @param array labels - optional labels to show in the navigation bar
+   * @return void
+   */
+  function build_nav_bar($view_type, $requested, $level, $sql_func,
+                         $sql_offset='', $labels=null)
+  {
+    global $template;
+    
+    $query = '
+SELECT DISTINCT('.$sql_func.'('.$this->date_field.')'.$sql_offset
+      .') as period';
+    $query.= $this->inner_sql;
+    $query.= $this->get_date_where($requested, $level);
+    $query.= '
+  GROUP BY period
+;';
+
+    $level_items = array();
+    $result = pwg_query($query);
+    while ($row = mysql_fetch_array($result))
+    {
+      $level_items[$row['period']] = 0;
+    }
+
+    $url_base = $this->url_base;
+    $url_base .= $view_type.'-';
+    for ($i=0; $i<$level; $i++)
+    {
+      if (isset($requested[$i]))
+      {
+        $url_base .= $requested[$i].'-';
+      }
+    }
+
+    $nav_bar = $this->get_nav_bar_from_items(
+      $url_base,
+      $level_items,
+      $requested[$level],
+      'cal',
+      true,
+      $labels
+      );
+
+    $template->assign_block_vars(
+      'calendar.navbar',
+      array(
+        'BAR' => $nav_bar
+        )
+      );
+  }
+}
 ?>
 \ No newline at end of file
diff --git a/include/calendar_monthly.class.php b/include/calendar_monthly.class.php
index 3103880c3..128afff87 100644
--- a/include/calendar_monthly.class.php
+++ b/include/calendar_monthly.class.php
@@ -73,7 +73,7 @@ function generate_category_content($url_base, $view_type, &$requested)
     if (count($requested)>0)
       $this->build_nav_bar2($view_type, $requested, 1, 'MONTH', $lang['month']); // month
     if (count($requested)>1)
-      $this->build_nav_bar2($view_type, $requested, 2, 'DAY' ); // days
+      $this->build_nav_bar2($view_type, $requested, 2, 'DAYOFWEEK' ); // days
   }
   return false;
 }
@@ -123,7 +123,7 @@ function get_date_where($requested, $max_levels=3)
       }
       if (isset($requested[2]) and $requested[2]!='any')
       {
-        $res .= ' AND DAY('.$this->date_field.')='.$requested[2];
+        $res .= ' AND DAYOFMONTH('.$this->date_field.')='.$requested[2];
       }
     }
     $res = " AND $this->date_field BETWEEN '$b' AND '$e 23:59:59'" . $res;
@@ -137,7 +137,7 @@ function get_date_where($requested, $max_levels=3)
     }
     if (isset($requested[2]) and $requested[2]!='any')
     {
-      $res .= ' AND DAY('.$this->date_field.')='.$requested[2];
+      $res .= ' AND DAYOFMONTH('.$this->date_field.')='.$requested[2];
     }
   }
   return $res;
diff --git a/include/category_default.inc.php b/include/category_default.inc.php
index 558e3d389..5c31e4a18 100644
--- a/include/category_default.inc.php
+++ b/include/category_default.inc.php
@@ -79,22 +79,25 @@ foreach ($pictures as $row)
   {
     $thumbnail_title .= ' : '.$row['filesize'].' KB';
   }
+  
   // url link on picture.php page
-  $url_link = PHPWG_ROOT_PATH.'picture.php?';
-  if ( isset($page['cat']) )
-  {
-    $url_link .= 'cat='.$page['cat'].'&amp;';
-  }
-  $url_link.= 'image_id='.$row['id'];
-  if ($page['cat'] == 'search')
-  {
-    $url_link.= '&amp;search='.$_GET['search'];
-  }
-  else if ($page['cat'] == 'list')
+  $url_link = PHPWG_ROOT_PATH.'picture.php?image_id='.$row['id'];
+
+  if (isset($page['cat']))
   {
-    $url_link.= '&amp;list='.$_GET['list'];
+    $url_link.= 'cat='.$page['cat'].'&amp;';
+
+    if ($page['cat'] == 'search')
+    {
+      $url_link.= '&amp;search='.$_GET['search'];
+    }
+    else if ($page['cat'] == 'list')
+    {
+      $url_link.= '&amp;list='.$_GET['list'];
+    }
   }
-  if ( isset($_GET['calendar']) )
+  
+  if (isset($_GET['calendar']))
   {
     $url_link.= '&amp;calendar='.$_GET['calendar'];
   }
diff --git a/include/functions_calendar.inc.php b/include/functions_calendar.inc.php
index e39bbe2a0..acc8b15b0 100644
--- a/include/functions_calendar.inc.php
+++ b/include/functions_calendar.inc.php
@@ -1,255 +1,298 @@
-<?php
-// +-----------------------------------------------------------------------+
-// | PhpWebGallery - a PHP based picture gallery                           |
-// | Copyright (C) 2003-2006 PhpWebGallery Team - http://phpwebgallery.net |
-// +-----------------------------------------------------------------------+
-// | branch        : BSF (Best So Far)
-// | file          : $RCSfile$
-// | last update   : $Date: 2006-01-27 02:11:43 +0100 (ven, 27 jan 2006) $
-// | last modifier : $Author: rvelices $
-// | revision      : $Revision: 1014 $
-// +-----------------------------------------------------------------------+
-// | This program is free software; you can redistribute it and/or modify  |
-// | it under the terms of the GNU General Public License as published by  |
-// | the Free Software Foundation                                          |
-// |                                                                       |
-// | This program is distributed in the hope that it will be useful, but   |
-// | WITHOUT ANY WARRANTY; without even the implied warranty of            |
-// | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU      |
-// | General Public License for more details.                              |
-// |                                                                       |
-// | You should have received a copy of the GNU General Public License     |
-// | along with this program; if not, write to the Free Software           |
-// | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, |
-// | USA.                                                                  |
-// +-----------------------------------------------------------------------+
-
-define('CAL_VIEW_LIST','l');
-define('CAL_VIEW_CALENDAR','c');
-
-function initialize_calendar()
-{
-  global $page, $conf, $user, $template;
-
-//------------------ initialize the condition on items to take into account ---
-  $inner_sql = ' FROM ' . IMAGES_TABLE;
-  if ( !isset($page['cat']) or is_numeric($page['cat']) )
-  { // we will regenerate the items by including subcats elements
-    $page['cat_nb_images']=0;
-    $page['items']=array();
-    $inner_sql .= '
-INNER JOIN '.IMAGE_CATEGORY_TABLE.' ON id = image_id';
-    if ( is_numeric($page['cat']) )
-    {
-      $sub_ids = get_subcat_ids(array($page['cat']));
-      $sub_ids = array_diff($sub_ids,
-                            explode(',', $user['forbidden_categories']) );
-      if (empty($sub_ids))
-      {
-        return; // nothing to do
-      }
-      $inner_sql .= '
-WHERE category_id IN ('.implode(',',$sub_ids).')';
-    }
-    else
-    {
-      $inner_sql .= '
-WHERE category_id NOT IN ('.$user['forbidden_categories'].')';
-    }
-  }
-  else
-  {
-    if ( empty($page['items']) )
-    {
-      return; // nothing to do
-    }
-    $inner_sql .= '
-WHERE id IN (' . implode(',',$page['items']) .')';
-  }
-
-//-------------------------------------- initialize the calendar parameters ---
-  pwg_debug('start initialize_calendar');
-  $cal_styles = array(
-    array('link'=>'m', 'default_link'=>'', 'name'=>l10n('Monthly'),
-          'include'=>'calendar_monthly.class.php', 'view_calendar'=>true ),
-    array('link'=>'w', 'default_link'=>'w-', 'name'=>l10n('Weekly'),
-          'include'=>'calendar_weekly.class.php', ),
-    );
-
-  $requested = explode('-', $_GET['calendar']);
-  $calendar = null;
-  foreach( $cal_styles as $cal_style)
-  {
-    if ($requested[0]==$cal_style['link'])
-    {
-      include( PHPWG_ROOT_PATH.'include/'.$cal_style['include']);
-      $calendar = new Calendar();
-      array_shift($requested);
-      break;
-    }
-  }
-  if ( !isset($calendar) )
-  {
-    foreach( $cal_styles as $cal_style)
-    {
-      if (''==$cal_style['default_link'])
-        break;
-    }
-    include( PHPWG_ROOT_PATH.'include/'.$cal_style['include']);
-    $calendar = new Calendar();
-  }
-
-  $view_type=CAL_VIEW_LIST;
-  if ($requested[0]==CAL_VIEW_LIST)
-  {
-    array_shift($requested);
-  }
-  elseif ($requested[0]==CAL_VIEW_CALENDAR)
-  {
-    if ($cal_style['view_calendar'])
-    {
-      $view_type=CAL_VIEW_CALENDAR;
-    }
-    array_shift($requested);
-  }
-  // perform a sanity check on $requested
-  while (count($requested)>3)
-  {
-    array_pop($requested);
-  }
-
-  $any_count = 0;
-  for ($i=0; $i<count($requested); $i++)
-  {
-    if ($requested[$i]=='any')
-    {
-      if ($view_type==CAL_VIEW_CALENDAR)
-      {// we dont allow any in calendar view
-        while ($i<count($requested))
-        {
-          array_pop( $requested );
-        }
-        break;
-      }
-      $any_count++;
-    }
-    elseif ( $requested[$i]=='' )
-    {
-      while ($i<count($requested))
-      {
-        array_pop( $requested );
-      }
-    }
-  }
-  if ($any_count==3)
-  {
-    array_pop($requested);
-  }
-
-  $calendar->initialize($conf['calendar_datefield'], $inner_sql);
-  //echo ('<pre>'. var_export($requested, true) . '</pre>');
-  //echo ('<pre>'. var_export($calendar, true) . '</pre>');
-
-  $category_calling = false;
-  if (basename($_SERVER["PHP_SELF"]) == 'category.php')
-  {
-    $category_calling = true;
-  }
-
-  $must_show_list = true;
-  if ($category_calling)
-  {
-    $template->assign_block_vars('calendar', array());
-
-    $url_base = get_query_string_diff(array('start','calendar'));
-    $url_base .= empty($url_base) ? '?' : '&';
-    $url_base .= 'calendar=';
-    $url_base = PHPWG_ROOT_PATH.'category.php'.$url_base;
-
-    if ( $calendar->generate_category_content(
-              $url_base.$cal_style['default_link'], $view_type, $requested) )
-    {
-      unset( $page['thumbnails_include'] );
-      unset( $page['items'] );
-      unset( $page['cat_nb_images'] );
-      $must_show_list = false;
-    }
-
-    if ($cal_style['view_calendar'])
-    { // Build bar for view modes (List/Calendar)
-      $views = array(
-        array(CAL_VIEW_LIST, l10n('List') ),
-        array(CAL_VIEW_CALENDAR, l10n('calendar') ),
-        );
-      $views_bar = '';
-      foreach( $views as $view )
-      {
-        $v = $view[1];
-        if ( $view_type!=$view[0] )
-        {
-          $url = $url_base.$cal_style['default_link'].$view[0].'-';
-          $url .= implode('-', $requested);
-          $v = '<a href="'.$url.'">'.$v.'</a> ';
-        }
-        else
-        {
-          $v = $v.' ';
-        }
-        $views_bar .= $v . ' ';
-      }
-      $template->assign_block_vars('calendar.views', array(
-        'BAR'=>$views_bar
-        ));
-    }
-
-    // Build bar for calendar styles (Monthly, Weekly)
-    $styles_bar = '';
-    foreach ( $cal_styles as $style)
-    {
-      if ($cal_style['link']!=$style['link'])
-      {
-        $url = $url_base.$style['default_link'];
-        $url .= $view_type;
-        if (isset($requested[0]))
-        {
-          $url .= '-' . $requested[0];
-        }
-        $styles_bar .= '<a href="'. $url . '">'.$style['name'].'</a> ';
-      }
-      else
-      {
-        $styles_bar .=  $style['name'].' ';
-      }
-    }
-    $template->assign_block_vars( 'calendar.styles',
-               array( 'BAR' => $styles_bar)
-               );
-  } // end category calling
-
-  if ($must_show_list)
-  {
-    $query = 'SELECT DISTINCT(id)';
-    $query .= $calendar->inner_sql;
-    $query .= $calendar->get_date_where($requested);
-    if ( isset($page['super_order_by']) )
-    {
-      $query .= '
-  '.$conf['order_by'];
-    }
-    else
-    {
-      $order_by = str_replace(
-                'ORDER BY ',
-                'ORDER BY '.$calendar->date_field.',', $conf['order_by']
-               );
-      $query .= $order_by;
-    }
-
-    $page['items'] = array_from_query($query, 'id');
-    $page['cat_nb_images'] = count($page['items']);
-    $page['thumbnails_include'] = 'include/category_default.inc.php';
-  }
-  pwg_debug('end initialize_calendar');
-}
-
+<?php
+// +-----------------------------------------------------------------------+
+// | PhpWebGallery - a PHP based picture gallery                           |
+// | Copyright (C) 2003-2006 PhpWebGallery Team - http://phpwebgallery.net |
+// +-----------------------------------------------------------------------+
+// | branch        : BSF (Best So Far)
+// | file          : $RCSfile$
+// | last update   : $Date: 2006-01-27 02:11:43 +0100 (ven, 27 jan 2006) $
+// | last modifier : $Author: rvelices $
+// | revision      : $Revision: 1014 $
+// +-----------------------------------------------------------------------+
+// | This program is free software; you can redistribute it and/or modify  |
+// | it under the terms of the GNU General Public License as published by  |
+// | the Free Software Foundation                                          |
+// |                                                                       |
+// | This program is distributed in the hope that it will be useful, but   |
+// | WITHOUT ANY WARRANTY; without even the implied warranty of            |
+// | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU      |
+// | General Public License for more details.                              |
+// |                                                                       |
+// | You should have received a copy of the GNU General Public License     |
+// | along with this program; if not, write to the Free Software           |
+// | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, |
+// | USA.                                                                  |
+// +-----------------------------------------------------------------------+
+
+define('CAL_VIEW_LIST',     'l');
+define('CAL_VIEW_CALENDAR', 'c');
+
+function initialize_calendar()
+{
+  global $page, $conf, $user, $template;
+
+//------------------ initialize the condition on items to take into account ---
+  $inner_sql = ' FROM ' . IMAGES_TABLE;
+  
+  if (!isset($page['cat']) or is_numeric($page['cat']))
+  { // we will regenerate the items by including subcats elements
+    $page['cat_nb_images'] = 0;
+    $page['items'] = array();
+    $inner_sql .= '
+INNER JOIN '.IMAGE_CATEGORY_TABLE.' ON id = image_id';
+    
+    if (isset($page['cat']) and is_numeric($page['cat']))
+    {
+      $sub_ids = array_diff(
+        get_subcat_ids(array($page['cat'])),
+        explode(',', $user['forbidden_categories'])
+        );
+      
+      if (empty($sub_ids))
+      {
+        return; // nothing to do
+      }
+      $inner_sql .= '
+WHERE category_id IN ('.implode(',',$sub_ids).')';
+    }
+    else
+    {
+      $inner_sql .= '
+WHERE category_id NOT IN ('.$user['forbidden_categories'].')';
+    }
+  }
+  else
+  {
+    if ( empty($page['items']) )
+    {
+      return; // nothing to do
+    }
+    $inner_sql .= '
+WHERE id IN (' . implode(',',$page['items']) .')';
+  }
+
+//-------------------------------------- initialize the calendar parameters ---
+  pwg_debug('start initialize_calendar');
+  
+  $cal_styles = array(
+    // Weekly style
+    array(
+      'link'           => 'm',
+      'default_link'   => '',
+      'name'           => l10n('Monthly'),
+      'include'        => 'calendar_monthly.class.php',
+      'view_calendar'  => true,
+      ),
+    // Monthly style
+    array(
+      'link'           => 'w',
+      'default_link'   => 'w-',
+      'name'           => l10n('Weekly'),
+      'include'        => 'calendar_weekly.class.php',
+      ),
+    );
+
+  $requested = explode('-', $_GET['calendar']);
+  $calendar = null;
+  foreach ($cal_styles as $cal_style)
+  {
+    if ($requested[0] == $cal_style['link'])
+    {
+      include(PHPWG_ROOT_PATH.'include/'.$cal_style['include']);
+      $calendar = new Calendar();
+      array_shift($requested);
+      break;
+    }
+  }
+  
+  if (!isset($calendar))
+  {
+    foreach($cal_styles as $cal_style)
+    {
+      if ('' == $cal_style['default_link'])
+      {
+        break;
+      }
+    }
+    include( PHPWG_ROOT_PATH.'include/'.$cal_style['include']);
+    $calendar = new Calendar();
+  }
+
+  $view_type = CAL_VIEW_LIST;
+  if ($requested[0] == CAL_VIEW_LIST)
+  {
+    array_shift($requested);
+  }
+  elseif ($requested[0] == CAL_VIEW_CALENDAR)
+  {
+    if ($cal_style['view_calendar'])
+    {
+      $view_type = CAL_VIEW_CALENDAR;
+    }
+    array_shift($requested);
+  }
+  // perform a sanity check on $requested
+  while (count($requested) > 3)
+  {
+    array_pop($requested);
+  }
+
+  $any_count = 0;
+  for ($i = 0; $i < count($requested); $i++)
+  {
+    if ($requested[$i] == 'any')
+    {
+      if ($view_type == CAL_VIEW_CALENDAR)
+      {// we dont allow any in calendar view
+        while ($i < count($requested))
+        {
+          array_pop($requested);
+        }
+        break;
+      }
+      $any_count++;
+    }
+    elseif ($requested[$i] == '')
+    {
+      while ($i < count($requested))
+      {
+        array_pop($requested);
+      }
+    }
+  }
+  if ($any_count == 3)
+  {
+    array_pop($requested);
+  }
+
+  $calendar->initialize($conf['calendar_datefield'], $inner_sql);
+  //echo ('<pre>'. var_export($requested, true) . '</pre>');
+  //echo ('<pre>'. var_export($calendar, true) . '</pre>');
+
+  // TODO: what makes the list view required?
+  $must_show_list = true;
+  
+  if (basename($_SERVER["PHP_SELF"]) == 'category.php')
+  {
+    $template->assign_block_vars('calendar', array());
+
+    $url_base =
+      PHPWG_ROOT_PATH.'category.php'
+      .get_query_string_diff(array('start', 'calendar'))
+      .(empty($url_base) ? '?' : '&')
+      .'calendar='
+      ;
+
+    if ($calendar->generate_category_content(
+          $url_base.$cal_style['default_link'],
+          $view_type,
+          $requested
+          )
+       )
+    {
+      unset(
+        $page['thumbnails_include'],
+        $page['items'],
+        $page['cat_nb_images']
+        );
+      
+      $must_show_list = false;
+    }
+
+    if ($cal_style['view_calendar'])
+    { // Build bar for views (List/Calendar)
+      $views = array(
+        // list view
+        array(
+          'type'  => CAL_VIEW_LIST,
+          'label' => l10n('List')
+          ),
+        // calendar view
+        array(
+          'type'  => CAL_VIEW_CALENDAR,
+          'label' => l10n('calendar')
+          ),
+        );
+      
+      $views_bar = '';
+
+      foreach ($views as $view)
+      {
+        if ($view_type != $view['type'])
+        {
+          $views_bar.=
+            '<a href="'
+            .$url_base.$cal_style['default_link'].$view['type'].'-'
+            .implode('-', $requested)
+            .'">'.$view['label'].'</a> ';
+        }
+        else
+        {
+          $views_bar.= $view['label'].' ';
+        }
+        
+        $views_bar.= ' ';
+      }
+      
+      $template->assign_block_vars(
+        'calendar.views',
+        array(
+          'BAR' => $views_bar,
+          )
+        );
+    }
+
+    // Build bar for calendar styles (Monthly, Weekly)
+    $styles_bar = '';
+    foreach ($cal_styles as $style)
+    {
+      if ($cal_style['link'] != $style['link'])
+      {
+        $url = $url_base.$style['default_link'];
+        $url .= $view_type;
+        if (isset($requested[0]))
+        {
+          $url .= '-' . $requested[0];
+        }
+        $styles_bar .= '<a href="'. $url . '">'.$style['name'].'</a> ';
+      }
+      else
+      {
+        $styles_bar .=  $style['name'].' ';
+      }
+    }
+    $template->assign_block_vars(
+      'calendar.styles',
+      array(
+        'BAR' => $styles_bar,
+        )
+      );
+  } // end category calling
+
+  if ($must_show_list)
+  {
+    $query = 'SELECT DISTINCT(id)';
+    $query .= $calendar->inner_sql;
+    $query .= $calendar->get_date_where($requested);
+    if ( isset($page['super_order_by']) )
+    {
+      $query .= '
+  '.$conf['order_by'];
+    }
+    else
+    {
+      $order_by = str_replace(
+        'ORDER BY ',
+        'ORDER BY '.$calendar->date_field.',', $conf['order_by']
+        );
+      $query .= $order_by;
+    }
+
+    $page['items']              = array_from_query($query, 'id');
+    $page['cat_nb_images']      = count($page['items']);
+    $page['thumbnails_include'] = 'include/category_default.inc.php';
+  }
+  pwg_debug('end initialize_calendar');
+}
+
 ?>
 \ No newline at end of file