Changeset 1851 for trunk

Timestamp:

Feb 22, 2007, 9:20:30 PM (17 years ago)

Author:

rub

Message:

o Proposition: improved display of 'x images in y sub-categories' or 'x images in this category' for cases when categories contain both images and sub-categories
o Good idea of this new way for way confguest_access, but I kept last implementation for access methods (Could be useful on future development)

Location:

trunk

Files:

• identification.php (modified) (1 diff)
• include/category_cats.inc.php (modified) (2 diffs)
• include/functions_category.inc.php (modified) (1 diff)
• include/functions_html.inc.php (modified) (1 diff)
• include/functions_user.inc.php (modified) (6 diffs)
• nbm.php (modified) (1 diff)
• password.php (modified) (1 diff)
• register.php (modified) (1 diff)
• search_rules.php (modified) (1 diff)
• ws.php (modified) (1 diff)

trunk/identification.php

@@ -29 +29 @@
 define('PHPWG_ROOT_PATH','./');
 include_once( PHPWG_ROOT_PATH.'include/common.inc.php' );
+
+// +-----------------------------------------------------------------------+
+// | Check Access and exit when user status is not ok                      |
+// +-----------------------------------------------------------------------+
+check_status(ACCESS_NONE);
 
 //-------------------------------------------------------------- identification

trunk/include/category_cats.inc.php

@@ -215 +215 @@
                                     $category['nb_images'],
                                     $category['count_images'],
-                                    $category['count_categories']
+                                    $category['count_categories'],
+                                    true,
+                                    '<BR>'
                                   ),
           'DESCRIPTION' => @$comment,
@@ -250 +252 @@
                                     $category['nb_images'],
                                     $category['count_images'],
-                                    $category['count_categories']
+                                    $category['count_categories'],
+                                    true,
+                                    '<BR>'
                                   ),
 

trunk/include/functions_category.inc.php

@@ -387 +387 @@
  * @return string
  */
-function get_display_images_count($cat_nb_images, $cat_count_images, $cat_count_categories, $short_message = true)
+function get_display_images_count($cat_nb_images, $cat_count_images, $cat_count_categories, $short_message = true, $Separator = '\n')
 {
   $display_text = '';
 
-  if ($cat_count_images>0)
-  {//at least one image direct or indirect
+  if ($cat_count_images > 0)
+  {
+    if ($cat_nb_images > 0 and $cat_nb_images < $cat_count_images)
+    {
+      $display_text.= get_display_images_count($cat_nb_images, $cat_nb_images, 0, $short_message, $Separator).$Separator;
+      $cat_count_images-= $cat_nb_images;
+      $cat_nb_images = 0;
+    }
+    
+    //at least one image direct or indirect
     $display_text.= l10n_dec('image_available', 'images_available', $cat_count_images);
 
-    if ($cat_count_categories==0 or $cat_nb_images>=$cat_count_images)
-    {//no descendant categories or descendants do not contain images
+    if ($cat_count_categories == 0 or $cat_nb_images == $cat_count_images)
+    {
+      //no descendant categories or descendants do not contain images
       if (! $short_message)
       {

trunk/include/functions_html.inc.php

@@ -471 +471 @@
                     $category['count_images'],
                     $category['count_categories'],
-                    false
+                    false,
+                    ' / '
                   ).'">';
       // show total number of images

trunk/include/functions_user.inc.php

@@ -436 +436 @@
 
   // if user is not an admin, locked categories are forbidden
-  if ( $user_status!='administrator' and $user_status!='webmaster' )
+  if (!is_admin($user_status))
   {
     $query = '
@@ -982 +982 @@
 function get_access_type_status($user_status='')
 {
-  global $user;
+  global $user, $conf;
 
   if ($user_status == '' and isset($user['status']) )
@@ -993 +993 @@
   {
     case 'guest':
+    {
+      if
+        (
+          !isset($user) or
+          ($user['id']==$conf['guest_id'] and !$conf['guest_access'])
+        )
+      {
+        $access_type_status = ACCESS_NONE;
+      }
+      else
+      {
+        $access_type_status = ACCESS_GUEST;
+      }
+      break;
+    }
     case 'generic':
     {
@@ -1023 +1038 @@
  * @return bool
 */
-function is_autorize_status($access_type)
-{
-  global $user, $conf;
-  if (
-      !isset($user) or
-      ($user['id']==$conf['guest_id'] and $conf['guest_access']==false)
-    )
-  {
-    return ACCESS_NONE>=$access_type;
-  }
-
-  return (get_access_type_status() >= $access_type);
+function is_autorize_status($access_type, $user_status = '')
+{
+  return (get_access_type_status($user_status) >= $access_type);
 }
 
@@ -1043 +1049 @@
  * @return none
 */
-function check_status( $access_type )
-{
-  if (!is_autorize_status($access_type) )
+function check_status($access_type, $user_status = '')
+{
+  if (!is_autorize_status($access_type, $user_status))
   {
     access_denied();
@@ -1055 +1061 @@
  * @return bool
 */
-function is_admin()
-{
-  return is_autorize_status(ACCESS_ADMINISTRATOR);
+ function is_admin($user_status = '')
+{
+  return is_autorize_status(ACCESS_ADMINISTRATOR, $user_status);
 }
 

trunk/nbm.php

@@ -28 +28 @@
 
 
+//--------------------------------------------------------------------- include
 define('PHPWG_ROOT_PATH','./');
 include_once(PHPWG_ROOT_PATH.'include/common.inc.php');
+check_status(ACCESS_NONE);
 include_once(PHPWG_ROOT_PATH.'include/functions_notification.inc.php');
 include_once(PHPWG_ROOT_PATH.'include/functions_mail.inc.php');

trunk/password.php

@@ -33 +33 @@
 include_once( PHPWG_ROOT_PATH.'include/common.inc.php' );
 include_once(PHPWG_ROOT_PATH.'include/functions_mail.inc.php');
+
+// +-----------------------------------------------------------------------+
+// | Check Access and exit when user status is not ok                      |
+// +-----------------------------------------------------------------------+
+check_status(ACCESS_NONE);
 
 // +-----------------------------------------------------------------------+

trunk/register.php

@@ -29 +29 @@
 define('PHPWG_ROOT_PATH','./');
 include_once( PHPWG_ROOT_PATH.'include/common.inc.php' );
+
+// +-----------------------------------------------------------------------+
+// | Check Access and exit when user status is not ok                      |
+// +-----------------------------------------------------------------------+
+check_status(ACCESS_NONE);
+
 //----------------------------------------------------------- user registration
 

trunk/search_rules.php

@@ -44 +44 @@
 define('PHPWG_ROOT_PATH','./');
 include_once( PHPWG_ROOT_PATH.'include/common.inc.php' );
+check_status(ACCESS_NONE);
 include_once( PHPWG_ROOT_PATH.'include/functions_search.inc.php' );
 

trunk/ws.php

@@ -27 +27 @@
 
 include_once(PHPWG_ROOT_PATH.'include/common.inc.php');
+check_status(ACCESS_NONE);
 include_once(PHPWG_ROOT_PATH.'include/ws_core.inc.php');