Project

General

Profile

« Previous | Next » 

Revision 1719

Added by Dietmar about 12 years ago

! beginning update frontend account
! remove html markup from code

View differences:

branches/2.8.x/wb/account/template.html
1
<!-- begin settings_modify.html -->
2
<!-- BEGIN main_block -->
3
<!-- BEGIN success_block -->
4
<p class="mod_preferences_success">
5
	{SUCCESS_VALUE}
6
</p>
7
<!-- END success_block -->
8
<!-- BEGIN error_block -->
9
<p class="mod_preferences_error">
10
	{ERROR_VALUE}
11
</p>
12
<!-- END error_block -->
13
<div style="margin: 1em auto;">
14
	<button type="button" value="cancel" onClick="javascript: window.location = '{HTTP_REFERER}';">{TEXT_CANCEL}</button>
15
</div>
16
<hr />
17
<form name="details" action="" method="post">
18
	<h3>{HEADING_MY_SETTINGS}</h3>
19
	<table summary="" cellpadding="5" cellspacing="0" border="0" width="100%">
20
		<tr>
21
			<td width="160">{TEXT_DISPLAY_NAME}:</td>
22
			<td>
23
				<input type="text" name="display_name" value="{DISPLAY_NAME}" style="width: 98%;" readonly="readonly" />
24
			</td>
25
		</tr>
26
		<tr>
27
			<td>{TEXT_LANGUAGE}:</td>
28
			<td>
29
				<select name="language" id="language">
30
					<!-- BEGIN language_list_block -->
31
						<option value="{CODE}"{SELECTED} style="background: url({FLAG}.png) no-repeat center left; padding-left: 20px;">{NAME} ({CODE})</option>
32
					<!-- END language_list_block -->
33
				</select>
34
			</td>
35
		</tr>
36
		<tr>
37
			<td>{TEXT_TIMEZONE}:</td>
38
			<td>
39
				<select name="timezone" style="width: 98%;">
40
					<option value="-20">{MOD_PREFERENCE_PLEASE_SELECT}</option>
41
<!-- BEGIN timezone_list_block -->
42
					<option value="{VALUE}" {SELECTED}>{NAME}</option>
43
<!-- END timezone_list_block -->
44
				</select>
45
			</td>
46
		</tr>
47
		<tr>
48
			<td>{TEXT_DATE_FORMAT}:</td>
49
			<td>
50
				<select name="date_format" style="width: 98%;">
51
					<option value="">{MOD_PREFERENCE_PLEASE_SELECT}</option>
52
<!-- BEGIN date_format_list_block -->
53
					<option value="{VALUE}" {SELECTED}>{NAME}</option>
54
<!-- END date_format_list_block -->
55
				</select>
56
			</td>
57
		</tr>
58
		<tr>
59
			<td>{TEXT_TIME_FORMAT}:</td>
60
			<td>
61
				<select name="time_format" style="width: 98%;">
62
					<option value="">{MOD_PREFERENCE_PLEASE_SELECT}</option>
63
<!-- BEGIN time_format_list_block -->
64
					<option value="{VALUE}" {SELECTED}>{NAME}</option>
65
<!-- END time_format_list_block -->
66
				</select>
67
			</td>
68
		</tr>
69
		<tr>
70
			<td>&nbsp;</td>
71
			<td>
72
				<button type="reset" name="reset" value="reset">{TEXT_RESET}</button>
73
				<button type="submit" name="action" value="details">{MOD_PREFERENCE_SAVE_SETTINGS}</button>
74
			</td>
75
		</tr>
76
	</table>
77
</form>
78
<hr />
79
<form name="email" action="" method="post">
80
	<h3>{HEADING_MY_EMAIL}</h3>
81
	<table summary="" cellpadding="5" cellspacing="0" border="0" width="100%">
82
		<tr>
83
			<td>{TEXT_EMAIL}:</td>
84
			<td>
85
				<input type="text" name="email" value="{EMAIL}" style="width: 98%;" />
86
			</td>
87
		</tr>
88
		<tr>
89
			<td width="160">{TEXT_CURRENT_PASSWORD}:</td>
90
			<td>
91
				<input type="password" name="current_password" style="width: 98%;" />
92
			</td>
93
		</tr>
94
		<tr>
95
			<td>&nbsp;</td>
96
			<td>
97
				<button type="reset" name="reset" value="reset">{TEXT_RESET}</button>
98
				<button type="submit" name="action" value="email">{MOD_PREFERENCE_SAVE_EMAIL}</button>
99
			</td>
100
		</tr>
101
	</table>
102
</form>
103
<hr />
104
<form name="password" action="" method="post">
105
	<h3>{HEADING_MY_PASSWORD}</h3>
106
	<table summary="" cellpadding="5" cellspacing="0" border="0" width="100%">
107
		<tr>
108
			<td width="160">{TEXT_CURRENT_PASSWORD}:</td>
109
			<td>
110
				<input type="password" name="current_password" style="width: 98%;" />
111
			</td>
112
		</tr>
113
		<tr>
114
			<td width="160">{TEXT_NEW_PASSWORD}:</td>
115
			<td>
116
				<input type="password" name="new_password" style="width: 98%;" />
117
			</td>
118
		</tr>
119
		<tr>
120
			<td width="160">{TEXT_RETYPE_NEW_PASSWORD}:</td>
121
			<td>
122
				<input type="password" name="new_password2" style="width: 98%;" />
123
			</td>
124
		</tr>
125
		<tr>
126
			<td>&nbsp;</td>
127
			<td>
128
				<button type="reset" name="reset" value="reset">{TEXT_RESET}</button>
129
				<button type="submit" name="action" value="password">{MOD_PREFERENCE_SAVE_PASSWORD}</button>
130
			</td>
131
		</tr>
132
	</table>
133
</form>
134
<div style="margin: 1em auto;">
135
	<button type="button" value="cancel" onClick="javascript: window.location = '{HTTP_REFERER}';">{TEXT_CANCEL}</button>
136
</div>
137
<!-- END main_block -->
138
<!-- end settings_modify.html -->
139 0

  
branches/2.8.x/wb/account/login_form.php
4 4
 * @category        frontend
5 5
 * @package         account
6 6
 * @author          WebsiteBaker Project
7
 * @copyright       2004-2009, Ryan Djurovich
8
 * @copyright       2009-2011, Website Baker Org. e.V.
7
 * @copyright       2009-2012, WebsiteBaker Org. e.V.
9 8
 * @link			http://www.websitebaker2.org/
10 9
 * @license         http://www.gnu.org/licenses/gpl.html
11 10
 * @platform        WebsiteBaker 2.8.x
......
16 15
 *
17 16
 */
18 17

  
19
// Must include code to stop this file being access directly
20
if(defined('WB_PATH') == false) { die("Cannot access this file directly"); }
18
/* -------------------------------------------------------- */
19
// Must include code to stop this file being accessed directly
20
if(defined('WB_PATH') == false)
21
{
22
	// Stop this file being access directly
23
		die('<h2 style="color:red;margin:3em auto;text-align:center;">Cannot access this file directly</h2>');
24
}
25
/* -------------------------------------------------------- */
21 26

  
27
	// Generate username field name
22 28
$username_fieldname = 'username';
23 29
$password_fieldname = 'password';
30
$output = '';
31
msgQueue::clear();
24 32

  
25
if(defined('SMART_LOGIN') AND SMART_LOGIN == 'enabled') {
26
	// Generate username field name
27
	$username_fieldname = 'username_';
28
	$password_fieldname = 'password_';
33
if(defined('SMART_LOGIN') AND SMART_LOGIN == 'true') {
29 34

  
30 35
	$temp = array_merge(range('a','z'), range(0,9));
31 36
	shuffle($temp);
......
36 41
}
37 42

  
38 43
$thisApp->redirect_url = (isset($thisApp->redirect_url) && ($thisApp->redirect_url!='')  ? $thisApp->redirect_url : $_SESSION['HTTP_REFERER'] );
39
?>
40
<div style="margin: 1em auto;">
41
	<button type="button" value="cancel" onClick="javascript: window.location = '<?php print $_SESSION['HTTP_REFERER'] ?>';"><?php print $TEXT['CANCEL'] ?></button>
42
</div>
43
<h1>&nbsp;Login</h1>
44
&nbsp;<?php echo $thisApp->message; ?>
45
<br />
46
<br />
47 44

  
48
<form class="login-box" action="<?php echo WB_URL.'/account/login.php'; ?>" method="post">
49
<input type="hidden" name="username_fieldname" value="<?php echo $username_fieldname; ?>" />
50
<input type="hidden" name="password_fieldname" value="<?php echo $password_fieldname; ?>" />
51
<input type="hidden" name="redirect" value="<?php echo $thisApp->redirect_url;?>" />
45
// set template file and assign module and template block
46
	$oTpl = new Template(dirname(__FILE__).'/htt','keep');
47
	$oTpl->set_file('page', 'login.htt');
48
	$oTpl->debug = false; // false, true
49
	$oTpl->set_block('page', 'main_block', 'main');
52 50

  
53
<table cellpadding="5" cellspacing="0" border="0" width="90%">
54
<tr>
55
	<td style="width:100px"><?php echo $TEXT['USERNAME']; ?>:</td>
56
	<td class="value_input">
57
		<input type="text" name="<?php echo $username_fieldname; ?>" maxlength="30" style="width:220px;"/>
58
    	<script type="text/javascript">
59
    	// document.login.<?php echo $username_fieldname; ?>.focus();
60
    	var ref= document.getElementById("<?php echo $username_fieldname; ?>");
61
    	if (ref) ref.focus();
62
    	</script>
63
	</td>
64
</tr>
65
<tr>
66
	<td style="width:100px"><?php echo $TEXT['PASSWORD']; ?>:</td>
67
	<td class="value_input">
68
		<input type="password" name="<?php echo $password_fieldname; ?>" maxlength="30" style="width:220px;"/>
69
	</td>
70
</tr>
71
<?php if($username_fieldname != 'username') { ?>
72
<tr>
73
	<td>&nbsp;</td>
74
	<td>
75
		<input type="checkbox" name="remember" id="remember" value="true"/>
76
		<label for="remember"><?php echo $TEXT['REMEMBER_ME']; ?></label>
77
	</td>
78
</tr>
79
<?php } ?>
80
<tr>
81
	<td>&nbsp;</td>
82
	<td>
83
		<input type="submit" name="submit" value="<?php echo $TEXT['LOGIN']; ?>"  />
84
		<input type="reset" name="reset" value="<?php echo $TEXT['RESET']; ?>"  />
85
	</td>
86
</tr>
87
</table>
51
	$oTpl->set_block('main_block', 'message_block', 'message');
52
	$oTpl->set_block('message', '');
88 53

  
89
</form>
54
// generell vars
55
	$oTpl->set_var(array(
56
		'FTAN' => $wb->getFTAN(),
57
		'ACTION_URL' => WB_URL.'/account/login.php',
58
		'FORGOT_URL' => WB_URL.'/account/forgot.php',
59
		'REDIRECT_URL' => $thisApp->redirect_url,
60
		'WB_URL' => WB_URL,
61
		'THEME_URL' => THEME_URL,
62
		'HTTP_REFERER' => $_SESSION['HTTP_REFERER'],
63
		'MESSAGE_VALUE' => '',
64
		'ERROR_VALUE' => '',
65
		'THISAPP_MESSAGE_VALUE' => $thisApp->message,
66
		'TEXT_FORGOTTEN_DETAILS' => $TEXT['FORGOTTEN_DETAILS'],
67
		'TEXT_USERNAME' => $TEXT['USERNAME'],
68
		'TEXT_PASSWORD' => $TEXT['PASSWORD'],
69
		'USER_FIELDNAME' => $username_fieldname,
70
		'PASSWORD_FIELDNAME' => $password_fieldname,
71
		'TEXT_LOGIN' => $TEXT['LOGIN'],
72
		'TEXT_RESET' => $TEXT['RESET'],
73
		'TEXT_CANCEL' => $TEXT['CANCEL'],
74
		)
75
	);
90 76

  
91
<br />
77
	$oTpl->set_block('main_block', 'show_smart_login_block', 'show_smart_login');
78
//	$oTpl->parse('show_smart_login', '');
79
	if($username_fieldname != 'username') {
80
		$oTpl->set_var(array(
81
		'TEXT_REMEMBER_ME' => $TEXT['REMEMBER_ME'],
82
			)
83
		);
92 84

  
93
<a href="<?php echo WB_URL; ?>/account/forgot.php"><?php echo $TEXT['FORGOTTEN_DETAILS']; ?></a>
85
		$oTpl->parse('smart_login', 'show_smart_login_block', true);
86
	} else {
87
		$oTpl->set_block('show_smart_login', '');
88
	}
89

  
90
	//$oTpl->parse('message', 'message_block', true);
91
	$oTpl->parse('main', 'main_block', false);
92
	$output = $oTpl->finish($oTpl->parse('output', 'page'));
93
	unset($oTpl);
94
	print $output;
95

  
branches/2.8.x/wb/account/preferences.php
3 3
 *
4 4
 * @category        frontend
5 5
 * @package         account
6
 * @author          WebsiteBaker Project
7
 * @copyright       2004-2009, Ryan Djurovich
8
 * @copyright       2009-2011, Website Baker Org. e.V.
6
 * @author          Ryan Djurovich, WebsiteBaker Project
7
 * @copyright       2009-2012, WebsiteBaker Org. e.V.
9 8
 * @link			http://www.websitebaker2.org/
10 9
 * @license         http://www.gnu.org/licenses/gpl.html
11 10
 * @platform        WebsiteBaker 2.8.x
......
19 18
require_once('../config.php');
20 19

  
21 20
if(!FRONTEND_LOGIN) {
22
	if(INTRO_PAGE) {
23
		header('Location: '.WB_URL.PAGES_DIRECTORY.'/index.php');
24
		exit(0);
25
	} else {
26 21
		header('Location: '.WB_URL.'/index.php');
27 22
		exit(0);
28
	}
23
//	if(INTRO_PAGE) {
24
//		header('Location: '.WB_URL.PAGES_DIRECTORY.'/index.php');
25
//		exit(0);
26
//	} else {
27
//		header('Location: '.WB_URL.'/index.php');
28
//		exit(0);
29
//	}
29 30
}
30 31

  
31 32
require_once(WB_PATH.'/framework/class.frontend.php');
33

  
32 34
$wb_inst = new wb();
33 35
if ($wb_inst->is_authenticated()==false) {
34 36
	header('Location: '.WB_URL.'/account/login.php');
branches/2.8.x/wb/account/login.php
3 3
 *
4 4
 * @category        frontend
5 5
 * @package         account
6
 * @author          WebsiteBaker Project
7
 * @copyright       2004-2009, Ryan Djurovich
8
 * @copyright       2009-2011, Website Baker Org. e.V.
6
 * @author          Ryan Djurovich, WebsiteBaker Project
7
 * @copyright       2009-2012, WebsiteBaker Org. e.V.
9 8
 * @link			http://www.websitebaker2.org/
10 9
 * @license         http://www.gnu.org/licenses/gpl.html
11 10
 * @platform        WebsiteBaker 2.8.x
......
20 19

  
21 20
// Make sure the login is enabled
22 21
if(!FRONTEND_LOGIN) {
23
	if(INTRO_PAGE) {
24
		header('Location: '.WB_URL.PAGES_DIRECTORY.'/index.php');
25
		exit(0);
26
	} else {
27 22
		header('Location: '.WB_URL.'/index.php');
28 23
		exit(0);
29
	}
24
//	if(INTRO_PAGE) {
25
//		header('Location: '.WB_URL.PAGES_DIRECTORY.'/index.php');
26
//		exit(0);
27
//	} else {
28
//	}
30 29
}
31 30

  
32 31
$page_id = !empty($_SESSION['PAGE_ID']) ? $_SESSION['PAGE_ID'] : 0;
......
62 61

  
63 62
$ThemeUrl  = WB_URL.$wb->correct_theme_source('warning.html');
64 63
// Setup template object, parse vars to it, then parse it
65
$ThemePath = realpath(WB_PATH.$wb->correct_theme_source('login.htt'));
64
$ThemePath = realpath(WB_PATH.$wb->correct_theme_source('loginBox.htt'));
66 65

  
67 66
$thisApp = new Login(
68 67
				array(
......
76 75
						"MAX_USERNAME_LEN" => "30",
77 76
						"MAX_PASSWORD_LEN" => "30",
78 77
						"LOGIN_URL" => $loginUrl,
79
						"DEFAULT_URL" => WB_URL.PAGES_DIRECTORY."/index.php",
78
						"DEFAULT_URL" => WB_URL."/index.php",
80 79
						"TEMPLATE_DIR" => $ThemePath,
81 80
						"TEMPLATE_FILE" => "login.htt",
82 81
						"FRONTEND" => true,
branches/2.8.x/wb/account/preferences.htt
1
<!-- BEGIN main_block -->
2
<!-- BEGIN success_block -->
3
<p class="mod_preferences_success">
4
	{SUCCESS_VALUE}
5
</p>
6
<!-- END success_block -->
7
<!-- BEGIN error_block -->
8
<p class="mod_preferences_error">
9
	{ERROR_VALUE}
10
</p>
11
<!-- END error_block -->
12
<div style="margin: 1em auto;">
13
	<button type="button" value="cancel" onclick="javascript:window.location = '{HTTP_REFERER}';">{TEXT_CANCEL}</button>
14
</div>
15
<hr />
16
<form name="details" action="" method="post">
17
	<h3>{HEADING_MY_SETTINGS}</h3>
18
	<table summary="" cellpadding="5" cellspacing="0" border="0" width="100%">
19
		<tr>
20
			<td width="160">{TEXT_DISPLAY_NAME}:</td>
21
			<td>
22
				<input class="button" type="button" name="display_name" value="{DISPLAY_NAME}" disabled="disabled" readonly="readonly"
23
				 style="border :1px solid #666666; color :#000000; text-align :left; font-weight :bold; background-color :#dddddd; margin : 2px auto; padding :2px 0px 2px 6px; width :71%;"/>
24
			</td>
25
		</tr>
26
		<tr>
27
			<td>{TEXT_LANGUAGE}:</td>
28
			<td>
29
				<select name="language" id="language">
30
					<!-- BEGIN language_list_block -->
31
						<option value="{CODE}"{SELECTED} style="background: url({FLAG}.png) no-repeat center left; padding-left: 20px;">{NAME} ({CODE})</option>
32
					<!-- END language_list_block -->
33
				</select>
34
			</td>
35
		</tr>
36
		<tr>
37
			<td>{TEXT_TIMEZONE}:</td>
38
			<td>
39
				<select name="timezone" style="width: 98%;">
40
					<option value="-20">{MOD_PREFERENCE_PLEASE_SELECT}</option>
41
<!-- BEGIN timezone_list_block -->
42
					<option value="{VALUE}" {SELECTED}>{NAME}</option>
43
<!-- END timezone_list_block -->
44
				</select>
45
			</td>
46
		</tr>
47
		<tr>
48
			<td>{TEXT_DATE_FORMAT}:</td>
49
			<td>
50
				<select name="date_format" style="width: 98%;">
51
					<option value="">{MOD_PREFERENCE_PLEASE_SELECT}</option>
52
<!-- BEGIN date_format_list_block -->
53
					<option value="{VALUE}" {SELECTED}>{NAME}</option>
54
<!-- END date_format_list_block -->
55
				</select>
56
			</td>
57
		</tr>
58
		<tr>
59
			<td>{TEXT_TIME_FORMAT}:</td>
60
			<td>
61
				<select name="time_format" style="width: 98%;">
62
					<option value="">{MOD_PREFERENCE_PLEASE_SELECT}</option>
63
<!-- BEGIN time_format_list_block -->
64
					<option value="{VALUE}" {SELECTED}>{NAME}</option>
65
<!-- END time_format_list_block -->
66
				</select>
67
			</td>
68
		</tr>
69
		<tr>
70
			<td>&nbsp;</td>
71
			<td>
72
				<button type="reset" name="reset" value="reset">{TEXT_RESET}</button>
73
				<button type="submit" name="action" value="details">{MOD_PREFERENCE_SAVE_SETTINGS}</button>
74
			</td>
75
		</tr>
76
	</table>
77
</form>
78
<hr />
79
<form name="email" action="" method="post">
80
	<h3>{HEADING_MY_EMAIL}</h3>
81
	<table summary="" cellpadding="5" cellspacing="0" border="0" width="100%">
82
		<tr>
83
			<td>{TEXT_EMAIL}:</td>
84
			<td>
85
				<input type="text" name="email" value="{EMAIL}" style="width: 98%;" />
86
			</td>
87
		</tr>
88
		<tr>
89
			<td width="160">{TEXT_CURRENT_PASSWORD}:</td>
90
			<td>
91
				<input type="password" name="current_password" style="width: 98%;" />
92
			</td>
93
		</tr>
94
		<tr>
95
			<td>&nbsp;</td>
96
			<td>
97
				<button type="reset" name="reset" value="reset">{TEXT_RESET}</button>
98
				<button type="submit" name="action" value="email">{MOD_PREFERENCE_SAVE_EMAIL}</button>
99
			</td>
100
		</tr>
101
	</table>
102
</form>
103
<hr />
104
<form name="password" action="" method="post">
105
	<h3>{HEADING_MY_PASSWORD}</h3>
106
	<table summary="" cellpadding="5" cellspacing="0" border="0" width="100%">
107
		<tr>
108
			<td width="160">{TEXT_CURRENT_PASSWORD}:</td>
109
			<td>
110
				<input type="password" name="current_password" style="width: 98%;" />
111
			</td>
112
		</tr>
113
		<tr>
114
			<td width="160">{TEXT_NEW_PASSWORD}:</td>
115
			<td>
116
				<input type="password" name="new_password" style="width: 98%;" />
117
			</td>
118
		</tr>
119
		<tr>
120
			<td width="160">{TEXT_RETYPE_NEW_PASSWORD}:</td>
121
			<td>
122
				<input type="password" name="new_password2" style="width: 98%;" />
123
			</td>
124
		</tr>
125
		<tr>
126
			<td>&nbsp;</td>
127
			<td>
128
				<button type="reset" name="reset" value="reset">{TEXT_RESET}</button>
129
				<button type="submit" name="action" value="password">{MOD_PREFERENCE_SAVE_PASSWORD}</button>
130
			</td>
131
		</tr>
132
	</table>
133
</form>
134
<div style="margin: 1em auto;">
135
	<button type="button" value="cancel" onclick="javascript:window.location = '{HTTP_REFERER}';">{TEXT_CANCEL}</button>
136
</div>
137
<!-- END main_block -->
0 138

  
branches/2.8.x/wb/account/htt/login.htt
1
<!-- BEGIN main_block -->
2
<!-- BEGIN message_block -->
3
{MESSAGE_VALUE}
4
<!-- END message_block -->
5

  
6
<hr />
7
<form class="login-box" action="{ACTION_URL}" method="post">
8
	<input type="hidden" name="action" value="login" />
9
	<input type="hidden" name="username_fieldname" value="{USER_FIELDNAME}" />
10
	<input type="hidden" name="password_fieldname" value="{PASSWORD_FIELDNAME}" />
11
	<input type="hidden" name="redirect" value="{REDIRECT_URL}" />
12

  
13
<table summary="" style="width: 60%; font-size: 1em;">
14
		<tr>
15
			<td height="10" colspan="2" style="text-align: center;"><h1>{TEXT_LOGIN}</h1></td>
16
		</tr>
17
		<tr>
18
			<td height="40" style="text-align: center;" colspan="2">
19
			<strong style="text-align: center;">{THISAPP_MESSAGE_VALUE}</strong>
20
			</td>
21
		</tr>
22
<tr>
23
	<td style="width:100px">{TEXT_USERNAME}:</td>
24
	<td class="value_input">
25
		<input type="text" name="{USER_FIELDNAME}" maxlength="30" style="width:220px;"/>
26
    	<script type="text/javascript">
27
    	// document.login.{USER_FIELDNAME}.focus();
28
    	var ref= document.getElementById("{USER_FIELDNAME}");
29
    	if (ref) ref.focus();
30
    	</script>
31
	</td>
32
</tr>
33
<tr>
34
	<td style="width:100px">{TEXT_PASSWORD}:</td>
35
	<td class="value_input">
36
		<input type="password" name="{PASSWORD_FIELDNAME}" maxlength="30" style="width:220px;"/>
37
	</td>
38
</tr>
39
<!-- BEGIN show_smart_login_block -->
40
<tr>
41
	<td>&nbsp;</td>
42
	<td>
43
		<input type="checkbox" name="remember" id="remember" value="true"/>
44
		<label for="remember">{TEXT_REMEMBER_ME}</label>
45
	</td>
46
</tr>
47
<!-- END show_smart_login_block -->
48
<tr>
49
	<td colspan="2" style="text-align: center;">
50
		<input type="submit" name="submit" value="{TEXT_LOGIN}" style="padding: 3px;"  />
51
		<input type="reset" name="reset" value="{TEXT_RESET}" style="padding: 3px;"  />
52
	<button type="button" value="cancel" onclick="javascript:window.location = '{HTTP_REFERER}';" style="padding: 3px;" >{TEXT_CANCEL}</button>
53
	</td>
54
</tr>
55
<tr>
56
	<td colspan="2" style="text-align: center;">
57
	<p class="link"><a href="{FORGOT_URL}">{TEXT_FORGOTTEN_DETAILS}</a></p>
58
	</td>
59
</tr>
60
</table>
61
</form>
62
<!-- END main_block -->
0 63

  
branches/2.8.x/wb/account/htt/success.htt
1
<!-- BEGIN main_block -->
2
<div class="msg-box info">
3
<!-- BEGIN show_registration_block -->
4
	<p>{MESSAGE_VALUE}</p>
5
<!-- END show_registration_block -->
6
	<p>{MESSAGE}</p>
7
<input type="button" name="submit" value="{BACK}" onclick="javascript:window.location='{HTTP_REFERER}';" style="padding: 0 3px;" />
8
</div>
9
<!-- END main_block -->
0 10

  
branches/2.8.x/wb/account/htt/forgot.htt
1
<!-- BEGIN main_block -->
2
<!-- BEGIN message_block -->
3
{MESSAGE_VALUE}
4
<!-- END message_block -->
5

  
6
<hr />
7
<form class="forgot-box" action="{ACTION_URL}" method="post">
8
	<input type="hidden" name="action" value="forgot" />
9
	<input type="hidden" name="url" value="{URL}" />
10

  
11
<table summary="" style="width: 60%; font-size: 1em;">
12
<tr>
13
	<td height="10" colspan="2" style="text-align: center;"><h1>{MENU_FORGOT}</h1></td>
14
</tr>
15
<tr>
16
	<td height="40" style="text-align: center;" colspan="2">
17
	<strong style="text-align: center;">{THISAPP_MESSAGE_VALUE}</strong>
18
	</td>
19
</tr>
20
		<tr>
21
			<td height="10" colspan="2">&nbsp;</td>
22
		</tr>
23
<tr>
24
	<td style="width:100px">{TEXT_EMAIL}:</td>
25
	<td class="value_input">
26
		<input type="text" name="email" maxlength="255" style="width:220px;"/>
27
	</td>
28
</tr>
29
		<tr>
30
			<td height="10" colspan="2">&nbsp;</td>
31
		</tr>
32
<tr>
33
	<td colspan="2" style="text-align: center;">
34
		<input type="submit" name="submit" value="{TEXT_SEND_DETAILS}" style="padding: 3px;"  />
35
		<input type="reset" name="reset" value="{TEXT_RESET}" style="padding: 3px;"  />
36
	<button type="button" value="cancel" onclick="javascript:window.location = '{HTTP_REFERER}';" style="padding: 3px;" >{TEXT_CANCEL}</button>
37
	</td>
38
</tr>
39
<tr>
40
	<td colspan="2" style="text-align: center;">
41
	<p class="link"><a href="{LOGIN_URL}">{TEXT_NEED_TO_LOGIN}</a></p>
42
	</td>
43
</tr>
44
</table>
45
</form>
46
<!-- END main_block -->
0 47

  
branches/2.8.x/wb/account/logout.php
3 3
 *
4 4
 * @category        frontend
5 5
 * @package         account
6
 * @author          WebsiteBaker Project
7
 * @copyright       2004-2009, Ryan Djurovich
8
 * @copyright       2009-2011, Website Baker Org. e.V.
6
 * @author          Ryan Djurovich, WebsiteBaker Project
7
 * @copyright       2009-2012, WebsiteBaker Org. e.V.
9 8
 * @link			http://www.websitebaker2.org/
10 9
 * @license         http://www.gnu.org/licenses/gpl.html
11 10
 * @platform        WebsiteBaker 2.8.x
......
22 21
	setcookie('REMEMBER_KEY', '', time()-3600, '/');
23 22
}
24 23

  
25
$redirect = ((isset($_SESSION['HTTP_REFERER']) && $_SESSION['HTTP_REFERER'] != '') ?  $_SESSION['HTTP_REFERER'] : WB_URL.'/index.php');
24
$redirect = ((isset($_SESSION['HTTP_REFERER']) && $_SESSION['HTTP_REFERER'] != '' && basename($_SESSION['HTTP_REFERER']) != 'logout.php') ?  $_SESSION['HTTP_REFERER'] : WB_URL.'/index.php');
26 25

  
27 26
$_SESSION['USER_ID'] = null;
28 27
$_SESSION['GROUP_ID'] = null;
......
37 36
session_destroy();
38 37

  
39 38
if(INTRO_PAGE) {
40
	header('Location: '.WB_URL.PAGES_DIRECTORY.'/index.php');
39
	header('Location: '.WB_URL.'/index.php');
41 40
} else {
42 41
	header('Location: '.$redirect);
43 42
}
branches/2.8.x/wb/account/languages/DE.php
17 17
  DEUTSCHE SPRACHDATEI FUER DAS PREFERENCES MODUL
18 18
 -----------------------------------------------------------------------------------------
19 19
	UPDATE HISTORY:
20
	Luisehahne; 11.06.2012
21
	 + release der Deutschen Sprachdatei
20 22
	Werner von der Decken; 17.05.2008
21 23
	 + erstes release der Deutschen Sprachdatei
22 24
 -----------------------------------------------------------------------------------------
......
31 33
	'SAVE_EMAIL' => 'Email speichern',
32 34
	'SAVE_PASSWORD' => 'Passwort speichern',
33 35
);
34
?>
36

  
37
$HEADING['SIGNUP2_CONFIMED_REGISTRATION'] = 'Kontofreischaltung';
38
$HEADING['MESSAGE_WELCOME'] = 'Herzlich willkomen zur Freischaltung Ihres Konto';
39

  
40
$HELP['SIGNUP_REMEMBER_PASSWORD'] = '<i>Bitte merken Sie sich Ihr Kennwort! Sie ben&ouml;tigen das Kennwort um die Aktivierung abzuschliessen!</i>';
41
$HELP['CONFIRM_PASSWORD'] = '<i>Geben Sie bitte Ihr Kennwort ein um die Aktivierung abzuschliessen!</i>';
42

  
43
$MESSAGE['ACTIVATED_NEW_USER'] = '<b>Das Konto wurde freigeschaltet. Sie k?nnen sich einloggen</b>';
44
$MESSAGE['FAILED_NEW_USER'] = '<b>Aktiverung abgelaufen oder Kennwort verkehrt</b>';
45
$MESSAGE['SIGNUP2_ADMIN_INFO'] = '
46
Es wurde ein neuer User regisriert.
47

  
48
Loginname: {LOGIN_NAME}
49
UserId: {LOGIN_ID}
50
E-Mail: {LOGIN_EMAIL}
51
IP-Adresse: {LOGIN_IP}
52
Anmeldedatum: {SIGNUP_DATE}
53
----------------------------------------
54
Diese E-Mail wurde automatisch erstellt!
55

  
56
';
57
$MESSAGE['SIGNUP2_BODY_LOGIN_FORGOT'] = '
58
Hallo {LOGIN_DISPLAY_NAME},
59

  
60
Sie erhalten diese E-Mail, weil sie ein neues Passwort angefordert haben.
61

  
62
Ihre neuen Logindaten f?r {LOGIN_WEBSITE_TITLE} lauten:
63

  
64
Loginname: {LOGIN_NAME}
65
Passwort: {LOGIN_PASSWORD}
66

  
67
Das bisherige Passwort wurde durch das neue Passwort oben ersetzt.
68

  
69
Aus Sicherheitsgr?nden sollten Sie dieses Kennwort sofort ?ndern.
70

  
71
Mit freundlichen Gr?ssen
72
----------------------------------------
73
Diese E-Mail wurde automatisch erstellt!
74
';
75
$MESSAGE['SIGNUP2_BODY_LOGIN_INFO'] = '
76
Hallo {LOGIN_DISPLAY_NAME},
77

  
78
Herzlich willkommen bei \'{LOGIN_WEBSITE_TITLE}\'
79

  
80
Ihre Logindaten f?r \'{LOGIN_WEBSITE_TITLE}\' lauten:
81
Loginname: {LOGIN_NAME}
82
Kennwort: {LOGIN_PASSWORD}
83

  
84
Vielen Dank f?r Ihre Registrierung.
85
Aus Sicherheitsgr?nden sollten Sie dieses Kennwort sofort ?ndern.
86

  
87
';
88

  
89
$MESSAGE['SUCCESS_EMAIL_TEXT_GENERATED'] = "\n"
90
."***********************************************************************\n"
91
."Dies ist eine automatisch generierte E-Mail. Die Absenderadresse dieser\n"
92
."E-Mail ist nur zum Versand, und nicht zum Empfang von Nachrichten\n"
93
."eingerichtet! Falls Sie diese E-Mail versehentlich erhalten haben,\n"
94
."l?schen diese Nachricht bitte von Ihrem Computer.\n"
95
."***********************************************************************\n";
96

  
97
$MESSAGE['INCORRECT_CAPTCHA'] = 'Die eingegebene Pr&uuml;fziffer stimmt nicht &uuml;berein. Wenn Sie Probleme mit dem Lesen der Pr&uuml;fziffer haben, bitte schreiben Sie eine E-Mail an den <a href="mailto:{{webmaster_email}}">Webmaster</a>';
98

  
99
$MESSAGE['CONFIRMED']  = 'Ihr Kennwort finden Sie weiter unten. Verwenden Sie sie, um Ihre Softwareeinstellungen und -Funktionen zu verwalten. ?ndern Sie aus Sicherheitsgr?nden umgehend Ihr Kennwort.';
100
$MESSAGE['CONFIRMED'] .= 'Kennwort: ';
101
$MESSAGE['CONFIRMED'] .= 'Vielen Dank!';
102
$MESSAGE['CHANGE_PASSWORD'] = 'Aus Sicherheitsgr?nden sollten Sie dieses Kennwort sofort ?ndern. Besuchen Sie dazu folgende Website:';
103

  
104
$MESSAGE['LOGIN_BOTH_BLANK'] = 'Bitte geben Sie unten Ihren Loginnamen und Passwort ein';
105
$MESSAGE['LOGIN_PASSWORD_BLANK'] = 'Bitte geben Sie Ihr Passwort ein';
106
$MESSAGE['LOGIN_PASSWORD_TOO_LONG'] = 'Das angegebene Passwort ist zu lang';
107
$MESSAGE['LOGIN_PASSWORD_TOO_SHORT'] = 'Das angegebene Passwort ist zu kurz';
108
$MESSAGE['LOGIN_USERNAME_BLANK'] = 'Bitte geben Sie Ihren Loginnamen ein';
109
$MESSAGE['LOGIN_USERNAME_TOO_LONG'] = 'Der angegebene Loginname ist zu lang';
110
$MESSAGE['LOGIN_USERNAME_TOO_SHORT'] = 'Der angegebene Loginname ist zu kurz';
111
$MESSAGE['MAIL_GENERATED'] = 'Diese Nachricht wurde automatisch erstellt und kann nicht beantwortet werden. Wenn Sie Fragen haben oder Hilfe ben?tigen, wenden Sie sich bitte an <a href="mailto:{{webmaster_email}}">Webmaster</a>';
112

  
113
$MESSAGE['SEND_CONFIRMED_REGISTRATION'] = "
114

  
115
Hallo {LOGIN_DISPLAY_NAME},
116

  
117
Herzlich willkommen bei {LOGIN_WEBSITE_TITLE}!
118

  
119
Bitte aktivieren Sie Ihren kostenlosen Account und klicken Sie auf folgenden Link um die Aktivierung abzuschlie?en:
120

  
121
{LINK}
122
Sollte der Link nicht anklickbar sein, so kopieren Sie ihn bitte in die Adresszeile Ihres Browsers!
123

  
124
Der Aktivierungslink ist g?ltig bis {CONFIRMED_REGISTRATION_ENDTIME}
125

  
126
Mit freundlichen Gr??en,
127
Ihr Support Team
128

  
129
";
130
$MESSAGE['SIGNUP2_SUBJECT_NEW_USER'] = 'Vielen Dank f&uuml;r Ihre Registrierung!';
131
$MESSAGE['SIGNUP2_NEW_USER'] = 'Es wurde ein neuer User regisriert';
132
$MESSAGE['SIGNUP2_SUBJECT_LOGIN_INFO'] = 'Deine WB Logindaten ...';
133
$MESSAGE['SIGNUP_NO_EMAIL'] = 'Bitte geben Sie Ihre E-Mail Adresse an';
134

  
135
$MESSAGE['SIGNUP_CONFIRMED_REGISTRATION'] = "Um Ihr Konto zu nutzen zu k&ouml;nnen, erhalten Sie eine E-Mail mit einem Link, um Ihr Konto zu aktivieren.
136
<br /><b>Aktivierung muss innerhalb 24 Stunden erfolgen, da ansonsten das Konto wieder gel&ouml;scht wird.</b>
137
";
138
$MESSAGE['SIGNUP_REGISTRATION'] = 'Sie erhalten Ihre Zugangsdaten per E-Mail!!';
139
$MESSAGE['SIGNUP_NEW_USER'] = '<b>Das Konto wurde angelegt.</b>';
140
$MESSAGE['SIGNUP_ACTIVATION'] = 'Kontoaktivierung';
141

  
142
$TEXT['NEED_CURRENT_PASSWORD'] = 'mit aktuellem Passwort best&auml;tigen';
143
$TEXT['NEED_TO_LOGIN'] = 'M&uuml;ssen Sie sich einloggen?';
144
$TEXT['NEW_PASSWORD'] = 'Neues Passwort';
145
$TEXT['PASSWORD'] = 'Kennwort';
146
$TEXT['ACTIVATION'] = 'Freischalten';
branches/2.8.x/wb/account/forgot_form.php
4 4
 * @category        frontend
5 5
 * @package         account
6 6
 * @author          WebsiteBaker Project
7
 * @copyright       2009-2011, Website Baker Org. e.V.
7
 * @copyright       2009-2012, WebsiteBaker Org. e.V.
8 8
 * @link			http://www.websitebaker2.org/
9 9
 * @license         http://www.gnu.org/licenses/gpl.html
10 10
 * @platform        WebsiteBaker 2.8.x
......
15 15
 *
16 16
 */
17 17

  
18
// Must include code to stop this file being access directly
19
if(defined('WB_PATH') == false) { die("Cannot access this file directly"); }
18
/* -------------------------------------------------------- */
19
// Must include code to stop this file being accessed directly
20
if(defined('WB_PATH') == false)
21
{
22
	// Stop this file being access directly
23
		die('<h2 style="color:red;margin:3em auto;text-align:center;">Cannot access this file directly</h2>');
24
}
25
/* -------------------------------------------------------- */
20 26
// Check if the user has already submitted the form, otherwise show it
21 27
$message = $MESSAGE['FORGOT_PASS_NO_DATA'];
22 28
$errMsg ='';
29
$redirect_url = (isset($redirect_url) && ($redirect_url!='')  ? $redirect_url : $_SESSION['HTTP_REFERER'] );
23 30
if(isset($_POST['email']) && $_POST['email'] != "" )
24 31
{
25 32
	$email = strip_tags($_POST['email']);
......
100 107
	$message = $errMsg;
101 108
	$message_color = 'ff0000';
102 109
}
103
?>
104
<div style="margin: 1em auto;">
105
	<button type="button" value="cancel" onClick="javascript: window.location = '<?php print $_SESSION['HTTP_REFERER'] ?>';"><?php print $TEXT['CANCEL'] ?></button>
106
</div>
107
<h1 style="text-align: center;"><?php echo $MENU['FORGOT']; ?></h1>
108
<form name="forgot_pass" action="<?php echo WB_URL.'/account/forgot.php'; ?>" method="post">
109
	<input type="hidden" name="url" value="{URL}" />
110
		<table summary="" cellpadding="5" cellspacing="0" border="0" align="center" width="500">
111
		<tr>
112
			<td height="40" align="center" style="color: #<?php echo $message_color; ?>;" colspan="3">
113
			<strong><?php echo $message; ?></strong>
114
			</td>
115
		</tr>
116
<?php if(!isset($display_form) OR $display_form != false) { ?>
117
		<tr>
118
			<td height="10" colspan="2"></td>
119
		</tr>
120
		<tr>
121
			<td width="165" height="30" align="right"><?php echo $TEXT['EMAIL']; ?>:</td>
122
			<td><input type="text" maxlength="255" name="email" value="<?php echo $email; ?>" style="width: 180px;" /></td>
123
			<td><input type="submit" name="submit" value="<?php echo $TEXT['SEND_DETAILS']; ?>" style="width: 180px; font-size: 10px; color: #003366; border: 1px solid #336699; background-color: #DDDDDD; padding: 3px; text-transform: uppercase;" /></td>
124
		</tr>
125
<?php } ?>
126
		</table>
127
</form>
110

  
111
// set template file and assign module and template block
112
	$oTpl = new Template(dirname(__FILE__).'/htt','keep');
113
	$oTpl->set_file('page', 'forgot.htt');
114
	$oTpl->debug = false; // false, true
115
	$oTpl->set_block('page', 'main_block', 'main');
116

  
117
	$oTpl->set_block('main_block', 'message_block', 'message');
118
	$oTpl->set_block('message', '');
119
	if(!isset($display_form) OR $display_form != false) {}
120
// generell vars
121
	$oTpl->set_var(array(
122
		'FTAN' => $wb->getFTAN(),
123
		'ACTION_URL' => WB_URL.'/account/forgot.php',
124
		'LOGIN_URL' => WB_URL.'/account/login.php',
125
		'REDIRECT_URL' => $redirect_url,
126
		'WB_URL' => WB_URL,
127
		'THEME_URL' => THEME_URL,
128
		'HTTP_REFERER' => $_SESSION['HTTP_REFERER'],
129
		'MESSAGE_VALUE' => '',
130
		'ERROR_VALUE' => '',
131
		'THISAPP_MESSAGE_VALUE' => $message,
132
		'TEXT_USERNAME' => $TEXT['USERNAME'],
133
		'TEXT_EMAIL' => $TEXT['EMAIL'],
134
//		'USER_FIELDNAME' => $username_fieldname,
135
		'TEXT_SEND_DETAILS' => $TEXT['SEND_DETAILS'],
136
		'TEXT_NEED_TO_LOGIN' => $TEXT['NEED_TO_LOGIN'],
137
		'MENU_FORGOT' => $MENU['FORGOT'],
138
		'TEXT_RESET' => $TEXT['RESET'],
139
		'TEXT_CANCEL' => $TEXT['CANCEL'],
140
		)
141
	);
142

  
143
	//$oTpl->parse('message', 'message_block', true);
144
	$oTpl->parse('main', 'main_block', false);
145
	$output = $oTpl->finish($oTpl->parse('output', 'page'));
146
	unset($oTpl);
147
	print $output;
branches/2.8.x/wb/account/preferences_form.php
4 4
 * @category        frontend
5 5
 * @package         account
6 6
 * @author          WebsiteBaker Project
7
 * @copyright       2004-2009, Ryan Djurovich
8
 * @copyright       2009-2011, Website Baker Org. e.V.
7
 * @copyright       2009-2012, WebsiteBaker Org. e.V.
9 8
 * @link			http://www.websitebaker2.org/
10 9
 * @license         http://www.gnu.org/licenses/gpl.html
11 10
 * @platform        WebsiteBaker 2.8.x
......
16 15
 *
17 16
 */
18 17

  
19
// prevent this file from being accesses directly
20
if(defined('WB_PATH') == false) {	exit("Cannot access this file directly"); }
18
/* -------------------------------------------------------- */
19
// Must include code to stop this file being accessed directly
20
if(defined('WB_PATH') == false)
21
{
22
	// Stop this file being access directly
23
		die('<h2 style="color:red;margin:3em auto;text-align:center;">Cannot access this file directly</h2>');
24
}
25
/* -------------------------------------------------------- */
21 26

  
22 27
	if($wb->is_authenticated() === false) {
23 28
// User needs to login first
......
41 46
	require(ADMIN_PATH.'/interface/time_formats.php');
42 47
	$error = array();
43 48
	$success = array();
44
	$template = new Template(WB_PATH .'/account','remove');
49
	$template = new Template(WB_PATH .'/account','keep');
45 50

  
46 51
	switch($wb->get_post('action')):
47 52
		case 'details':
......
59 64
	endswitch; // switch
60 65

  
61 66
// show template
62
	$template->set_file('page', 'template.html');
67
	$template->set_file('page', 'preferences.htt');
63 68
	$template->set_block('page', 'main_block', 'main');
64 69
// get existing values from database
65 70
	$sql = "SELECT display_name,email FROM ".TABLE_PREFIX."users WHERE user_id = '".$wb->get_user_id()."'";
......
173 178
						);
174 179
// Insert error and/or success messages
175 180
	$template->set_block('main_block', 'error_block', 'error_list');
181
	$template->set_var('ERROR_VALUE', '');
176 182
	if(sizeof($error)>0){
177 183
		foreach($error AS $value){
178 184
			$template->set_var('ERROR_VALUE', $value);
179 185
			$template->parse('error_list', 'error_block', true);
180 186
		}
187
	} else {
188
		$template->parse('error_list', '');
181 189
	}
182 190

  
183 191
	$template->set_block('main_block', 'success_block', 'success_list');
192
	$template->set_var('SUCCESS_VALUE', '');
184 193
	if(sizeof($success)!=0){
185 194
		foreach($success AS $value){
186 195
			$template->set_var('SUCCESS_VALUE', $value);
187 196
			$template->parse('success_list', 'success_block', true);
188 197
		}
198
	} else {
199
		$template->parse('success_list', '');
189 200
	}
190 201
// Parse template for preferences form
191 202
	$template->parse('main', 'main_block', false);

Also available in: Unified diff