![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
index 6f0b1699f14b17136ef4a1d5d00c24081f3544e6..96f29ae922a3d60733d1a3a5b62d83e0770b7825 100644 (file)
--- a/gosa-core/html/index.php
+++ b/gosa-core/html/index.php
*/
function displayLogin()
{
- global $smarty,$message,$config,$ssl,$error_collector;
+ global $smarty,$message,$config,$ssl,$error_collector, $BASE_DIR;
error_reporting(E_ALL | E_STRICT);
+
+ /* Check theme compatibility */
+ $theme= $config->get_cfg_value('theme', 'default');
+ if (file_exists("$BASE_DIR/ihtml/themes/$theme/blacklist")) {
+ $blocks= file("$BASE_DIR/ihtml/themes/$theme/blacklist");
+ foreach ($blocks as $block) {
+ if (preg_match('/'.preg_quote($block).'/', $_SERVER['HTTP_USER_AGENT'])) {
+ die(sprintf(_("Your browser (%s) is blacklisted for the current theme."), $block));
+ }
+ }
+ }
+
/* Fill template with required values */
$username = "";
if(isset($_POST["username"])){
$username= $_POST["username"];
}
+ $smarty->assign ("logo", image(get_template_path("images/logo.png")));
$smarty->assign ('date', gmdate("D, d M Y H:i:s"));
$smarty->assign ('username', $username);
$smarty->assign ('personal_img', get_template_path('images/login-head.png'));
/* Displasy SSL mode warning? */
if ($ssl != "" && $config->get_cfg_value('warnssl') == 'true'){
- $smarty->assign ("ssl", _("Warning").": <a style=\"color:red;\" href=\"$ssl\">"._("Session is not encrypted!")."</a>");
+ $smarty->assign ("ssl", sprintf(_("This session is not ecrypted. Click %s to enter an encrypted session."), "<a href=\"$ssl\">"._("here")."</a>"));
} else {
$smarty->assign ("ssl", "");
- }
+ }
if(!$config->check_session_lifetime()){
- $smarty->assign ("lifetime", _("Warning").": ".
- _("The session lifetime configured in your gosa.conf will be overridden by php.ini settings."));
+ $smarty->assign ("lifetime", _("The session lifetime configured in your gosa.conf will be overridden by php.ini settings."));
}else{
$smarty->assign ("lifetime", "");
}
$smarty->assign("php_errors", "");
}
$smarty->assign("msg_dialogs", msg_dialog::get_dialogs());
+ $smarty->assign("iePngWorkaround", $config->get_cfg_value("iePngWorkaround","false" ) == "true");
+ $smarty->assign("usePrototype", "false");
$smarty->display (get_template_path('headers.tpl'));
$smarty->assign("version",get_gosa_version());
$smarty->display(get_template_path('login.tpl'));
/* Check for java script */
if(isset($_POST['javascript']) && $_POST['javascript'] == "true") {
- session::set('js',TRUE);
+ session::global_set('js',TRUE);
}elseif(isset($_POST['javascript'])) {
- session::set('js',FALSE);
+ session::global_set('js',FALSE);
}
/* Check if gosa.conf (.CONFIG_FILE) is accessible */
/* Parse configuration file */
$config= new config(CONFIG_DIR."/".CONFIG_FILE, $BASE_DIR);
-session::set('DEBUGLEVEL',$config->get_cfg_value('DEBUGLEVEL'));
+session::global_set('DEBUGLEVEL',$config->get_cfg_value('DEBUGLEVEL'));
if ($_SERVER["REQUEST_METHOD"] != "POST"){
@DEBUG (DEBUG_CONFIG, __LINE__, __FUNCTION__, __FILE__, $config->data, "config");
}
/* Enable compressed output */
-if ($config->get_cfg_value("compressed") != ""){
+if ($config->get_cfg_value("sendCompressedOutput") != ""){
ob_start("ob_gzhandler");
}
/* Set template compile directory */
-$smarty->compile_dir= $config->get_cfg_value("compile", '/var/spool/gosa');
+$smarty->compile_dir= $config->get_cfg_value("templateCompileDirectory", '/var/spool/gosa');
/* Check for compile directory */
if (!(is_dir($smarty->compile_dir) && is_writable($smarty->compile_dir))){
/* Do we have htaccess authentification enabled? */
$htaccess_authenticated= FALSE;
-if ($config->get_cfg_value("htaccess_auth") == "true" ){
+if ($config->get_cfg_value("htaccessAuthentication") == "true" ){
if (!isset($_SERVER['REMOTE_USER'])){
msg_dialog::display(_("Configuration error"), _("There is a problem with the authentication setup!"), FATAL_ERROR_DIALOG);
exit;
@@ -237,8 +251,8 @@ if (($_SERVER["REQUEST_METHOD"] == "POST" && isset($_POST['login'])) || $htacces
$message= "";
/* Destroy old sessions, they cause a successfull login to relog again ...*/
- if(session::is_set('_LAST_PAGE_REQUEST')){
- session::set('_LAST_PAGE_REQUEST',time());
+ if(session::global_is_set('_LAST_PAGE_REQUEST')){
+ session::global_set('_LAST_PAGE_REQUEST',time());
}
if (!$htaccess_authenticated){
@@ -255,13 +269,9 @@ if (($_SERVER["REQUEST_METHOD"] == "POST" && isset($_POST['login'])) || $htacces
}
/* Check for schema file presence */
- #TODO: these three lines should go to the class_config.inc, shouldn't they?
- if(!isset($config->data['MAIN']['SCHEMACHECK'])){
- $config->data['MAIN']['SCHEMACHECK'] = "true";
- }
if ($config->get_cfg_value("schemaCheck") == "true"){
- $recursive = ($config->get_cfg_value("recursive") == "true");
- $tls = ($config->get_cfg_value("tls") == "true");
+ $recursive = ($config->get_cfg_value("ldapFollowReferrals") == "true");
+ $tls = ($config->get_cfg_value("ldapTLS") == "true");
if(!count($ldap->get_objectclasses())){
msg_dialog::display(_("LDAP error"), _("Cannot detect information about the installed LDAP schema!"), ERROR_DIALOG);
@@ -269,8 +279,8 @@ if (($_SERVER["REQUEST_METHOD"] == "POST" && isset($_POST['login'])) || $htacces
exit() ;
}else{
$cfg = array();
- $cfg['admin'] = $config->current['ADMIN'];
- $cfg['password'] = $config->current['PASSWORD'];
+ $cfg['admin'] = $config->current['ADMINDN'];
+ $cfg['password'] = $config->current['ADMINPASSWORD'];
$cfg['connection']= $config->current['SERVER'];
$cfg['tls'] = $tls;
$str = check_schema($cfg, $config->get_cfg_value("rfc2307bis") == "true");
@@ -297,7 +307,7 @@ if (($_SERVER["REQUEST_METHOD"] == "POST" && isset($_POST['login'])) || $htacces
$ok= true;
if (!$htaccess_authenticated){
$username= $_POST["username"];
- if (!ereg("^[@A-Za-z0-9_.-]+$", $username)){
+ if (!preg_match("/^[@A-Za-z0-9_.-]+$/", $username)){
$message= _("Please specify a valid username!");
$ok= false;
} elseif (mb_strlen($_POST["password"], 'UTF-8') == 0){
@@ -322,23 +332,24 @@ if (($_SERVER["REQUEST_METHOD"] == "POST" && isset($_POST['login'])) || $htacces
if ($ui === NULL || !$ui){
$message= _("Please check the username/password combination.");
$smarty->assign ('nextfield', 'password');
- new log("security","login","",array(),"Authentication failed for user \"$username\"") ;
+ session::global_set('config',$config);
+ new log("security","login","",array(),"Authentication failed for user \"$username\"");
} else {
/* Remove all locks of this user */
del_user_locks($ui->dn);
/* Save userinfo and plugin structure */
- session::set('ui',$ui);
- session::set('session_cnt',0);
+ session::global_set('ui',$ui);
+ session::global_set('session_cnt',0);
/* Let GOsa trigger a new connection for each POST, save
config to session. */
$config->get_departments();
$config->make_idepartments();
- session::set('config',$config);
+ session::global_set('config',$config);
/* Restore filter settings from cookie, if available */
- if($config->get_cfg_value("save_filter") == "true"){
+ if($config->get_cfg_value("storeFilterSettings") == "true"){
if(isset($_COOKIE['GOsa_Filter_Settings']) || isset($HTTP_COOKIE_VARS['GOsa_Filter_Settings'])){
@@ -352,7 +363,7 @@ if (($_SERVER["REQUEST_METHOD"] == "POST" && isset($_POST['login'])) || $htacces
$cookie_vars= array("MultiDialogFilters","CurrentMainBase","plug");
foreach($cookie_vars as $var){
if(isset($cookie[$var])){
- session::set($var,$cookie[$var]);
+ session::global_set($var,$cookie[$var]);
}
}
if(isset($cookie['plug'])){
@@ -363,7 +374,7 @@ if (($_SERVER["REQUEST_METHOD"] == "POST" && isset($_POST['login'])) || $htacces
}
/* are we using accountexpiration */
- if ($config->get_cfg_value("account_expiration") == "true"){
+ if ($config->get_cfg_value("handleExpiredAccounts") == "true"){
$expired= ldap_expired_account($config, $ui->dn, $ui->username);
if ($expired == 1){
$smarty->assign ("message", $message);
-/* Displasy SSL mode warning? */
-if ($ssl != "" && $config->get_cfg_value('WARNSSL') == 'true'){
- $smarty->assign ("ssl", "<b>"._("Warning").":<\/b> "._("Session will not be encrypted.")." <a style=\"color:red;\" href=\"$ssl\"><b>"._("Enter SSL session")."<\/b></a>!");
-} else {
- $smarty->assign ("ssl", "");
-}
-
/* Translation of cookie-warning. Whether to display it, is determined by JavaScript */
-$smarty->assign ("cookies", "<b>"._("Warning").":<\/b> "._("Your browser has cookies disabled. Please enable cookies and reload this page before logging in!"));
+$smarty->assign ("cookies", _("Your browser has cookies disabled. Please enable cookies and reload this page before logging in!"));
/* Generate server list */
$servers= array();