Project

General

Profile

« Previous | Next » 

Revision 1792

Added by Dietmar about 12 years ago

! all changes in folder account, Signup with confirmation Mail
! frontend.css now included by account script

View differences:

branches/2.8.x/CHANGELOG
13 13

  
14 14

  
15 15

  
16
24 Oct-2012 Build 1792 Dietmar Woellbrink (Luisehahne)
17
! all changes in folder account, Signup with confirmation Mail
18
! frontend.css now included by account script
16 19
24 Oct-2012 Build 1791 Dietmar Woellbrink (Luisehahne)
17 20
# fixed save search settings
18 21
14 Oct-2012 Build 1790 Dietmar Woellbrink (Luisehahne)
branches/2.8.x/wb/admin/skel/themes/htt/maintenance.htt
1
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
2
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
3
<head>
4
    <title>CMS WebsiteBaker | {PAGE_TITLE}</title>
5
    <meta http-equiv="content-type" content="text/html; charset=utf-8" />
6
    <meta http-equiv="content-language" content="{LANGUAGE}" />
7
    <meta name="description" content="{PAGE_TITLE}" />
8
    <meta name="keywords" content="{PAGE_TITLE}" />
9
    <link href="{THEME_URL}/css/warn.css" rel="stylesheet" type="text/css" />
10
</head>
11

  
12
<body>
13

  
14
<div class="main">
15
    <table class="header layout">
16
        <tr>
17
        	<td class="logo">
18
        		<a href="http://www.websitebaker2.org/" title=""><img src="../images/logo.png" alt="Logo" /></a>
19
        	</td>
20
        	<td></td>
21
        </tr>
22
    </table>
23

  
24
    <div class="table">
25
        <div class="td">
26
            <div class="content">
27
                <div class="login_box">
28
                        <div class="topdiv">
29
                        OFF-LINE
30
                        </div>
31
                        <div class="bottomdiv">
32
        					<h3>{PAGE_TITLE}</h3>
33
        					<h3>{BE_PATIENT}</h3>
34
        					<img src="{PAGE_ICON}" alt="{PAGE_TITLE}" /><br />
35
        					<h3>{CHECK_BACK}</h3>
36
                        </div>
37
                </div>
38
            </div>
39
        </div>
40
    </div>
41
    <table class="footer">
42
    <tbody>
43
        <tr>
44
        	<td>
45
              <!-- Please note: the below reference to the GNU GPL should not be removed, as it provides a link for users to read about warranty, etc. -->
46
              <a href="http://www.websitebaker2.org/" title="external">WebsiteBaker</a> is released under the
47
              <a href="http://www.gnu.org/licenses/gpl.html" title="WebsiteBaker is released under the GNU General Public License">GNU General Public License</a>
48
              <!-- Please note: the above reference to the GNU GPL should not be removed, as it provides a link for users to read about warranty, etc. -->
49
        	</td>
50
        </tr>
51
        </tbody>
52
    </table>
53
</div>
54
</body>
55
</html>
56
<!--- Icons from http://www.iconfinder.com Filter: Allowed for commercial use (No link required) -->
57
<!--- Icon Designer David Vignoni - http://www.icon-king.com/ License: http://www.gnu.org/licenses/lgpl.html -->
0 58

  
branches/2.8.x/wb/admin/interface/version.php
51 51

  
52 52
// check if defined to avoid errors during installation (redirect to admin panel fails if PHP error/warnings are enabled)
53 53
if(!defined('VERSION')) define('VERSION', '2.8.3');
54
if(!defined('REVISION')) define('REVISION', '1791');
54
if(!defined('REVISION')) define('REVISION', '1792');
55 55
if(!defined('SP')) define('SP', '');
branches/2.8.x/wb/account/confirm_form_mask.php
33 33
		'ACTION_URL' => WB_URL.'/account/confirm.php',
34 34
		'WB_URL' => WB_URL,
35 35
		'THEME_URL' => THEME_URL,
36
        'CSS_BLOCK'	=> $sIncludeHeadLinkCss,
36 37
		'HTTP_REFERER' => isset($_SESSION['HTTP_REFERER']) ? $_SESSION['HTTP_REFERER'] : WB_URL,
37 38
		'CONFIRM_CODE' => $sConfirmationId,
38 39
		'MESSAGE_VALUE' => '',
branches/2.8.x/wb/account/login_form.php
17 17

  
18 18
/* -------------------------------------------------------- */
19 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>');
20
if(!defined('WB_PATH')) {
21
require_once(dirname(dirname(__FILE__)).'/framework/globalExceptionHandler.php');
22
throw new IllegalFileException();
24 23
}
25 24
/* -------------------------------------------------------- */
26 25

  
......
42 41

  
43 42
$thisApp->redirect_url = (isset($thisApp->redirect_url) && ($thisApp->redirect_url!='')  ? $thisApp->redirect_url : $_SESSION['HTTP_REFERER'] );
44 43

  
45
//print '<pre style="text-align: left;"><strong>function '.__FUNCTION__.'( '.''.' );</strong>  basename: '.basename(__FILE__).'  line: '.__LINE__.' -> <br />';
46
//print_r( $thisApp->redirect_url ); print '</pre>';
44
$sIncludeHeadLinkCss = '';
45
if( is_readable(WB_PATH .'/account/frontend.css')) {
46
	$sIncludeHeadLinkCss .= '<link href="'.WB_URL.'/account/frontend.css"';
47
	$sIncludeHeadLinkCss .= ' rel="stylesheet" type="text/css" media="screen" />'."\n";
48
}
47 49

  
48 50
// set template file and assign module and template block
49 51
	$oTpl = new Template(dirname(__FILE__).'/htt');
......
64 66
		'THEME_URL' => THEME_URL,
65 67
		'TEMPLATE_URL' => TEMPLATE_DIR,
66 68
		'HTTP_REFERER' => $_SESSION['HTTP_REFERER'],
69
        'CSS_BLOCK'	=> $sIncludeHeadLinkCss,
67 70
		'MESSAGE_VALUE' => '',
68 71
		'ERROR_VALUE' => '',
69 72
		'THISAPP_MESSAGE_VALUE' => $thisApp->message,
branches/2.8.x/wb/account/confirm.php
17 17

  
18 18
require_once('../config.php');
19 19

  
20
require_once(WB_PATH.'/framework/class.admin.php');
20
if(!class_exists('frontend', false)){ include(WB_PATH.'/framework/class.frontend.php'); }
21

  
22
require_once(WB_PATH.'/framework/functions.php');
23

  
21 24
// Create new frontend object
22
$wb = new admin();
25
$wb = new frontend(false);
23 26

  
24
//require_once(dirname(__FILE__).'/AccountSignup.php');
25

  
26 27
// load module language file
27
$sAutoLanguage = isset($_SESSION['LANGUAGE']) ? $_SESSION['LANGUAGE'] : AccountSignup::GetBowserLanguage(DEFAULT_LANGUAGE);
28
//$sAutoLanguage = isset($_SESSION['LANGUAGE']) ? $_SESSION['LANGUAGE'] : AccountSignup::GetBowserLanguage(DEFAULT_LANGUAGE);
28 29

  
29 30
$mLang = ModLanguage::getInstance();
30
$mLang->setLanguage(dirname(__FILE__).'/languages/', $sAutoLanguage, DEFAULT_LANGUAGE);
31
$mLang->setLanguage(dirname(__FILE__).'/languages/', LANGUAGE, DEFAULT_LANGUAGE);
31 32

  
33
//$langDir = WB_PATH . '/languages/' . LANGUAGE . '.php';
34
//require_once(!file_exists($langDir) ? WB_PATH . '/languages/EN.php' : $langDir );
35

  
32 36
// form faked? Check the honeypot-fields.
33 37
if(ENABLED_ASP && isset($_POST['username']) && (
34 38
	(!isset($_POST['submitted_when']) OR !isset($_SESSION['submitted_when']) ) OR
......
41 45
	$wb->send_header(WB_URL.'/index.php');
42 46
}
43 47

  
44
$page_id = isset($_SESSION['PAGE_ID']) ? intval($_SESSION['PAGE_ID']) : 0;
48
$page_id = defined('REFERRER_ID') ? REFERRER_ID : isset($_SESSION['PAGE_ID']) ? $_SESSION['PAGE_ID'] : 0;
45 49
// needed for backlink/cancel
46 50
$_SESSION['HTTP_REFERER'] = isset($_SESSION['HTTP_REFERER']) ? ($_SESSION['HTTP_REFERER']) : WB_URL.'/';
47 51
// action modus
48 52
$_POST['action'] = !isset($_POST['action']) ? 'show' : $_POST['action'];
49 53

  
54
// Required page details
50 55
$page_description = '';
51 56
$page_keywords = '';
57
// Work out level
58
$level = ($page_id > 0 )? level_count($page_id): $page_id;
59
// Work out root parent
60
$root_parent = ($page_id > 0 )? root_parent($page_id): $page_id;
61

  
52 62
define('PAGE_ID', $page_id);
53
define('ROOT_PARENT', 0);
63
define('ROOT_PARENT', $root_parent);
54 64
define('PARENT', 0);
55
define('LEVEL', 0);
65
define('LEVEL', $level);
56 66
define('PAGE_TITLE', $TEXT['SIGNUP']);
57 67
define('MENU_TITLE', $TEXT['SIGNUP']);
58 68
define('MODULE', '');
branches/2.8.x/wb/account/forgot.php
15 15
 *
16 16
 */
17 17

  
18
require_once('../config.php');
18
// Include config file
19
$config_file = realpath('../config.php');
20
if(file_exists($config_file) && !defined('WB_URL'))
21
{
22
	require_once($config_file);
23
}
19 24

  
20
$page_id = (!empty($_SESSION['PAGE_ID']) ? $_SESSION['PAGE_ID'] : 0);
25
if(!class_exists('frontend', false)){ include(WB_PATH.'/framework/class.frontend.php'); }
21 26

  
27
require_once(WB_PATH.'/framework/functions.php');
28

  
29
$wb = new frontend(false);
30

  
31
$page_id = defined('REFERRER_ID') ? REFERRER_ID : isset($_SESSION['PAGE_ID']) ? $_SESSION['PAGE_ID'] : PAGE_ID;
32

  
22 33
// Required page details
23
// $page_id = 0;
24 34
$page_description = '';
25 35
$page_keywords = '';
36
// Work out level
37
$level = ($page_id > 0 )? level_count($page_id): $page_id;
38
// Work out root parent
39
$root_parent = ($page_id > 0 )? root_parent($page_id): $page_id;
40

  
26 41
define('PAGE_ID', $page_id);
27
define('ROOT_PARENT', 0);
42
define('ROOT_PARENT', $root_parent);
28 43
define('PARENT', 0);
29
define('LEVEL', 0);
44
define('LEVEL', $level);
45

  
30 46
define('PAGE_TITLE', $MENU['FORGOT']);
31 47
define('MENU_TITLE', $MENU['FORGOT']);
32 48
define('VISIBILITY', 'public');
branches/2.8.x/wb/account/preferences.php
15 15
 *
16 16
 */
17 17

  
18
require_once('../config.php');
18
// Include config file
19
$config_file = realpath('../config.php');
20
if(file_exists($config_file) && !defined('WB_URL'))
21
{
22
	require_once($config_file);
23
}
19 24

  
25
if(!class_exists('frontend', false)){ include(WB_PATH.'/framework/class.frontend.php'); }
26

  
27
require_once(WB_PATH.'/framework/functions.php');
28

  
29
$wb = new frontend(false);
30

  
20 31
if(!FRONTEND_LOGIN) {
21
		header('Location: '.WB_URL.'/index.php');
22
		exit(0);
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
//	}
32
	$wb->send_header('Location: '.WB_URL.'/');
33
	exit(0);
30 34
}
31 35

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

  
34
$wb_inst = new wb();
35
if ($wb_inst->is_authenticated()==false) {
36
	header('Location: '.WB_URL.'/account/login.php');
36
if ($wb->is_authenticated()==false) {
37
	$wb->send_header('Location: '.WB_URL.'/account/login.php');
37 38
	exit(0);
38 39
}
40
$page_id = defined('REFERRER_ID') ? REFERRER_ID : isset($_SESSION['PAGE_ID']) ? $_SESSION['PAGE_ID'] : 0;
39 41

  
40
$page_id = !empty($_SESSION['PAGE_ID']) ? $_SESSION['PAGE_ID'] : 0;
41

  
42 42
// Required page details
43
/* */
44
// $page_id = 0;
45 43
$page_description = '';
46 44
$page_keywords = '';
45
// Work out level
46
$level = ($page_id > 0 )? level_count($page_id): $page_id;
47
// Work out root parent
48
$root_parent = ($page_id > 0 )? root_parent($page_id): $page_id;
49

  
47 50
define('PAGE_ID', $page_id);
48
define('ROOT_PARENT', 0);
51
define('ROOT_PARENT', $root_parent);
49 52
define('PARENT', 0);
50
define('LEVEL', 0);
53
define('LEVEL', $level);
51 54

  
52 55
define('PAGE_TITLE', $MENU['PREFERENCES']);
53 56
define('MENU_TITLE', $MENU['PREFERENCES']);
......
55 58
define('VISIBILITY', 'public');
56 59

  
57 60
define('PAGE_CONTENT', WB_PATH.'/account/preferences_form.php');
61

  
58 62
// Include the index (wrapper) file
59 63
require(WB_PATH.'/index.php');
branches/2.8.x/wb/account/login.php
15 15
 *
16 16
 */
17 17

  
18
require_once("../config.php");
18
// Include config file
19
$config_file = realpath('../config.php');
20
if(file_exists($config_file) && !defined('WB_URL'))
21
{
22
	require_once($config_file);
23
}
19 24

  
25
if(!class_exists('login', false)){ include(WB_PATH.'/framework/class.login.php'); }
26
if(!class_exists('frontend', false)){ include(WB_PATH.'/framework/class.frontend.php'); }
27

  
28
require_once(WB_PATH.'/framework/functions.php');
29

  
30
$wb = new frontend(false);
31

  
20 32
// Make sure the login is enabled
21 33
if(!FRONTEND_LOGIN) {
22
		header('Location: '.WB_URL.'/index.php');
34
		header('Location: '.WB_URL.'/');
23 35
		exit(0);
24 36
//	if(INTRO_PAGE) {
25 37
//		header('Location: '.WB_URL.PAGES_DIRECTORY.'/index.php');
......
28 40
//	}
29 41
}
30 42

  
31
$page_id = !empty($_SESSION['PAGE_ID']) ? $_SESSION['PAGE_ID'] : 0;
43
$page_id = defined('REFERRER_ID') ? REFERRER_ID : isset($_SESSION['PAGE_ID']) ? $_SESSION['PAGE_ID'] : 0;
32 44

  
33 45
// Required page details
34
// $page_id = 0;
35 46
$page_description = '';
36 47
$page_keywords = '';
48
// Work out level
49
$level = ($page_id > 0 )? level_count($page_id): $page_id;
50
// Work out root parent
51
$root_parent = ($page_id > 0 )? root_parent($page_id): $page_id;
52

  
37 53
define('PAGE_ID', $page_id);
38
define('ROOT_PARENT', 0);
54
define('ROOT_PARENT', $root_parent);
39 55
define('PARENT', 0);
40
define('LEVEL', 0);
56
define('LEVEL', $level);
57

  
41 58
define('PAGE_TITLE', $TEXT['PLEASE_LOGIN']);
42 59
define('MENU_TITLE', $TEXT['PLEASE_LOGIN']);
43 60
define('VISIBILITY', 'public');
44 61
// Set the page content include file
45 62
define('PAGE_CONTENT', WB_PATH.'/account/login_form.php');
46 63

  
47
require_once(WB_PATH.'/framework/class.login.php');
48
require_once(WB_PATH.'/framework/class.frontend.php');
49

  
50
// Create new frontend object
51
$wb = new frontend();
52

  
53 64
// Create new login app
54 65
$requestMethod = '_'.strtoupper($_SERVER['REQUEST_METHOD']);
55 66
$redirect  = strip_tags(isset(${$requestMethod}['redirect']) ? ${$requestMethod}['redirect'] : '');
......
59 70
$loginUrl  = WB_URL.'/account/login.php';
60 71
$loginUrl .= (!empty($redirect) ? '?redirect=' .$_SESSION['HTTP_REFERER'] : '');
61 72

  
62
//print '<pre style="text-align: left;"><strong>function '.__FUNCTION__.'( '.''.' );</strong>  basename: '.basename(__FILE__).'  line: '.__LINE__.' -> <br />';
63
//print_r( $redirect ); print '</pre>';
64

  
65 73
$ThemeUrl  = WB_URL.$wb->correct_theme_source('warning.html');
66 74
// Setup template object, parse vars to it, then parse it
67 75
$ThemePath = realpath(WB_PATH.$wb->correct_theme_source('loginBox.htt'));
......
86 94
						"USERS_TABLE" => TABLE_PREFIX."users",
87 95
						"GROUPS_TABLE" => TABLE_PREFIX."groups",
88 96
						"REDIRECT_URL" => $redirect
89
				)
97
                    )
90 98
		);
91 99

  
92 100
// Set extra outsider var
branches/2.8.x/wb/account/htt/preferences.htt
1 1
<!-- BEGIN main_block -->
2
<!-- BEGIN success_block -->
3
{SUCCESS_VALUE}
4
<!-- END success_block -->
5
<!-- BEGIN error_block -->
6
{ERROR_VALUE}
2
{CSS_BLOCK}
3
    <!-- BEGIN success_block -->
4
        {SUCCESS_VALUE}
5
    <!-- END success_block -->
6
    <!-- BEGIN error_block -->
7
        {ERROR_VALUE}
7 8
<!-- END error_block -->
8 9
<hr />
9 10
<div class="account">
10

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

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

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

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

  
2 4
<!-- BEGIN message_block -->
3 5
{MESSAGE_VALUE}
4 6
<!-- END message_block -->
branches/2.8.x/wb/account/confirm_form.php
36 36
			$sSubmitAction = 'cancel'; // default action
37 37
		}
38 38

  
39
        $sIncludeHeadLinkCss = '';
40
        if( is_readable(WB_PATH .'/account/frontend.css')) {
41
        	$sIncludeHeadLinkCss .= '<link href="'.WB_URL.'/account/frontend.css"';
42
        	$sIncludeHeadLinkCss .= ' rel="stylesheet" type="text/css" media="screen" />'."\n";
43
        }
44

  
39 45
		$output = '';
40 46
		msgQueue::clear();
41 47
		switch($sSubmitAction) :
branches/2.8.x/wb/account/frontend.css
46 46
div.box-info { border-color :#bb7a00; color :#003ff2; }
47 47
div.box-warning { border-color :#ffa500; color :#ffa500; }
48 48
/* Border attributes for mbox and other elements also *********************** */
49

  
49 50
/* ]]> */
branches/2.8.x/wb/account/languages/EN.php
31 31
	'SAVE_PASSWORD' => 'save password',
32 32
);
33 33
$TEXT['USERNAME'] = 'Loginname';
34
$HEADING['SIGNUP2_CONFIMED_REGISTRATION'] = 'Kontofreischaltung';
35
$HEADING['MESSAGE_WELCOME'] = 'Herzlich willkomen zur Freischaltung Ihres Konto';
34
$HEADING['SIGNUP2_CONFIMED_REGISTRATION'] = 'Unlock account';
35
$HEADING['MESSAGE_WELCOME'] = 'Welcome to unlock of your account';
36 36

  
37
$HELP['SIGNUP_REMEMBER_PASSWORD'] = '<i>Bitte merken Sie sich Ihren Loginnamen und das Kennwort! Sie ben&ouml;tigen den Loginnamen und das Kennwort um die Aktivierung abzuschliessen!</i>';
38
$HELP['CONFIRM_PASSWORD'] = '<i>Geben Sie bitte Ihren Loginnamen und das Kennwort ein um die Aktivierung abzuschliessen!</i>';
37
$HELP['SIGNUP_REMEMBER_PASSWORD'] = '<i>Remember your Loginname and Passwoprd please! You will need it later to complete the activation!</i>';
38
$HELP['CONFIRM_PASSWORD'] = '<i>Enter your Loginname and Password please to finish the the activation!</i>';
39 39

  
40
$MESSAGE['ACTIVATED_NEW_USER'] = '<b>Das Konto wurde freigeschaltet. Sie können sich einloggen</b>';
41
$MESSAGE['FAILED_NEW_USER'] = '<b>Die Aktiverung ist abgelaufen oder verkehrtes Kennwort</b>';
40
$MESSAGE['ACTIVATED_NEW_USER'] = '<b>Your account is activated. You can logon now.</b>';
41
$MESSAGE['FAILED_NEW_USER'] = '<b>Invalid access data or activation code is expired!</b>';
42 42
$MESSAGE['SIGNUP2_ADMIN_INFO'] = '
43
Es wurde ein neuer User regisriert.
43
A new user was registered.
44 44

  
45 45
Loginname: {LOGIN_NAME}
46 46
UserId: {LOGIN_ID}
47 47
E-Mail: {LOGIN_EMAIL}
48
IP-Adresse: {LOGIN_IP}
49
Anmeldedatum: {SIGNUP_DATE}
48
IP-Address: {LOGIN_IP}
49
Signup date: {SIGNUP_DATE}
50 50
----------------------------------------
51
Diese E-Mail wurde automatisch erstellt!
51
Do NOT answer! This e-mail is autogenerated by WebsiteBaker!
52 52

  
53 53
';
54 54
$MESSAGE['SIGNUP2_BODY_LOGIN_FORGOT'] = '
55
Hallo {LOGIN_DISPLAY_NAME},
55
Hello {LOGIN_DISPLAY_NAME},
56 56

  
57
Sie erhalten diese E-Mail, weil sie ein neues Passwort angefordert haben.
57
You got this email, because you\'ve requested a new password.
58 58

  
59
Ihre neuen Logindaten für {LOGIN_WEBSITE_TITLE} lauten:
59
Your new password for {LOGIN_WEBSITE_TITLE} is:
60 60

  
61
Loginname: {LOGIN_NAME}
62
Passwort: {LOGIN_PASSWORD}
61
Password: {LOGIN_PASSWORD}
63 62

  
64
Das bisherige Passwort wurde durch das neue Passwort oben ersetzt.
63
For security reasons change the password as soon as possible please.
65 64

  
66
Aus Sicherheitsgründen sollten Sie dieses Kennwort sofort ändern.
67

  
68
Mit freundlichen Grüssen
65
with kind regards
69 66
----------------------------------------
70
Diese E-Mail wurde automatisch erstellt!
67
Do NOT answer! This e-mail is autogenerated by WebsiteBaker!
71 68
';
72 69
$MESSAGE['SIGNUP2_BODY_LOGIN_INFO'] = '
73
Hallo {LOGIN_DISPLAY_NAME},
70
Hello {LOGIN_DISPLAY_NAME},
74 71

  
75
Herzlich willkommen bei \'{LOGIN_WEBSITE_TITLE}\'
72
Welcome on \'{LOGIN_WEBSITE_TITLE}\'
76 73

  
77
Ihre Logindaten für \'{LOGIN_WEBSITE_TITLE}\' lauten:
78
Loginname: {LOGIN_NAME}
79
Kennwort: {LOGIN_PASSWORD}
74
Your account for  \'{LOGIN_WEBSITE_TITLE}\' is:
75
Login name: {LOGIN_NAME}
76
Password: {LOGIN_PASSWORD}
80 77

  
81
Vielen Dank für Ihre Registrierung.
82
Aus Sicherheitsgründen sollten Sie dieses Kennwort sofort ändern.
78
Thank you for registration.
79
For security reasons change the password as soon as possible please.
83 80

  
84 81
';
85 82

  
86 83
$MESSAGE['SUCCESS_EMAIL_TEXT_GENERATED'] = "\n"
87
."***********************************************************************\n"
88
."Dies ist eine automatisch generierte E-Mail. Die Absenderadresse dieser\n"
89
."E-Mail ist nur zum Versand, und nicht zum Empfang von Nachrichten\n"
90
."eingerichtet! Falls Sie diese E-Mail versehentlich erhalten haben,\n"
91
."löschen Sie diese Nachricht bitte von Ihrem Computer.\n"
92
."***********************************************************************\n";
84
."***************************************************************************\n"
85
."This e-mail is autogenerated by WebsiteBaker! Do NOT answer to this e-mail!\n"
86
."If you got this email by a mistake, please excuse and delete this e-mail.\n"
87
."***************************************************************************\n";
93 88

  
94
$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>';
89
$MESSAGE['INCORRECT_CAPTCHA'] = 'The given code does not match. If you have problems reading the code, please write an e-mail to the <a href="mailto:{{webmaster_email}}">Webmaster</a>';
95 90

  
96
$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.';
97
$MESSAGE['CONFIRMED'] .= 'Kennwort: ';
98
$MESSAGE['CONFIRMED'] .= 'Vielen Dank!';
99
$MESSAGE['CHANGE_PASSWORD'] = 'Aus Sicherheitsgründen sollten Sie dieses Kennwort sofort ändern. Besuchen Sie dazu folgende Website:';
91
$MESSAGE['CONFIRMED']  = 'You can find your password below. Use it to maintain your settings and functions. For security reasons change the password as soon as possible please.';
92
$MESSAGE['CONFIRMED'] .= 'Password: ';
93
$MESSAGE['CONFIRMED'] .= 'Thank you!';
94
$MESSAGE['CHANGE_PASSWORD'] = 'For security reasons change the password as soon as possible please. For that visit following website:';
100 95

  
101
$MESSAGE['LOGIN_BOTH_BLANK'] = 'Bitte geben Sie Ihren Loginnamen und Passwort ein';
102
$MESSAGE['LOGIN_PASSWORD_BLANK'] = 'Bitte geben Sie Ihr Passwort ein';
103
$MESSAGE['LOGIN_PASSWORD_TOO_LONG'] = 'Das angegebene Passwort ist zu lang';
104
$MESSAGE['LOGIN_PASSWORD_TOO_SHORT'] = 'Das angegebene Passwort ist zu kurz';
105
$MESSAGE['LOGIN_USERNAME_BLANK'] = 'Bitte geben Sie Ihren Loginnamen ein';
106
$MESSAGE['LOGIN_USERNAME_TOO_LONG'] = 'Der angegebene Loginname ist zu lang';
107
$MESSAGE['LOGIN_USERNAME_TOO_SHORT'] = 'Der angegebene Loginname ist zu kurz';
108
$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>';
96
$MESSAGE['LOGIN_BOTH_BLANK'] = 'Give your login name and password please';
97
$MESSAGE['LOGIN_PASSWORD_BLANK'] = 'Give your password please';
98
$MESSAGE['LOGIN_PASSWORD_TOO_LONG'] = 'given password is too long';
99
$MESSAGE['LOGIN_PASSWORD_TOO_SHORT'] = 'given password is too short';
100
$MESSAGE['LOGIN_USERNAME_BLANK'] = 'Give your login name please';
101
$MESSAGE['LOGIN_USERNAME_TOO_LONG'] = 'given login name is too long';
102
$MESSAGE['LOGIN_USERNAME_TOO_SHORT'] = 'given login name is too short';
103
$MESSAGE['MAIL_GENERATED'] = 'This email is autogenerated by WebsiteBaker! Do NOT answer to this e-mail! If you need some help or you have any questions, please contact <a href="mailto:{{webmaster_email}}">Webmaster</a>';
109 104

  
110 105
$MESSAGE['SEND_CONFIRMED_REGISTRATION'] = "
111 106

  
112
Hallo {LOGIN_DISPLAY_NAME},
107
Hello {LOGIN_DISPLAY_NAME},
113 108

  
114
Herzlich willkommen bei {LOGIN_WEBSITE_TITLE}!
109
welcome on {LOGIN_WEBSITE_TITLE}!
115 110

  
116
Bitte aktivieren Sie Ihren kostenlosen Account und klicken Sie auf folgenden Link um die Aktivierung abzuschließen:
111
Click the link below to activate your account and finalize your signup:
117 112

  
118 113
{LINK}
119
Sollte der Link nicht anklickbar sein, so kopieren Sie ihn bitte in die Adresszeile Ihres Browsers!
120 114

  
121
Der Aktivierungslink ist gültig bis {CONFIRMED_REGISTRATION_ENDTIME}
115
If the link is not clickable, please copy it into your browser!
122 116

  
123
Mit freundlichen Grüßen,
124
Ihr Support Team
117
This activation link will exceed on {CONFIRMED_REGISTRATION_ENDTIME}
125 118

  
119
with kind regards,
120
your Support Team
121

  
126 122
";
127 123
$MESSAGE['SEND_CONFIRMED_ACTIVATION'] = "
128 124

  
129
Hallo {LOGIN_DISPLAY_NAME},
125
Hello {LOGIN_DISPLAY_NAME},
130 126

  
131
Herzlich willkommen bei {LOGIN_WEBSITE_TITLE}!
127
welcome on {LOGIN_WEBSITE_TITLE}!
132 128

  
133
Sie haben sich erfolgreich aktiviert. Sie können sich jetzt anmelden.
129
Your account now is successful activated. You can login now.
134 130

  
135
Bei Problemen oder Fragen wenden Sie sich bitte per E-Mail an den <a href=\"mailto:{{webmaster_email}}\">Webmaster</a>
131
If you need some help or you have any questions, please contact the <a href=\"mailto:{{webmaster_email}}\">Webmaster</a>
136 132

  
137
Mit freundlichen Grüßen,
138
Ihr Support Team
133
with kind regards,
134
your Support Team
139 135

  
140 136
";
141 137

  
142
$MESSAGE['SIGNUP2_SUBJECT_NEW_USER'] = 'Vielen Dank f&uuml;r Ihre Registrierung!';
143
$MESSAGE['SIGNUP2_NEW_USER'] = 'Es wurde ein neuer User regisriert';
144
$MESSAGE['SIGNUP2_SUBJECT_LOGIN_INFO'] = 'Deine WB Logindaten ...';
145
$MESSAGE['SIGNUP_NO_EMAIL'] = 'Bitte geben Sie Ihre E-Mail Adresse an';
138
$MESSAGE['SIGNUP2_SUBJECT_NEW_USER'] = 'Thank you for signing up.';
139
$MESSAGE['SIGNUP2_NEW_USER'] = 'A new user has signed up';
140
$MESSAGE['SIGNUP2_SUBJECT_LOGIN_INFO'] = 'Your WB account data ...';
141
$MESSAGE['SIGNUP_NO_EMAIL'] = 'Please key in your valid email address';
146 142

  
147
$MESSAGE['SIGNUP_CONFIRMED_REGISTRATION'] = "Um Ihr Konto nutzen zu k&ouml;nnen, erhalten Sie eine E-Mail mit einem Link, um Ihr Konto zu aktivieren.
148
<br /><b>Die Aktivierung muss innerhalb 24 Stunden erfolgen, da ansonsten das Konto wieder gel&ouml;scht wird.</b>
143
$MESSAGE['SIGNUP_CONFIRMED_REGISTRATION'] = "To be able to use your account, receive during the next minutes e-mail with a link to activate your account.
144
<br /><b>The activation must be done during 24 hours. Otherwise the account will be deleted.</b>
149 145
";
150
$MESSAGE['SIGNUP_REGISTRATION'] = 'Sie erhalten Ihre Zugangsdaten per E-Mail!!';
151
$MESSAGE['SIGNUP_NEW_USER'] = '<b>Das Konto wurde angelegt.</b>';
152
$MESSAGE['SIGNUP_ACTIVATION'] = 'Kontoaktivierung';
146
$MESSAGE['SIGNUP_REGISTRATION'] = 'You get your data by e-mail!!';
147
$MESSAGE['SIGNUP_NEW_USER'] = '<b>Your account is created.</b>';
148
$MESSAGE['SIGNUP_ACTIVATION'] = 'Account Activation';
153 149

  
154
$TEXT['NEED_CURRENT_PASSWORD'] = 'mit aktuellem Passwort best&auml;tigen';
155
$TEXT['NEED_TO_LOGIN'] = 'M&uuml;ssen Sie sich einloggen?';
156
$TEXT['NEW_PASSWORD'] = 'Neues Passwort';
157
$TEXT['PASSWORD'] = 'Kennwort';
158
$TEXT['ACTIVATION'] = 'Freischalten';
159
$TEXT['SEND'] = 'Anfordern';
160
$TEXT['USERNAME'] = 'Loginname';
150
$TEXT['NEED_CURRENT_PASSWORD'] = 'confirm with your password please';
151
$TEXT['NEED_TO_LOGIN'] = 'You need to logon';
152
$TEXT['NEW_PASSWORD'] = 'New password';
153
$TEXT['PASSWORD'] = 'Password';
154
$TEXT['ACTIVATION'] = 'Activate';
155
$TEXT['SEND'] = 'Request';
156
$TEXT['USERNAME'] = 'Login name';
branches/2.8.x/wb/account/languages/DE.php
32 32
	'SAVE_SETTINGS' => 'Einstellungen speichern',
33 33
	'SAVE_EMAIL' => 'Email speichern',
34 34
	'SAVE_PASSWORD' => 'Passwort speichern',
35
	'SAVE_LANGUAGE' => 'Zuerst die Sprache wechseln',
35 36
);
36 37

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

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

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

  
62
Ihre neuen Logindaten für {LOGIN_WEBSITE_TITLE} lauten:
63
Ihr neues Passwort für {LOGIN_WEBSITE_TITLE} lautet:
63 64

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

  
67 67
Das bisherige Passwort wurde durch das neue Passwort oben ersetzt.
......
72 72
----------------------------------------
73 73
Diese E-Mail wurde automatisch erstellt!
74 74
';
75

  
75 76
$MESSAGE['SIGNUP2_BODY_LOGIN_INFO'] = '
76 77
Hallo {LOGIN_DISPLAY_NAME},
77 78

  
branches/2.8.x/wb/account/forgot_form.php
114 114
	$message_color = 'ff0000';
115 115
}
116 116

  
117
$sIncludeHeadLinkCss = '';
118
if( is_readable(WB_PATH .'/account/frontend.css')) {
119
	$sIncludeHeadLinkCss .= '<link href="'.WB_URL.'/account/frontend.css"';
120
	$sIncludeHeadLinkCss .= ' rel="stylesheet" type="text/css" media="screen" />'."\n";
121
}
122

  
117 123
// set template file and assign module and template block
118 124
	$oTpl = new Template(dirname(__FILE__).'/htt','keep');
119 125
	$oTpl->set_file('page', 'forgot.htt');
......
133 139
		'WB_URL' => WB_URL,
134 140
		'THEME_URL' => THEME_URL,
135 141
		'TEMPLATE_URL' => TEMPLATE_DIR,
142
        'CSS_BLOCK'	=> $sIncludeHeadLinkCss,
136 143
		'HTTP_REFERER' => $_SESSION['HTTP_REFERER'],
137 144
		'MESSAGE_VALUE' => '',
138 145
		'ERROR_VALUE' => '',
branches/2.8.x/wb/account/save_signup.php
117 117
		msgQueue::add($MESSAGE['LOGIN_USERNAME_BLANK']);
118 118
	}
119 119

  
120
	if($wb->get_session('DISPLAY_NAME') != "") {
121
//		$aErrorMsg[] = $MESSAGE['GENERIC_FILL_IN_ALL'];
122
		msgQueue::add($MESSAGE['GENERIC_FILL_IN_ALL']);
123
	}
124

  
125 120
	if($wb->get_session('EMAIL') != "") {
126 121
		// Check if the email already exists
127 122
		$sql = 'SELECT `user_id` FROM `'.TABLE_PREFIX.'users` WHERE `email` = \''.$_SESSION['EMAIL'].'\'';
......
138 133
		msgQueue::add($MESSAGE['SIGNUP_NO_EMAIL']);
139 134
	}
140 135

  
136
	if($wb->get_session('DISPLAY_NAME') == "") {
137
//		$aErrorMsg[] = $MESSAGE['GENERIC_FILL_IN_ALL'];
138
		msgQueue::add($MESSAGE['GENERIC_FILL_IN_ALL'].' ('.$TEXT['DISPLAY_NAME'].')');
139
	}
140

  
141 141
	if(CONFIRMED_REGISTRATION) {
142 142
		$iMinPassLength = 6;
143 143
// receive password vars and calculate needed action
......
156 156
				if($sNewPassword != $sNewPasswordRetyped) {
157 157
					msgQueue::add($MESSAGE['USERS_PASSWORD_MISMATCH']);
158 158
				} else {
159
					$pattern = '/[^'.$admin->password_chars.']/';
159
					$pattern = '/[^'.$wb->password_chars.']/';
160 160
					if (preg_match($pattern, $sNewPassword)) {
161 161
						msgQueue::add($MESSAGE['PREFERENCES_INVALID_CHARS']);
162 162
					}else {
......
210 210
//		$sDisplayName = $_SESSION['DISPLAY_NAME'];
211 211
		$sDisplayName = $wb->add_slashes($_SESSION['DISPLAY_NAME']);
212 212
		$groups_id = FRONTEND_SIGNUP;
213
		$email_to = $_SESSION['email'];
213
		$email_to = $_SESSION['EMAIL'];
214 214

  
215 215
// Delete outdated confirmation IDs
216 216
		deleteOutdatedConfirmations();
......
227 227
		}
228 228

  
229 229
// Save new user
230
		$bSaveRegistration = true;
231 230

  
232 231
		$sql  = 'INSERT INTO `'.TABLE_PREFIX.'users` SET ';
233 232
		$sql .= '`group_id` = \''.$groups_id.'\', ';
......
258 257
				msgQueue::add($database->get_error());
259 258
			}
260 259
		} else {
260
    		$bSaveRegistration = true;
261 261
			msgQueue::add($MESSAGE['SIGNUP_NEW_USER'],true);
262 262

  
263 263
			include(dirname(__FILE__).'/signup_mails.php');
......
270 270
		} // end success $bSaveRegistration
271 271
	}
272 272
} // end $_POST['action']
273
// if page_id lost
274
$page_id = isset($_SESSION['PAGE_ID']) ? $_SESSION['PAGE_ID'] : 0;
branches/2.8.x/wb/account/preferences_form.php
5 5
* @package         account
6 6
* @author          WebsiteBaker Project
7 7
* @copyright       2009-2012, WebsiteBaker Org. e.V.
8
* @link			http://www.websitebaker2.org/
8
* @link	           http://www.websitebaker2.org/
9 9
* @license         http://www.gnu.org/licenses/gpl.html
10 10
* @platform        WebsiteBaker 2.8.x
11 11
* @requirements    PHP 5.2.2 and higher
......
25 25

  
26 26
if($wb->is_authenticated() === false) {
27 27
// User needs to login first
28
header("Location: ".WB_URL."/account/login.php?redirect=".$wb->link);
29
exit(0);
28
    header("Location: ".WB_URL."/account/login.php?redirect=".$wb->link);
29
    exit(0);
30 30
}
31 31

  
32
/**
33
 *
34
 */
35
$sUserLanguage = LANGUAGE;
36
// Check existing language
37
	$sql  = 'SELECT `language` ';
38
	$sql .= 'FROM `'.TABLE_PREFIX.'users` ';
39
	$sql .= 'WHERE `user_id` = '.$wb->get_user_id();
40
    if ($sUserLanguage = $database->get_one($sql)) {
41
		$_SESSION['LANGUAGE'] = $sUserLanguage;
42
    }
43

  
44
$sDefaultLanguage = DEFAULT_LANGUAGE;
45
//$sLang = $wb->get_session('LANGUAGE');
46
$sLanguage = LANGUAGE.'.php';
47

  
48
$LanguageDir = WB_PATH .'/account/languages/';
49

  
50
$sLanguageFile = ( file_exists($LanguageDir.$sUserLanguage.'.php') ? $LanguageDir.$sUserLanguage.'.php' : $LanguageDir.$sLanguage);
51
$sLanguageFile = ( is_readable($sLanguageFile) ?  $sLanguageFile :  $LanguageDir.$sDefaultLanguage.'.php'   );
32 52
// load module default language file (EN)
33
require_once(WB_PATH .'/account/languages/EN.php');
34
// check for user defined language file, load it and override EN-Settings with
35
if(file_exists(WB_PATH .'/account/languages/' .LANGUAGE .'.php')) {
36
require_once(WB_PATH .'/account/languages/' .LANGUAGE .'.php');
53
require($sLanguageFile);
54

  
55
require(WB_PATH.'/framework/functions-utf8.php');
56

  
57
$sIncludeHeadLinkCss = '';
58
if( is_readable(WB_PATH .'/account/frontend.css')) {
59
	$sIncludeHeadLinkCss .= '<link href="'.WB_URL.'/account/frontend.css"';
60
	$sIncludeHeadLinkCss .= ' rel="stylesheet" type="text/css" media="screen" />'."\n";
37 61
}
38
require_once(WB_PATH.'/framework/functions-utf8.php');
39 62

  
40
//	echo '<style type="text/css">';
41
//	include(WB_PATH .'/account/frontend.css');
42
//	echo "\n</style>\n";
43

  
44 63
$user_time = true;
45 64
require(ADMIN_PATH.'/interface/timezones.php');
46 65
require(ADMIN_PATH.'/interface/date_formats.php');
47 66
require(ADMIN_PATH.'/interface/time_formats.php');
48 67
$error = array();
49 68
$success = array();
69

  
50 70
$template = new Template(WB_PATH .'/account/htt','keep');
51 71

  
72
// show template
73
$template->set_file('page', 'preferences.htt');
74
$template->set_block('page', 'main_block', 'main');
75

  
76
/**
77
 *
78
 */
52 79
switch($wb->get_post('action')):
53
case 'details':
54
require_once(WB_PATH .'/account/details.php');
55
break;
56
case 'email':
57
require_once(WB_PATH .'/account/email.php');
58

  
59
break;
60
case 'password':
61
require_once(WB_PATH .'/account/password.php');
62
break;
63
default:
80
    case 'details':
81
        require_once(WB_PATH .'/account/details.php');
82
        break;
83
    case 'email':
84
        require_once(WB_PATH .'/account/email.php');
85
        break;
86
    case 'password':
87
        require_once(WB_PATH .'/account/password.php');
88
        break;
89
    default:
64 90
// do nothing
65 91
endswitch; // switch
92
// require(dirname(__FILE__).'/save_preferences.php');
93
// get existing values from database
94
$sql  = "SELECT `display_name`,`email`,`language`,`timezone`,`date_format`,`time_format` ";
95
$sql .= "FROM `".TABLE_PREFIX."users` ";
96
$sql .= "WHERE `user_id` = '".$wb->get_user_id()."'";
66 97

  
67
// show template
68
$template->set_file('page', 'preferences.htt');
69
$template->set_block('page', 'main_block', 'main');
70
// get existing values from database
71
$sql = "SELECT `display_name`,`email` FROM ".TABLE_PREFIX."users WHERE `user_id` = '".$wb->get_user_id()."'";
72
$rowset = $database->query($sql);
98
if($rowset = $database->query($sql)) {
99
    $row = $rowset->fetchRow();
100
    $_SESSION['LANGUAGE'] = $row['language'];
101
    $_SESSION['EMAIL'] = $row['email'];
102
    $_SESSION['DISPLAY_NAME'] = $row['display_name'];
103
    $_SESSION['TIMEZONE'] = $row['timezone'];
104
    $_SESSION['DATE_FORMAT'] = $row['date_format'];
105
    $_SESSION['TIME_FORMAT'] = $row['time_format'];
106
}
73 107
if($database->is_error()) $error[] = $database->get_error();
74
$row = $rowset->fetchRow();
75 108
// insert values into form
76 109
$template->set_var('DISPLAY_NAME', $row['display_name']);
77 110
$template->set_var('EMAIL', $row['email']);
78 111
$template->set_var('ACTION_URL', WB_URL.'/account/preferences.php');
79 112

  
80
// read available languages from table addons and assign it to the template
113
$_SESSION['HTTP_REFERER'] =( ($_SESSION['LANGUAGE'] != LANGUAGE ) ? WB_URL.'?lang='.$_SESSION['LANGUAGE'] : $_SESSION['HTTP_REFERER']);
114
$template->set_block('main_block', 'show_detail_send_block', 'show_detail_send');
115
$template->set_block('main_block', 'show_email_send_block', 'show_email_send');
116
$template->set_block('main_block', 'show_password_send_block', 'show_password_send');
117

  
118
if(($sUserLanguage != LANGUAGE) ) {
119
    $template->parse('show_detail_send', '');
120
    $template->parse('show_email_send', '');
121
    $template->parse('show_password_send', '');
122
} else {
123
    $template->parse('show_detail_send', 'show_detail_send_block');
124
    $template->parse('show_email_send', 'show_email_send_block');
125
    $template->parse('show_password_send', 'show_password_send_block');
126
}
127

  
128
// Insert language text and messages
129
$template->set_var(array(
130
    'HTTP_REFERER' => ( $wb->get_session('HTTP_REFERER')!='' ? $_SESSION['HTTP_REFERER'] : WB_URL),
131
    'CSS_BLOCK'	=> $sIncludeHeadLinkCss,
132
    'TEXT_SAVE'	=> $TEXT['SAVE'],
133
    'TEXT_RESET' => $TEXT['RESET'],
134
    'TEXT_CANCEL' => ($sUserLanguage!=LANGUAGE) ? $MOD_PREFERENCE['SAVE_LANGUAGE']:$TEXT['CANCEL'],
135
    'TEXT_DISPLAY_NAME'	=> $TEXT['DISPLAY_NAME'],
136
    'TEXT_EMAIL' => $TEXT['EMAIL'],
137
    'TEXT_LANGUAGE' => $TEXT['LANGUAGE'],
138
    'TEXT_TIMEZONE' => $TEXT['TIMEZONE'],
139
    'TEXT_DATE_FORMAT' => $TEXT['DATE_FORMAT'],
140
    'TEXT_TIME_FORMAT' => $TEXT['TIME_FORMAT'],
141
    'TEXT_CURRENT_PASSWORD' => $TEXT['CURRENT_PASSWORD'],
142
    'TEXT_NEW_PASSWORD' => $TEXT['NEW_PASSWORD'],
143
    'TEXT_RETYPE_NEW_PASSWORD' => $TEXT['RETYPE_NEW_PASSWORD']
144
    )
145
);
146

  
147
$aLangAddons = array();
148
$aLangBrowser = array();
149

  
150
// read available languages from table addons
81 151
$sql  = 'SELECT * FROM `'.TABLE_PREFIX.'addons` ';
82 152
$sql .= 'WHERE `type` = \'language\' ORDER BY `directory`';
83
if( $res_lang = $database->query($sql) )
153
if( $oLang = $database->query($sql) )
84 154
{
85
    $template->set_block('main_block', 'language_list_block', 'language_list');
86
    while( $rec_lang = $res_lang->fetchRow() )
155
    while( $aLang = $oLang->fetchRow(MYSQL_ASSOC) )
87 156
    {
88
        $langIcons = (empty($rec_lang['directory'])) ? 'none' : strtolower($rec_lang['directory']);
89
        $template->set_var('CODE',        $rec_lang['directory']);
90
        $template->set_var('NAME',        $rec_lang['name']);
91
        $template->set_var('FLAG',        THEME_URL.'/images/flags/'.$langIcons);
92
        $template->set_var('SELECTED',    ($wb->get_session('LANGUAGE') == $rec_lang['directory'] ? ' selected="selected"' : '') );
93
        $template->parse('language_list', 'language_list_block', true);
157
        $aLangAddons[$aLang['directory']] = $aLang['name'];
94 158
    }
95 159
}
160

  
161
// default, if no information from client available
162
$sAutoLanguage = DEFAULT_LANGUAGE;
163
// detect client language
164
//if(isset($_SERVER['HTTP_ACCEPT_LANGUAGE'])) {
165
//	if(preg_match('/([a-z]{2})(?:-[a-z]{2})*/i', strtolower($_SERVER['HTTP_ACCEPT_LANGUAGE']), $matches)) {
166
//		$sAutoLanguage = strtoupper($matches[1]);
167
//	}
168
//}
169

  
170
//$sAutoLanguage = 'FR';
171
$aLangUsed = array_flip(explode(',',$wb->GetLanguagesInUsed()));
172
$aLangUsed = array_intersect_key($aLangAddons, $aLangUsed);
173
//$sAutoLanguage = array_key_exists($sAutoLanguage,$aLangUsed) ? $sAutoLanguage : DEFAULT_LANGUAGE;
174

  
175
// read available languages from table addons and assign it to the template
176
$template->set_block('main_block', 'language_list_block', 'language_list');
177
foreach( $aLangUsed as $sDirectory => $sName  )
178
{
179
    $langIcons = ( empty($sDirectory) ? 'none' : strtolower($sDirectory));
180

  
181
    $template->set_var('CODE',        $sDirectory);
182
    $template->set_var('NAME',        $sName);
183
    $template->set_var('FLAG',        THEME_URL.'/images/flags/'.$langIcons);
184
    $template->set_var('SELECTED',    ( $_SESSION['LANGUAGE'] == $sDirectory ? ' selected="selected"' : '') );
185

  
186
    $template->parse('language_list', 'language_list_block', true);
187
}
188

  
96 189
// Insert default timezone values
97 190
$template->set_block('main_block', 'timezone_list_block', 'timezone_list');
98 191
foreach($TIMEZONES AS $hour_offset => $title) {
......
149 242
}
150 243
// Insert language headings
151 244
$template->set_var(array(
152
'HEADING_MY_SETTINGS' => $HEADING['MY_SETTINGS'],
153
'HEADING_MY_EMAIL'    => $HEADING['MY_EMAIL'],
154
'HEADING_MY_PASSWORD' => $HEADING['MY_PASSWORD']
155
)
156
);
157
// Insert language text and messages
158
$template->set_var(array(
159
    'HTTP_REFERER' => $_SESSION['HTTP_REFERER'],
160
    'TEXT_SAVE'	=> $TEXT['SAVE'],
161
    'TEXT_RESET' => $TEXT['RESET'],
162
    'TEXT_CANCEL' => $TEXT['CANCEL'],
163
    'TEXT_DISPLAY_NAME'	=> $TEXT['DISPLAY_NAME'],
164
    'TEXT_EMAIL' => $TEXT['EMAIL'],
165
    'TEXT_LANGUAGE' => $TEXT['LANGUAGE'],
166
    'TEXT_TIMEZONE' => $TEXT['TIMEZONE'],
167
    'TEXT_DATE_FORMAT' => $TEXT['DATE_FORMAT'],
168
    'TEXT_TIME_FORMAT' => $TEXT['TIME_FORMAT'],
169
    'TEXT_CURRENT_PASSWORD' => $TEXT['CURRENT_PASSWORD'],
170
    'TEXT_NEW_PASSWORD' => $TEXT['NEW_PASSWORD'],
171
    'TEXT_RETYPE_NEW_PASSWORD' => $TEXT['RETYPE_NEW_PASSWORD']
245
    'HEADING_MY_SETTINGS' => $HEADING['MY_SETTINGS'],
246
    'HEADING_MY_EMAIL'    => $HEADING['MY_EMAIL'],
247
    'HEADING_MY_PASSWORD' => $HEADING['MY_PASSWORD']
172 248
    )
173 249
);
174 250

  
branches/2.8.x/wb/account/details.php
26 26

  
27 27
// Get entered values
28 28
	$display_name = strip_tags($wb->StripCodeFromText($wb->get_post('display_name')));
29
	$language = strip_tags($wb->StripCodeFromText($wb->get_post('language')));
29
	$sUserLanguage = strip_tags($wb->StripCodeFromText($wb->get_post('language')));
30 30
	$timezone = intval($wb->StripCodeFromText($wb->get_post('timezone')))*60*60;
31 31
	$date_format = strip_tags($wb->StripCodeFromText($wb->get_post('date_format')));
32 32
	$time_format = strip_tags($wb->StripCodeFromText($wb->get_post('time_format')));
33 33

  
34
// Update the database
35
// $database = new database();
34
//  Update the database
36 35
	$sql  = "UPDATE `".TABLE_PREFIX."users` SET ";
37
	$sql .= "`display_name` = '".$display_name."', `language` = '".$language."', ";
36
	$sql .= "`display_name` = '".$display_name."', `language` = '".$sUserLanguage."', ";
38 37
	$sql .= "`timezone` = '".$timezone."', `date_format` = '".$date_format."', ";
39 38
	$sql .= "`time_format` = '".$time_format."' ";
40 39
	$sql .=	"WHERE `user_id` = '".$wb->get_user_id()."'";
......
44 43
	} else {
45 44
		$success[] = $MOD_PREFERENCE['DETAILS_SAVED'];
46 45
		$_SESSION['DISPLAY_NAME'] = $display_name;
47
		$_SESSION['LANGUAGE'] = $language;
46
		$_SESSION['LANGUAGE'] = $sUserLanguage;
48 47
		$_SESSION['TIME_FORMAT'] = $time_format;
49 48
		$_SESSION['DATE_FORMAT'] = $date_format;
50 49
		$_SESSION['TIMEZONE'] = $timezone;
branches/2.8.x/wb/account/signup_form.php
34 34
$mLang = ModLanguage::getInstance();
35 35
$mLang->setLanguage(dirname(__FILE__).'/languages/', LANGUAGE, DEFAULT_LANGUAGE);
36 36

  
37
//echo '<style type="text/css">';
38
//include(WB_PATH .'/account/frontend.css');
39
//echo "\n</style>\n";
40

  
41 37
if(isset($_POST['action']) && $_POST['action']=='send') {
42 38
	require(dirname(__FILE__).'/save_signup.php');
43 39
} else {
......
50 46
	unset($_SESSION['TIMEZONE']);
51 47
}
52 48

  
53
if($_SESSION['display_form']){
49
if($_SESSION['display_form'])
50
{
54 51

  
52
$sIncludeHeadLinkCss = '';
53
if( is_readable(WB_PATH .'/account/frontend.css')) {
54
	$sIncludeHeadLinkCss .= '<link href="'.WB_URL.'/account/frontend.css"';
55
	$sIncludeHeadLinkCss .= ' rel="stylesheet" type="text/css" media="screen" />'."\n";
56
}
57

  
55 58
// set template file and assign module and template block
56 59
	$oTpl = new Template(dirname(__FILE__).'/htt','keep');
57 60
	$oTpl->set_file('page', 'signup.htt');
......
63 66
		'ACTION_URL' => WB_URL.'/account/signup.php',
64 67
		'WB_URL' => WB_URL,
65 68
		'THEME_URL' => THEME_URL,
69
        'CSS_BLOCK'	=> $sIncludeHeadLinkCss,
66 70
		'HTTP_REFERER' => $_SESSION['HTTP_REFERER'],
67 71
		'MESSAGE_VALUE' => '',
68 72
		'ERROR_VALUE' => '',
......
116 120
		)
117 121
	);
118 122

  
123

  
124
$aLangAddons = array();
125
$aLangBrowser = array();
126
// read available languages from table addons
127
$sql  = 'SELECT * FROM `'.TABLE_PREFIX.'addons` ';
128
$sql .= 'WHERE `type` = \'language\' ORDER BY `directory`';
129
if( $oLang = $database->query($sql) )
130
{
131
    while( $aLang = $oLang->fetchRow(MYSQL_ASSOC) )
132
    {
133
        $aLangAddons[$aLang['directory']] = $aLang['name'];
134
    }
135
}
136

  
137
// default, if no information from client available
138
$sAutoLanguage = DEFAULT_LANGUAGE;
119 139
// detect client language
120
	$oTpl->set_block('main_block', 'language_list_block', 'language_list');
121
	$sAutoLanguage = DEFAULT_LANGUAGE; // default, if no information from client available
122
	if(isset($_SERVER['HTTP_ACCEPT_LANGUAGE'])) {
123
		if(preg_match('/([a-z]{2})(?:-[a-z]{2})*/i', strtolower($_SERVER['HTTP_ACCEPT_LANGUAGE']), $matches)) {
124
			$sAutoLanguage = strtoupper($matches[1]);
125
		}
140
if(isset($_SERVER['HTTP_ACCEPT_LANGUAGE'])) {
141
	if(preg_match('/([a-z]{2})(?:-[a-z]{2})*/i', strtolower($_SERVER['HTTP_ACCEPT_LANGUAGE']), $matches)) {
142
		$sAutoLanguage = strtoupper($matches[1]);
126 143
	}
127
	$sAutoLanguage = isset($_SESSION['LANGUAGE']) ? $_SESSION['LANGUAGE'] : $sAutoLanguage;
128
	// Insert language values
129
	$sql  = 'SELECT `name`, `directory` FROM `'.TABLE_PREFIX.'addons` ';
130
	$sql .= 'WHERE `type` = \'language\' ';
131
//	$sql .= 'AND `function` != \'theme\' ';
132
	$sql .= 'ORDER BY `directory`';
133
	if( ($result = $database->query($sql)) && ($result->numRows() > 0) )
134
//	$result = $database->query("SELECT * FROM ".TABLE_PREFIX."addons WHERE type = 'language' ORDER BY directory");
135
//	if($result->numRows() > 0)
136
	{
137
		while($addon = $result->fetchRow())
138
		{
139
	        $langIcons = (empty($addon['directory'])) ? 'none' : strtolower($addon['directory']);
144
}
140 145

  
141
			$oTpl->set_var('CODE',        $addon['directory']);
142
			$oTpl->set_var('NAME',        $addon['name']);
143
			$oTpl->set_var('FLAG',        THEME_URL.'/images/flags/'.$langIcons);
144
			$oTpl->set_var('SELECTED',    ($sAutoLanguage == $addon['directory'] ? $sSelected : '') );
145
			$oTpl->parse('language_list', 'language_list_block', true);
146
		}
147
	}
146
$sAutoLanguage=($wb->get_session('LANGUAGE')) ? $_SESSION['LANGUAGE'] : $sAutoLanguage;
148 147

  
148
//$sAutoLanguage = 'NL';
149
$aLangUsed = array_flip(explode(',',$wb->GetLanguagesInUsed()));
150
$aLangUsed = array_intersect_key($aLangAddons, $aLangUsed);
151
$sAutoLanguage = array_key_exists($sAutoLanguage,$aLangUsed) ? $sAutoLanguage : DEFAULT_LANGUAGE;
152
//print '<pre style="text-align: left;"><strong>function '.__FUNCTION__.'( '.''.' );</strong>  basename: '.basename(__FILE__).'  line: '.__LINE__.' -> <br />';
... This diff was truncated because it exceeds the maximum size that can be displayed.

Also available in: Unified diff