Changeset 1056

Timestamp:

Feb 24, 2006, 2:16:30 AM (18 years ago)

Author:

rvelices

Message:

fix: remove all php warnings and notices

Location:

trunk

Files:

• admin/rating.php (modified) (1 diff)
• category.php (modified) (2 diffs)
• identification.php (modified) (1 diff)
• include/calendar_base.class.php (modified) (1 diff)
• include/calendar_monthly.class.php (modified) (5 diffs)
• include/category_default.inc.php (modified) (2 diffs)
• include/functions_calendar.inc.php (modified) (3 diffs)
• picture.php (modified) (4 diffs)

trunk/admin/rating.php

@@ -224 +224 @@
                 get_query_string_diff(array('del'));
     
-    $del_param = 'e='.$image[id].
+    $del_param = 'e='.$image['id'].
                  '&u='.$row['user_id'].
                  '&a='.$row['anonymous_id'];

trunk/category.php

@@ -86 +86 @@
   {
     $nav_url .= 'cat='.$page['cat'].'&';
-  }
-
-  switch ($page['cat'])
-  {
-    case 'search':
+
+    switch ($page['cat'])
     {
-      $nav_url.= 'search='.$_GET['search'].'&';
-      break;
+      case 'search':
+      {
+        $nav_url.= 'search='.$_GET['search'].'&';
+        break;
+      }
+      case 'list':
+      {
+        $nav_url.= 'list='.$_GET['list'].'&';
+        break;
+      }
     }
-    case 'list':
-    {
-      $nav_url.= 'list='.$_GET['list'].'&';
-      break;
-    }
-  }
+  }
+
   if ( isset($_GET['calendar']) )
   {
@@ -402 +403 @@
 }
 
-if ($page['cat_nb_images']>0 and 
+if ( ( isset($page['cat_nb_images']) and $page['cat_nb_images']>0 ) 
+     and 
     ( !isset($page['cat']) 
       or ($page['cat'] != 'most_visited' and $page['cat'] != 'best_rated') )

trunk/identification.php

@@ -45 +45 @@
 if (isset($_POST['login']))
 {
-  $redirect_to = $_POST['redirect'];
+  $redirect_to = isset($_POST['redirect']) ? $_POST['redirect'] : '';
   $username = mysql_escape_string($_POST['username']);
   // retrieving the encrypted password of the login submitted

trunk/include/calendar_base.class.php

@@ -163 +163 @@
       $url_base,
       $level_items,
-      $requested[$level],
+      isset($requested[$level]) ? $requested[$level] : null,
       'cal',
       true,

trunk/include/calendar_monthly.class.php

@@ -74 +74 @@
       $this->build_nav_bar2($view_type, $requested, 1, 'MONTH', $lang['month']); // month
     if (count($requested)>1)
-      $this->build_nav_bar2($view_type, $requested, 2, 'DAYOFWEEK' ); // days
+      $this->build_nav_bar2($view_type, $requested, 2, 'DAYOFMONTH' ); // days
   }
   return false;
@@ -152 +152 @@
 function build_global_calendar(&$requested)
 {
+  assert( count($requested) == 0 );
   $query='SELECT DISTINCT(DATE_FORMAT('.$this->date_field.',"%Y%m")) as period,
             COUNT(id) as count';
   $query.= $this->inner_sql;
-  $query.= $this->get_date_where($requested, 0);
+  $query.= $this->get_date_where($requested);
   $query.= '
   GROUP BY period';
@@ -189 +190 @@
 
     $url_base .= '-';
-    $nav_bar .= $this->get_nav_bar_from_items( $url_base, $year_data['children'], $requested[0], 'calCal', false, $lang['month'] );
+    $nav_bar .= $this->get_nav_bar_from_items( $url_base, 
+            $year_data['children'], null, 'calCal', false, $lang['month'] );
 
     $template->assign_block_vars( 'calendar.calbar',
@@ -200 +202 @@
 function build_year_calendar(&$requested)
 {
+  assert( count($requested) == 1 );
   $query='SELECT DISTINCT(DATE_FORMAT('.$this->date_field.',"%m%d")) as period,
             COUNT(id) as count';
   $query.= $this->inner_sql;
-  $query.= $this->get_date_where($requested, 1);
+  $query.= $this->get_date_where($requested);
   $query.= '
   GROUP BY period';
@@ -243 +246 @@
     $url_base .= '-';
     $nav_bar .= $this->get_nav_bar_from_items( $url_base, 
-                     $month_data['children'], $requested[1], 'calCal', false );
+                     $month_data['children'], null, 'calCal', false );
 
     $template->assign_block_vars( 'calendar.calbar',

trunk/include/category_default.inc.php

@@ -86 +86 @@
   if (isset($page['cat']))
   {
-    $url_link.= 'cat='.$page['cat'].'&';
+    $url_link.= '&cat='.$page['cat'];
 
     if ($page['cat'] == 'search')
@@ -126 +126 @@
       $name = str_replace('_', ' ', get_filename_wo_extension($row['file']));
     }
-    if ($page['cat'] == 'best_rated')
+    if ( isset($page['cat']) )
     {
-      $name = '('.$row['average_rate'].') '.$name;
-    }
-    else
-    if ($page['cat'] == 'most_visited')
-    {
-      $name = '('.$row['hit'].') '.$name;
-    }
-    
-    if ($page['cat'] == 'search')
-    {
-      $name = replace_search($name, $_GET['search']);
+      if ($page['cat'] == 'best_rated')
+      {
+        $name = '('.$row['average_rate'].') '.$name;
+      }
+      elseif ($page['cat'] == 'most_visited')
+      {
+        $name = '('.$row['hit'].') '.$name;
+      }
+      
+      if ($page['cat'] == 'search')
+      {
+        $name = replace_search($name, $_GET['search']);
+      }
     }
   

trunk/include/functions_calendar.inc.php

@@ -76 +76 @@
   
   $cal_styles = array(
-    // Weekly style
+    // Monthly style
     array(
       'link'           => 'm',
@@ -84 +84 @@
       'view_calendar'  => true,
       ),
-    // Monthly style
+    // Weekly style    
     array(
       'link'           => 'w',
@@ -90 +90 @@
       'name'           => l10n('Weekly'),
       'include'        => 'calendar_weekly.class.php',
+      'view_calendar'  => false,
       ),
     );

trunk/picture.php

@@ -380 +380 @@
 }
 
-if ( $page['cat'] == 'search' )
-{
-  $url_up.= '&search='.$_GET['search'];
-}
-if ( $page['cat'] == 'list' )
-{
-  $url_up.= '&list='.$_GET['list'];
+if ( isset($page['cat']) )
+{
+  if ( $page['cat'] == 'search' )
+  {
+    $url_up.= '&search='.$_GET['search'];
+  }
+  if ( $page['cat'] == 'list' )
+  {
+    $url_up.= '&list='.$_GET['list'];
+  }
 }
 
 $url_admin =
   PHPWG_ROOT_PATH.'admin.php?page=picture_modify'
-  .'&cat_id='.$page['cat']
+  .'&cat_id='. ( isset($page['cat']) ? $page['cat'] : '' )
   .'&image_id='.$_GET['image_id'];
 
@@ -414 +417 @@
     $result = pwg_query( $query );
   }
-  if ( !$_GET['add_fav'] and $page['cat'] == 'fav' )
+  if ( !$_GET['add_fav'] and isset($page['cat']) and 'fav'==$page['cat'] )
   {
     if (!isset($page['previous_item']) and !isset($page['next_item']))
@@ -538 +541 @@
 
 $title_img = $picture['current']['name'];
-if (is_numeric( $page['cat'] )) 
-{
-  $title_img = replace_space(get_cat_display_name($page['cat_name']));
-}
-else if ( $page['cat'] == 'search' )
-{
-  $title_img = replace_search( $title_img, $_GET['search'] );
+if ( isset( $page['cat'] ) ) 
+{
+  if (is_numeric( $page['cat'] )) 
+  {
+    $title_img = replace_space(get_cat_display_name($page['cat_name']));
+  }
+  else if ( $page['cat'] == 'search' )
+  {
+    $title_img = replace_search( $title_img, $_GET['search'] );
+  }
 }
 $title_nb = ($page['current_rank'] + 1).'/'.$page['cat_nb_images'];
@@ -681 +687 @@
 }
 // button to set the current picture as representative
-if ('admin' == $user['status'] and is_numeric($page['cat']))
+if ('admin' == $user['status'] and 
+    isset($page['cat']) and is_numeric($page['cat']))
 {
   $template->assign_block_vars(