Changeset 394 for trunk

Timestamp:

Mar 26, 2004, 6:08:09 PM (20 years ago)

Author:

gweltas

Message:

• Template migration
• Admin Control Panel migration
• Category management

Location:

trunk

Files:

• admin.php (modified) (3 diffs)
• admin/admin_phpinfo.php (added)
• admin/cat_list.php (modified) (1 diff)
• admin/cat_modify.php (modified) (1 diff)
• admin/comments.php (deleted)
• admin/configuration.php (modified) (3 diffs)
• admin/include/functions.php (modified) (9 diffs)
• admin/update.php (modified) (3 diffs)
• category.php (modified) (4 diffs)
• include/common.inc.php (modified) (3 diffs)
• include/functions.inc.php (modified) (2 diffs)
• include/functions_category.inc.php (modified) (6 diffs)
• include/functions_user.inc.php (modified) (1 diff)
• include/htmlfunctions.inc.php (added)
• language/en_UK.iso-8859-1/admin.lang.php (modified) (10 diffs)
• language/en_UK.iso-8859-1/common.lang.php (modified) (4 diffs)
• picture.php (modified) (1 diff)
• template/default/admin.tpl (modified) (1 diff)
• template/default/admin/cat_list.tpl (added)
• template/default/admin/cat_list.vtp (deleted)
• template/default/admin/configuration.tpl (modified) (3 diffs)
• template/default/admin/help.tpl (modified) (1 diff)
• template/default/admin/images/icon_folder.gif (added)
• template/default/admin/images/icon_folder_link.gif (added)
• template/default/admin/images/icon_folder_lock.gif (added)
• template/default/admin/images/icon_subfolder.gif (added)
• template/default/category.tpl (modified) (1 diff)
• template/default/comments.tpl (modified) (1 diff)
• template/default/default.css (modified) (9 diffs)
• template/default/htmlfunctions.inc.php (deleted)
• upload.php (modified) (1 diff)

trunk/admin.php

@@ -90 +90 @@
  case 'configuration':
    $title = $lang['title_configuration']; $page_valide = true; break;
+ case 'admin_phpinfo':
+   $title = $lang['phpinfos']; $page_valide = true; break;
  case 'help':
    $title = $lang['title_instructions'];  $page_valide = true; break;
@@ -173 +175 @@
 
 $template->assign_vars(array(
-  'L_CONFIG'=>$lang['menu_config'],
-  'L_USERS'=>$lang['menu_users'],
-  'L_GROUPS'=>$lang['menu_groups'],
-  'L_CATEGORIES'=>$lang['menu_categories'],
-  'L_WAITING'=>$lang['menu_waiting'].$nb_waiting,
-  'L_COMMENTS'=>$lang['menu_comments'].$nb_comments,
-  'L_UPDATE'=>$lang['menu_update'],
-  'L_THUMBNAILS'=>$lang['menu_thumbnails'],
-  'L_HISTORY'=>$lang['menu_history'],
-  'L_FAQ'=>$lang['menu_instructions'],
-  'L_RETURN'=>$lang['menu_back'],
-  
+  'L_TITLE'=>$lang['admin_panel'],
+  'L_LINKS'=>$lang['links'],
+  'L_GALLERY_INDEX'=>$lang['gallery_index'],
+  'L_GENERAL'=>$lang['general'],
+  'L_CONFIG'=>$lang['config'],
+  'L_SITES'=>$lang['remote_site'],
+  'L_DEFAULT'=>$lang['gallery_default'],
+  'L_PHPINFO'=>$lang['phpinfos'],
+  'L_HISTORY'=>$lang['history'],
+  'L_FAQ'=>$lang['instructions'],
+  'L_CATEGORIES'=>$lang['categories'],
+  'L_MANAGE'=>$lang['manage'],
+  'L_UPLOAD'=>$lang['upload'],
+  'L_IMAGES'=>$lang['pictures'],
+  'L_WAITING'=>$lang['waiting'].$nb_waiting,
+  'L_COMMENTS'=>$lang['comments'].$nb_comments,
+  'L_THUMBNAILS'=>$lang['thumbnails'],
+  'L_IDENTIFY'=>$lang['identification'],
+  'L_USERS'=>$lang['users'],
+  'L_GROUPS'=>$lang['groups'],
+  'L_AUTH'=>$lang['permissions'],
+  'L_UPDATE'=>$lang['update'],
+    
   'U_CONFIG'=>add_session_id($link_start.'configuration' ),
+  'U_PHPINFO'=>add_session_id($link_start.'admin_phpinfo' ),
   'U_USERS'=>add_session_id($link_start.'user_search' ),
   'U_GROUPS'=>add_session_id($link_start.'group_list' ),
@@ -191 +205 @@
   'U_WAITING'=>add_session_id($link_start.'waiting' ),
   'U_COMMENTS'=>add_session_id($link_start.'comments' ),
-  'U_UPDATE'=>add_session_id($link_start.'update' ),
+  'U_CAT_UPDATE'=>add_session_id($link_start.'update&update=cats' ),
+  'U_IMG_UPDATE'=>add_session_id($link_start.'update&update=all' ),
   'U_THUMBNAILS'=>add_session_id($link_start.'thumbnail' ),
   'U_HISTORY'=>add_session_id($link_start.'stats' ),

trunk/admin/cat_list.php

@@ -25 +25 @@
 // | USA.                                                                  |
 // +-----------------------------------------------------------------------+
-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','errors_title' );
-templatize_array( $tpl, 'lang', $sub );
-$vtp->setGlobalVar( $sub, 'user_template', $user['template'] );
-//--------------------------------------------------- adding a virtual category
+
+if( !defined("PHPWG_ROOT_PATH") )
+{
+        die ("Hacking attempt!");
+}
+include_once( PHPWG_ROOT_PATH.'admin/include/isadmin.inc.php' );
+
 $errors = array();
-if ( isset( $_POST['submit'] ) )
+$categories=array();
+$navigation=$lang['gallery_index'];
+
+//---------------------------------------------------  virtual categories
+if ( isset( $_GET['delete'] ) && is_numeric( $_GET['delete'] ) )
+{
+  delete_category( $_GET['delete'] );
+  synchronize_all_users();
+}
+elseif ( isset( $_POST['submit'] ) )
 {
   // 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 ))
+  {
+    // we have then to add the virtual category
+        $parent_id = !empty($_GET['parent_id'])?$_GET['parent_id']:'NULL'; 
+    $query = 'INSERT INTO '.CATEGORIES_TABLE;
+    $query.= ' (name,id_uppercat,rank) VALUES ';
+    $query.= " ('".$_POST['virtual_name']."',".$parent_id.",".$_POST['rank'].")";
+    $query.= ';';
+    mysql_query( $query );
+    synchronize_all_users();
+  }
+}
+
+// Cache management
+
+$query = 'SELECT * FROM '.CATEGORIES_TABLE;
+if ( !isset($_GET['parent_id']))
+{
+  $query.= ' WHERE id_uppercat IS NULL';
+}
+else
+{
+  $query.= ' WHERE id_uppercat = '.$_GET['parent_id'];
+}
+$query.= ' ORDER BY rank ASC';
+$query.= ';';
+$result = mysql_query( $query );
+while ( $row = mysql_fetch_assoc( $result ) )
+{
+  $categories[$row['rank']]=$row;
+}
+
+// Navigation path
+if (isset($_GET['parent_id']))
+{
+  $current_category = get_cat_info($_GET['parent_id']);
+  $url = PHPWG_ROOT_PATH.'admin.php?page=cat_list&parent_id=';
+  $navigation = '<a class="" href="'.add_session_id(PHPWG_ROOT_PATH.'admin.php?page=cat_list').'">';
+  $navigation.= $lang['gallery_index'].'</a>-&gt;';
+  $navigation.= get_cat_display_name($current_category['name'], '-&gt;', $url);
+}
+
+//---------------------------------------------------------------  rank updates
+$current_rank=0;
+if ( isset( $_GET['up'] ) && is_numeric( $_GET['up'] ))
+{
+  // 1. searching the id of the category just above at the same level
+  while (list ($id,$current) = each($categories))
+  {
+    if ($current['id'] == $_GET['up'])
+        {
+          $current_rank = $current['rank'];
+          break;
+    }
+  }
+  if ($current_rank>1)
+  {
+    // 2. Exchanging ranks between the two categories
+    $query = 'UPDATE '.CATEGORIES_TABLE;
+    $query.= ' SET rank = '.($current_rank-1);
+    $query.= ' WHERE id = '.$_GET['up'];
+    $query.= ';';
+    mysql_query( $query );
+    $query = 'UPDATE '.CATEGORIES_TABLE;
+    $query.= ' SET rank = '.$current_rank;
+    $query.= ' WHERE id = '.$categories[($current_rank-1)]['id'];
+    $query.= ';';
+    mysql_query( $query );
+        // 3. Updating the cache array
+        $categories[$current_rank]=$categories[($current_rank-1)];
+        $categories[($current_rank-1)] = $current;
+  }
+  else
+  {
+    // 2. Updating the rank of our category to be after the previous max rank
+    $query = 'UPDATE '.CATEGORIES_TABLE;
+    $query.= ' SET rank = '.(count($categories) + 1);
+    $query.= ' WHERE id = '.$_GET['up'];
+    $query.= ';';
+    mysql_query( $query );
+    $query = 'UPDATE '.CATEGORIES_TABLE;
+    $query.= ' SET rank = rank-1';
+        $query.= ' WHERE id_uppercat ';
+        $query.= empty($_GET['parent_id'])?'IS NULL':('= '.$_GET['parent_id']);
+        $query.= ';';
+    mysql_query( $query );
+        // 3. Updating the cache array
+        array_push($categories, $current);
+        array_shift($categories);
+  }
+}
+elseif ( isset( $_GET['down'] ) && is_numeric( $_GET['down'] ) )
+{
+  // 1. searching the id of the category just above at the same level
+  while (list ($id,$current) = each($categories))
+  {
+    if ($current['id'] == $_GET['down'])
+        {
+          $current_rank = $current['rank'];
+          break;
+        }
+  }
+  if ($current_rank < count($categories))
+  {
+    // 2. Exchanging ranks between the two categories
+    $query = 'UPDATE '.CATEGORIES_TABLE;
+    $query.= ' SET rank = '.($current_rank+1);
+    $query.= ' WHERE id = '.$_GET['down'];
+    $query.= ';';
+    mysql_query( $query );
+    $query = 'UPDATE '.CATEGORIES_TABLE;
+    $query.= ' SET rank = '.$current_rank;
+    $query.= ' WHERE id = '.$categories[($current_rank+1)]['id'];
+    $query.= ';';
+    mysql_query( $query );
+        // 3. Updating the cache array
+        $categories[$current_rank]=$categories[($current_rank+1)];
+        $categories[($current_rank+1)] = $current;
+  }
+  else 
+  {
+    // 2. updating the rank of our category to be the first one
+    $query = 'UPDATE '.CATEGORIES_TABLE;
+    $query.= ' SET rank = 0';
+    $query.= ' WHERE id = '.$_GET['down'];
+    $query.= ';';
+    mysql_query( $query );
+    $query = 'UPDATE '.CATEGORIES_TABLE;
+    $query.= ' SET rank = (rank+1)';
+        $query.= ' WHERE id_uppercat ';
+        $query.= empty($_GET['parent_id'])?'IS NULL':('= '.$_GET['parent_id']);
+        $query.= ';';
+    mysql_query( $query );
+        // 3. Updating the cache array
+        array_unshift($categories, $current);
+        array_pop($categories);
+  }
+}
+reset($categories);
+
+//----------------------------------------------------- template initialization
+$template->set_filenames( array('categories'=>'admin/cat_list.tpl') );
+
+$template->assign_vars(array(
+  'CATEGORIES_NAV'=>$navigation,
+  'NEXT_RANK'=>count($categories)+1,
   
-  if ( count( $errors ) == 0 )
-  {
-    // we have then to add the virtual category
-    $query = 'INSERT INTO '.PREFIX_TABLE.'categories';
-    $query.= ' (name,id_uppercat) VALUES ';
-    if ( $_POST['associate'] == -1 )
-    {
-      $_POST['associate'] = 'NULL';
-    }
-    $query.= " ('".$_POST['virtual_name']."',".$_POST['associate'].")";
-    $query.= ';';
-    mysql_query( $query );
-    synchronize_all_users();
-  }
-}
-//---------------------------------------------------------------  rank updates
-if ( isset( $_GET['up'] ) and is_numeric( $_GET['up'] ) )
-{
-  // 1. searching level (id_uppercat)
-  //    and rank of the category to move
-  $query = 'SELECT id_uppercat,rank';
-  $query.= ' FROM '.PREFIX_TABLE.'categories';
-  $query.= ' WHERE id = '.$_GET['up'];
-  $query.= ';';
-  $row = mysql_fetch_array( mysql_query( $query ) );
-  $level = $row['id_uppercat'];
-  $rank  = $row['rank'];
-  // 2. searching the id and the rank of the category
-  //    just above at the same level
-  $query = 'SELECT id,rank';
-  $query.= ' FROM '.PREFIX_TABLE.'categories';
-  $query.= ' WHERE rank < '.$rank;
-  if ( $level == '' )
-  {
-    $query.= ' AND id_uppercat IS NULL';
-  }
-  else
-  {
-    $query.= ' AND id_uppercat = '.$level;
-  }
-  $query.= ' ORDER BY rank DESC';
-  $query.= ' LIMIT 0,1';
-  $query.= ';';
-  $row = mysql_fetch_array( mysql_query( $query ) );
-  $new_rank     = $row['rank'];
-  $replaced_cat = $row['id'];
-  // 3. exchanging ranks between the two categories
-  $query = 'UPDATE '.PREFIX_TABLE.'categories';
-  $query.= ' SET rank = '.$new_rank;
-  $query.= ' WHERE id = '.$_GET['up'];
-  $query.= ';';
-  mysql_query( $query );
-  $query = 'UPDATE '.PREFIX_TABLE.'categories';
-  $query.= ' SET rank = '.$rank;
-  $query.= ' WHERE id = '.$replaced_cat;
-  $query.= ';';
-  mysql_query( $query );
-}
-if ( isset( $_GET['down'] ) and is_numeric( $_GET['down'] ) )
-{
-  // 1. searching level (id_uppercat)
-  //    and rank of the category to move
-  $query = 'SELECT id_uppercat,rank';
-  $query.= ' FROM '.PREFIX_TABLE.'categories';
-  $query.= ' WHERE id = '.$_GET['down'];
-  $query.= ';';
-  $row = mysql_fetch_array( mysql_query( $query ) );
-  $level = $row['id_uppercat'];
-  $rank  = $row['rank'];
-  // 2. searching the id and the rank of the category
-  //    just below at the same level
-  $query = 'SELECT id,rank';
-  $query.= ' FROM '.PREFIX_TABLE.'categories';
-  $query.= ' WHERE rank > '.$rank;
-  if ( $level == '' )
-  {
-    $query.= ' AND id_uppercat IS NULL';
-  }
-  else
-  {
-    $query.= ' AND id_uppercat = '.$level;
-  }
-  $query.= ' ORDER BY rank ASC';
-  $query.= ' LIMIT 0,1';
-  $query.= ';';
-  $row = mysql_fetch_array( mysql_query( $query ) );
-  $new_rank     = $row['rank'];
-  $replaced_cat = $row['id'];
-  // 3. exchanging ranks between the two categories
-  $query = 'UPDATE '.PREFIX_TABLE.'categories';
-  $query.= ' SET rank = '.$new_rank;
-  $query.= ' WHERE id = '.$_GET['down'];
-  $query.= ';';
-  mysql_query( $query );
-  $query = 'UPDATE '.PREFIX_TABLE.'categories';
-  $query.= ' SET rank = '.$rank;
-  $query.= ' WHERE id = '.$replaced_cat;
-  $query.= ';';
-  mysql_query( $query );
-}
-if ( isset( $_GET['last'] ) and is_numeric( $_GET['last'] ) )
-{
-  // 1. searching level (id_uppercat) of the category to move
-  $query = 'SELECT id_uppercat,rank';
-  $query.= ' FROM '.PREFIX_TABLE.'categories';
-  $query.= ' WHERE id = '.$_GET['last'];
-  $query.= ';';
-  $row = mysql_fetch_array( mysql_query( $query ) );
-  $level = $row['id_uppercat'];
-  // 2. searching the highest rank of the categories of the same parent
-  $query = 'SELECT MAX(rank) AS max_rank';
-  $query.= ' FROM '.PREFIX_TABLE.'categories';
-  $query.= ' WHERE id_uppercat';
-  if ( $level == '' ) $query.= ' IS NULL';
-  else                $query.= ' = '.$level;
-  $query.= ';';
-  $row = mysql_fetch_array( mysql_query( $query ) );
-  $max_rank = $row['max_rank'];
-  // 3. updating the rank of our category to be after the previous max rank
-  $query = 'UPDATE '.PREFIX_TABLE.'categories';
-  $query.= ' SET rank = '.($max_rank + 1);
-  $query.= ' WHERE id = '.$_GET['last'];
-  $query.= ';';
-  mysql_query( $query );
-}
-if ( isset( $_GET['first'] ) and is_numeric( $_GET['first'] ) )
-{
-  // to place our category as first, we simply say that is rank is 0, then
-  // reordering will move category ranks correctly (first rank should be 1
-  // and not 0)
-  $query = 'UPDATE '.PREFIX_TABLE.'categories';
-  $query.= ' SET rank = 0';
-  $query.= ' WHERE id = '.$_GET['first'];
-  $query.= ';';
-  mysql_query( $query );
-}
-if ( isset( $_GET['delete'] ) and is_numeric( $_GET['delete'] ) )
-{
-  delete_category( $_GET['delete'] );
-  synchronize_all_users();
-}
-//------------------------------------------------------------------ reordering
-function ordering( $id_uppercat )
-{
-  $rank = 1;
-                
-  $query = 'SELECT id';
-  $query.= ' FROM '.PREFIX_TABLE.'categories';
-  if ( !is_numeric( $id_uppercat ) )
-  {
-    $query.= ' WHERE id_uppercat IS NULL';
-  }
-  else
-  {
-    $query.= ' WHERE id_uppercat = '.$id_uppercat;
-  }
-  $query.= ' ORDER BY rank ASC, dir ASC';
-  $query.= ';';
-  $result = mysql_query( $query );
-  while ( $row = mysql_fetch_array( $result ) )
-  {
-    $query = 'UPDATE '.PREFIX_TABLE.'categories';
-    $query.= ' SET rank = '.$rank;
-    $query.= ' WHERE id = '.$row['id'];
-    $query.= ';';
-    mysql_query( $query );
-    $rank++;
-    ordering( $row['id'] );
-  }
-}
-ordering( 'NULL' );
+  'L_ADD_VIRTUAL'=>$lang['cat_add'],
+  'L_SUBMIT'=>$lang['submit'],
+  'L_STORAGE'=>$lang['storage'],
+  'L_NB_IMG'=>$lang['pictures'],
+  'L_MOVE_UP'=>$lang['cat_up'],
+  'L_MOVE_DOWN'=>$lang['cat_down'],
+  'L_EDIT'=>$lang['edit'],
+  'L_INFO_IMG'=>$lang['cat_image_info'],
+  'L_DELETE'=>$lang['delete']
+  ));
+  
+$tpl = array( 'cat_first','cat_last');
+                          
 //-------------------------------------------------------------- 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' );
-}
-//---------------------------------------------------------------- page display
-function display_cat_manager( $id_uppercat, $indent,
-                              $uppercat_visible, $level )
-{
-  global $lang,$conf,$sub,$vtp,$page;
-                
-  // searching the min_rank and the max_rank of the category
-  $query = 'SELECT MIN(rank) AS min, MAX(rank) AS max';
-  $query.= ' FROM '.PREFIX_TABLE.'categories';
-  if ( !is_numeric( $id_uppercat ) )
-  {
-    $query.= ' WHERE id_uppercat IS NULL';
-  }
-  else
-  {
-    $query.= ' WHERE id_uppercat = '.$id_uppercat;
-  }
-  $query.= ';';
-  $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'];
-                
-  // will we use <th> or <td> lines ?
-  $td    = 'td';
-  $class = '';
-  if ( $level > 0 ) $class = 'row'.$level;
-  else              $td = 'th';
-                
-  $query = 'SELECT id,name,dir,nb_images,status,rank,site_id,visible';
-  $query.= ' FROM '.PREFIX_TABLE.'categories';
-  if ( !is_numeric( $id_uppercat ) )
-  {
-    $query.= ' WHERE id_uppercat IS NULL';
-  }
-  else
-  {
-    $query.= ' WHERE id_uppercat = '.$id_uppercat;
-  }
-  $query.= ' ORDER BY rank ASC';
-  $query.= ';';
-  $result = mysql_query( $query );
-  while ( $row = mysql_fetch_array( $result ) )
-  {
-    $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&amp;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&amp;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'] );
-
-    if ( $row['dir'] != '' )
-    {
-      $vtp->addSession( $sub, 'storage' );
-      $vtp->setVar( $sub, 'storage.dir', $row['dir'] );
-      $vtp->closeSession( $sub, 'storage' );
-      // category can't be deleted
-      $vtp->addSession( $sub, 'no_delete' );
-      $vtp->closeSession( $sub, 'no_delete' );
-    }
-    else
-    {
-      $vtp->addSession( $sub, 'virtual' );
-      $vtp->closeSession( $sub, 'virtual' );
-      // category can be deleted
-      $vtp->addSession( $sub, 'delete' );
-      $url = './admin.php?page=cat_list&amp;expand='.$page['expand'];
-      $url.= '&amp;delete='.$row['id'];
-      $vtp->setVar( $sub, 'delete.delete_url', add_session_id( $url ) );
-      $vtp->closeSession( $sub, 'delete' );
-    }
-    if ( $row['visible'] == 'false' or !$uppercat_visible )
-    {
-      $subcat_visible = false;
-      $vtp->setVar( $sub, 'cat.invisible', $lang['cat_invisible'] );
-    }
-    if ( $row['status'] == 'private' )
-    {
-      $vtp->setVar( $sub, 'cat.private', $lang['private'] );
-    }
-    $vtp->setVar( $sub, 'cat.nb_picture', $row['nb_images'] );
-    $url = add_session_id( './admin.php?page=cat_modify&amp;cat='.$row['id'] );
-    $vtp->setVar( $sub, 'cat.edit_url', $url );
-    if ( $row['rank'] != $min_rank )
-    {
-      $vtp->addSession( $sub, 'up' );
-      $url = './admin.php?page=cat_list&amp;expand='.$page['expand'];
-      $url.= '&amp;up='.$row['id'];
-      $vtp->setVar( $sub, 'up.up_url', add_session_id( $url ) );
-      $vtp->closeSession( $sub, 'up' );
-    }
-    else if ( $min_rank != $max_rank )
-    {
-      $vtp->addSession( $sub, 'no_up' );
-      $url = './admin.php?page=cat_list&amp;expand='.$page['expand'];
-      $url.= '&amp;last='.$row['id'];
-      $vtp->setVar( $sub, 'no_up.last_url', add_session_id( $url ) );
-      $vtp->closeSession( $sub, 'no_up' );
-    }
-    if ( $row['rank'] != $max_rank )
-    {
-      $vtp->addSession( $sub, 'down' );
-      $url = './admin.php?page=cat_list&amp;expand='.$page['expand'];
-      $url.= '&amp;down='.$row['id'];
-      $vtp->setVar( $sub, 'down.down_url', add_session_id( $url ) );
-      $vtp->closeSession( $sub, 'down' );
-    }
-    else if ( $min_rank != $max_rank )
-    {
-      $vtp->addSession( $sub, 'no_down' );
-      $url = './admin.php?page=cat_list&amp;expand='.$page['expand'];
-      $url.= '&amp;first='.$row['id'];
-      $vtp->setVar( $sub, 'no_down.first_url', add_session_id( $url ) );
-      $vtp->closeSession( $sub, 'no_down' );
-    }
-    if ( $row['nb_images'] > 0 )
-    {
-      $vtp->addSession( $sub, 'image_info' );
-      $url = './admin.php?page=infos_images&amp;cat_id='.$row['id'];
-      $vtp->setVar( $sub, 'image_info.image_info_url', add_session_id($url) );
-      $vtp->closeSession( $sub, 'image_info' );
-    }
-    else
-    {
-      $vtp->addSession( $sub, 'no_image_info' );
-      $vtp->closeSession( $sub, 'no_image_info' );
-    }
-    if ( $row['status'] == 'private' )
-    {
-      $vtp->addSession( $sub, 'permission' );
-      $url=add_session_id('./admin.php?page=cat_perm&amp;cat_id='.$row['id']);
-      $vtp->setVar( $sub, 'permission.url', $url );
-      $vtp->closeSession( $sub, 'permission' );
-    }
-    else
-    {
-      $vtp->addSession( $sub, 'no_permission' );
-      $vtp->closeSession( $sub, 'no_permission' );
-    }
-    // you can individually update a category only if it is on the main site
-    // and if it's not a virtual category (a category is virtual if there is
-    // no directory associated)
-    if ( $row['site_id'] == 1 and $row['dir'] != '' )
-    {
-      $vtp->addSession( $sub, 'update' );
-      $url = add_session_id('./admin.php?page=update&amp;update='.$row['id']);
-      $vtp->setVar( $sub, 'update.update_url', $url );
-      $vtp->closeSession( $sub, 'update' );
-    }
-    else
-    {
-      $vtp->addSession( $sub, 'no_update' );
-      $vtp->closeSession( $sub, 'no_update' );
-    }
-
-    $vtp->closeSession( $sub, 'cat' );
-
-    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 ?
-// 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' );
-}
+if ( sizeof( $errors ) != 0 )
+{
+  $template->assign_block_vars('errors',array());
+  for ( $i = 0; $i < sizeof( $errors ); $i++ )
+  {
+    $template->assign_block_vars('errors.error',array('ERROR'=>$errors[$i]));
+  }
+}
+//----------------------------------------------------------- Categories display
+while (list ($id,$category) = each($categories))
+{
+
+  if ($category['status'] == 'private')
+  {
+    $category_image = '<img src="'.PHPWG_ROOT_PATH.'template/'.$user['template'].'/admin/images/icon_folder_lock.gif" 
+          width="46" height="25" alt="'.$lang['cat_private'].'" title="'.$lang['cat_private'].'"/>';
+  }
+  elseif (empty($category['dir']))
+  {
+    $category_image = '<img src="'.PHPWG_ROOT_PATH.'template/'.$user['template'].'/admin/images/icon_folder_link.gif"
+          width="46" height="25" alt="'.$lang['cat_virtual'].'" title="'.$lang['cat_virtual'].'"/>';
+  }
+  else
+  {
+        // May be should we have to introduce a computed field in the table to avoid this query
+    $query = 'SELECT COUNT(id) as sub_cats FROM ' . CATEGORIES_TABLE . ' WHERE id_uppercat = '.$category['id'];
+    $result = mysql_fetch_array(mysql_query( $query ));
+        $category_image = ($result['sub_cats']) ? 
+          '<img src="'.PHPWG_ROOT_PATH.'template/'.$user['template'].'/admin/images/icon_subfolder.gif" width="46" height="25" alt="" />' : 
+          '<img src="'.PHPWG_ROOT_PATH.'template/'.$user['template'].'/admin/images/icon_folder.gif" width="46" height="25" alt="" />';
+  }
+  
+  if ( !isset( $category['dir'] ) ) $category['dir'] = '';
+  $simple_url = PHPWG_ROOT_PATH.'admin.php?page=cat_list&amp;';
+  $url = $simple_url;
+  if (isset($_GET['parent_id']))
+    $url = $simple_url.'parent_id='.$_GET['parent_id'].'&amp;';
+
+  $template->assign_block_vars('category' ,array(
+    'CATEGORY_IMG'=>$category_image,
+    'CATEGORY_NAME'=>$category['name'],
+        'CATEGORY_DIR'=>$category['dir'],
+        'CATEGORY_NB_IMG'=>$category['nb_images'],
+        
+        'U_CATEGORY'=>add_session_id( $simple_url.'parent_id='.$category['id']),
+        'U_MOVE_UP'=>add_session_id( $url.'up='.$category['id'] ),
+        'U_MOVE_DOWN'=>add_session_id( $url.'down='.$category['id'] ),
+        'U_CAT_EDIT'=>add_session_id( PHPWG_ROOT_PATH.'admin.php?page=cat_modify&amp;cat_id='.$row['id'] ),
+        'U_CAT_DELETE'=>add_session_id( $url.'delete='.$category['id'] ),
+        'U_INFO_IMG'=>add_session_id( PHPWG_ROOT_PATH.'admin.php?page=infos_images&amp;cat_id='.$row['id'] ),
+        'U_CAT_UPDATE'=>add_session_id( PHPWG_ROOT_PATH.'admin.php?page=update&amp;update='.$row['id'] )
+        ));
+        
+  if ( !empty($category['dir']))
+  {
+    $template->assign_block_vars('category.storage' ,array());
+  }
+  else
+  {
+        $template->assign_block_vars('category.virtual' ,array());
+  }
+  $url = add_session_id( './admin.php?page=cat_modify&amp;cat='.$row['id'] );
+  if ( $category['nb_images'] > 0 )
+  {
+    $template->assign_block_vars('category.image_info' ,array());
+  }
+  else
+  {
+    $template->assign_block_vars('category.no_image_info' ,array()); 
+  }
+}
+
 //----------------------------------------------------------- sending html code
-$vtp->Parse( $handle , 'sub', $sub );
+$template->assign_var_from_handle('ADMIN_CONTENT', 'categories');
 ?>

trunk/admin/cat_modify.php

@@ -130 +130 @@
 $result = get_cat_info( $row['id'] );
 // cat name
-$cat_name = get_cat_display_name( $result['name'], ' - ', '' );
+$cat_name = get_cat_display_name( $result['name'], ' - ' );
 $vtp->setVar( $sub, 'cat:name', $cat_name );
 // cat dir

trunk/admin/configuration.php

@@ -250 +250 @@
   'L_ACCESS_FREE'=>$lang['conf_general_access_1'],
   'L_ACCESS_RESTRICTED'=>$lang['conf_general_access_2'],
-  'L_HISTORY'=>$lang['conf_general_log'],
-  'L_HISTORY_INFO'=>$lang['conf_general_log_info'],
+  'L_CONF_HISTORY'=>$lang['history'],
+  'L_CONF_HISTORY_INFO'=>$lang['conf_general_log_info'],
   'L_MAIL_NOTIFICATION'=>$lang['conf_general_mail_notification'],
   'L_MAIL_NOTIFICATION_INFO'=>$lang['conf_general_mail_notification_info'],
@@ -280 +280 @@
   'L_NB_COMMENTS'=>$lang['customize_show_nb_comments'],
   'L_NB_COMMENTS_INFO'=>$lang['conf_default_show_nb_comments_info'],
-  'L_UPLOAD'=>$lang['conf_upload_available'],
-  'L_UPLOAD_INFO'=>$lang['conf_upload_available_info'],
+  'L_AUTH_UPLOAD'=>$lang['conf_upload_available'],
+  'L_AUTH_UPLOAD_INFO'=>$lang['conf_upload_available_info'],
   'L_CONF_UPLOAD'=>$lang['conf_upload_title'],
   'L_UPLOAD_MAXSIZE'=>$lang['conf_upload_maxfilesize'],
@@ -307 +307 @@
   ));
 
-$tpl = array( 'conf_confirmation','remote_site','delete',
-              'conf_remote_site_delete_info','submit','errors_title' );
-
 //-------------------------------------------------------------- errors display
 if ( sizeof( $error ) != 0 )

trunk/admin/include/functions.php

@@ -137 +137 @@
   // destruction of the categories of the site
   $query = 'SELECT id';
-  $query.= ' FROM '.PREFIX_TABLE.'categories';
+  $query.= ' FROM '.CATEGORIES_TABLE;
   $query.= ' WHERE site_id = '.$id;
   $query.= ';';
@@ -191 +191 @@
   // destruction of the sub-categories
   $query = 'SELECT id';
-  $query.= ' FROM '.PREFIX_TABLE.'categories';
+  $query.= ' FROM '.CATEGORIES_TABLE;
   $query.= ' WHERE id_uppercat = '.$id;
   $query.= ';';
@@ -201 +201 @@
 
   // destruction of the category
-  $query = 'DELETE FROM '.PREFIX_TABLE.'categories';
+  $query = 'DELETE FROM '.CATEGORIES_TABLE;
   $query.= ' WHERE id = '.$id;
   $query.= ';';
@@ -374 +374 @@
   if ( $id == 'all' )
   {
-    $query = 'SELECT id';
-    $query.= ' FROM '.PREFIX_TABLE.'categories';
-    $query.= ';';
+    $query = 'SELECT id FROM '.CATEGORIES_TABLE.';';
     $result = mysql_query( $query );
     while ( $row = mysql_fetch_array( $result ) )
@@ -400 +398 @@
     list( $date_available ) = mysql_fetch_array( mysql_query( $query ) );
     
-    $query = 'UPDATE '.PREFIX_TABLE.'categories';
+    $query = 'UPDATE '.CATEGORIES_TABLE;
     $query.= " SET date_last = '".$date_available."'";
     $query.= ', nb_images = '.$nb_images;
@@ -411 +409 @@
     // have to set representative_picture_id to NULL
     $query = 'SELECT representative_picture_id';
-    $query.= ' FROM '.PREFIX_TABLE.'categories';
+    $query.= ' FROM '.CATEGORIES_TABLE;
     $query.= ' WHERE id = '.$id;
     $row = mysql_fetch_array( mysql_query( $query ) );
@@ -426 +424 @@
       if ( mysql_num_rows( $result ) == 0 )
       {
-        $query = 'UPDATE '.PREFIX_TABLE.'categories';
+        $query = 'UPDATE '.CATEGORIES_TABLE;
         $query.= ' SET representative_picture_id = NULL';
         $query.= ' WHERE id = '.$id;
@@ -525 +523 @@
   $query = 'SELECT id,id_uppercat';
   if ( $use_name ) $query.= ',name';
-  $query.= ' FROM '.PREFIX_TABLE.'categories';
+  $query.= ' FROM '.CATEGORIES_TABLE;
   $query.= ' ORDER BY id_uppercat ASC, rank ASC';
   $query.= ';';
@@ -712 +710 @@
 
   $string_uppercats = implode( ',', array_reverse( $uppercats ) );
-  $query = 'UPDATE '.PREFIX_TABLE.'categories';
+  $query = 'UPDATE '.CATEGORIES_TABLE;
   $query.= ' SET uppercats = '."'".$string_uppercats."'";
   $query.= ' WHERE id = '.$final_id;

trunk/admin/update.php

@@ -28 +28 @@
 include_once( PHPWG_ROOT_PATH.'admin/include/isadmin.inc.php' );
 //------------------------------------------------------------------- functions
+function ordering( $id_uppercat )
+{
+  $rank = 1;
+                
+  $query = 'SELECT id';
+  $query.= ' FROM '.CATEGORIES_TABLE;
+  if ( !is_numeric( $id_uppercat ) )
+  {
+    $query.= ' WHERE id_uppercat IS NULL';
+  }
+  else
+  {
+    $query.= ' WHERE id_uppercat = '.$id_uppercat;
+  }
+  $query.= ' ORDER BY rank ASC, dir ASC';
+  $query.= ';';
+  $result = mysql_query( $query );
+  while ( $row = mysql_fetch_array( $result ) )
+  {
+    $query = 'UPDATE '.CATEGORIES_TABLE;
+    $query.= ' SET rank = '.$rank;
+    $query.= ' WHERE id = '.$row['id'];
+    $query.= ';';
+    mysql_query( $query );
+    $rank++;
+    ordering( $row['id'] );
+  }
+}
+
 function insert_local_category( $id_uppercat )
 {
@@ -678 +707 @@
   ));
   
-$tpl = array('remote_site');
 //-------------------------------------------- introduction : choices of update
 // Display choice if "update" var is not specified
@@ -733 +761 @@
   $start = get_moment();
   update_category( 'all' );
+  ordering('NULL');
   $end = get_moment();
   echo get_elapsed_time( $start, $end ).' for update_category( all )<br />';

trunk/category.php

@@ -68 +68 @@
   if (empty($name)) $name = str_replace( '_', ' ', $category['dir'] );
   
-  $template->assign_block_vars(
-    'category',
-    array(
+  $template->assign_block_vars('category', array(
       'T_NAME' => $style,
       'LINK_NAME' => $name,
@@ -188 +186 @@
   if ( is_numeric( $page['cat'] ) )
   {
-    $cat_title = get_cat_display_name( $page['cat_name'], ' > ',
-                                    'font-style:italic;' );
+    $cat_title = get_cat_display_name( $page['cat_name'], ' - ');
   }
   else
@@ -357 +354 @@
     $thumbnail_title .= ' : '.$poids.' KB';
     // url link on picture.php page
-    $url_link = './picture.php?cat='.$page['cat'];
+    $url_link = PHPWG_ROOT_PATH.'picture.php?cat='.$page['cat'];
     $url_link.= '&image_id='.$row['id'];
     if ( $page['cat'] == 'search' )
@@ -474 +471 @@
 if ( isset ( $page['cat'] ) )
 {
-  $cat_name='';
-  // total number of pictures in the category
-  if ( is_numeric( $page['cat'] ) )
-  {
-    $cat_name=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'] )
-    {
-      $url = PHPWG_ROOT_PATH.'upload.php?cat='.$page['cat'];
-          $template->assign_block_vars('upload',array('U_UPLOAD'=>add_session_id( $url )));
-    }
-  }
-  else
-  {
-    $cat_name= $page['title'];
-  }
-  $template->assign_block_vars('cat_infos',array(
-    'CAT_NAME'=>$cat_name,
-    'NB_IMG_CAT' => $page['cat_nb_images']
-        ));
+  // upload a picture in the category
+  if ( is_numeric( $page['cat']) && $page['cat_site_id'] == 1
+       && $conf['upload_available'] && $page['cat_uploadable'] )
+  {
+    $url = PHPWG_ROOT_PATH.'upload.php?cat='.$page['cat'];
+        $template->assign_block_vars('upload',array('U_UPLOAD'=>add_session_id( $url )));
+  }
+  
+  $template->assign_block_vars('cat_infos',array('NB_IMG_CAT' => $page['cat_nb_images']));
 
   // navigation bar

trunk/include/common.inc.php

@@ -121 +121 @@
 }
 
-define( 'PREFIX_INCLUDE', '' );// en attendant la migration complète
 include(PHPWG_ROOT_PATH . 'include/constants.php');
 include(PHPWG_ROOT_PATH . 'include/config.inc.php');
@@ -141 +140 @@
 if ( getenv( 'HTTP_X_FORWARDED_FOR' ) != '' )
 {
-  $client_ip = ( !empty($_SERVER['REMOTE_ADDR']) ) ? $_SERVER['REMOTE_ADDR'] : ( ( !empty($_ENV['REMOTE_ADDR']) ) ? $_ENV['REMOTE_ADDR'] : $REMOTE_ADDR );
+  $client_ip = ( !empty($_SERVER['REMOTE_ADDR']) ) ? 
+    $_SERVER['REMOTE_ADDR'] : ( ( !empty($_ENV['REMOTE_ADDR']) ) ? $_ENV['REMOTE_ADDR'] : $REMOTE_ADDR );
 
   if ( preg_match("/^([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)/",
@@ -159 +159 @@
 else
 {
-  $client_ip = ( !empty($_SERVER['REMOTE_ADDR']) ) ? $_SERVER['REMOTE_ADDR'] : ( ( !empty($_ENV['REMOTE_ADDR']) ) ? $_ENV['REMOTE_ADDR'] : $REMOTE_ADDR );
+  $client_ip = ( !empty($_SERVER['REMOTE_ADDR']) ) ? 
+    $_SERVER['REMOTE_ADDR'] : ( ( !empty($_ENV['REMOTE_ADDR']) ) ? $_ENV['REMOTE_ADDR'] : $REMOTE_ADDR );
 }
 $user_ip = encode_ip($client_ip);
 
 //
-// Setup forum wide options, if this fails then we output a CRITICAL_ERROR
-// since basic forum information is not available
+// Setup gallery wide options, if this fails then we output a CRITICAL_ERROR
+// since basic gallery information is not available
 //
 $query = 'SELECT param,value';

trunk/include/functions.inc.php

@@ -25 +25 @@
 // | USA.                                                                  |
 // +-----------------------------------------------------------------------+
-include( PHPWG_ROOT_PATH .'include/functions_user.inc.php' );
-include( PHPWG_ROOT_PATH .'include/functions_session.inc.php' );
-include( PHPWG_ROOT_PATH .'include/functions_category.inc.php' );
-include( PHPWG_ROOT_PATH .'include/functions_xml.inc.php' );
-include( PHPWG_ROOT_PATH .'include/functions_group.inc.php' );
+include_once( PHPWG_ROOT_PATH .'include/functions_user.inc.php' );
+include_once( PHPWG_ROOT_PATH .'include/functions_session.inc.php' );
+include_once( PHPWG_ROOT_PATH .'include/functions_category.inc.php' );
+include_once( PHPWG_ROOT_PATH .'include/functions_xml.inc.php' );
+include_once( PHPWG_ROOT_PATH .'include/functions_group.inc.php' );
+include_once( PHPWG_ROOT_PATH .'include/htmlfunctions.inc.php' );
 
 //----------------------------------------------------------- generic functions
@@ -397 +398 @@
   {
     $to = $row['mail_address'];
-    include( PREFIX_INCLUDE.'./language/'.$row['language'].'.php' );
+    include( PHPWG_ROOT_PATH.'language/'.$row['language'].'.php' );
     $content = $lang['mail_hello']."\n\n";
     switch ( $type )

trunk/include/functions_category.inc.php

@@ -112 +112 @@
     $category = array();
     foreach ( $infos as $info ) {
-      if ( $info == 'uc.date_last' )
-      {
-        list($year,$month,$day) = explode( '-', $row['date_last'] );
-        $category['date_last'] = mktime(0,0,0,$month,$day,$year);
+      if ( $info == 'uc.date_last')
+      {
+            if (empty($row['date_last'])) 
+                {
+                  $category['date_last']= 0;
+                }
+                else
+                {
+          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];
@@ -240 +247 @@
 function get_cat_info( $id )
 {
-  global $page;
-
   $infos = array( 'nb_images','id_uppercat','comment','site_id','galleries_url'
                   ,'dir','date_last','uploadable','status','visible'
@@ -271 +276 @@
   $cat['name'] = array();
 
-  $query = 'SELECT name FROM '.CATEGORIES_TABLE;
+  $query = 'SELECT name,id FROM '.CATEGORIES_TABLE;
   $query.= ' WHERE id IN ('.$cat['uppercats'].')';
   $query.= ' ORDER BY id ASC';
@@ -278 +283 @@
   while( $row = mysql_fetch_array( $result ) )
   {
-    array_push( $cat['name'], $row['name'] );
+    $cat['name'][$row['id']] = $row['name'];
   }
   
@@ -349 +354 @@
   $row = mysql_fetch_array( mysql_query( $query ) );
   return $row['galleries_url'];
-}
-
-// The function get_cat_display_name returns a string containing the list
-// of upper categories to the root category from the lowest category shown
-// example : "anniversaires - fete mere 2002 - animaux - erika"
-// You can give two parameters :
-//   - $separation : the string between each category name " - " for example
-//   - $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, $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
-      $output.= '<span style="'.$style.'">'.$name.'</span>';
-  }
-  if ( $replace_space ) return replace_space( $output );
-  else                  return $output;
 }
 
@@ -634 +617 @@
 }
 ?>
+

trunk/include/functions_user.inc.php

@@ -261 +261 @@
   $template_path = 'template/' ;
   $template_name = $style ;
-  include_once( PHPWG_ROOT_PATH . $template_path . $template_name.'/htmlfunctions.inc.php' );
   $template = new Template(PHPWG_ROOT_PATH . $template_path . $template_name);
   return $template;

trunk/language/en_UK.iso-8859-1/admin.lang.php

@@ -26 +26 @@
 // +-----------------------------------------------------------------------+
 
+// Main words
+$lang['links'] = 'Links';
+$lang['general'] = 'General';
+$lang['config'] = 'Configuration';
+$lang['users'] = 'Users';
+$lang['instructions'] = 'Instructions';
+$lang['history'] = 'History';
+$lang['manage'] = 'Manage';
+$lang['waiting'] = 'Waiting';
+$lang['groups'] = 'Groups';
+$lang['permissions'] = 'Permissions';
+$lang['update'] = 'Synchronize';
+$lang['storage'] = 'Directory';
+$lang['edit'] = 'Edit';
+
+// Specific words
+$lang['phpinfos'] = 'PHP Information';
+$lang['remote_site'] = 'Remote site';
+$lang['gallery_default'] = 'Gallery Default';
+$lang['upload'] = 'Upload';
+
+// Categorie words
+$lang['cat_up'] = 'Move up';
+$lang['cat_down'] = 'Move down';
+$lang['cat_add'] = 'Add a virtual category';
+$lang['cat_virtual'] = 'Virtual category';
+$lang['cat_public'] = 'Public category';
+$lang['cat_private'] = 'Private category';
+$lang['cat_image_info'] = 'Images info';
+
+// Titles
+$lang['admin_panel'] = 'Administration Panel';
+$lang['default_message'] = 'PhpWebGallery Administration Control Panel';
 $lang['title_liste_users'] = 'Users list';
 $lang['title_history'] = 'History';
@@ -37 +70 @@
 $lang['title_thumbnails_2'] = 'for';
 $lang['title_default'] = 'PhpWebGallery administration';
-$lang['menu_title'] = 'Administration';
-$lang['menu_config'] = 'Configuration';
-$lang['menu_users'] = 'Users';
+$lang['title_waiting'] = 'Pictures waiting for validation';
+
 $lang['menu_add_user'] = 'add';
 $lang['menu_list_user'] = 'list';
-$lang['menu_categories'] = 'Categories';
-$lang['menu_update'] = 'Database update';
-$lang['menu_thumbnails'] = 'Thumbnails';
-$lang['menu_history'] = 'History';
-$lang['menu_instructions'] = 'Instructions';
-$lang['menu_back'] = 'Back to galleries';
-$lang['title_waiting'] = 'Pictures waiting for validation';
-$lang['menu_waiting'] = 'Waiting';
-$lang['default_message'] = 'PhpWebGallery administration panel';
+
+//Error messages
 $lang['conf_err_prefixe'] = 'thumbnail\'s prefix mustn\'t contain any accentued character';
 $lang['conf_err_mail'] = 'e-mail address refused, it must be like name@server.com';
@@ -56 +81 @@
 $lang['conf_err_sid_time'] = 'the session time must be an integer value between 5 and 60';
 $lang['conf_err_max_user_listbox'] = 'the max user listbox number must be an integer value between 0 and 255';
+$lang['cat_error_name'] = 'The name of a category mustn\'t be empty';
+
+//FAQ
+$lang['help_images_title'] = 'Adding pictures';
+$lang['help_images_intro'] = 'How to place pictures in your directories';
+$lang['help_images'][0] = 'in the directory "galleries", create directories that will represent your categories';
+$lang['help_images'][1] = 'in each directory, you can create as many sub-level directories as you wish.';
+$lang['help_images'][2] = 'you can create as many categories and sub-categories for each category as you wish';
+$lang['help_images'][3] = 'picture files must have jpeg format (extension jpg or JPG), gif format (extension gif or GIF) or png format (extension png or PNG).';
+$lang['help_images'][4] = 'try not to use blank space " " or hyphen "-" in picture files, I advise you to use underscore "_" character which is managed by PhpWebGallery and will provide better results';
+$lang['help_thumbnails_title'] = 'Thumbnails';
+$lang['help_thumbnails'][0] = 'in each directory containing picture to display on your site, there is a sub-directory nammed "thumbnail", if it doesn\'t exist, create it to place your thumbnails into it.';
+$lang['help_thumbnails'][1] = 'thumbnails don\'t need to have the same extension as their associated picture (a picture with .jpg extension can have a thumbnail in .GIF extention for instance).';
+$lang['help_thumbnails'][2] = 'the thumbnail associated to a picture must be prefixed with the prefix given on the configuration page(image.jpg -> TN_image.GIF for instance).';
+$lang['help_thumbnails'][3] = 'I advise you to use the module for windows downloadable on the presentation site of PhpWebGallery for thumbnails management.';
+$lang['help_thumbnails'][4] = 'you can use the thumbnail creation page integrated in PhpWebGallery, but I don\'t advice you so, because thumbnail quality may be poor and it uses a high CPU load which can be a problem if you use free web hosting.';
+$lang['help_thumbnails'][5] = 'if you choose to use your hosting provider to create thumbnails, you must give 775 rights on "galleries" folder and all its sub-folders.';
+$lang['help_database_title'] = 'Updating database';
+$lang['help_database'][0] = 'once pictures files and thumbnails correctly placed in the directories, clic on "database update" in the menu of the administration panel.';
+$lang['help_infos_title'] = 'Miscellanous informations';
+$lang['help_infos'][1] = 'As soon as you created your gallery, go in the user list and modify permissions for user "visiteur". Indeed, every new registered users will have by default the same permissions as "visiteur" user.';
+$lang['help_remote_title'] = 'Remote site';
+$lang['help_remote'][0] = 'PhpWebGallery offers the possibility to use several servers to store the images which will compose your gallery. It can be useful if your gallery is installed on one limited space and that you have a big quantity of images to be shown. Please , follow this procedure : ';
+$lang['help_remote'][1] = '1. edit file "create_listing_file.php" (you will find it in the directory "admin"), by modifying the line "$prefix_thumbnail = "TN-";" if the prefix for your thumbnails is not "TN-".';
+$lang['help_remote'][2] = '2. place file "create_listing_file.php" modified on your distant website, in the root directory of your directories of images  (as the directory "galleries" of this website) by ftp.';
+$lang['help_remote'][3] = '3. launch script using the url http://domaineDistant/repGalerie/create_listing_file.php, a file listing.xml has just been created.';
+$lang['help_remote'][4] = '4. get back file listing.xml from your distant website to place it in directory "admin" of this website.';
+$lang['help_remote'][5] = '5. please , launch an update of the data of images by the interface of administration, once the listing.xml used file, kill it from the directory "admin".';
+$lang['help_remote'][6] = 'You can update the contents of a distant website by redoing the described manipulation. You can also kill a distant website by choosing the option in the configuration section of the administration panel.';
+$lang['help_upload_title'] = 'Added images by users';
+$lang['help_upload'][0] = 'PhpWebGallery offers the possibility for users to upload images. in order to do it :';
+$lang['help_upload'][1] = '1. authorize the option in the configuration zone of the administration panel';
+$lang['help_upload'][2] = '2. authorize the rights in writing in the images directories';
+$lang['help_database'][1] = 'In order to avoid the update of too many pictures in a single update, I advise to start by updating only categories, then on the categories section of the administration panel, update each category thanks to the link "update"';
+$lang['help_upload'][3] = 'The category must have upload available itself for upload.';
+$lang['help_upload'][4] = 'Uploaded images by the users are not directly visible on the website, they must be validated by an administrator.  For that purpose, an administrator must go on the page "en attente" of the administration panel, to validate or to refuse the images proposed, then launch an update of the images data.';
+$lang['help_virtual_title'] = 'Links between pictures and categories and virtual categories';
+$lang['help_virtual'][0] = 'PhpWebGallery is able to dissociate categories where pictures are stored and categories where pictures are shown.';
+$lang['help_virtual'][1] = 'By default, pictures are shown only in their real categories : the ones corresponding to directories on the web server.';
+$lang['help_virtual'][2] = 'To link a picture to a category, you just have to make the association on the page of picture informations or on the informations of all pictures of a category.';
+$lang['help_virtual'][3] = 'Using this principle, it is possible to create virtual categories in PhpWebGallery : no real directory coresponds to this category. You just have to create this category on the section "categories" of the admin panel.';
+$lang['help_groups_title'] = 'Users Groups';
+$lang['help_groups'][0] = 'PhpWebGallery is able to manage groups of users. It can be very useful to have common permission access for private categories.';
+$lang['help_groups'][1] = '1. Create the group "family" on the section "Groups" of admin panel.';
+$lang['help_groups'][2] = '2. On the section "Users", edit on of them and associate him to the group "family".';
+$lang['help_groups'][3] = '3. By modifying the permissions for a category or for a group, you\'ll see that all categories accessible for a group are accessible for its members.';
+$lang['help_groups'][4] = 'A user can belong to several groups. The authorization is stronger than prohibition : if a user "jack" belongs to the group "family" and "friends", and that only group "family" can see category "Christmas 2003", "jack" will be able to see "Christmas 2003".';
+$lang['help_access_title'] = 'Access authorization';
+$lang['help_access'][0] = 'PhpWebGallery is able to forbid access to categories. Categories can be "public" or "private". In order to forbid access to a category :';
+$lang['help_access'][1] = '1. Modify category informations (from the "categories" section in tha admin panel) and make it "private".';
+$lang['help_access'][2] = '2. On the page of permissions (for a group or a user) the private category will be shown and you\'ll be able to authorize access or not.';
+if (isset($conf))
+  $lang['help_infos'][2] = 'If you have any question, do not hesitate to take a look at the forum or ask a question there. The <a href="'.$conf['forum_url'].'" style="text-decoration:underline">forum</a> (message board) is available on the presentation site of PhpWebGallery.';
+
+
+
 $lang['conf_confirmation'] = 'Information data registered in database';
 $lang['conf_general_title'] = 'Main configuration';
-$lang['conf_general_webmaster'] = 'webmaster login';
+$lang['conf_general_webmaster'] = 'Webmaster login';
 $lang['conf_general_webmaster_info'] = 'It will be shown to the visitors. It is necessary for website administration';
-$lang['conf_general_mail'] = 'webmaster mail adress';
+$lang['conf_general_mail'] = 'Webmaster mail adress';
 $lang['conf_general_mail_info'] = 'Visitors will be able to contact by this mail';
-$lang['conf_general_prefix'] = 'thumbnail prefix';
+$lang['conf_general_prefix'] = 'Thumbnail prefix';
 $lang['conf_general_prefix_info'] = 'Thumbnails use this prefix. Do not fill if your not sure.';
-$lang['conf_general_access'] = 'access type';
-$lang['conf_general_access_1'] = 'free';
-$lang['conf_general_access_2'] = 'restricted';
+$lang['conf_general_access'] = 'Access type';
+$lang['conf_general_access_1'] = 'Free';
+$lang['conf_general_access_2'] = 'Restricted';
 $lang['conf_general_access_info'] = '- free : anyone can enter the site, any visitor can create an account in order to customize the appareance of the website<br />- restricted : the webmaster create accounts. Only registered users can enter the site';
-$lang['conf_general_max_user_listbox'] = 'max listbox users number';
-$lang['conf_general_max_user_listbox_info'] = '- this is the number maximum of users for which PhpWebGallery display a listbox instead of a simple text box on the identification page<br />- enter a number between 0 and 255, 0 means that you want to display the listbox';
-$lang['conf_comments'] = 'users comments';
-$lang['conf_comments_title'] = 'Configuration of '.$lang['conf_comments'];
+$lang['conf_comments'] = 'Users comments';
+$lang['conf_comments_title'] = 'Configuration of users comments';
 $lang['conf_comments_show_comments'] = $lang['conf_comments'];
 $lang['conf_comments_show_comments_info'] = 'display the users comments under each picture ?';
-$lang['conf_comments_comments_number'] = 'number of comments per page';
+$lang['conf_comments_comments_number'] = 'Number of comments per page';
 $lang['conf_comments_comments_number_info'] = 'number of comments to display on each page. This number is unlimited for a picture. Enter a number between 5 and 50.';
 $lang['conf_err_comment_number'] = 'The number of comments a page must be between 5 and 50 included.';
@@ -96 +175 @@
 $lang['conf_err_upload_maxheight_thumbnail'] = 'Maximum height authorized for the uploaded thumbnails must be a number superior to 10 pixels.';
 $lang['conf_default_title'] = 'Default display properties for unregistered visitors and new accounts';
-$lang['conf_default_language_info'] = 'default language';
-$lang['conf_default_theme_info'] = 'default theme';
+$lang['conf_default_language_info'] = 'Default language';
+$lang['conf_default_theme_info'] = 'Default theme';
 $lang['conf_session_title'] = 'Sessions configuration';
 $lang['conf_session_size'] = 'identifier size';
@@ -128 +207 @@
 $lang['listuser_modify'] = 'modify';
 $lang['listuser_modify_hint'] = 'modify informations of';
-$lang['listuser_permission'] = 'permissions';
+$lang['listuser_permission'] = 'Permissions';
 $lang['listuser_permission_hint'] = 'modify permissions of';
 $lang['listuser_delete'] = 'delete';
@@ -135 +214 @@
 $lang['listuser_button_invert'] = 'invert';
 $lang['listuser_button_create_address'] = 'create mail address';
-$lang['cat_invisible'] = 'invisible';
-$lang['cat_edit'] = 'Edit';
-$lang['cat_up'] = 'Move up';
-$lang['cat_down'] = 'Move down';
-$lang['cat_image_info'] = 'Images info';
-$lang['cat_total'] = 'total';
+
+
 $lang['editcat_confirm'] = 'Information registered in the database';
-$lang['editcat_back'] = 'categories';
 $lang['editcat_title1'] = 'Options for the';
 $lang['editcat_name'] = 'Name';
@@ -194 +268 @@
 $lang['tn_dirs_title'] = 'Directories list';
 $lang['tn_dirs_alone'] = 'pictures without thumbnail';
-$lang['help_images_title'] = 'Adding pictures';
-$lang['help_images_intro'] = 'How to place pictures in your directories';
-$lang['help_images'][0] = 'in the directory "galleries", create directories that will represent your categories';
-$lang['help_images'][1] = 'in each directory, you can create as many sub-level directories as you wish.';
-$lang['help_images'][2] = 'you can create as many categories and sub-categories for each category as you wish';
-$lang['help_images'][3] = 'picture files must have jpeg format (extension jpg or JPG), gif format (extension gif or GIF) or png format (extension png or PNG).';
-$lang['help_images'][4] = 'try not to use blank space " " or hyphen "-" in picture files, I advise you to use underscore "_" character which is managed by PhpWebGallery and will provide better results';
-$lang['help_thumbnails_title'] = 'Thumbnails';
-$lang['help_thumbnails'][0] = 'in each directory containing picture to display on your site, there is a sub-directory nammed "thumbnail", if it doesn\'t exist, create it to place your thumbnails into it.';
-$lang['help_thumbnails'][1] = 'thumbnails don\'t need to have the same extension as their associated picture (a picture with .jpg extension can have a thumbnail in .GIF extention for instance).';
-$lang['help_thumbnails'][2] = 'the thumbnail associated to a picture must be prefixed with the prefix given on the configuration page(image.jpg -> TN_image.GIF for instance).';
-$lang['help_thumbnails'][3] = 'I advise you to use the module for windows downloadable on the presentation site of PhpWebGallery for thumbnails management.';
-$lang['help_thumbnails'][4] = 'you can use the thumbnail creation page integrated in PhpWebGallery, but I don\'t advice you so, because thumbnail quality may be poor and it uses a high CPU load which can be a problem if you use free web hosting.';
-$lang['help_thumbnails'][5] = 'if you choose to use your hosting provider to create thumbnails, you must give 775 rights on "galleries" folder and all its sub-folders.';
-$lang['help_database_title'] = 'Updating database';
-$lang['help_database'][0] = 'once pictures files and thumbnails correctly placed in the directories, clic on "database update" in the menu of the administration panel.';
-$lang['help_infos_title'] = 'Miscellanous informations';
-$lang['help_infos'][1] = 'As soon as you created your gallery, go in the user list and modify permissions for user "visiteur". Indeed, every new registered users will have by default the same permissions as "visiteur" user.';
-$lang['help_remote_title'] = 'Remote site';
-$lang['help_remote'][0] = 'PhpWebGallery offers the possibility to use several servers to store the images which will compose your gallery. It can be useful if your gallery is installed on one limited space and that you have a big quantity of images to be shown. Please , follow this procedure : ';
-$lang['help_remote'][1] = '1. edit file "create_listing_file.php" (you will find it in the directory "admin"), by modifying the line "$prefix_thumbnail = "TN-";" if the prefix for your thumbnails is not "TN-".';
-$lang['help_remote'][2] = '2. place file "create_listing_file.php" modified on your distant website, in the root directory of your directories of images  (as the directory "galleries" of this website) by ftp.';
-$lang['help_remote'][3] = '3. launch script using the url http://domaineDistant/repGalerie/create_listing_file.php, a file listing.xml has just been created.';
-$lang['help_remote'][4] = '4. get back file listing.xml from your distant website to place it in directory "admin" of this website.';
-$lang['help_remote'][5] = '5. please , launch an update of the data of images by the interface of administration, once the listing.xml used file, kill it from the directory "admin".';
-$lang['help_remote'][6] = 'You can update the contents of a distant website by redoing the described manipulation. You can also kill a distant website by choosing the option in the configuration section of the administration panel.';
-$lang['help_upload_title'] = 'Added images by users';
-$lang['help_upload'][0] = 'PhpWebGallery offers the possibility for users to upload images. in order to do it :';
-$lang['help_upload'][1] = '1. authorize the option in the configuration zone of the administration panel';
-$lang['help_upload'][2] = '2. authorize the rights in writing in the images directories';
-$lang['remote_site'] = 'Remote site';
+
+
 $lang['title_add'] = 'Add a user';
 $lang['title_modify'] = 'Modify a user';
@@ -232 +277 @@
 $lang['title_group_perm'] = 'Modify permissions for group';
 $lang['title_picmod'] = 'Modify informations about a picture';
-$lang['menu_groups'] = 'Groups';
-$lang['menu_comments'] = 'Comments';
-$lang['conf_general_log'] = 'history';
 $lang['conf_general_log_info'] = 'Keep an history of visits on your website ? Visits will be shown in the history section of the administration panel';
 $lang['conf_general_mail_notification'] = 'Mail notification';
@@ -259 +301 @@
 $lang['group_list_title'] = 'List of existing groups';
 $lang['group_err_unknown'] = 'This group doesn\'t exist in the database';
-$lang['cat_permission'] = 'permissions';
-$lang['cat_update'] = 'update';
-$lang['cat_add'] = 'Add a virtual category';
-$lang['cat_parent'] = 'parent category';
-$lang['cat_error_name'] = 'The name of a category mustn\'t be empty';
-$lang['cat_virtual'] = 'virtual';
 $lang['cat_first'] = 'Move first';
 $lang['cat_last'] = 'Move last';
@@ -281 +317 @@
 $lang['comments_last_title'] = 'Last comments';
 $lang['comments_non_validated_title'] = 'Comments waiting for validation';
-$lang['help_database'][1] = 'In order to avoid the update of too many pictures in a single update, I advise to start by updating only categories, then on the categories section of the administration panel, update each category thanks to the link "update"';
-$lang['help_upload'][3] = 'The category must have upload available itself for upload.';
-$lang['help_upload'][4] = 'Uploaded images by the users are not directly visible on the website, they must be validated by an administrator.  For that purpose, an administrator must go on the page "en attente" of the administration panel, to validate or to refuse the images proposed, then launch an update of the images data.';
-$lang['help_virtual_title'] = 'Links between pictures and categories and virtual categories';
-$lang['help_virtual'][0] = 'PhpWebGallery is able to dissociate categories where pictures are stored and categories where pictures are shown.';
-$lang['help_virtual'][1] = 'By default, pictures are shown only in their real categories : the ones corresponding to directories on the web server.';
-$lang['help_virtual'][2] = 'To link a picture to a category, you just have to make the association on the page of picture informations or on the informations of all pictures of a category.';
-$lang['help_virtual'][3] = 'Using this principle, it is possible to create virtual categories in PhpWebGallery : no real directory coresponds to this category. You just have to create this category on the section "categories" of the admin panel.';
-$lang['help_groups_title'] = 'Users Groups';
-$lang['help_groups'][0] = 'PhpWebGallery is able to manage groups of users. It can be very useful to have common permission access for private categories.';
-$lang['help_groups'][1] = '1. Create the group "family" on the section "Groups" of admin panel.';
-$lang['help_groups'][2] = '2. On the section "Users", edit on of them and associate him to the group "family".';
-$lang['help_groups'][3] = '3. By modifying the permissions for a category or for a group, you\'ll see that all categories accessible for a group are accessible for its members.';
-$lang['help_groups'][4] = 'A user can belong to several groups. The authorization is stronger than prohibition : if a user "jack" belongs to the group "family" and "friends", and that only group "family" can see category "Christmas 2003", "jack" will be able to see "Christmas 2003".';
-$lang['help_access_title'] = 'Access authorization';
-$lang['help_access'][0] = 'PhpWebGallery is able to forbid access to categories. Categories can be "public" or "private". In order to forbid access to a category :';
-$lang['help_access'][1] = '1. Modify category informations (from the "categories" section in tha admin panel) and make it "private".';
-$lang['help_access'][2] = '2. On the page of permissions (for a group or a user) the private category will be shown and you\'ll be able to authorize access or not.';
-if (isset($conf))
-  $lang['help_infos'][2] = 'If you have any question, do not hesitate to take a look at the forum or ask a question there. The <a href="'.$conf['forum_url'].'" style="text-decoration:underline">forum</a> (message board) is available on the presentation site of PhpWebGallery.';
+
 $lang['step1_err_copy'] = 'Copy the text between hyphens and paste it into the file "include/mysql.inc.php"(Warning : mysql.inc.php must only contain what is in blue, no line return or space character)';
 $lang['permuser_only_private'] = 'Only private categories are shown';

trunk/language/en_UK.iso-8859-1/common.lang.php

@@ -26 +26 @@
 // +-----------------------------------------------------------------------+
 
+// Main words 
+
+$lang['gallery_index'] = 'Gallery index';
+$lang['category'] = 'Category';
+$lang['categories'] = 'Categories';
+$lang['thumbnail'] = 'Thumbnail';
+$lang['thumbnails'] = 'Thumbnails';
+$lang['search'] = 'Search';
+$lang['submit'] = 'Submit';
+$lang['comment'] = 'Comment';
+$lang['comments'] = 'Comments';
+$lang['picture'] = 'Picture';
+$lang['pictures'] = 'Pictures';
+$lang['no'] = 'No';
+$lang['yes'] = 'Yes';
+$lang['date'] = 'Date';
+
+// Identification
+$lang['login'] = 'Login';
+$lang['logout'] = 'Logout';
+$lang['password'] = 'Password';
+$lang['customize'] = 'Customize';
+$lang['new'] = 'New';
+$lang['delete'] = 'Delete';
+$lang['identification'] = 'Identification';
+
+//Calendar
+$lang['month'][1] = 'January';
+$lang['month'][2] = 'February';
+$lang['month'][3] = 'March';
+$lang['month'][4] = 'April';
+$lang['month'][5] = 'May';
+$lang['month'][6] = 'June';
+$lang['month'][7] = 'July';
+$lang['month'][8] = 'August';
+$lang['month'][9] = 'September';
+$lang['month'][10] = 'October';
+$lang['month'][11] = 'November';
+$lang['month'][12] = 'December';
+$lang['day'][0] = 'Sunday';
+$lang['day'][1] = 'Monday';
+$lang['day'][2] = 'Tuesday';
+$lang['day'][3] = 'Wednesday';
+$lang['day'][4] = 'Thursday';
+$lang['day'][5] = 'Friday';
+$lang['day'][6] = 'Saturday';
+
 $lang['only_members'] = 'Only members can access this page';
 $lang['invalid_pwd'] = 'Invalid password!';
 $lang['access_forbiden'] = 'You are not authorized to access this page';
-$lang['submit'] = 'Submit';
-$lang['login'] = 'login';
-$lang['password'] = 'password';
-$lang['new'] = 'new';
-$lang['delete'] = 'delete';
-$lang['category'] = 'category';
-$lang['thumbnail'] = 'thumbnail';
-$lang['date'] = 'date';
 $lang['diapo_default_page_title'] = 'No category selected';
-$lang['thumbnails'] = 'Thumbnails';
-$lang['categories'] = 'Categories';
 $lang['hint_category'] = 'shows images at the root of this categry';
 $lang['total_images'] = 'total';
 $lang['title_menu'] = 'Menu';
 $lang['change_login'] = 'change login';
-$lang['login'] = 'login';
 $lang['hint_login'] = 'identification enables site\'s appareance customization';
-$lang['logout'] = 'Logout';
-$lang['customize'] = 'customize';
 $lang['hint_customize'] = 'customize the appareance of the gallery';
 $lang['hint_search'] = 'search';
-$lang['search'] = 'search';
 $lang['favorite_cat'] = 'favorites';
 $lang['favorite_cat_hint'] = 'display your favorites';
@@ -112 +145 @@
 $lang['comments_del'] = 'delete this comment';
 $lang['comments_add'] = 'Add a comment';
-$lang['month'][1] = 'January';
-$lang['month'][2] = 'February';
-$lang['month'][3] = 'March';
-$lang['month'][4] = 'April';
-$lang['month'][5] = 'May';
-$lang['month'][6] = 'June';
-$lang['month'][7] = 'July';
-$lang['month'][8] = 'August';
-$lang['month'][9] = 'September';
-$lang['month'][10] = 'October';
-$lang['month'][11] = 'November';
-$lang['month'][12] = 'December';
-$lang['day'][0] = 'Sunday';
-$lang['day'][1] = 'Monday';
-$lang['day'][2] = 'Tuesday';
-$lang['day'][3] = 'Wednesday';
-$lang['day'][4] = 'Thursday';
-$lang['day'][5] = 'Friday';
-$lang['day'][6] = 'Saturday';
+
 $lang['add_favorites_alt'] = 'Add to favorites';
 $lang['add_favorites_hint'] = 'Add this picture to your favorites';
@@ -165 +180 @@
 // new or modified in release 1.3
 $lang['charset'] = 'iso-8859-1';
-$lang['no'] = 'no';
-$lang['yes'] = 'yes';
+
 $lang['guest'] = 'guest';
 $lang['mail_address'] = 'mail address';
-$lang['public'] = 'public';
-$lang['private'] = 'private';
 $lang['add'] = 'add';
 $lang['dissociate'] = 'dissociate';
@@ -183 +195 @@
 $lang['infos_title'] = 'Informations';
 $lang['default'] = 'default';
-$lang['comments'] = 'comments';
 $lang['category_representative'] = 'representative';
 $lang['stats'] = 'statistics';

trunk/picture.php

@@ -277 +277 @@
 if (is_numeric( $page['cat'] )) 
 {
-  $title_img = replace_space(get_cat_display_name( $page['cat_name'], " > ","font-style:italic;" ));
+  $title_img = replace_space(get_cat_display_name( $page['cat_name'], " > "));
   $n = $page['num'] + 1;
   $title_nb = "Photo".' '.$n.'/';

trunk/template/default/admin.tpl

@@ -2 +2 @@
   <p class="install_warning">{L_INSTALL_WARNING}</div>
 <!-- END install_warning -->
-<div class="adminMenu">
-  <a class="adminMenu" href="{U_CONFIG}">{L_CONFIG}</a>&nbsp;|&nbsp;
-  <a class="adminMenu" href="{U_USERS}">{L_USERS}</a>&nbsp;|&nbsp; 
-  <a class="adminMenu" href="{U_GROUPS}">{L_GROUPS}</a>&nbsp;|&nbsp;
-  <a class="adminMenu" href="{U_CATEGORIES}">{L_CATEGORIES}</a>&nbsp;|&nbsp;
-  <a class="adminMenu" href="{U_WAITING}">{L_WAITING}</a>&nbsp;|&nbsp; 
-  <a class="adminMenu" href="{U_COMMENTS}">{L_COMMENTS}</a>&nbsp;|&nbsp; 
-  <a class="adminMenu" href="{U_UPDATE}">{L_UPDATE}</a>&nbsp;|&nbsp; 
-  <a class="adminMenu" href="{U_THUMBNAILS}">{L_THUMBNAILS}</a>&nbsp;|&nbsp; 
-  <a class="adminMenu" href="{U_HISTORY}">{L_HISTORY}</a>&nbsp;|&nbsp; 
-  <a class="adminMenu" href="{U_FAQ}">{L_FAQ}</a>&nbsp;|&nbsp;
-  <a class="adminMenu" href="{U_RETURN}">{L_RETURN}</a> 
+<table style="width:100%;">
+  <tr>
+        <td valign="top" style="padding:10px;width:1%;">
+        <div class="table1">
+
+<div class="titreMenu">{L_LINKS}</div>
+<div class="menu">
+<ul class="menu">
+  <li><a class="adminMenu" href="{U_RETURN}">{L_GALLERY_INDEX}</a></li>
+  </ul>
 </div>
-<div align="center">
-<div class="adminMain">
+<div class="titreMenu">{L_GENERAL}</div>
+<div class="menu">
+<ul class="menu">
+  <li><a class="adminMenu" href="{U_FAQ}">{L_FAQ}</a></li>
+  <li><a class="adminMenu" href="{U_CONFIG}">{L_CONFIG}</a></li>
+  <li><a class="adminMenu" href="{U_CONFIG}">{L_SITES}</a></li>
+  <!--<li><a class="adminMenu" href="{U_CONFIG}">{L_DEFAULT}</a></li>-->
+  <li><a class="adminMenu" href="{U_PHPINFO}">{L_PHPINFO}</a></li>
+  <li><a class="adminMenu" href="{U_HISTORY}">{L_HISTORY}</a></li>
+  </ul>
+</div>
+<div class="titreMenu">{L_CATEGORIES}</div>
+<div class="menu">
+<ul class="menu">
+  <li><a class="adminMenu" href="{U_CATEGORIES}">{L_MANAGE}</a></li>
+  <li><a class="adminMenu" href="{U_UPLOAD}">{L_UPLOAD}</a></li>
+  <li><a class="adminMenu" href="{U_CAT_UPDATE}">{L_UPDATE}</a></li>
+</ul>
+</div>
+<div class="titreMenu">{L_IMAGES}</div>
+<div class="menu">
+<ul class="menu">
+  <li><a class="adminMenu" href="{U_WAITING}">{L_WAITING}</a></li>
+  <li><a class="adminMenu" href="{U_THUMBNAILS}">{L_THUMBNAILS}</a></li>
+  <li><a class="adminMenu" href="{U_COMMENTS}">{L_COMMENTS}</a></li>
+  <li><a class="adminMenu" href="{U_IMG_UPDATE}">{L_UPDATE}</a></li>
+  </ul>
+</div>
+<div class="titreMenu">{L_IDENTIFY}</div>
+<div class="menu">
+<ul class="menu">
+  <li><a class="adminMenu" href="{U_USERS}">{L_USERS}</a></li>
+  <li><a class="adminMenu" href="{U_GROUPS}">{L_GROUPS}</a></li>
+</ul>
+</div>
+<div class="titreMenu">{L_AUTH}</div>
+<div class="menu">
+<ul class="menu">
+  <li><a class="adminMenu" href="{U_AUTH}">{L_AUTH}</a></li>
+  <li><a class="adminMenu" href="{U_USERS_AUTH}">{L_USERS}</a></li>
+  <li><a class="adminMenu" href="{U_GROUPS_AUTH}">{L_GROUPS}</a></li>
+</ul>
+</div>
+      </div>
+        </td>
+        <td style="padding:10px;width:99%;" valign="top">
+<div class="home">
   <div class="titrePage">{PAGE_TITLE}</div>
   {ADMIN_CONTENT}
-</div></div>
+</div>
+        </td>
+  </tr>
+</table>

trunk/template/default/admin/configuration.tpl

@@ -12 +12 @@
 <!-- END confirmation -->
 <form method="post" action="{F_ACTION}">
-<table width="100%">
-  <tr class="admin">
-    <th colspan="3">{L_CONF_GENERAL}</th>
-  </tr>
-  <tr>
-    <td colspan="3">&nbsp;</td>
-  </tr>
-  <tr>
-    <td width="20%" >{L_ADMIN_NAME}</td>
-        <td><input type="text" size="25" name="webmaster" value="{ADMIN_NAME}" /></td>
-        <td width="50%" >{L_ADMIN_NAME_INFO}</td>
-  </tr>
-  <tr>
-    <td>{L_ADMIN_MAIL}</td>
-        <td><input type="text" size="25" maxlength="100" name="mail_webmaster" value="{ADMIN_MAIL}" /></td>
-        <td>{L_ADMIN_MAIL_INFO}</td>
-  </tr>
-  <tr>
-    <td>{L_THUMBNAIL_PREFIX}</td>
-        <td><input type="text" size="3" maxlength="4" name="prefix_thumbnail" value="{THUMBNAIL_PREFIX}" /></td>
-        <td>{L_THUMBNAIL_PREFIX_INFO}</td>
-  </tr>
-  <tr>
-  <td>{L_ACCESS}</td>
-        <td><input type="radio" class="radio" name="access" value="free" {ACCESS_FREE} />{L_ACCESS_FREE}&nbsp;&nbsp;
+<table width="100%" align="center">
+  <tr class="admin">
+    <th colspan="2">{L_CONF_GENERAL}</th>
+  </tr>
+  <tr>
+    <td colspan="2">&nbsp;</td>
+  </tr>
+  <tr>
+    <td width="50%" ><strong>{L_ADMIN_NAME} &nbsp;:</strong><br /><span class="small">{L_ADMIN_NAME_INFO}</span></td>
+        <td class="row1"><input type="text" size="25" name="webmaster" value="{ADMIN_NAME}" /></td>
+  </tr>
+  <tr>
+    <td><strong>{L_ADMIN_MAIL}&nbsp;:</strong><br /><span class="small">{L_ADMIN_MAIL_INFO}</span></td>
+        <td class="row1"><input type="text" size="25" maxlength="100" name="mail_webmaster" value="{ADMIN_MAIL}" /></td>
+  </tr>
+  <tr>
+    <td><strong>{L_THUMBNAIL_PREFIX}&nbsp;:</strong><br /><span class="small">{L_THUMBNAIL_PREFIX_INFO}</span></td>
+        <td class="row1"><input type="text" size="3" maxlength="4" name="prefix_thumbnail" value="{THUMBNAIL_PREFIX}" /></td>
+  </tr>
+  <tr>
+  <td><strong>{L_ACCESS}&nbsp;:</strong><br /><span class="small">{L_ACCESS_INFO}</span></td>
+        <td class="row1"><input type="radio" class="radio" name="access" value="free" {ACCESS_FREE} />{L_ACCESS_FREE}&nbsp;&nbsp;
         <input type="radio" class="radio" name="access" value="restricted" {ACCESS_RESTRICTED} />{L_ACCESS_RESTRICTED}</td>
-        <td>{L_ACCESS_INFO}</td>
-  </tr>
-  <tr>
-    <td>{L_HISTORY}</td>
-        <td><input type="radio" class="radio" name="log" value="true" {HISTORY_YES} />{L_YES}&nbsp;&nbsp;
+  </tr>
+  <tr>
+    <td><strong>{L_CONF_HISTORY}&nbsp;:</strong><br /><span class="small">{L_CONF_HISTORY_INFO}</span></td>
+        <td class="row1"><input type="radio" class="radio" name="log" value="true" {HISTORY_YES} />{L_YES}&nbsp;&nbsp;
         <input type="radio" class="radio" name="log" value="false" {HISTORY_NO} />{L_NO}</td>
-        <td>{L_HISTORY_INFO}</td>
-  </tr>
-  <tr>
-    <td>{L_MAIL_NOTIFICATION}</td>
-        <td><input type="radio" class="radio" name="mail_notification" value="true" {MAIL_NOTIFICATION_YES} />{L_YES}&nbsp;&nbsp;
+  </tr>
+  <tr>
+    <td><strong>{L_MAIL_NOTIFICATION}&nbsp;:</strong><br /><span class="small">{L_MAIL_NOTIFICATION_INFO}</span></td>
+        <td class="row1"><input type="radio" class="radio" name="mail_notification" value="true" {MAIL_NOTIFICATION_YES} />{L_YES}&nbsp;&nbsp;
         <input type="radio" class="radio" name="mail_notification" value="false" {MAIL_NOTIFICATION_NO} />{L_NO}</td>
-        <td>{L_MAIL_NOTIFICATION_INFO}</td>
-  </tr>
-    <tr>
-    <td colspan="3">&nbsp;</td>
-  </tr>
-  <tr class="admin">
-    <th colspan="3">{L_CONF_COMMENTS}</th>
-  </tr>
-    <tr>
-    <td colspan="3">&nbsp;</td>
-  </tr>
-  <tr>
-    <td>{L_SHOW_COMMENTS}</td>
-        <td><input type="radio" class="radio" name="show_comments" value="true" {SHOW_COMMENTS_YES} />{L_YES}&nbsp;&nbsp;
+  </tr>
+    <tr>
+    <td colspan="2">&nbsp;</td>
+  </tr>
+  <tr class="admin">
+    <th colspan="2">{L_CONF_COMMENTS}</th>
+  </tr>
+    <tr>
+    <td colspan="2">&nbsp;</td>
+  </tr>
+  <tr>
+    <td><strong>{L_SHOW_COMMENTS}&nbsp;:</strong><br /><span class="small">{L_SHOW_COMMENTS_INFO}</span></td>
+        <td class="row1"><input type="radio" class="radio" name="show_comments" value="true" {SHOW_COMMENTS_YES} />{L_YES}&nbsp;&nbsp;
         <input type="radio" class="radio" name="show_comments" value="false" {SHOW_COMMENTS_NO} />{L_NO}</td>
-        <td>{L_SHOW_COMMENTS_INFO}</td>
-  </tr>
-  <tr>
-    <td>{L_COMMENTS_ALL}</td>
-        <td><input type="radio" class="radio" name="comments_forall" value="true" {COMMENTS_ALL_YES} />{L_YES}&nbsp;&nbsp;
+  </tr>
+  <tr>
+    <td><strong>{L_COMMENTS_ALL}&nbsp;:</strong><br /><span class="small">{L_NB_COMMENTS_PAGE_INFO}</span></td>
+        <td class="row1"><input type="radio" class="radio" name="comments_forall" value="true" {COMMENTS_ALL_YES} />{L_YES}&nbsp;&nbsp;
         <input type="radio" class="radio" name="comments_forall" value="false" {COMMENTS_ALL_NO} />{L_NO}</td>
-        <td>{L_COMMENTS_ALL_INFO}</td>
-  </tr>
-  <tr>
-    <td>{L_NB_COMMENTS_PAGE}</td>
-        <td><input type="text" size="3" maxlength="4" name="nb_comment_page" value="{NB_COMMENTS_PAGE}" /></td>
-        <td>{L_NB_COMMENTS_PAGE_INFO}</td>
-  </tr>
-  <tr>
-    <td>{L_VALIDATE_COMMENTS}</td>
-        <td><input type="radio" class="radio" name="comments_validation" value="true" {VALIDATE_COMMENTS_YES} />{L_YES}&nbsp;&nbsp;
+  </tr>
+  <tr>
+    <td><strong>{L_NB_COMMENTS_PAGE}&nbsp;:</strong><br /><span class="small">{L_NB_COMMENTS_PAGE_INFO}</span></td>
+        <td class="row1"><input type="text" size="3" maxlength="4" name="nb_comment_page" value="{NB_COMMENTS_PAGE}" /></td>
+  </tr>
+  <tr>
+    <td><strong>{L_VALIDATE_COMMENTS}&nbsp;:</strong><br /><span class="small">{L_VALIDATE_COMMENTS_INFO}</span></td>
+        <td class="row1"><input type="radio" class="radio" name="comments_validation" value="true" {VALIDATE_COMMENTS_YES} />{L_YES}&nbsp;&nbsp;
         <input type="radio" class="radio" name="comments_validation" value="false" {VALIDATE_COMMENTS_NO} />{L_NO}</td>
-        <td>{L_VALIDATE_COMMENTS_INFO}</td>
-  </tr>
-    <tr>
-    <td colspan="3">&nbsp;</td>
-  </tr>
-  <tr class="admin">
-    <th colspan="3">{L_ABILITIES_SETTINGS}</th>
-  </tr>
-    <tr>
-    <td colspan="3">&nbsp;</td>
-  </tr>
-  <tr>
-    <td>{L_LANG_SELECT}</td>
-        <td>{LANG_SELECT}</td>
-        <td>{L_LANG_SELECT_INFO}</td>
-  </tr>
-  <tr>
-    <td>{L_NB_IMAGE_LINE}</td>
-        <td><input type="text" size="3" maxlength="2" name="nb_image_line" value="{NB_IMAGE_LINE}" /></td>
-        <td>{L_NB_IMAGE_LINE_INFO}</td>
-  </tr>
-  <tr>
-    <td>{L_NB_ROW_PAGE}</td>
-        <td><input type="text" size="3" maxlength="2" name="nb_line_page" value="{NB_ROW_PAGE}" /></td>
-        <td>{L_NB_ROW_PAGE_INFO}</td>
-  </tr>
-  <tr>
-    <td>{L_STYLE_SELECT}</td>
-        <td>{STYLE_SELECT}</td>
-        <td>{L_STYLE_SELECT_INFO}</td>
-  </tr>
-  <tr>
-    <td>{L_SHORT_PERIOD}</td>
-        <td><input type="text" size="3" maxlength="2" name="short_period" value="{SHORT_PERIOD}" /></td>
-        <td>{L_SHORT_PERIOD_INFO}</td>
-  </tr>
-  <tr>
-    <td>{L_LONG_PERIOD}</td>
-        <td><input type="text" size="3" maxlength="2" name="long_period" value="{LONG_PERIOD}" /></td>
-        <td>{L_LONG_PERIOD_INFO}</td>
-  </tr>
-  <tr>
-    <td>{L_EXPAND_TREE}</td>
-        <td><input type="radio" class="radio" name="auto_expand" value="true" {EXPAND_TREE_YES} />{L_YES}&nbsp;&nbsp;
+  </tr>
+    <tr>
+    <td colspan="2">&nbsp;</td>
+  </tr>
+  <tr class="admin">
+    <th colspan="2">{L_ABILITIES_SETTINGS}</th>
+  </tr>
+    <tr>
+    <td colspan="2">&nbsp;</td>
+  </tr>
+  <tr>
+    <td><strong>{L_LANG_SELECT}&nbsp;:</strong><br /><span class="small">{L_LANG_SELECT_INFO}</span></td>
+        <td class="row1">{LANG_SELECT}</td>
+  </tr>
+  <tr>
+    <td><strong>{L_NB_IMAGE_LINE}&nbsp;:</strong><br /><span class="small">{L_NB_IMAGE_LINE_INFO}</span></td>
+        <td class="row1"><input type="text" size="3" maxlength="2" name="nb_image_line" value="{NB_IMAGE_LINE}" /></td>
+  </tr>
+  <tr>
+    <td><strong>{L_NB_ROW_PAGE}&nbsp;:</strong><br /><span class="small">{L_NB_ROW_PAGE_INFO}</span></td>
+        <td class="row1"><input type="text" size="3" maxlength="2" name="nb_line_page" value="{NB_ROW_PAGE}" /></td>
+  </tr>
+  <tr>
+    <td><strong>{L_STYLE_SELECT}&nbsp;:</strong><br /><span class="small">{L_STYLE_SELECT_INFO}</span></td>
+        <td class="row1">{STYLE_SELECT}</td>
+  </tr>
+  <tr>
+    <td><strong>{L_SHORT_PERIOD}&nbsp;:</strong><br /><span class="small">{L_SHORT_PERIOD_INFO}</span></td>
+        <td class="row1"><input type="text" size="3" maxlength="2" name="short_period" value="{SHORT_PERIOD}" /></td>
+  </tr>
+  <tr>
+    <td><strong>{L_LONG_PERIOD}&nbsp;:</strong><br /><span class="small">{L_LONG_PERIOD_INFO}</span></td>
+        <td class="row1"><input type="text" size="3" maxlength="2" name="long_period" value="{LONG_PERIOD}" /></td>
+  </tr>
+  <tr>
+    <td><strong>{L_EXPAND_TREE}&nbsp;:</strong><br /><span class="small">{L_EXPAND_TREE_INFO}</span></td>
+        <td class="row1"><input type="radio" class="radio" name="auto_expand" value="true" {EXPAND_TREE_YES} />{L_YES}&nbsp;&nbsp;
         <input type="radio" class="radio" name="auto_expand" value="false" {EXPAND_TREE_NO} />{L_NO}</td>
-        <td>{L_EXPAND_TREE_INFO}</td>
-  </tr>
-  <tr>
-    <td>{L_NB_COMMENTS}</td>
-        <td><input type="radio" class="radio" name="show_nb_comments" value="true" {NB_COMMENTS_YES} />{L_YES}&nbsp;&nbsp;
+  </tr>
+  <tr>
+    <td><strong>{L_NB_COMMENTS}&nbsp;:</strong><br /><span class="small">{L_NB_COMMENTS_INFO}</span></td>
+        <td class="row1"><input type="radio" class="radio" name="show_nb_comments" value="true" {NB_COMMENTS_YES} />{L_YES}&nbsp;&nbsp;
         <input type="radio" class="radio" name="show_nb_comments" value="false" {NB_COMMENTS_NO} />{L_NO}</td>
-        <td>{L_NB_COMMENTS_INFO}</td>
-  </tr>
-  <tr>
-    <td colspan="3">&nbsp;</td>
-  </tr>
-  <tr class="admin">
-    <th colspan="3">{L_CONF_UPLOAD}</th>
-  </tr>
-  <tr>
-    <td colspan="3">&nbsp;</td>
-  </tr>
-  <tr>
-    <td>{L_UPLOAD}</td>
-        <td><input type="radio" class="radio" name="upload_available" value="true" {UPLOAD_YES} />{L_YES}&nbsp;&nbsp;
+  </tr>
+  <tr>
+    <td colspan="2">&nbsp;</td>
+  </tr>
+  <tr class="admin">
+    <th colspan="2">{L_CONF_UPLOAD}</th>
+  </tr>
+  <tr>
+    <td colspan="2">&nbsp;</td>
+  </tr>
+  <tr>
+    <td><strong>{L_AUTH_UPLOAD}&nbsp;:</strong><br /><span class="small">{L_AUTH_UPLOAD_INFO}</span></td>
+        <td class="row1"><input type="radio" class="radio" name="upload_available" value="true" {UPLOAD_YES} />{L_YES}&nbsp;&nbsp;
         <input type="radio" class="radio" name="upload_available" value="false" {UPLOAD_NO} />{L_NO}</td>
-        <td>{L_UPLOAD_INFO}</td>
-  </tr>
-  <tr>
-    <td>{L_UPLOAD_MAXSIZE}</td>
-        <td><input type="text" size="4" maxlength="4" name="upload_maxfilesize" value="{UPLOAD_MAXSIZE}" /></td>
-        <td>{L_UPLOAD_MAXSIZE_INFO}</td>
-  </tr>
-  <tr>
-    <td>{L_UPLOAD_MAXWIDTH}</td>
-        <td><input type="text" size="4" maxlength="4" name="upload_maxwidth" value="{UPLOAD_MAXWIDTH}" /></td>
-        <td>{L_UPLOAD_MAXWIDTH_INFO}</td>
-  </tr>
-  <tr>
-    <td>{L_UPLOAD_MAXHEIGHT}</td>
-        <td><input type="text" size="4" maxlength="4" name="upload_maxheight" value="{UPLOAD_MAXHEIGHT}" /></td>
-        <td>{L_UPLOAD_MAXHEIGHT_INFO}</td>
-  </tr>
-    <tr>
-    <td>{L_TN_UPLOAD_MAXWIDTH}</td>
-        <td><input type="text" size="4" maxlength="4" name="upload_maxwidth_thumbnail" value="{TN_UPLOAD_MAXWIDTH}" /></td>
-        <td>{L_TN_UPLOAD_MAXWIDTH_INFO}</td>
-  </tr>
-  <tr>
-    <td>{L_TN_UPLOAD_MAXHEIGHT}</td>
-        <td><input type="text" size="4" maxlength="4" name="upload_maxheight_thumbnail" value="{TN_UPLOAD_MAXHEIGHT}" /></td>
-        <td>{L_TN_UPLOAD_MAXHEIGHT_INFO}</td>
-  </tr>
-  <tr>
-    <td colspan="3">&nbsp;</td>
-  </tr>
-  <tr class="admin">
-    <th colspan="3">{L_CONF_SESSION}</th>
-  </tr>
-  <tr>
-    <td colspan="3">&nbsp;</td>
-  </tr>
-    <tr>
-    <td>{L_COOKIE}</td>
-        <td><input type="radio" class="radio" name="authorize_cookies" value="true" {COOKIE_YES} />{L_YES}&nbsp;&nbsp;
+  </tr>
+  <tr>
+    <td><strong>{L_UPLOAD_MAXSIZE}&nbsp;:</strong><br /><span class="small">{L_UPLOAD_MAXSIZE_INFO}</span></td>
+        <td class="row1"><input type="text" size="4" maxlength="4" name="upload_maxfilesize" value="{UPLOAD_MAXSIZE}" /></td>
+  </tr>
+  <tr>
+    <td><strong>{L_UPLOAD_MAXWIDTH}&nbsp;:</strong><br /><span class="small">{L_UPLOAD_MAXWIDTH_INFO}</span></td>
+        <td class="row1"><input type="text" size="4" maxlength="4" name="upload_maxwidth" value="{UPLOAD_MAXWIDTH}" /></td>
+  </tr>
+  <tr>
+    <td><strong>{L_UPLOAD_MAXHEIGHT}&nbsp;:</strong><br /><span class="small">{L_UPLOAD_MAXHEIGHT_INFO}</span></td>
+        <td class="row1"><input type="text" size="4" maxlength="4" name="upload_maxheight" value="{UPLOAD_MAXHEIGHT}" /></td>
+  </tr>
+    <tr>
+    <td><strong>{L_TN_UPLOAD_MAXWIDTH}&nbsp;:</strong><br /><span class="small">{L_TN_UPLOAD_MAXWIDTH_INFO}</span></td>
+        <td class="row1"><input type="text" size="4" maxlength="4" name="upload_maxwidth_thumbnail" value="{TN_UPLOAD_MAXWIDTH}" /></td>
+  </tr>
+  <tr>
+    <td><strong>{L_TN_UPLOAD_MAXHEIGHT}&nbsp;:</strong><br /><span class="small">{L_TN_UPLOAD_MAXHEIGHT_INFO}</span></td>
+        <td class="row1"><input type="text" size="4" maxlength="4" name="upload_maxheight_thumbnail" value="{TN_UPLOAD_MAXHEIGHT}" /></td>
+  </tr>
+  <tr>
+    <td colspan="2">&nbsp;</td>
+  </tr>
+  <tr class="admin">
+    <th colspan="2">{L_CONF_SESSION}</th>
+  </tr>
+  <tr>
+    <td colspan="2">&nbsp;</td>
+  </tr>
+    <tr>
+    <td><strong>{L_COOKIE}&nbsp;:</strong><br /><span class="small">{L_COOKIE_INFO}</span></td>
+        <td class="row1"><input type="radio" class="radio" name="authorize_cookies" value="true" {COOKIE_YES} />{L_YES}&nbsp;&nbsp;
         <input type="radio" class="radio" name="authorize_cookies" value="false" {COOKIE_NO} />{L_NO}</td>
-        <td>{L_COOKIE_INFO}</td>
-  </tr>
-  <tr>
-    <td>{L_SESSION_LENGTH}</td>
-        <td><input type="text" size="4" maxlength="6" name="session_time" value="{SESSION_LENGTH}" /></td>
-        <td>{L_SESSION_LENGTH_INFO}</td>
-  </tr>
-    <tr>
-    <td>{L_SESSION_ID_SIZE}</td>
-        <td><input type="text" size="2" maxlength="3" name="session_id_size" value="{SESSION_ID_SIZE}" /></td>
-        <td>{L_SESSION_ID_SIZE_INFO}</td>
+  </tr>
+  <tr>
+    <td><strong>{L_SESSION_LENGTH}&nbsp;:</strong><br /><span class="small">{L_SESSION_LENGTH_INFO}</span></td>
+        <td class="row1"><input type="text" size="4" maxlength="6" name="session_time" value="{SESSION_LENGTH}" /></td>
+  </tr>
+    <tr>
+    <td><strong>{L_SESSION_ID_SIZE}&nbsp;:</strong><br /><span class="small">{L_SESSION_ID_SIZE_INFO}</span></td>
+        <td class="row1"><input type="text" size="2" maxlength="3" name="session_id_size" value="{SESSION_ID_SIZE}" /></td>
   </tr>
     <!-- BEGIN remote_sites -->
     <tr>
-      <th colspan="3" align="center">{#remote_site}</th>
+      <th colspan="2" align="center">{#remote_site}</th>
     </tr>
     <tr>
@@ -217 +190 @@
       <td align="center"><input type="checkbox" name="delete_site_{#id}" value="1" /></td>
       <!-- BEGIN rowspan -->
-          <td class="row2" rowspan="{#nb_sites}">{#conf_remote_site_delete_info}</td>
+          <td class="row2" rowspan="{#nb_sites}">{#conf_remote_site_delete_INFO}</span></td>
           <!-- END rowspan -->
     </tr>
@@ -226 +199 @@
     <!-- END remote_sites -->
     <tr>
-      <td colspan="3" align="center">
+      <td colspan="2" align="center">
         <input type="submit" name="submit" class="bouton" value="{L_SUBMIT}">
       </td>

trunk/template/default/admin/help.tpl

@@ -13 +13 @@
       {cat.illustration.CAPTION}
       <!-- END illustration -->
-      <ul style="margin-right:10px;">
+      <ul style="text-align:left; margin-right:10px;">
         <!-- BEGIN item -->
         <li>{cat.item.CONTENT}</li>

trunk/template/default/category.tpl

@@ -103 +103 @@
                           <!-- END comment -->
                           <div class="infoCat">
-                          {L_NB_IMG} "{cat_infos.CAT_NAME}" : {cat_infos.NB_IMG_CAT}
+                          {L_NB_IMG} "{TITLE}" : {cat_infos.NB_IMG_CAT}
                           </div>
                         <!-- END cat_infos -->

trunk/template/default/comments.tpl

@@ -50 +50 @@
 </table>
 <!-- BEGIN validation -->
+<div align="center">
 <input type="submit" name="validate" class="bouton" value="{L_VALIDATE}" />
 <input type="submit" name="delete" class="bouton" value="{L_DELETE}" />
+</div>
 </form>
 <!-- END validation -->

trunk/template/default/default.css

@@ -1 @@
-/* Main styles */
+/* MAIN STYLES */
 
 body {
   font-family: Verdana, Geneva, Arial, sans-serif;
-  font-size:10px;
+  font-size:12px;
   background-color:#000000;
   color:#E0E0E0;
@@ -9 +9 @@
 }
 
-a {
-  text-decoration:none;
-  color:#FFFFFF;
-}
-a:hover {
-  text-decoration:underline;
-  color:#FFF48E;
-}
-
-a.none:hover {
-  text-decoration:none;
-}
+h1 {
+        font:                   bold 18pt 'Trebuchet MS', Verdana, sans-serif;
+        text-decoration:none; 
+        line-height:    120%; 
+}
+h2 {
+        font:                   bold 12pt Arial, Helvetica, sans-serif;
+        text-decoration:none; 
+        line-height:    120%; 
+}
+
+.small{ font-size:80%;}
+
+/* ANCHORS */
+
+a { text-decoration:none; color:#FFFFFF;}
+a:hover { text-decoration:underline; color:#FFF48E;}
+a.none:hover { text-decoration:none;}
+a.image:hover { text-decoration:none;}
+a.thumbLink:hover { text-decoration:none;}
+/*a.adminMenu:hover{ color : #C6B78E; }
+a.adminMenu{ color : #FFF48E; }*/
+
 /* Navigation styles */
 
@@ -80 +91 @@
 }
 
-a.image:hover {
-  text-decoration:none;
-}
-
 .commentImage {
   text-align:justify;
@@ -145 +152 @@
   color:#FFFFCC;
   background-color:#3F3F3F;
-  width:100%;
   text-align:center;
   font-weight:bold;
@@ -176 +182 @@
         border-color: #A0A0A0;
         margin: 2px;
-}
-
-a.thumbLink:hover {
-  text-decoration:none;
 }
 
@@ -203 +205 @@
 }
 /* Form styles */
+
+form{
+  text-align:left;
+  padding:10px;
+}
 
 .bouton {
@@ -216 +223 @@
 
 input,select {
+ text-indent:2px;
  background-color:#505050;
  border: 1px solid #797979;
@@ -222 +230 @@
 }
 
+.radio{
+  border:0;
+}
 /* Admin styles */
 
@@ -231 +242 @@
 div.adminMenu{
 margin:10px 50px 10px 50px; 
-}
-
-a.adminMenu:hover{
-  color : #C6B78E; 
-}
-
-a.adminMenu{
-  color : #FFF48E; 
 }
 

trunk/upload.php

@@ -278 +278 @@
 {
   $advise_title = $lang['upload_advise'];
-  $advise_title.= get_cat_display_name( $page['cat_name'], ' - ', 'font-style:italic;' );
+  $advise_title.= get_cat_display_name( $page['cat_name'], ' - ' );
 }