* Added vim information to unify the layout

* Removed dnmode check, since this is already done by the config class

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@563 594d385d-05f5-0310-b6e9-bd551577e9d8

diff --git a/plugins/personal/connectivity/class_oxchangeAccount.inc b/plugins/personal/connectivity/class_oxchangeAccount.inc
index e465149969f18086da395edca8e5cec885c468e9..9b774ba3a9d6fc077a95ce457a39502bfcddfc7d 100644 (file)
--- a/plugins/personal/connectivity/class_oxchangeAccount.inc
+++ b/plugins/personal/connectivity/class_oxchangeAccount.inc
@@ -1,4 +1,5 @@
 <?php
+
 class oxchangeAccount extends plugin
 {
   /* Definitions */
@@ -20,9 +21,7 @@ class oxchangeAccount extends plugin
   var $attributes= array("OXAppointmentDays", "OXTaskDays", "OXTimeZone","mailEnabled");
   var $objectclasses= array("OXUserObject");
 
-
   var $oxconf = array();
-
   var $timezones=array(
       "Africa/Abidjan",
       "Africa/Accra",
@@ -563,22 +562,19 @@ class oxchangeAccount extends plugin
       "Zulu"
         );
 
-
-  var $dnmode="cn";
-
+  var $dnmode= "";
 
   function oxchangeAccount ($config, $dn= NULL)
   {
     plugin::plugin ($config, $dn);
     for ($i=0;$i<count($this->config->data['TABS']['CONNECTIVITY']);$i++){
-      if($this->config->data['TABS']['CONNECTIVITY'][$i]['CLASS']=='oxchangeAccount')
-      {
+      if($this->config->data['TABS']['CONNECTIVITY'][$i]['CLASS']=='oxchangeAccount') {
         $this->oxconf=$this->config->data['TABS']['CONNECTIVITY'][$i];
         break;
       }
     }
-       if (isset($this->config->current['DNMODE']))
-               $this->dnmode=$this->config->current['DNMODE'];
+
+    $this->dnmode= $this->config->current['DNMODE'];
   }
 
   function execute()
@@ -723,30 +719,30 @@ class oxchangeAccount extends plugin
   function save()
   {
 
-       $needupdate=TRUE;
+    $needupdate=TRUE;
 
-       /*First at all, we must check if this is new or is updated */
-       for ($i=0;$i<$this->attrs['objectClass']['count'];$i++){
-               if($this->attrs['objectClass'][$i]=="OXUserObject") $needupdate=FALSE;
-       }
+    /*First at all, we must check if this is new or is updated */
+    for ($i=0;$i<$this->attrs['objectClass']['count'];$i++){
+      if($this->attrs['objectClass'][$i]=="OXUserObject") $needupdate=FALSE;
+    }
 
     if($needupdate){
-           /* Trying to open a Postgresql Database Server */
-           if (function_exists("pg_connect")){
-             if(isset($this->oxconf["PGUSER"]) and isset($this->oxconf["PGHOST"]) and isset($this->oxconf["PGDBNAME"]) and isset($this->oxconf["PGPASSWD"])){
-               $pgcon = pg_connect("host=".$this->oxconf["PGHOST"]." user=".$this->oxconf["PGUSER"]." password=".$this->oxconf["PGPASSWD"]." dbname=".$this->oxconf["PGDBNAME"]);
-               if (! $pgcon){
-                 print_red(_("Couldn't Connect To Postgresql Database"));
-                 return;
-               }
-             }else{
-               print_red(_("Needed Parameters to openexchange connectivity plugin failed!"));
-               return;
-             }
-           }else{
-             print_red(_("PHP4 module for Postgresql Database Failed!"));
-             return;
-           }
+      /* Trying to open a Postgresql Database Server */
+      if (function_exists("pg_connect")){
+        if(isset($this->oxconf["PGUSER"]) and isset($this->oxconf["PGHOST"]) and isset($this->oxconf["PGDBNAME"]) and isset($this->oxconf["PGPASSWD"])){
+          $pgcon = pg_connect("host=".$this->oxconf["PGHOST"]." user=".$this->oxconf["PGUSER"]." password=".$this->oxconf["PGPASSWD"]." dbname=".$this->oxconf["PGDBNAME"]);
+          if (! $pgcon){
+            print_red(_("Couldn't Connect To Postgresql Database"));
+            return;
+          }
+        }else{
+          print_red(_("Needed Parameters to openexchange connectivity plugin failed!"));
+          return;
+        }
+      }else{
+        print_red(_("PHP4 module for Postgresql Database Failed!"));
+        return;
+      }
     }
 
     $uid=$this->attrs[$this->dnmode][0];
@@ -763,39 +759,41 @@ class oxchangeAccount extends plugin
     $this->postcreate();
 
     if($needupdate){
-           /* Finally save data to postgresql server */
-           pg_set_client_encoding ("UNICODE");
-           $nv = "SELECT nextval ('serial_id')";
-           $ot = "insert into oxfolder_tree (fuid, parent, fname, module, type, owner, creator, creating_date, created_from, changing_date, changed_from) VALUES (%d, 1, '%s', '%s', 'private', '%s', '%s', 'now', 'System', 'now', 'System')";
-           $op = "INSERT INTO oxfolder_permissions (puid, pid, role, entity, sealed, fp, orp, owp, odp) VALUES (%d, %d, 32768,  '%s', 0, 128, 128, 128, 128)";
-           $os = "insert into oxfolder_standardfolders (owner,module_calendar,module_contact,module_task) VALUES ('%s',%d,%d,%d)";
-           $ugr= "INSERT INTO usr_general_rights SELECT creating_date, created_from, changing_date, changed_from,text('%s'),  addr_u, addr_r, addr_d, cont_u, cont_r, cont_d, data_u, data_r, data_d, serie_u, serie_r, serie_d, task_u, task_r, task_d,  refer, proj_u, proj_r, proj_d, dfolder_u, dfolder_r, dfolder_d, doc_u, doc_r, doc_d, knowl_u, knowl_r, knowl_d, bfolder_u,  bfolder_r, bfolder_d, bookm_u, bookm_r, bookm_d, pin_u, pin_r, pin_d, forum_n, fentrie_n, setup, pin_public, internal,  int_groups, kfolder_u, kfolder_r, kfolder_d, webmail FROM sys_gen_rights_template WHERE login LIKE 'default_template'";
-
-           $res=pg_exec($pgcon,$nv); $calendarid=pg_fetch_row($res); pg_freeresult($res);
-           $q=sprintf($ot,$calendarid[0],'My Appointments','calendar',$uid,$uid);
-           pg_exec($pgcon,$q);
-           $res=pg_exec($pgcon,$nv); $nid=pg_fetch_row($res); pg_freeresult($res);
-           $q=sprintf($op,$nid[0],$calendarid[0],$uid);
-           pg_exec($pgcon,$q);
-           $res=pg_exec($pgcon,$nv); $contactsid=pg_fetch_row($res); pg_freeresult($res);
-           $q=sprintf($ot,$contactsid[0],'My Contacts','contact',$uid,$uid);
-           pg_exec($pgcon,$q);
-           $res=pg_exec($pgcon,$nv); $nid=pg_fetch_row($res); pg_freeresult($res);
-           $q=sprintf($op,$nid[0],$contactsid[0],$uid);
-           pg_exec($pgcon,$q);
-           $res=pg_exec($pgcon,$nv); $tasksid=pg_fetch_row($res); pg_freeresult($res);
-           $q=sprintf($ot,$tasksid[0],'My Tasks','task',$uid,$uid);
-           pg_exec($pgcon,$q);
-           $res=pg_exec($pgcon,$nv); $nid=pg_fetch_row($res); pg_freeresult($res);
-           $q=sprintf($op,$nid[0],$tasksid[0],$uid);
-           pg_exec($pgcon,$q);
-           $q=sprintf($os,$uid,$calendarid[0],$contactsid[0],$tasksid[0]);
-           pg_exec($pgcon,$q);
-           $q=sprintf($ugr,$uid);
-           pg_exec($pgcon,$q);
-           pg_close($pgcon);
-         }
+      /* Finally save data to postgresql server */
+      pg_set_client_encoding ("UNICODE");
+      $nv = "SELECT nextval ('serial_id')";
+      $ot = "insert into oxfolder_tree (fuid, parent, fname, module, type, owner, creator, creating_date, created_from, changing_date, changed_from) VALUES (%d, 1, '%s', '%s', 'private', '%s', '%s', 'now', 'System', 'now', 'System')";
+      $op = "INSERT INTO oxfolder_permissions (puid, pid, role, entity, sealed, fp, orp, owp, odp) VALUES (%d, %d, 32768,  '%s', 0, 128, 128, 128, 128)";
+      $os = "insert into oxfolder_standardfolders (owner,module_calendar,module_contact,module_task) VALUES ('%s',%d,%d,%d)";
+      $ugr= "INSERT INTO usr_general_rights SELECT creating_date, created_from, changing_date, changed_from,text('%s'),  addr_u, addr_r, addr_d, cont_u, cont_r, cont_d, data_u, data_r, data_d, serie_u, serie_r, serie_d, task_u, task_r, task_d,  refer, proj_u, proj_r, proj_d, dfolder_u, dfolder_r, dfolder_d, doc_u, doc_r, doc_d, knowl_u, knowl_r, knowl_d, bfolder_u,  bfolder_r, bfolder_d, bookm_u, bookm_r, bookm_d, pin_u, pin_r, pin_d, forum_n, fentrie_n, setup, pin_public, internal,  int_groups, kfolder_u, kfolder_r, kfolder_d, webmail FROM sys_gen_rights_template WHERE login LIKE 'default_template'";
+
+      $res=pg_exec($pgcon,$nv); $calendarid=pg_fetch_row($res); pg_freeresult($res);
+      $q=sprintf($ot,$calendarid[0],'My Appointments','calendar',$uid,$uid);
+      pg_exec($pgcon,$q);
+      $res=pg_exec($pgcon,$nv); $nid=pg_fetch_row($res); pg_freeresult($res);
+      $q=sprintf($op,$nid[0],$calendarid[0],$uid);
+      pg_exec($pgcon,$q);
+      $res=pg_exec($pgcon,$nv); $contactsid=pg_fetch_row($res); pg_freeresult($res);
+      $q=sprintf($ot,$contactsid[0],'My Contacts','contact',$uid,$uid);
+      pg_exec($pgcon,$q);
+      $res=pg_exec($pgcon,$nv); $nid=pg_fetch_row($res); pg_freeresult($res);
+      $q=sprintf($op,$nid[0],$contactsid[0],$uid);
+      pg_exec($pgcon,$q);
+      $res=pg_exec($pgcon,$nv); $tasksid=pg_fetch_row($res); pg_freeresult($res);
+      $q=sprintf($ot,$tasksid[0],'My Tasks','task',$uid,$uid);
+      pg_exec($pgcon,$q);
+      $res=pg_exec($pgcon,$nv); $nid=pg_fetch_row($res); pg_freeresult($res);
+      $q=sprintf($op,$nid[0],$tasksid[0],$uid);
+      pg_exec($pgcon,$q);
+      $q=sprintf($os,$uid,$calendarid[0],$contactsid[0],$tasksid[0]);
+      pg_exec($pgcon,$q);
+      $q=sprintf($ugr,$uid);
+      pg_exec($pgcon,$q);
+      pg_close($pgcon);
     }
+  }
 }
 
+
+// vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler:
 ?>