Changeset 286

Timestamp:

Jan 17, 2004, 11:38:04 PM (21 years ago)

Author:

z0rglub

Message:

• reformating gweltas coding style :-) (so easy to do with emacs)

• due to a too much restrictive (preventing warning) test, when no category was selected, it didn't show random pictures from sub-categories

File:

• branches/release-1_3/category.php (modified) (6 diffs)

branches/release-1_3/category.php

@@ -24 +24 @@
 include_once( './include/init.inc.php' );
 //---------------------------------------------------------------------- logout
-if ( isset( $_GET['act'] ) && $_GET['act'] == 'logout' && isset( $_COOKIE['id'] ) )
+if ( isset( $_GET['act'] )
+     and $_GET['act'] == 'logout'
+     and isset( $_COOKIE['id'] ) )
 {
   // cookie deletion if exists
@@ -35 +37 @@
 }
 //-------------------------------------------------- access authorization check
-if ( isset( $_GET['cat'] )) 
-        check_cat_id( $_GET['cat'] );
+if ( isset( $_GET['cat'] ) ) check_cat_id( $_GET['cat'] );
 check_login_authorization();
-if ( isset( $page['cat'] ) && is_numeric( $page['cat'] ) )
+if ( isset( $page['cat'] ) and is_numeric( $page['cat'] ) )
 {
   check_restrictions( $page['cat'] );
@@ -78 +79 @@
 // The $page['expand'] equals 'all' and
 // $page['tab_expand'] contains all the authorized cat ids
-if ( $user['expand'] || (isset($_GET['expand']) && $_GET['expand'] == 'all' ))
+if ( $user['expand']
+     or ( isset( $_GET['expand'] ) and $_GET['expand'] == 'all' ) )
 {
   $page['tab_expand'] = array();
@@ -87 +89 @@
 // We have to find the right $page['start'] that show the num picture
 // in this category
-if ( isset($_GET['num']) && is_numeric( $_GET['num'] ) && $_GET['num'] >= 0 )
+if ( isset( $_GET['num'] )
+     and is_numeric( $_GET['num'] )
+     and $_GET['num'] >= 0 )
 {
   $page['start'] = floor( $_GET['num'] / $user['nb_image_page'] );
@@ -358 +362 @@
 
   $subcats=array();
-  if (isset ($page['cat'] ))
-        $subcats = get_non_empty_subcat_ids( $page['cat'] );
+  if (isset($page['cat'])) $subcats = get_non_empty_subcat_ids( $page['cat'] );
+  else                     $subcats = get_non_empty_subcat_ids( '' );
   $cell_number = 1;
   $i = 0;
@@ -463 +467 @@
                   get_cat_display_name( $page['cat_name'], ' - ',
                                         'font-style:italic;' ) );
-        // upload a picture in the category
-        if ( $page['cat_site_id'] == 1
-       and $conf['upload_available']
-       and $page['cat_uploadable'] )
-        {
-        $vtp->addSession( $handle, 'upload' );
-            $url = './upload.php?cat='.$page['cat'].'&expand='.$page['expand'];
-        $vtp->setVar( $handle, 'upload.url', add_session_id( $url ) );
-            $vtp->closeSession( $handle, 'upload' );
-        }
+    // upload a picture in the category
+    if ( $page['cat_site_id'] == 1
+         and $conf['upload_available']
+         and $page['cat_uploadable'] )
+    {
+      $vtp->addSession( $handle, 'upload' );
+      $url = './upload.php?cat='.$page['cat'].'&expand='.$page['expand'];
+      $vtp->setVar( $handle, 'upload.url', add_session_id( $url ) );
+      $vtp->closeSession( $handle, 'upload' );
+    }
   }
   else