Removed swedish. It's very incomplete...

[gosa.git] / gosa-core / include / functions.inc

diff --git a/gosa-core/include/functions.inc b/gosa-core/include/functions.inc
index 8d40ad58071fd1da4ee0a29f8453c4fabe763532..6cb2ede0581e9d969b690b0e3f9a09c4036f3cf8 100644 (file)
--- a/gosa-core/include/functions.inc
+++ b/gosa-core/include/functions.inc
@@ -344,7 +344,7 @@ function ldap_init ($server, $base, $binddn='', $pass='')
   global $config;
 
   $ldap = new LDAP ($binddn, $pass, $server,
-      isset($config->current['RECURSIVE']) && $config->current['RECURSIVE'] == "true",
+      isset($config->current['LDAPFOLLOWREFERRALS']) && $config->current['LDAPFOLLOWREFERRALS'] == "true",
       isset($config->current['LDAPTLS']) && $config->current['LDAPTLS'] == "true");
 
   /* Sadly we've no proper return values here. Use the error message instead. */
@@ -503,8 +503,8 @@ function ldap_login_user ($username, $password)
   /* password check, bind as user with supplied password  */
   $ldap->disconnect();
   $ldap= new LDAP($ui->dn, $password, $config->current['SERVER'],
-      isset($config->current['RECURSIVE']) &&
-      $config->current['RECURSIVE'] == "true",
+      isset($config->current['LDAPFOLLOWREFERRALS']) &&
+      $config->current['LDAPFOLLOWREFERRALS'] == "true",
       isset($config->current['LDAPTLS'])
       && $config->current['LDAPTLS'] == "true");
   if (!$ldap->success()){
@@ -1150,37 +1150,37 @@ function get_ou($name)
 {
   global $config;
 
-  $name= strtolower($name);
-
   $map = array( 
-                "ogroupou"      => "ou=groups,",
-                "applicationou" => "ou=apps,",
-                "systemsou"     => "ou=systems,",
-                "serverou"      => "ou=servers,ou=systems,",
-                "terminalou"    => "ou=terminals,ou=systems,",
-                "workstationou" => "ou=workstations,ou=systems,",
-                "printerou"     => "ou=printers,ou=systems,",
-                "phoneou"       => "ou=phones,ou=systems,",
-                "componentou"   => "ou=netdevices,ou=systems,",
-                "winstations"   => "ou=winstation,",
-
-                "blocklistou"   => "ou=gofax,ou=systems,",
-                "incomingou"    => "ou=incoming,",
-                "aclroleou"     => "ou=aclroles,",
-                "macroou"       => "ou=macros,ou=asterisk,ou=configs,ou=systems,",
-                "conferenceou"  => "ou=conferences,ou=asterisk,ou=configs,ou=systems,",
-
-                "faiou"         => "ou=fai,ou=configs,ou=systems,",
-                "faiscriptou"   => "ou=scripts,",
-                "faihookou"     => "ou=hooks,",
-                "faitemplateou" => "ou=templates,",
-                "faivariableou" => "ou=variables,",
-                "faiprofileou"  => "ou=profiles,",
-                "faipackageou"  => "ou=packages,",
-                "faipartitionou"=> "ou=disk,",
-
-                "deviceou"      => "ou=devices,",
-                "mimetypeou"    => "ou=mime,");
+                "ogroupRDN"      => "ou=groups,",
+                "applicationRDN" => "ou=apps,",
+                "systemRDN"     => "ou=systems,",
+                "serverRDN"      => "ou=servers,ou=systems,",
+                "terminalRDN"    => "ou=terminals,ou=systems,",
+                "workstationRDN" => "ou=workstations,ou=systems,",
+                "printerRDN"     => "ou=printers,ou=systems,",
+                "phoneRDN"       => "ou=phones,ou=systems,",
+                "componentRDN"   => "ou=netdevices,ou=systems,",
+                "sambaMachineAccountRDN"   => "ou=winstation,",
+
+                "faxBlocklistRDN"   => "ou=gofax,ou=systems,",
+                "systemIncomingRDN"    => "ou=incoming,",
+                "aclRoleRDN"     => "ou=aclroles,",
+                "phoneMacroRDN"       => "ou=macros,ou=asterisk,ou=configs,ou=systems,",
+                "phoneConferenceRDN"  => "ou=conferences,ou=asterisk,ou=configs,ou=systems,",
+
+                "faiBaseRDN"         => "ou=fai,ou=configs,ou=systems,",
+                "faiScriptRDN"   => "ou=scripts,",
+                "faiHookRDN"     => "ou=hooks,",
+                "faiTemplateRDN" => "ou=templates,",
+                "faiVariableRDN" => "ou=variables,",
+                "faiProfileRDN"  => "ou=profiles,",
+                "faiPackageRDN"  => "ou=packages,",
+                "faiPartitionRDN"=> "ou=disk,",
+
+                "sudoRDN"       => "ou=sudoers,",
+
+                "deviceRDN"      => "ou=devices,",
+                "mimetypeRDN"    => "ou=mime,");
 
   /* Preset ou... */
   if ($config->get_cfg_value($name, "_not_set_") != "_not_set_"){
@@ -1215,19 +1215,19 @@ function get_ou($name)
 
 function get_people_ou()
 {
-  return (get_ou("USERRDN"));
+  return (get_ou("userRDN"));
 }
 
 
 function get_groups_ou()
 {
-  return (get_ou("GROUPRDN"));
+  return (get_ou("groupRDN"));
 }
 
 
 function get_winstations_ou()
 {
-  return (get_ou("WINSTATIONS"));
+  return (get_ou("sambaMachineAccountRDN"));
 }
 
 
@@ -2234,7 +2234,7 @@ function check_schema($cfg,$rfc2307bis = FALSE)
   $messages= array();
 
   /* Get objectclasses */
-  $ldap = new ldapMultiplexer(new LDAP($cfg['admin'],$cfg['password'],$cfg['connection'] ,FALSE,$cfg['LDAPTLS']));
+  $ldap = new ldapMultiplexer(new LDAP($cfg['admin'],$cfg['password'],$cfg['connection'] ,FALSE, $cfg['tls']));
   $objectclasses = $ldap->get_objectclasses();
   if(count($objectclasses) == 0){
     msg_dialog::display(_("LDAP warning"), _("Cannot get schema information from server. No schema check possible!"), WARNING_DIALOG);
@@ -2373,7 +2373,7 @@ function get_languages($languages_in_own_language = FALSE,$strip_region_tag = FA
         "en_US" => "English",
         "nl_NL" => "Dutch",
         "pl_PL" => "Polish",
-        "sv_SE" => "Swedish",
+        #"sv_SE" => "Swedish",
         "zh_CN" => "Chinese",
         "vi_VN" => "Vietnamese",
         "ru_RU" => "Russian");
@@ -2386,7 +2386,7 @@ function get_languages($languages_in_own_language = FALSE,$strip_region_tag = FA
         "en_US" => _("English"),
         "nl_NL" => _("Dutch"),
         "pl_PL" => _("Polish"),
-        "sv_SE" => _("Swedish"),
+        #"sv_SE" => _("Swedish"),
         "zh_CN" => _("Chinese"),
         "vi_VN" => _("Vietnamese"),
         "ru_RU" => _("Russian"));
@@ -2585,7 +2585,7 @@ function generate_smb_nt_hash($password)
   global $config;
 
   # Try to use gosa-si?
-  if ($config->get_cfg_value("gosa_si") != ""){
+  if ($config->get_cfg_value("gosaSupportURI") != ""){
        $res= gosaSupportDaemon::send("gosa_gen_smb_hash", "GOSA", array("password" => $password), TRUE);
     if (isset($res['XML']['HASH'])){
        $hash= $res['XML']['HASH'];