X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=include%2Fclass_opengw.inc;h=de50ef93690e6d277524bdc528515372df4d8132;hb=075b806cd405200df8712134e09f803eb9c5fe02;hp=6ecf100a82b692f842a45401ce994f025d0d5260;hpb=c52d370a62786537b1bf9d7514acfb75282347f0;p=gosa.git diff --git a/include/class_opengw.inc b/include/class_opengw.inc index 6ecf100a8..de50ef936 100755 --- a/include/class_opengw.inc +++ b/include/class_opengw.inc @@ -18,7 +18,7 @@ class ogw{ var $MAY = array( "salutation","firstname","description","degree", "birthday","sex","street","zip","country","zipcity", "state","name1","value_string","number","db_status", - "object_version","is_locked","LocationTeamID","TeamIDis"); + "object_version","is_locked","LocationTeamID","TeamIDis","password"); var $LastError = ""; var $option = ""; @@ -54,7 +54,7 @@ class ogw{ $ret = array(); $qry = "SELECT is_person,is_account,is_intra_account,is_extra_account, number,owner_id,object_version,company_id,template_user_id,is_locked, - name,firstname,description,salutation,login,degree,birthday,sex + name,firstname,description,salutation,login,degree,birthday,sex FROM person WHERE login='".$uid."';"; $res = $this->ogo->FetchAllRows($this->ogo->Query($qry)); $ret = $res[0]; @@ -222,10 +222,12 @@ class ogw{ foreach($this->validTeams as $id){ $tmp[]= $id['company_id']; } - foreach($this->info['TeamIDis'] as $id){ - if(!in_array($id,$tmp)){ - $this->LastError = sprintf("Given 'Team ID':%s is invalid.",$id); - return(false); + if(is_array($this->info['TeamIDis'])){ + foreach($this->info['TeamIDis'] as $id){ + if(!in_array($id,$tmp)){ + $this->LastError = sprintf("Given 'Team ID':%s is invalid.",$id); + return(false); + } } } return(true); @@ -265,7 +267,7 @@ class ogw{ $arr = array( "company_id","object_version","owner_id","template_user_id", "is_person","is_account","is_intra_account","is_extra_account", "number","description","is_locked","login","name","name","firstname", - "salutation","degree","birthday","sex","db_status"); + "salutation","degree","birthday","sex","db_status","password"); $this->info['company_id'] = $this->ogo->gen_id(); $this->info['userID'] = "OGo".$this->info['company_id']; foreach($arr as $attr){ @@ -403,7 +405,7 @@ class ogw{ $arr = array( "company_id","object_version","owner_id", "template_user_id","is_person","is_account","is_intra_account", "is_extra_account","number","description","is_locked","login","name", - "firstname","salutation","degree","birthday","sex","db_status"); + "firstname","salutation","degree","birthday","sex","db_status","password"); $this->info['company_id'] = $ist[0]['company_id']; $this->info['userID'] = "OGo".$this->info['company_id']; foreach($arr as $attr){ @@ -516,16 +518,19 @@ class ogw{ (SELECT company_id FROM team WHERE is_location_team=1));"; $arr = array("company_assignment_id","company_id","sub_company_id","db_status"); - foreach($this->info['TeamIDis'] as $TeamID){ - $this->info['company_id'] = $TeamID; - $this->info['sub_company_id'] = $ist[0]['company_id']; - $this->info['company_assignment_id']= $this->ogo->gen_id(); - foreach($arr as $attr){ - $add_company_assignment[$attr] = $this->info[$attr]; - } - $QUERY[] = gen_syntax($add_company_assignment,"company_assignment","ADD",false); - } + if(is_array($this->info['TeamIDis'])){ + foreach($this->info['TeamIDis'] as $TeamID){ + $this->info['company_id'] = $TeamID; + $this->info['sub_company_id'] = $ist[0]['company_id']; + $this->info['company_assignment_id']= $this->ogo->gen_id(); + $add_company_assignment = array(); + foreach($arr as $attr){ + $add_company_assignment[$attr] = $this->info[$attr]; + } + $QUERY[] = gen_syntax($add_company_assignment,"company_assignment","ADD",false); + } + } $remove_all = false; foreach($QUERY as $q ){