diff --git a/identification.php b/identification.php index 51a50f7ef..88a2a5f96 100644 --- a/identification.php +++ b/identification.php @@ -36,11 +36,11 @@ if ( isset( $_POST['login'] ) ) // retrieving the encrypted password of the login submitted $query = 'SELECT password'; $query.= ' FROM '.USERS_TABLE; - $query.= " WHERE username = '".$_POST['login']."';"; + $query.= " WHERE username = '".$_POST['username']."';"; $row = mysql_fetch_array( mysql_query( $query ) ); if( $row['password'] == md5( $_POST['pass'] ) ) { - $session_id = session_create( $_POST['login'] ); + $session_id = session_create( $_POST['username'] ); $url = 'category.php?id='.$session_id; header( 'Request-URI: '.$url ); header( 'Content-Location: '.$url ); @@ -59,69 +59,41 @@ if ( isset( $_POST['login'] ) ) $title = $lang['ident_page_title']; include('include/page_header.php'); -$handle = $vtp->Open( './template/default/identification.vtp' ); -// language -$vtp->setGlobalVar( $handle, 'ident_title', $lang['ident_title'] ); -$vtp->setGlobalVar( $handle, 'login', $lang['login'] ); -$vtp->setGlobalVar( $handle, 'password', $lang['password'] ); -$vtp->setGlobalVar( $handle, 'submit', $lang['submit'] ); -$vtp->setGlobalVar( $handle, 'ident_guest_visit',$lang['ident_guest_visit'] ); -$vtp->setGlobalVar( $handle, 'ident_register', $lang['ident_register'] ); -$vtp->setGlobalVar( $handle, 'ident_forgotten_password', - $lang['ident_forgotten_password'] ); -// conf -$vtp->setGlobalVar( $handle, 'mail_webmaster', $conf['mail_webmaster'] ); -// user -$vtp->setGlobalVar( $handle, 'user_template', $user['template'] ); +$template->set_filenames( array('identification'=>'identification.tpl') ); initialize_template(); + +$template->assign_vars(array( + 'MAIL_ADMIN' => $conf['mail_webmaster'], + + 'L_TITLE' => $lang['ident_title'], + 'L_USERNAME' => $lang['login'], + 'L_PASSWORD' => $lang['password'], + 'L_LOGIN' => $lang['submit'], + 'L_GUEST' => $lang['ident_guest_visit'], + 'L_REGISTER' => $lang['ident_register'], + 'L_FORGET' => $lang['ident_forgotten_password'], + + 'T_STYLE' => $user['template'], + + 'F_LOGIN_ACTION' => add_session_id('identification.php') + )); + //-------------------------------------------------------------- errors display if ( sizeof( $errors ) != 0 ) { - $vtp->addSession( $handle, 'errors' ); - foreach ( $errors as $error ) { - $vtp->addSession( $handle, 'li' ); - $vtp->setVar( $handle, 'li.li', $error ); - $vtp->closeSession( $handle, 'li' ); - } - $vtp->closeSession( $handle, 'errors' ); -} -//------------------------------------------------------------------ users list -// retrieving all the users login -$query = 'select username from '.USERS_TABLE.';'; -$result = mysql_query( $query ); -if ( mysql_num_rows ( $result ) < $conf['max_user_listbox'] ) -{ - $vtp->addSession( $handle, 'select_field' ); - while ( $row = mysql_fetch_array( $result ) ) + $template->assign_block_vars('errors',array()); + for ( $i = 0; $i < sizeof( $errors ); $i++ ) { - if ( $row['username'] != 'guest' ) - { - $vtp->addSession( $handle, 'option' ); - $vtp->setVar( $handle, 'option.option', $row['username'] ); - $vtp->closeSession( $handle, 'option' ); - } + $template->assign_block_vars('errors.error',array('ERROR'=>$errors[$i])); } - $vtp->closeSession( $handle, 'select_field' ); -} -else -{ - $vtp->addSession( $handle, 'text_field' ); - $vtp->closeSession( $handle, 'text_field' ); } + //-------------------------------------------------------------- visit as guest if ( $conf['access'] == 'free' ) { - $vtp->addSession( $handle, 'guest_visit' ); - $vtp->closeSession( $handle, 'guest_visit' ); -} -//---------------------------------------------------------------- registration -if ( $conf['access'] == 'free' ) -{ - $vtp->addSession( $handle, 'register' ); - $vtp->closeSession( $handle, 'register' ); + $template->assign_block_vars('free_access',array()); } //----------------------------------------------------------- html code display -$code = $vtp->Display( $handle, 0 ); -echo $code; +$template->pparse('identification'); include('include/page_tail.php'); ?> diff --git a/register.php b/register.php index 979e38cd0..c2378718e 100644 --- a/register.php +++ b/register.php @@ -27,7 +27,7 @@ //----------------------------------------------------------- include define('PHPWG_ROOT_PATH','./'); -include_once( PHPWG_ROOT_PATH.'incelude/common.inc.php' ); +include_once( PHPWG_ROOT_PATH.'include/common.inc.php' ); //-------------------------------------------------- access authorization check if ( $conf['access'] == "restricted" ) { @@ -50,6 +50,10 @@ if ( isset( $_POST['submit'] ) ) exit(); } } + +$login = empty($_POST['login'])?$_POST['login']:''; +$email = empty($_POST['login'])?$_POST['login']:''; + //----------------------------------------------------- template initialization // // Start output of page @@ -57,62 +61,33 @@ if ( isset( $_POST['submit'] ) ) $title= $lang['register_page_title']; include('include/page_header.php'); -$handle = $vtp->Open( './template/'.$user['template'].'/register.vtp' ); -// language -$vtp->setGlobalVar( $handle, 'register_title', $lang['register_title'] ); -$vtp->setGlobalVar( $handle, 'ident_guest_visit',$lang['ident_guest_visit'] ); -$vtp->setGlobalVar( $handle, 'submit', $lang['submit'] ); +$template->set_filenames( array('register'=>'register.tpl') ); initialize_template(); -//----------------------------------------------------------------- form action -$vtp->setGlobalVar( $handle, 'form_action', './register.php' ); + +$template->assign_vars(array( + 'L_TITLE' => $lang['register_title'], + 'L_GUEST' => $lang['ident_guest_visit'], + 'L_SUBMIT' => $lang['submit'], + 'L_USERNAME' => $lang['login'], + 'L_PASSWORD' => $lang['password'], + 'L_CONFIRM_PASSWORD' => $lang['reg_confirm'], + 'L_EMAIL' => $lang['mail_address'], + + 'F_ACTION' => add_session_id('register.php'), + 'F_LOGIN' => $login, + 'F_MAIL' => $email + )); + //-------------------------------------------------------------- errors display -if ( sizeof( $error ) != 0 ) +if ( sizeof( $errors ) != 0 ) { - $vtp->addSession( $handle, 'errors' ); - for ( $i = 0; $i < sizeof( $error ); $i++ ) + $template->assign_block_vars('errors',array()); + for ( $i = 0; $i < sizeof( $errors ); $i++ ) { - $vtp->addSession( $handle, 'li' ); - $vtp->setVar( $handle, 'li.li', $error[$i] ); - $vtp->closeSession( $handle, 'li' ); + $template->assign_block_vars('errors.error',array('ERROR'=>$errors[$i])); } - $vtp->closeSession( $handle, 'errors' ); } -//----------------------------------------------------------------------- login -$vtp->addSession( $handle, 'line' ); -$vtp->setVar( $handle, 'line.name', $lang['login'] ); -$vtp->addSession( $handle, 'text' ); -$vtp->setVar( $handle, 'text.name', 'login' ); -if (isset( $_POST['login'])) - $vtp->setVar( $handle, 'text.value', $_POST['login'] ); -$vtp->closeSession( $handle, 'text' ); -$vtp->closeSession( $handle, 'line' ); -//-------------------------------------------------------------------- password -$vtp->addSession( $handle, 'line' ); -$vtp->setVar( $handle, 'line.name', $lang['password'] ); -$vtp->addSession( $handle, 'password' ); -$vtp->setVar( $handle, 'password.name', 'password' ); -$vtp->setVar( $handle, 'password.value', '' ); -$vtp->closeSession( $handle, 'password' ); -$vtp->closeSession( $handle, 'line' ); -//------------------------------------------------------- password confirmation -$vtp->addSession( $handle, 'line' ); -$vtp->setVar( $handle, 'line.name', $lang['reg_confirm'] ); -$vtp->addSession( $handle, 'password' ); -$vtp->setVar( $handle, 'password.name', 'password_conf' ); -$vtp->setVar( $handle, 'password.value', '' ); -$vtp->closeSession( $handle, 'password' ); -$vtp->closeSession( $handle, 'line' ); -//---------------------------------------------------------------- mail address -$vtp->addSession( $handle, 'line' ); -$vtp->setVar( $handle, 'line.name', $lang['mail_address'] ); -$vtp->addSession( $handle, 'text' ); -$vtp->setVar( $handle, 'text.name', 'mail_address' ); -if (isset( $_POST['mail_address'])) - $vtp->setVar( $handle, 'text.value', $_POST['mail_address'] ); -$vtp->closeSession( $handle, 'text' ); -$vtp->closeSession( $handle, 'line' ); -//----------------------------------------------------------- html code display -$code = $vtp->Display( $handle, 0 ); -echo $code; + +$template->pparse('register'); include('include/page_tail.php'); ?> diff --git a/template/default/identification.tpl b/template/default/identification.tpl new file mode 100644 index 000000000..bc36f0c78 --- /dev/null +++ b/template/default/identification.tpl @@ -0,0 +1,61 @@ + + + + +
+ {T_START}1px{T_BEGIN} +
{L_TITLE}
+ {T_END} +
 
+ {T_START}50%{T_BEGIN} +
+
+ + + + + + + + + + + + + + + + + + + + + +
+
+
    + +
  • {errors.error.ERROR}
    • + +
+
+
 
{L_USERNAME}: + +
{L_PASSWORD}: + +
+
+ + + + +
+ +

[ {L_GUEST} ]

+  {L_REGISTER}  -   + +  {L_FORGET} +
+
+ {T_END} +
\ No newline at end of file diff --git a/template/default/identification.vtp b/template/default/identification.vtp deleted file mode 100644 index 132776ad6..000000000 --- a/template/default/identification.vtp +++ /dev/null @@ -1,67 +0,0 @@ - - - - -
- {#frame_start}1px{#frame_begin} -
{#ident_title}
- {#frame_end} -
 
- {#frame_start}50%{#frame_begin} -
-
- - - - - - - - - - - - - - - - -
-
-
    - -
  • {#li}
    • - -
-
-
{#login}{#password} 
- - - - - - -
-
- - - - -
- - [ {#ident_guest_visit} ] - - -
-
- {#frame_end} -
\ No newline at end of file diff --git a/template/default/profile.vtp b/template/default/profile.vtp deleted file mode 100644 index e53394e97..000000000 --- a/template/default/profile.vtp +++ /dev/null @@ -1,91 +0,0 @@ - - - - -
- {#frame_start}1px{#frame_begin} -
{#customize_title}
- {#frame_end} -
- {#frame_start}50%{#frame_begin} -
- - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
-
    - -
  • {#li}
    • - -
-
-
{#name} - - - - - - - - - {#option} - - -
 
{#new} {#password}
{#reg_confirm}
 
{#create_cookie} - -
 
- -
-
-
- {#frame_end} -
\ No newline at end of file diff --git a/template/default/register.tpl b/template/default/register.tpl new file mode 100644 index 000000000..72e604383 --- /dev/null +++ b/template/default/register.tpl @@ -0,0 +1,67 @@ + + + + +
+ {T_START}1px{T_BEGIN} +
{L_TITLE}
+ {T_END} +
+ {T_START}50%{T_BEGIN} +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+
    + +
  • {errors.error.ERROR}
    • + +
+
+
{L_USERNAME} + +
{L_PASSWORD} + +
{L_CONFIRM_PASSWORD} + +
{L_EMAIL} + +
 
+ +
+ [ {L_GUEST} ] +
+
+ {T_END} +
\ No newline at end of file diff --git a/template/default/register.vtp b/template/default/register.vtp deleted file mode 100644 index f4d97c52f..000000000 --- a/template/default/register.vtp +++ /dev/null @@ -1,63 +0,0 @@ - - - - -
- {#frame_start}1px{#frame_begin} -
{#register_title}
- {#frame_end} -
- {#frame_start}50%{#frame_begin} -
- - - - - - - - - - - - - - - - - - - - - - -
-
-
    - -
  • {#li}
    • - -
-
-
{#name} - - - - - - - - - -
 
- -
- [ {#ident_guest_visit} ] -
-
- {#frame_end} -
\ No newline at end of file