![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/html/index.php b/html/index.php
index 9877161c96ac60495c7d8eba693a47098718cca0..7977dfab03cb46087fa67931475669ce426df3d3 100644 (file)
--- a/html/index.php
+++ b/html/index.php
/* Load required includes */
require_once ("../include/php_setup.inc");
require_once ("functions.inc");
+require_once ("class_log.inc");
header("Content-type: text/html; charset=UTF-8");
function displayLogin()
/* Displasy SSL mode warning? */
if ($ssl != "" && $config->data['MAIN']['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>!");
+ $smarty->assign ("ssl", _("Warning").": <a style=\"color:red;\" href=\"$ssl\">"._("Session is not encrypted!")."</a>");
} else {
$smarty->assign ("ssl", "");
}
$_SESSION['LastError'] = "";
/* Check if we need to run setup */
-if (!file_exists(CONFIG_DIR."/gosa.conf")){
+if (!file_exists(CONFIG_DIR."/".CONFIG_FILE)){
header("location:setup.php");
exit();
}
$_SESSION['js']= FALSE;
}
-/* Check if gosa.conf is accessible */
-if (!is_readable(CONFIG_DIR."/gosa.conf")){
- echo sprintf(_("GOsa configuration %s/gosa.conf is not readable. Aborted."), CONFIG_DIR);
+/* Check if gosa.conf (.CONFIG_FILE) is accessible */
+if (!is_readable(CONFIG_DIR."/".CONFIG_FILE)){
+ echo sprintf(_("GOsa configuration %s/%s is not readable. Aborted."), CONFIG_DIR,CONFIG_FILE);
exit();
}
/* Parse configuration file */
-$config= new config(CONFIG_DIR."/gosa.conf-trunk", $BASE_DIR);
+$config= new config(CONFIG_DIR."/".CONFIG_FILE, $BASE_DIR);
$_SESSION['DEBUGLEVEL']= $config->data['MAIN']['DEBUGLEVEL'];
if ($_SERVER["REQUEST_METHOD"] != "POST"){
@DEBUG (DEBUG_CONFIG, __LINE__, __FUNCTION__, __FILE__, $config->data, "config");
$config->data['MAIN']['SCHEMA_CHECK'] = "true";
}
if(isset($config->data['MAIN']['SCHEMA_CHECK'])&&preg_match("/true/i",$config->data['MAIN']['SCHEMA_CHECK'])){
- require_once("functions_setup.inc");
- if(!is_schema_readable($config->current['SERVER'],$config->current['ADMIN'],$config->current['PASSWORD'])){
+ $recursive = (isset($config->current['RECURSIVE']) && $config->current['RECURSIVE'] == "true");
+ $tls = (isset($config->current['TLS']) && $config->current['TLS'] == "true");
+
+ if(!count($ldap->get_objectclasses())){
print_red(_("GOsa cannot retrieve information about the installed schema files. Please make sure, that this is possible."));
- $smarty->display(get_template_path('headers.tpl'));
- echo "<body>".$_SESSION['errors']."</body></html>";
- exit();
+ displayLogin();
+ exit() ;
}else{
- $str = (schema_check($config->current['SERVER'],$config->current['ADMIN'],$config->current['PASSWORD'],0,TRUE));
+ $cfg = array();
+ $cfg['admin'] = $config->current['ADMIN'];
+ $cfg['password'] = $config->current['PASSWORD'];
+ $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']));
$checkarr = array();
foreach($str as $tr){
- if(isset($tr['needonstartup'])){
- print_red($tr['msg']."<br>"._("Your ldap setup contains old schema definitions. Please re-run the setup."));
- $smarty->display(get_template_path('headers.tpl'));
- echo "<body>".$_SESSION['errors']."</body></html>";
+ if(isset($tr['IS_MUST_HAVE']) && !$tr['STATUS']){
+ print_red($tr['MSG']."<br>"._("Your ldap setup contains old schema definitions. Please re-run the setup."));
+ displayLogin();
exit();
}
}
$ldap->create_missing_trees($config->current['CONFIG']);
}
- /* Check for at least one subtreeACL in the complete tree */
- $ldap->cd($config->current['BASE']);
- $ldap->search("(&(objectClass=gosaObject)(gosaSubtreeACL=:all))");
- if ($ldap->count() < 1){
- print_red(_("You're missing an administrative account for GOsa, you'll not be able to administrate anything!"));
- displayLogin();
- exit();
- }
-
/* Check for valid input */
$username= $_POST["username"];
if (!ereg("^[A-Za-z0-9_.-]+$", $username)){
/* Login as user, initialize user ACL's */
$ui= ldap_login_user($username, $_POST["password"]);
- if ($ui === NULL || $ui == 0){
+ if ($ui === NULL || !$ui){
$message= _("Please check the username/password combination.");
$smarty->assign ('nextfield', 'password');
- gosa_log ("Authentication failed for user \"$username\"");
+ new log("security","login","",array(),"Authentication failed for user \"$username\"") ;
} else {
/* Remove all locks of this user */
del_user_locks($ui->dn);
$config->make_idepartments();
$_SESSION['config']= $config;
+ /* Take care about zend.ze1_compatiblity_mode */
+ if (ini_get("zend.ze1_compatibility_mode") != 0){
+ $_SESSION['PHP4COMPATIBLE']= TRUE;
+ }
+
/* are we using accountexpiration */
if((isset($config->data['MAIN']['ACCOUNT_EXPIRATION'])) &&
preg_match('/true/i', $config->data['MAIN']['ACCOUNT_EXPIRATION'])){
if ($expired == 1){
$message= _("Account locked. Please contact your system administrator.");
$smarty->assign ('nextfield', 'password');
- gosa_log ("Account for user \"$username\" has expired");
+ new log("security","login","",array(),"Account for user \"$username\" has expired") ;
} elseif ($expired == 3){
$plist= new pluglist($config, $ui);
foreach ($plist->dirlist as $key => $value){
if (preg_match("/\bpassword\b/i",$value)){
$plug=$key;
- gosa_log ("User \"$username\" password forced to change");
+ new log("security","login","",array(),"User \"$username\" password forced to change") ;
header ("Location: main.php?plug=$plug&reset=1");
exit;
}
}
/* Not account expired or password forced change go to main page */
- gosa_log ("User \"$username\" logged in successfully");
+ new log("security","login","",array(),"User \"$username\" logged in successfully") ;
header ("Location: main.php?global_check=1");
exit;
} else {
/* Go to main page */
- gosa_log ("User \"$username\" logged in successfully");
+ new log("security","login","",array(),"User \"$username\" logged in successfully") ;
header ("Location: main.php?global_check=1");
exit;
}