Project

General

Profile

« Previous | Next » 

Revision 1214

Added by MaGnaL over 14 years ago

Ticket #832: Fix wrong configuration of timezone-handling when saving preferences-form on backend and frontend

View differences:

branches/2.8.x/CHANGELOG
11 11
! = Update/Change
12 12

  
13 13
------------------------------------- 2.8.1 -------------------------------------
14
14-DEC-2009 Manuel lang (MaGnaL)
15
#	Ticket #832: Fix wrong configuration of timezone-handling when saving
16
	preferences-form on backend and frontend 
14 17
12-DEC-2009 Manuel Lang (MaGnaL)
15 18
#	Ticket #827: Fix false form-parameter when javascript is deactivated
16 19
	on users and groups temps (admintool).
branches/2.8.x/wb/upgrade-script.php
103 103
<h2>Step 1: Backup your files</h2>
104 104
<p>It is highly recommended to <strong>create a manual backup</strong> of the entire <strong>/pages folder</strong> and the <strong>MySQL database</strong> before proceeding.<br /><strong class="error">Note: </strong>The upgrade script alters some settings of your existing database!!! You need to confirm the disclaimer before proceeding.</p>
105 105

  
106
<form name="send" action="<?php echo $_SERVER['PHP_SELF'];?>" method="POST">
106
<form name="send" action="<?php echo $_SERVER['PHP_SELF'];?>" method="post">
107 107
<textarea cols="80" rows="5">DISCLAIMER: The Website Baker upgrade script is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. One needs to confirm that a manual backup of the /pages folder (including all files and subfolders contained in it) and backup of the entire Website Baker MySQL database was created before you can proceed.</textarea>
108 108
<br /><br /><input name="backup_confirmed" type="checkbox" value="confirmed" />&nbsp;I confirm that a manual backup of the /pages folder and the MySQL database was created.
109 109
<br /><br /><input name="send" type="submit" value="Start upgrade script" />
branches/2.8.x/wb/admin/preferences/details.php
1 1
<?php
2 2

  
3
// $Id$
3
/****************************************************************************
4
* SVN Version information:
5
*
6
* $Id$
7
*
8
*****************************************************************************
9
*
10
*****************************************************************************
11
*                          WebsiteBaker
12
*
13
* WebsiteBaker Project <http://www.websitebaker2.org/>
14
* Copyright (C) 2009, Website Baker Org. e.V.
15
*         http://start.websitebaker2.org/impressum-datenschutz.php
16
* Copyright (C) 2004-2009, Ryan Djurovich
17
*
18
*                        About WebsiteBaker
19
*
20
* Website Baker is a PHP-based Content Management System (CMS)
21
* designed with one goal in mind: to enable its users to produce websites
22
* with ease.
23
*
24
*****************************************************************************
25
*
26
*****************************************************************************
27
*                   WebsiteBaker Extra Information (where needed)
28
*
29
* @author       : Ryan Djurovich, stefan, Matthias Gallas, Manuel Lang
30
* @platform     : WebsiteBaker 2.8
31
*
32
*****************************************************************************
33
*
34
*****************************************************************************
35
*                        LICENSE INFORMATION
36
*
37
* WebsiteBaker is free software; you can redistribute it and/or
38
* modify it under the terms of the GNU General Public License
39
* as published by the Free Software Foundation; either version 2
40
* of the License, or (at your option) any later version.
41
*
42
* WebsiteBaker is distributed in the hope that it will be useful,
43
* but WITHOUT ANY WARRANTY; without even the implied warranty of
44
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
45
* See the GNU General Public License for more details.
46
*
47
* You should have received a copy of the GNU General Public License
48
* along with this program; if not, write to the Free Software
49
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
50
*****************************************************************************/
4 51

  
5
/*
6

  
7
 Website Baker Project <http://www.websitebaker.org/>
8
 Copyright (C) 2004-2009, Ryan Djurovich
9

  
10
 Website Baker is free software; you can redistribute it and/or modify
11
 it under the terms of the GNU General Public License as published by
12
 the Free Software Foundation; either version 2 of the License, or
13
 (at your option) any later version.
14

  
15
 Website Baker is distributed in the hope that it will be useful,
16
 but WITHOUT ANY WARRANTY; without even the implied warranty of
17
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
18
 GNU General Public License for more details.
19

  
20
 You should have received a copy of the GNU General Public License
21
 along with Website Baker; if not, write to the Free Software
22
 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
23

  
24
*/
25

  
26 52
// Print admin header
27 53
require('../../config.php');
28 54
require_once(WB_PATH.'/framework/class.admin.php');
......
45 71
	$admin->print_success($MESSAGE['PREFERENCES']['DETAILS_SAVED']);
46 72
	$_SESSION['DISPLAY_NAME'] = $display_name;
47 73
	$_SESSION['LANGUAGE'] = $language;
48
	$_SESSION['TIMEZONE'] = $timezone;
49 74
	// Update date format
50 75
	if($date_format != '') {
51 76
		$_SESSION['DATE_FORMAT'] = $date_format;
......
62 87
		$_SESSION['USE_DEFAULT_TIME_FORMAT'] = true;
63 88
		if(isset($_SESSION['TIME_FORMAT'])) { unset($_SESSION['TIME_FORMAT']); }
64 89
	}
90
	// Update timezone
91
	if($timezone != '-72000') {
92
		$_SESSION['TIMEZONE'] = $timezone;
93
		if(isset($_SESSION['USE_DEFAULT_TIMEZONE'])) { unset($_SESSION['USE_DEFAULT_TIMEZONE']); }
94
	} else {
95
		$_SESSION['USE_DEFAULT_TIMEZONE'] = true;
96
		if(isset($_SESSION['TIMEZONE'])) { unset($_SESSION['TIMEZONE']); }
97
	}
65 98
}
66 99

  
67 100
// Print admin footer
branches/2.8.x/wb/admin/preferences/index.php
123 123
	if(TIME_FORMAT == $format AND !isset($_SESSION['USE_DEFAULT_TIME_FORMAT'])) {
124 124
		$template->set_var('SELECTED', ' selected="selected"');
125 125
	} elseif($format == 'system_default' AND isset($_SESSION['USE_DEFAULT_TIME_FORMAT'])) {
126
		$template->set_var('SELECTED', 'selected');
126
		$template->set_var('SELECTED', ' selected="selected"');
127 127
	} else {
128 128
		$template->set_var('SELECTED', '');
129 129
	}
......
157 157
								'TEXT_TIME_FORMAT' => $TEXT['TIME_FORMAT'],
158 158
								'TEXT_CURRENT_PASSWORD' => $TEXT['CURRENT_PASSWORD'],
159 159
								'TEXT_NEW_PASSWORD' => $TEXT['NEW_PASSWORD'],
160
								'TEXT_RETYPE_NEW_PASSWORD' => $TEXT['RETYPE_NEW_PASSWORD']
160
								'TEXT_RETYPE_NEW_PASSWORD' => $TEXT['RETYPE_NEW_PASSWORD'],
161
								'TEXT_PLEASE_SELECT' => $TEXT['PLEASE_SELECT']
161 162
								)
162 163
						);
163 164

  
branches/2.8.x/wb/account/details.php
1 1
<?php
2 2

  
3
// $Id$
3
/****************************************************************************
4
* SVN Version information:
5
*
6
* $Id$
7
*
8
*****************************************************************************
9
*
10
*****************************************************************************
11
*                          WebsiteBaker
12
*
13
* WebsiteBaker Project <http://www.websitebaker2.org/>
14
* Copyright (C) 2009, Website Baker Org. e.V.
15
*         http://start.websitebaker2.org/impressum-datenschutz.php
16
* Copyright (C) 2004-2009, Ryan Djurovich
17
*
18
*                        About WebsiteBaker
19
*
20
* Website Baker is a PHP-based Content Management System (CMS)
21
* designed with one goal in mind: to enable its users to produce websites
22
* with ease.
23
*
24
*****************************************************************************
25
*
26
*****************************************************************************
27
*                   WebsiteBaker Extra Information
28
*
29
* @author       : Ryan Djurovich, stefan, Matthias Gallas, thorn, Manuel Lang
30
* @platform     : WebsiteBaker 2.8
31
*
32
*****************************************************************************
33
*
34
*****************************************************************************
35
*                        LICENSE INFORMATION
36
*
37
* WebsiteBaker is free software; you can redistribute it and/or
38
* modify it under the terms of the GNU General Public License
39
* as published by the Free Software Foundation; either version 2
40
* of the License, or (at your option) any later version.
41
*
42
* WebsiteBaker is distributed in the hope that it will be useful,
43
* but WITHOUT ANY WARRANTY; without even the implied warranty of
44
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
45
* See the GNU General Public License for more details.
46
*
47
* You should have received a copy of the GNU General Public License
48
* along with this program; if not, write to the Free Software
49
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
50
*****************************************************************************/
4 51

  
5
/*
6

  
7
 Website Baker Project <http://www.websitebaker.org/>
8
 Copyright (C) 2004-2009, Ryan Djurovich
9

  
10
 Website Baker is free software; you can redistribute it and/or modify
11
 it under the terms of the GNU General Public License as published by
12
 the Free Software Foundation; either version 2 of the License, or
13
 (at your option) any later version.
14

  
15
 Website Baker is distributed in the hope that it will be useful,
16
 but WITHOUT ANY WARRANTY; without even the implied warranty of
17
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
18
 GNU General Public License for more details.
19

  
20
 You should have received a copy of the GNU General Public License
21
 along with Website Baker; if not, write to the Free Software
22
 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
23

  
24
*/
25

  
26 52
if(!defined('WB_URL')) {
27 53
	header('Location: ../pages/index.php');
28 54
	exit(0);
......
48 74
	$wb->print_success($MESSAGE['PREFERENCES']['DETAILS_SAVED'], WB_URL.'/account/preferences.php');
49 75
	$_SESSION['DISPLAY_NAME'] = $display_name;
50 76
	$_SESSION['LANGUAGE'] = $language;
51
	$_SESSION['TIMEZONE'] = $timezone;
52 77
	// Update date format
53 78
	if($date_format != '') {
54 79
		$_SESSION['DATE_FORMAT'] = $date_format;
......
65 90
		$_SESSION['USE_DEFAULT_TIME_FORMAT'] = true;
66 91
		if(isset($_SESSION['TIME_FORMAT'])) { unset($_SESSION['TIME_FORMAT']); }
67 92
	}
93
	// Update timezone
94
	if($timezone != '-72000') {
95
		$_SESSION['TIMEZONE'] = $timezone;
96
		if(isset($_SESSION['USE_DEFAULT_TIMEZONE'])) { unset($_SESSION['USE_DEFAULT_TIMEZONE']); }
97
	} else {
98
		$_SESSION['USE_DEFAULT_TIMEZONE'] = true;
99
		if(isset($_SESSION['TIMEZONE'])) { unset($_SESSION['TIMEZONE']); }
100
	}
68 101
}
69 102

  
70 103
?>
branches/2.8.x/wb/templates/classic_theme/templates/preferences.htt
28 28
	<td>{TEXT_TIMEZONE}:</td>
29 29
	<td>
30 30
		<select name="timezone" style="width: 98%;">
31
			<option value="-20">Please select...</option>
31
			<option value="-20">{TEXT_PLEASE_SELECT}...</option>
32 32
			<!-- BEGIN timezone_list_block -->
33 33
				<option value="{VALUE}" {SELECTED}>{NAME}</option>
34 34
			<!-- END timezone_list_block -->
......
39 39
	<td>{TEXT_DATE_FORMAT}:</td>
40 40
	<td>
41 41
		<select name="date_format" style="width: 98%;">
42
			<option value="">Please select...</option>
42
			<option value="">{TEXT_PLEASE_SELECT}...</option>
43 43
			<!-- BEGIN date_format_list_block -->
44 44
				<option value="{VALUE}" {SELECTED}>{NAME}</option>
45 45
			<!-- END date_format_list_block -->
......
50 50
	<td>{TEXT_TIME_FORMAT}:</td>
51 51
	<td>
52 52
		<select name="time_format" style="width: 98%;">
53
			<option value="">Please select...</option>
53
			<option value="">{TEXT_PLEASE_SELECT}...</option>
54 54
			<!-- BEGIN time_format_list_block -->
55 55
				<option value="{VALUE}" {SELECTED}>{NAME}</option>
56 56
			<!-- END time_format_list_block -->
branches/2.8.x/wb/templates/wb_theme/templates/preferences.htt
28 28
	<td>{TEXT_TIMEZONE}:</td>
29 29
	<td>
30 30
		<select name="timezone" style="width: 98%;">
31
			<option value="-20">Please select...</option>
31
			<option value="-20">{TEXT_PLEASE_SELECT}...</option>
32 32
			<!-- BEGIN timezone_list_block -->
33 33
				<option value="{VALUE}" {SELECTED}>{NAME}</option>
34 34
			<!-- END timezone_list_block -->
......
39 39
	<td>{TEXT_DATE_FORMAT}:</td>
40 40
	<td>
41 41
		<select name="date_format" style="width: 98%;">
42
			<option value="">Please select...</option>
42
			<option value="">{TEXT_PLEASE_SELECT}...</option>
43 43
			<!-- BEGIN date_format_list_block -->
44 44
				<option value="{VALUE}" {SELECTED}>{NAME}</option>
45 45
			<!-- END date_format_list_block -->
......
50 50
	<td>{TEXT_TIME_FORMAT}:</td>
51 51
	<td>
52 52
		<select name="time_format" style="width: 98%;">
53
			<option value="">Please select...</option>
53
			<option value="">{TEXT_PLEASE_SELECT}...</option>
54 54
			<!-- BEGIN time_format_list_block -->
55 55
				<option value="{VALUE}" {SELECTED}>{NAME}</option>
56 56
			<!-- END time_format_list_block -->
branches/2.8.x/wb/templates/argos_theme/templates/preferences.htt
29 29
	<td>{TEXT_TIMEZONE}:</td>
30 30
	<td>
31 31
		<select name="timezone" style="width: 98%;">
32
			<option value="-20">Please select...</option>
32
			<option value="-20">{TEXT_PLEASE_SELECT}...</option>
33 33
			<!-- BEGIN timezone_list_block -->
34 34
				<option value="{VALUE}" {SELECTED}>{NAME}</option>
35 35
			<!-- END timezone_list_block -->
......
40 40
	<td>{TEXT_DATE_FORMAT}:</td>
41 41
	<td>
42 42
		<select name="date_format" style="width: 98%;">
43
			<option value="">Please select...</option>
43
			<option value="">{TEXT_PLEASE_SELECT}...</option>
44 44
			<!-- BEGIN date_format_list_block -->
45 45
				<option value="{VALUE}" {SELECTED}>{NAME}</option>
46 46
			<!-- END date_format_list_block -->
......
51 51
	<td>{TEXT_TIME_FORMAT}:</td>
52 52
	<td>
53 53
		<select name="time_format" style="width: 98%;">
54
			<option value="">Please select...</option>
54
			<option value="">{TEXT_PLEASE_SELECT}...</option>
55 55
			<!-- BEGIN time_format_list_block -->
56 56
				<option value="{VALUE}" {SELECTED}>{NAME}</option>
57 57
			<!-- END time_format_list_block -->
branches/2.8.x/wb/modules/show_menu2/languages/NL.php
27 27
*/
28 28

  
29 29
//Module Description
30
$module_description = 'Deze module integreert een de geavanceerde menu functie <code> show_menu2 () </ code> in Website Baker. Gedetailleerde informatie is beschikbaar op <a href="http://code.jellycan.com/show_menu2/" target="_blank"> http://code.jellycan.com/show_menu2/ </a> of in de <a href = "{WB_URL}/modules/show_menu2/README_EN" target = "_blank"> README </a>.
30
$module_description = 'Deze module integreert een de geavanceerde menu functie <code> show_menu2 () </ code> in Website Baker. Gedetailleerde informatie is beschikbaar op <a href="http://code.jellycan.com/show_menu2/" target="_blank"> http://code.jellycan.com/show_menu2/ </a> of in de <a href = "{WB_URL}/modules/show_menu2/README_EN" target = "_blank"> README </a>.';
31 31

  
32 32
?>

Also available in: Unified diff