Index: branches/2.8.x/CHANGELOG
===================================================================
--- branches/2.8.x/CHANGELOG (revision 1781)
+++ branches/2.8.x/CHANGELOG (revision 1782)
@@ -13,6 +13,8 @@
+11 Oct-2012 Build 1782 Dietmar Woellbrink (Luisehahne)
++ add maintance modus in backend
10 Oct-2012 Build 1781 Dietmar Woellbrink (Luisehahne)
! fixed form modul (Tks to Ruebenwurzel)
! Send forgotten Theme CSS in Revision 1780
Index: branches/2.8.x/wb/admin/groups/groups_list.inc.php
===================================================================
--- branches/2.8.x/wb/admin/groups/groups_list.inc.php (revision 1781)
+++ branches/2.8.x/wb/admin/groups/groups_list.inc.php (revision 1782)
@@ -25,7 +25,7 @@
*/
function show_grouplist($admin)
{
-// global $TEXT, $MESSAGE, $MENU, $HEADING;
+ global $TEXT, $MESSAGE, $MENU, $HEADING;
$database = WbDatabase::getInstance();
$mLang = ModLanguage::getInstance();
// Create new template object for the modify/remove section
@@ -140,7 +140,7 @@
$tpl->set_var(array(
'TEXT_MODIFY' => ($admin->get_permission('groups_modify') == true) ? $mLang->TEXT_MODIFY : $mLang->TEXT_VIEW,
'TEXT_DELETE' => $mLang->TEXT_DELETE,
- 'CONFIRM_DELETE' => $mLang->MESSAGE_GROUPS_CONFIRM_DELETE
+ 'CONFIRM_DELETE' => $MESSAGE['GROUPS_CONFIRM_DELETE']
));
// Parse template object
Index: branches/2.8.x/wb/admin/skel/themes/htt/maintance.htt
===================================================================
--- branches/2.8.x/wb/admin/skel/themes/htt/maintance.htt (nonexistent)
+++ branches/2.8.x/wb/admin/skel/themes/htt/maintance.htt (revision 1782)
@@ -0,0 +1,57 @@
+
+
+
+ CMS WebsiteBaker | {PAGE_TITLE}
+
+
+
+
+
+
+
+
+ OFF-LINE - {WB_URL}
+
+
+
{PAGE_TITLE}
+
{BE_PATIENT}
+
+
{CHECK_BACK}
+
+
+
+
+
+
+
Index: branches/2.8.x/wb/admin/pages/settings_save.php
===================================================================
--- branches/2.8.x/wb/admin/pages/settings_save.php (revision 1781)
+++ branches/2.8.x/wb/admin/pages/settings_save.php (revision 1782)
@@ -75,9 +75,9 @@
$template = preg_replace('/[^a-z0-9_-]/i', "", $admin->get_post('template')); // fix secunia 2010-93-3
$template = (($template == DEFAULT_TEMPLATE ) ? '' : $template);
$target = preg_replace("/\W/", "", $admin->get_post('target'));
-$aAdminGroups = (isset($_POST['admin_groups']) ? $_POST['admin_groups'] : array(1));
+$aAdminGroups = (isset($_POST['admin_groups']) ? $_POST['admin_groups'] : array('1'));
$aAdminUsers = (isset($_POST['admin_users']) ? $_POST['admin_users'] : array());
-$aViewingGroups = (isset($_POST['viewing_groups']) ? $_POST['viewing_groups'] : array(1));
+$aViewingGroups = (isset($_POST['viewing_groups']) ? $_POST['viewing_groups'] : array('1'));
$aViewingUsers = (isset($_POST['viewing_users']) ? $_POST['viewing_users'] : array());
$searching = intval($admin->get_post('searching'));
$language = strtoupper($admin->get_post('language'));
Index: branches/2.8.x/wb/admin/pages/languages/EN.php
===================================================================
--- branches/2.8.x/wb/admin/pages/languages/EN.php (revision 1781)
+++ branches/2.8.x/wb/admin/pages/languages/EN.php (revision 1782)
@@ -75,8 +75,8 @@
$HELP['PAGE_CODE'] .= 'If you have put a side into another language, confirm from this list the matching entry of the standard language
';
$HELP['PAGE_CODE'] .= 'Example:Impressum choose Default Language EN: Imprint
';
-$HELP['SEO_TITLE'] = 'Folder and Filename for this Accessfile {{filename}}
';
-$HELP['SEO_TITLE'] .= 'In WebsiteBaker version 2.8.4 you have the possibility to create a Seo friendly Accessfile independent of Menutitle..
';
+$HELP['SEO_TITLE'] = 'Path and file name of the access file of this page. {{filename}}
';
+$HELP['SEO_TITLE'] .= 'In this field you can define a well readable, expressive name for the access file, regardless of menu title or page title. This is also usable well to create SEO friendly links..
';
$HELP['SEO_TITLE'] .= 'For Example: Pressemitteilung Pressemitteilung and Downloads pressemitteilungen-and-downloads.php
';
Index: branches/2.8.x/wb/admin/pages/languages/DE.php
===================================================================
--- branches/2.8.x/wb/admin/pages/languages/DE.php (revision 1781)
+++ branches/2.8.x/wb/admin/pages/languages/DE.php (revision 1782)
@@ -73,8 +73,8 @@
$HELP['PAGE_CODE'] .= 'Wenn sie eine Seite in einer anderen Sprache angelegt haben, bestätigen Sie aus dieser Liste den dazugehörigen Eintrag der Standardsprache.
';
$HELP['PAGE_CODE'] .= 'Beispiel:Imprint zuweisen an Standardsprache DE: Impressum
';
-$HELP['SEO_TITLE'] = 'Verzeichnis und Dateiname dieser Zugriffsdatei {{filename}}
';
-$HELP['SEO_TITLE'] .= 'In der WebsiteBaker Version 2.8.4 haben Sie die Möglichkeit, unabhängig vom Menutitel eine Seo freundliche Zugriffsdatei anzulegen.
';
+$HELP['SEO_TITLE'] = 'Verzeichnis und Dateiname der Zugriffsdatei dieser Seite{{filename}}
';
+$HELP['SEO_TITLE'] .= 'In diesem Feld können Sie unabhängig von Menü- oder Seitentitel einen gut lesbaren, aussagekräftigen Dateinamen für die Zugriffsdatei festlegen. Dieser ist auch gut zur Erstellung SEO-freundlicher Links verwendbar.
';
$HELP['SEO_TITLE'] .= 'Beispiel: Pressemitteilung Pressemitteilung und Downloads pressemitteilungen-und-downloads.php
';
Index: branches/2.8.x/wb/admin/interface/version.php
===================================================================
--- branches/2.8.x/wb/admin/interface/version.php (revision 1781)
+++ branches/2.8.x/wb/admin/interface/version.php (revision 1782)
@@ -51,5 +51,5 @@
// check if defined to avoid errors during installation (redirect to admin panel fails if PHP error/warnings are enabled)
if(!defined('VERSION')) define('VERSION', '2.8.3');
-if(!defined('REVISION')) define('REVISION', '1781');
+if(!defined('REVISION')) define('REVISION', '1782');
if(!defined('SP')) define('SP', '');
Index: branches/2.8.x/wb/admin/settings/locking.php
===================================================================
--- branches/2.8.x/wb/admin/settings/locking.php (nonexistent)
+++ branches/2.8.x/wb/admin/settings/locking.php (revision 1782)
@@ -0,0 +1,43 @@
+get_user_id() == 1)
+{
+ $val = (((int)(defined('SYSTEM_LOCKED') ? SYSTEM_LOCKED : 0)) + 1) % 2;
+ $sql = 'SELECT COUNT(`setting_id`) FROM `'.TABLE_PREFIX.'settings` WHERE `name` = \'system_locked\'';
+ if($database->get_one($sql))
+ {
+ $sql = 'UPDATE ';
+ $sql_where = 'WHERE `name` = \'system_locked\'';
+ } else {
+ $sql = 'INSERT INTO ';
+ $sql_where = '';
+ }
+ $sql .= '`'.TABLE_PREFIX.'settings` ';
+ $sql .= 'SET `name` = \'system_locked\', ';
+ $sql .= '`value` = \''.$val.'\' '.$sql_where;
+ $database->query($sql);
+}
+// redirect to backend
+header('Location: ' . ADMIN_URL . '/index.php');
+exit();
Property changes on: branches/2.8.x/wb/admin/settings/locking.php
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+Date Author Id Revision HeadURL
\ No newline at end of property
Index: branches/2.8.x/wb/admin/preferences/save.php
===================================================================
--- branches/2.8.x/wb/admin/preferences/save.php (revision 1781)
+++ branches/2.8.x/wb/admin/preferences/save.php (revision 1782)
@@ -52,7 +52,7 @@
$date_format = (array_key_exists($date_format_key, $DATE_FORMATS) ? $date_format : 'system_default');
$date_format = ($date_format == 'system_default' ? '' : $date_format);
unset($DATE_FORMATS);
-// time_format must be a key from /interface/time_formats
+// time_format must be a key from /interface/time_formats
$time_format = $admin->get_post('time_format');
$time_format_key = str_replace(' ', '|', $time_format);
$user_time = true;
Index: branches/2.8.x/wb/admin/login/forgot/index.php
===================================================================
--- branches/2.8.x/wb/admin/login/forgot/index.php (revision 1781)
+++ branches/2.8.x/wb/admin/login/forgot/index.php (revision 1782)
@@ -3,7 +3,7 @@
*
* @category admin
* @package login
- * @author Ryan Djurovich, WebsiteBaker Project
+ * @author Ryan Djurovich (2004-2009), WebsiteBaker Project
* @copyright 2009-2012, WebsiteBaker Org. e.V.
* @link http://www.websitebaker2.org/
* @license http://www.gnu.org/licenses/gpl.html
@@ -21,8 +21,11 @@
}
// Include the language file
require(WB_PATH.'/languages/'.DEFAULT_LANGUAGE.'.php');
+
// Include the database class file and initiate an object
-require(WB_PATH.'/framework/class.admin.php');
+//if(!class_exists('frontend', false)){ require_once(WB_PATH.'/framework/class.frontend.php'); }
+//$admin = new frontend();
+if(!class_exists('admin', false)){ require_once(WB_PATH.'/framework/class.admin.php'); }
$admin = new admin('Start', 'start', false, false);
// Get the website title
@@ -50,7 +53,7 @@
if($time_diff < 2) {
// Tell the user that their password cannot be reset more than once per hour
- $message = $MESSAGE['FORGOT_PASS']['ALREADY_RESET'];
+ $message = $MESSAGE['FORGOT_PASS_ALREADY_RESET'];
} else {
@@ -76,20 +79,20 @@
} else {
// Setup email to send
$mail_to = $email;
- $mail_subject = $MESSAGE['SIGNUP2']['SUBJECT_LOGIN_INFO'];
+ $mail_subject = $MESSAGE['SIGNUP2_SUBJECT_LOGIN_INFO'];
// Replace placeholders from language variable with values
$search = array('{LOGIN_DISPLAY_NAME}', '{LOGIN_WEBSITE_TITLE}', '{LOGIN_NAME}', '{LOGIN_PASSWORD}');
$replace = array($results_array['display_name'], WEBSITE_TITLE, $results_array['username'], $new_pass);
- $mail_message = str_replace($search, $replace, $MESSAGE['SIGNUP2']['BODY_LOGIN_FORGOT']);
+ $mail_message = str_replace($search, $replace, $MESSAGE['SIGNUP2_BODY_LOGIN_FORGOT']);
// Try sending the email
if($admin->mail(SERVER_EMAIL,$mail_to,$mail_subject,$mail_message)) {
- $message = $MESSAGE['FORGOT_PASS']['PASSWORD_RESET'];
+ $message = $MESSAGE['FORGOT_PASS_PASSWORD_RESET'];
$display_form = false;
} else {
$database->query("UPDATE ".TABLE_PREFIX."users SET password = '".$old_pass."' WHERE user_id = '".$results_array['user_id']."'");
- $message = $MESSAGE['FORGOT_PASS']['CANNOT_EMAIL'];
+ $message = $MESSAGE['FORGOT_PASS_CANNOT_EMAIL'];
}
}
@@ -97,7 +100,7 @@
} else {
// Email doesn't exist, so tell the user
- $message = $MESSAGE['FORGOT_PASS']['EMAIL_NOT_FOUND'];
+ $message = $MESSAGE['FORGOT_PASS_EMAIL_NOT_FOUND'];
// and delete the wrong Email
$email = '';
}
@@ -107,7 +110,7 @@
}
if(!isset($message)) {
- $message = $MESSAGE['FORGOT_PASS']['NO_DATA'];
+ $message = $MESSAGE['FORGOT_PASS_NO_DATA'];
$message_color = '000000';
} else {
$message_color = 'FF0000';
Index: branches/2.8.x/wb/admin/login/index.php
===================================================================
--- branches/2.8.x/wb/admin/login/index.php (revision 1781)
+++ branches/2.8.x/wb/admin/login/index.php (revision 1782)
@@ -15,12 +15,15 @@
*
*/
- require('../../config.php');
// Include the configuration file
if(!defined('WB_URL') && file_exists(realpath('../../config.php'))) {
+ require('../../config.php');
}
-require_once(WB_PATH."/framework/class.login.php");
+//require_once(WB_PATH."/framework/class.login.php");
+if(!class_exists('login', false)){ require_once(WB_PATH.'/framework/class.login.php'); }
+if(!class_exists('frontend', false)){ require_once(WB_PATH.'/framework/class.frontend.php'); }
+
if(defined('SMART_LOGIN') AND SMART_LOGIN == 'enabled') {
// Generate username field name
$username_fieldname = 'username_';
@@ -40,7 +43,7 @@
$password_fieldname = 'password';
}
-$admin = new admin('Start', '', false, false);
+$admin = new frontend();
$WarnUrl = str_replace(WB_PATH,WB_URL,$admin->correct_theme_source('warning.html'));
Index: branches/2.8.x/wb/framework/class.admin.php
===================================================================
--- branches/2.8.x/wb/framework/class.admin.php (revision 1781)
+++ branches/2.8.x/wb/framework/class.admin.php (revision 1782)
@@ -1,9 +1,9 @@
section_name = $section_name;
- $this->section_permission = $section_permission;
- // Authenticate the user for this application
- if($auto_auth == true)
- {
- // First check if the user is logged-in
- if($this->is_authenticated() == false)
+ if( $section_name != '##skip##' )
+ {
+ global $database, $MESSAGE;
+ // Specify the current applications name
+ $this->section_name = $section_name;
+ $this->section_permission = $section_permission;
+ $maintance = ( defined('SYSTEM_LOCKED') && (SYSTEM_LOCKED==true) ? true : false );
+ // Authenticate the user for this application
+ if( ($auto_auth == true) )
+ {
+ // First check if the user is logged-in
+ if($this->is_authenticated() == false)
+ {
+ header('Location: '.ADMIN_URL.'/login/index.php');
+ exit(0);
+ }
+ // Now check if they are allowed in this section
+ if($this->get_permission($section_permission) == false) {
+ die($MESSAGE['ADMIN_INSUFFICIENT_PRIVELLIGES']);
+ }
+ }
+
+ if( ($maintance==true) || $this->get_session('USER_ID')!= 1 )
{
- header('Location: '.ADMIN_URL.'/login/index.php');
- exit(0);
- }
+ // check for show maintenance screen and terminate if needed
+ $this->ShowMaintainScreen('locked');
+ }
- // Now check if they are allowed in this section
- if($this->get_permission($section_permission) == false) {
- die($MESSAGE['ADMIN_INSUFFICIENT_PRIVELLIGES']);
- }
- }
+ // Check if the backend language is also the selected language. If not, send headers again.
+ $sql = 'SELECT `language` FROM `'.TABLE_PREFIX.'users` ';
+ $sql .= 'WHERE `user_id`='.(int)$this->get_user_id();
+ $get_user_language = @$database->query($sql);
+ $user_language = ($get_user_language) ? $get_user_language->fetchRow() : '';
+ // prevent infinite loop if language file is not XX.php (e.g. DE_du.php)
+ $user_language = substr($user_language[0],0,2);
+ // obtain the admin folder (e.g. /admin)
+ $admin_folder = str_replace(WB_PATH, '', ADMIN_PATH);
- // Check if the backend language is also the selected language. If not, send headers again.
- $sql = 'SELECT `language` FROM `'.TABLE_PREFIX.'users` ';
- $sql .= 'WHERE `user_id`='.(int)$this->get_user_id();
- $get_user_language = @$database->query($sql);
- $user_language = ($get_user_language) ? $get_user_language->fetchRow() : '';
- // prevent infinite loop if language file is not XX.php (e.g. DE_du.php)
- $user_language = substr($user_language[0],0,2);
- // obtain the admin folder (e.g. /admin)
- $admin_folder = str_replace(WB_PATH, '', ADMIN_PATH);
- if((LANGUAGE != $user_language) && file_exists(WB_PATH .'/languages/' .$user_language .'.php')
- && strpos($_SERVER['PHP_SELF'],$admin_folder.'/') !== false) {
- // check if page_id is set
- $page_id_url = (isset($_GET['page_id'])) ? '&page_id=' .(int) $_GET['page_id'] : '';
- $section_id_url = (isset($_GET['section_id'])) ? '§ion_id=' .(int) $_GET['section_id'] : '';
- if(isset($_SERVER['QUERY_STRING']) && $_SERVER['QUERY_STRING'] != '') { // check if there is an query-string
- header('Location: '.$_SERVER['PHP_SELF'] .'?lang='.$user_language .$page_id_url .$section_id_url.'&'.$_SERVER['QUERY_STRING']);
- } else {
- header('Location: '.$_SERVER['PHP_SELF'] .'?lang='.$user_language .$page_id_url .$section_id_url);
- }
- exit();
- }
+ if( (LANGUAGE != $user_language) && file_exists(WB_PATH .'/languages/' .$user_language .'.php')
+ && strpos($_SERVER['SCRIPT_NAME'],$admin_folder.'/') !== false) {
+ // check if page_id is set
+ $page_id_url = (isset($_GET['page_id'])) ? '&page_id=' .(int) $_GET['page_id'] : '';
+ $section_id_url = (isset($_GET['section_id'])) ? '§ion_id=' .(int) $_GET['section_id'] : '';
+ // check if there is an query-string
+ if(isset($_SERVER['QUERY_STRING']) && $_SERVER['QUERY_STRING'] != '') {
+ header('Location: '.$_SERVER['SCRIPT_NAME'] .'?lang='.$user_language .$page_id_url .$section_id_url.'&'.$_SERVER['QUERY_STRING']);
+ } else {
+ header('Location: '.$_SERVER['SCRIPT_NAME'] .'?lang='.$user_language .$page_id_url .$section_id_url);
+ }
+ exit();
+ }
- // Auto header code
- if($auto_header == true) {
- $this->print_header();
- }
+ // Auto header code
+ if($auto_header == true) {
+ $this->print_header();
+ }
+ }
}
- }
// Print the admin header
/**
- * admin::print_header()
*
* @param string $body_tags
* @return void
@@ -143,6 +150,8 @@
$row = @$result->fetchRow();
if($row) $view_url .= PAGES_DIRECTORY .$row['link']. PAGE_EXTENSION;
}
+
+ $HelpUrl = ((strtolower(LANGUAGE)!='de') ? '/en/help.php' : '/de/hilfe.php');
$sServerAdress = isset($_SERVER['SERVER_ADDR']) ? $_SERVER['SERVER_ADDR'] : '127.0.0.1';
$header_template->set_var( array(
'SECTION_FORGOT' => $MENU['FORGOT'],
@@ -166,7 +175,7 @@
'START_CLASS' => 'start',
'TITLE_START' => $TEXT['READ_MORE'],
'TITLE_VIEW' => $TEXT['WEBSITE'],
- 'TITLE_HELP' => $MENU['HELP'],
+ 'TITLE_HELP' => 'WebsiteBaker '.$MENU['HELP'],
'URL_VIEW' => $view_url,
'TITLE_LOGOUT' => $MENU['LOGIN'],
'LOGIN_DISPLAY_HIDDEN' => !$this->is_authenticated() ? 'hidden' : '',
@@ -174,17 +183,30 @@
'LOGIN_LINK' => $_SERVER['SCRIPT_NAME'],
'LOGIN_ICON' => 'login',
'START_ICON' => 'blank',
- 'URL_HELP' => 'http://www.websitebaker.org/',
+ 'URL_HELP' => 'http://www.websitebaker2.org'.$HelpUrl,
'BACKEND_MODULE_CSS' => $this->register_backend_modfiles('css'), // adds backend.css
'BACKEND_MODULE_JS' => $this->register_backend_modfiles('js') // adds backend.js
)
);
+ $header_template->set_block('header_block', 'maintenance_block', 'maintenance');
+ if($this->get_user_id() == 1)
+ {
+ $sys_locked = (((int)(defined('SYSTEM_LOCKED') ? SYSTEM_LOCKED : 0)) == 1);
+ $header_template->set_var('MAINTENANCE_MODE', ($sys_locked ? $TEXT['MAINTENANCE_OFF'] : $TEXT['MAINTENANCE_ON']));
+ $header_template->set_var('MAINTENANCE_ICON', THEME_URL.'/images/'.($sys_locked ? 'lock' : 'unlock').'.png');
+ $header_template->set_var('MAINTAINANCE_URL', ADMIN_URL.'/settings/locking.php');
+ $header_template->parse('maintenance', 'maintenance_block', true);
+ }else
+ {
+ $header_template->set_block('maintenance_block', '');
+ }
// Create the menu
+ $UrlLang = ((strtolower(LANGUAGE)!='de') ? 'en' : strtolower(LANGUAGE));
if(!$this->is_authenticated())
{
- $header_template->set_var('STYLE', 'login');
- $menu = array(
+ $header_template->set_var('STYLE', 'login');
+ $menu = array(
// array('http://www.websitebaker.org/', '_blank', 'WebsiteBaker Home', 'help', 0),
// array($view_url, '_blank', $TEXT['FRONTEND'], '', 0),
// array(ADMIN_URL.'/login/index.php', '', $MENU['LOGIN'], '', 0)
@@ -201,7 +223,8 @@
'TITLE_START' => $MENU['START']
)
);
- // @array ( $url, $target, $title, $page_permission, $ppermission_required )
+
+ // @array ( $url, $target, $title, $page_permission, $permission_required )
$menu = array(
// array(ADMIN_URL.'/index.php', '', $MENU['START'], 'start', 1 ),
array(ADMIN_URL.'/pages/index.php', '', $MENU['PAGES'], 'pages', 1),
@@ -212,9 +235,10 @@
array(ADMIN_URL.'/settings/index.php', '', $MENU['SETTINGS'], 'settings', 1),
array(ADMIN_URL.'/admintools/index.php', '', $MENU['ADMINTOOLS'], 'admintools', 1),
array(ADMIN_URL.'/access/index.php', '', $MENU['ACCESS'], 'access', 1),
+// array('http://addons.websitebaker2.org/', '', 'WB-Addons', 'preferences', 1),
+// array('http://template.websitebaker2.org/', '', 'WB-Template', 'preferences', 1),
// array('http://www.websitebaker.org/', '_blank', 'WebsiteBaker Home', '', 0),
// array(ADMIN_URL.'/logout/index.php', '', $MENU['LOGOUT'], '', 0)
-
);
}
Index: branches/2.8.x/wb/framework/class.login.php
===================================================================
--- branches/2.8.x/wb/framework/class.login.php (revision 1781)
+++ branches/2.8.x/wb/framework/class.login.php (revision 1782)
@@ -3,8 +3,8 @@
*
* @category framework
* @package backend login
- * @author Ryan Djurovich, WebsiteBaker Project
- * @copyright 2009-2012, Website Baker Org. e.V.
+ * @author Ryan Djurovich (2004-2009), WebsiteBaker Project
+ * @copyright 2009-2012, WebsiteBaker Org. e.V.
* @link http://www.websitebaker2.org/
* @license http://www.gnu.org/licenses/gpl.html
* @platform WebsiteBaker 2.8.x
@@ -24,7 +24,7 @@
define('LOGIN_CLASS_LOADED', true);
// Load the other required class files if they are not already loaded
-require_once(WB_PATH."/framework/class.admin.php");
+if(!class_exists('admin', false)){ include(WB_PATH.'/framework/class.admin.php'); }
// Get WB version
require_once(ADMIN_PATH.'/interface/version.php');
@@ -140,7 +140,7 @@
$sql = 'SELECT * FROM `'.$this->users_table.'` ';
$sql .= 'WHERE `username`=\''.$loginname.'\' AND `password`=\''.$this->password.'\' AND `active`=1';
$results = $database->query($sql);
- $results_array = $results->fetchRow();
+ $results_array = $results->fetchRow(MYSQL_ASSOC);
$num_rows = $results->numRows();
if($num_rows == 1) {
$user_id = $results_array['user_id'];
@@ -188,6 +188,8 @@
$_SESSION['TEMPLATE_PERMISSIONS'] = array();
$_SESSION['GROUP_NAME'] = array();
+
+
$first_group = true;
foreach (explode(",", $this->get_session('GROUPS_ID')) as $cur_group_id)
{
@@ -196,28 +198,33 @@
$results_array = $results->fetchRow();
$_SESSION['GROUP_NAME'][$cur_group_id] = $results_array['name'];
// Set system permissions
- if($results_array['system_permissions'] != '') {
+ if( $results_array['system_permissions'] != '' ) {
$_SESSION['SYSTEM_PERMISSIONS'] = array_merge($_SESSION['SYSTEM_PERMISSIONS'], explode(',', $results_array['system_permissions']));
}
// Set module permissions
- if($results_array['module_permissions'] != '') {
+ if( $results_array['module_permissions'] != '' ) {
if ($first_group) {
- $_SESSION['MODULE_PERMISSIONS'] = explode(',', $results_array['module_permissions']);
- } else {
- $_SESSION['MODULE_PERMISSIONS'] = array_intersect($_SESSION['MODULE_PERMISSIONS'], explode(',', $results_array['module_permissions']));
+ $_SESSION['MODULE_PERMISSIONS'] = explode(',', $results_array['module_permissions']);
+ } else {
+ $_SESSION['MODULE_PERMISSIONS'] = array_intersect($_SESSION['MODULE_PERMISSIONS'], explode(',', $results_array['module_permissions']));
}
}
// Set template permissions
if($results_array['template_permissions'] != '') {
if ($first_group) {
- $_SESSION['TEMPLATE_PERMISSIONS'] = explode(',', $results_array['template_permissions']);
- } else {
- $_SESSION['TEMPLATE_PERMISSIONS'] = array_intersect($_SESSION['TEMPLATE_PERMISSIONS'], explode(',', $results_array['template_permissions']));
+ $_SESSION['TEMPLATE_PERMISSIONS'] = explode(',', $results_array['template_permissions']);
+ } else {
+ $_SESSION['TEMPLATE_PERMISSIONS'] = array_intersect($_SESSION['TEMPLATE_PERMISSIONS'], explode(',', $results_array['template_permissions']));
}
}
$first_group = false;
}
+ if( $this->ami_group_member('1')) {
+ $_SESSION['MODULE_PERMISSIONS'] = array();
+ $_SESSION['TEMPLATE_PERMISSIONS'] = array();
+ }
+
// Update the users table with current ip and timestamp
$get_ts = time();
$get_ip = $_SERVER['REMOTE_ADDR'];
Index: branches/2.8.x/wb/framework/class.wb.php
===================================================================
--- branches/2.8.x/wb/framework/class.wb.php (revision 1781)
+++ branches/2.8.x/wb/framework/class.wb.php (revision 1782)
@@ -3,7 +3,7 @@
*
* @category framework
* @package frontend
- * @author Ryan Djurovich, WebsiteBaker Project
+ * @author Ryan Djurovich (2004-2009), WebsiteBaker Project
* @copyright 2009-2012, WebsiteBaker Org. e.V.
* @link http://www.websitebaker2.org/
* @license http://www.gnu.org/licenses/gpl.html
@@ -31,12 +31,72 @@
{
public $password_chars = 'a-zA-Z0-9\_\-\!\#\*\+\@\$\&\:'; // General initialization function
+
// performed when frontend or backend is loaded.
-
public function __construct($mode = SecureForm::FRONTEND) {
parent::__construct($mode);
}
+
+ /**
+ *
+ *
+ * @param mixed $lang
+ * @param mixed $level
+ * @param mixed $parent
+ * @return
+ */
+ public function GetLanguagesPages ( $lang, $level, $parent ) {
+ global $database;
+ $page = array();
+ $sql =
+ 'SELECT `language`,`visibility`,`viewing_groups`,`viewing_users`,`language`,`position`, '.
+ '`page_id`,`level`,`parent`,`root_parent`,`page_code`,`link` '.
+ 'FROM `'.TABLE_PREFIX.'pages` '.
+ 'WHERE `level`=\''.$level.'\' '.
+ 'AND `language`=\''.$lang['language'].'\' '.
+ 'AND `visibility`!=\'none\' '.
+ 'AND `visibility`!=\'hidden\' '.
+ 'AND `parent`=\''.$parent.'\' '.
+ 'AND `root_parent`=`page_id` '.
+ 'ORDER BY `position`';
+ if($oPage = $database->query($sql))
+ {
+ $page = $oPage->fetchRow(MYSQL_ASSOC);
+ }
+ return $page;
+ }
+
+ /**
+ *
+ *
+ * @return
+ */
+ public function GetLanguagesInUsed ( ) {
+ global $database;
+ $retVal = '';
+ $page = array();
+ $sql =
+ 'SELECT DISTINCT `language` '.
+ 'FROM `'.TABLE_PREFIX.'pages` '.
+ 'WHERE `level`= \'0\' '.
+ 'AND `visibility`!=\'none\' '.
+ 'AND `visibility`!=\'hidden\' '.
+ 'ORDER BY `position`';
+
+ if($oRes = $database->query($sql))
+ {
+ while($lang = $oRes->fetchRow(MYSQL_ASSOC))
+ {
+ $page = $this->GetLanguagesPages ( $lang, 0, 0 );
+ if(!$this->page_is_visible($page)) {continue;}
+ $retVal .= $page['language'].',';
+ }
+ }
+ return trim($retVal,',');
+ }
+
+
/* ****************
* check if one or more group_ids are in both group_lists
*
@@ -429,7 +489,97 @@
}
return $retval;
}
+/*
+ * @param string $type: 'locked'(default) or 'new'
+ * @return void: terminates application
+ * @description: 'locked' >> Show maintenance screen and terminate, if system is locked
+ * 'new' >> Show 'new site under construction'(former print_under_construction)
+ */
+ public function ShowMaintainScreen($type = 'locked')
+ {
+ global $database, $MESSAGE;
+ $CHECK_BACK = $MESSAGE['GENERIC_PLEASE_CHECK_BACK_SOON'];
+ $BE_PATIENT = '';
+ $LANGUAGE = strtolower((isset($_SESSION['LANGUAGE']) ? $_SESSION['LANGUAGE'] : LANGUAGE ));
+ $show_screen = false;
+ if($type == 'locked')
+ {
+ $curr_user = (intval(isset($_SESSION['USER_ID']) ? $_SESSION['USER_ID'] : 0) ) ;
+ if( (defined('SYSTEM_LOCKED') && (int)SYSTEM_LOCKED == 1) && ($curr_user != 1))
+ {
+ header($_SERVER['SERVER_PROTOCOL'].' 503 Service Unavailable');
+ // first kick logged users out of the system
+ // delete all remember keys from table 'user' except user_id=1
+ $sql = 'UPDATE `'.TABLE_PREFIX.'users` SET `remember_key`=\'\' ';
+ $sql .= 'WHERE `user_id`<>1';
+ $database->query($sql);
+ // delete remember key-cookie if set
+ if (isset($_COOKIE['REMEMBER_KEY'])) {
+ setcookie('REMEMBER_KEY', '', time() - 3600, '/');
+ }
+ // overwrite session array
+ $_SESSION = array();
+ // delete session cookie if set
+ if (ini_get("session.use_cookies")) {
+ $params = session_get_cookie_params();
+ setcookie(session_name(), '', time() - 42000, $params["path"],
+ $params["domain"], $params["secure"], $params["httponly"]
+ );
+ }
+ // delete the session itself
+ session_destroy();
+ $PAGE_TITLE = $MESSAGE['GENERIC_WEBSITE_LOCKED'];
+ $BE_PATIENT = $MESSAGE['GENERIC_BE_PATIENT'];
+ $PAGE_ICON = 'system';
+ $show_screen = true;
+ }
+ } else {
+ header($_SERVER['SERVER_PROTOCOL'].' 503 Service Unavailable');
+ $PAGE_TITLE = $MESSAGE['GENERIC_WEBSITE_UNDER_CONSTRUCTION'];
+ $PAGE_ICON = 'negative';
+ $show_screen = true;
+ }
+ if($show_screen)
+ {
+ $sMaintanceFile = $this->correct_theme_source('maintance.htt');
+ if(file_exists($sMaintanceFile))
+ {
+ $tpl = new Template(dirname( $sMaintanceFile ));
+ $tpl->set_file( 'page', 'maintance.htt' );
+ $tpl->set_block( 'page', 'main_block', 'main' );
+
+ if(defined('DEFAULT_CHARSET'))
+ {
+ $charset=DEFAULT_CHARSET;
+ } else {
+ $charset='utf-8';
+ }
+ $tpl->set_var( 'PAGE_TITLE', $MESSAGE['GENERIC_WEBSITE_UNDER_CONSTRUCTION'] );
+ $tpl->set_var( 'CHECK_BACK', $MESSAGE['GENERIC_PLEASE_CHECK_BACK_SOON'] );
+ $tpl->set_var( 'CHARSET', $charset );
+ $tpl->set_var( 'WB_URL', WB_URL );
+ $tpl->set_var( 'BE_PATIENT', $BE_PATIENT );
+ $tpl->set_var( 'THEME_URL', THEME_URL );
+ $tpl->set_var( 'PAGE_ICON', $PAGE_ICON);
+ $tpl->set_var( 'LANGUAGE', strtolower(LANGUAGE));
+ $tpl->parse( 'main', 'main_block', false );
+ $tpl->pparse( 'output', 'page' );
+ exit();
+ } else {
+ require_once(WB_PATH.'/languages/'.DEFAULT_LANGUAGE.'.php');
+ echo '
+ '.$MESSAGE['GENERIC_WEBSITE_UNDER_CONSTRUCTION'].'
+
+ '.$MESSAGE['GENERIC_WEBSITE_UNDER_CONSTRUCTION'].' 
+ 
- 
- 
- 
+