aboutsummaryrefslogtreecommitdiffhomepage
path: root/index.php
diff options
context:
space:
mode:
Diffstat (limited to 'index.php')
-rw-r--r--index.php21
1 files changed, 9 insertions, 12 deletions
diff --git a/index.php b/index.php
index 1e255583..e392e501 100644
--- a/index.php
+++ b/index.php
@@ -1146,9 +1146,12 @@ function renderPage($conf, $pluginManager, $LINKSDB)
1146 $PAGE->assign('theme', $conf->get('resource.theme')); 1146 $PAGE->assign('theme', $conf->get('resource.theme'));
1147 $PAGE->assign('theme_available', ThemeUtils::getThemes($conf->get('resource.raintpl_tpl'))); 1147 $PAGE->assign('theme_available', ThemeUtils::getThemes($conf->get('resource.raintpl_tpl')));
1148 $PAGE->assign('redirector', $conf->get('redirector.url')); 1148 $PAGE->assign('redirector', $conf->get('redirector.url'));
1149 list($timezone_form, $timezone_js) = generateTimeZoneForm($conf->get('general.timezone')); 1149 list($continents, $cities) = generateTimeZoneData(
1150 $PAGE->assign('timezone_form', $timezone_form); 1150 timezone_identifiers_list(),
1151 $PAGE->assign('timezone_js',$timezone_js); 1151 $conf->get('general.timezone')
1152 );
1153 $PAGE->assign('continents', $continents);
1154 $PAGE->assign('cities', $cities);
1152 $PAGE->assign('private_links_default', $conf->get('privacy.default_private_links', false)); 1155 $PAGE->assign('private_links_default', $conf->get('privacy.default_private_links', false));
1153 $PAGE->assign('session_protection_disabled', $conf->get('security.session_protection_disabled', false)); 1156 $PAGE->assign('session_protection_disabled', $conf->get('security.session_protection_disabled', false));
1154 $PAGE->assign('enable_rss_permalinks', $conf->get('feed.rss_permalinks', false)); 1157 $PAGE->assign('enable_rss_permalinks', $conf->get('feed.rss_permalinks', false));
@@ -1969,16 +1972,10 @@ function install($conf)
1969 exit; 1972 exit;
1970 } 1973 }
1971 1974
1972 // Display config form:
1973 list($timezone_form, $timezone_js) = generateTimeZoneForm();
1974 $timezone_html = '';
1975 if ($timezone_form != '') {
1976 $timezone_html = '<tr><td><b>Timezone:</b></td><td>'.$timezone_form.'</td></tr>';
1977 }
1978
1979 $PAGE = new PageBuilder($conf); 1975 $PAGE = new PageBuilder($conf);
1980 $PAGE->assign('timezone_html',$timezone_html); 1976 list($continents, $cities) = generateTimeZoneData(timezone_identifiers_list(), date_default_timezone_get());
1981 $PAGE->assign('timezone_js',$timezone_js); 1977 $PAGE->assign('continents', $continents);
1978 $PAGE->assign('cities', $cities);
1982 $PAGE->renderPage('install'); 1979 $PAGE->renderPage('install');
1983 exit; 1980 exit;
1984} 1981}