- bug 111 fixed: "Can't add virtual category when cookie

  disabled". Correction reported from branch 1.4.

- bug 109 fixed : "disabled "best rated" menu item when rating is not
  enabled". Correction reported from branch 1.4.

- bug 95 fixed : "default maxwidth and maxheight not registered". Correction
  reported from branch 1.4.


git-svn-id: http://piwigo.org/svn/trunk@869 68402e56-0260-453c-a942-63ccdbb3a9ee

4 files changed, 42 insertions, 9 deletions

diff --git a/admin/cat_list.php b/admin/cat_list.php
index e681fa55c..3c8e1e8d2 100644
--- a/admin/cat_list.php
+++ b/admin/cat_list.php
@@ -238,7 +238,7 @@ else
 $template->assign_vars(array(
   'CATEGORIES_NAV'=>$navigation,
   'NEXT_RANK'=>$next_rank,
-  'F_ACTION'=>$form_action,
+  'F_ACTION'=>add_session_id($form_action),
   
   'L_ADD_VIRTUAL'=>$lang['cat_add'],
   'L_SUBMIT'=>$lang['submit'],
diff --git a/admin/configuration.php b/admin/configuration.php
index 9da9c56d3..ecbdcf1d4 100644
--- a/admin/configuration.php
+++ b/admin/configuration.php
@@ -82,6 +82,22 @@ if (isset($_POST['submit']))
       {
         array_push($page['errors'], $lang['periods_error']);
       }
+      // maxwidth
+      if (isset($_POST['default_maxwidth'])
+          and !empty($_POST['default_maxwidth'])
+          and (!preg_match($int_pattern, $_POST['default_maxwidth'])
+               or $_POST['default_maxwidth'] < 50))
+      {
+        array_push($page['errors'], $lang['maxwidth_error']);
+      }
+      // maxheight
+      if (isset($_POST['default_maxheight'])
+          and !empty($_POST['default_maxheight'])
+          and (!preg_match($int_pattern, $_POST['default_maxheight'])
+               or $_POST['default_maxheight'] < 50))
+      {
+        array_push($page['errors'], $lang['maxheight_error']);
+      }
       break;
     }
   }
@@ -89,7 +105,7 @@ if (isset($_POST['submit']))
   // updating configuration if no error found
   if (count($page['errors']) == 0)
   {
-    echo '<pre>'; print_r($_POST); echo '</pre>';
+//    echo '<pre>'; print_r($_POST); echo '</pre>';
     $result = pwg_query('SELECT * FROM '.CONFIG_TABLE);
     while ($row = mysql_fetch_array($result))
     {
@@ -176,6 +192,8 @@ switch ($page['section'])
         'NB_ROW_PAGE'=>$conf['nb_line_page'],
         'CONF_RECENT'=>$conf['recent_period'],
         'NB_COMMENTS_PAGE'=>$conf['nb_comment_page'],
+        'MAXWIDTH'=>$conf['default_maxwidth'],
+        'MAXHEIGHT'=>$conf['default_maxheight'],
         'EXPAND_YES'=>$expand_yes,
         'EXPAND_NO'=>$expand_no,
         'SHOW_COMMENTS_YES'=>$show_yes,
diff --git a/category.php b/category.php
index a28601e10..c62bb3e31 100644
--- a/category.php
+++ b/category.php
@@ -214,13 +214,17 @@ $template->assign_block_vars(
     'NAME' => $lang['most_visited_cat']
     ));
 // best rated
-$template->assign_block_vars(
-  'special_cat',
-  array(
-    'URL' => add_session_id(PHPWG_ROOT_PATH.'category.php?cat=best_rated'),
-    'TITLE' => $lang['best_rated_cat_hint'],
-    'NAME' => $lang['best_rated_cat']
-    ));
+if ($conf['rate'])
+{
+  $template->assign_block_vars(
+    'special_cat',
+    array(
+      'URL' => add_session_id(PHPWG_ROOT_PATH.'category.php?cat=best_rated'),
+      'TITLE' => $lang['best_rated_cat_hint'],
+      'NAME' => $lang['best_rated_cat']
+      )
+    );
+}
 // random
 $template->assign_block_vars(
   'special_cat',
diff --git a/doc/ChangeLog b/doc/ChangeLog
index 71a0b075d..fd6d22511 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,5 +1,16 @@
 2005-09-18 Pierrick LE GALL
 
+	* bug 111 fixed: "Can't add virtual category when cookie
+	disabled". Correction reported from branch 1.4.
+
+	* bug 109 fixed : "disabled "best rated" menu item when rating is
+	not enabled". Correction reported from branch 1.4.
+
+	* bug 95 fixed : "default maxwidth and maxheight not registered
+	". Correction reported from branch 1.4.
+
+2005-09-18 Pierrick LE GALL
+
 	* bug 107 fixed: crash when logging visit on a category containing
 	"'" character. Correction reported from branch 1.4