Changeset 345

Timestamp:

Feb 2, 2004, 1:55:18 AM (20 years ago)

Author:

gweltas

Message:

Merge of the 1.3.1 release
Creation of an unique include file (common.php)
Creation of an unique define file (include/constants.php)
Modification of the installation procedure

Location:

trunk

Files:

• about.php (modified) (2 diffs)
• admin.php (modified) (2 diffs)
• admin/cat_list.php (modified) (13 diffs)
• admin/cat_modify.php (modified) (5 diffs)
• admin/cat_perm.php (modified) (3 diffs)
• admin/comments.php (modified) (3 diffs)
• admin/configuration.php (modified) (4 diffs)
• admin/create_listing_file.php (modified) (6 diffs)
• admin/group_list.php (modified) (1 diff)
• admin/group_perm.php (modified) (1 diff)
• admin/include/functions.php (modified) (14 diffs)
• admin/include/isadmin.inc.php (modified) (1 diff)
• admin/infos_images.php (modified) (10 diffs)
• admin/phpwebgallery_structure.sql (modified) (5 diffs)
• admin/picture_modify.php (modified) (10 diffs)
• admin/stats.php (modified) (3 diffs)
• admin/thumbnail.php (modified) (3 diffs)
• admin/update.php (modified) (13 diffs)
• admin/user_list.php (modified) (4 diffs)
• admin/user_modify.php (modified) (5 diffs)
• admin/user_perm.php (modified) (2 diffs)
• admin/waiting.php (modified) (1 diff)
• category.php (modified) (22 diffs)
• comments.php (modified) (4 diffs)
• common.php (added)
• config.php (added)
• identification.php (modified) (5 diffs)
• include/config.inc.php (modified) (4 diffs)
• include/constant.php (deleted)
• include/constants.php (added)
• include/functions.inc.php (modified) (6 diffs)
• include/functions_category.inc.php (modified) (29 diffs)
• include/functions_group.inc.php (modified) (1 diff)
• include/functions_user.inc.php (modified) (7 diffs)
• include/functions_xml.inc.php (modified) (1 diff)
• include/init.inc.php (deleted)
• include/page_header.php (added)
• include/page_tail.php (added)
• include/user.inc.php (modified) (6 diffs)
• include/vtemplate.class.php (modified) (1 diff)
• index.php (modified) (1 diff)
• install.php (modified) (12 diffs)
• language/catala.php (added)
• language/deutsch.php (added)
• language/english.php (modified) (3 diffs)
• language/francais.php (modified) (4 diffs)
• language/japanese.php (added)
• language/magyar.php (added)
• language/norsk.php (added)
• language/spanish.php (added)
• language/svenska.php (added)
• picture.php (modified) (29 diffs)
• profile.php (modified) (9 diffs)
• register.php (modified) (5 diffs)
• search.php (modified) (6 diffs)
• template/default/about.vtp (modified) (2 diffs)
• template/default/admin/cat_list.vtp (modified) (2 diffs)
• template/default/admin/cat_modify.vtp (modified) (1 diff)
• template/default/admin/comments.vtp (modified) (1 diff)
• template/default/admin/configuration.vtp (modified) (1 diff)
• template/default/admin/infos_image.vtp (modified) (3 diffs)
• template/default/admin/picture_modify.vtp (modified) (1 diff)
• template/default/admin/stats.vtp (modified) (1 diff)
• template/default/category.vtp (modified) (5 diffs)
• template/default/comments.vtp (modified) (5 diffs)
• template/default/default-admin.css (added)
• template/default/default.css (added)
• template/default/footer.vtp (added)
• template/default/header.vtp (added)
• template/default/htmlfunctions.inc.php (modified) (5 diffs)
• template/default/identification.vtp (modified) (2 diffs)
• template/default/picture.vtp (modified) (3 diffs)
• template/default/profile.vtp (modified) (2 diffs)
• template/default/register.vtp (modified) (2 diffs)
• template/default/search.vtp (modified) (2 diffs)
• template/default/style.inc.php (deleted)
• template/default/theme/conf.php (deleted)
• template/default/upload.vtp (modified) (2 diffs)
• upload.php (modified) (10 diffs)

trunk/about.php

@@ -18 +18 @@
  ***************************************************************************/
 
-//----------------------------------------------------------- personnal include
-include_once( './include/init.inc.php' );
+//----------------------------------------------------------- include
+$phpwg_root_path = './';
+include_once( $phpwg_root_path.'common.php' );
 //----------------------------------------------------- template initialization
-$vtp = new VTemplate;
+//
+// Start output of page
+//
+$title= $lang['about_page_title'];
+include('include/page_header.php');
+
 $handle = $vtp->Open( './template/'.$user['template'].'/about.vtp' );
 initialize_template();
 
-$tpl = array('about_page_title','about_title','about_message','about_return');
+$tpl = array('about_title','about_message','about_return');
 templatize_array( $tpl, 'lang', $handle );
 $vtp->setVar( $handle, 'user_template', $user['template'] );
@@ -34 +40 @@
 $code = $vtp->Display( $handle, 0 );
 echo $code;
+include('include/page_tail.php');
 ?>

trunk/admin.php

@@ -18 +18 @@
  ***************************************************************************/
 
-//----------------------------------------------------------- personnal include
+//----------------------------------------------------------- include
+$phpwg_root_path = './';
+include_once( $phpwg_root_path.'common.php' );
 include_once( './admin/include/isadmin.inc.php' );
 //----------------------------------------------------- template initialization
@@ -35 +37 @@
 $page_valide = false;
 $title = '';
+if (isset( $_GET['page'] ))
 switch ( $_GET['page'] )
 {

trunk/admin/cat_list.php

@@ -19 +19 @@
  ***************************************************************************/
 include_once( './admin/include/isadmin.inc.php' );
+
 //----------------------------------------------------- template initialization
 $sub = $vtp->Open( './template/'.$user['template'].'/admin/cat_list.vtp' );
 $tpl = array( 'cat_edit','cat_up','cat_down','cat_image_info',
               'cat_permission','cat_update','cat_add','cat_parent','submit',
-              'cat_virtual','delete','cat_first','cat_last' );
+              'cat_virtual','delete','cat_first','cat_last','errors_title' );
 templatize_array( $tpl, 'lang', $sub );
 $vtp->setGlobalVar( $sub, 'user_template', $user['template'] );
@@ -30 +31 @@
 if ( isset( $_POST['submit'] ) )
 {
-  if ( !preg_match( '/^\s*$/', $_POST['virtual_name'] ) )
+  // is the given category name only containing blank spaces ?
+  if ( preg_match( '/^\s*$/', $_POST['virtual_name'] ) )
+    array_push( $errors, $lang['cat_error_name'] );
+  // does the uppercat id exists in the database ?
+  if ( $_POST['associate'] == '' )
+  {
+    $_POST['associate'] = -1;
+  }
+  else if ( !is_numeric( $_POST['associate'] ) )
+  {
+    array_push( $errors, $lang['cat_unknown_id'] );
+  }
+  else
+  {
+    $query = 'SELECT id';
+    $query.= ' FROM '.PREFIX_TABLE.'categories';
+    $query.= ' WHERE id = '.$_POST['associate'];
+    $query.= ';';
+    if ( mysql_num_rows( mysql_query( $query ) ) == 0 )
+      array_push( $errors, $lang['cat_unknown_id'] );
+  }
+  
+  if ( count( $errors ) == 0 )
   {
     // we have then to add the virtual category
@@ -42 +65 @@
     $query.= ';';
     mysql_query( $query );
-  }
-  else
-  {
-    array_push( $errors, $lang['cat_error_name'] );
+    synchronize_all_users();
   }
 }
@@ -172 +192 @@
 {
   delete_category( $_GET['delete'] );
+  synchronize_all_users();
 }
 //------------------------------------------------------------------ reordering
@@ -234 +255 @@
   $result = mysql_query( $query );
   $row    = mysql_fetch_array( $result );
+  if ( !isset( $row['min'] ) ) $row['min'] = 0;
+  if ( !isset( $row['max'] ) ) $row['max'] = 0;
   $min_rank = $row['min'];
   $max_rank = $row['max'];
@@ -259 +282 @@
   {
     $subcat_visible = true;
+    if ( !isset( $row['dir'] ) ) $row['dir'] = '';
 
     $vtp->addSession( $sub, 'cat' );
+    // is the category expanded or not ?
+    if ( isset($page['expand']) && $page['expand'] == 'all' )
+    {
+      $vtp->addSession( $sub, 'bullet_wo_link' );
+      $vtp->closeSession( $sub, 'bullet_wo_link' );
+    }
+    else if ( isset($page['tab_expand']) && in_array( $row['id'], $page['tab_expand'] ) )
+    {
+      $vtp->addSession( $sub, 'bullet_expanded' );
+      $tab_expand = array_diff( $page['tab_expand'], array( $row['id'] ) );
+      $expand = implode( ',', $tab_expand );
+      $url = './admin.php?page=cat_list&expand='.$expand;
+      $vtp->setVar( $sub, 'bullet_expanded.link', add_session_id( $url ) );
+      $vtp->closeSession( $sub, 'bullet_expanded' );
+    }
+    else
+    {
+      $vtp->addSession( $sub, 'bullet_collapsed' );
+      $tab_expand = array_merge( $page['tab_expand'], array( $row['id'] ) );
+      $expand = implode( ',', $tab_expand );
+      $url = './admin.php?page=cat_list&expand='.$expand;
+      $vtp->setVar( $sub, 'bullet_collapsed.link', add_session_id( $url ) );
+      $vtp->closeSession( $sub, 'bullet_collapsed' );
+    }
+    
     $vtp->setVar( $sub, 'cat.td', $td );
     $vtp->setVar( $sub, 'cat.class', $class );
     $vtp->setVar( $sub, 'cat.indent', $indent );
     $vtp->setVar( $sub, 'cat.name', $row['name'] );
-    $vtp->setVar( $sub, 'cat.id', $row['id'] );
+
     if ( $row['dir'] != '' )
     {
@@ -281 +330 @@
       // category can be deleted
       $vtp->addSession( $sub, 'delete' );
-      $url = './admin.php?page=cat_list&delete='.$row['id'];
+      $url = './admin.php?page=cat_list&expand='.$page['expand'];
+      $url.= '&delete='.$row['id'];
       $vtp->setVar( $sub, 'delete.delete_url', add_session_id( $url ) );
       $vtp->closeSession( $sub, 'delete' );
@@ -300 +350 @@
     {
       $vtp->addSession( $sub, 'up' );
-      $vtp->setVar( $sub, 'up.id', $row['id'] );
-      $url = add_session_id( './admin.php?page=cat_list&up='.$row['id'] );
-      $vtp->setVar( $sub, 'up.up_url', $url );
+      $url = './admin.php?page=cat_list&expand='.$page['expand'];
+      $url.= '&up='.$row['id'];
+      $vtp->setVar( $sub, 'up.up_url', add_session_id( $url ) );
       $vtp->closeSession( $sub, 'up' );
     }
@@ -308 +358 @@
     {
       $vtp->addSession( $sub, 'no_up' );
-      $vtp->setVar( $sub, 'no_up.id', $row['id'] );
-      $url = add_session_id( './admin.php?page=cat_list&last='.$row['id']);
-      $vtp->setVar( $sub, 'no_up.last_url', $url );
+      $url = './admin.php?page=cat_list&expand='.$page['expand'];
+      $url.= '&last='.$row['id'];
+      $vtp->setVar( $sub, 'no_up.last_url', add_session_id( $url ) );
       $vtp->closeSession( $sub, 'no_up' );
     }
@@ -316 +366 @@
     {
       $vtp->addSession( $sub, 'down' );
-      $vtp->setVar( $sub, 'down.id', $row['id'] );
-      $url = add_session_id( './admin.php?page=cat_list&down='.$row['id']);
-      $vtp->setVar( $sub, 'down.down_url', $url );
+      $url = './admin.php?page=cat_list&expand='.$page['expand'];
+      $url.= '&down='.$row['id'];
+      $vtp->setVar( $sub, 'down.down_url', add_session_id( $url ) );
       $vtp->closeSession( $sub, 'down' );
     }
@@ -324 +374 @@
     {
       $vtp->addSession( $sub, 'no_down' );
-      $vtp->setVar( $sub, 'no_down.id', $row['id'] );
-      $url = add_session_id('./admin.php?page=cat_list&first='.$row['id']);
-      $vtp->setVar( $sub, 'no_down.first_url', $url );
+      $url = './admin.php?page=cat_list&expand='.$page['expand'];
+      $url.= '&first='.$row['id'];
+      $vtp->setVar( $sub, 'no_down.first_url', add_session_id( $url ) );
       $vtp->closeSession( $sub, 'no_down' );
     }
@@ -332 +382 @@
     {
       $vtp->addSession( $sub, 'image_info' );
-      $url = add_session_id( './admin.php?page=infos_images&cat_id='
-                             .$row['id'] );
-      $vtp->setVar( $sub, 'image_info.image_info_url', $url );
+      $url = './admin.php?page=infos_images&cat_id='.$row['id'];
+      $vtp->setVar( $sub, 'image_info.image_info_url', add_session_id($url) );
       $vtp->closeSession( $sub, 'image_info' );
     }
@@ -372 +421 @@
     $vtp->closeSession( $sub, 'cat' );
 
-    display_cat_manager( $row['id'], $indent.str_repeat( '&nbsp', 4 ),
-                         $subcat_visible, $level + 1 );
+    if ( in_array( $row['id'], $page['tab_expand'] )
+         or $page['expand'] == 'all')
+      display_cat_manager( $row['id'], $indent.str_repeat( '&nbsp', 4 ),
+                           $subcat_visible, $level + 1 );
   }
 }
 display_cat_manager( 'NULL', str_repeat( '&nbsp', 4 ), true, 0 );
 // add a virtual category ?
-$vtp->addSession( $sub, 'associate_cat' );
-$vtp->setVar( $sub, 'associate_cat.value', '-1' );
-$vtp->setVar( $sub, 'associate_cat.content', '' );
-$vtp->closeSession( $sub, 'associate_cat' );
-$page['plain_structure'] = get_plain_structure();
-$structure = create_structure( '', array() );
-display_categories( $structure, ' ' );
+// We only show a List Of Values if the number of categories is less than
+// $conf['max_LOV_categories']
+$query = 'SELECT COUNT(id) AS nb_total_categories';
+$query.= ' FROM '.PREFIX_TABLE.'categories';
+$query.= ';';
+$row = mysql_fetch_array( mysql_query( $query ) );
+if ( $row['nb_total_categories'] < $conf['max_LOV_categories'] )
+{
+  $vtp->addSession( $sub, 'associate_LOV' );
+  $vtp->addSession( $sub, 'associate_cat' );
+  $vtp->setVar( $sub, 'associate_cat.value', '-1' );
+  $vtp->setVar( $sub, 'associate_cat.content', '' );
+  $vtp->closeSession( $sub, 'associate_cat' );
+  $page['plain_structure'] = get_plain_structure( true );
+  $structure = create_structure( '', array() );
+  display_categories( $structure, '&nbsp;' );
+  $vtp->closeSession( $sub, 'associate_LOV' );
+}
+// else, we only display a small text field, we suppose the administrator
+// knows the id of its category
+else
+{
+  $vtp->addSession( $sub, 'associate_text' );
+  $vtp->closeSession( $sub, 'associate_text' );
+}
 //----------------------------------------------------------- sending html code
 $vtp->Parse( $handle , 'sub', $sub );

trunk/admin/cat_modify.php

@@ -41 +41 @@
   $query.= ';';
   $row = mysql_fetch_array( mysql_query( $query ) );
+  
+  $query = 'UPDATE '.PREFIX_TABLE.'categories';
+
+  $query.= ' SET name = ';
+  if ( $_POST['name'] == '' )
+    $query.= 'NULL';
+  else
+    $query.= "'".htmlentities( $_POST['name'], ENT_QUOTES)."'";
+
+  $query.= ', comment = ';
+  if ( $_POST['comment'] == '' )
+    $query.= 'NULL';
+  else
+    $query.= "'".htmlentities( $_POST['comment'], ENT_QUOTES )."'";
+
+  $query.= ", status = '".$_POST['status']."'";
+  $query.= ", visible = '".$_POST['visible']."'";
+
+  if ( isset( $_POST['uploadable'] ) )
+    $query.= ", uploadable = '".$_POST['uploadable']."'";
+
+  if ( isset( $_POST['associate'] ) )
+  {
+    $query.= ', id_uppercat = ';
+    if ( $_POST['associate'] == -1 or $_POST['associate'] == '' )
+      $query.= 'NULL';
+    else
+      $query.= $_POST['associate'];
+  }
+  $query.= ' WHERE id = '.$_GET['cat'];
+  $query.= ';';
+  mysql_query( $query );
 
   if ( $_POST['status'] != $row['status'] )
@@ -54 +86 @@
     $query.= ' WHERE cat_id = '.$_GET['cat'];
     mysql_query( $query );
-  }
-  
-  $query = 'UPDATE '.PREFIX_TABLE.'categories';
-
-  $query.= ' SET name = ';
-  if ( $_POST['name'] == '' )
-    $query.= 'NULL';
-  else
-    $query.= "'".htmlentities( $_POST['name'], ENT_QUOTES)."'";
-
-  $query.= ', comment = ';
-  if ( $_POST['comment'] == '' )
-    $query.= 'NULL';
-  else
-    $query.= "'".htmlentities( $_POST['comment'], ENT_QUOTES )."'";
-
-  $query.= ", status = '".$_POST['status']."'";
-  $query.= ", visible = '".$_POST['visible']."'";
-
-  if ( isset( $_POST['uploadable'] ) )
-    $query.= ", uploadable = '".$_POST['uploadable']."'";
-
-  if ( isset( $_POST['associate'] ) )
-  {
-    $query.= ', id_uppercat = ';
-    if ( $_POST['associate'] == -1 ) $query.= 'NULL';
-    else                             $query.= $_POST['associate'];
-  }
-  $query.= ' WHERE id = '.$_GET['cat'];
-  $query.= ';';
-  mysql_query( $query );
+    // resynchronize all users
+    synchronize_all_users();
+  }
 
   // checking users favorites
@@ -112 +116 @@
 $query.= ';';
 $row = mysql_fetch_array( mysql_query( $query ) );
+
+if ( !isset( $row['dir'] ) ) $row['dir'] = '';
+if ( !isset( $row['id_uppercat'] ) ) $row['id_uppercat'] = '';
+
 $result = get_cat_info( $row['id'] );
 // cat name
@@ -136 +144 @@
 }
 $vtp->setVar( $sub, 'name',    $row['name'] );
+if ( !isset( $row['comment'] ) ) $row['comment'] = '';
 $vtp->setVar( $sub, 'comment', $row['comment'] );
 // status : public, private...
@@ -204 +213 @@
 {
   $vtp->addSession( $sub, 'parent' );
-  $vtp->addSession( $sub, 'associate_cat' );
-  $vtp->setVar( $sub, 'associate_cat.value', '-1' );
-  $vtp->setVar( $sub, 'associate_cat.content', '' );
-  $vtp->closeSession( $sub, 'associate_cat' );
-  $structure = create_structure( '', array() );
-  display_categories( $structure, ' ', $row['id_uppercat'], $row['id'] );
+  // We only show a List Of Values if the number of categories is less than
+  // $conf['max_LOV_categories']
+  $query = 'SELECT COUNT(id) AS nb_total_categories';
+  $query.= ' FROM '.PREFIX_TABLE.'categories';
+  $query.= ';';
+  $countrow = mysql_fetch_array( mysql_query( $query ) );
+  if ( $countrow['nb_total_categories'] < $conf['max_LOV_categories'] )
+  {
+    $vtp->addSession( $sub, 'associate_LOV' );
+    $vtp->addSession( $sub, 'associate_cat' );
+    $vtp->setVar( $sub, 'associate_cat.value', '-1' );
+    $vtp->setVar( $sub, 'associate_cat.content', '' );
+    $vtp->closeSession( $sub, 'associate_cat' );
+    $page['plain_structure'] = get_plain_structure( true );
+    $structure = create_structure( '', array() );
+    display_categories( $structure, '&nbsp;', $row['id_uppercat'],$row['id'] );
+    $vtp->closeSession( $sub, 'associate_LOV' );
+  }
+  // else, we only display a small text field, we suppose the administrator
+  // knows the id of its category
+  else
+  {
+    $vtp->addSession( $sub, 'associate_text' );
+    $vtp->setVar( $sub, 'associate_text.value', $row['id_uppercat'] );
+    $vtp->closeSession( $sub, 'associate_text' );
+  }
   $vtp->closeSession( $sub, 'parent' );
 }

trunk/admin/cat_perm.php

@@ -84 +84 @@
     check_favorites( $row['id'] );
   }
+  // resynchronize all users
+  synchronize_all_users();
 }
 //---------------------------------------------------------------------- groups
@@ -150 +152 @@
   // for color of user : (red means access forbidden, green authorized) we
   // ask all forbidden categories, including the groups rights
-  $restrictions = get_restrictions( $row['id'], $row['status'], false );
+  $restrictions = get_user_restrictions( $row['id'], $row['status'], false );
   $is_user_allowed = is_user_allowed( $page['cat'], $restrictions );
   if ( $is_user_allowed == 0 )
@@ -162 +164 @@
   // for permission update button, we only ask forbidden categories for the
   // user, not taking into account the groups the user belongs to
-  $restrictions = get_restrictions( $row['id'], $row['status'], false, false );
+  $restrictions = get_user_restrictions($row['id'],$row['status'],false,false);
   $is_user_allowed = is_user_allowed( $page['cat'], $restrictions );
   if ( $is_user_allowed == 2 )

trunk/admin/comments.php

@@ -37 +37 @@
     $subrow = mysql_fetch_array( $subresult );
 
-    if ( $array_cat_directories[$subrow['cat_id']] == '' )
+    if ( !isset( $array_cat_directories[$subrow['cat_id']] ) )
     {
       $array_cat_directories[$subrow['cat_id']] =
@@ -50 +50 @@
     // name of the picture
     $name = $array_cat_names[$subrow['cat_id']].' > ';
-    if ( $subrow['name'] != '' )
+    if ( isset( $subrow['name'] ) and $subrow['name'] != '' )
     {
       $name.= $subrow['name'];
@@ -160 +160 @@
 $vtp->setGlobalVar( $sub, 'user_template', $user['template'] );
 //--------------------------------------------------- number of days to display
-if ( isset( $_GET['last_days'] ) ) define( "MAX_DAYS", $_GET['last_days'] );
-else                               define( "MAX_DAYS", 0 );
+if ( isset( $_GET['last_days'] ) ) define( 'MAX_DAYS', $_GET['last_days'] );
+else                               define( 'MAX_DAYS', 0 );
 //----------------------------------------- non specific section initialization
 $array_cat_directories = array();

trunk/admin/configuration.php

@@ -61 +61 @@
   }
   // deletion of site as asked
+  $site_deleted = false;
   $query = 'SELECT id';
   $query.= ' FROM '.PREFIX_TABLE.'sites';
@@ -71 +72 @@
     {
       delete_site( $row['id'] );
-      // if any picture of this site were linked to another categories, we
-      // have to update the informations of those categories. To make it
-      // simple, we just update all the categories
-      update_category( 'all' );
+      $site_deleted = true;
     }
+  }
+  // if any picture of this site were linked to another categories, we have
+  // to update the informations of those categories. To make it simple, we
+  // just update all the categories
+  if ( $site_deleted )
+  {
+    update_category( 'all' );
+    synchronize_all_users();
   }
   // thumbnail prefix must not contain accentuated characters
@@ -235 +241 @@
 {
 //--------------------------------------------------------- data initialization
-  $query  = 'SELECT';
-  foreach ( $conf_infos as $i => $conf_info ) {
-    if ( $i > 0 ) $query.= ',';
-    else          $query.= ' ';
-    $query.= $conf_info;
-  }
+  $query  = 'SELECT '.implode( ',', $conf_infos );
   $query .= ' FROM '.PREFIX_TABLE.'config;';
   $row = mysql_fetch_array( mysql_query( $query ) );
-  foreach ( $conf_infos as $conf_info ) {
-    $$conf_info = $row[$conf_info];
-  }
-
-  $query  = 'SELECT';
-  foreach ( $default_user_infos as $i => $default_user_info ) {
-    if ( $i > 0 ) $query.= ',';
-    else          $query.= ' ';
-    $query.= $default_user_info;
-  }
+  foreach ( $conf_infos as $info ) {
+    if ( isset( $row[$info] ) ) $$info = $row[$info];
+    else                        $$info = '';
+  }
+
+  $query  = 'SELECT '.implode( ',', $default_user_infos );
   $query.= ' FROM '.PREFIX_TABLE.'users';
   $query.= " WHERE username = 'guest'";
   $query.= ';';
   $row = mysql_fetch_array( mysql_query( $query ) );
-  foreach ( $default_user_infos as $default_user_info ) {
-    $$default_user_info = $row[$default_user_info];
+  foreach ( $default_user_infos as $info ) {
+    if ( isset( $row[$info] ) ) $$info = $row[$info];
+    else                        $$info = '';
   }
 }
@@ -654 +652 @@
 $vtp->setVar( $sub, 'select.name', 'template' );
 $option = get_dirs( './template/' );
+
 for ( $i = 0; $i < sizeof( $option ); $i++ )
 {

trunk/admin/create_listing_file.php

@@ -10 +10 @@
  ***************************************************************************/
 
-$prefix_thumbnail = 'TN-';
-        
+$conf['prefix_thumbnail'] = 'TN-';
 $conf['picture_ext'] = array ( 'jpg', 'gif', 'png', 'JPG', 'GIF', 'PNG' );
 
@@ -21 +20 @@
 
 $listing.= '<url>'.$url.'</url>';
-        
+
+/**
+ * returns an array with all picture files according to $conf['picture_ext']
+ *
+ * @param string $dir
+ * @return array
+ */
+function get_picture_files( $dir )
+{
+  global $conf;
+
+  $pictures = array();
+  if ( $opendir = opendir( $dir ) )
+  {
+    while ( $file = readdir( $opendir ) )
+    {
+      if ( in_array( get_extension( $file ), $conf['picture_ext'] ) )
+      {
+        array_push( $pictures, $file );
+      }
+    }
+  }
+  return $pictures;
+}
+
+/**
+ * returns an array with all thumbnails according to $conf['picture_ext']
+ * and $conf['prefix_thumbnail']
+ *
+ * @param string $dir
+ * @return array
+ */
+function get_thumb_files( $dir )
+{
+  global $conf;
+
+  $prefix_length = strlen( $conf['prefix_thumbnail'] );
+  
+  $thumbnails = array();
+  if ( $opendir = @opendir( $dir ) )
+  {
+    while ( $file = readdir( $opendir ) )
+    {
+      if ( in_array( get_extension( $file ), $conf['picture_ext'] )
+           and substr($file,0,$prefix_length) == $conf['prefix_thumbnail'] )
+      {
+        array_push( $thumbnails, $file );
+      }
+    }
+  }
+  return $thumbnails;
+}
+
 // get_dirs retourne un tableau contenant tous les sous-répertoires d'un
 // répertoire
-function get_dirs( $rep, $indent, $level )
+function get_dirs( $basedir, $indent, $level )
 {
-  $sub_rep = array();
-  $i = 0;
+  $fs_dirs = array();
   $dirs = "";
-  if ( $opendir = opendir ( $rep ) )
+
+  if ( $opendir = opendir( $basedir ) )
   {
-    while ( $file = readdir ( $opendir ) )
+    while ( $file = readdir( $opendir ) )
     {
-      if ( $file != "."
-           and $file != ".."
-           and is_dir ( $rep."/".$file )
-           and $file != "thumbnail" )
+      if ( $file != '.'
+           and $file != '..'
+           and is_dir ( $basedir.'/'.$file )
+           and $file != 'thumbnail' )
       {
-        $sub_rep[$i++] = $file;
+        array_push( $fs_dirs, $file );
         if ( !preg_match( '/^[a-zA-Z0-9-_.]+$/', $file ) )
         {
@@ -50 +101 @@
   }
   // write of the dirs
-  for ( $i = 0; $i < sizeof( $sub_rep ); $i++ )
-  {
-    $dirs.= "\n".$indent.'<dir'.$level.' name="'.$sub_rep[$i].'">';
-    $dirs.= get_pictures( $rep.'/'.$sub_rep[$i], $indent.'  ' );
-    $dirs.= get_dirs( $rep.'/'.$sub_rep[$i], $indent.'  ', $level + 1 );
+  foreach ( $fs_dirs as $fs_dir ) {
+    $dirs.= "\n".$indent.'<dir'.$level.' name="'.$fs_dir.'">';
+    $dirs.= get_pictures( $basedir.'/'.$fs_dir, $indent.'  ' );
+    $dirs.= get_dirs( $basedir.'/'.$fs_dir, $indent.'  ', $level + 1 );
     $dirs.= "\n".$indent.'</dir'.$level.'>';
   }
@@ -74 +124 @@
 }
 
-function is_image( $filename )
+function get_pictures( $dir, $indent )
 {
   global $conf;
+  
+  // fs means filesystem : $fs_pictures contains pictures in the filesystem
+  // found in $dir, $fs_thumbnails contains thumbnails...
+  $fs_pictures   = get_picture_files( $dir );
+  $fs_thumbnails = get_thumb_files( $dir.'/thumbnail' );
 
-  if ( !is_dir( $filename )
-       and in_array( get_extension( $filename ), $conf['picture_ext'] ) )
-  {
-    return true;
-  }
-  return false;
-}
+  $root = "\n".$indent.'<root>';
 
-function TN_exists( $dir, $file )
-{
-  global $conf, $prefix_thumbnail;
+  foreach ( $fs_pictures as $fs_picture ) {
+    $file_wo_ext = get_filename_wo_extension( $fs_picture );
+    $tn_ext = '';
+    foreach ( $conf['picture_ext'] as $ext ) {
+      $test = $conf['prefix_thumbnail'].$file_wo_ext.'.'.$ext;
+      if ( !in_array( $test, $fs_thumbnails ) ) continue;
+      else { $tn_ext = $ext; break; }
+    }
+    // if we found a thumnbnail corresponding to our picture...
+    if ( $tn_ext != '' )
+    {
+      list( $width,$height ) = @getimagesize( $dir.'/'.$fs_picture );
 
-  $titre = get_filename_wo_extension( $file );
-
-  for ( $i = 0; $i < sizeof ( $conf['picture_ext'] ); $i++ )
-  {
-    $base_tn_name = $dir.'/thumbnail/'.$prefix_thumbnail.$titre.'.';
-    $ext = $conf['picture_ext'][$i];
-    if ( is_file( $base_tn_name.$ext ) )
+      $root.= "\n".$indent.'  ';
+      $root.= '<picture';
+      $root.= ' file="'.    $fs_picture.'"';
+      $root.= ' tn_ext="'.  $tn_ext.'"';
+      $root.= ' filesize="'.floor(filesize($dir.'/'.$fs_picture)/1024).'"';
+      $root.= ' width="'.   $width.'"';
+      $root.= ' height="'.  $height.'"';
+      $root.= ' />';
+      
+      if ( !preg_match( '/^[a-zA-Z0-9-_.]+$/', $fs_picture ) )
+      {
+        echo '<span style="color:red;">"'.$fs_picture.'" : ';
+        echo 'The name of the picture should be composed of ';
+        echo 'letters, figures, "-", "_" or "." ONLY';
+        echo '</span><br />';
+      }
+    }
+    else
     {
-      return $ext;
+      echo 'The thumbnail is missing for '.$dir.'/'.$fs_picture;
+      echo '-> '.$dir.'/thumbnail/';
+      echo $conf['prefix_thumbnail'].$file_wo_ext.'.xxx';
+      echo ' ("xxx" can be : ';
+      echo implode( ', ', $conf['picture_ext'] );
+      echo ')<br />';
     }
   }
-  echo 'The thumbnail is missing for '.$dir.'/'.$file;
-  echo '-> '.$dir.'/thumbnail/'.$prefix_thumbnail.$titre.'.xxx';
-  echo ' ("xxx" can be : ';
-  for ( $i = 0; $i < sizeof ( $conf['picture_ext'] ); $i++ )
-  {
-    if ( $i > 0 )
-    {
-      echo ', ';
-    }
-    echo '"'.$conf['picture_ext'][$i].'"';
-  }
-  echo ')<br />';
-  return false;
-}
 
-function get_pictures( $rep, $indent )
-{
-  $pictures = array();          
+  $root.= "\n".$indent.'</root>';
 
-  $tn_ext = '';
-  $root = '';
-  if ( $opendir = opendir ( $rep ) )
-  {
-    while ( $file = readdir ( $opendir ) )
-    {
-      if ( is_image( $file ) and $tn_ext = TN_exists( $rep, $file ) )
-      {
-        $picture = array();
-
-        $picture['file']     = $file;
-        $picture['tn_ext']   = $tn_ext;
-        $picture['date']     = date('Y-m-d',filemtime( $rep.'/'.$file ) );
-        $picture['filesize'] = floor( filesize( $rep."/".$file ) / 1024 );
-        $image_size = @getimagesize( $rep."/".$file );
-        $picture['width']    = $image_size[0];
-        $picture['height']   = $image_size[1];
-
-        array_push( $pictures, $picture );
-
-        if ( !preg_match( '/^[a-zA-Z0-9-_.]+$/', $file ) )
-        {
-          echo '<span style="color:red;">"'.$file.'" : ';
-          echo 'The name of the picture should be composed of ';
-          echo 'letters, figures, "-", "_" or "." ONLY';
-          echo '</span><br />';
-        }
-      }
-    }
-  }
-  // write of the node <root> with all the pictures at the root of the
-  // directory
-  $root.= "\n".$indent."<root>";
-  if ( sizeof( $pictures ) > 0 )
-  {
-    for( $i = 0; $i < sizeof( $pictures ); $i++ )
-    {
-      $root.= "\n".$indent.'  ';
-      $root.= '<picture';
-      $root.= ' file="'.     $pictures[$i]['file'].     '"';
-      $root.= ' tn_ext="'.   $pictures[$i]['tn_ext'].   '"';
-      $root.= ' date="'.     $pictures[$i]['date'].     '"';
-      $root.= ' filesize="'. $pictures[$i]['filesize']. '"';
-      $root.= ' width="'.    $pictures[$i]['width'].    '"';
-      $root.= ' height="'.   $pictures[$i]['height'].   '"';
-      $root.= ' />';
-    }
-  }
-  $root.= "\n".$indent.'</root>';
   return $root;
 }
@@ -178 +187 @@
   fwrite( $fp, $listing );
   fclose( $fp );
+  echo "listing.xml created";
 }
 else
@@ -183 +193 @@
   echo "I can't write the file listing.xml";
 }
-
-echo "listing.xml created";
 ?>

trunk/admin/group_list.php

@@ -34 +34 @@
   $row = mysql_fetch_array( mysql_query( $query ) );
   // confirm group deletion ?
-  if ( $_GET['confirm'] != 1 )
+  if ( !isset( $_GET['confirm'] ) or $_GET['confirm'] != 1 )
   {
     $vtp->addSession( $sub, 'deletion' );

trunk/admin/group_perm.php

@@ -61 +61 @@
     check_favorites( $row['id'] );
   }
+  // synchronization of calculated data
+  synchronize_group( $_GET['group_id'] );
   // confirmation display
   $vtp->addSession( $sub, 'confirmation' );

trunk/admin/include/functions.php

@@ -54 +54 @@
   return false;
 }
-        
+
+/**
+ * returns an array with all picture files according to $conf['picture_ext']
+ *
+ * @param string $dir
+ * @return array
+ */
+function get_picture_files( $dir )
+{
+  global $conf;
+
+  $pictures = array();
+  if ( $opendir = opendir( $dir ) )
+  {
+    while ( $file = readdir( $opendir ) )
+    {
+      if ( in_array( get_extension( $file ), $conf['picture_ext'] ) )
+      {
+        array_push( $pictures, $file );
+      }
+    }
+  }
+  return $pictures;
+}
+
+/**
+ * returns an array with all thumbnails according to $conf['picture_ext']
+ * and $conf['prefix_thumbnail']
+ *
+ * @param string $dir
+ * @return array
+ */
+function get_thumb_files( $dir )
+{
+  global $conf;
+
+  $prefix_length = strlen( $conf['prefix_thumbnail'] );
+  
+  $thumbnails = array();
+  if ( $opendir = @opendir( $dir ) )
+  {
+    while ( $file = readdir( $opendir ) )
+    {
+      if ( in_array( get_extension( $file ), $conf['picture_ext'] )
+           and substr($file,0,$prefix_length) == $conf['prefix_thumbnail'] )
+      {
+        array_push( $thumbnails, $file );
+      }
+    }
+  }
+  return $thumbnails;
+}
+
 function TN_exists( $dir, $file )
 {
@@ -68 +120 @@
   }
   return false;
-}       
+}
         
+
 // The function delete_site deletes a site
 // and call the function delete_category for each primary category of the site
@@ -92 +145 @@
 }
         
+
 // The function delete_category deletes the category identified by the $id
 // It also deletes (in the database) :
@@ -145 +199 @@
 }
         
+
 // The function delete_image deletes the image identified by the $id
 // It also deletes (in the database) :
@@ -179 +234 @@
   $count_deleted++;
 }
-        
+
 // The delete_user function delete a user identified by the $user_id
 // It also deletes :
@@ -186 +241 @@
 //     - all the favorites linked to this user
 //     - all sessions linked to this user
+//     - all categories informations linked to this user
 function delete_user( $user_id )
 {
@@ -211 +267 @@
   $query.= ';';
   mysql_query( $query );
-                
+
+  // destruction of the categories informations linked with the user
+  $query = 'DELETE FROM '.PREFIX_TABLE.'user_category';
+  $query.= ' WHERE user_id = '.$user_id;
+  $query.= ';';
+  mysql_query( $query );
+
   // destruction of the user
   $query = 'DELETE FROM '.PREFIX_TABLE.'users';
@@ -231 +293 @@
   mysql_query( $query );
 
-  // destruction of the group links for this group
+  // synchronize all users linked to the group
+  synchronize_group( $group_id );
+
+  // destruction of the users links for this group
   $query = 'DELETE FROM '.PREFIX_TABLE.'user_group';
   $query.= ' WHERE group_id = '.$group_id;
@@ -249 +314 @@
 function check_favorites( $user_id )
 {
-  $query = 'SELECT status';
+  $query = 'SELECT status,forbidden_categories';
   $query.= ' FROM '.PREFIX_TABLE.'users';
   $query.= ' WHERE id = '.$user_id;
@@ -256 +321 @@
   $status = $row['status'];
   // retrieving all the restricted categories for this user
-  $restricted_cat = get_all_restrictions( $user_id, $status );
+  if ( isset( $row['forbidden_categories'] ) )
+    $restricted_cat = explode( ',', $row['forbidden_categories'] );
+  else
+    $restricted_cat = array();
   // retrieving all the favorites for this user and comparing their
   // categories to the restricted categories
@@ -315 +383 @@
     $query.= ' WHERE category_id = '.$id;
     $query.= ';';
-    $row = mysql_fetch_array( mysql_query( $query ) );
+    list( $nb_images ) = mysql_fetch_array( mysql_query( $query ) );
+    // updating the date_last
+    $query = 'SELECT MAX(date_available) AS date_available';
+    $query.= ' FROM '.PREFIX_TABLE.'images';
+    $query.= ' INNER JOIN '.PREFIX_TABLE.'image_category ON id = image_id';
+    $query.= ' WHERE category_id = '.$id;
+    $query.= ';';
+    list( $date_available ) = mysql_fetch_array( mysql_query( $query ) );
+    
     $query = 'UPDATE '.PREFIX_TABLE.'categories';
-    $query.= ' SET nb_images = '.$row['nb_images'];
+    $query.= " SET date_last = '".$date_available."'";
+    $query.= ', nb_images = '.$nb_images;
     $query.= ' WHERE id = '.$id;
     $query.= ';';
     mysql_query( $query );
-    // updating the date_last
-    $query = 'SELECT date_available';
-    $query.= ' FROM '.PREFIX_TABLE.'images';
-    $query.= ' LEFT JOIN '.PREFIX_TABLE.'image_category ON id = image_id';
-    $query.= ' WHERE category_id = '.$id;
-    $query.= ' ORDER BY date_available DESC';
-    $query.= ' LIMIT 0,1';
-    $query.= ';';
-    $row = mysql_fetch_array( mysql_query( $query ) );
-    $query = 'UPDATE '.PREFIX_TABLE.'categories';
-    $query.= " SET date_last = '".$row['date_available']."'";
-    $query.= ' WHERE id = '.$id;
-    $query.= ';';
-    mysql_query( $query );
+
     // updating the representative_picture_id : if the representative
     // picture of the category is not any more linked to the category, we
@@ -344 +408 @@
     // if the category has no representative picture (ie
     // representative_picture_id == NULL) we don't update anything
-    if ( $row['representative_picture_id'] != '' )
+    if ( isset( $row['representative_picture_id'] ) )
     {
       $query = 'SELECT image_id';
@@ -367 +431 @@
 {
   // date arrives at this format : DD/MM/YYYY
-  list($day,$month,$year) = explode( '/', $date );
+  @list($day,$month,$year) = explode( '/', $date );
   return @checkdate( $month, $day, $year );
 }
@@ -433 +497 @@
   }
 }
+
+/**
+ * Complete plain structure of the gallery
+ *
+ * Returns the plain structure (one level array) of the gallery. In the
+ * returned array, each element is an array with jeys 'id' and
+ * 'id_uppercat'. The function also fills the array $page['subcats'] which
+ * associate (category_id => array of sub-categories id).
+ *
+ * @param bool $use_name
+ * @return array
+ */
+function get_plain_structure( $use_name = false )
+{
+  global $page;
+
+  $plain_structure = array();
+
+  $query = 'SELECT id,id_uppercat';
+  if ( $use_name ) $query.= ',name';
+  $query.= ' FROM '.PREFIX_TABLE.'categories';
+  $query.= ' ORDER BY id_uppercat ASC, rank ASC';
+  $query.= ';';
+
+  $subcats = array();
+  $id_uppercat = 'NULL';
+
+  $result = mysql_query( $query );
+  while ( $row = mysql_fetch_array( $result ) )
+  {
+    $plain_structure[$row['id']]['id'] = $row['id'];
+    if ( !isset( $row['id_uppercat'] ) ) $row['id_uppercat'] = 'NULL';
+    $plain_structure[$row['id']]['id_uppercat'] = $row['id_uppercat'];
+    if ( $use_name ) $plain_structure[$row['id']]['name'] = $row['name'];
+    // subcats list
+    if ( $row['id_uppercat'] != $id_uppercat )
+    {
+      $page['subcats'][$id_uppercat] = $subcats;
+
+      $subcats = array();
+      $id_uppercat = $row['id_uppercat'];
+    }
+    array_push( $subcats, $row['id'] );
+  }
+  mysql_free_result( $result );
+  
+  $page['subcats'][$id_uppercat] = $subcats;
+
+  return $plain_structure;
+}
+
+/**
+ * get N levels array representing structure under the given category
+ *
+ * create_structure returns the N levels array representing structure under
+ * the given gategory id. It also updates the
+ * $page['plain_structure'][id]['all_subcats_id'] and
+ * $page['plain_structure'][id]['direct_subcats_ids'] for each sub category.
+ *
+ * @param int $id_uppercat
+ * @return array
+ */
+function create_structure( $id_uppercat )
+{
+  global $page;
+
+  $structure = array();
+  $ids = get_subcats_ids( $id_uppercat );
+  foreach ( $ids as $id ) {
+    $category = $page['plain_structure'][$id];
+
+    $category['subcats'] = create_structure( $id );
+
+    $page['plain_structure'][$id]['all_subcats_ids'] =
+      get_all_subcats_ids( $id );
+
+    $page['plain_structure'][$id]['direct_subcats_ids'] =
+      get_subcats_ids( $id );
+
+    array_push( $structure, $category );
+  }
+  return $structure;
+}
+
+/**
+ * returns direct sub-categories ids
+ *
+ * Returns an array containing all the direct sub-categories ids of the
+ * given category. It uses the $page['subcats'] global array.
+ *
+ * @param int $id_uppercat
+ * @return array
+ */
+function get_subcats_ids( $id_uppercat )
+{
+  global $page;
+
+  if ( $id_uppercat == '' ) $id_uppercat = 'NULL';
+
+  if ( isset( $page['subcats'][$id_uppercat] ) )
+    return $page['subcats'][$id_uppercat];
+  else
+    return array();
+}
+
+/**
+ * returns all sub-categories ids, not only direct ones
+ *
+ * Returns an array containing all the sub-categories ids of the given
+ * category, not only direct ones. This function is recursive.
+ *
+ * @param int $category_id
+ * @return array
+ */
+function get_all_subcats_ids( $category_id )
+{
+  $ids = array();
+  
+  $subcats = get_subcats_ids( $category_id );
+  $ids = array_merge( $ids, $subcats );
+  foreach ( $subcats as $subcat ) {
+    // recursive call
+    $sub_subcats = get_all_subcats_ids( $subcat );
+    $ids = array_merge( $ids, $sub_subcats );
+  }
+  return array_unique( $ids );
+}
+
+/**
+ * prepares the query to update the table user_category
+ *
+ * Prepares the query (global variable $values) to update table
+ * user_category : for a couple (user,category) the number of sub-categories
+ * and the last date of the category (all sub-categories taken into
+ * account). It also calls function update_uppercats for each category. The
+ * function is recursive.
+ *
+ * @param array $categories
+ * @return void
+ */
+function update_user_category( $categories )
+{
+  global $page,$user_restrictions,$value_num,$values;
+
+  foreach ( $categories as $category ) {
+    // recursive call
+    update_user_category( $category['subcats'] );
+    // 1. update the table user_category
+    foreach ( $user_restrictions as $user_id => $restrictions ) {
+      // if the category is forbidden to this user, go to next user
+      if ( in_array( $category['id'], $restrictions ) ) continue;
+
+      // how many sub_categories for this user ?
+      $user_subcats = array_diff(
+        $page['plain_structure'][$category['id']]['direct_subcats_ids'],
+        $restrictions );
+      $user_nb_subcats = count( array_unique( $user_subcats ) );
+      // last date of the category
+      $user_all_subcats = array_unique( array_diff(
+        $page['plain_structure'][$category['id']]['all_subcats_ids'],
+        $restrictions ) );
+            
+      $query = 'SELECT MAX(date_last) AS last_date';
+      $query.= ' FROM '.PREFIX_TABLE.'categories';
+      $query.= ' WHERE id IN ('.$category['id'];
+      if ( count( $user_all_subcats ) > 0 )
+        $query.= ','.implode( ',', $user_all_subcats );
+      $query.= ')';
+      $query.= ';';
+      $row = mysql_fetch_array( mysql_query( $query ) );
+
+      // insert a new line in database
+      if ( $value_num++ > 0 ) $values.= ', ';
+      else                    $values.= ' ';
+      $values.= '('.$user_id.",".$category['id'];
+      if ( isset( $row['last_date'] ) ) $values.= ",'".$row['last_date']."'";
+      else                              $values.= ',NULL';
+      $values.= ','.$user_nb_subcats.')';
+    }
+    update_uppercats( $category['id'] );
+  }
+}
+
+/**
+ * updates the column categories.uppercats
+ *
+ * @param int $category_id
+ * @return void
+ */
+function update_uppercats( $category_id )
+{
+  global $page;
+
+  $final_id = $category_id;
+  $uppercats = array();
+
+  array_push( $uppercats, $category_id );
+  $uppercat = $page['plain_structure'][$category_id]['id_uppercat'];
+
+  while ( $uppercat != 'NULL' )
+  {
+    array_push( $uppercats, $uppercat );
+    $category_id = $page['plain_structure'][$category_id]['id_uppercat'];
+    $uppercat = $page['plain_structure'][$category_id]['id_uppercat'];
+  }
+
+  $string_uppercats = implode( ',', array_reverse( $uppercats ) );
+  $query = 'UPDATE '.PREFIX_TABLE.'categories';
+  $query.= ' SET uppercats = '."'".$string_uppercats."'";
+  $query.= ' WHERE id = '.$final_id;
+  $query.= ';';
+  mysql_query( $query );
+}
+
+/**
+ * returns an array with the ids of the restricted categories for the user
+ *
+ * Returns an array with the ids of the restricted categories for the
+ * user. If the $check_invisible parameter is set to true, invisible
+ * categorie are added to the restricted one in the array.
+ *
+ * @param int $user_id
+ * @param string $user_status
+ * @param bool $check_invisible
+ * @param bool $use_groups
+ * @return array
+ */
+function get_user_restrictions( $user_id, $user_status,
+                                $check_invisible, $use_groups = true )
+{
+  // 1. retrieving ids of private categories
+  $query = 'SELECT id';
+  $query.= ' FROM '.PREFIX_TABLE.'categories';
+  $query.= " WHERE status = 'private'";
+  $query.= ';';
+  $result = mysql_query( $query );
+  $privates = array();
+  while ( $row = mysql_fetch_array( $result ) )
+  {
+    array_push( $privates, $row['id'] );
+  }
+  // 2. retrieving all authorized categories for the user
+  $authorized = array();
+  // 2.1. retrieving authorized categories thanks to personnal user
+  //      authorization
+  $query = 'SELECT cat_id';
+  $query.= ' FROM '.PREFIX_TABLE.'user_access';
+  $query.= ' WHERE user_id = '.$user_id;
+  $query.= ';';
+  $result = mysql_query( $query );
+  while ( $row = mysql_fetch_array( $result ) )
+  {
+    array_push( $authorized, $row['cat_id'] );
+  }
+  // 2.2. retrieving authorized categories thanks to group authorization to
+  //      which the user is a member
+  if ( $use_groups )
+  {
+    $query = 'SELECT ga.cat_id';
+    $query.= ' FROM '.PREFIX_TABLE.'user_group as ug';
+    $query.= ', '.PREFIX_TABLE.'group_access as ga';
+    $query.= ' WHERE ug.group_id = ga.group_id';
+    $query.= ' AND ug.user_id = '.$user_id;
+    $query.= ';';
+    $result = mysql_query( $query );
+    while ( $row = mysql_fetch_array( $result ) )
+    {
+      array_push( $authorized, $row['cat_id'] );
+    }
+    $authorized = array_unique( $authorized );
+  }
+
+  $forbidden = array();
+  foreach ( $privates as $private ) {
+    if ( !in_array( $private, $authorized ) )
+    {
+      array_push( $forbidden, $private );
+    }
+  }
+
+  if ( $check_invisible )
+  {
+    // 3. adding to the restricted categories, the invisible ones
+    if ( $user_status != 'admin' )
+    {
+      $query = 'SELECT id';
+      $query.= ' FROM '.PREFIX_TABLE.'categories';
+      $query.= " WHERE visible = 'false';";
+      $result = mysql_query( $query );
+      while ( $row = mysql_fetch_array( $result ) )
+      {
+        array_push( $forbidden, $row['id'] );
+      }
+    }
+  }
+  return array_unique( $forbidden );
+}
+
+/**
+ * finalizes operation for user_category table update
+ *
+ * This function is called by synchronization_*. It creates the
+ * $page['plain_structure'] and $page['structure'], get the SQL query to
+ * update user_category, clean user_category, and finally update the
+ * table. The users updates depends on the global array $user_restrictions.
+ *
+ * @return void
+ */
+function synchronize()
+{
+  global $user_restrictions,$page,$values;
+
+  update_user_category( $page['structure'] );
+
+  // cleaning user_category table for users to update
+  foreach( $user_restrictions as $user_id => $restrictions ) {
+    $query = 'DELETE';
+    $query.= ' FROM '.PREFIX_TABLE.'user_category';
+    $query.= ' WHERE user_id = '.$user_id;
+    $query.= ';';
+    mysql_query( $query );
+  }
+
+  $query = 'INSERT INTO '.PREFIX_TABLE.'user_category';
+  $query.= ' (user_id,category_id,date_last,nb_sub_categories) VALUES ';
+  $query.= $values;
+  $query.= ';';
+  mysql_query( $query );
+}
+
+/**
+ * synchronizes all users calculated informations
+ *
+ * fills global array $user_restrictions with all users and related
+ * restrictions before calling synchronize.
+ *
+ * @return void
+ */
+function synchronize_all_users()
+{
+  global $user_restrictions,$page;
+
+  $page['plain_structure'] = get_plain_structure();
+  $page['structure']       = create_structure( '' );
+  
+  $user_restrictions = array();
+  
+  $query = 'SELECT id';
+  $query.= ' FROM '.PREFIX_TABLE.'users';
+  $query.= ';';
+  $result = mysql_query( $query );
+  while ( $row = mysql_fetch_array( $result ) )
+  {
+    $user_restrictions[$row['id']] = update_user_restrictions( $row['id'] );
+  }
+  synchronize();
+}
+
+/**
+ * synchronizes 1 user calculated informations
+ *
+ * fills global array $user_restrictions with the user id and its related
+ * restrictions before calling synchronize.
+ *
+ * @param int $user_id
+ * @return void
+ */
+function synchronize_user( $user_id )
+{
+  global $user_restrictions,$page;
+
+  $page['plain_structure'] = get_plain_structure();
+  $page['structure']       = create_structure( '' );
+  
+  $user_restrictions = array();
+  $user_restrictions[$user_id] = update_user_restrictions( $user_id );
+  synchronize();
+}
+
+/**
+ * synchronizes all users (belonging to the group) calculated informations
+ *
+ * fills global array $user_restrictions with all users and related
+ * restrictions before calling synchronize.
+ *
+ * @return void
+ */
+function synchronize_group( $group_id )
+{
+  global $user_restrictions,$page;
+
+  $page['plain_structure'] = get_plain_structure();
+  $page['structure']       = create_structure( '' );
+  
+  $user_restrictions = array();
+  
+  $query = 'SELECT id';
+  $query.= ' FROM '.PREFIX_TABLE.'users';
+  $query.= ', '.PREFIX_TABLE.'user_group';
+  $query.= ' WHERE group_id = '.$group_id;
+  $query.= ' AND id = user_id';
+  $query.= ';';
+  $result = mysql_query( $query );
+  while ( $row = mysql_fetch_array( $result ) )
+  {
+    $user_restrictions[$row['id']] = update_user_restrictions( $row['id'] );
+  }
+  synchronize();
+}
+
+/**
+ * updates the calculated data users.forbidden_categories, it includes
+ * sub-categories of the direct forbidden categories
+ *
+ * @param nt $user_id
+ * @return array
+ */
+function update_user_restrictions( $user_id )
+{
+  $restrictions = get_user_all_restrictions( $user_id );
+
+  // update the users.forbidden_categories in database
+  $query = 'UPDATE '.PREFIX_TABLE.'users';
+  $query.= ' SET forbidden_categories = ';
+  if ( count( $restrictions ) > 0 )
+    $query.= "'".implode( ',', $restrictions )."'";
+  else
+    $query.= 'NULL';
+  $query .= ' WHERE id = '.$user_id;
+  $query.= ';';
+  mysql_query( $query );
+
+  return $restrictions;
+}
+
+/**
+ * returns all the restricted categories ids including sub-categories
+ *
+ * @param int $user_id
+ * @return array
+ */
+function get_user_all_restrictions( $user_id )
+{
+  global $page;
+  
+  $query = 'SELECT status';
+  $query.= ' FROM '.PREFIX_TABLE.'users';
+  $query.= ' WHERE id = '.$user_id;
+  $query.= ';';
+  $row = mysql_fetch_array( mysql_query( $query ) );
+  
+  $base_restrictions=get_user_restrictions($user_id,$row['status'],true,true);
+
+  $restrictions = $base_restrictions;
+  foreach ( $base_restrictions as $category_id ) {
+    echo $category_id.' is forbidden to user '.$user_id.'<br />';
+    $restrictions =
+      array_merge( $restrictions,
+                   $page['plain_structure'][$category_id]['all_subcats_ids'] );
+  }
+
+  return array_unique( $restrictions );
+}
+
+// The function is_user_allowed returns :
+//      - 0 : if the category is allowed with this $restrictions array
+//      - 1 : if this category is not allowed
+//      - 2 : if an uppercat category is not allowed
+// Note : the restrictions array must represent ONLY direct forbidden
+// categories, not all forbidden categories
+function is_user_allowed( $category_id, $restrictions )
+{
+  if ( in_array( $category_id, $restrictions ) ) return 1;
+
+  $query = 'SELECT uppercats';
+  $query.= ' FROM '.PREFIX_TABLE.'categories';
+  $query.= ' WHERE id = '.$category_id;
+  $query.= ';';
+  $row = mysql_fetch_array( mysql_query( $query ) );
+  $uppercats = explode( ',', $row['uppercats'] );
+  foreach ( $uppercats as $category_id ) {
+    if ( in_array( $category_id, $restrictions ) ) return 2;
+  }
+
+  // no restriction found : the user is allowed to access this category
+  return 0;
+}
+
+/**
+ * returns an array containing sub-directories which can be a category
+ *
+ * directories nammed "thumbnail" are omitted
+ *
+ * @param string $basedir
+ * @return array
+ */
+function get_category_directories( $basedir )
+{
+  $sub_dirs = array();
+
+  if ( $opendir = opendir( $basedir ) )
+  {
+    while ( $file = readdir( $opendir ) )
+    {
+      if ( $file != '.' and $file != '..'
+           and is_dir( $basedir.'/'.$file )
+           and $file != 'thumbnail' )
+      {
+        array_push( $sub_dirs, $file );
+      }
+    }
+  }
+  return $sub_dirs;
+}
 ?>

trunk/admin/include/isadmin.inc.php

@@ -17 +17 @@
  *                                                                         *
  ***************************************************************************/
-define( "PREFIX_INCLUDE", '' );
 
-include_once( './include/config.inc.php' );
-include_once( './include/user.inc.php' );
 include( './admin/include/functions.php' );
 

trunk/admin/infos_images.php

@@ -21 +21 @@
 include_once( './template/'.$user['template'].'/htmlfunctions.inc.php' );
 //-------------------------------------------------------------- initialization
+$page['nb_image_page'] = 5;
+
 check_cat_id( $_GET['cat_id'] );
+
+$errors = array();
+
 if ( isset( $page['cat'] ) )
 {
 //--------------------------------------------------- update individual options
-  $query = 'SELECT id,file';
-  $query.= ' FROM '.PREFIX_TABLE.'images';
-  $query.= ' LEFT JOIN '.PREFIX_TABLE.'image_category ON id = image_id';
-  $query.= ' WHERE category_id = '.$page['cat'];
-  $query.= ';';
-  $result = mysql_query( $query );
-  $i = 1;
-  while ( $row = mysql_fetch_array( $result ) )
-  {
-    $name          = 'name-'.$row['id'];
-    $author        = 'author-'.$row['id'];
-    $comment       = 'comment-'.$row['id'];
-    $date_creation = 'date_creation-'.$row['id'];
-    $keywords      = 'keywords-'.$row['id'];
-    if ( isset( $_POST[$name] ) )
-    {
-      $query = 'UPDATE '.PREFIX_TABLE.'images';
-
-      $query.= ' SET name = ';
-      if ( $_POST[$name] == '' )
-        $query.= 'NULL';
+  if ( isset( $_POST['submit'] ) )
+  {
+    if ( isset( $_POST['associate'] ) and $_POST['associate'] != '' )
+    {
+      // does the uppercat id exists in the database ?
+      if ( !is_numeric( $_POST['associate'] ) )
+      {
+        array_push( $errors, $lang['cat_unknown_id'] );
+      }
       else
-        $query.= "'".htmlentities( $_POST[$name], ENT_QUOTES )."'";
-
-      $query.= ', author = ';
-      if ( $_POST[$author] == '' )
-        $query.= 'NULL';
-      else
-        $query.= "'".htmlentities($_POST[$author],ENT_QUOTES)."'";
-
-      $query.= ', comment = ';
-      if ( $_POST[$comment] == '' )
-        $query.= 'NULL';
-      else
-        $query.= "'".htmlentities($_POST[$comment],ENT_QUOTES)."'";
-
-      $query.= ', date_creation = ';
-      if ( check_date_format( $_POST[$date_creation] ) )
-        $query.= "'".date_convert( $_POST[$date_creation] )."'";
-      else if ( $_POST[$date_creation] == '' )
-        $query.= 'NULL';
-
-      $query.= ', keywords = ';
-      $keywords_array = get_keywords( $_POST[$keywords] );
-      if ( count( $keywords_array ) == 0 )
-        $query.= 'NULL';
-      else
-      {
-        $query.= "'";
-        foreach ( $keywords_array as $i => $keyword ) {
-          if ( $i > 0 ) $query.= ',';
-          $query.= $keyword;
-        }
-        $query.= "'";
-      }
-
-      $query.= ' WHERE id = '.$row['id'];
-      $query.= ';';
-      mysql_query( $query );
-    }
-    // add link to another category
-    if ( $_POST['check-'.$row['id']] == 1 )
-    {
-      $query = 'INSERT INTO '.PREFIX_TABLE.'image_category';
-      $query.= ' (image_id,category_id) VALUES';
-      $query.= ' ('.$row['id'].','.$_POST['associate'].')';
-      $query.= ';';
-      mysql_query( $query );
-    }
-  }
-  update_category( $_POST['associate'] );
-//------------------------------------------------------ update general options
-  if ( $_POST['use_common_author'] == 1 )
-  {
-    $query = 'SELECT image_id';
-    $query.= ' FROM '.PREFIX_TABLE.'image_category';
+      {
+        $query = 'SELECT id';
+        $query.= ' FROM '.PREFIX_TABLE.'categories';
+        $query.= ' WHERE id = '.$_POST['associate'];
+        $query.= ';';
+        if ( mysql_num_rows( mysql_query( $query ) ) == 0 )
+          array_push( $errors, $lang['cat_unknown_id'] );
+      }
+    }
+
+    $associate = false;
+    
+    $query = 'SELECT id,file';
+    $query.= ' FROM '.PREFIX_TABLE.'images';
+    $query.= ' INNER JOIN '.PREFIX_TABLE.'image_category ON id = image_id';
     $query.= ' WHERE category_id = '.$page['cat'];
+    $query.= ';';
     $result = mysql_query( $query );
     while ( $row = mysql_fetch_array( $result ) )
     {
-      $query = 'UPDATE '.PREFIX_TABLE.'images';
-      if ( $_POST['author_cat'] == '' )
-      {
-        $query.= ' SET author = NULL';
-      }
-      else
-      {
-        $query.= ' SET author = ';
-        $query.= "'".htmlentities( $_POST['author_cat'], ENT_QUOTES )."'";
-      }
-      $query.= ' WHERE id = '.$row['image_id'];
-      $query.= ';';
-      mysql_query( $query );
-    }
-  }
-  if ( $_POST['use_common_date_creation'] == 1 )
-  {
-    if ( check_date_format( $_POST['date_creation_cat'] ) )
-    {
-      $date = date_convert( $_POST['date_creation_cat'] );
+      $name          = 'name-'.$row['id'];
+      $author        = 'author-'.$row['id'];
+      $comment       = 'comment-'.$row['id'];
+      $date_creation = 'date_creation-'.$row['id'];
+      $keywords      = 'keywords-'.$row['id'];
+      if ( isset( $_POST[$name] ) )
+      {
+        $query = 'UPDATE '.PREFIX_TABLE.'images';
+
+        $query.= ' SET name = ';
+        if ( $_POST[$name] == '' )
+          $query.= 'NULL';
+        else
+          $query.= "'".htmlentities( $_POST[$name], ENT_QUOTES )."'";
+
+        $query.= ', author = ';
+        if ( $_POST[$author] == '' )
+          $query.= 'NULL';
+        else
+          $query.= "'".htmlentities($_POST[$author],ENT_QUOTES)."'";
+
+        $query.= ', comment = ';
+        if ( $_POST[$comment] == '' )
+          $query.= 'NULL';
+        else
+          $query.= "'".htmlentities($_POST[$comment],ENT_QUOTES)."'";
+
+        $query.= ', date_creation = ';
+        if ( check_date_format( $_POST[$date_creation] ) )
+          $query.= "'".date_convert( $_POST[$date_creation] )."'";
+        else if ( $_POST[$date_creation] == '' )
+          $query.= 'NULL';
+
+        $query.= ', keywords = ';
+
+        $keywords_array = get_keywords( $_POST[$keywords] );
+        if ( count( $keywords_array ) == 0 ) $query.= 'NULL';
+        else $query.= "'".implode( ',', $keywords_array )."'";
+
+        $query.= ' WHERE id = '.$row['id'];
+        $query.= ';';
+        mysql_query( $query );
+      }
+      // add link to another category
+      if ( isset( $_POST['check-'.$row['id']] ) and count( $errors ) == 0 )
+      {
+        $query = 'INSERT INTO '.PREFIX_TABLE.'image_category';
+        $query.= ' (image_id,category_id) VALUES';
+        $query.= ' ('.$row['id'].','.$_POST['associate'].')';
+        $query.= ';';
+        mysql_query( $query );
+        $associate = true;
+      }
+    }
+    update_category( $_POST['associate'] );
+    if ( $associate ) synchronize_all_users();
+//------------------------------------------------------ update general options
+    if ( isset( $_POST['use_common_author'] ) )
+    {
       $query = 'SELECT image_id';
       $query.= ' FROM '.PREFIX_TABLE.'image_category';
@@ -132 +126 @@
       {
         $query = 'UPDATE '.PREFIX_TABLE.'images';
-        if ( $_POST['date_creation_cat'] == '' )
-        {
-          $query.= ' SET date_creation = NULL';
-        }
-        else
-        {
-          $query.= " SET date_creation = '".$date."'";
+        if ( $_POST['author_cat'] == '' )
+        {
+          $query.= ' SET author = NULL';
+        }
+        else
+        {
+          $query.= ' SET author = ';
+          $query.= "'".htmlentities( $_POST['author_cat'], ENT_QUOTES )."'";
         }
         $query.= ' WHERE id = '.$row['image_id'];
@@ -145 +140 @@
       }
     }
-    else
-    {
-      echo $lang['err_date'];
-    }
-  }
-  if ( isset( $_POST['common_keywords'] ) and $_POST['keywords_cat'] != '' )
-  {
-    $query = 'SELECT id,keywords';
-    $query.= ' FROM '.PREFIX_TABLE.'images';
-    $query.= ' LEFT JOIN '.PREFIX_TABLE.'image_category ON id = image_id';
-    $query.= ' WHERE category_id = '.$page['cat'];
-    $query.= ';';
-    $result = mysql_query( $query );
-    while ( $row = mysql_fetch_array( $result ) )
-    {
-      $specific_keywords = explode( ',', $row['keywords'] );
-      $common_keywords   = get_keywords( $_POST['keywords_cat'] );
-      // first possiblity : adding the given keywords to all the pictures
-      if ( $_POST['common_keywords'] == 'add' )
-      {
-        $keywords = array_merge( $specific_keywords, $common_keywords );
-        $keywords = array_unique( $keywords );
-      }
-      // second possiblity : removing the given keywords from all pictures
-      // (without deleting the other specific keywords
-      if ( $_POST['common_keywords'] == 'remove' )
-      {
-        $keywords = array_diff( $specific_keywords, $common_keywords );
-      }
-      // cleaning the keywords array, sometimes, an empty value still remain
-      $keywords = array_remove( $keywords, '' );
-      // updating the picture with new keywords array
-      $query = 'UPDATE '.PREFIX_TABLE.'images';
-      $query.= ' SET keywords = ';
-      if ( count( $keywords ) == 0 )
-      {
-        $query.= 'NULL';
+    if ( isset( $_POST['use_common_date_creation'] ) )
+    {
+      if ( check_date_format( $_POST['date_creation_cat'] ) )
+      {
+        $date = date_convert( $_POST['date_creation_cat'] );
+        $query = 'SELECT image_id';
+        $query.= ' FROM '.PREFIX_TABLE.'image_category';
+        $query.= ' WHERE category_id = '.$page['cat'];
+        $result = mysql_query( $query );
+        while ( $row = mysql_fetch_array( $result ) )
+        {
+          $query = 'UPDATE '.PREFIX_TABLE.'images';
+          if ( $_POST['date_creation_cat'] == '' )
+          {
+            $query.= ' SET date_creation = NULL';
+          }
+          else
+          {
+            $query.= " SET date_creation = '".$date."'";
+          }
+          $query.= ' WHERE id = '.$row['image_id'];
+          $query.= ';';
+          mysql_query( $query );
+        }
       }
       else
       {
-        $query.= '"';
-        $i = 0;
-        foreach ( $keywords as $keyword ) {
-          if ( $i++ > 0 ) $query.= ',';
-          $query.= $keyword;
-        }
-        $query.= '"';
-      }
-      $query.= ' WHERE id = '.$row['id'];
+        array_push( $errors, $lang['err_date'] );
+      }
+    }
+    if ( isset( $_POST['common_keywords'] ) and $_POST['keywords_cat'] != '' )
+    {
+      $query = 'SELECT id,keywords';
+      $query.= ' FROM '.PREFIX_TABLE.'images';
+      $query.= ' INNER JOIN '.PREFIX_TABLE.'image_category ON id = image_id';
+      $query.= ' WHERE category_id = '.$page['cat'];
       $query.= ';';
-      mysql_query( $query );
+      $result = mysql_query( $query );
+      while ( $row = mysql_fetch_array( $result ) )
+      {
+        if ( !isset( $row['keywords'] ) ) $specific_keywords = array();
+        else $specific_keywords = explode( ',', $row['keywords'] );
+        
+        $common_keywords   = get_keywords( $_POST['keywords_cat'] );
+        // first possiblity : adding the given keywords to all the pictures
+        if ( $_POST['common_keywords'] == 'add' )
+        {
+          $keywords = array_merge( $specific_keywords, $common_keywords );
+          $keywords = array_unique( $keywords );
+        }
+        // second possiblity : removing the given keywords from all pictures
+        // (without deleting the other specific keywords
+        if ( $_POST['common_keywords'] == 'remove' )
+        {
+          $keywords = array_diff( $specific_keywords, $common_keywords );
+        }
+        // cleaning the keywords array, sometimes, an empty value still remain
+        $keywords = array_remove( $keywords, '' );
+        // updating the picture with new keywords array
+        $query = 'UPDATE '.PREFIX_TABLE.'images';
+        $query.= ' SET keywords = ';
+        if ( count( $keywords ) == 0 )
+        {
+          $query.= 'NULL';
+        }
+        else
+        {
+          $query.= '"';
+          $i = 0;
+          foreach ( $keywords as $keyword ) {
+            if ( $i++ > 0 ) $query.= ',';
+            $query.= $keyword;
+          }
+          $query.= '"';
+        }
+        $query.= ' WHERE id = '.$row['id'];
+        $query.= ';';
+        mysql_query( $query );
+      }
     }
   }
 //--------------------------------------------------------- form initialization
-  $page['nb_image_page'] = 5;
-
   if( !isset( $_GET['start'] )
       or !is_numeric( $_GET['start'] )
@@ -212 +233 @@
   }
 
-  if ( is_numeric( $_GET['num'] ) and $_GET['num'] >= 0 )
+  if ( isset($_GET['num']) and is_numeric($_GET['num']) and $_GET['num'] >= 0 )
   {
     $page['start'] =
@@ -218 +239 @@
   }
   // retrieving category information
-  $page['plain_structure'] = get_plain_structure();
   $result = get_cat_info( $page['cat'] );
   $cat['name'] = $result['name'];
@@ -229 +249 @@
                 'infoimage_creation_date','keywords',
                 'infoimage_addtoall','infoimage_removefromall',
-                'infoimage_keyword_separation','infoimage_associate' );
+                'infoimage_keyword_separation','infoimage_associate',
+                'errors_title' );
   templatize_array( $tpl, 'lang', $sub );
   $vtp->setGlobalVar( $sub, 'user_template',   $user['template'] );
+//-------------------------------------------------------------- errors display
+if ( count( $errors ) != 0 )
+{
+  $vtp->addSession( $sub, 'errors' );
+  foreach ( $errors as $error ) {
+    $vtp->addSession( $sub, 'li' );
+    $vtp->setVar( $sub, 'li.content', $error );
+    $vtp->closeSession( $sub, 'li' );
+  }
+  $vtp->closeSession( $sub, 'errors' );
+}
 //------------------------------------------------------------------------ form
   $url = './admin.php?page=infos_images&cat_id='.$page['cat'];
@@ -244 +276 @@
   $array_cat_directories = array();
 
-  $query = 'SELECT id,file,comment,author,tn_ext,name,date_creation,keywords';
-  $query.= ',storage_category_id,category_id';
+  $infos = array( 'id','file','comment','author','tn_ext','name'
+                  ,'date_creation','keywords','storage_category_id'
+                  ,'category_id' );
+  
+  $query = 'SELECT '.implode( ',', $infos );
   $query.= ' FROM '.PREFIX_TABLE.'images';
-  $query.= ' LEFT JOIN '.PREFIX_TABLE.'image_category ON id = image_id';
+  $query.= ' INNER JOIN '.PREFIX_TABLE.'image_category ON id = image_id';
   $query.= ' WHERE category_id = '.$page['cat'];
   $query.= $conf['order_by'];
@@ -255 +290 @@
   while ( $row = mysql_fetch_array( $result ) )
   {
+    foreach ($infos as $info) { if (!isset($row[$info])) $row[$info] = ''; }
+    
     $vtp->addSession( $sub, 'picture' );
     $vtp->setVar( $sub, 'picture.id', $row['id'] );
@@ -267 +304 @@
     $vtp->setVar( $sub, 'picture.default_name', $file );
     // creating url to thumbnail
-    if ( $array_cat_directories[$row['storage_category_id']] == '' )
+    if ( !isset( $array_cat_directories[$row['storage_category_id']] ) )
     {
       $array_cat_directories[$row['storage_category_id']] =
@@ -280 +317 @@
     $vtp->closeSession( $sub, 'picture' );
   }
-  $structure = create_structure( '', array() );
-  display_categories( $structure, ' ' );
+  // Virtualy associate a picture to a category
+  //
+  // We only show a List Of Values if the number of categories is less than
+  // $conf['max_LOV_categories']
+  $query = 'SELECT COUNT(id) AS nb_total_categories';
+  $query.= ' FROM '.PREFIX_TABLE.'categories';
+  $query.= ';';
+  $row = mysql_fetch_array( mysql_query( $query ) );
+  if ( $row['nb_total_categories'] < $conf['max_LOV_categories'] )
+  {
+    $vtp->addSession( $sub, 'associate_LOV' );
+    $page['plain_structure'] = get_plain_structure( true );
+    $structure = create_structure( '', array() );
+    display_categories( $structure, '&nbsp;' );
+    $vtp->closeSession( $sub, 'associate_LOV' );
+  }
+  // else, we only display a small text field, we suppose the administrator
+  // knows the id of its category
+  else
+  {
+    $vtp->addSession( $sub, 'associate_text' );
+    $vtp->closeSession( $sub, 'associate_text' );
+  }
 }
 //----------------------------------------------------------- sending html code

trunk/admin/phpwebgallery_structure.sql

@@ -1 +1 @@
 -- MySQL dump 8.21
 --
--- Host: localhost    Database: devel
+-- Host: localhost    Database: perfs_test
 ---------------------------------------------------------
 -- Server version       3.23.49-log
@@ -24 +24 @@
   uploadable enum('true','false') NOT NULL default 'false',
   representative_picture_id mediumint(8) unsigned default NULL,
-  PRIMARY KEY  (id)
+  uppercats varchar(255) NOT NULL default '',
+  PRIMARY KEY  (id),
+  KEY id (id),
+  KEY id_uppercat (id_uppercat)
 ) TYPE=MyISAM;
 
@@ -126 +129 @@
   image_id mediumint(8) unsigned NOT NULL default '0',
   category_id smallint(5) unsigned NOT NULL default '0',
-  PRIMARY KEY  (image_id,category_id)
+  PRIMARY KEY  (image_id,category_id),
+  KEY category_id (category_id),
+  KEY image_id (image_id)
 ) TYPE=MyISAM;
 
@@ -187 +192 @@
   cat_id smallint(5) unsigned NOT NULL default '0',
   PRIMARY KEY  (user_id,cat_id)
+) TYPE=MyISAM;
+
+--
+-- Table structure for table 'phpwebgallery_user_category'
+--
+
+DROP TABLE IF EXISTS phpwebgallery_user_category;
+CREATE TABLE phpwebgallery_user_category (
+  user_id smallint(5) unsigned NOT NULL default '0',
+  category_id smallint(5) unsigned NOT NULL default '0',
+  date_last date default NULL,
+  nb_sub_categories smallint(5) unsigned NOT NULL default '0',
+  PRIMARY KEY  (user_id,category_id)
 ) TYPE=MyISAM;
 
@@ -221 +239 @@
   long_period tinyint(3) unsigned NOT NULL default '14',
   template varchar(255) NOT NULL default 'default',
+  forbidden_categories text,
   PRIMARY KEY  (id),
   UNIQUE KEY username (username)

trunk/admin/picture_modify.php

@@ -19 +19 @@
 
 include_once( './admin/include/isadmin.inc.php' );
-//----------------------------------------- categories structure initialization
-$page['plain_structure'] = get_plain_structure();
 //--------------------------------------------------------- update informations
 $errors = array();
@@ -88 +86 @@
     // category, the category is updated in the database (without wondering
     // if this picture was already the representative one)
-    if ( $_POST['representative-'.$row['category_id']] == 1 )
+    if ( isset($_POST['representative-'.$row['category_id']]) )
     {
       $query = 'UPDATE '.PREFIX_TABLE.'categories';
@@ -98 +96 @@
     // if the user ask this picture to be not any more the representative,
     // we have to set the representative_picture_id of this category to NULL
-    else if ( $row['representative_picture_id'] == $_GET['image_id'] )
+    else if ( isset( $row['representative_picture_id'] )
+              and $row['representative_picture_id'] == $_GET['image_id'] )
     {
       $query = 'UPDATE '.PREFIX_TABLE.'categories';
@@ -107 +106 @@
     }
   }
+  $associate_or_dissociate = false;
   // associate with a new category ?
-  if ( $_POST['associate'] != '-1' )
+  if ( $_POST['associate'] != '-1' and $_POST['associate'] != '' )
+  {
+    // does the uppercat id exists in the database ?
+    if ( !is_numeric( $_POST['associate'] ) )
+    {
+      array_push( $errors, $lang['cat_unknown_id'] );
+    }
+    else
+    {
+      $query = 'SELECT id';
+      $query.= ' FROM '.PREFIX_TABLE.'categories';
+      $query.= ' WHERE id = '.$_POST['associate'];
+      $query.= ';';
+      if ( mysql_num_rows( mysql_query( $query ) ) == 0 )
+        array_push( $errors, $lang['cat_unknown_id'] );
+    }
+  }
+  if ( $_POST['associate'] != '-1'
+       and $_POST['associate'] != ''
+       and count( $errors ) == 0 )
   {
     $query = 'INSERT INTO '.PREFIX_TABLE.'image_category';
@@ -115 +134 @@
     $query.= ';';
     mysql_query( $query);
+    $associate_or_dissociate = true;
     update_category( $_POST['associate'] );
   }
@@ -126 +146 @@
   while ( $row = mysql_fetch_array( $result ) )
   {
-    if ( $_POST['dissociate-'.$row['category_id']] == 1 )
+    if ( isset($_POST['dissociate-'.$row['category_id']]) )
     {
       $query = 'DELETE FROM '.PREFIX_TABLE.'image_category';
@@ -133 +153 @@
       $query.= ';';
       mysql_query( $query );
+      $associate_or_dissociate = true;
       update_category( $row['category_id'] );
     }
+  }
+  if ( $associate_or_dissociate )
+  {
+    synchronize_all_users();
   }
 }
@@ -163 +188 @@
 $vtp->setVar( $sub, 'form_action', $action );
 // retrieving direct information about picture
-$query = 'SELECT file,date_available,date_creation,tn_ext,name,filesize';
-$query.= ',width,height,author,comment,keywords,storage_category_id';
+$infos = array( 'file','date_available','date_creation','tn_ext','name'
+                ,'filesize','width','height','author','comment','keywords'
+                ,'storage_category_id' );
+$query = 'SELECT '. implode( ',', $infos );
 $query.= ' FROM '.PREFIX_TABLE.'images';
 $query.= ' WHERE id = '.$_GET['image_id'];
 $query.= ';';
 $row = mysql_fetch_array( mysql_query( $query ) );
+
+foreach ( $infos as $info ) {
+  if ( !isset( $row[$info] ) ) $row[$info] = '';
+}
+
 // picture title
 if ( $row['name'] == '' )
@@ -291 +323 @@
   }
 
-  if ( $row['representative_picture_id'] == $_GET['image_id'] )
+  if ( isset( $row['representative_picture_id'] )
+       and $row['representative_picture_id'] == $_GET['image_id'] )
   {
     $vtp->setVar( $sub, 'linked_category.representative_checked',
@@ -307 +340 @@
 }
 // associate to another category ?
-$vtp->addSession( $sub, 'associate_cat' );
-$vtp->setVar( $sub, 'associate_cat.value', '-1' );
-$vtp->setVar( $sub, 'associate_cat.content', '' );
-$vtp->closeSession( $sub, 'associate_cat' );
-$structure = create_structure( '', array() );
-display_categories( $structure, ' ' );
+//
+// We only show a List Of Values if the number of categories is less than
+// $conf['max_LOV_categories']
+$query = 'SELECT COUNT(id) AS nb_total_categories';
+$query.= ' FROM '.PREFIX_TABLE.'categories';
+$query.= ';';
+$row = mysql_fetch_array( mysql_query( $query ) );
+if ( $row['nb_total_categories'] < $conf['max_LOV_categories'] )
+{
+  $vtp->addSession( $sub, 'associate_LOV' );
+  $vtp->addSession( $sub, 'associate_cat' );
+  $vtp->setVar( $sub, 'associate_cat.value', '-1' );
+  $vtp->setVar( $sub, 'associate_cat.content', '' );
+  $vtp->closeSession( $sub, 'associate_cat' );
+  $page['plain_structure'] = get_plain_structure( true );
+  $structure = create_structure( '', array() );
+  display_categories( $structure, '&nbsp;' );
+  $vtp->closeSession( $sub, 'associate_LOV' );
+}
+// else, we only display a small text field, we suppose the administrator
+// knows the id of its category
+else
+{
+  $vtp->addSession( $sub, 'associate_text' );
+  $vtp->closeSession( $sub, 'associate_text' );
+}
 //----------------------------------------------------------- sending html code
 $vtp->Parse( $handle , 'sub', $sub );

trunk/admin/stats.php

@@ -43 +43 @@
 $vtp->setGlobalVar( $sub, 'user_template', $user['template'] );
 //--------------------------------------------------- number of days to display
-if ( isset( $_GET['last_days'] ) ) define( "MAX_DAYS", $_GET['last_days'] );
-else                               define( "MAX_DAYS", 0 );
+if ( isset( $_GET['last_days'] ) ) define( 'MAX_DAYS', $_GET['last_days'] );
+else                               define( 'MAX_DAYS', 0 );
 
 foreach ( $conf['last_days'] as $option ) {
   $vtp->addSession( $sub, 'last_day_option' );
   $vtp->setVar( $sub, 'last_day_option.option', $option );
-  $url = './admin.php?page=stats&expand='.$_GET['expand'];
+  $url = './admin.php?page=stats';
+  if (isset($_GET['expand']))
+          $url .='&expand='.$_GET['expand'];
   $url.= '&last_days='.($option - 1);
   $vtp->setVar( $sub, 'last_day_option.link', add_session_id( $url ) );
@@ -60 +62 @@
 //---------------------------------------------------------------- log  history
 // empty link
-$url = './admin.php?page=stats&last_days='.$_GET['last_days'];
-$url.= '&expand='.$_GET['expand'];
+$url = './admin.php?page=stats';
+if (isset($_GET['last_days']))
+        $url .='&last_days='.$_GET['last_days'];
+// expand array management
+$expand_days = array();
+if (isset($_GET['expand']))
+{
+        $url.= '&expand='.$_GET['expand'];
+        $expand_days = explode( ',', $_GET['expand'] );
+}
 $url.= '&act=empty';
 $vtp->setVar( $sub, 'emply_url', add_session_id( $url ) );
-// expand array management
-$expand_days = explode( ',', $_GET['expand'] );
 $page['expand_days'] = array();
 foreach ( $expand_days as $expand_day ) {
@@ -100 +108 @@
     array_push( $local_expand, $i );
   }
-  $url = './admin.php?page=stats&last_days='.$_GET['last_days'];
+  $url = './admin.php?page=stats';
+  if (isset($_GET['last_days']))
+        $url.= '&last_days='.$_GET['last_days'];
   $url.= '&expand='.implode( ',', $local_expand );
   $vtp->setVar( $sub, 'day.url', add_session_id( $url ) );

trunk/admin/thumbnail.php

@@ -254 +254 @@
     $vtp->closeSession( $sub, 'dir' );
     // recursive call
-    $dirs.= get_displayed_dirs( $dir.'/'.$sub_dir,
-                                $indent+30 );
-    
+    get_displayed_dirs( $dir.'/'.$sub_dir,
+                                $indent+30 );    
   }
 }
@@ -360 +359 @@
     $vtp->setVar( $sub, 'params.action', add_session_id( $url ) );
     // GD version selected...
-    if ( $_POST['gd'] == 1 )
+    if ( isset( $_POST['gd'] ) and $_POST['gd'] == 1 )
     {
       $vtp->setVar( $sub, 'params.gd1_checked', ' checked="checked"' );
@@ -388 +387 @@
     // options for the number of picture to miniaturize : "n"
     $options = array( 5,10,20,40 );
+    if ( isset( $_POST['n'] ) ) $n = $_POST['n'];
+    else                        $n = 5;
     foreach ( $options as $option ) {
       $vtp->addSession( $sub, 'n_option' );
       $vtp->setVar( $sub, 'n_option.option', $option );
-      if ( $option == $_POST['n'] )
+      if ( $option == $n )
       {
         $vtp->setVar( $sub, 'n_option.selected', ' selected="selected"' );

trunk/admin/update.php

@@ -3 +3 @@
  *                                update.php                               *
  *                            ------------------                           *
- *   application   : PhpWebGallery 1.3 <http://phpwebgallery.net>          *
+ *   application   : PhpWebGallery 1.4 <http://phpwebgallery.net>          *
  *   author        : Pierrick LE GALL <pierrick@z0rglub.com>               *
  *                                                                         *
@@ -20 +20 @@
 include_once( './admin/include/isadmin.inc.php' );
 //------------------------------------------------------------------- functions
-function insert_local_category( $cat_id )
+function insert_local_category( $id_uppercat )
 {
   global $conf, $page, $user, $lang;
-
-  $site_id = 1;
+ 
+  $uppercats = '';
+  $output = '';
 
   // 0. retrieving informations on the category to display
   $cat_directory = './galleries';
-
-  if ( is_numeric( $cat_id ) )
-  {
-    $cat_directory.= '/'.get_local_dir( $cat_id );
-    $result = get_cat_info( $cat_id );
+  if ( is_numeric( $id_uppercat ) )
+  {
+    $query = 'SELECT name,uppercats,dir';
+    $query.= ' FROM '.PREFIX_TABLE.'categories';
+    $query.= ' WHERE id = '.$id_uppercat;
+    $query.= ';';
+    $row = mysql_fetch_array( mysql_query( $query ) );
+    $uppercats = $row['uppercats'];
+    $name      = $row['name'];
+    $dir       = $row['dir'];
+
+    $upper_array = explode( ',', $uppercats );
+
+    $local_dir = '';
+
+    $database_dirs = array();
+    $query = 'SELECT id,dir';
+    $query.= ' FROM '.PREFIX_TABLE.'categories';
+    $query.= ' WHERE id IN ('.$uppercats.')';
+    $query.= ';';
+    $result = mysql_query( $query );
+    while( $row = mysql_fetch_array( $result ) )
+    {
+      $database_dirs[$row['id']] = $row['dir'];
+    }
+    foreach ( $upper_array as $id ) {
+      $local_dir.= $database_dirs[$id].'/';
+    }
+
+    $cat_directory.= '/'.$local_dir;
+
     // 1. display the category name to update
     $src = './template/'.$user['template'].'/admin/images/puce.gif';
     $output = '<img src="'.$src.'" alt="&gt;" />';
-    $output.= '<span style="font-weight:bold;">'.$result['name'][0].'</span>';
-    $output.= ' [ '.$result['dir'].' ]';
+    $output.= '<span style="font-weight:bold;">'.$name.'</span>';
+    $output.= ' [ '.$dir.' ]';
     $output.= '<div class="retrait">';
 
@@ -44 +71 @@
     if ( isset( $page['cat'] ) or $_GET['update'] == 'all' )
     {
-      $output.= insert_local_image( $cat_directory, $cat_id );
-    }
-  }
-
+      $output.= insert_local_image( $cat_directory, $id_uppercat );
+    }
+  }
+
+  $sub_dirs = get_category_directories( $cat_directory );
+
+  $sub_category_dirs = array();
+  $query = 'SELECT id,dir';
+  $query.= ' FROM '.PREFIX_TABLE.'categories';
+  $query.= ' WHERE site_id = 1';
+  if (!is_numeric($id_uppercat)) $query.= ' AND id_uppercat IS NULL';
+  else                           $query.= ' AND id_uppercat = '.$id_uppercat;
+  $query.= ' AND dir IS NOT NULL'; // virtual categories not taken
+  $query.= ';';
+  $result = mysql_query( $query );
+  while ( $row = mysql_fetch_array( $result ) )
+  {
+    $sub_category_dirs[$row['id']] = $row['dir'];
+  }
+  
   // 3. we have to remove the categories of the database not present anymore
+  foreach ( $sub_category_dirs as $id => $dir ) {
+    if ( !in_array( $dir, $sub_dirs ) ) delete_category( $id );
+  }
+
+  // array of new categories to insert
+  $inserts = array();
+  
+  foreach ( $sub_dirs as $sub_dir ) {
+    // 5. Is the category already existing ? we create a subcat if not
+    //    existing
+    $category_id = array_search( $sub_dir, $sub_category_dirs );
+    if ( !is_numeric( $category_id ) )
+    {
+      if ( preg_match( '/^[a-zA-Z0-9-_.]+$/', $sub_dir ) )
+      {
+        $name = str_replace( '_', ' ', $sub_dir );
+
+        $value = "('".$sub_dir."','".$name."',1";
+        if ( !is_numeric( $id_uppercat ) ) $value.= ',NULL';
+        else                               $value.= ','.$id_uppercat;
+        $value.= ",'undef'";
+        $value.= ')';
+        array_push( $inserts, $value );
+      }
+      else
+      {
+        $output.= '<span style="color:red;">"'.$sub_dir.'" : ';
+        $output.= $lang['update_wrong_dirname'].'</span><br />';
+      }
+    }
+  }
+
+  // we have to create the category
+  if ( count( $inserts ) > 0 )
+  {
+    $query = 'INSERT INTO '.PREFIX_TABLE.'categories';
+    $query.= ' (dir,name,site_id,id_uppercat,uppercats) VALUES ';
+    $query.= implode( ',', $inserts );
+    $query.= ';';
+    mysql_query( $query );
+    // updating uppercats field
+    $query = 'UPDATE '.PREFIX_TABLE.'categories';
+    $query.= ' SET uppercats = ';
+    if ( $uppercats != '' ) $query.= "CONCAT('".$uppercats."',',',id)";
+    else                    $query.= 'id';
+    $query.= ' WHERE id_uppercat ';
+    if (!is_numeric($id_uppercat)) $query.= 'IS NULL';
+    else                           $query.= '= '.$id_uppercat;
+    $query.= ';';
+    mysql_query( $query );
+  }
+
+  // Recursive call on the sub-categories (not virtual ones)
   $query = 'SELECT id';
   $query.= ' FROM '.PREFIX_TABLE.'categories';
-  $query.= ' WHERE site_id = '.$site_id;
-  if ( !is_numeric( $cat_id ) )
-  {
-    $query.= ' AND id_uppercat IS NULL';
-  }
-  else
-  {
-    $query.= ' AND id_uppercat = '.$cat_id;
-  }
-  $query.= ';';
-  $result = mysql_query( $query );
-  while ( $row = mysql_fetch_array( $result ) )
-  {
-    // retrieving the directory
-    $rep = './galleries/'.get_local_dir( $row['id'] );
-    // is the directory present ?
-    if ( !is_dir( $rep ) ) delete_category( $row['id'] );
-  }
-  // 4. retrieving the sub-directories
-  $subdirs = array();
-  $dirs = '';
-  if ( $opendir = opendir( $cat_directory ) )
-  {
-    while ( $file = readdir( $opendir ) )
-    {
-      if ( $file != '.'
-           and $file != '..'
-           and is_dir ( $cat_directory.'/'.$file )
-           and $file != 'thumbnail' )
-      {
-        if ( preg_match( '/^[a-zA-Z0-9-_.]+$/', $file ) )
-          array_push( $subdirs, $file );
-        else
-        {
-          $output.= '<span style="color:red;">"'.$file.'" : ';
-          $output.= $lang['update_wrong_dirname'].'</span><br />';
-          // if the category even exists (from a previous release of
-          // PhpWebGallery), we keep it in our $subdirs array
-          $query = 'SELECT id';
-          $query.= ' FROM '.PREFIX_TABLE.'categories';
-          $query.= ' WHERE site_id = '.$site_id;
-          $query.= " AND dir = '".$file."'";
-          $query.= ' AND id_uppercat';
-          if ( !is_numeric( $cat_id ) ) $query.= ' IS NULL';
-          else                          $query.= ' = '.$cat_id;
-          $query.= ';';
-          $result = mysql_query( $query );
-          if ( mysql_num_rows( $result ) != 0 )
-          {
-            array_push( $subdirs, $file );
-          }
-        }
-      }
-    }
-  }
-  foreach ( $subdirs as $subdir ) {
-    // 5. Is the category already existing ? we create a subcat if not
-    //    existing
-    $category_id = '';
-    $query = 'SELECT id';
-    $query.= ' FROM '.PREFIX_TABLE.'categories';
-    $query.= ' WHERE site_id = '.$site_id;
-    $query.= " AND dir = '".$subdir."'";
-    $query.= ' AND id_uppercat';
-    if ( !is_numeric( $cat_id ) ) $query.= ' IS NULL';
-    else                          $query.= ' = '.$cat_id;
-    $query.= ';';
-    $result = mysql_query( $query );
-    if ( mysql_num_rows( $result ) == 0 )
-    {
-      $name = str_replace( '_', ' ', $subdir );
-      // we have to create the category
-      $query = 'INSERT INTO '.PREFIX_TABLE.'categories';
-      $query.= ' (dir,name,site_id,id_uppercat) VALUES';
-      $query.= " ('".$subdir."','".$name."','".$site_id."'";
-      if ( !is_numeric( $cat_id ) ) $query.= ',NULL';
-      else                          $query.= ",'".$cat_id."'";
-      $query.= ');';
-      mysql_query( $query );
-      $category_id = mysql_insert_id();
-      // regeneration of the plain_structure to integrate the new category
-      $page['plain_structure'] = get_plain_structure();
-    }
-    else
-    {
-      // we get the already registered id
-      $row = mysql_fetch_array( $result );
-      $category_id = $row['id'];
-    }
-    // 6. recursive call
-    $output.= insert_local_category( $category_id );
-  }
-                
-  if ( is_numeric( $cat_id ) )
+  $query.= ' WHERE site_id = 1';
+  if (!is_numeric($id_uppercat)) $query.= ' AND id_uppercat IS NULL';
+  else                           $query.= ' AND id_uppercat = '.$id_uppercat;
+  $query.= ' AND dir IS NOT NULL'; // virtual categories not taken
+  $query.= ';';
+  $result = mysql_query( $query );
+  while ( $row = mysql_fetch_array( $result ) )
+  {
+    $output.= insert_local_category( $row['id'] );
+  }
+
+  if ( is_numeric( $id_uppercat ) )
   {
     $output.= '</div>';
@@ -150 +164 @@
   return $output;
 }
-        
-function insert_local_image( $rep, $category_id )
+
+function insert_local_image( $dir, $category_id )
 {
   global $lang,$conf,$count_new;
 
   $output = '';
+
+  // fs means filesystem : $fs_pictures contains pictures in the filesystem
+  // found in $dir, $fs_thumbnails contains thumbnails...
+  $fs_pictures   = get_picture_files( $dir );
+  $fs_thumbnails = get_thumb_files( $dir.'thumbnail' );
+
   // we have to delete all the images from the database that :
   //     - are not in the directory anymore
@@ -166 +186 @@
   while ( $row = mysql_fetch_array( $result ) )
   {
-    $lien_image = $rep.'/'.$row['file'];
-    $lien_thumbnail = $rep.'/thumbnail/'.$conf['prefix_thumbnail'];
-    $lien_thumbnail.= get_filename_wo_extension( $row['file'] );
-    $lien_thumbnail.= '.'.$row['tn_ext'];
-                
-    if ( !is_file ( $lien_image ) or !is_file ( $lien_thumbnail ) )
-    {
-      if ( !is_file ( $lien_image ) )
+    $pic_to_delete = false;
+    if ( !in_array( $row['file'], $fs_pictures ) )
+    {
+      $output.= $row['file'];
+      $output.= ' <span style="font-weight:bold;">';
+      $output.= $lang['update_disappeared'].'</span><br />';
+      $pic_to_delete = true;
+    }
+
+    $thumbnail = $conf['prefix_thumbnail'];
+    $thumbnail.= get_filename_wo_extension( $row['file'] );
+    $thumbnail.= '.'.$row['tn_ext'];
+    if ( !in_array( $thumbnail, $fs_thumbnails ) )
+    {
+      $output.= $row['file'];
+      $output.= ' : <span style="font-weight:bold;">';
+      $output.= $lang['update_disappeared_tn'].'</span><br />';
+      $pic_to_delete = true;
+    }
+
+    if ( $pic_to_delete ) delete_image( $row['id'] );
+  }
+
+  $registered_pictures = array();
+  $query = 'SELECT file';
+  $query.= ' FROM '.PREFIX_TABLE.'images';
+  $query.= ' WHERE storage_category_id = '.$category_id;
+  $query.= ';';
+  $result = mysql_query( $query );
+  while ( $row = mysql_fetch_array( $result ) )
+  {
+    array_push( $registered_pictures, $row['file'] );
+  }
+
+  // validated pictures are picture uploaded by users, validated by an admin
+  // and not registered (visible) yet
+  $validated_pictures    = array();
+  $unvalidated_pictures  = array();
+  
+  $query = 'SELECT file,infos,validated';
+  $query.= ' FROM '.PREFIX_TABLE.'waiting';
+  $query.= ' WHERE storage_category_id = '.$category_id;
+  $query.= ';';
+  $result = mysql_query( $query );
+  while ( $row = mysql_fetch_array( $result ) )
+  {
+    if ( $row['validated'] == 'true' )
+      $validated_pictures[$row['file']] = $row['infos'];
+    else
+      array_push( $unvalidated_pictures, $row['file'] );
+  }
+
+  // we only search among the picture present in the filesystem and not
+  // present in the database yet. If we know that this picture is known as
+  // an uploaded one but not validated, it's not tested neither
+  $unregistered_pictures = array_diff( $fs_pictures
+                                       ,$registered_pictures
+                                       ,$unvalidated_pictures );
+
+  $inserts = array();
+  
+  foreach ( $unregistered_pictures as $unregistered_picture ) {
+    if ( preg_match( '/^[a-zA-Z0-9-_.]+$/', $unregistered_picture ) )
+    {
+      $file_wo_ext = get_filename_wo_extension( $unregistered_picture );
+      $tn_ext = '';
+      foreach ( $conf['picture_ext'] as $ext ) {
+        $test = $conf['prefix_thumbnail'].$file_wo_ext.'.'.$ext;
+        if ( !in_array( $test, $fs_thumbnails ) ) continue;
+        else { $tn_ext = $ext; break; }
+      }
+      // if we found a thumnbnail corresponding to our picture...
+      if ( $tn_ext != '' )
       {
-        $output.= $row['file'];
+        $image_size = @getimagesize( $dir.$unregistered_picture );
+        // (file, storage_category_id, date_available, tn_ext, filesize,
+        // width, height, name, author, comment, date_creation)'
+        $value = '(';
+        $value.= "'".$unregistered_picture."'";
+        $value.= ','.$category_id;
+        $value.= ",'".date( 'Y-m-d' )."'";
+        $value.= ",'".$tn_ext."'";
+        $value.= ','.floor( filesize( $dir.$unregistered_picture) / 1024 );
+        $value.= ','.$image_size[0];
+        $value.= ','.$image_size[1];
+        if ( isset( $validated_pictures[$unregistered_picture] ) )
+        {
+          // retrieving infos from the XML description from waiting table
+          $infos = nl2br( $validated_pictures[$unregistered_picture] );
+
+          $unixtime = getAttribute( $infos, 'date_creation' );
+          if ($unixtime != '') $date_creation ="'".date('Y-m-d',$unixtime)."'";
+          else                 $date_creation = 'NULL';
+          
+          $value.= ",'".getAttribute( $infos, 'name' )."'";
+          $value.= ",'".getAttribute( $infos, 'author' )."'";
+          $value.= ",'".getAttribute( $infos, 'comment')."'";
+          $value.= ','.$date_creation;
+
+          // deleting the waiting element
+          $query = 'DELETE FROM '.PREFIX_TABLE.'waiting';
+          $query.= " WHERE file = '".$unregistered_picture."'";
+          $query.= ' AND storage_category_id = '.$category_id;
+          $query.= ';';
+          mysql_query( $query );
+        }
+        else
+        {
+          $value.= ",'','','',NULL";
+        }
+        $value.= ')';
+        
+        $count_new++;
+        $output.= $unregistered_picture;
         $output.= ' <span style="font-weight:bold;">';
-        $output.= $lang['update_disappeared'].'</span><br />';
+        $output.= $lang['update_research_added'].'</span>';
+        $output.= ' ('.$lang['update_research_tn_ext'].' '.$tn_ext.')';
+        $output.= '<br />';
+        array_push( $inserts, $value );
       }
-      if ( !is_file ( $lien_thumbnail ) )
+      else
       {
-        $output.= $row['file'];
-        $output.= ' : <span style="font-weight:bold;">';
-        $output.= $lang['update_disappeared_tn'].'</span><br />';
+        $output.= '<span style="color:red;">';
+        $output.= $lang['update_missing_tn'].' : '.$unregistered_picture;
+        $output.= ' (<span style="font-weight:bold;">';
+        $output.= $conf['prefix_thumbnail'];
+        $output.= get_filename_wo_extension( $unregistered_picture );
+        $output.= '.XXX</span>';
+        $output.= ', XXX = ';
+        $output.= implode( ', ', $conf['picture_ext'] );
+        $output.= ')</span><br />';
       }
-      // suppression de la base :
-      delete_image( $row['id'] );
-    }
-  }
-                
-  // searching the new images in the directory
-  $pictures = array();          
-  $tn_ext = '';
-  if ( $opendir = opendir( $rep ) )
-  {
-    while ( $file = readdir( $opendir ) )
-    {
-      if ( is_file( $rep.'/'.$file ) and is_image( $rep.'/'.$file ) )
-      {
-        // is the picture waiting for validation by an administrator ?
-        $query = 'SELECT id,validated,infos';
-        $query.= ' FROM '.PREFIX_TABLE.'waiting';
-        $query.= ' WHERE storage_category_id = '.$category_id;
-        $query.= " AND file = '".$file."'";
-        $query.= ';';
-        $result = mysql_query( $query );
-        $waiting = mysql_fetch_array( $result );
-        if (mysql_num_rows( $result ) == 0 or $waiting['validated'] == 'true')
-        {
-          if ( $tn_ext = TN_exists( $rep, $file ) )
-          {
-            // is the picture already in the database ?
-            $query = 'SELECT id';
-            $query.= ' FROM '.PREFIX_TABLE.'images';
-            $query.= ' WHERE storage_category_id = '.$category_id;
-            $query.= " AND file = '".$file."'";
-            $query.= ';';
-            $result = mysql_query( $query );
-            if ( mysql_num_rows( $result ) == 0 )
-            {
-              // the name of the file must not use acentuated characters or
-              // blank space..
-              if ( preg_match( '/^[a-zA-Z0-9-_.]+$/', $file ) )
-              {
-                $picture = array();
-                $picture['file']     = $file;
-                $picture['tn_ext']   = $tn_ext;
-                $picture['date'] = date( 'Y-m-d', filemtime($rep.'/'.$file) );
-                $picture['filesize'] = floor( filesize($rep.'/'.$file) / 1024);
-                $image_size = @getimagesize( $rep.'/'.$file );
-                $picture['width']    = $image_size[0];
-                $picture['height']   = $image_size[1];
-                if ( $waiting['validated'] == 'true' )
-                {
-                  // retrieving infos from the XML description of
-                  // $waiting['infos']
-                  $infos = nl2br( $waiting['infos'] );
-                  $picture['author']        = getAttribute( $infos, 'author' );
-                  $picture['comment']       = getAttribute( $infos, 'comment');
-                  $unixtime = getAttribute( $infos, 'date_creation' );
-                  $picture['date_creation'] = '';
-                  if ( $unixtime != '' )
-                    $picture['date_creation'] = date( 'Y-m-d', $unixtime );
-                  $picture['name']          = getAttribute( $infos, 'name' );
-                  // deleting the waiting element
-                  $query = 'DELETE FROM '.PREFIX_TABLE.'waiting';
-                  $query.= ' WHERE id = '.$waiting['id'];
-                  $query.= ';';
-                  mysql_query( $query );
-                }
-                array_push( $pictures, $picture );
-              }
-              else
-              {
-                $output.= '<span style="color:red;">"'.$file.'" : ';
-                $output.= $lang['update_wrong_dirname'].'</span><br />';
-              }
-
-            }
-          }
-          else
-          {
-            $output.= '<span style="color:red;">';
-            $output.= $lang['update_missing_tn'].' : '.$file;
-            $output.= ' (<span style="font-weight:bold;">';
-            $output.= $conf['prefix_thumbnail'];
-            $output.= get_filename_wo_extension( $file ).'.XXX</span>';
-            $output.= ', XXX = ';
-            $output.= implode( ', ', $conf['picture_ext'] );
-            $output.= ')</span><br />';
-          }
-        }
-      }
-    }
-  }
-  // inserting the pictures found in the directory
-  foreach ( $pictures as $picture ) {
+    }
+    else
+    {
+      $output.= '<span style="color:red;">"'.$unregistered_picture.'" : ';
+      $output.= $lang['update_wrong_dirname'].'</span><br />';
+    }
+  }
+
+  if ( count( $inserts ) > 0 )
+  {
+    // inserts all found pictures
     $query = 'INSERT INTO '.PREFIX_TABLE.'images';
     $query.= ' (file,storage_category_id,date_available,tn_ext';
@@ -282 +334 @@
     $query.= ',name,author,comment,date_creation)';
     $query.= ' VALUES ';
-    $query.= "('".$picture['file']."','".$category_id."'";
-    $query.= ",'".$picture['date']."','".$picture['tn_ext']."'";
-    $query.= ",'".$picture['filesize']."','".$picture['width']."'";
-    $query.= ",'".$picture['height']."','".$picture['name']."'";
-    $query.= ",'".$picture['author']."','".$picture['comment']."'";
-    if ( $picture['date_creation'] != '' )
-    {
-      $query.= ",'".$picture['date_creation']."'";
-    }
-    else
-    {
-      $query.= ',NULL';
-    }
-    $query.= ');';
-    mysql_query( $query );
-    $count_new++;
-    // retrieving the id of newly inserted picture
+    $query.= implode( ',', $inserts );
+    $query.= ';';
+    mysql_query( $query );
+
+    // what are the ids of the pictures in the $category_id ?
+    $ids = array();
+
     $query = 'SELECT id';
     $query.= ' FROM '.PREFIX_TABLE.'images';
     $query.= ' WHERE storage_category_id = '.$category_id;
-    $query.= " AND file = '".$picture['file']."'";
-    $query.= ';';
-    list( $image_id ) = mysql_fetch_array( mysql_query( $query ) );
-    // adding the link between this picture and its storage category
+    $query.= ';';
+    $result = mysql_query( $query );
+    while ( $row = mysql_fetch_array( $result ) )
+    {
+      array_push( $ids, $row['id'] );
+    }
+
+    // recreation of the links between this storage category pictures and
+    // its storage category
+    $query = 'DELETE FROM '.PREFIX_TABLE.'image_category';
+    $query.= ' WHERE category_id = '.$category_id;
+    $query.= ' AND image_id IN ('.implode( ',', $ids ).')';
+    $query.= ';';
+    mysql_query( $query );
+
     $query = 'INSERT INTO '.PREFIX_TABLE.'image_category';
-    $query.= ' (image_id,category_id) VALUES ';
-    $query.= ' ('.$image_id.','.$category_id.')';
-    $query.= ';';
-    mysql_query( $query );
-
-    $output.= $picture['file'];
-    $output.= ' <span style="font-weight:bold;">';
-    $output.= $lang['update_research_added'].'</span>';
-    $output.= ' ('.$lang['update_research_tn_ext'].' '.$picture['tn_ext'].')';
-    $output.= '<br />';
+    $query.= '(category_id,image_id) VALUES ';
+    foreach ( $ids as $num => $image_id ) {
+      if ( $num > 0 ) $query.= ',';
+      $query.= '('.$category_id.','.$image_id.')';
+    }
+    $query.= ';';
+    mysql_query( $query );
   }
   return $output;
@@ -368 +418 @@
 // function also deletes the categories that are in the database and not in
 // the xml_file.
-function insert_remote_category( $xml_dir, $site_id, $id_uppercat, $level )
-{
-  global $conf,$user;
-
+function insert_remote_category( $xml_content, $site_id, $id_uppercat, $level )
+{
+  global $conf, $page, $user, $lang;
+ 
+  $uppercats = '';
   $output = '';
-  $categories = array();
-  $list_dirs = getChildren( $xml_dir, 'dir'.$level );
-  for ( $i = 0; $i < sizeof( $list_dirs ); $i++ )
-  {
-    // is the category already existing ?
-    $category_id = '';
-    $dir = getAttribute( $list_dirs[$i], 'name' );
-    $categories[$i] = $dir;
-
+  // 0. retrieving informations on the category to display
+  $cat_directory = '../galleries';
+                
+  if ( is_numeric( $id_uppercat ) )
+  {
+    $query = 'SELECT name,uppercats,dir';
+    $query.= ' FROM '.PREFIX_TABLE.'categories';
+    $query.= ' WHERE id = '.$id_uppercat;
+    $query.= ';';
+    $row = mysql_fetch_array( mysql_query( $query ) );
+    $uppercats = $row['uppercats'];
+    $name      = $row['name'];
+
+    // 1. display the category name to update
     $src = './template/'.$user['template'].'/admin/images/puce.gif';
-    $output.= '<img src="'.$src.'" alt="&gt;" />';
-    $output.= '<span style="font-weight:bold;">'.$dir.'</span>';
+    $output = '<img src="'.$src.'" alt="&gt;" />';
+    $output.= '<span style="font-weight:bold;">'.$name.'</span>';
+    $output.= ' [ '.$row['dir'].' ]';
     $output.= '<div class="retrait">';
 
-    $query = 'SELECT id';
-    $query.= ' FROM '.PREFIX_TABLE.'categories';
-    $query.= ' WHERE site_id = '.$site_id;
-    $query.= " AND dir = '".$dir."'";
-    if ( $id_uppercat == 'NULL' )
-    {
-      $query.= ' AND id_uppercat IS NULL';
-    }
-    else
-    {
-      $query.= ' AND id_uppercat = '.$id_uppercat;
-    }
-    $query.= ';';
-    $result = mysql_query( $query );
-    if ( mysql_num_rows( $result ) == 0 )
-    {
-      $name = str_replace( '_', ' ', $dir );
-      // we have to create the category
-      $query = 'INSERT INTO '.PREFIX_TABLE.'categories';
-      $query.= ' (name,dir,site_id,id_uppercat) VALUES ';
-      $query.= "('".$name."','".$dir."',".$site_id;
-      if ( !is_numeric( $id_uppercat ) )
-      {
-        $query.= ',NULL';
-      }
-      else
-      {
-        $query.= ','.$id_uppercat;
-      }
-      $query.= ');';
-      mysql_query( $query );
-      $category_id = mysql_insert_id();
-    }
-    else
-    {
-      // we get the already registered id
-      $row = mysql_fetch_array( $result );
-      $category_id = $row['id'];
-    }
-    $output.= insert_remote_image( $list_dirs[$i], $category_id );
-    $output.= insert_remote_category( $list_dirs[$i], $site_id,
-                                      $category_id, $level+1 );
-    $output.= '</div>';
-  }
-  // we have to remove the categories of the database not present in the xml
-  // file (ie deleted from the picture storage server)
-  $query = 'SELECT dir,id';
+    // 2. we search pictures of the category only if the update is for all
+    //    or a cat_id is specified
+    $output.= insert_remote_image( $xml_content, $id_uppercat );
+  }
+
+  // $xml_dirs contains dir names contained in the xml file for this
+  // id_uppercat
+  $xml_dirs = array();
+  $temp_dirs = getChildren( $xml_content, 'dir'.$level );
+  foreach ( $temp_dirs as $temp_dir ) {
+    array_push( $xml_dirs, getAttribute( $temp_dir, 'name' ) );
+  }
+
+  // $database_dirs contains dir names contained in the database for this
+  // id_uppercat and site_id
+  $database_dirs = array();
+  $query = 'SELECT id,dir';
   $query.= ' FROM '.PREFIX_TABLE.'categories';
   $query.= ' WHERE site_id = '.$site_id;
-  if ( !is_numeric( $id_uppercat ) )
-  {
-    $query.= ' AND id_uppercat IS NULL';
-  }
-  else
-  {
-    $query.= ' AND id_uppercat = '.$id_uppercat;
-  }
-  $query.= ';';
-  $result = mysql_query( $query );
-  while ( $row = mysql_fetch_array( $result ) )
-  {
-    // is the category in the xml file ?
-    if ( !in_array( $row['dir'], $categories ) )
-    {
-      delete_category( $row['id'] );
-    }
-  }
+  if (!is_numeric($id_uppercat)) $query.= ' AND id_uppercat IS NULL';
+  else                           $query.= ' AND id_uppercat = '.$id_uppercat;
+  $query.= ' AND dir IS NOT NULL'; // virtual categories not taken
+  $query.= ';';
+  $result = mysql_query( $query );
+  while ( $row = mysql_fetch_array( $result ) )
+  {
+    $database_dirs[$row['id']] = $row['dir'];
+  }
+  
+  // 3. we have to remove the categories of the database not present anymore
+  foreach ( $database_dirs as $id => $dir ) {
+    if ( !in_array( $dir, $xml_dirs ) ) delete_category( $id );
+  }
+
+  // array of new categories to insert
+  $inserts = array();
+  
+  foreach ( $xml_dirs as $xml_dir ) {
+    // 5. Is the category already existing ? we create a subcat if not
+    //    existing
+    $category_id = array_search( $xml_dir, $database_dirs );
+    if ( !is_numeric( $category_id ) )
+    {
+      $name = str_replace( '_', ' ', $xml_dir );
+
+      $value = "('".$xml_dir."','".$name."',".$site_id;
+      if ( !is_numeric( $id_uppercat ) ) $value.= ',NULL';
+      else                               $value.= ','.$id_uppercat;
+      $value.= ",'undef'";
+      $value.= ')';
+      array_push( $inserts, $value );
+    }
+  }
+
+  // we have to create the category
+  if ( count( $inserts ) > 0 )
+  {
+    $query = 'INSERT INTO '.PREFIX_TABLE.'categories';
+    $query.= ' (dir,name,site_id,id_uppercat,uppercats) VALUES ';
+    $query.= implode( ',', $inserts );
+    $query.= ';';
+    mysql_query( $query );
+    // updating uppercats field
+    $query = 'UPDATE '.PREFIX_TABLE.'categories';
+    $query.= ' SET uppercats = ';
+    if ( $uppercats != '' ) $query.= "CONCAT('".$uppercats."',',',id)";
+    else                    $query.= 'id';
+    $query.= ' WHERE id_uppercat ';
+    if (!is_numeric($id_uppercat)) $query.= 'IS NULL';
+    else                           $query.= '= '.$id_uppercat;
+    $query.= ';';
+    mysql_query( $query );
+  }
+
+  // Recursive call on the sub-categories (not virtual ones)
+  $query = 'SELECT id,dir';
+  $query.= ' FROM '.PREFIX_TABLE.'categories';
+  $query.= ' WHERE site_id = '.$site_id;
+  if (!is_numeric($id_uppercat)) $query.= ' AND id_uppercat IS NULL';
+  else                           $query.= ' AND id_uppercat = '.$id_uppercat;
+  $query.= ' AND dir IS NOT NULL'; // virtual categories not taken
+  $query.= ';';
+  $result = mysql_query( $query );
+  while ( $row = mysql_fetch_array( $result ) )
+  {
+    $database_dirs[$row['dir']] = $row['id'];
+  }
+  foreach ( $temp_dirs as $temp_dir ) {
+    $dir = getAttribute( $temp_dir, 'name' );
+    $id_uppercat = $database_dirs[$dir];
+    $output.= insert_remote_category( $temp_dir, $site_id,
+                                      $id_uppercat,$level+1 );
+  }
+
+  if ( is_numeric( $id_uppercat ) ) $output.= '</div>';
 
   return $output;
 }
-        
+
 // insert_remote_image searchs the "root" node of the xml_dir given and
 // insert the contained pictures if the are not in the database yet.
@@ -466 +551 @@
   $output = '';
   $root = getChild( $xml_dir, 'root' );
-  $pictures = array();
+
+  $fs_pictures = array();
   $xml_pictures = getChildren( $root, 'picture' );
-  for ( $j = 0; $j < sizeof( $xml_pictures ); $j++ )
-  {
-    //<picture file="albatros.jpg" tn_ext="png" date="2002-04-14"
-    //  filesize="35" width="640" height="480" />
-    $file     = getAttribute( $xml_pictures[$j], 'file' );
-    $tn_ext   = getAttribute( $xml_pictures[$j], 'tn_ext' );
-    $date     = getAttribute( $xml_pictures[$j], 'date' ); 
-    $filesize = getAttribute( $xml_pictures[$j], 'filesize' );
-    $width    = getAttribute( $xml_pictures[$j], 'width' );
-    $height   = getAttribute( $xml_pictures[$j], 'height' );
-                        
-    $pictures[$j] = $file;
-                        
+  foreach ( $xml_pictures as $xml_picture ) {
+    array_push( $fs_pictures, getAttribute( $xml_picture, 'file' ) );
+  }
+  
+  // we have to delete all the images from the database that are not in the
+  // directory anymore (not in the XML anymore)
+  $query = 'SELECT id,file';
+  $query.= ' FROM '.PREFIX_TABLE.'images';
+  $query.= ' WHERE storage_category_id = '.$category_id;
+  $query.= ';';
+  $result = mysql_query( $query );
+  while ( $row = mysql_fetch_array( $result ) )
+  {
+    if ( !in_array( $row['file'], $fs_pictures ) )
+    {
+      $output.= $row['file'];
+      $output.= ' <span style="font-weight:bold;">';
+      $output.= $lang['update_disappeared'].'</span><br />';
+      delete_image( $row['id'] );
+    }
+  }
+
+  $database_pictures = array();
+  $query = 'SELECT file';
+  $query.= ' FROM '.PREFIX_TABLE.'images';
+  $query.= ' WHERE storage_category_id = '.$category_id;
+  $query.= ';';
+  $result = mysql_query( $query );
+  while ( $row = mysql_fetch_array( $result ) )
+  {
+    array_push( $database_pictures, $row['file'] );
+  }
+
+  $inserts = array();
+  $xml_pictures = getChildren( $root, 'picture' );
+  foreach ( $xml_pictures as $xml_picture ) {
+    // <picture file="albatros.jpg" tn_ext="png" filesize="35" width="640"
+    // height="480" />
+    $file = getAttribute( $xml_picture, 'file' );
+
     // is the picture already existing in the database ?
-    $query = 'SELECT id,tn_ext';
-    $query.= ' FROM '.PREFIX_TABLE.'images';
-    $query.= ' WHERE storage_category_id = '.$category_id;
-    $query.= " AND file = '".$file."'";
-    $query.= ';';
-    $result = mysql_query( $query );
-    $query = '';
-    if ( mysql_num_rows( $result ) == 0 )
-    {
-      $query = 'INSERT INTO '.PREFIX_TABLE.'images';
-      $query.= ' (file,storage_category_id,date_available,tn_ext';
-      $query.= ',filesize,width,height)';
-      $query.= ' VALUES (';
-      $query.= "'".$file."'";
-      $query.= ",'".$category_id."'";
-      $query.= ",'".$date."'";
-      $query.= ",'".$tn_ext."'";
-      $query.= ",'".$filesize."'";
-      $query.= ",'".$width."'";
-      $query.= ",'".$height."'";
-      $query.= ')';
-      $query.= ';';
-      mysql_query( $query );
-      // retrieving the id of newly inserted picture
-      $query = 'SELECT id';
-      $query.= ' FROM '.PREFIX_TABLE.'images';
-      $query.= ' WHERE storage_category_id = '.$category_id;
-      $query.= " AND file = '".$file."'";
-      $query.= ';';
-      list( $image_id ) = mysql_fetch_array( mysql_query( $query ) );
-      // adding the link between this picture and its storage category
-      $query = 'INSERT INTO '.PREFIX_TABLE.'image_category';
-      $query.= ' (image_id,category_id) VALUES ';
-      $query.= ' ('.$image_id.','.$category_id.')';
-      $query.= ';';
-      mysql_query( $query );
-
+    if ( !in_array( $file, $database_pictures ) )
+    {
+      $tn_ext = getAttribute( $xml_picture, 'tn_ext' );
+      // (file, storage_category_id, date_available, tn_ext, filesize,
+      // width, height)
+      $value = '(';
+      $value.= "'".$file."'";
+      $value.= ','.$category_id;
+      $value.= ",'".date( 'Y-m-d' )."'";
+      $value.= ",'".$tn_ext."'";
+      $value.= ','.getAttribute( $xml_picture, 'filesize' );
+      $value.= ','.getAttribute( $xml_picture, 'width' );
+      $value.= ','.getAttribute( $xml_picture, 'height' );
+      $value.= ')';
+
+      $count_new++;
       $output.= $file;
       $output.= ' <span style="font-weight:bold;">';
       $output.= $lang['update_research_added'].'</span>';
-      $output.= ' ('.$lang['update_research_tn_ext'].' '.$tn_ext.')<br />';
-
-      $count_new++;
-    }
-    else
-    {
-      // is the tn_ext the same in the xml file and in the database ?
-      $row = mysql_fetch_array( $result );
-      if ( $row['tn_ext'] != $tn_ext )
-      {
-        $query = 'UPDATE '.PREFIX_TABLE.'images';
-        $query.= ' SET';
-        $query.= " tn_ext = '".$tn_ext."'";
-        $query.= ' WHERE storage_category_id = '.$category_id;
-        $query.= " AND file = '".$file."'";
-        $query.= ';';
-      }
-    }
-    // execution of the query
-    if ( $query != '' )
-    {
-      mysql_query( $query );
-    }
-  }
-  // we have to remove the pictures of the database not present in the xml file
-  // (ie deleted from the picture storage server)
-  $query = 'SELECT id,file';
-  $query.= ' FROM '.PREFIX_TABLE.'images';
-  $query.= ' WHERE storage_category_id = '.$category_id;
-  $query.= ';';
-  $result = mysql_query( $query );
-  while ( $row = mysql_fetch_array( $result ) )
-  {
-    // is the file in the xml file ?
-    if ( !in_array( $row['file'], $pictures ) )
-    {
-      delete_image( $row['id'] );
-    }
-  }
+      $output.= ' ('.$lang['update_research_tn_ext'].' '.$tn_ext.')';
+      $output.= '<br />';
+      array_push( $inserts, $value );
+    }
+  }
+
+  if ( count( $inserts ) > 0 )
+  {
+    // inserts all found pictures
+    $query = 'INSERT INTO '.PREFIX_TABLE.'images';
+    $query.= ' (file,storage_category_id,date_available,tn_ext';
+    $query.= ',filesize,width,height)';
+    $query.= ' VALUES ';
+    $query.= implode( ',', $inserts );
+    $query.= ';';
+    mysql_query( $query );
+
+    // what are the ids of the pictures in the $category_id ?
+    $ids = array();
+
+    $query = 'SELECT id';
+    $query.= ' FROM '.PREFIX_TABLE.'images';
+    $query.= ' WHERE storage_category_id = '.$category_id;
+    $query.= ';';
+    $result = mysql_query( $query );
+    while ( $row = mysql_fetch_array( $result ) )
+    {
+      array_push( $ids, $row['id'] );
+    }
+
+    // recreation of the links between this storage category pictures and
+    // its storage category
+    $query = 'DELETE FROM '.PREFIX_TABLE.'image_category';
+    $query.= ' WHERE category_id = '.$category_id;
+    $query.= ' AND image_id IN ('.implode( ',', $ids ).')';
+    $query.= ';';
+    mysql_query( $query );
+
+    $query = 'INSERT INTO '.PREFIX_TABLE.'image_category';
+    $query.= '(category_id,image_id) VALUES ';
+    foreach ( $ids as $num => $image_id ) {
+      if ( $num > 0 ) $query.= ',';
+      $query.= '('.$category_id.','.$image_id.')';
+    }
+    $query.= ';';
+    mysql_query( $query );
+  }
+
   return $output;
 }
@@ -570 +671 @@
 templatize_array( $tpl, 'lang', $sub );
 $vtp->setGlobalVar( $sub, 'user_template', $user['template'] );
-//-------------------------------------------------------- categories structure
-$page['plain_structure'] = get_plain_structure();
 //-------------------------------------------- introduction : choices of update
 // Display choice if "update" var is not specified
-check_cat_id( $_GET['update'] );
-if ( !isset( $_GET['update'] )
-     and !( isset( $page['cat'] )
-            or $_GET['update'] == 'cats'
-            or $_GET['update'] == 'all' ) )
+if (!isset( $_GET['update'] ))
 {
   $vtp->addSession( $sub, 'introduction' );
@@ -592 +687 @@
 else
 {
+  check_cat_id( $_GET['update'] );
+  $start = get_moment();
   $count_new = 0;
   $count_deleted = 0;
@@ -603 +700 @@
     $categories = insert_local_category( 'NULL' );
   }
+  $end = get_moment();
+  echo get_elapsed_time( $start, $end ).' for update <br />';
   $vtp->setVar( $sub, 'local_update.categories', $categories );
   $vtp->setVar( $sub, 'local_update.count_new', $count_new );
@@ -614 +713 @@
   $count_deleted = 0;
   $vtp->addSession( $sub, 'remote_update' );
-
+  
+  $start = get_moment();
   remote_images();
+  $end = get_moment();
+  echo get_elapsed_time( $start, $end ).' for remote_images<br />';
+  
   $vtp->setVar( $sub, 'remote_update.count_new', $count_new );
   $vtp->setVar( $sub, 'remote_update.count_deleted', $count_deleted );
@@ -622 +725 @@
 }
 //---------------------------------------- update informations about categories
-update_category( 'all' );
+if ( isset( $_GET['update'] )
+     or isset( $page['cat'] )
+     or @is_file( './listing.xml' ) )
+{
+  $start = get_moment();
+  update_category( 'all' );
+  $end = get_moment();
+  echo get_elapsed_time( $start, $end ).' for update_category( all )<br />';
+
+  $start = get_moment();
+  synchronize_all_users();
+  $end = get_moment();
+  echo get_elapsed_time( $start, $end ).' for synchronize_all_users<br />';
+}
 //----------------------------------------------------------- sending html code
 $vtp->Parse( $handle , 'sub', $sub );

trunk/admin/user_list.php

@@ -59 +59 @@
   $row = mysql_fetch_array( mysql_query( $query ) );
   // confirm user deletion ?
-  if ( $_GET['confirm'] != 1 )
+  if ( !isset( $_GET['confirm'] ) )
   {
     $vtp->addSession( $sub, 'deletion' );
@@ -110 +110 @@
   $action = './admin.php?'.$_SERVER['QUERY_STRING'];
   $vtp->setVar( $sub, 'add_user.form_action', $action );
-  $vtp->setVar( $sub, 'add_user.f_username', $_POST['username'] );
+  if (isset( $_POST['username']))
+          $vtp->setVar( $sub, 'add_user.f_username', $_POST['username'] );
   $vtp->closeSession( $sub, 'add_user' );
   
@@ -150 +151 @@
     $vtp->addSession( $sub, 'user' );
     // checkbox for mail management if the user has a mail address
-    if ( $row['mail_address'] != '' and $row['username'] != 'guest' )
+    if ( isset( $row['mail_address'] ) and $row['username'] != 'guest' )
     {
       $vtp->addSession( $sub, 'checkbox' );
@@ -230 +231 @@
     while ( $row = mysql_fetch_array( $result ) )
     {
-      if ( $_POST['mail-'.$row['id']] == 1 )
+      if ( isset( $_POST['mail-'.$row['id']] ) )
         array_push( $mails, $row['mail_address'] );
     }

trunk/admin/user_modify.php

@@ -40 +40 @@
 $page['username'] = $row['username'];
 $page['status'] = $row['status'];
+if ( !isset( $row['mail_address'] ) ) $row['mail_address'] = '';
 $page['mail_address'] = $row['mail_address'];
 // user is not modifiable if :
@@ -63 +64 @@
   // shall we use a new password and overwrite the old one ?
   $use_new_password = false;
-  if ( $_POST['use_new_pwd'] == 1)
-  {
-    $use_new_password = true;
-  }
+  if ( isset( $_POST['use_new_pwd'] ) ) $use_new_password = true;
   // if we try to update the webmaster infos, we have to set the status to
   // 'admin'
@@ -89 +87 @@
   {
     $dissociate = 'dissociate-'.$row['id'];
-    if ( $_POST[$dissociate] == 1 )
+    if ( isset( $_POST[$dissociate] ) )
     {
       $query = 'DELETE FROM '.PREFIX_TABLE.'user_group';
@@ -104 +102 @@
   $query.= ';';
   mysql_query( $query );
+  // synchronize category informations for this user
+  synchronize_user( $_GET['user_id'] );
 }
 //-------------------------------------------------------------- errors display
@@ -125 +125 @@
   $vtp->setVar( $sub, 'confirmation.url', $url );
   $vtp->closeSession( $sub, 'confirmation' );
-  if ( $use_new_pwd )
+  if ( $use_new_password )
   {
     $vtp->addSession( $sub, 'password_updated' );

trunk/admin/user_perm.php

@@ -53 +53 @@
   }
   check_favorites( $_GET['user_id'] );
+  synchronize_user( $_GET['user_id'] );
   $vtp->addSession( $sub, 'confirmation' );
   $url = './admin.php?page=user_list';
@@ -59 +60 @@
 }
 //---------------------------------------------------------------- form display
-$restrictions = get_restrictions( $_GET['user_id'], $page['user_status'],
+$restrictions = get_user_restrictions( $_GET['user_id'], $page['user_status'],
                                   false, false );
 $action = './admin.php?page=user_perm&user_id='.$_GET['user_id'];

trunk/admin/waiting.php

@@ -117 +117 @@
   $vtp->setVar( $sub, 'picture.file', $row['file'] );
   // is there an existing associated thumnail ?
-  if ( $row['tn_ext'] != '' )
+  if ( isset( $row['tn_ext'] ) and $row['tn_ext'] != '' )
   {
     $vtp->addSession( $sub, 'thumbnail' );

trunk/category.php

@@ -17 +17 @@
  *                                                                         *
  ***************************************************************************/
-// determine the initial instant to indicate the generation time of this page
-$t1 = explode( ' ', microtime() );
-$t2 = explode( '.', $t1[0] );
-$t2 = $t1[1].'.'.$t2[1];
-//----------------------------------------------------------- personnal include
-include_once( './include/init.inc.php' );
+//----------------------------------------------------------- include
+$phpwg_root_path = './';
+include_once( $phpwg_root_path.'common.php' );
 //---------------------------------------------------------------------- logout
-if ( $_GET['act'] == 'logout' and isset( $_COOKIE['id'] ) )
+if ( isset( $_GET['act'] )
+     and $_GET['act'] == 'logout'
+     and isset( $_COOKIE['id'] ) )
 {
   // cookie deletion if exists
@@ -35 +34 @@
 }
 //-------------------------------------------------- access authorization check
-// creating the plain structure : array of all the available categories and
-// their relative informations, see the definition of the function
-// get_plain_structure for further details.
-$page['plain_structure'] = get_plain_structure();
-
-check_cat_id( $_GET['cat'] );
+if ( isset( $_GET['cat'] ) ) check_cat_id( $_GET['cat'] );
 check_login_authorization();
 if ( isset( $page['cat'] ) and is_numeric( $page['cat'] ) )
@@ -47 +41 @@
 }
 //-------------------------------------------------------------- initialization
+// detection of the start picture to display
+if ( !isset( $_GET['start'] )
+     or !is_numeric( $_GET['start'] )
+     or ( is_numeric( $_GET['start'] ) and $_GET['start'] < 0 ) )
+  $page['start'] = 0;
+else
+  $page['start'] = $_GET['start'];
+
+initialize_category();
+
 // creation of the array containing the cat ids to expand in the menu
 // $page['tab_expand'] contains an array with the category ids
@@ -57 +61 @@
     if ( is_numeric( $id ) ) array_push( $page['tab_expand'], $id );
   }
-  if ( is_numeric( $page['cat'] ) )
-  {
-    // the category displayed (in the URL cat=23) must be seen in the menu ->
-    // parent categories must be expanded
-    $parent = $page['plain_structure'][$page['cat']]['id_uppercat'];
-    while ( $parent != '' )
-    {
-      array_push( $page['tab_expand'], $parent );
-      $parent = $page['plain_structure'][$parent]['id_uppercat'];
-    }
-  }
-  $page['expand'] = implode( ',', $page['tab_expand'] );
-}
+}
+if ( isset($page['cat']) && is_numeric( $page['cat'] ) )
+{
+  // the category displayed (in the URL cat=23) must be seen in the menu ->
+  // parent categories must be expanded
+  $uppercats = explode( ',', $page['uppercats'] );
+  foreach ( $uppercats as $uppercat ) {
+    array_push( $page['tab_expand'], $uppercat );
+  }
+}
+$page['tab_expand'] = array_unique( $page['tab_expand'] );
+$page['expand'] = implode( ',', $page['tab_expand'] );
 // in case of expanding all authorized cats
 // The $page['expand'] equals 'all' and
 // $page['tab_expand'] contains all the authorized cat ids
-if ( $user['expand'] or $_GET['expand'] == 'all' )
+if ( $user['expand']
+     or ( isset( $_GET['expand'] ) and $_GET['expand'] == 'all' ) )
 {
   $page['tab_expand'] = array();
   $page['expand'] = 'all';
-}
-// detection of the start picture to display
-if ( !isset( $_GET['start'] )
-     or !is_numeric( $_GET['start'] )
-     or ( is_numeric( $_GET['start'] ) and $_GET['start'] < 0 ) )
-{
-  $page['start'] = 0;
-}
-else
-{
-  $page['start'] = $_GET['start'];
 }
 // Sometimes, a "num" is provided in the URL. It is the number
@@ -93 +86 @@
 // We have to find the right $page['start'] that show the num picture
 // in this category
-if ( is_numeric( $_GET['num'] ) and $_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'] );
@@ -99 +94 @@
 }
 // creating the structure of the categories (useful for displaying the menu)
-$page['structure'] = create_structure( '', $user['restrictions'] );
+// creating the plain structure : array of all the available categories and
+// their relative informations, see the definition of the function
+// get_user_plain_structure for further details.
+$page['plain_structure'] = get_user_plain_structure();
+$page['structure'] = create_user_structure( '' );
 $page['structure'] = update_structure( $page['structure'] );
-initialize_category();
+
 //----------------------------------------------------- template initialization
-$vtp = new VTemplate;
+
+//
+// Start output of page
+//
+$title = $page['title'];
+include('include/page_header.php');
+
 $handle = $vtp->Open( './template/'.$user['template'].'/category.vtp' );
 initialize_template();
@@ -109 +114 @@
   'categories','hint_category','sub-cat','images_available','total',
   'title_menu','nb_image_category','send_mail','title_send_mail',
-  'generation_time','connected_user','recent_image','days','generation_time',
+  'connected_user','recent_image','days',
   'favorite_cat_hint','favorite_cat','stats','most_visited_cat_hint',
   'most_visited_cat','recent_cat','recent_cat_hint','upload_picture',
@@ -115 +120 @@
 templatize_array( $tpl, 'lang', $handle );
 
-$tpl = array( 'mail_webmaster','webmaster','top_number','version','site_url' );
+$tpl = array( 'mail_webmaster','webmaster','top_number');
 templatize_array( $tpl, 'conf', $handle );
 
@@ -121 +126 @@
 templatize_array( $tpl, 'user', $handle );
 
-$tpl = array( 'title','navigation_bar','cat_comment','cat_nb_images' );
+$tpl = array( 'navigation_bar','cat_comment','cat_nb_images' );
 templatize_array( $tpl, 'page', $handle );
 
@@ -128 +133 @@
 $icon_long = get_icon( time() - ( $user['short_period'] * 24 * 60 * 60 + 1 ) );
 $vtp->setGlobalVar( $handle, 'icon_long', $icon_long );
-$nb_total_pictures = count_images( $page['structure'] );
+$nb_total_pictures = count_user_total_images();
 $vtp->setGlobalVar( $handle, 'nb_total_pictures',$nb_total_pictures );
+
 //------------------------------------------------------------- categories menu
+$vtp->setVar( $handle, 'home_url', add_session_id( 'category.php' ) );
 // normal categories
 foreach ( $page['structure'] as $category ) {
@@ -144 +151 @@
   // searching the number of favorite picture
   $query = 'SELECT COUNT(*) AS count';
-  $query.= ' FROM '.PREFIX_TABLE.'favorites';
+  $query.= ' FROM '.FAVORITES_TABLE;
   $query.= ' WHERE user_id = '.$user['id'].';';
   $result = mysql_query( $query );
@@ -182 +189 @@
   // customization link
   $vtp->addSession( $handle, 'summary' );
-  $url = './profile.php?cat='.$page['cat'];
-  $url.= '&amp;expand='.$page['expand'];
-  if ( $page['cat'] == 'search' )
+  $url = './profile.php';
+  if (isset($page['cat']) && isset($page['expand']))
+        $url.='?cat='.$page['cat'].'&amp;expand='.$page['expand'];
+  if ( isset($page['cat']) && $page['cat'] == 'search' )
   {
     $url.= '&amp;search='.$_GET['search'].'&amp;mode='.$_GET['mode'];
@@ -254 +262 @@
   $query = 'SELECT distinct(id),file,date_available,tn_ext,name,filesize';
   $query.= ',storage_category_id';
-  $query.= ' FROM '.PREFIX_TABLE.'images AS i';
-  $query.= ' LEFT JOIN '.PREFIX_TABLE.'image_category AS ic ON id=ic.image_id';
+  $query.= ' FROM '.IMAGES_TABLE.' AS i';
+  $query.=' INNER JOIN '.IMAGE_CATEGORY_TABLE.' AS ic ON id=ic.image_id';
   $query.= $page['where'];
   $query.= $conf['order_by'];
@@ -271 +279 @@
   {
     // retrieving the storage dir of the picture
-    if ( $array_cat_directories[$row['storage_category_id']] == '' )
+    if ( !isset($array_cat_directories[$row['storage_category_id']]))
     {
       $array_cat_directories[$row['storage_category_id']] =
@@ -280 +288 @@
     $file = get_filename_wo_extension( $row['file'] );
     // name of the picture
-    if ( $row['name'] != '' ) $name = $row['name'];
-    else                      $name = str_replace( '_', ' ', $file );
+    if ( isset( $row['name'] ) and $row['name'] != '' ) $name = $row['name'];
+    else $name = str_replace( '_', ' ', $file );
 
     if ( $page['cat'] == 'search' )
@@ -321 +329 @@
       $vtp->addSession( $handle, 'nb_comments' );
       $query = 'SELECT COUNT(*) AS nb_comments';
-      $query.= ' FROM '.PREFIX_TABLE.'comments';
-      $query.= ' WHERE image_id = '.$row['id'];
+      $query.= ' FROM '.COMMENTS_TABLE.' WHERE image_id = '.$row['id'];
       $query.= " AND validated = 'true'";
       $query.= ';';
@@ -351 +358 @@
 elseif ( ( isset( $page['cat'] )
            and is_numeric( $page['cat'] )
-           and $page['cat_nb_images'] == 0 )
-         or $_GET['cat'] == '' )
+           and $page['cat_nb_images'] == 0
+           and $page['plain_structure'][$page['cat']]['nb_sub_categories'] > 0)
+         or (!isset($_GET['cat'])))
 {
   $vtp->addSession( $handle, 'thumbnails' );
   $vtp->addSession( $handle, 'line' );
 
-  $subcats = get_non_empty_subcat_ids( $page['cat'] );
+  $subcats=array();
+  if (isset($page['cat'])) $subcats = get_non_empty_subcat_ids( $page['cat'] );
+  else                     $subcats = get_non_empty_subcat_ids( '' );
   $cell_number = 1;
   $i = 0;
@@ -369 +379 @@
     // searching the representative picture of the category
     $query = 'SELECT representative_picture_id';
-    $query.= ' FROM '.PREFIX_TABLE.'categories';
-    $query.= ' WHERE id = '.$non_empty_id;
+    $query.= ' FROM '.CATEGORIES_TABLE.' WHERE id = '.$non_empty_id;
+    $query.= ';';
     $row = mysql_fetch_array( mysql_query( $query ) );
     
     $query = 'SELECT file,tn_ext,storage_category_id';
-    $query.= ' FROM '.PREFIX_TABLE.'images';
-    $query.= ' LEFT JOIN '.PREFIX_TABLE.'image_category ON id = image_id';
+    $query.= ' FROM '.IMAGES_TABLE.', '.IMAGE_CATEGORY_TABLE;
     $query.= ' WHERE category_id = '.$non_empty_id;
+    $query.= ' AND id = image_id';
     // if the category has a representative picture, this is its thumbnail
-    // tha will be displayed !
-    if ( $row['representative_picture_id'] != '' )
+    // that will be displayed !
+    if ( isset( $row['representative_picture_id'] ) )
       $query.= ' AND id = '.$row['representative_picture_id'];
     else
@@ -398 +408 @@
 
     $url_link = './category.php?cat='.$subcat_id;
-    if ( !in_array( $page['cat'], $page['tab_expand'] ) )
+    if ( isset($page['cat'])&& !in_array( $page['cat'], $page['tab_expand'] ) )
     {
       array_push( $page['tab_expand'], $page['cat'] );
@@ -460 +470 @@
                   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'].'&amp;expand='.$page['expand'];
+      $vtp->setVar( $handle, 'upload.url', add_session_id( $url ) );
+      $vtp->closeSession( $handle, 'upload' );
+    }
   }
   else
@@ -465 +485 @@
     $vtp->setVar( $handle, 'cat_infos.cat_name', $page['title'] );
   }
-  // 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'].'&amp;expand='.$page['expand'];
-    $vtp->setVar( $handle, 'upload.url', add_session_id( $url ) );
-    $vtp->closeSession( $handle, 'upload' );
-  }
+  
   $vtp->closeSession( $handle, 'cat_infos' );
 }
@@ -480 +491 @@
 pwg_log( 'category', $page['title'] );
 mysql_close();
-//------------------------------------------------------------- generation time
-$time = get_elapsed_time( $t2, get_moment() );
-$vtp->setGlobalVar( $handle, 'time', $time );
 //----------------------------------------------------------- html code display
 $code = $vtp->Display( $handle, 0 );
 echo $code;
+
+include('include/page_tail.php');
 ?>

trunk/comments.php

@@ -18 +18 @@
  ***************************************************************************/
 
-include_once( './include/init.inc.php' );
+//----------------------------------------------------------- include
+$phpwg_root_path = './';
+include_once( $phpwg_root_path.'common.php' );
+
 //------------------------------------------------------------------- functions
 function display_pictures( $mysql_result, $maxtime, $forbidden_cat_ids )
@@ -47 +50 @@
     $category_id = $subrow['category_id'];
 
-    if ( $array_cat_directories[$category_id] == '' )
+    if ( !isset($array_cat_directories[$category_id]))
     {
       $array_cat_directories[$category_id] =
@@ -134 +137 @@
 }
 //----------------------------------------------------- template initialization
-$vtp = new VTemplate;
+//
+// Start output of page
+//
+$title= $lang['title_comments'];
+include('include/page_header.php');
+
 $handle = $vtp->Open( './template/'.$user['template'].'/comments.vtp' );
 initialize_template();
 $tpl = array( 'title_comments','stats_last_days','search_return_main_page' );
 templatize_array( $tpl, 'lang', $handle );
-$vtp->setGlobalVar( $handle, 'text_color', $user['couleur_text'] );
 //--------------------------------------------------- number of days to display
-if ( isset( $_GET['last_days'] ) ) define( "MAX_DAYS", $_GET['last_days'] );
-else                               define( "MAX_DAYS", 0 );
+if ( isset( $_GET['last_days'] ) ) define( 'MAX_DAYS', $_GET['last_days'] );
+else                               define( 'MAX_DAYS', 0 );
 //----------------------------------------- non specific section initialization
 $array_cat_directories = array();
@@ -169 +176 @@
 $query.= ' WHERE c.image_id = ic.image_id';
 $query.= ' AND date > '.$maxtime;
+$query.= " AND validated = 'true'";
 // we must not show pictures of a forbidden category
-$restricted_cats = get_all_restrictions( $user['id'],$user['status'] );
-if ( count( $restricted_cats ) > 0 )
+if ( $user['forbidden_categories'] != '' )
 {
-  $query.= ' AND category_id NOT IN (';
-  foreach ( $restricted_cats as $i => $restricted_cat ) {
-    if ( $i > 0 ) $query.= ',';
-    $query.= $restricted_cat;
-  }
-  $query.= ')';
+  $query.= ' AND category_id NOT IN ';
+  $query.= '('.$user['forbidden_categories'].')';
 }
 $query.= ' ORDER BY ic.image_id DESC';
 $query.= ';';
 $result = mysql_query( $query );
-display_pictures( $result, $maxtime, $restricted_cats );
+display_pictures( $result, $maxtime, $user['restrictions'] );
 //----------------------------------------------------------- html code display
 $code = $vtp->Display( $handle, 0 );
 echo $code;
+include('include/page_tail.php');
 ?>

trunk/identification.php

@@ -18 +18 @@
  ***************************************************************************/
 
-//----------------------------------------------------------- personnal include
-include_once( "./include/init.inc.php" );
+//----------------------------------------------------------- include
+$phpwg_root_path = './';
+include_once( $phpwg_root_path.'common.php' );
+
 //-------------------------------------------------------------- identification
 $errors = array();
@@ -26 +28 @@
   // retrieving the encrypted password of the login submitted
   $query = 'SELECT password';
-  $query.= ' FROM '.PREFIX_TABLE.'users';
+  $query.= ' FROM '.USERS_TABLE;
   $query.= " WHERE username = '".$_POST['login']."';";
   $row = mysql_fetch_array( mysql_query( $query ) );
@@ -44 +46 @@
 }
 //----------------------------------------------------- template initialization
-$vtp = new VTemplate;
+//
+// Start output of page
+//
+$title = $lang['ident_page_title'];
+include('include/page_header.php');
+
 $handle = $vtp->Open( './template/default/identification.vtp' );
 // language
-$vtp->setGlobalVar( $handle, 'ident_page_title', $lang['ident_page_title'] );
 $vtp->setGlobalVar( $handle, 'ident_title',      $lang['ident_title'] );
 $vtp->setGlobalVar( $handle, 'login',            $lang['login'] );
@@ -74 +80 @@
 //------------------------------------------------------------------ users list
 // retrieving all the users login
-$query = 'select username from '.PREFIX_TABLE.'users;';
+$query = 'select username from '.USERS_TABLE.';';
 $result = mysql_query( $query );
 if ( mysql_num_rows ( $result ) < $conf['max_user_listbox'] )
@@ -110 +116 @@
 $code = $vtp->Display( $handle, 0 );
 echo $code;
+include('include/page_tail.php');
 ?>

trunk/include/config.inc.php

@@ -3 +3 @@
  *                              config.inc.php                             *
  *                            -------------------                          *
- *   application   : PhpWebGallery 1.3 <http://phpwebgallery.net>          *
+ *   application   : PhpWebGallery 1.4 <http://phpwebgallery.net>          *
  *   author        : Pierrick LE GALL <pierrick@z0rglub.com>               *
  *                                                                         *
@@ -17 +17 @@
  *                                                                         *
  ***************************************************************************/
-unset( $conf, $page, $user, $lang );
-$conf = array();
-$page = array();
-$user = array();
-$lang = array();
-
-include_once( PREFIX_INCLUDE.'./include/functions.inc.php' );
-include_once( PREFIX_INCLUDE.'./include/vtemplate.class.php' );
 // How to change the order of display for images in a category ?
 //
@@ -45 +37 @@
 $conf['slideshow_period']   = array(2,5,10);
 $conf['last_days']          = array(1,2,3,10,30,365);
-$conf['version']            = 'devel';
+$conf['version']            = '1.4 - devel';
 $conf['site_url']           = 'http://www.phpwebgallery.net';
 $conf['forum_url']          = 'http://forum.phpwebgallery.net';
@@ -52 +44 @@
 $conf['top_number']         = 10;
 $conf['anti-flood_time']    = 60; // seconds between 2 comments : 0 to disable
+$conf['max_LOV_categories'] = 50;
 
-database_connection();
-// rertieving the configuration informations for site
-// $infos array is used to know the fields to retrieve in the table "config"
-// Each field becomes an information of the array $conf.
-// Example :
-//            prefix_thumbnail --> $conf['prefix_thumbnail']
-$infos = array( 'prefix_thumbnail', 'webmaster', 'mail_webmaster', 'access',
-                'session_id_size', 'session_keyword', 'session_time',
-                'max_user_listbox', 'show_comments', 'nb_comment_page',
-                'upload_available', 'upload_maxfilesize', 'upload_maxwidth',
-                'upload_maxheight', 'upload_maxwidth_thumbnail',
-                'upload_maxheight_thumbnail','log','comments_validation',
-                'comments_forall','authorize_cookies','mail_notification' );
-
-$query  = 'SELECT ';
-foreach ( $infos as $i => $info ) {
-  if ( $i > 0 ) $query.= ',';
-  $query.= $info;
-}
-$query.= ' FROM '.PREFIX_TABLE.'config;';
-
-$row = mysql_fetch_array( mysql_query( $query ) );
-
-// affectation of each field of the table "config" to an information of the
-// array $conf.
-foreach ( $infos as $info ) {
-  $conf[$info] = $row[$info];
-  // If the field is true or false, the variable is transformed into a boolean
-  // value.
-  if ( $row[$info] == 'true' or $row[$info] == 'false' )
-  {
-    $conf[$info] = get_boolean( $row[$info] );
-  }
-}
 ?>

trunk/include/functions.inc.php

@@ -1 +1 @@
 <?php
-// +-----------------------------------------------------------------------+
-// |                           functions.inc.php                           |
-// +-----------------------------------------------------------------------+
-// | application   : PhpWebGallery 1.3 <http://phpwebgallery.net>          |
-// | author        : Pierrick LE GALL <pierrick@z0rglub.com>               |
-// +-----------------------------------------------------------------------+
-// | file          : $RCSfile$
-// | tag           : $Name$
-// | last update   : $Date$
-// | revision      : $Revision$
-// +-----------------------------------------------------------------------+
-// | This program is free software; you can redistribute it and/or modify  |
-// | it under the terms of the GNU General Public License as published by  |
-// | the Free Software Foundation;                                         |
-// +-----------------------------------------------------------------------+
-
+/***************************************************************************
+ *                             functions.inc.php                           *
+ *                            -------------------                          *
+ *   application   : PhpWebGallery 1.3 <http://phpwebgallery.net>          *
+ *   author        : Pierrick LE GALL <pierrick@z0rglub.com>               *
+ *                                                                         *
+ *   $Id$
+ *                                                                         *
+ ***************************************************************************
+
+ ***************************************************************************
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation;                                         *
+ *                                                                         *
+ ***************************************************************************/
 include( PREFIX_INCLUDE.'./include/functions_user.inc.php' );
 include( PREFIX_INCLUDE.'./include/functions_session.inc.php' );
@@ -167 +168 @@
 }
 
-// get_dirs retourne un tableau contenant tous les sous-répertoires d'un
-// répertoire
-function get_dirs( $rep )
-{
-  $sub_rep = array();
-
-  if ( $opendir = opendir ( $rep ) )
+/**
+ * returns an array contening sub-directories
+ *
+ * @param string $dir
+ * @return array
+ */
+function get_dirs( $directory )
+{
+  $sub_dirs = array();
+
+  if ( $opendir = opendir( $directory ) )
   {
     while ( $file = readdir ( $opendir ) )
     {
-      if ( $file != '.' and $file != '..' and is_dir ( $rep.$file ) )
+      if ( $file != '.' and $file != '..' and is_dir ( $directory.'/'.$file ) )
       {
-        array_push( $sub_rep, $file );
+        array_push( $sub_dirs, $file );
       }
     }
   }
-  return $sub_rep;
+  return $sub_dirs;
 }
 
@@ -266 +271 @@
 }
 
-// get_themes retourne un tableau contenant tous les "template - couleur"
-function get_themes( $theme_dir )
-{
-  $themes = array();
-  $main_themes = get_dirs( $theme_dir );
-  for ( $i = 0; $i < sizeof( $main_themes ); $i++ )
-  {
-    $colors = get_dirs( $theme_dir.$main_themes[$i].'/' );
-    for ( $j = 0; $j < sizeof( $colors ); $j++ )
-    {
-      array_push( $themes, $main_themes[$i].' - '.$colors[$j] );
-    }
-  }
-  return $themes;
-}
-
 // - add_style replaces the 
 //         $search  into <span style="$style">$search</span>
@@ -325 +314 @@
 }
 
-function database_connection()
-{
-  include( PREFIX_INCLUDE.'./include/mysql.inc.php' );
-  define( "PREFIX_TABLE", $prefixeTable );
-
-  @mysql_connect( $cfgHote, $cfgUser, $cfgPassword )
-    or die ( "Could not connect to server" );
-  @mysql_select_db( $cfgBase )
-    or die ( "Could not connect to database" );
-}
-
 function pwg_log( $file, $category, $picture = '' )
 {
@@ -356 +334 @@
 
   foreach ( $array as $value ) {
+  if (isset(${$global_array_name}[$value]))
     $vtp->setGlobalVar( $handle, $value, ${$global_array_name}[$value] );
   }
@@ -433 +412 @@
   }
 }
+
+function pwg_write_debug()
+{
+  global $debug;
+  
+  $fp = @fopen( './log/debug.log', 'a+' );
+  fwrite( $fp, "\n\n" );
+  fwrite( $fp, $debug );
+  fclose( $fp );
+}
+
+function pwg_query( $query )
+{
+  global $count_queries,$queries_time;
+
+  $start = get_moment();
+  $output = '';
+  
+  $count_queries++;
+  $output.= '<br /><br />['.$count_queries.'] '.$query;
+  $result = mysql_query( $query );
+  $time = get_moment() - $start;
+  $queries_time+= $time;
+  $output.= '<b>('.number_format( $time, 3, '.', ' ').' s)</b>';
+  $output.= '('.number_format( $queries_time, 3, '.', ' ').' s)';
+
+  // echo $output;
+  
+  return $result;
+}
+
+function pwg_debug( $string )
+{
+  global $debug,$t2,$count_queries;
+
+  $now = explode( ' ', microtime() );
+  $now2 = explode( '.', $now[0] );
+  $now2 = $now[1].'.'.$now2[1];
+  $time = number_format( $now2 - $t2, 3, '.', ' ').' s';
+  $debug.= '['.$time.', ';
+  $debug.= $count_queries.' queries] : '.$string;
+  $debug.= "\n";
+}
 ?>

trunk/include/functions_category.inc.php

@@ -18 +18 @@
  ***************************************************************************/
 
-function get_subcats_id( $cat_id )
-{
-  $restricted_cats = array();
-                
-  $query = 'SELECT id';
-  $query.= ' FROM '.PREFIX_TABLE.'categories';
-  $query.= ' WHERE id_uppercat = '.$cat_id;
-  $query.= ';';
-  $result = mysql_query( $query );
-  while ( $row = mysql_fetch_array( $result ) )
-  {
-    array_push( $restricted_cats, $row['id'] );
-    $sub_restricted_cats = get_subcats_id( $row['id'] );
-    foreach ( $sub_restricted_cats as $sub_restricted_cat ) {
-      array_push( $restricted_cats, $sub_restricted_cat );
-    }
-  }
-  return $restricted_cats;
-}
-
 function check_restrictions( $category_id )
 {
   global $user,$lang;
 
-  if ( is_user_allowed( $category_id, $user['restrictions'] ) > 0 )
+  if ( in_array( $category_id, $user['restrictions'] ) )
   {
     echo '<div style="text-align:center;">'.$lang['access_forbiden'].'<br />';
@@ -50 +30 @@
   }
 }
-        
+
 // the check_cat_id function check whether the $cat is a right parameter :
 //  - $cat is numeric and corresponds to a category in the database
@@ -62 +42 @@
   if ( isset( $cat ) )
   {
-    if ( isset( $page['plain_structure'] ) )
-    {
-      if ( isset( $page['plain_structure'][$cat] ) )
-      {
-        $page['cat'] = $cat;
-      }
+    if ( isset( $page['plain_structure'][$cat] ) )
+    {
+      $page['cat'] = $cat;
     }
     else if ( is_numeric( $cat ) )
     {
       $query = 'SELECT id';
-      $query.= ' FROM '.PREFIX_TABLE.'categories';
-      $query.= ' WHERE id = '.$cat;
-      $query. ';';
+      $query.= ' FROM '.CATEGORIES_TABLE.' WHERE id = '.$cat.';';
       $result = mysql_query( $query );
       if ( mysql_num_rows( $result ) != 0 )
@@ -92 +67 @@
 }
 
-function get_plain_structure()
-{
-  $infos = array( 'name','id','date_last','nb_images','dir','id_uppercat',
-                  'rank','site_id');
+function get_user_plain_structure()
+{
+  global $page,$user;
   
-  $query = 'SELECT ';
-  foreach ( $infos as $i => $info ) {
-    if ( $i > 0 ) $query.= ',';
-    $query.= $info;
-  }
-  $query.= ' FROM '.PREFIX_TABLE.'categories';
+  $infos = array( 'name','id','uc.date_last','nb_images','dir','id_uppercat',
+                  'rank','site_id','nb_sub_categories','uppercats');
+  
+  $query = 'SELECT '.implode( ',', $infos );
+  $query.= ' FROM '.CATEGORIES_TABLE.' AS c';
+//  $query.= ' ,'.PREFIX_TABLE.'user_category AS uc';
+  $query.= ' INNER JOIN '.USER_CATEGORY_TABLE.' AS uc';
+  $query.= ' ON c.id = uc.category_id';
+  $query.= ' WHERE user_id = '.$user['id'];
+  if ( $page['expand'] != 'all' )
+  {
+    $query.= ' AND (id_uppercat is NULL';
+    if ( count( $page['tab_expand'] ) > 0 )
+    {
+      $query.= ' OR id_uppercat IN ('.$page['expand'].')';
+    }
+    $query.= ')';
+  }
+  if ( $user['forbidden_categories'] != '' )
+  {
+    $query.= ' AND id NOT IN ';
+    $query.= '('.$user['forbidden_categories'].')';
+  }
+//  $query.= ' AND c.id = uc.category_id';
   $query.= ' ORDER BY id_uppercat ASC, rank ASC';
   $query.= ';';
@@ -112 +104 @@
     $category = array();
     foreach ( $infos as $info ) {
-      $category[$info] = $row[$info];
-      if ( $info == 'date_last' )
-      {
-        list($year,$month,$day) = explode( '-', $row[$info] );
-        $category[$info] = mktime(0,0,0,$month,$day,$year);
-      }
+      if ( $info == 'uc.date_last' )
+      {
+        list($year,$month,$day) = explode( '-', $row['date_last'] );
+        $category['date_last'] = mktime(0,0,0,$month,$day,$year);
+      }
+      else if ( isset( $row[$info] ) ) $category[$info] = $row[$info];
+      else                             $category[$info] = '';
     }
     $plain_structure[$row['id']] = $category;
@@ -125 +118 @@
 }
 
-function create_structure( $id_uppercat, $restrictions )
+function create_user_structure( $id_uppercat )
 {
   global $page;
 
   if ( !isset( $page['plain_structure'] ) )
-    $page['plain_structure'] = get_plain_structure();
+    $page['plain_structure'] = get_user_plain_structure();
 
   $structure = array();
-  $ids = get_subcat_ids( $id_uppercat );
+  $ids = get_user_subcat_ids( $id_uppercat );
   foreach ( $ids as $id ) {
-    if ( !in_array( $id, $restrictions ) )
-    {
-      $category = $page['plain_structure'][$id];
-      $category['subcats'] = create_structure( $id, $restrictions );
-      array_push( $structure, $category );
-    }
+    $category = $page['plain_structure'][$id];
+    $category['subcats'] = create_user_structure( $id );
+    array_push( $structure, $category );
   }
   return $structure;
 }
 
-function get_subcat_ids( $id_uppercat )
+function get_user_subcat_ids( $id_uppercat )
 {
   global $page;
@@ -158 +148 @@
 
 // update_structure updates or add informations about each node of the
-// structure : the last date, should the category be expanded in the menu ?,
-// the associated expand string "48,14,54"
+// structure :
 //
-// 1. last date
-// for each category of the structure, we have to find the most recent
-// subcat so that the parent cat has the same last_date info.
-// For example : we have :
-// > pets       (2003.02.15)
-//    > dogs    (2003.06.14)
-//       > rex  (2003.06.18)
-//       > toby (2003.06.13)
-//    > kitten  (2003.07.05)
-// We finally want to have :
-// > pets       (2003.07.05) <- changed to pets > kitten last date
-//    > dogs    (2003.06.18) <- changed to pets > dogs > rex last date
-//       > rex  (2003.06.18)
-//       > toby (2003.06.13)
-//    > kitten  (2003.07.05)
-//
-// 2. should the category be expanded in the menu ?
+// 1. should the category be expanded in the menu ?
 // If the category has to be expanded (ie its id is in the
 // $page['tab_expand'] or all the categories must be expanded by default),
 // $category['expanded'] is set to true.
 //
-// 3. associated expand string
+// 2. associated expand string
 // in the menu, there is a expand string (used in the URL) to tell which
 // categories must be expanded in the menu if this category is chosen
@@ -192 +165 @@
 
   foreach ( $categories as $category ) {
-    // update the last date of the category
-    $last_date = search_last_date( $category );
-    $category['date_last'] = $last_date;
     // update the "expanded" key
     if ( $user['expand']
@@ -206 +176 @@
       $category['expanded'] = false;
     }
-    // update the  "expand_string" key
+    // update the "expand_string" key
     if ( $page['expand'] == 'all' )
     {
@@ -220 +190 @@
         $tab_expand = array_diff( $page['tab_expand'],array($category['id']) );
       }
-      else if ( count( $category['subcats'] ) > 0 )
+      else if ( $category['nb_sub_categories'] > 0 )
       {
         // we have this time to add the $category['id']...
@@ -234 +204 @@
 
   return $updated_categories;
-}
-
-// search_last_date searchs the last date for a given category. If we take
-// back the example given for update_last_dates, we should have :
-// search_last_date( pets )        --> 2003.07.05
-// search_last_date( pets > dogs ) --> 2003.06.18
-// and so on
-function search_last_date( $category )
-{
-  $date_last = $category['date_last'];
-  foreach ( $category['subcats'] as $subcat ) {
-    $subcat_date_last = search_last_date( $subcat );
-    if ( $subcat_date_last > $date_last )
-    {
-      $date_last = $subcat_date_last;
-    }
-  }
-  return $date_last;
 }
 
@@ -263 +215 @@
 function count_images( $categories )
 {
+  return count_user_total_images();
   $total = 0;
   foreach ( $categories as $category ) {
@@ -269 +222 @@
   }
   return $total;
+}
+
+function count_user_total_images()
+{
+  global $user;
+
+  $query = 'SELECT SUM(nb_images) AS total';
+  $query.= ' FROM '.CATEGORIES_TABLE;
+  if ( count( $user['restrictions'] ) > 0 )
+    $query.= ' WHERE id NOT IN ('.$user['forbidden_categories'].')';
+  $query.= ';';
+  
+  $row = mysql_fetch_array( mysql_query( $query ) );
+
+  if ( !isset( $row['total'] ) ) $row['total'] = 0;
+
+  return $row['total'];
 }
 
@@ -286 +256 @@
   global $page;
 
+  $infos = array( 'nb_images','id_uppercat','comment','site_id','galleries_url'
+                  ,'dir','date_last','uploadable','status','visible'
+                  ,'representative_picture_id','uppercats' );
+
+  $query = 'SELECT '.implode( ',', $infos );
+  $query.= ' FROM '.CATEGORIES_TABLE.' AS a';
+  $query.= ', '.SITES_TABLE.' AS b';
+  $query.= ' WHERE a.id = '.$id;
+  $query.= ' AND a.site_id = b.id';
+  $query.= ';';
+  $row = mysql_fetch_array( mysql_query( $query ) );
+
   $cat = array();
-                
-  $query = 'SELECT nb_images,id_uppercat,comment,site_id,galleries_url,dir';
-  $query.= ',date_last,uploadable,status,visible,representative_picture_id';
-  $query.= ' FROM '.PREFIX_TABLE.'categories AS a';
-  $query.= ', '.PREFIX_TABLE.'sites AS b';
-  $query.= ' WHERE a.id = '.$id;
-  $query.= ' AND a.site_id = b.id;';
-  $row = mysql_fetch_array( mysql_query( $query ) );
-  $cat['site_id']     = $row['site_id'];
-  $cat['id_uppercat'] = $row['id_uppercat'];
-  $cat['comment']     = nl2br( $row['comment'] );
-  $cat['nb_images']   = $row['nb_images'];
-  $cat['dir']         = $row['dir'];
-  $cat['date_last']   = $row['date_last'];
-  $cat['uploadable']  = get_boolean( $row['uploadable'] );
-  $cat['status']      = $row['status'];
-  $cat['visible']     = get_boolean( $row['visible'] );
-  $cat['representative_picture_id'] = $row['representative_picture_id'];
+  // affectation of each field of the table "config" to an information of the
+  // array $cat.
+  foreach ( $infos as $info ) {
+    if ( isset( $row[$info] ) ) $cat[$info] = $row[$info];
+    else                        $cat[$info] = '';
+    // If the field is true or false, the variable is transformed into a
+    // boolean value.
+    if ( $cat[$info] == 'true' or $cat[$info] == 'false' )
+    {
+      $cat[$info] = get_boolean( $cat[$info] );
+    }
+  }
+  $cat['comment'] = nl2br( $cat['comment'] );
 
   $cat['name'] = array();
 
-  if ( !isset( $page['plain_structure'] ) )
-    $page['plain_structure'] = get_plain_structure();
-
-  array_push( $cat['name'], $page['plain_structure'][$id]['name'] );
-  while ( $page['plain_structure'][$id]['id_uppercat'] != '' )
-  {
-    $id = $page['plain_structure'][$id]['id_uppercat'];
-    array_push( $cat['name'], $page['plain_structure'][$id]['name'] );
-  }
+  $query = 'SELECT name FROM '.CATEGORIES_TABLE;
+  $query.= ' WHERE id IN ('.$cat['uppercats'].')';
+  $query.= ' ORDER BY id ASC';
+  $query.= ';';
+  $result = mysql_query( $query );
+  while( $row = mysql_fetch_array( $result ) )
+  {
+    array_push( $cat['name'], $row['name'] );
+  }
+  
   return $cat;
 }
@@ -338 +316 @@
   global $page;
 
-  if ( !isset( $page['plain_structure'] ) )
-    $page['plain_structure'] = get_plain_structure();
-  
-  // creating the local path : "root_cat/sub_cat/sub_sub_cat/"
-  $dir = $page['plain_structure'][$category_id]['dir'].'/';
-  while ( $page['plain_structure'][$category_id]['id_uppercat'] != '' )
-  {
-    $category_id = $page['plain_structure'][$category_id]['id_uppercat'];
-    $dir = $page['plain_structure'][$category_id]['dir'].'/'.$dir;
-  }
-  return $dir;
+  $uppercats = '';
+  $local_dir = '';
+
+  if ( isset( $page['plain_structure'][$category_id]['uppercats'] ) )
+  {
+    $uppercats = $page['plain_structure'][$category_id]['uppercats'];
+  }
+  else
+  {
+    $query = 'SELECT uppercats';
+    $query.= ' FROM '.CATEGORIES_TABLE.' WHERE id = '.$category_id;
+    $query.= ';';
+    $row = mysql_fetch_array( mysql_query( $query ) );
+    $uppercats = $row['uppercats'];
+  }
+
+  $upper_array = explode( ',', $uppercats );
+
+  $database_dirs = array();
+  $query = 'SELECT id,dir';
+  $query.= ' FROM '.CATEGORIES_TABLE.' WHERE id IN ('.$uppercats.')';
+  $query.= ';';
+  $result = mysql_query( $query );
+  while( $row = mysql_fetch_array( $result ) )
+  {
+    $database_dirs[$row['id']] = $row['dir'];
+  }
+  foreach ( $upper_array as $id ) {
+    $local_dir.= $database_dirs[$id].'/';
+  }
+
+  return $local_dir;
 }
 
@@ -357 +356 @@
   global $page;
 
-  if ( !isset( $page['plain_structure'] ) )
-    $page['plain_structure'] = get_plain_structure();
-
   $query = 'SELECT galleries_url';
-  $query.= ' FROM '.PREFIX_TABLE.'sites';
-  $query.= ' WHERE id = '.$page['plain_structure'][$category_id]['site_id'];
+  $query.= ' FROM '.SITES_TABLE.' AS s,'.CATEGORIES_TABLE.' AS c';
+  $query.= ' WHERE s.id = c.site_id';
+  $query.= ' AND c.id = '.$category_id;
   $query.= ';';
   $row = mysql_fetch_array( mysql_query( $query ) );
@@ -375 +372 @@
 //   - $style : the style of the span tag for the lowest category,
 //     "font-style:italic;" for example
-function get_cat_display_name( $array_cat_names, $separation, $style )
-{
-  $output = "";
-  for ( $i = sizeof( $array_cat_names ) - 1; $i >= 0; $i-- )
-  {
-    if ( $i != sizeof( $array_cat_names ) - 1 )
-    {
-      $output.= $separation;
-    }
-    if ( $i != 0 )
-    {
-      $output.= $array_cat_names[$i];
-    }
+function get_cat_display_name( $array_cat_names, $separation,
+                               $style, $replace_space = true )
+{
+  $output = '';
+  foreach ( $array_cat_names as $i => $name ) {
+    if ( $i > 0 ) $output.= $separation;
+    if ( $i < count( $array_cat_names ) - 1 or $style == '')
+      $output.= $name;
     else
-    {
-      if ( $style != "" )
-      {
-        $output.= '<span style="'.$style.'">';
-      }
-      $output.= $array_cat_names[$i];
-      if ( $style != "" )
-      {
-        $output.= "</span>";
-      }
-    }
-  }
-  return replace_space( $output );
+      $output.= '<span style="'.$style.'">'.$name.'</span>';
+  }
+  if ( $replace_space ) return replace_space( $output );
+  else                  return $output;
 }
 
@@ -419 +402 @@
 function initialize_category( $calling_page = 'category' )
 {
+  pwg_debug( 'start initialize_category' );
   global $page,$lang,$user,$conf;
 
@@ -427 +411 @@
     $page['nb_image_page'] = $user['nb_image_page'];
     // $url is used to create the navigation bar
-    $url = './category.php?cat='.$page['cat'].'&amp;expand='.$page['expand'];
+    $url = './category.php?cat='.$page['cat'];
+    if ( isset($page['expand']) ) $url.= '&amp;expand='.$page['expand'];
     // simple category
     if ( is_numeric( $page['cat'] ) )
@@ -438 +423 @@
       $page['cat_site_id']    = $result['site_id'];
       $page['cat_uploadable'] = $result['uploadable'];
-      $page['title'] = get_cat_display_name( $page['cat_name'], ' - ', '' );
+      $page['uppercats']      = $result['uppercats'];
+      $page['title'] = get_cat_display_name( $page['cat_name'],' - ','',false);
       $page['where'] = ' WHERE category_id = '.$page['cat'];
     }
@@ -447 +433 @@
       {
         // we must not show pictures of a forbidden category
-        $restricted_cats = get_all_restrictions( $user['id'],$user['status'] );
-        if ( count( $restricted_cats ) > 0 )
+        if ( $user['forbidden_categories'] != '' )
         {
-          $where_append.= ' AND category_id NOT IN (';
-          foreach ( $restricted_cats as $i => $restricted_cat ) {
-            if ( $i > 0 ) $where_append.= ',';
-            $where_append.= $restricted_cat;
-          }
-          $where_append.= ')';
+          $forbidden = ' category_id NOT IN ';
+          $forbidden.= '('.$user['forbidden_categories'].')';
         }
       }
@@ -500 +481 @@
         }
         $page['where'].= ' )';
-        $page['where'].= $where_append;
+        if ( isset( $forbidden ) ) $page['where'].= ' AND '.$forbidden;
 
         $query = 'SELECT COUNT(DISTINCT(id)) AS nb_total_images';
-        $query.= ' FROM '.PREFIX_TABLE.'images';
-        $query.= ' LEFT JOIN '.PREFIX_TABLE.'image_category AS ic';
+        $query.= ' FROM '.IMAGES_TABLE;
+        $query.= ' INNER JOIN '.IMAGE_CATEGORY_TABLE.' AS ic';
         $query.= ' ON id = ic.image_id';
         $query.= $page['where'];
@@ -516 +497 @@
         $page['title'] = $lang['favorites'];
 
-        $page['where'] = ', '.PREFIX_TABLE.'favorites AS fav';
+        $page['where'] = ', '.FAVORITES_TABLE.' AS fav';
         $page['where'].= ' WHERE user_id = '.$user['id'];
         $page['where'].= ' AND fav.image_id = id';
       
         $query = 'SELECT COUNT(*) AS nb_total_images';
-        $query.= ' FROM '.PREFIX_TABLE.'favorites';
+        $query.= ' FROM '.FAVORITES_TABLE;
         $query.= ' WHERE user_id = '.$user['id'];
         $query.= ';';
@@ -534 +515 @@
         $page['where'] = " WHERE date_available > '";
         $page['where'].= date( 'Y-m-d', $date )."'";
-        $page['where'].= $where_append;
+        if ( isset( $forbidden ) ) $page['where'].= ' AND '.$forbidden;
 
         $query = 'SELECT COUNT(DISTINCT(id)) AS nb_total_images';
-        $query.= ' FROM '.PREFIX_TABLE.'images';
-        $query.= ' LEFT JOIN '.PREFIX_TABLE.'image_category AS ic';
+        $query.= ' FROM '.IMAGES_TABLE;
+        $query.= ' INNER JOIN '.PREFIX_TABLE.'image_category AS ic';
         $query.= ' ON id = ic.image_id';
         $query.= $page['where'];
@@ -547 +528 @@
       {
         $page['title'] = $conf['top_number'].' '.$lang['most_visited_cat'];
-        $page['where'] = ' WHERE category_id != -1'.$where_append;
+        
+        if ( isset( $forbidden ) ) $page['where'] = ' WHERE '.$forbidden;
+        else                       $page['where'] = '';
         $conf['order_by'] = ' ORDER BY hit DESC, file ASC';
         $page['cat_nb_images'] = $conf['top_number'];
-        if ( $page['start'] + $user['nb_image_page'] >= $conf['top_number'] )
+        if ( isset( $page['start'] )
+             and ($page['start']+$user['nb_image_page']>=$conf['top_number']))
         {
           $page['nb_image_page'] = $conf['top_number'] - $page['start'];
@@ -556 +540 @@
       }
 
-      if ( $query != '' )
+      if ( isset($query))
       {
         $result = mysql_query( $query );
@@ -574 +558 @@
     $page['title'] = $lang['diapo_default_page_title'];
   }
+  pwg_debug( 'end initialize_category' );
 }
 
@@ -600 +585 @@
 
   $query = 'SELECT id,nb_images';
-  $query.= ' FROM '.PREFIX_TABLE.'categories';
+  $query.= ' FROM '.CATEGORIES_TABLE;
   $query.= ' WHERE id_uppercat ';
   if ( !is_numeric( $id_uppercat ) ) $query.= 'is NULL';
   else                               $query.= '= '.$id_uppercat;
   // we must not show pictures of a forbidden category
-  foreach ( $user['restrictions'] as $restricted_cat ) {
-    $query.= ' AND id != '.$restricted_cat;
+  if ( $user['forbidden_categories'] != '' )
+  {
+    $query.= ' AND id NOT IN ('.$user['forbidden_categories'].')';
   }
   $query.= ' ORDER BY rank';
@@ -633 +619 @@
 
   $query = 'SELECT id,nb_images';
-  $query.= ' FROM '.PREFIX_TABLE.'categories';
+  $query.= ' FROM '.CATEGORIES_TABLE;
   $query.= ' WHERE id_uppercat = '.$id_uppercat;
   // we must not show pictures of a forbidden category
-  foreach ( $user['restrictions'] as $restricted_cat ) {
-    $query.= ' AND id != '.$restricted_cat;
+  if ( $user['forbidden_categories'] != '' )
+  {
+    $query.= ' AND id NOT IN ('.$user['forbidden_categories'].')';
   }
   $query.= ' ORDER BY RAND()';

trunk/include/functions_group.inc.php

@@ -86 +86 @@
     $query.= ';';
     $row = mysql_fetch_array( mysql_query( $query ) );
-    if ( $row['id_uppercat'] == '' )
-    {
-      $is_root = true;
-    }
+    if ( !isset( $row['id_uppercat'] ) ) $row['id_uppercat'] = '';
+    if ( $row['id_uppercat'] == '' ) $is_root = true;
     $category_id = $row['id_uppercat'];
   }

trunk/include/functions_user.inc.php

@@ -38 +38 @@
 }
 
-function register_user(
-  $login, $password, $password_conf, $mail_address, $status = 'guest' )
+function register_user( $login, $password, $password_conf,
+                        $mail_address, $status = 'guest' )
 {
   global $lang;
@@ -50 +50 @@
   //      3. include ' or " characters
   //      4. be already used
-  if ( $login == '' )
-  {
-    $error[$i++] = $lang['reg_err_login1'];
-  }
-  if ( ereg( "^.* $", $login) )
-  {
-    $error[$i++] = $lang['reg_err_login2'];
-  }
-  if ( ereg( "^ .*$", $login ) )
-  {
-    $error[$i++] = $lang['reg_err_login3'];
-  }
+  if ( $login == '' )            $error[$i++] = $lang['reg_err_login1'];
+  if ( ereg( "^.* $", $login) )  $error[$i++] = $lang['reg_err_login2'];
+  if ( ereg( "^ .*$", $login ) ) $error[$i++] = $lang['reg_err_login3'];
+
   if ( ereg( "'", $login ) or ereg( "\"", $login ) )
-  {
     $error[$i++] = $lang['reg_err_login4'];
-  }
   else
   {
-    $query = 'select id';
-    $query.= ' from '.PREFIX_TABLE.'users';
-    $query.= " where username = '".$login."';";
-    $result = mysql_query( $query );
-    if ( mysql_num_rows( $result ) > 0 )
-    {
-      $error[$i++] = $lang['reg_err_login5'];
-    }
+    $query = 'SELECT id';
+    $query.= ' FROM '.PREFIX_TABLE.'users';
+    $query.= " WHERE username = '".$login."'";
+    $query.= ';';
+    $result = mysql_query( $query );
+    if ( mysql_num_rows($result) > 0 ) $error[$i++] = $lang['reg_err_login5'];
   }
   // given password must be the same as the confirmation
-  if ( $password != $password_conf )
-  {
-    $error[$i++] = $lang['reg_err_pass'];
-  }
+  if ( $password != $password_conf ) $error[$i++] = $lang['reg_err_pass'];
 
   $error_mail_address = validate_mail_address( $mail_address );
-  if ( $error_mail_address != '' )
-  {
-    $error[$i++] = $error_mail_address;
-  }
+  if ( $error_mail_address != '' ) $error[$i++] = $error_mail_address;
 
   // if no error until here, registration of the user
@@ -95 +77 @@
     $infos = array( 'nb_image_line', 'nb_line_page', 'language',
                     'maxwidth', 'maxheight', 'expand', 'show_nb_comments',
-                    'short_period', 'long_period', 'template' );
-    $query = 'select';
+                    'short_period', 'long_period', 'template',
+                    'forbidden_categories' );
+    $query = 'SELECT ';
     for ( $i = 0; $i < sizeof( $infos ); $i++ )
     {
-      if ( $i > 0 )
-      {
-        $query.= ',';
-      }
-      else
-      {
-        $query.= ' ';
-      }
+      if ( $i > 0 ) $query.= ',';
       $query.= $infos[$i];
     }
-    $query.= ' from '.PREFIX_TABLE.'users';
-    $query.= " where username = 'guest';";
+    $query.= ' FROM '.PREFIX_TABLE.'users';
+    $query.= " WHERE username = 'guest'";
+    $query.= ';';
     $row = mysql_fetch_array( mysql_query( $query ) );
     // 2. adding new user
-    $query = 'insert into '.PREFIX_TABLE.'users';
+    $query = 'INSERT INTO '.PREFIX_TABLE.'users';
     $query.= ' (';
     $query.= ' username,password,mail_address,status';
@@ -123 +100 @@
     $query.= " '".$login."'";
     $query.= ",'".md5( $password )."'";
-    if ( $mail_address != '' )
-    {
-      $query.= ",'".$mail_address."'";
-    }
-    else
-    {
-      $query.= ',NULL';
-    }
+    if ( $mail_address != '' ) $query.= ",'".$mail_address."'";
+    else                       $query.= ',NULL';
     $query.= ",'".$status."'";
-    for ( $i = 0; $i < sizeof( $infos ); $i++ )
-    {
+    foreach ( $infos as $info ) {
       $query.= ',';
-      if ( $row[$infos[$i]] == '' )
-      {
-        $query.= 'NULL';
-      }
-      else
-      {
-        $query.= "'".$row[$infos[$i]]."'";
-      }
+      if ( !isset( $row[$info] ) ) $query.= 'NULL';
+      else                         $query.= "'".$row[$info]."'";
     }
     $query.= ');';
@@ -166 +130 @@
       mysql_query ( $query );
     }
+    // 5. associate new user to the same groups that the guest
+    $query = 'SELECT group_id';
+    $query.= ' FROM '.PREFIX_TABLE.'user_group AS ug';
+    $query.= ',     '.PREFIX_TABLE.'users      AS u';
+    $query.= " WHERE u.username = 'guest'";
+    $query.= ' AND ug.user_id = u.id';
+    $query.= ';';
+    $result = mysql_query( $query );
+    while( $row = mysql_fetch_array( $result ) )
+    {
+      $query = 'INSERT INTO '.PREFIX_TABLE.'user_group';
+      $query.= ' (user_id,group_id) VALUES';
+      $query.= ' ('.$user_id.','.$row['group_id'].')';
+      $query.= ';';
+      mysql_query ( $query );
+    }
+    // 6. has the same categories informations than guest
+    $query = 'SELECT category_id,date_last,nb_sub_categories';
+    $query.= ' FROM '.PREFIX_TABLE.'user_category AS uc';
+    $query.= ',     '.PREFIX_TABLE.'users         AS u';
+    $query.= " WHERE u.username = 'guest'";
+    $query.= ' AND uc.user_id = u.id';
+    $query.= ';';
+    $result = mysql_query( $query );
+    while( $row = mysql_fetch_array( $result ) )
+    {
+      $query = 'INSERT INTO '.PREFIX_TABLE.'user_category';
+      $query.= ' (user_id,category_id,date_last,nb_sub_categories) VALUES';
+      $query.= ' ('.$user_id.','.$row['category_id'];
+      $query.= ",'".$row['date_last']."',".$row['nb_sub_categories'].')';
+      $query.= ';';
+      mysql_query ( $query );
+    }
   }
   return $error;
@@ -210 +207 @@
   global $user,$lang,$conf,$page;
 
-  if ( $user['is_the_guest']
-       and ( $conf['access'] == 'restricted' or $page['cat'] == 'fav' ) )
+  if ( $user['is_the_guest'])
+  {
+  if ( $conf['access'] == 'restricted' || (isset($page['cat']) && $page['cat'] == 'fav' ) )
   {
     echo '<div style="text-align:center;">'.$lang['only_members'].'<br />';
@@ -217 +215 @@
     exit();
   }
-}
-        
-// The function get_restrictions returns an array with the ids of the
-// restricted categories for the user.
-// If the $check_invisible parameter is set to true, invisible categories
-// are added to the restricted one in the array.
-function get_restrictions( $user_id, $user_status,
-                           $check_invisible, $use_groups = true )
-{
-  // 1. retrieving ids of private categories
-  $query = 'SELECT id';
-  $query.= ' FROM '.PREFIX_TABLE.'categories';
-  $query.= " WHERE status = 'private'";
-  $query.= ';';
-  $result = mysql_query( $query );
-  $privates = array();
-  while ( $row = mysql_fetch_array( $result ) )
-  {
-    array_push( $privates, $row['id'] );
-  }
-  // 2. retrieving all authorized categories for the user
-  $authorized = array();
-  // 2.1. retrieving authorized categories thanks to personnal user
-  //      authorization
-  $query = 'SELECT cat_id';
-  $query.= ' FROM '.PREFIX_TABLE.'user_access';
-  $query.= ' WHERE user_id = '.$user_id;
-  $query.= ';';
-  $result = mysql_query( $query );
-  while ( $row = mysql_fetch_array( $result ) )
-  {
-    array_push( $authorized, $row['cat_id'] );
-  }
-  // 2.2. retrieving authorized categories thanks to group authorization to
-  //      which the user is a member
-  if ( $use_groups )
-  {
-    $query = 'SELECT ga.cat_id';
-    $query.= ' FROM '.PREFIX_TABLE.'user_group as ug';
-    $query.= ', '.PREFIX_TABLE.'group_access as ga';
-    $query.= ' WHERE ug.group_id = ga.group_id';
-    $query.= ' AND ug.user_id = '.$user_id;
-    $query.= ';';
-    $result = mysql_query( $query );
-    while ( $row = mysql_fetch_array( $result ) )
-    {
-      array_push( $authorized, $row['cat_id'] );
-    }
-    $authorized = array_unique( $authorized );
-  }
-
-  $forbidden = array();
-  foreach ( $privates as $private ) {
-    if ( !in_array( $private, $authorized ) )
-    {
-      array_push( $forbidden, $private );
-    }
-  }
-
-  if ( $check_invisible )
-  {
-    // 3. adding to the restricted categories, the invisible ones
-    if ( $user_status != 'admin' )
-    {
-      $query = 'SELECT id';
-      $query.= ' FROM '.PREFIX_TABLE.'categories';
-      $query.= " WHERE visible = 'false';";
-      $result = mysql_query( $query );
-      while ( $row = mysql_fetch_array( $result ) )
-      {
-        array_push( $forbidden, $row['id'] );
-      }
-    }
-  }
-  return array_unique( $forbidden );
-}
-
-// The get_all_restrictions function returns an array with all the
-// categories id which are restricted for the user. Including the
-// sub-categories and invisible categories
-function get_all_restrictions( $user_id, $user_status )
-{
-  $restricted_cats = get_restrictions( $user_id, $user_status, true );
-  foreach ( $restricted_cats as $restricted_cat ) {
-    $sub_restricted_cats = get_subcats_id( $restricted_cat );
-    foreach ( $sub_restricted_cats as $sub_restricted_cat ) {
-      array_push( $restricted_cats, $sub_restricted_cat );
-    }
-  }
-  return $restricted_cats;
-}
-
-// The function is_user_allowed returns :
-//      - 0 : if the category is allowed with this $restrictions array
-//      - 1 : if this category is not allowed
-//      - 2 : if an uppercat category is not allowed
-function is_user_allowed( $category_id, $restrictions )
-{
-  $lowest_category_id = $category_id;
-
-  $is_root = false;
-  while ( !$is_root and !in_array( $category_id, $restrictions ) )
-  {
-    $query = 'SELECT id_uppercat';
-    $query.= ' FROM '.PREFIX_TABLE.'categories';
-    $query.= ' WHERE id = '.$category_id;
-    $query.= ';';
-    $row = mysql_fetch_array( mysql_query( $query ) );
-    if ( $row['id_uppercat'] == '' ) $is_root = true;
-    $category_id = $row['id_uppercat'];
-  }
-
-  if ( in_array( $lowest_category_id, $restrictions ) ) return 1;
-  if ( in_array( $category_id,        $restrictions ) ) return 2;
-  // this user is allowed to go in this category
-  return 0;
+  }
 }
 ?>

trunk/include/functions_xml.inc.php

@@ -17 +17 @@
  *                                                                         *
  ***************************************************************************/
-
-//------------------------------------------------------------------ constantes
-define( "ATT_REG", '\w+' );
-define( "VAL_REG", '[^"]*' );
 //------------------------------------------------------------------- functions
 // getContent returns the content of a tag

trunk/include/user.inc.php

@@ -17 +17 @@
  *                                                                         *
  ***************************************************************************/
+
 // retrieving user informations
 // $infos array is used to know the fields to retrieve in the table "users"
@@ -25 +26 @@
                 'nb_line_page', 'status', 'language', 'maxwidth',
                 'maxheight', 'expand', 'show_nb_comments', 'short_period',
-                'long_period', 'template' );
+                'long_period', 'template', 'forbidden_categories' );
 
-$query_user  = 'SELECT ';
-foreach ( $infos as $i => $info ) {
-  if ( $i > 0 ) $query_user.= ',';
-  $query_user.= $info;
-}
-$query_user.= ' FROM '.PREFIX_TABLE.'users';
+$query_user = 'SELECT '.implode( ',', $infos );
+$query_user.= ' FROM '.USERS_TABLE;
 $query_done = false;
 $user['is_the_guest'] = false;
@@ -60 +57 @@
   $page['session_id'] = $session_id;
   $query = 'SELECT user_id,expiration,ip';
-  $query.= ' FROM '.PREFIX_TABLE.'sessions';
+  $query.= ' FROM '.SESSIONS_TABLE;
   $query.= " WHERE id = '".$page['session_id']."'";
   $query.= ';';
@@ -73 +70 @@
         // deletion of the session from the database,
         // because it is out-of-date
-        $delete_query = 'DELETE FROM '.PREFIX_TABLE.'sessions';
+        $delete_query = 'DELETE FROM '.SESSIONS_TABLE;
         $delete_query.= " WHERE id = '".$page['session_id']."'";
         $delete_query.= ';';
@@ -97 +94 @@
 }
 $query_user .= ';';
-
 $row = mysql_fetch_array( mysql_query( $query_user ) );
 
@@ -103 +99 @@
 // of the array $user.
 foreach ( $infos as $info ) {
-  $user[$info] = $row[$info];
-  // If the field is true or false, the variable is transformed into a
-  // boolean value.
-  if ( $row[$info] == 'true' or $row[$info] == 'false' )
+  if ( isset( $row[$info] ) )
   {
-    $user[$info] = get_boolean( $row[$info] );
+    // If the field is true or false, the variable is transformed into a
+    // boolean value.
+    if ( $row[$info] == 'true' or $row[$info] == 'false' )
+      $user[$info] = get_boolean( $row[$info] );
+    else
+      $user[$info] = $row[$info];    
+  }
+  else
+  {
+    $user[$info] = '';
   }
 }
+
+// special for $user['restrictions'] array
+$user['restrictions'] = explode( ',', $user['forbidden_categories'] );
+if ( $user['restrictions'][0] == '' ) $user['restrictions'] = array();
 ?>

trunk/include/vtemplate.class.php

@@ -16 +16 @@
  *                        
  *****************************************************************/ 
-
 // to make it work on nexen.net
 set_magic_quotes_runtime(0);

trunk/index.php

@@ -18 +18 @@
  ***************************************************************************/
 
-define( "PREFIX_INCLUDE", '' );
-include_once( './include/functions.inc.php' );
-database_connection();
-// retrieving configuration informations
-$query = 'SELECT access';
-$query.= ' FROM '.PREFIX_TABLE.'config;';
-$row = mysql_fetch_array( mysql_query( $query ) );
-if ( $row['access'] == 'restricted' )
+//----------------------------------------------------------- include
+$phpwg_root_path = './';
+include_once( $phpwg_root_path.'common.php' );
+if ( $conf['access'] == 'restricted' )
 {
   if ( isset( $_COOKIE['id'] ) ) $url = 'category';

trunk/install.php

@@ -19 +19 @@
 
 //-------------------------------------------------------------------- includes
-define( "PREFIX_INCLUDE", '' );
+define( 'PREFIX_INCLUDE', '' );
 include( './include/vtemplate.class.php' );
 include( './include/functions.inc.php' );
+
+$config_file = './config.php';
 //----------------------------------------------------- template initialization
 $vtp = new VTemplate;
 $handle = $vtp->Open( './template/default/install.vtp' );
-$vtp->setGlobalVar( $handle, 'release', '1.3' );
+$vtp->setGlobalVar( $handle, 'release', '1.4' );
 //-------------------------------------------------------------------- language
 if ( isset( $_GET['language'] ) )
@@ -46 +48 @@
 }
 //---------------------- Step 1 : connection informations, write of config file
-if ( $_GET['step'] == 1 )
+if ( isset($_GET['step']) && $_GET['step'] == 1 )
 {
   $errors = array();
@@ -74 +76 @@
       array_push( $errors, $lang['step1_err_server'] );
     }
-                        
+        
     if ( count( $errors ) == 0 )
     {
@@ -82 +84 @@
       $file_content.= "\n\$cfgPassword = '". $_POST['cfgPassword']."';";
       $file_content.= "\n\$cfgHote = '".     $_POST['cfgHote']."';";
-      $file_content.= "\n\$prefixeTable = '".$_POST['prefixeTable']."';";
+          $file_content.= "\n";
+      $file_content.= "\n\$table_prefix = '".$_POST['prefixeTable']."';";
+          $file_content.= "\n";
+          $file_content.= "\ndefine('PHPWG_INSTALLED', true);";
       $file_content.= "\n?>";
       // writting the configuration file
-      if ( $fp = @fopen( './include/mysql.inc.php', 'a+' ) )
-      {
+      if ( $fp = @fopen( $config_file, 'a+' ) )
+      {
+                ftruncate($fp, 0);
         fwrite( $fp, $file_content ); 
         fclose( $fp );
@@ -94 +100 @@
       $cfgPassword = '';
       $cfgBase     = '';
-      include( './include/mysql.inc.php' );
+      if ( is_file( $config_file ) ) include( $config_file );
       $file_OK = false;
       if ( @mysql_connect( $cfgHote, $cfgUser, $cfgPassword ) )
@@ -151 +157 @@
       $vtp->setVar( $handle, 'step1.f_host', $_POST['cfgHote'] );
     // user
-    $vtp->setVar( $handle, 'step1.f_user', $_POST['cfgUser'] );
+        if ( isset( $_POST['cfgUser'] ) )
+            $vtp->setVar( $handle, 'step1.f_user', $_POST['cfgUser'] );
     // base
-    $vtp->setVar( $handle, 'step1.f_base', $_POST['cfgBase'] );
+        if ( isset( $_POST['cfgBase'] ) )
+            $vtp->setVar( $handle, 'step1.f_base', $_POST['cfgBase'] );
     // prefixeTable
     if ( !isset( $_POST['prefixeTable'] ) )
@@ -164 +172 @@
 }
 //------------------------------------- Step 2 : creation of tables in database
-else if ( $_GET['step'] == 2 )
+else if (  isset($_GET['step']) && $_GET['step'] == 2 )
 {
   $errors = array();
   $infos  = array();
 
-  include( './include/mysql.inc.php' );
+  include( $config_file );
   mysql_connect( $cfgHote, $cfgUser, $cfgPassword )
     or die ( "Can't connect to database host" );
@@ -189 +197 @@
       {
         $query = trim( $query );
-        $query = str_replace( 'phpwebgallery_', $prefixeTable, $query );
+        $query = str_replace( 'phpwebgallery_', $table_prefix, $query );
         // we don't execute "DROP TABLE" queries
         if ( !preg_match( '/^DROP TABLE/i', $query ) )
@@ -222 +230 @@
     if ( count( $errors ) == 0 )
     {
-      $query = 'DELETE FROM '.$prefixeTable.'config';
+      $query = 'DELETE FROM '.$table_prefix.'config';
       mysql_query( $query );
 
-      $query = 'INSERT INTO '.$prefixeTable.'config';
+      $query = 'INSERT INTO '.$table_prefix.'config';
       $query.= ' (webmaster,mail_webmaster) VALUES ';
       $query.= " ('".$webmaster."','".$_POST['mail_webmaster']."')";
@@ -231 +239 @@
       mysql_query( $query );
 
-      $query = 'INSERT INTO '.$prefixeTable.'sites';
+      $query = 'INSERT INTO '.$table_prefix.'sites';
       $query.= " (id,galleries_url) VALUES (1, './galleries/')";
       $query.= ';';
@@ -237 +245 @@
 
       // webmaster admin user
-      $query = 'INSERT INTO '.$prefixeTable.'users';
-      $query.= ' (id,username,password,status,language) VALUES ';
+      $query = 'INSERT INTO '.$table_prefix.'users';
+      $query.= ' (id,username,password,status,language,mail_address) VALUES ';
       $query.= "(1,'".$webmaster."','".md5( $_POST['pwdWebmaster'] )."'";
-      $query.= ",'admin','".$_GET['language']."')";
+      $query.= ",'admin','".$_GET['language']."'";
+      $query.= ",'".$_POST['mail_webmaster']."')";
       $query.= ';';
       mysql_query($query);
 
       // guest user
-      $query = 'INSERT INTO '.$prefixeTable.'users';
+      $query = 'INSERT INTO '.$table_prefix.'users';
       $query.= '(id,username,password,status,language) VALUES ';
       $query.= "(2,'guest','','guest','".$_GET['language']."')";
@@ -268 +277 @@
   {
     $vtp->addSession( $handle, 'step2' );
+        if ( isset( $_POST['webmaster'] ))
     $vtp->setVar( $handle, 'step2.f_webmaster', $_POST['webmaster'] );
+        if ( isset( $_POST['mail_webmaster'] ))
     $vtp->setVar( $handle, 'step2.f_mail_webmaster', $_POST['mail_webmaster']);
     $vtp->closeSession( $handle, 'step2' );

trunk/language/english.php

@@ -156 +156 @@
 $lang['upload_successful'] = 'Picture uploaded with success, an administrator will validate it as soon as possible';
 // new or modified in release 1.3
-$lang['charset'] = 'ISO_8859-1';
+$lang['charset'] = 'iso-8859-1';
 $lang['no'] = 'no';
 $lang['yes'] = 'yes';
@@ -536 +536 @@
   $lang['conf_upload_available_info'] = 'Authorizing the upload of pictures by users on the categories of the website (not on a remote server). This is general parameter, it is needed to authorize upload category by category, by default, no category is "uploadable".';
   $lang['install_help'] = 'Need help ? Ask your question on <a href="http://forum.phpwebgallery.net">PhpWebGallery message board</a>.';
+  // new or modified in release 1.3.1
+  $lang['cat_unknown_id'] = 'This category is unknown in the database';
+}
+
   // new or modified in release 1.4
   $lang['install_end_message'] = 'The configuration of PhpWebGallery is finished, here is the next step<br /><br />
@@ -545 +549 @@
 </ul>';
   $lang['install_warning'] = 'The file "install.php" is still present. Please remove it from your server. It is not secure to keep it.';
-}
+
 ?>

trunk/language/francais.php

@@ -3 +3 @@
  *                                francais.php                             *
  *                            -------------------                          *
- *   application   : PhpWebGallery 1.3 <http://phpwebgallery.net>          *
+ *   application   : PhpWebGallery 1.4 <http://phpwebgallery.net>          *
  *   author        : Pierrick LE GALL <pierrick@z0rglub.com>               *
  *                                                                         *
@@ -148 +148 @@
 $lang['upload_successful'] = 'Image uploadée avec succès, un administrateur validera celle-ci dès que possible.';
 // new or modified in release 1.3
-$lang['charset'] = 'ISO_8859-1';
+$lang['charset'] = 'iso-8859-1';
 $lang['no'] = 'non';
 $lang['yes'] = 'oui';
@@ -216 +216 @@
 $lang['mail_new_comment_subject'] = 'Nouveau commentaire sur le site';
 $lang['mail_new_comment_content'] = 'Un nouveau commentaire a été posté sur la galerie. Si vous avez activé la validation des commentaires, il faut d\'abord valider le commentaire dans la zone d\'administration pour le voir apparaître.'."\n\n".'Vous avez accès aux derniers commentaires dans la zone d\'administration.';
+if (isset($conf))
 $lang['about_message'] = '<div style="text-align:center;font-weigh:bold;">Informations sur le PhpWebGallery</div>
 <ul>
@@ -532 +533 @@
   $lang['help_access'][2] = '2. Sur les pages des permissions (d\'un groupe, d\'utilisateur) la catégorie apparaîtra et vous pourrez autoriser l\'accès ou non.';
   $lang['help_infos'][2] = 'Pour n\'importe quelle question, n\'hésitez pas à consulter le forum ou à y poser une question, sur le site';
+if (isset($conf))
   $lang['help_infos'][2] = 'Pour n\'importe quelle question, n\'hésitez pas à consulter le <a href="'.$conf['forum_url'].'" style="text-decoration:underline">forum</a> ou à y poser une question, sur le site';
   $lang['step1_err_copy'] = 'Copiez le texte en bleu entre les tirets et collez-le dans le fichier mysql.inc.php qui se trouve dans le répertoire "include" à la base de l\'endroit où vous avez installé PhpWebGallery (le fichier mysql.inc.php ne doit comporter QUE ce qui est en bleu entre les tirets, aucun retour à la ligne ou espace n\'est autorisé)';
   $lang['conf_upload_available_info'] = 'Autoriser l\'ajout d\'image par les utilisateurs dans les catégories du site (pas sur un site distant). Ceci est un paramètre général, il est nécessaire pour autoriser l\'upload catégorie par catégorie.';
   $lang['install_help'] = 'Besoin d\'aide ? Posez votre question sur le <a href="http://forum.phpwebgallery.net">forum de PhpWebGallery</a>.';
-  // new or modified in release 1.4
+   // new or modified in release 1.3.1
+  $lang['cat_unknown_id'] = 'Cette catégorie n\'existe pas dans la base de données';
+  }
+  
+
+// new or modified in release 1.4
   $lang['install_end_message'] = 'La configuration de l\'application s\'est correctement déroulée, place à la prochaine étape<br /><br />
 Par mesure de sécurité, merci de supprimer le fichier "install.php"<br />
 Un fois ce fichier supprimé, veuillez suivre ces indications :
 <ul>
-  <li>allez sur la page d\'identification : [ <a href="../identification.php">identification</a> ] et connectez-vous avec le pseudo donné pour le webmaster</li>
+  <li>allez sur la page d\'identification : [ <a href="./identification.php">identification</a> ] et connectez-vous avec le pseudo donné pour le webmaster</li>
   <li>celui-ci vous permet d\'accéder à la partie administration et aux instructions pour placer les images dans les répertoires.</li>
 </ul>';
   $lang['install_warning'] = 'Le fichier "install.php" est encore présent sur votre serveur. Merci de le supprimer. Il pourrait être utilisé par un tiers à des fins malveillantes.';
-}
+
+
 ?>

trunk/picture.php

@@ -17 +17 @@
  *                                                                         *
  ***************************************************************************/
-
 // this page shows the image full size
-//----------------------------------------------------------- personnal include
-include_once( './include/init.inc.php' );       
+//----------------------------------------------------------- include
+$phpwg_root_path = './';
+include_once( $phpwg_root_path.'common.php' );    
 //-------------------------------------------------- access authorization check
 check_cat_id( $_GET['cat'] );
 check_login_authorization();
-$page['plain_structure'] = get_plain_structure();
 if ( isset( $page['cat'] ) and is_numeric( $page['cat'] ) )
 {
@@ -30 +29 @@
 }
 //---------------------------------------- incrementation of the number of hits
-$query = 'UPDATE '.PREFIX_TABLE.'images';
-$query.= ' SET hit=hit+1';
+$query = 'UPDATE '.IMAGES_TABLE.' SET hit=hit+1';
 $query.= ' WHERE id='.$_GET['image_id'];
 $query.= ';';
@@ -38 +36 @@
 initialize_category( 'picture' );
 //------------------------------------- main picture information initialization
-$query = 'SELECT id,date_available,comment,hit,keywords';
-$query.= ',author,name,file,date_creation,filesize,width,height';
-$query.= ',storage_category_id';
-if ( is_numeric( $page['cat'] ) )
-{
-  $query.= ',category_id';
-}
-$query.= ' FROM '.PREFIX_TABLE.'images';
-$query.= ' LEFT JOIN '.PREFIX_TABLE.'image_category AS ic ON id = ic.image_id';
+$infos = array( 'id','date_available','comment','hit','keywords','author'
+                ,'name','file','date_creation','filesize','width','height'
+                ,'storage_category_id' );
+
+$query = 'SELECT '.implode( ',', $infos );
+if ( is_numeric( $page['cat'] ) ) $query.= ',category_id';
+$query.= ' FROM '.IMAGES_TABLE;
+$query.= ' INNER JOIN '.IMAGE_CATEGORY_TABLE.' AS ic';
+$query.= ' ON id = ic.image_id';
 $query.= $page['where'];
 $query.= ' AND id = '.$_GET['image_id'];
@@ -62 +60 @@
 }
 $row = mysql_fetch_array( $result );
-$page['id']             = $row['id'];
-$page['file']           = $row['file'];
-$page['name']           = $row['name'];
-$page['date_available'] = $row['date_available'];
-$page['comment']        = $row['comment'];
-$page['hit']            = $row['hit'];
-$page['author']         = $row['author'];
-$page['date_creation']  = $row['date_creation'];
-$page['filesize']       = $row['filesize'];
-$page['width']          = $row['width'];
-$page['height']         = $row['height'];
-$page['category_id']    = $row['category_id'];
-$page['keywords']       = $row['keywords'];
-$page['storage_category_id'] = $row['storage_category_id'];
+
+foreach ( $infos as $info ) {
+  if ( isset( $row[$info] ) ) $page[$info] = $row[$info];
+  else                        $page[$info] = '';
+}
+if ( is_numeric( $page['cat'] ) ) $page['category_id'] = $row['category_id'];
 // retrieving the number of the picture in its category (in order)
 $query = 'SELECT DISTINCT(id)';
-$query.= ' FROM '.PREFIX_TABLE.'images';
-$query.= ' LEFT JOIN '.PREFIX_TABLE.'image_category AS ic ON id = ic.image_id';
+$query.= ' FROM '.IMAGES_TABLE;
+$query.= ' INNER JOIN '.IMAGE_CATEGORY_TABLE.' AS ic';
+$query.= ' ON id = ic.image_id';
 $query.= $page['where'];
 $query.= $conf['order_by'];
@@ -98 +89 @@
     // verify if the picture is already in the favorite of the user
     $query = 'SELECT COUNT(*) AS nb_fav';
-    $query.= ' FROM '.PREFIX_TABLE.'favorites';
-    $query.= ' WHERE image_id = '.$page['id'];
+    $query.= ' FROM '.FAVORITES_TABLE.' WHERE image_id = '.$page['id'];
     $query.= ' AND user_id = '.$user['id'];
     $query.= ';';
@@ -106 +96 @@
     if ( $row['nb_fav'] == 0 )
     {
-      $query = 'INSERT INTO '.PREFIX_TABLE.'favorites';
-      $query.= ' (image_id,user_id) VALUES';
+      $query = 'INSERT INTO '.FAVORITES_TABLE.' (image_id,user_id) VALUES';
       $query.= ' ('.$page['id'].','.$user['id'].')';
       $query.= ';';
@@ -115 +104 @@
   if ( $_GET['add_fav'] == 0 )
   {
-    $query = 'DELETE FROM '.PREFIX_TABLE.'favorites';
-    $query.= ' WHERE user_id = '.$user['id'];
+    $query = 'DELETE FROM '.FAVORITES_TABLE.' WHERE user_id = '.$user['id'];
     $query.= ' AND image_id = '.$page['id'];
     $query.= ';';
@@ -140 +128 @@
     }
     $query = 'SELECT id';
-    $query.= ' FROM '.PREFIX_TABLE.'images';
-    $query.= ' LEFT JOIN '.PREFIX_TABLE.'image_category AS ic';
+        $query.= ' FROM '.IMAGES_TABLE;
+        $query.= ' INNER JOIN '.IMAGE_CATEGORY_TABLE.' AS ic';
     $query.= ' ON id = ic.image_id';
     $query.= $page['where'];
@@ -162 +150 @@
   }
 }
+
+//---------------------------------------------- next picture thumbnail display
+$next = 0;
+if ( $page['num'] < $page['cat_nb_images']-1 )
+{
+  $next = $page['num'] + 1;
+  $query = 'SELECT DISTINCT(id),name,file,tn_ext,storage_category_id';
+  $query.= ' FROM '.IMAGES_TABLE;
+  $query.= ' INNER JOIN '.IMAGE_CATEGORY_TABLE.' AS ic';
+  $query.= ' ON id=ic.image_id';
+  $query.= $page['where'];
+  $query.= $conf['order_by'];
+  $query.= ' LIMIT '.$next.',1';
+  $query.= ';';
+  $result = mysql_query( $query );
+  $row = mysql_fetch_array( $result );
+
+  if ( !isset($array_cat_directories[$row['storage_category_id']]))
+  {
+    $array_cat_directories[$row['storage_category_id']] =
+      get_complete_dir( $row['storage_category_id'] );
+  }
+  $cat_directory = $array_cat_directories[$row['storage_category_id']];
+
+  $file = substr ( $row['file'], 0, strrpos ( $row['file'], ".") );
+  $next_lien_thumbnail = $cat_directory.'thumbnail/';
+  $next_lien_thumbnail.= $conf['prefix_thumbnail'].$file.".".$row['tn_ext'];
+  
+  if ( isset( $row['name'] ) and $row['name'] != '' )
+  {
+    $next_alt_thumbnail = $row['name'];
+  }
+  else
+  {
+    $next_alt_thumbnail = $file;
+  }
+  $next_title = $lang['next_image']." : ".$next_alt_thumbnail;
+
+  $next_url_link = './picture.php?image_id='.$row['id'];
+  $next_url_link.= '&amp;cat='.$page['cat'];
+  if ( isset( $_GET['expand'] ) )
+    $next_url_link.= '&amp;expand='.$_GET['expand'];
+  if ( $page['cat'] == 'search' )
+  {
+    $next_url_link.= "&amp;search=".$_GET['search'].'&amp;mode='.$_GET['mode'];
+  }
+}
 //----------------------------------------------------- template initialization
-$vtp = new VTemplate;
+//
+// Start output of page
+//
+//------------------------------------------------------------------ page title
+$title = $page['name']; 
+if ( $title == '')
+{
+  $title = str_replace("_"," ",get_filename_wo_extension($page['file']));
+}
+$refresh = 0;
+if ( isset( $_GET['slideshow'] ) && isset($next_url_link)) 
+{
+        $refresh= $_GET['slideshow'];
+        $url_link = $next_url_link;
+}
+include('include/page_header.php');
+
 $handle = $vtp->Open( './template/'.$user['template'].'/picture.vtp' );
 initialize_template();
@@ -171 +222 @@
               'period_seconds' );
 templatize_array( $tpl, 'lang', $handle );
-$vtp->setGlobalVar( $handle, 'user_template', $user['template'] );
-$vtp->setGlobalVar( $handle, 'text_color', $user['couleur_text'] );
 //-------------------------------------------------------- slideshow management
 if ( isset( $_GET['slideshow'] ) )
@@ -200 +249 @@
     $url.= '?image_id='.$page['id'];
     $url.= '&amp;cat='.$page['cat'];
-    $url.= '&amp;expand='.$_GET['expand'];
+        if (isset($_GET['expand']))
+            $url.= '&amp;expand='.$_GET['expand'];
     if ( $page['cat'] == 'search' )
     {
@@ -212 +262 @@
   $vtp->closeSession( $handle, 'start_slideshow' );
 }
-//------------------------------------------------------------------ page title
-if ( $page['name'] != '' )
-{
-  $vtp->setGlobalVar( $handle, 'page_title', $page['name'] );
-}
-else
-{
-  $page_title = str_replace("_"," ",get_filename_wo_extension($page['file']));
-  $vtp->setGlobalVar( $handle, 'page_title', $page_title );
-}
+
 //-------------------------------------------------- previous picture thumbnail
 if ( $page['num'] >= 1 )
@@ -227 +268 @@
   $prev = $page['num'] - 1;
   $query = 'SELECT DISTINCT(id),name,file,tn_ext,storage_category_id';
-  $query.= ' FROM '.PREFIX_TABLE.'images';
-  $query.= ' LEFT JOIN '.PREFIX_TABLE.'image_category AS ic ON id=ic.image_id';
+  $query.= ' FROM '.IMAGES_TABLE;
+  $query.= ' INNER JOIN '.IMAGE_CATEGORY_TABLE.' AS ic';
+  $query.= ' ON id=ic.image_id';
   $query.= $page['where'];
   $query.= $conf['order_by'];
@@ -236 +278 @@
   $row = mysql_fetch_array( $result );
 
-  if ( $array_cat_directories[$row['storage_category_id']] == '' )
+  if ( !isset($array_cat_directories[$row['storage_category_id']]) )
   {
     $array_cat_directories[$row['storage_category_id']] =
@@ -244 +286 @@
 
   $file = substr( $row['file'], 0, strrpos ( $row['file'], '.' ) );
-  $lien_thumbnail = $cat_directory.'/thumbnail/';
+  $lien_thumbnail = $cat_directory.'thumbnail/';
   $lien_thumbnail.= $conf['prefix_thumbnail'].$file.".".$row['tn_ext'];
 
   $prev_title = $lang['previous_image'].' : ';
-  $alt_thumbnaill = '';
-  if ( $row['name'] != '' ) $alt_thumbnail = $row['name'];
-  else                      $alt_thumbnail = $file;
+
+  if ( isset( $row['name'] ) and $row['name'] != '' )
+    $alt_thumbnail = $row['name'];
+  else
+    $alt_thumbnail = $file;
+
   $prev_title.= $alt_thumbnail;
   
   $url_link = './picture.php?image_id='.$row['id'].'&amp;cat='.$page['cat'];
-  $url_link.= '&amp;expand='.$_GET['expand'];
+  if ( isset( $_GET['expand'] ) ) $url_link.= '&amp;expand='.$_GET['expand'];
   if ( $page['cat'] == 'search' )
   {
@@ -283 +328 @@
 }
 
-if ( $array_cat_directories[$page['storage_category_id']] == '' )
+if ( !isset($array_cat_directories[$page['storage_category_id']]) )
 {
   $array_cat_directories[$page['storage_category_id']] =
@@ -291 +336 @@
 
 $n = $page['num'] + 1;
-$intitule_titre = replace_space( $intitule_cat." - " ).$n.'/'.
+$intitule_titre = replace_space( $intitule_cat." - " ).$n.'/';
 $intitule_titre.= $page['cat_nb_images']."<br />";
 if ( $page['name'] != "" )
@@ -330 +375 @@
         
 $url_link = './category.php?cat='.$page['cat'].'&amp;';
-$url_link.= 'num='.$page['num'].'&amp;expand='.$_GET['expand'];
+$url_link.= 'num='.$page['num']; 
+if (isset($_GET['expand']))
+        $url_link.='&amp;expand='.$_GET['expand'];
 if ( $page['cat'] == 'search' )
 {
@@ -338 +385 @@
 $vtp->setGlobalVar( $handle, 'picture_width', $final_width );
 $vtp->setGlobalVar( $handle, 'picture_height', $final_height );
-$vtp->setGlobalVar( $handle, 'picture_border_color', $user['couleur_text'] );
 $vtp->setGlobalVar( $handle, 'picture_src', $lien_image );
 $vtp->setGlobalVar( $handle, 'picture_alt', $page['file'] );
@@ -427 +473 @@
   $keywords = explode( ',', $page['keywords'] );
   $content = '';
-  $url = './category.php?cat=search&amp;expand='.$_GET['expand'];
+  $url = './category.php?cat=search';
+  if ( isset( $_GET['expand'] ) ) $url.= '&amp;expand='.$_GET['expand'];
   $url.= '&amp;mode=OR&amp;search=';
   foreach ( $keywords as $i => $keyword ) {
@@ -443 +490 @@
 $vtp->closeSession( $handle, 'info_line' );
 //------------------------------------------------------- favorite manipulation
-if ( $page['cat'] != 'fav' and !$user['is_the_guest'] )
-{
-  $url = './picture.php?cat='.$page['cat'].'&amp;image_id='.$page['id'];
-  $url.= '&amp;expand='.$_GET['expand'].'&amp;add_fav=1';
-  if ( $page['cat'] == 'search' )
-  {
-    $url.= '&amp;search='.$_GET['search'].'&amp;mode='.$_GET['mode'];
-  }
-  $vtp->addSession( $handle, 'favorite' );
-  $vtp->setVar( $handle, 'favorite.link', add_session_id( $url ) );
-  $vtp->setVar( $handle, 'favorite.title', $lang['add_favorites_hint'] );
-  $vtp->setVar( $handle, 'favorite.src',
-                './template/'.$user['template'].'/theme/favorite.gif' );
-  $vtp->setVar( $handle, 'favorite.alt','[ '.$lang['add_favorites_alt'].' ]' );
-  $vtp->closeSession( $handle, 'favorite' );
-}
-if ( $page['cat'] == 'fav' )
-{
-  $url = './picture.php?cat='.$page['cat'].'&amp;image_id='.$page['id'];
-  $url.= '&amp;expand='.$_GET['expand'].'&amp;add_fav=0';
-  $vtp->addSession( $handle, 'favorite' );
-  $vtp->setVar( $handle, 'favorite.link', add_session_id( $url ) );
-  $vtp->setVar( $handle, 'favorite.title', $lang['del_favorites_hint'] );
-  $vtp->setVar( $handle, 'favorite.src',
-                './template/'.$user['template'].'/theme/del_favorite.gif' );
-  $vtp->setVar( $handle, 'favorite.alt','[ '.$lang['del_favorites_alt'].' ]' );
-  $vtp->closeSession( $handle, 'favorite' );
+if ( !$user['is_the_guest'] )
+{
+  // verify if the picture is already in the favorite of the user
+  $query = 'SELECT COUNT(*) AS nb_fav';
+  $query.= ' FROM '.FAVORITES_TABLE.' WHERE image_id = '.$page['id'];
+  $query.= ' AND user_id = '.$user['id'].';';
+  $result = mysql_query( $query );
+  $row = mysql_fetch_array( $result );
+  if (!$row['nb_fav'])
+  {
+    $url = './picture.php?cat='.$page['cat'].'&amp;image_id='.$page['id'];
+    if (isset($_GET['expand']))
+      $url.= '&amp;expand='.$_GET['expand'];
+    $url.='&amp;add_fav=1';
+    if ( $page['cat'] == 'search' )
+    {
+      $url.= '&amp;search='.$_GET['search'].'&amp;mode='.$_GET['mode'];
+    }
+    $vtp->addSession( $handle, 'favorite' );
+    $vtp->setVar( $handle, 'favorite.link', add_session_id( $url ) );
+    $vtp->setVar( $handle, 'favorite.title', $lang['add_favorites_hint'] );
+    $vtp->setVar( $handle, 'favorite.src',
+                  './template/'.$user['template'].'/theme/favorite.gif' );
+    $vtp->setVar($handle,'favorite.alt','[ '.$lang['add_favorites_alt'].' ]');
+    $vtp->closeSession( $handle, 'favorite' );
+  }
+  else
+  {
+    $url = './picture.php?cat='.$page['cat'].'&amp;image_id='.$page['id'];
+    $url.= '&amp;expand='.$_GET['expand'].'&amp;add_fav=0';
+    $vtp->addSession( $handle, 'favorite' );
+    $vtp->setVar( $handle, 'favorite.link', add_session_id( $url ) );
+    $vtp->setVar( $handle, 'favorite.title', $lang['del_favorites_hint'] );
+    $vtp->setVar( $handle, 'favorite.src',
+                  './template/'.$user['template'].'/theme/del_favorite.gif' );
+    $vtp->setVar($handle,'favorite.alt','[ '.$lang['del_favorites_alt'].' ]');
+    $vtp->closeSession( $handle, 'favorite' );
+  }
 }
 //------------------------------------ admin link for information modifications
@@ -480 +538 @@
   $vtp->setVar( $handle, 'modification.name', $lang['link_info_image'] );
 }
-//---------------------------------------------- next picture thumbnail display
-if ( $page['num'] < $page['cat_nb_images']-1 )
-{
-  $next = $page['num'] + 1;
-  $query = 'SELECT DISTINCT(id),name,file,tn_ext,storage_category_id';
-  $query.= ' FROM '.PREFIX_TABLE.'images';
-  $query.= ' LEFT JOIN '.PREFIX_TABLE.'image_category AS ic ON id=ic.image_id';
-  $query.= $page['where'];
-  $query.= $conf['order_by'];
-  $query.= ' LIMIT '.$next.',1';
-  $query.= ';';
-  $result = mysql_query( $query );
-  $row = mysql_fetch_array( $result );
-
-  if ( $array_cat_directories[$row['storage_category_id']] == '' )
-  {
-    $array_cat_directories[$row['storage_category_id']] =
-      get_complete_dir( $row['storage_category_id'] );
-  }
-  $cat_directory = $array_cat_directories[$row['storage_category_id']];
-
-  $file = substr ( $row['file'], 0, strrpos ( $row['file'], ".") );
-  $lien_thumbnail = $cat_directory.'thumbnail/';
-  $lien_thumbnail.= $conf['prefix_thumbnail'].$file.".".$row['tn_ext'];
-  
-  if ( $row['name'] != "" )
-  {
-    $alt_thumbnail = $row['name'];
-  }
-  else
-  {
-    $alt_thumbnail = $file;
-  }
-  $next_title = $lang['next_image']." : ".$alt_thumbnail;
-
-  $url_link = './picture.php?image_id='.$row['id'].'&amp;cat='.$page['cat'];
-  $url_link.= '&amp;expand='.$_GET['expand'];
-  if ( $page['cat'] == 'search' )
-  {
-    $url_link.= "&amp;search=".$_GET['search'].'&amp;mode='.$_GET['mode'];
-  }
+
+if ( $next )
+{
   // sending vars for display
   $vtp->addSession( $handle,   'next' );
-  $vtp->setGlobalVar( $handle, 'next.url', add_session_id( $url_link ) );
+  $vtp->setGlobalVar( $handle, 'next.url', add_session_id( $next_url_link ) );
   $vtp->setGlobalVar( $handle, 'next.title', $next_title );
-  $vtp->setGlobalVar( $handle, 'next.src', $lien_thumbnail );
-  $vtp->setGlobalVar( $handle, 'next.alt', $alt_thumbnail );
+  $vtp->setGlobalVar( $handle, 'next.src', $next_lien_thumbnail );
+  $vtp->setGlobalVar( $handle, 'next.alt', $next_alt_thumbnail );
   $vtp->closeSession( $handle, 'next' );
-  // slideshow
-  if ( isset( $_GET['slideshow'] ) )
-  {
-    $vtp->addSession( $handle, 'refresh' );
-    $vtp->setVar( $handle, 'refresh.time', $_GET['slideshow'] );
-    $url = $url_link.'&amp;slideshow='.$_GET['slideshow'];
-    $vtp->setVar( $handle, 'refresh.url', add_session_id( $url ) );
-    $vtp->closeSession( $handle, 'refresh' );
-  }
-}
-else
-{
-  $vtp->addSession( $handle, 'previous_empty' );
-  $vtp->closeSession( $handle, 'previous_empty' );
+}
+else
+{
+  $vtp->addSession( $handle, 'next_empty' );
+  $vtp->closeSession( $handle, 'next_empty' );
 }
 //---------------------------------------------------- users's comments display
@@ -577 +588 @@
       // anti-flood system
       $reference_date = time() - $conf['anti-flood_time'];
-      $query = 'SELECT id';
-      $query.= ' FROM '.PREFIX_TABLE.'comments';
+      $query = 'SELECT id FROM '.COMMENTS_TABLE;
       $query.= ' WHERE date > '.$reference_date;
       $query.= " AND author = '".$author."'";
@@ -585 +595 @@
            or $conf['anti-flood_time'] == 0 )
       {
-        $query = 'INSERT INTO '.PREFIX_TABLE.'comments';
+        $query = 'INSERT INTO '.COMMENTS_TABLE;
         $query.= ' (author,date,image_id,content,validated) VALUES';
         $query.= ' (';
@@ -632 +642 @@
        and $user['status'] == 'admin' )
   {
-    $query = 'DELETE FROM '.PREFIX_TABLE.'comments';
-    $query.= ' WHERE id = '.$_GET['del'].';';
+    $query = 'DELETE FROM '.COMMENTS_TABLE.' WHERE id = '.$_GET['del'].';';
     mysql_query( $query );
   }
   // number of comment for this picture
   $query = 'SELECT COUNT(*) AS nb_comments';
-  $query.= ' FROM '.PREFIX_TABLE.'comments';
-  $query.= ' WHERE image_id = '.$page['id'];
+  $query.= ' FROM '.COMMENTS_TABLE.' WHERE image_id = '.$page['id'];
   $query.= " AND validated = 'true'";
   $query.= ';';
@@ -646 +654 @@
   // navigation bar creation
   $url = './picture.php?cat='.$page['cat'].'&amp;image_id='.$page['id'];
-  $url.= '&amp;expand='.$_GET['expand'];
+  if (isset($_GET['expand']))
+        $url.= '&amp;expand='.$_GET['expand'];
   if ( $page['cat'] == 'search' )
   {
@@ -670 +679 @@
 
   $query = 'SELECT id,author,date,image_id,content';
-  $query.= ' FROM '.PREFIX_TABLE.'comments';
-  $query.= ' WHERE image_id = '.$page['id'];
+  $query.= ' FROM '.COMMENTS_TABLE.' WHERE image_id = '.$page['id'];
   $query.= " AND validated = 'true'";
   $query.= ' ORDER BY date ASC';
@@ -724 +732 @@
     {
       $vtp->addSession( $handle, 'author_known' );
-      $vtp->setVar( $handle, 'author_known.value', $user['pseudo'] );
+          if (isset($user['pseudo']))
+              $vtp->setVar( $handle, 'author_known.value', $user['pseudo'] );
       $vtp->closeSession( $handle, 'author_known' );
     }
@@ -742 +751 @@
 $code = $vtp->Display( $handle, 0 );
 echo $code;
+
+include('include/page_tail.php');
 ?>

trunk/profile.php

@@ -18 +18 @@
  ***************************************************************************/
 // customize appearance of the site for a user
-//----------------------------------------------------------- personnal include
-include_once( './include/init.inc.php' );
+//----------------------------------------------------------- include
+$phpwg_root_path = './';
+include_once( $phpwg_root_path.'common.php' );
 //-------------------------------------------------- access authorization check
 check_login_authorization();
@@ -28 +29 @@
   exit();
 }
-//-------------------------------------------------------------- initialization
-check_cat_id( $_GET['cat'] );
 //------------------------------------------------------ update & customization
 $infos = array( 'nb_image_line', 'nb_line_page', 'language',
@@ -70 +69 @@
   }
   $mail_error = validate_mail_address( $_POST['mail_address'] );
-  if ( $mail_error != '' )
-  {
-    array_push( $errors, $mail_error );
-  }
-  if ( $_POST['use_new_pwd'] == 1 )
-  {
-    // password must be the same as its confirmation
-    if ( $_POST['password'] != $_POST['passwordConf'] )
-    {
-      array_push( $errors, $lang['reg_err_pass'] );
-    }
-  }
-
+  if ( $mail_error != '' ) array_push( $errors, $mail_error );
+  // password must be the same as its confirmation
+  if ( isset( $_POST['use_new_pwd'] )
+       and $_POST['password'] != $_POST['passwordConf'] )
+    array_push( $errors, $lang['reg_err_pass'] );
+  
   if ( count( $errors ) == 0 )
   {
@@ -98 +90 @@
     mysql_query( $query );
 
-    if ( $_POST['use_new_pwd'] == 1 )
+    if ( isset( $_POST['use_new_pwd'] ) )
     {
       $query = 'UPDATE '.PREFIX_TABLE.'users';
@@ -106 +98 @@
       mysql_query( $query );
     }
-    if ( $_POST['create_cookie'] == 1 )
+    if ( isset( $_POST['create_cookie'] ) )
     {
       setcookie( 'id',$page['session_id'],$_POST['cookie_expiration'],
@@ -118 +110 @@
     }
     // redirection
-    $url = 'category.php?cat='.$page['cat'].'&expand='.$_GET['expand'];
-    if ( $page['cat'] == 'search' )
-    {
-      $url.= '&search='.$_GET['search'].'&mode='.$_GET['mode'];
-    }
-    if ( $_POST['create_cookie'] != 1 ) $url = add_session_id( $url, true );
+    $url = 'category.php';
+    if ( !isset($_POST['create_cookie']) ) $url = add_session_id( $url,true );
     header( 'Request-URI: '.$url );  
     header( 'Content-Location: '.$url );  
@@ -131 +119 @@
 }
 //----------------------------------------------------- template initialization
-$vtp = new VTemplate;
+//
+// Start output of page
+//
+$title = $lang['customize_page_title'];
+include('include/page_header.php');
+
 $handle = $vtp->Open( './template/'.$user['template'].'/profile.vtp' );
 initialize_template();
-$tpl = array( 'customize_page_title','customize_title','password','new',
+$tpl = array( 'customize_title','password','new',
               'reg_confirm','submit','create_cookie' );
 templatize_array( $tpl, 'lang', $handle );
 //----------------------------------------------------------------- form action
-$url = './profile.php?cat='.$page['cat'].'&expand='.$page['expand'];
-if ( $page['cat'] == 'search' )
-{
-  $url.= '&search='.$_GET['search'].'&mode='.$_GET['mode'];
-}
+$url = './profile.php';
 $vtp->setGlobalVar( $handle, 'form_action', add_session_id( $url ) );
 //-------------------------------------------------------------- errors display
@@ -202 +191 @@
   $vtp->addSession( $handle, 'select' );
   $vtp->setVar( $handle, 'select.name', 'template' );
-  $option = get_dirs( './template/' );
+  $option = get_dirs( './template' );
   for ( $i = 0; $i < sizeof( $option ); $i++ )
   {
@@ -379 +368 @@
 $code = $vtp->Display( $handle, 0 );
 echo $code;
+include('include/page_tail.php');
 ?>

trunk/register.php

@@ -18 +18 @@
  ***************************************************************************/
 
-//----------------------------------------------------------- personnal include
-include_once( './include/init.inc.php' );
+//----------------------------------------------------------- include
+$phpwg_root_path = './';
+include_once( $phpwg_root_path.'common.php' );
 //-------------------------------------------------- access authorization check
 if ( $conf['access'] == "restricted" )
@@ -43 +44 @@
 }
 //----------------------------------------------------- template initialization
-$vtp = new VTemplate;
+//
+// Start output of page
+//
+$title= $lang['register_page_title'];
+include('include/page_header.php');
+
 $handle = $vtp->Open( './template/'.$user['template'].'/register.vtp' );
 // language
-$vtp->setGlobalVar( $handle, 'register_page_title',
-                    $lang['register_page_title'] );
 $vtp->setGlobalVar( $handle, 'register_title',   $lang['register_title'] );
 $vtp->setGlobalVar( $handle, 'ident_guest_visit',$lang['ident_guest_visit'] );
@@ -71 +75 @@
 $vtp->addSession( $handle, 'text' );
 $vtp->setVar( $handle, 'text.name', 'login' );
-$vtp->setVar( $handle, 'text.value', $_POST['login'] );
+if (isset( $_POST['login']))
+        $vtp->setVar( $handle, 'text.value', $_POST['login'] );
 $vtp->closeSession( $handle, 'text' );
 $vtp->closeSession( $handle, 'line' );
@@ -95 +100 @@
 $vtp->addSession( $handle, 'text' );
 $vtp->setVar( $handle, 'text.name', 'mail_address' );
-$vtp->setVar( $handle, 'text.value', $_POST['mail_address'] );
+if (isset( $_POST['mail_address']))
+        $vtp->setVar( $handle, 'text.value', $_POST['mail_address'] );
 $vtp->closeSession( $handle, 'text' );
 $vtp->closeSession( $handle, 'line' );
@@ -101 +107 @@
 $code = $vtp->Display( $handle, 0 );
 echo $code;
+include('include/page_tail.php');
 ?>

trunk/search.php

@@ -18 +18 @@
  ***************************************************************************/
 
-//----------------------------------------------------------- personnal include
-include_once( './include/init.inc.php' );
+//----------------------------------------------------------- include
+$phpwg_root_path = './';
+include_once( $phpwg_root_path.'common.php' );
 //-------------------------------------------------- access authorization check
 check_login_authorization();
@@ -54 +55 @@
 }
 //----------------------------------------------------- template initialization
-$vtp = new VTemplate;
+//
+// Start output of page
+//
+$title= $lang['search_title'];
+include('include/page_header.php');
+
 $handle = $vtp->Open( './template/'.$user['template'].'/search.vtp' );
 initialize_template();
-
 $tpl = array( 'search_title','search_return_main_page','submit',
               'search_comments' );
@@ -82 +87 @@
 $vtp->setVar( $handle, 'text.size', '40' );
 $vtp->setVar( $handle, 'text.name', 'search' );
+if (isset($_POST['search']))
 $vtp->setVar( $handle, 'text.value', $_POST['search'] );
 $vtp->closeSession( $handle, 'text' );
@@ -93 +99 @@
 $vtp->setVar( $handle, 'radio.value', 'OR' );
 $vtp->setVar( $handle, 'radio.option', $lang['search_mode_or'] );
-if ( $_POST['mode'] == 'OR' or $_POST['mode'] == '' )
+if (!isset($_POST['mode']) || $_POST['mode'] == 'OR' )
 {
   $vtp->setVar( $handle, 'radio.checked', ' checked="checked"' );
@@ -103 +109 @@
 $vtp->setVar( $handle, 'radio.value', 'AND' );
 $vtp->setVar( $handle, 'radio.option', $lang['search_mode_and'] );
-if ( $_POST['mode'] == 'AND' )
+if ( isset($_POST['mode']) && $_POST['mode'] == 'AND' )
 {
   $vtp->setVar( $handle, 'radio.checked', ' checked="checked"' );
@@ -117 +123 @@
 echo $code;
 //------------------------------------------------------------ log informations
-pwg_log( 'search', $page['title'] );
+pwg_log( 'search', $title );
 mysql_close();
+include('include/page_tail.php');
 ?>

trunk/template/default/about.vtp

@@ -1 @@
-<html>
-  <head>
-    {#style}
-    <title>{#about_page_title}</title>
-    <meta http-equiv="Content-Type" content="text/html; charset={#charset}" />
-  </head>
-  <body>
-    {#header}
     <table style="width:100%;height:100%">
       <tr align="center" valign="middle">
@@ -28 +20 @@
       </tr>
     </table>
-    {#footer}
-  </body>
-</html>

trunk/template/default/admin/cat_list.vtp

@@ -9 +9 @@
 </div>
 <!--/VTP_errors-->
-<table style="width:100%;">
-<tr>
-  <td colspan="8" style="text-align:center;padding-top:10px;padding-bottom:10px;">
+<div style="text-align:center;padding-top:10px;padding-bottom:5px;">
   <form action="" method="post">
     {#cat_add} <input type="text" name="virtual_name" />
     {#cat_parent}
+    <!--VTP_associate_LOV-->
     <select name="associate">
       <!--VTP_associate_cat-->
@@ -20 +19 @@
       <!--/VTP_associate_cat-->
     </select>
+    <!--/VTP_associate_LOV-->
+    <!--VTP_associate_text-->
+      <input type="text" name="associate" />
+    <!--/VTP_associate_text-->
    <input type="submit" value="{#submit}" name="submit" />
   </form>
-  </td>
-</tr>
+</div>
+<table style="width:100%;">
 <!--VTP_cat-->
 <tr>
   <{#td} style="width:50%;text-align:left;">
     <a name="{#id}"></a>
-    {#indent}<img src="./template/{#user_template}/admin/images/puce.gif" alt="&gt;" />
+    {#indent}
+    <!--VTP_bullet_collapsed--><a href="{#link}"><img src="../template/{#user_template}/admin/images/collapsed.gif" style="border:none;" alt="&gt;" /></a><!--/VTP_bullet_collapsed-->
+    <!--VTP_bullet_expanded--><a href="{#link}"><img src="../template/{#user_template}/admin/images/expanded.gif" style="border:none;" alt="&gt;" /></a><!--/VTP_bullet_expanded-->
+    <!--VTP_bullet_wo_link--><img src="../template/{#user_template}/admin/images/collapsed.gif" style="border:none;" alt="&gt;" /><!--/VTP_bullet_wo_link-->
     &nbsp;{#name} [
     <!--VTP_storage-->

trunk/template/default/admin/cat_modify.vtp

@@ -65 +65 @@
       <td>{#cat_parent}</td>
       <td class="row2">
+        <!--VTP_associate_LOV-->
         <select name="associate">
           <!--VTP_associate_cat-->
-          <option value="{#value}"{#selected}>{#content}</option>
+          <option value="{#value}">{#content}</option>
           <!--/VTP_associate_cat-->
         </select>
+        <!--/VTP_associate_LOV-->
+        <!--VTP_associate_text-->
+        <input type="text" name="associate" value="{#value}" />
+        <!--/VTP_associate_text-->
       </td>
     </tr>

trunk/template/default/admin/comments.vtp

@@ -25 +25 @@
 <!--/VTP_start_form-->
 <!--VTP_picture-->
-<div style="border:2px solid #D3DCE3;margin:2px;">
+<div style="border:2px solid #D3DCE3;margin:3px;">
   <table style="width:100%;">
     <tr>

trunk/template/default/admin/configuration.vtp

@@ -48 +48 @@
     <!--VTP_title_line-->
     <tr>
-      <th colspan="3" align="center">{#title}</th>
+      <th colspan="3">{#title}</th>
     </tr>
     <!--/VTP_title_line-->

trunk/template/default/admin/infos_image.vtp

@@ +1 @@
+<!--VTP_errors-->
+<div class="errors">
+  <div class="errors_title">{#errors_title}</div>
+  <ul>
+    <!--VTP_li-->
+    <li>{#content}</li>
+    <!--/VTP_li-->
+  </ul>
+</div>
+<!--/VTP_errors-->
 <form method="post" action="{#form_action}">
   <table width="100%">
@@ -76 +86 @@
         <img src="./template/{#user_template}/admin/images/arrow_select.gif" alt="&lt;" />
         {#infoimage_associate}
+        <!--VTP_associate_LOV-->
         <select name="associate">
           <!--VTP_associate_cat-->
@@ -81 +92 @@
           <!--/VTP_associate_cat-->
         </select>
-    </td>
-  </tr>
+        <!--/VTP_associate_LOV-->
+        <!--VTP_associate_text-->
+        <input type="text" name="associate" />
+        <!--/VTP_associate_text-->
+      </td>
+    </tr>
     <tr>
       <td colspan="6" style="text-align:center;">

trunk/template/default/admin/picture_modify.vtp

@@ -77 +77 @@
                 <tr>
                   <td>{#infoimage_associate}
+                    <!--VTP_associate_LOV-->
                     <select name="associate">
                       <!--VTP_associate_cat-->
                       <option value="{#value}">{#content}</option>
                       <!--/VTP_associate_cat-->
+                    </select>
+                    <!--/VTP_associate_LOV-->
+                    <!--VTP_associate_text-->
+                    <input type="text" name="associate" />
+                    <!--/VTP_associate_text-->
                     </select>
                   </td>

trunk/template/default/admin/stats.vtp

@@ -1 @@
-<style>
-      .commentsAuthor,.commentsTitle,.commentsInfos,.commentsContent,.commentsNavigationBar {
-        color:{#text_color};
-        font-family:arial,sans-Serif;
-        font-size:12px;
-      }
-      .commentsTitle,.commentsAuthor {
-        text-align:center;
-        font-weight:bold;
-      }
-      .commentsInfos {
-        text-align:right;
-        margin:3px 3px 3px 10px;
-        font-size:11px;
-      }
-      .commentsContent {
-        margin:10px;
-      }
-      .commentsTitle {
-        margin-top:15px;
-      }
-      .commentsAuthor {
-        margin:5px;
-      }
-      .commentsNavigationBar {
-        margin:10px;
-      }
-      .tableComment {
-        width:100%;
-        border:2px solid #006699;
-        margin:10px;
-      }
-      .cellAuthor {
-        border-right:1px solid #006699;
-        width:100px;
-      }
-      .cellInfo {
-        border-bottom:1px solid #006699;
-      }
-      .imgLink {
-        border:1px solid black;
-      }
-</style>
 <div style="text-align:center;margin-top:5px;">
   <!--VTP_last_day_option-->

trunk/template/default/category.vtp

@@ -1 @@
-<html>
-  <head>
-    <meta http-equiv="Content-Type" content="text/html; charset={#charset}" />
-    {#style}
-    <title>{#title}</title>
-  </head>
-  <body>
-    {#header}
     <table style="width:100%;">
       <tr>
         <td valign="top" style="width:1%;padding:10px;">
           {#frame_start}100%{#frame_begin}
-            <div class="titreMenu">{#categories}</div>
+            <div class="titreMenu">
+              <a href="{#home_url}">{#categories}</a>
+            </div>
             <div class="menu">
               <!--VTP_category-->{#indent}<!--VTP_bullet_w_link--><a href="{#bullet_link}"><img src="{#bullet_url}" style="border:none;" alt="&gt;" /></a><!--/VTP_bullet_w_link--><!--VTP_bullet_wo_link--><img src="{#bullet_url}" style="border:none;" alt="&gt;" /><!--/VTP_bullet_wo_link-->&nbsp;<a href="{#link_url}"><span title="{#hint_category}" style="{#name_style}">{#link_name}</span>&nbsp;<span class="menuInfoCat">[&nbsp;<!--VTP_subcat--><span title="{#nb_subcats} {#sub-cat}">{#nb_subcats}</span>&nbsp;-&nbsp;<!--/VTP_subcat--><span title="{#total_cat} {#images_available}">{#total_cat}</span>&nbsp;]</span></a>{#cat_icon}<br />
@@ -17 +11 @@
               <div class="totalImages">[&nbsp;{#nb_total_pictures}&nbsp;{#total}&nbsp;]</div>
               <!--VTP_favorites-->
-              <br />&nbsp;<img src="{#lien_collapsed}" al="&gt;" />&nbsp;<a href="{#url}"><span title="{#favorite_cat_hint}" style="font-weight:bold;">{#favorite_cat}</span></a>&nbsp;<span class="menuInfoCat">[&nbsp;{#nb_favorites}&nbsp;]</span>
+              <br />&nbsp;<img src="{#lien_collapsed}" alt="&gt;" />&nbsp;<a href="{#url}"><span title="{#favorite_cat_hint}" style="font-weight:bold;">{#favorite_cat}</span></a>&nbsp;<span class="menuInfoCat">[&nbsp;{#nb_favorites}&nbsp;]</span>
               <!--/VTP_favorites-->
-              <br />&nbsp;<img src="{#lien_collapsed}" al="&gt;" />&nbsp;<span style="font-weight:bold;">{#stats}</span></a>
-              <br />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<img src="{#lien_collapsed}" al="&gt;" />&nbsp;<a href="{#most_visited_url}"><span title="{#most_visited_cat_hint}" style="font-weight:bold;">{#top_number}&nbsp;{#most_visited_cat}</span></a>
-              <br />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<img src="{#lien_collapsed}" al="&gt;" />&nbsp;<a href="{#recent_url}"><span title="{#recent_cat_hint}" style="font-weight:bold;">{#recent_cat}</span></a> {#icon_short}
+              <br />&nbsp;<img src="{#lien_collapsed}" alt="&gt;" />&nbsp;<span style="font-weight:bold;">{#stats}</span>
+              <br />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<img src="{#lien_collapsed}" alt="&gt;" />&nbsp;<a href="{#most_visited_url}"><span title="{#most_visited_cat_hint}" style="font-weight:bold;">{#top_number}&nbsp;{#most_visited_cat}</span></a>
+              <br />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<img src="{#lien_collapsed}" alt="&gt;" />&nbsp;<a href="{#recent_url}"><span title="{#recent_cat_hint}" style="font-weight:bold;">{#recent_cat}</span></a> {#icon_short}
             </div>
           {#frame_end}
@@ -32 +26 @@
               <!--/VTP_summary-->
               <!--VTP_upload-->
-              <br />&nbsp;<img src="{#lien_collapsed}" alt="&gt;"/>&nbsp;<a href="{#url}" class="back">{#upload_picture}</a>
+              <br />&nbsp;<img src="{#lien_collapsed}" alt="&gt;"/>&nbsp;<a href="{#url}">{#upload_picture}</a>
               <!--/VTP_upload-->
             </div>
@@ -55 +49 @@
                            alt="{#alt}"
                            title="{#title}"
-                           class="imgLink"/><br />
-                      {#name}
-                      </a>
+                           class="imgLink"/></a>
+                      <br />
+                      <a href="{#url}" class="back">{#name}</a>
                       {#icon}
                       <!--VTP_nb_comments-->
@@ -103 +97 @@
       </tr>
     </table>
-    <div class="copyright">{#generation_time} {#time}</div>
-    <!-- Please, do not remove this copyright. If you really want to,
-         contact me pierrick@z0rglub.com to find a solution on how
-         to show the origin of the script...-->
-    <div class="copyright">Powered by <a href="{#site_url}" class="back">PhpWebGallery</a> {#version}</div>
-    {#footer}
-  </body>
-</html>

trunk/template/default/comments.vtp

@@ -1 @@
-<html>
-  <head>
-    {#style}
-    <title>{#title_comments}</title>
-    <meta http-equiv="Content-Type" content="text/html; {#charset}">
-    <!-- Specific style to comments.php-->
-    <style type="text/css">
-      .commentsAuthor,.commentsTitle,.commentsInfos,.commentsContent,.commentsNavigationBar {
-        color:{#text_color};
-        font-family:arial,sans-Serif;
-        font-size:12px;
-      }
-      .commentsTitle,.commentsAuthor {
-        text-align:center;
-        font-weight:bold;
-      }
-      .commentsInfos {
-        margin:3px 3px 3px 10px;
-        font-size:11px;
-        text-align:right;
-      }
-      .commentsContent {
-        margin:10px;
-      }
-      .commentsTitle {
-        margin-top:15px;
-      }
-      .commentsAuthor {
-        margin:5px;
-      }
-      .commentsNavigationBar {
-        margin:10px;
-      }
-      .tableComment {
-        width:100%;
-        border:2px solid {#text_color};
-        margin:10px;
-      }
-      .cellAuthor {
-        border-right:1px solid {#text_color};
-        width:100px;
-      }
-      .cellInfo {
-        border-bottom:1px solid {#text_color};
-      }
-    </style>
-  </head>
-  <body>
-    {#header}
     <table style="width:100%;">
       <tr align="center" valign="middle">
@@ -73 +24 @@
   <table style="width:100%;">
     <tr>
-     <td valign="top" width="1px">
+     <td valign="top" style="width:15%;">
        <!-- the thumbnail of the picture, linked to the full size page -->
        <a href="{#thumb_url}" title="{#thumb_title}">
@@ -79 +30 @@
        </a>
      </td>
-     <td style="padding:2px;">
-       <div style="font-weight:bold;padding-left:10px;">{#title}</div>
+     <td style="padding:10px;width:85%;">
+       <div style="font-weight:bold;padding-left:10px;text-align:left;">{#title}</div>
        <!--VTP_comment-->
-       <table style="width:100%;">
-         <tr>
-           <td>
              <table class="tableComment">
                <tr>
@@ -102 +50 @@
                </tr>
              </table>
-           </td>
-         </tr>
-       </table>
        <!--/VTP_comment-->
      </td>
@@ -115 +60 @@
       </tr>
     </table>
-    {#footer}
-  </body>
-</html>

trunk/template/default/htmlfunctions.inc.php

@@ -18 +18 @@
  ***************************************************************************/
 
-include( PREFIX_INCLUDE.'./template/'.$user['template'].'/theme/conf.php' );
+//include( PREFIX_INCLUDE.'./template/'.$user['template'].'/theme/conf.php' );
 $user['lien_expanded']='./template/'.$user['template'].'/theme/expanded.gif';
 $user['lien_collapsed']='./template/'.$user['template'].'/theme/collapsed.gif';
-include_once( PREFIX_INCLUDE.'./template/'.$user['template'].'/style.inc.php');
+//include_once( PREFIX_INCLUDE.'./template/'.$user['template'].'/style.inc.php');
 
 function get_icon( $date_comparaison )
@@ -161 +161 @@
   global $vtp, $handle, $user, $lang;
 
-  $vtp->setGlobalVar( $handle, 'charset', $lang['charset'] );
-  $vtp->setGlobalVar( $handle, 'style', $user['style'] );
+ // $vtp->setGlobalVar( $handle, 'charset', $lang['charset'] );
+  //$vtp->setGlobalVar( $handle, 'style', $user['style'] );
   $vtp->setGlobalVar( $handle, 'frame_start', get_frame_start() );
   $vtp->setGlobalVar( $handle, 'frame_begin', get_frame_begin() );
   $vtp->setGlobalVar( $handle, 'frame_end',   get_frame_end() );
-  $vtp->setVarF( $handle, 'header',
-                 './template/'.$user['template'].'/header.htm' );
-  $vtp->setVarF( $handle, 'footer',
-                 './template/'.$user['template'].'/footer.htm' );
+ //$vtp->setVarF( $handle, 'header',
+ //                './template/'.$user['template'].'/header.htm' );
+  //$vtp->setVarF( $handle, 'footer',
+   //              './template/'.$user['template'].'/footer.htm' );
 }
 
@@ -178 +178 @@
   $vtp->addSession( $handle, 'category' );
   $vtp->setVar( $handle, 'category.indent', $indent );
-
-  if ( $user['expand'] or count( $category['subcats'] ) == 0 )
+  if ( $user['expand'] or $category['nb_sub_categories'] == 0 )
   {
     $vtp->addSession( $handle, 'bullet_wo_link' );
@@ -189 +188 @@
   {
     $vtp->addSession( $handle, 'bullet_w_link' );
-    $url = './category.php?cat='.$page['cat'];
+    $url = './category.php';
+        if (isset($page['cat']))
+        {
+        $url .='?cat='.$page['cat'];
     $url.= '&expand='.$category['expand_string'];
-    if ( $page['cat'] == 'search' )
-    {
-      $url.= '&search='.$_GET['search'].'&mode='.$_GET['mode'];
-    }
+        }
+        else if ($category['expand_string']<>'')
+        {
+                $url.= '?expand='.$category['expand_string'];
+        }
     $vtp->setVar( $handle, 'bullet_w_link.bullet_link', add_session_id($url) );
     if ( $category['expanded'] )
@@ -221 +224 @@
     $vtp->setVar( $handle, 'category.name_style', 'font-weight:bold;' );
   }
-  if ( count( $category['subcats'] ) > 0 )
+  if ( $category['nb_sub_categories'] > 0 )
   {
     $vtp->addSession( $handle, 'subcat' );
-    $vtp->setVar( $handle, 'subcat.nb_subcats', count($category['subcats']) );
+    $vtp->setVar( $handle,'subcat.nb_subcats',$category['nb_sub_categories'] );
     $vtp->closeSession( $handle, 'subcat' );
   }

trunk/template/default/identification.vtp

@@ -1 @@
-<html>
-  <head>
-    {#style}
-    <title>{#ident_page_title}</title>
-    <meta http-equiv="Content-Type" content="text/html; charset={#charset}" />
-  </head>
-  <body>
-    {#header}
     <table style="width:100%;height:100%">
       <tr align="center" valign="middle">
@@ -74 +66 @@
       </tr>
     </table>
-    {#footer}
-  </body>
-</html>

trunk/template/default/picture.vtp

@@ -1 @@
-<html>
-  <head>
-    <!--VTP_refresh-->
-    <meta http-equiv="refresh" content="{#time};url={#url}">
-    <!--/VTP_refresh-->
-    <meta http-equiv="Content-Type" content="text/html;charset={#charset}">
-    {#style}
-    <!-- Specific style to picture.php-->
-    <style type="text/css">
-      .commentsAuthor,.commentsTitle,.commentsInfos,.commentsContent,.commentsNavigationBar {
-        color:{#text_color};
-        font-family:arial,sans-Serif;
-        font-size:12px;
-      }
-      .commentsTitle,.commentsAuthor {
-        text-align:center;
-        font-weight:bold;
-      }
-      .commentsInfos {
-        margin:3px 3px 3px 10px;
-        font-size:11px;
-      }
-      .commentsContent {
-        margin:10px;
-      }
-      .commentsTitle {
-        margin-top:15px;
-      }
-      .commentsAuthor {
-        margin:5px;
-      }
-      .commentsNavigationBar {
-        margin:10px;
-      }
-      .tableComment {
-        width:90%;
-        border:2px solid {#text_color};
-        margin:10px;
-      }
-      .cellAuthor {
-        border-right:1px solid {#text_color};
-        width:100px;
-      }
-      .cellInfo {
-        border-bottom:1px solid {#text_color};
-      }
-    </style>
-    <title>{#page_title}</title>
-  </head>
-  <body>
-    {#header}
     <!--VTP_information-->
     <div class="information">{#content}</div>
@@ -86 +35 @@
           {#frame_start}1%{#frame_begin}
           <a href="{#picture_link}">
-            <img style="margin:10px;width:{#picture_width}px;height:{#picture_height}px;border:1px solid {#picture_border_color}" src="{#picture_src}" alt="{#picture_alt}"/>
+            <img class="imgLink" style="margin:10px;width:{#picture_width}px;height:{#picture_height}px;border:1px solid" src="{#picture_src}" alt="{#picture_alt}"/>
           </a>
           <div class="commentImage">{#picture_comment}</div>
@@ -186 +135 @@
       <!--/VTP_comments-->
     </table>
-    {#footer}
-  </body>
-</html>

trunk/template/default/profile.vtp

@@ -1 @@
-<html>
-  <head>
-    {#style}
-    <title>{#customize_page_title}</title>
-    <meta http-equiv="Content-Type" content="text/html; {#charset}">
-  </head>
-  <body>
-    {#header}
     <table style="width:100%;height:100%">
       <tr align="center" valign="middle">
@@ -98 +90 @@
       </tr>
     </table>
-    {#footer}
-  </body>
-</html>

trunk/template/default/register.vtp

@@ -1 @@
-<html>
-  <head>
-    {#style}
-    <title>{#register_page_title}</title>
-    <meta http-equiv="Content-Type" content="text/html; charset={#charset}">
-  </head>
-  <body>
-    {#header}
     <table style="width:100%;height:100%">
       <tr align="center" valign="middle">
@@ -70 +62 @@
       </tr>
     </table>
-    {#footer}
-  </body>
-</html>

trunk/template/default/search.vtp

@@ -1 @@
-<html>
-  <head>
-    {#style}
-    <title>{#search_title}</title>
-    <meta http-equiv="Content-Type" content="text/html; charset={#charset}">
-  </head>
-  <body>
-    {#header}
     <table style="width:100%;height:100%">
       <tr align="center" valign="middle">
@@ -80 +72 @@
       </tr>
     </table>
-    {#footer}
-  </body>
-</html>

trunk/template/default/upload.vtp

@@ -1 @@
-<html>
-  <head>
-    {#style}
-    <title>{#upload_title}</title>
-    <meta http-equiv="Content-Type" content="text/html; charset={#charset}">
-  </head>
-  <body>
-    {#header}
     <table style="width:100%;height:100%">
       <tr align="center" valign="middle">
@@ -111 +103 @@
       </tr>
     </table>
-    {#footer}
-  </body>
-</html>

trunk/upload.php

@@ -17 +17 @@
  *                                                                         *
  ***************************************************************************/
+
+//----------------------------------------------------------- include
+$phpwg_root_path = './';
+include_once( $phpwg_root_path.'common.php' );
 
 //------------------------------------------------------------------- functions
@@ -95 +99 @@
     @unlink( $temp_name );
   }
+  else
+  {
+        @chmod( $temp_name, 0644);
+  }
   return $result;
 }       
-//----------------------------------------------------------- personnal include
-include_once( './include/init.inc.php' );
+
 //-------------------------------------------------- access authorization check
 check_login_authorization();
@@ -110 +117 @@
   $page['cat_name']       = $result['name'];
   $page['cat_uploadable'] = $result['uploadable'];
-}
-else
-{
-  $access_forbidden = true;
-}
-if ( $access_forbidden == true
-     or $page['cat_site_id'] != 1
+if ( $page['cat_site_id'] != 1
      or !$conf['upload_available']
      or !$page['cat_uploadable'] )
@@ -125 +126 @@
   exit();
 }
+}
 //----------------------------------------------------- template initialization
-$vtp = new VTemplate;
+//
+// Start output of page
+//
+$title= $lang['upload_title'];
+include('include/page_header.php');
 $handle = $vtp->Open( './template/'.$user['template'].'/upload.vtp' );
 initialize_template();
@@ -165 +171 @@
     array_push( $error, $lang['upload_err_username'] );
   }
-
+  
+  $date_creation = '';
   if ( $_POST['date_creation'] != '' )
   {
@@ -190 +197 @@
   $xml_infos.= ' name="'.htmlspecialchars( $_POST['name'], ENT_QUOTES).'"';
   $xml_infos.= ' />';
+
+  if ( !preg_match( '/^[a-zA-Z0-9-_.]+$/', $_FILES['picture']['name'] ) )
+  {
+    // reload language file with administration labels
+    $isadmin = true;
+    include( './language/'.$user['language'].'.php' );
+    array_push( $error, $lang['update_wrong_dirname'] );
+  }
   
   if ( sizeof( $error ) == 0 )
@@ -196 +211 @@
                                $conf['upload_maxwidth'],
                                $conf['upload_maxheight']  );
-    $upload_type = $result['type'];
     for ( $j = 0; $j < sizeof( $result['error'] ); $j++ )
     {
@@ -238 +252 @@
                              $conf['upload_maxwidth_thumbnail'],
                              $conf['upload_maxheight_thumbnail']  );
-  $upload_type = $result['type'];
   for ( $j = 0; $j < sizeof( $result['error'] ); $j++ )
   {
@@ -348 +361 @@
     $vtp->setGlobalVar( $handle, 'user_mail_address',$user['mail_address'] );
     // name of the picture
+        if (isset($_POST['name']))
     $vtp->setVar( $handle, 'fields.name', $_POST['name'] );
     // author
+        if (isset($_POST['author']))
     $vtp->setVar( $handle, 'fields.author', $_POST['author'] );
     // date of creation
+        if (isset($_POST['date_creation']))
     $vtp->setVar( $handle, 'fields.date_creation', $_POST['date_creation'] );
     // comment
+        if (isset($_POST['comment']))
     $vtp->setVar( $handle, 'fields.comment', $_POST['comment'] );
 
@@ -374 +391 @@
 $code = $vtp->Display( $handle, 0 );
 echo $code;
+include('include/page_tail.php');
 ?>