Changeset 642 for trunk/include

Timestamp:

Dec 12, 2004, 10:06:39 PM (20 years ago)

Author:

plg

Message:

• in admin menu, status option for categories is not "permissions" but "private or public" choice = different language item

• get_cat_display_name changed : use $conflevel_separator to unify presentation

• default values for category properties commentable, uploadable, status and visible (set in include/config.inc.php) used for category creation (admin/update, admin/remote_site, admin/cat_list)

• use mass_inserts in admin/update for inserting new categories

• only one query for counting the number of sub categories in admin/cat_list

Location:

trunk/include

Files:

• category_calendar.inc.php (modified) (3 diffs)
• category_recent_cats.inc.php (modified) (2 diffs)
• config.inc.php (modified) (2 diffs)
• functions_category.inc.php (modified) (2 diffs)
• functions_html.inc.php (modified) (5 diffs)
• functions_xml.inc.php (modified) (1 diff)

trunk/include/category_calendar.inc.php

@@ -364 +364 @@
 elseif (isset($page['calendar_day']))
 {
+  $old_level_separator = $conf['level_separator'];
+  $conf['level_separator'] = '<br />';
   // for each category of this day, display a random picture
   foreach ($calendar_categories as $calendar_category => $nb_pics)
@@ -374 +376 @@
     {
       $cat_infos = get_cat_info( $calendar_category );
-      $name = get_cat_display_name($cat_infos['name'],'<br />','',false);
+      
+      $name = get_cat_display_name($cat_infos['name'],'',false);
       $name = '['.$name.']';
     }
@@ -427 +430 @@
     }
   }
+  $conf['level_separator'] = $old_level_separator;
 }
 ?>

trunk/include/category_recent_cats.inc.php

@@ -60 +60 @@
 }
 
+$old_level_separator = $conf['level_separator'];
+$conf['level_separator'] = '<br />';
 // for each category, we have to search a recent picture to display and
 // the name to display
@@ -91 +93 @@
   }
 }
+$conf['level_separator'] = $old_level_separator;
 ?>

trunk/include/config.inc.php

@@ -77 +77 @@
 // top_number : number of element to display for "best rated" and "most
 // visited" categories
-$conf['top_number'] = 10;
+$conf['top_number'] = 15;
 
 // anti-flood_time : number of seconds between 2 comments : 0 to disable
@@ -169 +169 @@
 $conf['show_gt'] = true;
 
-// Default options for new categories.
-//
-// Some options for categories (commentable, uploadable, status, visible)
-// must be set directly in the database by changing the corresponding
-// default values of the column. Examples :
-//
-// ALTER TABLE phpwebgallery_categories ALTER visible SET DEFAULT 'true';
-// ALTER TABLE phpwebgallery_categories ALTER status SET DEFAULT 'private';
-// ALTER TABLE phpwebgallery_categories ALTER uploadable SET DEFAULT 'true';
-// ALTER TABLE phpwebgallery_categories ALTER commentable SET DEFAULT 'false';
-//
-// MySQL default values are used when inserting a row and that no value is
-// given for the column. In PhpWebGallery, the above columns are not valued
-// during categories insertion, so default values are important.
+// newcat_default_commentable : at creation, must a category be commentable
+// or not ?
+$conf['newcat_default_commentable'] = 'true';
+
+// newcat_default_uploadable : at creation, must a category be uploadable or
+// not ?
+$conf['newcat_default_uploadable'] = 'true';
+
+// newcat_default_visible : at creation, must a category be visible or not ?
+// Warning : if the parent category is invisible, the category is
+// automatically create invisible. (invisible = locked)
+$conf['newcat_default_visible'] = 'true';
+
+// newcat_default_status : at creation, must a category be public or private
+// ? Warning : if the parent category is private, the category is
+// automatically create private.
+$conf['newcat_default_status'] = 'public';
+
+// level_separator : character string used for separating a category level
+// to the sub level
+$conf['level_separator'] = ' / ';
 ?>

trunk/include/functions_category.inc.php

@@ -349 +349 @@
       $page['title'] =
         get_cat_display_name($page['cat_name'],
-                             ' > ',
                              'category.php?cat=',
                              false);
@@ -759 +758 @@
     {
       $option = get_cat_display_name_cache($category['uppercats'],
-                                           ' → ',
                                            '',
                                            false);

trunk/include/functions_html.inc.php

@@ -160 +160 @@
  */
 function get_cat_display_name($cat_informations,
-                              $separator, 
                               $url = 'category.php?cat=',
                               $replace_space = true)
 {
+  global $conf;
+  
   $output = '';
   $is_first = true;
@@ -174 +175 @@
     else
     {
-      $output.= $separator;
+      $output.= $conf['level_separator'];
     }
 
@@ -206 +207 @@
  *
  * @param string uppercats
- * @param string separator
  * @param string url
  * @param boolean replace_space
@@ -212 +212 @@
  */
 function get_cat_display_name_cache($uppercats,
-                                    $separator,
                                     $url = 'category.php?cat=',
                                     $replace_space = true)
 {
-  global $cat_names;
+  global $cat_names, $conf;
 
   if (!isset($cat_names))
@@ -243 +242 @@
     else
     {
-      $output.= $separator;
+      $output.= $conf['level_separator'];
     }
 

trunk/include/functions_xml.inc.php

@@ -52 +52 @@
 function getAttribute( $element, $attribute )
 {
+//  echo htmlentities($element).'<br /><br />';
   $regex = '/^<\w+[^>]*'.$attribute.'\s*=\s*"('.VAL_REG.')"/i';
   if ( preg_match( $regex, $element, $out ) ) return $out[1];