Revision 1849
Added by Dietmar almost 12 years ago
branches/2.8.x/CHANGELOG | ||
---|---|---|
11 | 11 |
! = Update/Change |
12 | 12 |
=============================================================================== |
13 | 13 |
|
14 |
|
|
15 |
|
|
16 |
06 Jan-2013 Build 1849 Dietmar Woellbrink (Luisehahne) |
|
17 |
# typofix page_extended in admin/settings and admin/pages/ |
|
18 |
! Fill empty option modules dropdown in admin/pages/sections.php |
|
14 | 19 |
05 Jan-2013 Build 1848 Werner v.d.Decken(DarkViper) |
15 | 20 |
# fixed reinitialisation of class frontend in /index.php |
16 | 21 |
05 Jan-2013 Build 1847 Werner v.d.Decken(DarkViper) |
branches/2.8.x/wb/upgrade-script.php | ||
---|---|---|
507 | 507 |
/********************************************************** |
508 | 508 |
* - Adding page_extended to settings table |
509 | 509 |
*/ |
510 |
$aDebugMessage[] = "<span>Adding/updating page_extended to settings table</span>";
|
|
510 |
$aDebugMessage[] = "<span>Adding/updating page_extendet to settings table</span>";
|
|
511 | 511 |
$cfg = array( |
512 |
'page_extended' => (defined('PAGE_EXTENDED') ? PAGE_EXTENDED : 'true'),
|
|
512 |
'page_extendet' => (defined('PAGE_EXTENDET') ? PAGE_EXTENDET : 'true'),
|
|
513 | 513 |
); |
514 | 514 |
|
515 | 515 |
$aDebugMessage[] = (db_update_key_value( 'settings', $cfg ) ? " $OK<br />" : " $FAIL!<br />"); |
branches/2.8.x/wb/admin/skel/themes/htt/settings.htt | ||
---|---|---|
78 | 78 |
<div class="mbox sub-row"> |
79 | 79 |
<label class="setting_name">{TEXT_PAGE_EXTENDED}:</label> |
80 | 80 |
<span> |
81 |
<input class="radio" type="radio" name="page_extended" id="page_extended_true" value="true"{PAGE_EXTENDED_ENABLED} />
|
|
82 |
<label for="page_extended_true">{TEXT_ENABLED}</label>
|
|
81 |
<input class="radio" type="radio" name="page_extendet" id="page_extendet_true" value="true"{PAGE_EXTENDET_ENABLED} />
|
|
82 |
<label for="page_extendet_true">{TEXT_ENABLED}</label>
|
|
83 | 83 |
</span> |
84 | 84 |
<span> |
85 |
<input class="radio" type="radio" name="page_extended" id="page_extended_false" value="false"{PAGE_EXTENDED_DISABLED} />
|
|
86 |
<label for="page_extended_false">{TEXT_DISABLED}</label>
|
|
85 |
<input class="radio" type="radio" name="page_extendet" id="page_extendet_false" value="false"{PAGE_EXTENDET_DISABLED} />
|
|
86 |
<label for="page_extendet_false">{TEXT_DISABLED}</label>
|
|
87 | 87 |
</span> |
88 | 88 |
</div> |
89 | 89 |
|
branches/2.8.x/wb/admin/skel/themes/htt/pages_sections.htt | ||
---|---|---|
112 | 112 |
<tr> |
113 | 113 |
<td width="50%" valign="middle"> |
114 | 114 |
<select name="module" class="input_large"> |
115 |
<option value=""> </option>
|
|
115 |
<option value="">{TEXT_PLEASE_SELECT}</option>
|
|
116 | 116 |
<!-- BEGIN module_block --> |
117 | 117 |
<option value="{VALUE}"{SELECTED}>{NAME}</option> |
118 | 118 |
<!-- END module_block --> |
branches/2.8.x/wb/admin/skel/themes/htt/pages_settings.htt | ||
---|---|---|
41 | 41 |
<label for="page_title">{TEXT_PAGE_TITLE}:</label> |
42 | 42 |
<input type="text" id="page_title" name="page_title" value="{PAGE_TITLE}" /> |
43 | 43 |
</div> |
44 |
<div class="{PAGE_EXTENDED_HIDE}">
|
|
44 |
<div class="{PAGE_EXTENDET_HIDE}">
|
|
45 | 45 |
<label for="page_icon" >{TEXT_PAGE_ICON}:</label> |
46 | 46 |
<span class="overlib" {p_page_icon_dir} ><img src="{THEME_URL}/icons/help_16.png" alt="TEXT_PAGE_ICON" /></span> |
47 | 47 |
<select id="page_icon" name="page_icon"> |
... | ... | |
60 | 60 |
<span class="overlib" {p_menu_filename} ><img src="{THEME_URL}/icons/help_16.png" alt="TEXT_SEO_TITLE" /></span> |
61 | 61 |
<input type="text" id="seo_title" name="seo_title" value="{SEO_TITLE}" /> |
62 | 62 |
</div> |
63 |
<div class="{PAGE_EXTENDED_HIDE}">
|
|
63 |
<div class="{PAGE_EXTENDET_HIDE}">
|
|
64 | 64 |
<label for="menu_icon_0">{TEXT_MENU_ICON_0}:</label> |
65 | 65 |
<span class="overlib" {p_menu_icon0_dir} ><img src="{THEME_URL}/icons/help_16.png" alt="TEXT_MENU_ICON_0" /></span> |
66 | 66 |
<select id="menu_icon_0" name="menu_icon_0"> |
... | ... | |
70 | 70 |
<!-- END menu_icon0_list_block --> |
71 | 71 |
</select> |
72 | 72 |
</div> |
73 |
<div class="{PAGE_EXTENDED_HIDE}">
|
|
73 |
<div class="{PAGE_EXTENDET_HIDE}">
|
|
74 | 74 |
<label for="menu_icon_1" >{TEXT_MENU_ICON_1}:</label> |
75 | 75 |
<span class="overlib" {p_menu_icon1_dir} ><img src="{THEME_URL}/icons/help_16.png" alt="TEXT_MENU_ICON_1" /></span> |
76 | 76 |
<select id="menu_icon_1" name="menu_icon_1"> |
... | ... | |
244 | 244 |
<input type="submit" name="submit" value="{TEXT_SAVE}" /> |
245 | 245 |
<input type="submit" name="back_submit" value="{TEXT_SAVE_BACK}" /> |
246 | 246 |
<span style="padding-left: 2em;"><input type="reset" name="reset" value="{TEXT_RESET}" /> |
247 |
<input type="submit" name="extended_submit" value="{TEXT_EXTENDED}" /></span>
|
|
247 |
<input type="submit" name="extendet_submit" value="{TEXT_EXTENDED}" /></span>
|
|
248 | 248 |
</div> |
249 | 249 |
</div> |
250 | 250 |
</form> |
branches/2.8.x/wb/admin/pages/settings.php | ||
---|---|---|
137 | 137 |
$oTpl->set_block('page', 'main_block', 'main'); |
138 | 138 |
$oTpl->set_var('FTAN', $admin->getFTAN()); |
139 | 139 |
// $sShowIconDirText = $TEXT['EXPAND'].' '; |
140 |
$sql = 'SELECT `value` FROM `'.TABLE_PREFIX.'settings` WHERE `name` = \'page_exented\''; |
|
141 |
if($page_extend = $database->get_one($sql)) {} |
|
140 |
$sql = 'SELECT `value` FROM `'.TABLE_PREFIX.'settings` WHERE `name` = \'page_extendet\''; |
|
141 |
// if($page_extend = $database->get_one($sql)) {} |
|
142 |
$page_extend = (defined('PAGE_EXTENDET') ? filter_var(PAGE_EXTENDET, FILTER_VALIDATE_BOOLEAN, FILTER_NULL_ON_FAILURE) : false); |
|
143 |
$sShowIconDirText = ($page_extend==true) ? $TEXT['HIDE_ADVANCED'] : $TEXT['SHOW_ADVANCED']; |
|
142 | 144 |
|
143 |
$sShowIconDirText = ($page_extend=='1') ? $TEXT['HIDE_ADVANCED'] : $TEXT['SHOW_ADVANCED']; |
|
144 |
|
|
145 | 145 |
$oTpl->set_var(array( |
146 | 146 |
'PAGE_ID' => $aCurrentPage['page_id'], |
147 | 147 |
'PAGE_IDKEY' => $admin->getIDKEY($aCurrentPage['page_id']), |
... | ... | |
207 | 207 |
$sTemplate = ($aCurrentPage['template'] == '' ? DEFAULT_TEMPLATE : $aCurrentPage['template']); |
208 | 208 |
$sIconDir = str_replace('\\', '/', ((defined('PAGE_ICON_DIR') && PAGE_ICON_DIR != '') ? PAGE_ICON_DIR : MEDIA_DIRECTORY)); |
209 | 209 |
$sIconDir = str_replace('/*', '/'.$sTemplate, $sIconDir); |
210 |
$bIconDirHide = ($page_extend=='1') ? '' : 'hide';
|
|
210 |
$bIconDirHide = ($page_extend==true) ? '' : 'hide';
|
|
211 | 211 |
// $oTpl->set_var('ICON_DIR', WB_REL.$sIconDir); |
212 | 212 |
$sHelp = replaceVars($mLang->HELP_PAGE_IMAGE_DIR, array('icon_dir'=>WB_REL.$sIconDir ) ); |
213 | 213 |
|
... | ... | |
216 | 216 |
$sAccesFile = (($database->get_one($sql))); |
217 | 217 |
$sFilename = replaceVars($mLang->HELP_SEO_TITLE, array('filename'=>PAGES_DIRECTORY.$sAccesFile.PAGE_EXTENSION ) ); |
218 | 218 |
|
219 |
$oTpl->set_var('PAGE_EXTENDED_HIDE', $bIconDirHide);
|
|
219 |
$oTpl->set_var('PAGE_EXTENDET_HIDE', $bIconDirHide);
|
|
220 | 220 |
$oTpl->set_var('p_page_icon_dir', p($sHelp,$mLang->TEXT_PAGE_ICON_DIR)); |
221 | 221 |
$oTpl->set_var('p_menu_icon0_dir', p($sHelp,$mLang->TEXT_MENU_ICON_0_DIR)); |
222 | 222 |
$oTpl->set_var('p_menu_icon1_dir', p($sHelp,$mLang->TEXT_MENU_ICON_1_DIR)); |
branches/2.8.x/wb/admin/pages/settings_save.php | ||
---|---|---|
66 | 66 |
// After check print the header |
67 | 67 |
$admin->print_header(); |
68 | 68 |
|
69 |
if(isset($_POST['extended_submit'])) { |
|
70 |
$sql = 'SELECT `value` FROM `'.TABLE_PREFIX.'settings` WHERE `name` = \'page_exented\''; |
|
71 |
if( ($page_exented = $database->get_one($sql)) != '' ) { |
|
72 |
$sql = 'UPDATE '; |
|
73 |
$sql_where = 'WHERE `name` = \'page_exented\''; |
|
74 |
} else { |
|
75 |
$sql = 'INSERT INTO '; |
|
76 |
$sql_where = ''; |
|
77 |
} |
|
78 |
$val = (((($page_exented=='1') ? $page_exented : 0)) + 1) % 2; |
|
79 |
|
|
80 |
$sql .= '`'.TABLE_PREFIX.'settings` '; |
|
81 |
$sql .= 'SET `name` = \'page_exented\', '; |
|
82 |
$sql .= '`value` = \''.$val.'\' '.$sql_where; |
|
83 |
|
|
69 |
if(isset($_POST['extendet_submit'])) { |
|
70 |
// $val = (((($page_exented=='1') ? $page_exented : 0)) + 1) % 2; |
|
71 |
$val = (defined('PAGE_EXTENDET') ? filter_var(PAGE_EXTENDET, FILTER_VALIDATE_BOOLEAN, FILTER_NULL_ON_FAILURE) : false); |
|
72 |
$sql = (defined('PAGE_EXTENDET') ? 'UPDATE `' : 'INSERT INTO `') . TABLE_PREFIX . 'settings` SET '; |
|
73 |
$sql .= '`name`=\'page_extendet\', '; |
|
74 |
$sql .= '`value`=\''.($val ? 'false' : 'true').'\' '; |
|
75 |
$sql .= (defined('PAGE_EXTENDET') ? 'WHERE `name`=\'page_extendet\'' : ''); |
|
84 | 76 |
if($database->query($sql)) { |
85 | 77 |
// redirect to backend |
86 | 78 |
echo "<p style=\"text-align:center;\"> If the script</strong> could not be start automatically.\n" . |
branches/2.8.x/wb/admin/pages/sections.php | ||
---|---|---|
537 | 537 |
$sql = 'SELECT `section_id` FROM `'.TABLE_PREFIX.'sections` '; |
538 | 538 |
$sql .= 'WHERE `page_id` = '.$page_id.' AND `module` = "menu_link"'; |
539 | 539 |
$query_sections = $database->query($sql); |
540 |
$tpl->set_var('TEXT_PLEASE_SELECT', $TEXT['NONE']); |
|
540 | 541 |
if($query_sections->numRows() == 0) |
541 | 542 |
{ |
543 |
$tpl->set_var('TEXT_PLEASE_SELECT', $TEXT['PLEASE_SELECT']); |
|
542 | 544 |
// Modules list |
543 | 545 |
$sql = 'SELECT `name`,`directory`,`type` FROM `'.TABLE_PREFIX.'addons` '; |
544 | 546 |
$sql .= 'WHERE `type` = "module" AND `function` = "page" AND `directory` != "menu_link" '; |
branches/2.8.x/wb/admin/interface/timezones.php | ||
---|---|---|
1 |
<?php |
|
2 |
/** |
|
3 |
* |
|
4 |
* @category admin |
|
5 |
* @package interface |
|
6 |
* @author WebsiteBaker Project |
|
7 |
* @copyright 2004-2009, Ryan Djurovich |
|
8 |
* @copyright 2009-2011, Website Baker Org. e.V. |
|
9 |
* @link http://www.websitebaker2.org/ |
|
10 |
* @license http://www.gnu.org/licenses/gpl.html |
|
11 |
* @platform WebsiteBaker 2.8.x |
|
12 |
* @requirements PHP 5.2.2 and higher |
|
13 |
* @version $Id$ |
|
14 |
* @filesource $HeadURL$ |
|
15 |
* @lastmodified $Date$ |
|
16 |
* |
|
17 |
* Timezone list file |
|
18 |
* This file is used to generate a list of timezones for the user to select |
|
19 |
* |
|
20 |
*/ |
|
21 |
|
|
22 |
if(!defined('WB_URL')) { |
|
23 |
header('Location: ../index.php'); |
|
24 |
exit(0); |
|
25 |
} |
|
26 |
|
|
27 |
// Create array |
|
28 |
$TIMEZONES = array(); |
|
29 |
$actual_timezone = ( DEFAULT_TIMEZONE <> 0 ) ? DEFAULT_TIMEZONE/3600 : 0; |
|
30 |
|
|
31 |
$TIMEZONES['-12'] = 'GMT - 12 Hours'; |
|
32 |
$TIMEZONES['-11'] = 'GMT -11 Hours'; |
|
33 |
$TIMEZONES['-10'] = 'GMT -10 Hours'; |
|
34 |
$TIMEZONES['-9'] = 'GMT -9 Hours'; |
|
35 |
$TIMEZONES['-8'] = 'GMT -8 Hours'; |
|
36 |
$TIMEZONES['-7'] = 'GMT -7 Hours'; |
|
37 |
$TIMEZONES['-6'] = 'GMT -6 Hours'; |
|
38 |
$TIMEZONES['-5'] = 'GMT -5 Hours'; |
|
39 |
$TIMEZONES['-4'] = 'GMT -4 Hours'; |
|
40 |
$TIMEZONES['-3.5'] = 'GMT -3.5 Hours'; |
|
41 |
$TIMEZONES['-3'] = 'GMT -3 Hours'; |
|
42 |
$TIMEZONES['-2'] = 'GMT -2 Hours'; |
|
43 |
$TIMEZONES['-1'] = 'GMT -1 Hour'; |
|
44 |
$TIMEZONES['0'] = 'GMT'; |
|
45 |
$TIMEZONES['1'] = 'GMT +1 Hour'; |
|
46 |
$TIMEZONES['2'] = 'GMT +2 Hours'; |
|
47 |
$TIMEZONES['3'] = 'GMT +3 Hours'; |
|
48 |
$TIMEZONES['3.5'] = 'GMT +3.5 Hours'; |
|
49 |
$TIMEZONES['4'] = 'GMT +4 Hours'; |
|
50 |
$TIMEZONES['4.5'] = 'GMT +4.5 Hours'; |
|
51 |
$TIMEZONES['5'] = 'GMT +5 Hours'; |
|
52 |
$TIMEZONES['5.5'] = 'GMT +5.5 Hours'; |
|
53 |
$TIMEZONES['6'] = 'GMT +6 Hours'; |
|
54 |
$TIMEZONES['6.5'] = 'GMT +6.5 Hours'; |
|
55 |
$TIMEZONES['7'] = 'GMT +7 Hours'; |
|
56 |
$TIMEZONES['8'] = 'GMT +8 Hours'; |
|
57 |
$TIMEZONES['9'] = 'GMT +9 Hours'; |
|
58 |
$TIMEZONES['9.5'] = 'GMT +9.5 Hours'; |
|
59 |
$TIMEZONES['10'] = 'GMT +10 Hours'; |
|
60 |
$TIMEZONES['11'] = 'GMT +11 Hours'; |
|
61 |
$TIMEZONES['12'] = 'GMT +12 Hours'; |
|
62 |
$TIMEZONES['13'] = 'GMT +13 Hours'; |
|
63 |
|
|
64 |
// Add "System Default" to list (if we need to) |
|
65 |
if(isset($user_time) && $user_time == true) |
|
66 |
{ |
|
67 |
if(isset($TEXT['SYSTEM_DEFAULT'])) |
|
68 |
{ |
|
69 |
$TIMEZONES['system_default'] = $TIMEZONES[$actual_timezone].' ('.$TEXT['SYSTEM_DEFAULT'].')'; |
|
70 |
} else { |
|
71 |
$TIMEZONES['system_default'] = $TIMEZONES[$actual_timezone].' (System Default)'; |
|
72 |
} |
|
73 |
} |
|
74 |
|
|
75 |
// Reverse array so "System Default" is at the top |
|
76 |
$TIMEZONES = array_reverse($TIMEZONES, true); |
|
77 |
|
|
78 |
?> |
|
1 |
<?php |
|
2 |
/** |
|
3 |
* |
|
4 |
* @category admin |
|
5 |
* @package interface |
|
6 |
* @author WebsiteBaker Project |
|
7 |
* @copyright 2004-2009, Ryan Djurovich |
|
8 |
* @copyright 2009-2011, Website Baker Org. e.V. |
|
9 |
* @link http://www.websitebaker2.org/ |
|
10 |
* @license http://www.gnu.org/licenses/gpl.html |
|
11 |
* @platform WebsiteBaker 2.8.x |
|
12 |
* @requirements PHP 5.2.2 and higher |
|
13 |
* @version $Id$ |
|
14 |
* @filesource $HeadURL$ |
|
15 |
* @lastmodified $Date$ |
|
16 |
* |
|
17 |
* Timezone list file |
|
18 |
* This file is used to generate a list of timezones for the user to select |
|
19 |
* |
|
20 |
*/ |
|
21 |
|
|
22 |
if(!defined('WB_URL')) { |
|
23 |
header('Location: ../index.php'); |
|
24 |
exit(0); |
|
25 |
} |
|
26 |
|
|
27 |
// Create array |
|
28 |
$TIMEZONES = array(); |
|
29 |
$actual_timezone = ( DEFAULT_TIMEZONE <> 0 ) ? DEFAULT_TIMEZONE/3600 : 0; |
|
30 |
|
|
31 |
$TIMEZONES['-12'] = 'GMT - 12 Hours'; |
|
32 |
$TIMEZONES['-11'] = 'GMT -11 Hours'; |
|
33 |
$TIMEZONES['-10'] = 'GMT -10 Hours'; |
|
34 |
$TIMEZONES['-9'] = 'GMT -9 Hours'; |
|
35 |
$TIMEZONES['-8'] = 'GMT -8 Hours'; |
|
36 |
$TIMEZONES['-7'] = 'GMT -7 Hours'; |
|
37 |
$TIMEZONES['-6'] = 'GMT -6 Hours'; |
|
38 |
$TIMEZONES['-5'] = 'GMT -5 Hours'; |
|
39 |
$TIMEZONES['-4'] = 'GMT -4 Hours'; |
|
40 |
$TIMEZONES['-3.5'] = 'GMT -3.5 Hours'; |
|
41 |
$TIMEZONES['-3'] = 'GMT -3 Hours'; |
|
42 |
$TIMEZONES['-2'] = 'GMT -2 Hours'; |
|
43 |
$TIMEZONES['-1'] = 'GMT -1 Hour'; |
|
44 |
$TIMEZONES['0'] = 'GMT'; |
|
45 |
$TIMEZONES['1'] = 'GMT +1 Hour'; |
|
46 |
$TIMEZONES['2'] = 'GMT +2 Hours'; |
|
47 |
$TIMEZONES['3'] = 'GMT +3 Hours'; |
|
48 |
$TIMEZONES['3.5'] = 'GMT +3.5 Hours'; |
|
49 |
$TIMEZONES['4'] = 'GMT +4 Hours'; |
|
50 |
$TIMEZONES['4.5'] = 'GMT +4.5 Hours'; |
|
51 |
$TIMEZONES['5'] = 'GMT +5 Hours'; |
|
52 |
$TIMEZONES['5.5'] = 'GMT +5.5 Hours'; |
|
53 |
$TIMEZONES['6'] = 'GMT +6 Hours'; |
|
54 |
$TIMEZONES['6.5'] = 'GMT +6.5 Hours'; |
|
55 |
$TIMEZONES['7'] = 'GMT +7 Hours'; |
|
56 |
$TIMEZONES['8'] = 'GMT +8 Hours'; |
|
57 |
$TIMEZONES['9'] = 'GMT +9 Hours'; |
|
58 |
$TIMEZONES['9.5'] = 'GMT +9.5 Hours'; |
|
59 |
$TIMEZONES['10'] = 'GMT +10 Hours'; |
|
60 |
$TIMEZONES['11'] = 'GMT +11 Hours'; |
|
61 |
$TIMEZONES['12'] = 'GMT +12 Hours'; |
|
62 |
$TIMEZONES['13'] = 'GMT +13 Hours'; |
|
63 |
|
|
64 |
// Add "System Default" to list (if we need to) |
|
65 |
if(isset($user_time) && $user_time == true) |
|
66 |
{ |
|
67 |
if(isset($TEXT['SYSTEM_DEFAULT'])) |
|
68 |
{ |
|
69 |
$TIMEZONES['system_default'] = $TIMEZONES[$actual_timezone].' ('.$TEXT['SYSTEM_DEFAULT'].')'; |
|
70 |
} else { |
|
71 |
$TIMEZONES['system_default'] = $TIMEZONES[$actual_timezone].' (System Default)'; |
|
72 |
} |
|
73 |
} |
|
74 |
|
|
75 |
// Reverse array so "System Default" is at the top |
|
76 |
$TIMEZONES = array_reverse($TIMEZONES, true); |
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', '1848');
|
|
54 |
if(!defined('REVISION')) define('REVISION', '1849');
|
|
55 | 55 |
if(!defined('SP')) define('SP', ''); |
branches/2.8.x/wb/admin/settings/save.php | ||
---|---|---|
212 | 212 |
$settings = array(); |
213 | 213 |
$old_settings = array(); |
214 | 214 |
// Query current settings in the db, then loop through them to get old values |
215 |
$sql = 'SELECT `name`, `value` FROM `'.TABLE_PREFIX.'settings`'; |
|
215 |
$sql = 'SELECT `name`, `value` FROM `'.TABLE_PREFIX.'settings`';
|
|
216 | 216 |
$sql .= 'ORDER BY `name`'; |
217 | 217 |
|
218 | 218 |
if($res_settings = $database->query($sql)) { |
... | ... | |
225 | 225 |
$value = isset($_POST[$setting_name]) ? $value : $old_settings[$setting_name] ; |
226 | 226 |
switch ($setting_name) { |
227 | 227 |
case 'default_timezone': |
228 |
$value=$value*60*60; |
|
228 |
$value = (is_numeric($value) ? $value : 0); |
|
229 |
$value = ( ($value >= -12 && $value <= 13) ? $value :0 ) * 3600; |
|
229 | 230 |
$passed = true; |
230 | 231 |
break; |
231 | 232 |
case 'string_dir_mode': |
branches/2.8.x/wb/admin/settings/index.php | ||
---|---|---|
37 | 37 |
'wbmail_signature' => defined('WBMAIL_SIGNATURE') ? WBMAIL_SIGNATURE : '', |
38 | 38 |
'confirmed_registration' => (defined('CONFIRMED_REGISTRATION') ? CONFIRMED_REGISTRATION : '0'), |
39 | 39 |
'modules_upgrade_list' => (defined('MODULES_UPGRADE_LIST') ? MODULES_UPGRADE_LIST : ''), |
40 |
'page_extendet' => (defined('PAGE_EXTENDET') ? PAGE_EXTENDET : 'true'), |
|
40 | 41 |
); |
41 | 42 |
db_update_key_value( 'settings', $cfg ); |
42 | 43 |
|
... | ... | |
254 | 255 |
} |
255 | 256 |
|
256 | 257 |
// Work-out if page extended feature is enabled |
257 |
if(defined('PAGE_EXTENDED') && PAGE_EXTENDED == true)
|
|
258 |
if(defined('PAGE_EXTENDET') && PAGE_EXTENDET == true)
|
|
258 | 259 |
{ |
259 | 260 |
$oTpl->set_var(array( |
260 |
'PAGE_EXTENDED_ENABLED' => $checked,
|
|
261 |
'PAGE_EXTENDED_DISABLED' => '',
|
|
261 |
'PAGE_EXTENDET_ENABLED' => $checked,
|
|
262 |
'PAGE_EXTENDET_DISABLED' => '',
|
|
262 | 263 |
)); |
263 | 264 |
} else { |
264 | 265 |
$oTpl->set_var(array( |
265 |
'PAGE_EXTENDED_DISABLED' => $checked,
|
|
266 |
'PAGE_EXTENDED_ENABLED' => '',
|
|
266 |
'PAGE_EXTENDET_DISABLED' => $checked,
|
|
267 |
'PAGE_EXTENDET_ENABLED' => '',
|
|
267 | 268 |
)); |
268 | 269 |
} |
269 | 270 |
|
branches/2.8.x/wb/admin/preferences/index.php | ||
---|---|---|
60 | 60 |
} |
61 | 61 |
} |
62 | 62 |
// Insert default timezone values |
63 |
$user_time = true; |
|
64 | 63 |
include_once( ADMIN_PATH.'/interface/timezones.php' ); |
65 | 64 |
$template->set_block('main_block', 'timezone_list_block', 'timezone_list'); |
66 | 65 |
foreach( $TIMEZONES AS $hour_offset => $title ) |
... | ... | |
71 | 70 |
$template->parse('timezone_list', 'timezone_list_block', true); |
72 | 71 |
} |
73 | 72 |
// Insert date format list |
73 |
$user_time = true; |
|
74 | 74 |
include_once( ADMIN_PATH.'/interface/date_formats.php' ); |
75 | 75 |
$template->set_block('main_block', 'date_format_list_block', 'date_format_list'); |
76 | 76 |
foreach( $DATE_FORMATS AS $format => $title ) |
branches/2.8.x/wb/account/htt/preferences.htt | ||
---|---|---|
34 | 34 |
<td>{TEXT_TIMEZONE}:</td> |
35 | 35 |
<td class="input"> |
36 | 36 |
<select name="timezone" style="width: 98%;"> |
37 |
<option value="-20">{MOD_PREFERENCE_PLEASE_SELECT}</option>
|
|
37 |
<option value="0">{MOD_PREFERENCE_PLEASE_SELECT}</option> |
|
38 | 38 |
<!-- BEGIN timezone_list_block --> |
39 | 39 |
<option value="{VALUE}" {SELECTED}>{NAME}</option> |
40 | 40 |
<!-- END timezone_list_block --> |
branches/2.8.x/wb/account/preferences_form.php | ||
---|---|---|
10 | 10 |
* @platform WebsiteBaker 2.8.x |
11 | 11 |
* @requirements PHP 5.2.2 and higher |
12 | 12 |
* @version $Id$ |
13 |
* @filesource $HeadURL$
|
|
13 |
* @filesource $HeadURL$
|
|
14 | 14 |
* @lastmodified $Date$ |
15 | 15 |
* |
16 | 16 |
*/ |
... | ... | |
162 | 162 |
|
163 | 163 |
// default, if no information from client available |
164 | 164 |
$sAutoLanguage = DEFAULT_LANGUAGE; |
165 |
// detect client language |
|
166 |
//if(isset($_SERVER['HTTP_ACCEPT_LANGUAGE'])) { |
|
167 |
// if(preg_match('/([a-z]{2})(?:-[a-z]{2})*/i', strtolower($_SERVER['HTTP_ACCEPT_LANGUAGE']), $matches)) { |
|
168 |
// $sAutoLanguage = strtoupper($matches[1]); |
|
169 |
// } |
|
170 |
//} |
|
171 | 165 |
|
172 | 166 |
//$sAutoLanguage = 'FR'; |
173 | 167 |
$aLangUsed = array_flip(explode(',',$wb->GetLanguagesInUsed())); |
... | ... | |
222 | 216 |
$template->parse('date_format_list', 'date_format_list_block', true); |
223 | 217 |
} |
224 | 218 |
|
219 |
$user_time = true; |
|
225 | 220 |
// Insert time format list |
226 | 221 |
$template->set_block('main_block', 'time_format_list_block', 'time_format_list'); |
227 | 222 |
foreach($TIME_FORMATS AS $format => $title) |
branches/2.8.x/wb/install/save.php | ||
---|---|---|
417 | 417 |
." (57, 'groups_updated', '".time()."')," |
418 | 418 |
." (58, 'wbmail_signature', '')," |
419 | 419 |
." (59, 'confirmed_registration', '1')," |
420 |
." (60, 'page_extended', 'true'),"
|
|
420 |
." (60, 'page_extendet', 'true'),"
|
|
421 | 421 |
." (61, 'modules_upgrade_list', 'news,wysiwyg,form')," |
422 | 422 |
." (62, 'system_locked', '0')"; |
423 | 423 |
if(!$database->query($settings_rows)) { set_error($database->get_error()); } |
Also available in: Unified diff
! Fill empty option modules dropdown in admin/pages/sections.php