![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
index 20edcb3a3e577c4d74495bb9cb3894c8e5b864bb..eb63ea93b86ed2c001add07dee1f46a1ec5b0ce9 100644 (file)
$r= ldap_bind ($ds, $admin, $password);
/* Get base to look for schema */
- $sr = @ldap_read ($ds, "", "objectClass=*", array("subschemaSubentry"));
+ $sr = @ldap_read ($ds, NULL, "objectClass=*", array("subschemaSubentry"));
$attr= @ldap_get_entries($ds,$sr);
if (!isset($attr[0]['subschemasubentry'][0])){
return (false);
"gosaApplication" => array("version" => "2.4", "class" => "appgroup","file" => "gosa.schema"),
"gosaApplicationGroup" => array("version" => "2.4", "class" => "appgroup","file" => "gosa.schema"),
- "GOhard" => array("version" => "2.4", "class" => "terminals","file" => "goto.schema"),
- "gotoTerminal" => array("version" => "2.0", "class" => "terminals","file" => "goto.schema"),
+ "GOhard" => array("version" => "2.5", "class" => "terminals","file" => "goto.schema"),
+ "gotoTerminal" => array("version" => "2.5", "class" => "terminals","file" => "goto.schema"),
"goServer" => array("version" => "2.4","class" => "server","file" => "goserver.schema"),
"goTerminalServer" => array("version" => "2.4", "class" => "terminals","file" => "goto.schema"),
"goShareServer" => array("version" => "2.4", "class" => "terminals","file" => "goto.schema"),
@@ -101,7 +101,7 @@ function schema_check($server, $admin, $password, $aff=0,$CalledByIndexPhP=false
$r= ldap_bind ($ds, $admin, $password);
/* Get base to look for schema */
- $sr = @ldap_read ($ds, "", "objectClass=*", array("subschemaSubentry"));
+ $sr = @ldap_read ($ds, NULL, "objectClass=*", array("subschemaSubentry"));
$attr= @ldap_get_entries($ds,$sr);
if (!isset($attr[0]['subschemasubentry'][0])){
return (array(array("msg" => _("Can't get schema information from server. No schema check possible!"), "status" => FALSE)));
@@ -216,6 +216,16 @@ function schema_check($server, $admin, $password, $aff=0,$CalledByIndexPhP=false
$affich['phpgroupware']['msg']= _("Support for phpgroupware enabled")."<td class=\"check\">phpgwaccount.schema</td>";
$affich['phpgroupware']['status']= TRUE;
}
+
+ if (!isset($objectclasses['trustAccount'])){
+ $messages['trustAccount']['msg']= _("Support for trustAccount disabled, no schema seems to be installed");
+ $affich['trustAccount']['msg']= $messages['trustAccount']['msg']."<td class=\"check\">trust.schema</td>";
+ $messages['trustAccount']['status']= FALSE;
+ $affich['trustAccount']['status']= FALSE;
+ }else{
+ $affich['trustAccount']['msg']= _("Support for trustAccount enabled")."<td class=\"check\">trust.schema</td>";
+ $affich['trustAccount']['status']= TRUE;
+ }
if (!isset($objectclasses['goFonAccount'])){
$messages['phoneaccount']['msg']= _("Support for gofon disabled, no schema seems to be installed");
@@ -237,6 +247,16 @@ function schema_check($server, $admin, $password, $aff=0,$CalledByIndexPhP=false
$affich['nagioscontact']['status']= true;
}
+ if ((!isset($objectclasses['apple-user'])) || (!isset($objectclasses['mount'])) ){
+ $messages['netatalk']['msg']= _("Support for netatalk disabled, no schema seems to be installed");
+ $affich['netatalk']['msg']= $messages['netatalk']['msg']."<td class=\"check\">apple.schema</td>";
+ $messages['netatalk']['status']= FALSE;
+ $affich['netatalk']['status']= FALSE;
+ }else{
+ $affich['netatalk']['msg']= _("Support for netatalk enabled")."<td class=\"check\">apple.schema</td>";
+ $affich['netatalk']['status']= true;
+ }
+
/* Fix for PHP Fehler "Undefined index: ldapconf"
* Ablaufverfolgung[1]: Funktion schema_check Datei: /home/hickert/gosa/include/functions_setup.inc (Zeile 230)
*/
$msg= "";
$msg.= "<h1>"._("PHP setup inspection")."</h1>";
+
$msg.= check ( $faults, _("Checking for PHP version (>=4.1.0)"),
_("PHP must be of version 4.1.0 or above for some functions and known bugs in PHP language."),
version_compare(phpversion(), "4.1.0")>=0);
$msg.= check ( $faults, _("Checking if register_globals is set to 'off'"),
_("register_globals is a PHP mechanism to register all global varibales to be accessible from scripts without changing the scope. This may be a security risk. GOsa will run in both modes."),
$check_globals == 0, FALSE);
+
+ $msg.= check ( $faults, _("PHP session.gc_maxlifetime (>= 86400 seconds)."),
+ _("PHP uses this value for the garbage collector to delete old sessions, setting this value to one day will prevent loosing session and cookie before they really timeout."),
+ ini_get("session.gc_maxlifetime") >= 86400,FALSE);
$msg.= check ( $faults, _("Checking for ldap module"),
_("This is the main module used by GOsa and therefore really required."),
}
/* Look for samba password generation method */
- if(file_exists("/usr/lib/gosa/mkntpasswd")){
- $pwdhash = "/usr/lib/gosa/mkntpasswd";
+ if(file_exists("/usr/bin/mkntpasswd")){
+ $pwdhash = "/usr/bin/mkntpasswd";
} elseif (preg_match("/^Usage: mkntpwd /", shell_exec ("mkntpwd 2>&1"))){
$pwdhash= "mkntpwd";
} else {
$possible_plugins['pureftp'][] = "'\n.*<tab.*pureftp.*>.*\n'i";
$possible_plugins['webdav'][] = "'\n.*<tab.*webdav.*>.*\n'i";
$possible_plugins['phpgroupware'][]= "'\n.*<tab.*phpgroupware.*>.*\n'i";
+ $possible_plugins['netatalk'][0] = "'\n.*<plugin.*netatalk+.*\n.*>.*\n'i";
+ $possible_plugins['netatalk'][1] = "'\n.*<tab.*netatalk.*>.*\n'i";
/*Header information
Needed to send the generated gosa.conf to the browser */
}
/* Data readed, types replaced, samba version detected and checked if
- we need to add SID and RIDBASE. Check if there is an ivbbEntry in
+ we need to add SID and RIDBASE. Check if there is an ivbbentry in
the LDAP tree, in this case we will set the governmentmode to true.
Create LDAP connection, to check if theres a domain Objekt definen
in the LDAP schema. */
}
/* Try to find a Samba Domain Objekt */
- $ldap->search("(objectClass=ivbbEntry)");
+ $ldap->search("(objectClass=ivbbentry)");
/* Something found ??? so we need to define ridbase an SID by ourselfs */
if($ldap->count()> 0) {
$str = str_replace("mailMethod=\"{MAILMETHOD}\"","",$str);
}
-
/* Remove all unused plugins */
- foreach($possible_plugins as $key=> $plugin) {
- foreach($plugin as $key=>$val) {
- if(in_array($plugin,$classes)) {
+ foreach(array_keys($possible_plugins) as $akey) {
+ if(array_key_exists($akey,$classes)) {
+ foreach($possible_plugins[$akey] as $key=>$val) {
$str = preg_replace($val,"\n",$str);
}
}
print_red (_("Can't bind to the specified LDAP server! Please make sure that it is reachable for GOsa."));
}
} else {
- $sr= @ldap_search ($ds, "", "objectClass=*", array("namingContexts"));
+ $sr= @ldap_search ($ds, NULL, "objectClass=*", array("namingContexts"));
$attr= @ldap_get_entries($ds,$sr);
if((empty($attr))) {
$base= "dc=example,dc=net";
if($withoutput){
- print_red(_("Bind to server successful, but the server seems to be completly empty, please check all informations twice"));
+ print_red(_("Bind to server successful, but the server seems to be completly empty, please check all information twice"));
}
} else {