Changeset 784 for trunk

Timestamp:

Oct 7, 2016, 12:03:13 AM (8 years ago)

Author:

autocommit@…

Message:

cambio a la creacion para tener los subdominios como grupos secundarios

File:

• trunk/alternc/patches/class/m_mail_egw.php (modified) (1 diff)

trunk/alternc/patches/class/m_mail_egw.php

@@ -93 +93 @@
 
 
-        // armamos el commando a executar en el cli de egw
-        $admincli= $L_EGW_ADMINCLI;
-        $command= "--edit-user";              // Command to be performed
-        $adminuser= $L_EGW_ADMINUSER;
-        $adminclave= $L_EGW_ADMINCLAVE;
-        //$adminclave= "*******";
-
-        $firstname = $mail;                     // the left side of the email
-        $lastname= "-";                         // we have a generic lastname
-        $pass= "*****"; //TEMPORARY
-        $email = $account = $mail ."@" .$domain; // account and email are the same
-        $expires= "never";
-        $canchangepw= "yes";
-        $anonuser= "no";
-//      $primarygroup = $domain[$size-3];   // domains in .ar starts at the third level
-        $primarygroup= "cta"; //TEMPORARY
-//      $secondarygroup = $domain[$size-4]; // sub-domain is used as a secondary group
-        $homedir = "/home/". $mail ."_" .$domain; // everyone can have a home    
-        $loginshell = "/bin/bash";                // everyone can have a shell
-
-        $go= $admincli ." " .$command ." " .$adminuser ."," .$adminclave .",\"" .$account ."\"," .$firstname ."," .$lastname ."," .$pass .",\"" .$email ."\"," .$expires ."," .$canchangepw ."," .$anonuser ."," .$primarygroup ;
+        $dominio = explode('.',$domain);
+        $size = count($dominio);
+        if (  $size >= 3 &&
+                $dominio[$size-2] == "org" &&
+                $dominio[$size-1] == "ar" ) {
+
+                // armamos el commando a executar en el cli de egw
+                $admincli= $L_EGW_ADMINCLI;
+                $command= "--edit-user";              // Command to be performed
+                $adminuser= $L_EGW_ADMINUSER;
+                $adminclave= $L_EGW_ADMINCLAVE;
+                //$adminclave= "*******";
+
+                $firstname = $mail;                     // the left side of the email
+                $lastname= "-";                         // we have a generic lastname
+                $pass= "*****"; //TEMPORARY
+                $email = $account = $mail ."@" .$domain; // account and email are the same
+                $expires= "never";
+                $canchangepw= "yes";
+                $anonuser= "no";
+                $primarygroup = $dominio[$size-3];   // domains in .ar starts at the third level
+                //$primarygroup= "cta"; //TEMPORARY
+                $secondarygroup = $dominio[$size-4]; // sub-domain as a secondary group
+                //$secondarygroup= "cta"; //TEMPORARY
+                $homedir = "/home/". $mail ."_" .$domain; // everyone can have a home    
+                $loginshell = "/bin/bash";                // everyone can have a shell
+
+                $go= $admincli ." " .$command ." " .$adminuser ."," .$adminclave .",\"" .$account ."\"," .$firstname ."," .$lastname ."," .$pass .",\"" .$email ."\"," .$expires ."," .$canchangepw ."," .$anonuser ."," .$primarygroup ;
         
-        $go= $go ."," .$homedir ."," .$loginshell ;
-
-        echo "<h3>Creamos la cuenta en la base ldap</h3>";
+                if (isset($secondarygroup)) {
+                $go= $go ."," .$secondarygroup ;
+                }
+
+                $go= $go ."," .$homedir ."," .$loginshell ;
+
+                echo "<h3>Creamos la cuenta en la base ldap</h3>";
 //      echo "<h4>$go</h4>"; // LA CLAVE SALE... ACA
 
-                        $cod = exec($go);
-                        if ($cod)
-                        {
-                         // die ($cod);
-                         echo "<p class=\"error\">";
-                         echo $cod;
-                         echo "</p>";
-                         //$res = false;
-                        }       
+                exec($go,$output);
+                $cod=$output;
+                if ($cod)
+                   {
+                   // die ($cod);
+                  echo "<p class=\"alert alert-danger\">";
+                  //echo $cod;
+                  print_r ($cod);
+                  echo "</p>";
+                  //$res = false;
+                 }
+        }
 
         // mandamos el codigo de error en /var/log/alternc/bureau.log 
         $err->log("mail_egw", "create", $cod);
-
 
         // para no morir aca...
         return $res;
         }       
-//////
+
         function _del_egw_account($mail_id) {
         global $err, $db, $hooks, $L_EGW_ADMINCLI, $L_EGW_ADMINUSER, $L_EGW_ADMINCLAVE;