- User control panel update (user side)

- User control panel update (admin side)
- Add of registration link on the main page
- Minor bug correction for group management


git-svn-id: http://piwigo.org/svn/trunk@631 68402e56-0260-453c-a942-63ccdbb3a9ee

1 files changed, 0 insertions, 265 deletions

diff --git a/admin/user_list.php b/admin/user_list.php
deleted file mode 100644
index c15980d72..000000000
--- a/admin/user_list.php
+++ /dev/null
@@ -1,265 +0,0 @@
-<?php
-// +-----------------------------------------------------------------------+
-// | PhpWebGallery - a PHP based picture gallery                           |
-// | Copyright (C) 2002-2003 Pierrick LE GALL - pierrick@phpwebgallery.net |
-// | Copyright (C) 2003-2004 PhpWebGallery Team - http://phpwebgallery.net |
-// +-----------------------------------------------------------------------+
-// | branch        : BSF (Best So Far)
-// | file          : $RCSfile$
-// | last update   : $Date$
-// | last modifier : $Author$
-// | revision      : $Revision$
-// +-----------------------------------------------------------------------+
-// | This program is free software; you can redistribute it and/or modify  |
-// | it under the terms of the GNU General Public License as published by  |
-// | the Free Software Foundation                                          |
-// |                                                                       |
-// | This program is distributed in the hope that it will be useful, but   |
-// | WITHOUT ANY WARRANTY; without even the implied warranty of            |
-// | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU      |
-// | General Public License for more details.                              |
-// |                                                                       |
-// | You should have received a copy of the GNU General Public License     |
-// | along with this program; if not, write to the Free Software           |
-// | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, |
-// | USA.                                                                  |
-// +-----------------------------------------------------------------------+
-include_once( PHPWG_ROOT_PATH.'admin/include/isadmin.inc.php' );
-
-
-
-//----------------------------------------------------- template initialization
-$sub = $vtp->Open( './template/'.$user['template'].'/admin/user_list.vtp' );
-$tpl = array( 'listuser_confirm','listuser_modify_hint','listuser_modify',
-              'listuser_permission','listuser_permission_hint',
-              'listuser_delete_hint','listuser_delete','yes','no',
-              'listuser_button_all','listuser_button_invert',
-              'listuser_button_create_address','title_add','login','password',
-              'add','errors_title' );
-templatize_array( $tpl, 'lang', $sub );
-$vtp->setGlobalVar( $sub, 'user_template',   $user['template'] );
-//------------------------------------------------------------------ add a user
-$errors = array();
-if ( isset( $_POST['submit_add_user'] ) )
-{
-  $errors = register_user(
-    $_POST['username'], $_POST['password'], $_POST['password'], '', 'guest' );
-}
-//-------------------------------------------------------------- errors display
-if ( sizeof( $errors ) != 0 )
-{
-  $vtp->addSession( $sub, 'errors' );
-  foreach ( $errors as $error ) {
-    $vtp->addSession( $sub, 'li' );
-    $vtp->setVar( $sub, 'li.li', $error );
-    $vtp->closeSession( $sub, 'li' );
-  }
-  $vtp->closeSession( $sub, 'errors' );
-}
-else if ( isset( $_POST['submit_add_user'] ) )
-{
-  $_POST = array();
-}
-//--------------------------------------------------------------- delete a user
-if ( isset ( $_GET['delete'] ) and is_numeric( $_GET['delete'] ) )
-{
-  $query = 'SELECT username';
-  $query.= ' FROM '.USERS_TABLE;
-  $query.= ' WHERE id = '.$_GET['delete'];
-  $query.= ';';
-  $row = mysql_fetch_array( pwg_query( $query ) );
-  // confirm user deletion ?
-  if ( !isset( $_GET['confirm'] ) )
-  {
-    $vtp->addSession( $sub, 'deletion' );
-    $vtp->setVar( $sub, 'deletion.login', $row['username'] );
-    $yes_url = './admin.php?page=user_list&amp;delete='.$_GET['delete'];
-    $yes_url.= '&amp;confirm=1';
-    $vtp->setVar( $sub, 'deletion.yes_url', add_session_id( $yes_url ) );
-    $no_url = './admin.php?page=user_list';
-    $vtp->setVar( $sub, 'deletion.no_url', add_session_id( $no_url ) );
-    $vtp->closeSession( $sub, 'deletion' );
-  }
-  // user deletion confirmed
-  else
-  {
-    $vtp->addSession( $sub, 'confirmation' );
-    if ( $row['username'] != 'guest'
-         and $row['username'] != $conf['webmaster'] )
-    {
-      $query = 'SELECT COUNT(*) AS nb_result';
-      $query.= ' FROM '.USERS_TABLE;
-      $query.= ' WHERE id = '.$_GET['delete'];
-      $query.= ';';
-      $row2 = mysql_fetch_array( pwg_query( $query ) );
-      if ( $row2['nb_result'] > 0 )
-      {
-        delete_user( $_GET['delete'] );
-        $vtp->setVar( $sub, 'confirmation.class', 'info' );
-        $info = '"'.$row['username'].'" '.$lang['listuser_info_deletion'];
-        $vtp->setVar( $sub, 'confirmation.info', $info );
-      }
-      else
-      {
-        $vtp->setVar( $sub, 'confirmation.class', 'erreur' );
-        $vtp->setVar( $sub, 'confirmation.info', $lang['user_err_unknown'] );
-      }
-    }
-    else
-    {
-      $vtp->setVar( $sub, 'confirmation.class', 'erreur' );
-      $vtp->setVar( $sub, 'confirmation.info', $lang['user_err_modify'] );
-    }
-    $vtp->closeSession( $sub, 'confirmation' );
-  }
-}
-//------------------------------------------------------------------ users list
-else
-{
-  // add a user
-  $vtp->addSession( $sub, 'add_user' );
-  $action = './admin.php?'.$_SERVER['QUERY_STRING'];
-  $vtp->setVar( $sub, 'add_user.form_action', $action );
-  if (isset( $_POST['username']))
-	  $vtp->setVar( $sub, 'add_user.f_username', $_POST['username'] );
-  $vtp->closeSession( $sub, 'add_user' );
-  
-  $vtp->addSession( $sub, 'users' );
-
-  $action = './admin.php?'.$_SERVER['QUERY_STRING'];
-  if ( !isset( $_GET['mail'] ) )
-  {
-    $action.= '&amp;mail=true';
-  }
-  $vtp->setVar( $sub, 'users.form_action', $action );
-
-  $query = 'SELECT id,username,status,mail_address';
-  $query.= ' FROM '.USERS_TABLE;
-  $query.= ' ORDER BY status ASC, username ASC';
-  $query.= ';';
-  $result = pwg_query( $query );
-
-  $current_status = '';
-  while ( $row = mysql_fetch_array( $result ) )
-  {
-    // display the line indicating the status of the next users
-    if ( $row['status'] != $current_status )
-    {
-      if ( $current_status != '' )
-      {
-        $vtp->closeSession( $sub, 'category' );
-      }
-      $vtp->addSession( $sub, 'category' );
-      $title = $lang['listuser_user_group'].' ';
-      switch ( $row['status'] )
-      {
-      case 'admin' : $title.= $lang['adduser_status_admin']; break;
-      case 'guest' : $title.= $lang['adduser_status_guest']; break;
-      }
-      $vtp->setVar( $sub, 'category.title', $title );
-      $current_status = $row['status'];
-    }
-    $vtp->addSession( $sub, 'user' );
-    // checkbox for mail management if the user has a mail address
-    if ( isset( $row['mail_address'] ) and $row['username'] != 'guest' )
-    {
-      $vtp->addSession( $sub, 'checkbox' );
-      $vtp->setVar( $sub, 'checkbox.name', 'mail-'.$row['id'] );
-      $vtp->closeSession( $sub, 'checkbox' );
-    }
-    // use a special color for the login of the user ?
-    if ( $row['username'] == $conf['webmaster'] )
-    {
-      $vtp->setVar( $sub, 'user.color', 'red' );
-    }
-    if ( $row['username'] == 'guest' )
-    {
-      $vtp->setVar( $sub, 'user.color', 'green' );
-      $vtp->setVar( $sub, 'user.login', $lang['guest'] );
-    }
-    else
-    {
-      $vtp->setVar( $sub, 'user.login', $row['username'] );
-    }
-    // modify or not modify ?
-    if ( $row['username'] == 'guest'
-         or ( $row['username'] == $conf['webmaster']
-              and $user['username'] != $conf['webmaster'] ) )
-    {
-      $vtp->addSession( $sub, 'not_modify' );
-      $vtp->closeSession( $sub, 'not_modify' );
-    }
-    else
-    {
-      $vtp->addSession( $sub, 'modify' );
-      $url = './admin.php?page=user_modify&amp;user_id=';
-      $url.= $row['id'];
-      $vtp->setVar( $sub, 'modify.url', add_session_id( $url ) );
-      $vtp->setVar( $sub, 'modify.login', $row['username'] );
-      $vtp->closeSession( $sub, 'modify' );
-    }
-    // manage permission or not ?
-    if ( $row['username'] == $conf['webmaster']
-         and $user['username'] != $conf['webmaster'] )
-    {
-      $vtp->addSession( $sub, 'not_permission' );
-      $vtp->closeSession( $sub, 'not_permission' );
-    }
-    else
-    {
-      $vtp->addSession( $sub, 'permission' );
-      $url = './admin.php?page=user_perm&amp;user_id='.$row['id'];
-      $vtp->setVar( $sub, 'permission.url', add_session_id( $url ) );
-      $vtp->setVar( $sub, 'permission.login', $row['username'] );
-      $vtp->closeSession( $sub, 'permission' );
-    }
-    // is the user deletable or not ?
-    if ( $row['username'] == 'guest'
-         or $row['username'] == $conf['webmaster'] )
-    {
-      $vtp->addSession( $sub, 'not_delete' );
-      $vtp->closeSession( $sub, 'not_delete' );
-    }
-    else
-    {
-      $vtp->addSession( $sub, 'delete' );
-      $url = './admin.php?page=user_list&amp;delete='.$row['id'];
-      $vtp->setVar( $sub, 'delete.url', add_session_id( $url ) );
-      $vtp->setVar( $sub, 'delete.login', $row['username'] );
-      $vtp->closeSession( $sub, 'delete' );
-    }
-    $vtp->closeSession( $sub, 'user' );
-  }
-  $vtp->closeSession( $sub, 'category' );
-  // mail management : creation of the mail address if asked by administrator
-  if ( isset( $_POST['submit_generate_mail'] ) and isset( $_GET['mail'] ) )
-  {
-    $mails = array();
-    $query = 'SELECT id,mail_address';
-    $query.= ' FROM '.USERS_TABLE;
-    $query.= ';';
-    $result = pwg_query( $query );
-    while ( $row = mysql_fetch_array( $result ) )
-    {
-      if ( isset( $_POST['mail-'.$row['id']] ) )
-        array_push( $mails, $row['mail_address'] );
-    }
-    $mail_destination = '';
-    foreach ( $mails as $i => $mail_address ) {
-      if ( $i > 0 ) $mail_destination.= ',';
-      $mail_destination.= $mail_address;
-    }
-    if ( sizeof( $mails ) > 0 )
-    {
-      $vtp->addSession( $sub, 'mail_link' );
-      $vtp->setVar( $sub, 'mail_link.mailto', $mail_destination );
-      $vtp->setVar( $sub, 'mail_link.mail_address_start',
-                    substr( $mail_destination, 0, 50 ) );
-      $vtp->closeSession( $sub, 'mail_link' );
-    }
-  }
-  $vtp->closeSession( $sub, 'users' );
-}
-//----------------------------------------------------------- sending html code
-$vtp->Parse( $handle , 'sub', $sub );
-?>