Changeset 869

Timestamp:

Sep 19, 2005, 12:29:17 AM (19 years ago)

Author:

plg

Message:

• 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.

Location:

trunk

Files:

• admin/cat_list.php (modified) (1 diff)
• admin/configuration.php (modified) (3 diffs)
• category.php (modified) (1 diff)
• doc/ChangeLog (modified) (1 diff)

trunk/admin/cat_list.php

@@ -239 +239 @@
   'CATEGORIES_NAV'=>$navigation,
   'NEXT_RANK'=>$next_rank,
-  'F_ACTION'=>$form_action,
+  'F_ACTION'=>add_session_id($form_action),
   
   'L_ADD_VIRTUAL'=>$lang['cat_add'],

trunk/admin/configuration.php

@@ -83 +83 @@
         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;
     }
@@ -90 +106 @@
   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))
@@ -177 +193 @@
         '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,

trunk/category.php

@@ -215 +215 @@
     ));
 // 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(

trunk/doc/ChangeLog

@@ +1 @@
+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