X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=gosa-core%2Fhtml%2Findex.php;h=96f29ae922a3d60733d1a3a5b62d83e0770b7825;hb=ab302c2472a7c64058e4f0d7aa11a5cc639ad7ea;hp=7aa0ca77b6c406237df1802ba99c5eed93aace34;hpb=18ddf97c7467b397a389cbb0cec81cc7302c5fa0;p=gosa.git diff --git a/gosa-core/html/index.php b/gosa-core/html/index.php index 7aa0ca77b..96f29ae92 100644 --- a/gosa-core/html/index.php +++ b/gosa-core/html/index.php @@ -1,21 +1,23 @@ 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/personal.png')); + $smarty->assign ('personal_img', get_template_path('images/login-head.png')); $smarty->assign ('password_img', get_template_path('images/password.png')); $smarty->assign ('directory_img', get_template_path('images/ldapserver.png')); @@ -46,15 +66,14 @@ function displayLogin() $smarty->assign ("message", $message); /* Displasy SSL mode warning? */ - if ($ssl != "" && $config->data['MAIN']['WARNSSL'] == 'true'){ - $smarty->assign ("ssl", _("Warning").": "._("Session is not encrypted!").""); + if ($ssl != "" && $config->get_cfg_value('warnssl') == 'true'){ + $smarty->assign ("ssl", sprintf(_("This session is not ecrypted. Click %s to enter an encrypted session."), ""._("here")."")); } 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", ""); } @@ -82,14 +101,21 @@ function displayLogin() } else { $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')); exit(); } +/***************************************************************************** + * M A I N * + *****************************************************************************/ + /* Set error handler to own one, initialize time calculation and start session. */ session::start(); @@ -120,40 +146,36 @@ session::set('errors',""); /* 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 */ if (!is_readable(CONFIG_DIR."/".CONFIG_FILE)){ - msg_dialog::display(_("Configuration accessibility"),sprintf(_("GOsa configuration %s/%s is not readable. Aborted."), CONFIG_DIR,CONFIG_FILE),FATAL_ERROR_DIALOG); + msg_dialog::display(_("Configuration error"),sprintf(_("GOsa configuration %s/%s is not readable. Aborted."), CONFIG_DIR,CONFIG_FILE),FATAL_ERROR_DIALOG); exit(); } /* Parse configuration file */ $config= new config(CONFIG_DIR."/".CONFIG_FILE, $BASE_DIR); -session::set('DEBUGLEVEL',$config->data['MAIN']['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 (isset($config->data['MAIN']['COMPRESSED']) && preg_match('/^(true|on)$/i', $config->data['MAIN']['COMPRESSED'])){ +if ($config->get_cfg_value("sendCompressedOutput") != ""){ ob_start("ob_gzhandler"); } /* Set template compile directory */ -if (isset ($config->data['MAIN']['COMPILE'])){ - $smarty->compile_dir= $config->data['MAIN']['COMPILE']; -} else { - $smarty->compile_dir= '/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))){ - msg_dialog::display(_("Smarty"),sprintf(_("Directory '%s' specified as compile directory is not accessible!"), - $smarty->compile_dir),FATAL_ERROR_DIALOG); + msg_dialog::display(_("Smarty error"),sprintf(_("Directory '%s' specified as compile directory is not accessible!"), + $smarty->compile_dir),FATAL_ERROR_DIALOG); exit(); } @@ -194,14 +216,14 @@ if (!isset($_SERVER['HTTPS']) || } /* If SSL is forced, just forward to the SSL enabled site */ -if ($config->data['MAIN']['FORCESSL'] == 'true' && $ssl != ''){ +if ($config->get_cfg_value("forcessl") == 'true' && $ssl != ''){ header ("Location: $ssl"); exit; } /* Do we have htaccess authentification enabled? */ $htaccess_authenticated= FALSE; -if (isset($config->data['MAIN']['HTACCESS_AUTH']) && preg_match('/^(yes|true)$/i', $config->data['MAIN']['HTACCESS_AUTH'])){ +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; @@ -229,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){ @@ -241,18 +263,15 @@ if (($_SERVER["REQUEST_METHOD"] == "POST" && isset($_POST['login'])) || $htacces /* Admin-logon and verify */ $ldap = $config->get_ldap_link(); if (is_null($ldap) || (is_int($ldap) && $ldap == 0)){ - msg_dialog::display(_("LDAP error"), _("Can't bind to LDAP. Please contact the system administrator."), ERROR_DIALOG); + msg_dialog::display(_("LDAP error"), msgPool::ldaperror($ldap->get_error(), $this->dn, 0, get_class())); displayLogin(); exit(); } /* Check for schema file presence */ - if(!isset($config->data['MAIN']['SCHEMA_CHECK'])){ - $config->data['MAIN']['SCHEMA_CHECK'] = "true"; - } - if(isset($config->data['MAIN']['SCHEMA_CHECK'])&&preg_match("/true/i",$config->data['MAIN']['SCHEMA_CHECK'])){ - $recursive = (isset($config->current['RECURSIVE']) && $config->current['RECURSIVE'] == "true"); - $tls = (isset($config->current['TLS']) && $config->current['TLS'] == "true"); + if ($config->get_cfg_value("schemaCheck") == "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); @@ -260,15 +279,15 @@ 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,isset($config->current['RFC2307BIS']) && preg_match("/(true|yes|on|1)/i",$config->current['RFC2307BIS'])); + $str = check_schema($cfg, $config->get_cfg_value("rfc2307bis") == "true"); $checkarr = array(); foreach($str as $tr){ if(isset($tr['IS_MUST_HAVE']) && !$tr['STATUS']){ - msg_dialog::display(_("LDAP error"), _("Your ldap setup contains old schema definitions:")."

".$tr['MSG']."", ERROR_DIALOG); + msg_dialog::display(_("LDAP error"), _("Your LDAP setup contains old schema definitions:")."

".$tr['MSG']."", ERROR_DIALOG); displayLogin(); exit(); } @@ -277,18 +296,18 @@ if (($_SERVER["REQUEST_METHOD"] == "POST" && isset($_POST['login'])) || $htacces } /* Check for locking area */ - $ldap->cat($config->current['CONFIG'], array("dn")); + $ldap->cat($config->get_cfg_value("config"), array("dn")); $attrs= $ldap->fetch(); if (!count ($attrs)){ $ldap->cd($config->current['BASE']); - $ldap->create_missing_trees($config->current['CONFIG']); + $ldap->create_missing_trees($config->get_cfg_value("config")); } /* Check for valid input */ $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){ @@ -297,7 +316,7 @@ if (($_SERVER["REQUEST_METHOD"] == "POST" && isset($_POST['login'])) || $htacces $ok= false; } } - + if ($ok) { /* Login as user, initialize user ACL's */ @@ -313,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(isset($config->data['MAIN']['SAVE_FILTER']) && preg_match("/true/",$config->data['MAIN']['SAVE_FILTER'])){ + if($config->get_cfg_value("storeFilterSettings") == "true"){ if(isset($_COOKIE['GOsa_Filter_Settings']) || isset($HTTP_COOKIE_VARS['GOsa_Filter_Settings'])){ @@ -343,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'])){ @@ -354,13 +374,11 @@ if (($_SERVER["REQUEST_METHOD"] == "POST" && isset($_POST['login'])) || $htacces } /* are we using accountexpiration */ - if((isset($config->data['MAIN']['ACCOUNT_EXPIRATION'])) && - preg_match('/true/i', $config->data['MAIN']['ACCOUNT_EXPIRATION'])){ - + if ($config->get_cfg_value("handleExpiredAccounts") == "true"){ $expired= ldap_expired_account($config, $ui->dn, $ui->username); if ($expired == 1){ - $message= _("Account locked. Please contact your system administrator."); + $message= _("Account locked. Please contact your system administrator!"); $smarty->assign ('nextfield', 'password'); new log("security","login","",array(),"Account for user \"$username\" has expired") ; } elseif ($expired == 3){ @@ -392,7 +410,7 @@ if (($_SERVER["REQUEST_METHOD"] == "POST" && isset($_POST['login'])) || $htacces /* Fill template with required values */ $smarty->assign ('date', gmdate("D, d M Y H:i:s")); $smarty->assign ('username', $username); -$smarty->assign ('personal_img', get_template_path('images/personal.png')); +$smarty->assign ('personal_img', get_template_path('images/login-head.png')); $smarty->assign ('password_img', get_template_path('images/password.png')); $smarty->assign ('directory_img', get_template_path('images/ldapserver.png')); @@ -403,16 +421,8 @@ if (!isset($message)){ $smarty->assign ("message", $message); -/* Displasy SSL mode warning? */ -if ($ssl != "" && $config->data['MAIN']['WARNSSL'] == 'true'){ - $smarty->assign ("ssl", ""._("Warning").":<\/b> "._("Session will not be encrypted.")." "._("Enter SSL session")."<\/b>!"); -} else { - $smarty->assign ("ssl", ""); -} - /* Translation of cookie-warning. Whether to display it, is determined by JavaScript */ -$smarty->assign ("cookies", ""._("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(); @@ -448,7 +458,7 @@ if (session::is_set('errors') && session::get('errors') != ""){ $smarty->assign("focus", $focus); displayLogin(); -// vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler: +// vim:tabstop=2:expandtab:shiftwidth=2:softtabstop=2:filetype=php:syntax:ruler: ?>