Revision 1217
Added by MaGnaL almost 15 years ago
branches/2.8.x/CHANGELOG | ||
---|---|---|
11 | 11 |
! = Update/Change |
12 | 12 |
|
13 | 13 |
------------------------------------- 2.8.1 ------------------------------------- |
14 |
16-DEC-2009 Manuel Lang (MaGnaL) |
|
15 |
# Minor bugfixes: Use localized messages in preference forms on frontend and backend, |
|
16 |
correct html/php syntax in upgrade-script.php and NL localization of show_menu2 snippet |
|
14 | 17 |
14-DEC-2009 Manuel lang (MaGnaL) |
15 | 18 |
# Ticket #832: Fix wrong configuration of timezone-handling when saving |
16 | 19 |
preferences-form on backend and frontend |
branches/2.8.x/wb/upgrade-script.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 : thorn, Matthias Gallas, doc, Dietrich Roland Pehlke, 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 |
@include_once('config.php'); |
27 | 53 |
|
28 | 54 |
// this function checks the basic configurations of an existing WB intallation |
... | ... | |
103 | 129 |
<h2>Step 1: Backup your files</h2> |
104 | 130 |
<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 | 131 |
|
106 |
<form name="send" action="<?php echo $_SERVER['PHP_SELF'];?>" method="POST">
|
|
132 |
<form name="send" action="<?php echo $_SERVER['PHP_SELF'];?>" method="post">
|
|
107 | 133 |
<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 | 134 |
<br /><br /><input name="backup_confirmed" type="checkbox" value="confirmed" /> I confirm that a manual backup of the /pages folder and the MySQL database was created. |
109 | 135 |
<br /><br /><input name="send" type="submit" value="Start upgrade script" /> |
branches/2.8.x/wb/admin/preferences/index.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 |
require('../../config.php'); |
27 | 53 |
require_once(WB_PATH.'/framework/class.admin.php'); |
28 | 54 |
$admin = new admin('Preferences'); |
... | ... | |
123 | 149 |
if(TIME_FORMAT == $format AND !isset($_SESSION['USE_DEFAULT_TIME_FORMAT'])) { |
124 | 150 |
$template->set_var('SELECTED', ' selected="selected"'); |
125 | 151 |
} elseif($format == 'system_default' AND isset($_SESSION['USE_DEFAULT_TIME_FORMAT'])) { |
126 |
$template->set_var('SELECTED', 'selected');
|
|
152 |
$template->set_var('SELECTED', ' selected="selected"');
|
|
127 | 153 |
} else { |
128 | 154 |
$template->set_var('SELECTED', ''); |
129 | 155 |
} |
... | ... | |
157 | 183 |
'TEXT_TIME_FORMAT' => $TEXT['TIME_FORMAT'], |
158 | 184 |
'TEXT_CURRENT_PASSWORD' => $TEXT['CURRENT_PASSWORD'], |
159 | 185 |
'TEXT_NEW_PASSWORD' => $TEXT['NEW_PASSWORD'], |
160 |
'TEXT_RETYPE_NEW_PASSWORD' => $TEXT['RETYPE_NEW_PASSWORD'] |
|
186 |
'TEXT_RETYPE_NEW_PASSWORD' => $TEXT['RETYPE_NEW_PASSWORD'], |
|
187 |
'TEXT_PLEASE_SELECT' => $TEXT['PLEASE_SELECT'] |
|
161 | 188 |
) |
162 | 189 |
); |
163 | 190 |
|
branches/2.8.x/wb/account/preferences_form.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 |
if(!defined('WB_URL')) die(header('Location: ../../index.php')); |
27 | 53 |
|
28 | 54 |
?> |
... | ... | |
89 | 115 |
<td><?php print $TEXT['DATE_FORMAT']; ?>:</td> |
90 | 116 |
<td> |
91 | 117 |
<select name="date_format" style="width: 98%;"> |
92 |
<option value="">Please select...</option>
|
|
118 |
<option value=""><?php print $TEXT['PLEASE_SELECT']; ?>...</option>
|
|
93 | 119 |
<?php |
94 | 120 |
// Insert date format list |
95 | 121 |
$user_time = true; |
... | ... | |
118 | 144 |
<td><?php print $TEXT['TIME_FORMAT']; ?>:</td> |
119 | 145 |
<td> |
120 | 146 |
<select name="time_format" style="width: 98%;"> |
121 |
<option value="">Please select...</option>
|
|
147 |
<option value=""><?php print $TEXT['PLEASE_SELECT']; ?>...</option>
|
|
122 | 148 |
<?php |
123 | 149 |
// Insert time format list |
124 | 150 |
$user_time = true; |
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
Clean check in of minor bugfixes: Add some localizations, correct html/php syntax