Changeset 623 for trunk

Timestamp:

Nov 26, 2004, 5:10:17 PM (20 years ago)

Author:

gweltas

Message:

New template for group management
French translation for synchronization
Minor update of the css file

Location:

trunk

Files:

• admin/admin_upload.php (deleted)
• admin/cat_modify.php (modified) (1 diff)
• admin/group_list.php (modified) (3 diffs)
• language/en_UK.iso-8859-1/admin.lang.php (modified) (3 diffs)
• language/fr_FR.iso-8859-1/admin.lang.php (modified) (5 diffs)
• language/fr_FR.iso-8859-1/common.lang.php (modified) (2 diffs)
• template/default/admin/admin_upload.tpl (deleted)
• template/default/admin/group_list.tpl (added)
• template/default/admin/group_list.vtp (deleted)
• template/default/default.css (modified) (8 diffs)

trunk/admin/cat_modify.php

@@ -171 +171 @@
 }
 
-/*
-// can the parent category be changed ? (is the category virtual ?)
-if ( $row['dir'] == '' )
-{
-  $vtp->addSession( $sub, 'parent' );
-  // 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 '.CATEGORIES_TABLE;
-  $query.= ';';
-  $countrow = mysql_fetch_array( pwg_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' );
-}
-*/
 //----------------------------------------------------------- sending html code
 $template->assign_var_from_handle('ADMIN_CONTENT', 'categories');

trunk/admin/group_list.php

@@ -25 +25 @@
 // | USA.                                                                  |
 // +-----------------------------------------------------------------------+
-include_once( './admin/include/isadmin.inc.php' );
-//----------------------------------------------------- template initialization
-$sub = $vtp->Open( './template/'.$user['template'].'/admin/group_list.vtp' );
-$tpl = array( 'group_add','add','listuser_permission','delete',
-              'group_confirm','yes','no','group_list_title' );
-templatize_array( $tpl, 'lang', $sub );
-$vtp->setGlobalVar( $sub, 'user_template', $user['template'] );
+if( !defined("PHPWG_ROOT_PATH") )
+{
+        die ("Hacking attempt!");
+}
+include_once( PHPWG_ROOT_PATH.'admin/include/isadmin.inc.php' );
+
 //-------------------------------------------------------------- delete a group
 $error = array();
-if ( isset ( $_GET['delete'] ) and is_numeric( $_GET['delete'] ) )
+if ( isset( $_POST['delete'] ) && isset( $_POST['confirm_delete'] )  )
 {
-  $query = 'SELECT name';
-  $query.= ' FROM '.PREFIX_TABLE.'groups';
-  $query.= ' WHERE id = '.$_GET['delete'];
-  $query.= ';';
-  $row = mysql_fetch_array( pwg_query( $query ) );
-  // confirm group deletion ?
-  if ( !isset( $_GET['confirm'] ) or $_GET['confirm'] != 1 )
-  {
-    $vtp->addSession( $sub, 'deletion' );
-    $vtp->setVar( $sub, 'deletion.name', $row['name'] );
-    $yes_url = './admin.php?page=group_list&delete='.$_GET['delete'];
-    $yes_url.= '&confirm=1';
-    $vtp->setVar( $sub, 'deletion.yes_url', add_session_id( $yes_url ) );
-    $no_url = './admin.php?page=group_list';
-    $vtp->setVar( $sub, 'deletion.no_url', add_session_id( $no_url ) );
-    $vtp->closeSession( $sub, 'deletion' );
-  }
-  // group deletion confirmed
-  else
-  {
-    $vtp->addSession( $sub, 'confirmation' );
-    $query = 'SELECT COUNT(*) AS nb_result';
-    $query.= ' FROM '.PREFIX_TABLE.'groups';
-    $query.= ' WHERE id = '.$_GET['delete'];
-    $query.= ';';
-    $row2 = mysql_fetch_array( pwg_query( $query ) );
-    if ( $row2['nb_result'] > 0 )
-    {
-      delete_group( $_GET['delete'] );
-      $vtp->setVar( $sub, 'confirmation.class', 'info' );
-      $info = '"'.$row['name'].'" '.$lang['listuser_info_deletion'];
-      $vtp->setVar( $sub, 'confirmation.info', $info );
-    }
-    else
-    {
-      $vtp->setVar( $sub, 'confirmation.class', 'erreur' );
-      $vtp->setVar( $sub, 'confirmation.info', $lang['group_err_unknown'] );
-    }
-    $vtp->closeSession( $sub, 'confirmation' );
-  }
+  $query = 'DELETE FROM ' . USER_GROUP_TABLE; 
+  $query.= ' WHERE group_id = '.$_POST['group_id'];
+        pwg_query( $query );
+        
+        $query = 'DELETE FROM ' . GROUPS_TABLE; 
+  $query.= ' WHERE id = '.$_POST['group_id'];
+        $query.= ';';
+        pwg_query( $query );
 }
 //----------------------------------------------------------------- add a group
-if ( isset( $_POST['submit'] ) )
+elseif ( isset( $_POST['new'] ) )
 {
-  if ( preg_match( "/'/", $_POST['name'] )
-       or preg_match( '/"/', $_POST['name'] ) )
+  if ( empty($_POST['newgroup']) || preg_match( "/'/", $_POST['newgroup'] )
+       or preg_match( '/"/', $_POST['newgroup'] ) )
   {
     array_push( $error, $lang['group_add_error1'] );
@@ -88 +55 @@
   {
     // is the group not already existing ?
-    $query = 'SELECT id';
-    $query.= ' FROM '.PREFIX_TABLE.'groups';
-    $query.= " WHERE name = '".$_POST['name']."'";
+    $query = 'SELECT id FROM '.GROUPS_TABLE;
+    $query.= " WHERE name = '".$_POST['newgroup']."'";
     $query.= ';';
     $result = pwg_query( $query );
@@ -101 +67 @@
   {
     // creating the group
-    $query = ' INSERT INTO '.PREFIX_TABLE.'groups';
-    $query.= " (name) VALUES ('".$_POST['name']."')";
+    $query = ' INSERT INTO '.GROUPS_TABLE;
+    $query.= " (name) VALUES ('".$_POST['newgroup']."')";
     $query.= ';';
     pwg_query( $query );
   }
 }
+//--------------------------------------------------------------- user management
+elseif ( isset( $_POST['add'] ) )
+{
+  $userdata = getuserdata($_POST['username']);
+  if (!$userdata) echo "Utilisateur inexistant";
+        
+        // create a new association between the user and a group
+  $query = 'INSERT INTO '.USER_GROUP_TABLE;
+  $query.= ' (user_id,group_id) VALUES';
+  $query.= ' ('.$userdata['id'].','.$_POST['edit_group_id'].')';
+  $query.= ';';
+  pwg_query( $query );
+}
+elseif (isset( $_POST['deny_user'] ))
+{
+  $sql_in = '';
+        $members = $_POST['members'];
+        for($i = 0; $i < count($members); $i++)
+  {
+    $sql_in .= ( ( $sql_in != '' ) ? ', ' : '' ) . intval($members[$i]);
+  }
+  $query = 'DELETE FROM ' . USER_GROUP_TABLE; 
+  $query.= ' WHERE user_id IN ('.$sql_in;
+        $query.= ') AND group_id = '.$_POST['edit_group_id'];
+        pwg_query( $query );
+}
 //-------------------------------------------------------------- errors display
 if ( sizeof( $error ) != 0 )
 {
-  $vtp->addSession( $sub, 'errors' );
+  $template->assign_block_vars('errors',array());
   for ( $i = 0; $i < sizeof( $error ); $i++ )
   {
-    $vtp->addSession( $sub, 'li' );
-    $vtp->setVar( $sub, 'li.li', $error[$i] );
-    $vtp->closeSession( $sub, 'li' );
+    $template->assign_block_vars('errors.error',array('ERROR'=>$error[$i]));
   }
-  $vtp->closeSession( $sub, 'errors' );
 }
 //----------------------------------------------------------------- groups list
-$vtp->addSession( $sub, 'groups' );
 
-$query = 'SELECT id,name';
-$query.= ' FROM '.PREFIX_TABLE.'groups';
-$query.= ' ORDER BY id ASC';
-$query.= ';';
+$query = 'SELECT id,name FROM '.GROUPS_TABLE;
+$query.= ' ORDER BY id ASC;';
 $result = pwg_query( $query );
+$groups_display = '<select name="group_id">';
+$groups_nb=0;
 while ( $row = mysql_fetch_array( $result ) )
 {
-  $vtp->addSession( $sub, 'group' );
-  $vtp->setVar( $sub, 'group.name', $row['name'] );
-  $url = './admin.php?page=group_perm&amp;group_id='.$row['id'];
-  $vtp->setVar( $sub, 'group.permission_url', add_session_id( $url ) );
-  $url = './admin.php?page=group_list&amp;delete='.$row['id'];
-  $vtp->setVar( $sub, 'group.deletion_url', add_session_id( $url ) );
-  $vtp->closeSession( $sub, 'group' );
+  $groups_nb++;
+        $selected = '';
+        if (isset($_POST['group_id']) && $_POST['group_id']==$row['id'])
+                $selected = 'selected';
+  $groups_display .= '<option value="' . $row['id'] . '" '.$selected.'>' . $row['name']  . '</option>';
+}
+$groups_display .= '</select>';
+
+$action = PHPWG_ROOT_PATH.'admin.php?page=group_list';
+//----------------------------------------------------- template initialization
+$template->set_filenames( array('groups'=>'admin/group_list.tpl') );
+$tpl = array( 'group_add','add','listuser_permission','delete',
+              'group_confirm','yes','no','group_list_title' );
+
+$template->assign_vars(array(
+  'S_GROUP_SELECT'=>$groups_display,
+        
+  'L_GROUP_SELECT'=>$lang['group_list_title'],
+        'L_GROUP_CONFIRM'=>$lang['group_confirm_delete'],
+        'L_LOOK_UP'=>$lang['edit'],
+        'L_GROUP_DELETE'=>$lang['delete'],
+  'L_CREATE_NEW_GROUP'=>$lang['group_add'],
+  'L_GROUP_EDIT'=>$lang['group_edit'],
+        'L_USER_NAME'=>$lang['login'],
+        'L_USER_EMAIL'=>$lang['mail_address'],
+        'L_USER_SELECT'=>$lang['Select'],
+        'L_DENY_SELECTED'=>$lang['group_deny_user'],
+        'L_ADD_MEMBER'=>$lang['group_add_user'],
+  'L_FIND_USERNAME'=>$lang['Find_username'],
+        
+        'S_GROUP_ACTION'=>add_session_id($action),
+        'U_SEARCH_USER' => add_session_id(PHPWG_ROOT_PATH.'admin/search.php')
+        ));
+
+if ($groups_nb) 
+{
+  $template->assign_block_vars('select_box',array());
 }
 
-$vtp->closeSession( $sub, 'groups' );
-//------------------------------------------------------- create new group form
-$action = './admin.php?'.$_SERVER['QUERY_STRING'];
-$vtp->setVar( $sub, 'form_action', $action );
+//----------------------------------------------------------------- add a group
+if ( isset( $_POST['edit']) || isset( $_POST['add']) || isset( $_POST['deny_user'] ))
+{
+  // Retrieving the group name
+        $query = 'SELECT id, name FROM '.GROUPS_TABLE;
+  $query.= " WHERE id = '".$_POST['group_id']."'";
+  $query.= ';';
+  $result = mysql_fetch_array(pwg_query( $query ));
+  $template->assign_block_vars('edit_group',array(
+          'GROUP_NAME'=>$result['name'],
+                'GROUP_ID'=>$result['id']
+                ));
+                
+  // Retrieving all the users
+        $query = 'SELECT id, username, mail_address';
+        $query.= ' FROM ('.USERS_TABLE.' as u';
+        $query.= ' LEFT JOIN '.USER_GROUP_TABLE.' as ug ON ug.user_id=u.id)';
+  $query.= " WHERE ug.group_id = '".$_POST['group_id']."';";
+        $result = pwg_query( $query );
+        $i=0;
+        while ( $row = mysql_fetch_array( $result ) )
+        {
+          $class = ($i % 2)? 'row1':'row2'; $i++;
+          $template->assign_block_vars('edit_group.user',array(
+                  'ID'=>$row['id'],
+                        'NAME'=>$row['username'],
+                        'EMAIL'=>$row['mail_address'],
+                        'T_CLASS'=>$class
+                ));
+        }
+}
+
 //----------------------------------------------------------- sending html code
-$vtp->Parse( $handle , 'sub', $sub );
+$template->assign_var_from_handle('ADMIN_CONTENT', 'groups');
 ?>

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

@@ -120 +120 @@
 $lang['title_waiting'] = 'Pictures waiting for validation';
 $lang['title_cat_options'] = 'Categories options';
+$lang['title_groups'] = 'Groups management';
 
 //Error messages
@@ -239 +240 @@
 $lang['stats_global_graph_title'] = 'Pages seen by month';
 $lang['stats_visitors_graph_title'] = 'Nombre de visiteurs par jour';
+
+// Users
+
+// Groups
+$lang['group_confirm_delete']= 'Confirm group deletion';
+$lang['group_add'] = 'Add a group';
+$lang['group_add_error1'] = 'The name of a group must not contain " or \' or be empty.';
+$lang['group_add_error2'] = 'This name is already used by another group.';
+$lang['group_list_title'] = 'List of existing groups';
+$lang['group_edit'] = 'Manage users of the group';
+$lang['group_deny_user'] = 'Deny selected';
+$lang['group_add_user']= 'Add user';
 
 $lang['menu_add_user'] = 'add';
@@ -303 +316 @@
 $lang['title_add'] = 'Add a user';
 $lang['title_modify'] = 'Modify a user';
-$lang['title_groups'] = 'Groups management';
 $lang['title_user_perm'] = 'Modify permission for user';
 $lang['title_cat_perm'] = 'Modify permissions for category';
 $lang['title_group_perm'] = 'Modify permissions for group';
 $lang['title_picmod'] = 'Modify informations about a picture';
-$lang['adduser_associate'] = 'Associate to group';
-$lang['group_add'] = 'Add a group';
-$lang['group_add_error1'] = 'The name of a group must not contain " or \'';
-$lang['group_add_error2'] = 'This name is already used by another group';
-$lang['group_confirm'] = 'Are you sure you want to remove this group ?';
-$lang['group_list_title'] = 'List of existing groups';
-$lang['group_err_unknown'] = 'This group doesn\'t exist in the database';
+
 $lang['stats_pages_seen'] = 'pages seen';
 $lang['stats_visitors'] = 'guests';

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

@@ -122 +122 @@
 $lang['title_upload'] = 'Sélectionner les catégories pour lesquelles l\'ajout d\'image est autorisé';
 $lang['title_cat_options'] = 'Options relatives aux catégories';
+$lang['title_groups'] = 'Gestion des groupes';
 
 //Error messages
@@ -214 +215 @@
 //Update
 $lang['update_missing_tn'] = 'Il manque la miniature pour';
-$lang['update_disappeared_tn'] = 'La miniature a disparu';
-$lang['update_disappeared'] = 'a disparu';
+$lang['update_disappeared_tn'] = 'La miniature n\'existe pas';
+$lang['update_disappeared'] = 'n\'existe pas';
 $lang['update_part_deletion'] = 'Suppression des images de la base qui n\'ont pas de thumbnail ou qui n\'existent pas';
-$lang['update_deletion_conclusion'] = 'images supprimées de la base de données';
 $lang['update_part_research'] = 'Recherche des nouvelles images dans les répertoires';
 $lang['update_research_added'] = 'ajouté';
 $lang['update_research_tn_ext'] = 'miniature en';
-$lang['update_research_conclusion'] = 'images ajoutées à la base de données';
-$lang['update_default_title'] = 'Choisir une option';
-$lang['update_only_cat'] = 'mettre à jour les catégories, mais pas les images';
-$lang['update_all'] = 'mettre tout à jour';
-$lang['update_sync_metadata_question'] = 'Utiliser les métadonnées des images pour la mise à jour';
+$lang['update_default_title'] = 'Type de mise à jour';
 $lang['update_nb_new_elements'] = 'élément(s) ajouté(s)';
 $lang['update_nb_del_elements'] = 'élément(s) effacé(s)';
 $lang['update_nb_new_categories'] = 'catégorie(s) ajoutée(s)';
 $lang['update_nb_del_categories'] = 'catégorie(s) effacée(s)';
+$lang['update_sync_files'] = 'Synchroniser la structure';
+$lang['update_sync_dirs'] = 'Seulement les catégories';
+$lang['update_sync_all'] = 'Catégories et fichiers';
+$lang['update_sync_metadata'] = 'Synchroniser les méta-donnnées';
+$lang['update_sync_metadata_new'] = 'Seulement sur les nouveaux éléments';
+$lang['update_sync_metadata_all'] = 'Sur tous les éléments';
+$lang['update_cats_subset'] = 'Limiter la synchronisation aux catégories suivantes';
 
 // History
@@ -239 +242 @@
 $lang['stats_visitors_graph_title'] = 'Nombre de visiteurs par jour';
 
-//Users
+// Users
+
+
+// Groups
+$lang['group_list_title'] = 'Liste des groupes existants';
+$lang['group_confirm_delete']= 'Confirmer la destruction du groupe';
+$lang['group_add'] = 'Ajouter un groupe';
+$lang['group_add_error1'] = 'Le nom du groupe ne doit pas comporter de " ou de \' et ne pas être vide.';
+$lang['group_add_error2'] = 'Ce nom de groupe est déjà utilisé.';
+$lang['group_edit'] = 'Edition des utilisateurs appartenant au groupe';
+$lang['group_deny_user'] = 'Supprimer la sélection';
+$lang['group_add_user']= 'Ajouter le membre';
 
 
@@ -306 +320 @@
 $lang['title_add'] = 'Ajouter un utilisateur';
 $lang['title_modify'] = 'Modifier un utilisateur';
-$lang['title_groups'] = 'Gestion des groupes';
+
 $lang['title_user_perm'] = 'Modifier les permissions pour l\'utilisateur';
 $lang['title_cat_perm'] = 'Modifier les permissions pour la catégorie';
@@ -312 +326 @@
 $lang['title_picmod'] = 'Modifier les informations d\'une image';
 $lang['waiting_update'] = 'Les images validées ne seront visibles qu\'après mise à jour de la base d\'images.';
-$lang['adduser_associate'] = 'Associer au groupe';
-$lang['group_add'] = 'Ajouter un groupe';
-$lang['group_add_error1'] = 'Le nom du groupe ne doit pas comporter de " ou de \'';
-$lang['group_add_error2'] = 'Ce nom de groupe est déjà utilisé';
-$lang['group_confirm'] = 'Etes-vous sûr de vouloir supprimer le groupe';
-$lang['group_list_title'] = 'Liste des groupes existants';
-$lang['group_err_unknown'] = 'Ce groupe n\'existe pas dans la base de données';
 $lang['permuser_only_private'] = 'Seules les catégories privées sont représentées';
 

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

@@ -136 +136 @@
 $lang['create_cookie'] = 'Créer un cookie';
 $lang['theme'] = 'Thème de l\'interface';
+$lang['mail_address'] = 'Adresse mail';
 $lang['periods_error'] = 'La période doit être entière.';
 $lang['maxwidth_error'] = 'La largeur maximum des images doit être un entier supérieur à 50';
@@ -252 +253 @@
 
 $lang['guest'] = 'visiteur';
-$lang['mail_address'] = 'adresse mail';
 $lang['add'] = 'ajouter';
 $lang['dissociate'] = 'dissocier';

trunk/template/default/default.css

@@ -1 +1 @@
 /* BACKGROUND */
+
 body { background-color:#000000;}
 .main, .throw, .admin { background-color:#3F3F3F;}
@@ -9 +10 @@
 .bouton, .imgMenu a, #imgBarMenu { background-image: url(theme/button_bg.gif);}
 
+/* FONT COLORS */
+
+.titreMenu, .titreMenu a, .info, .admin{ color:#FFF48E;}
+.titrePage, .titreMenu a:hover { color:#E0E0E0;}
+.comment{ color:#C6B78E;}
+.commentDate { color:#999999;}
+input,select,textarea { color:#FFFFCC;}
+
+/* ANCHORS */
+
+a { text-decoration:none; color:#FFFFFF;}
+a:hover { text-decoration:none; color:#FFF48E;}
+a.none:hover { text-decoration:none;}
+a.image:hover { text-decoration:none;}
+a.thumbLink:hover { text-decoration:none;}
+
 /* POSITION */
 #gauche,#droite
@@ -24 +41 @@
 }
 
-#droite
-{
-  text-align:right;
-}
-
-#left
-{
-  float:left; 
-}
-
-#right
-{
-  float:right; 
-}
+#droite{text-align:right;}
+#left {float:left; }
+#right{float:right; }
 
 /* MAIN STYLES */
@@ -60 +66 @@
 }
 
-/* ANCHORS */
-
-a { text-decoration:none; color:#FFFFFF;}
-a:hover { text-decoration:none; color:#FFF48E;}
-a.none:hover { text-decoration:none;}
-a.image:hover { text-decoration:none;}
-a.thumbLink:hover { text-decoration:none;}
+
 
 /* LAYOUT STYLE */
@@ -93 +93 @@
   line-height: 25px;
   font-size:12px;
-  color:#E0E0E0;
   font-weight:600;
   text-align:center;
@@ -266 +265 @@
   font-weight:lighter;
   text-align:right;
-  color:#999999;
   border-top: 1px solid #000000; 
   border-bottom: 1px solid #000000;
 }
 
-.comment{
-  color:#C6B78E; 
-}
 /* Form styles */
 
@@ -295 +290 @@
  border: 1px solid #797979;
  padding: 0;
- color:#FFFFCC;
 }
 
@@ -317 +311 @@
 text-align: center;
 padding:0px;
-color : #FFF48E;
 }
 
 /* Other styles */
 .info {
-  color:#FFF48E;
   margin:5px 0px 5px 0px;
   white-space:nowrap;