Removed passwort settings from opw template, because ogw is able to authenticate...

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

diff --git a/plugins/personal/connectivity/class_opengwAccount.inc b/plugins/personal/connectivity/class_opengwAccount.inc
index 9e9ce7f6dd424053425fcec2e43b2c7172eae901..b7ea6b6c31f4b7bf084eab02b2584e8e1beb9773 100644 (file)
--- a/plugins/personal/connectivity/class_opengwAccount.inc
+++ b/plugins/personal/connectivity/class_opengwAccount.inc
@@ -128,7 +128,7 @@ class opengwAccount extends plugin
                        $smarty->assign($ar,array());
                }
                $smarty->assign("OGWstate"," disabled ");
-               foreach(array("LocationTeam","TemplateUser","is_locked","validTeams","opengwAccount","is_account","OGWPassword") as $ar){
+               foreach(array("LocationTeam","TemplateUser","is_locked","validTeams","opengwAccount","is_account"/*,"OGWPassword"*/) as $ar){
                        $smarty->assign($ar,"");
                        $smarty->assign($ar."CHK","");
                        $smarty->assign($ar."ACL"," disabled ");
@@ -154,7 +154,7 @@ class opengwAccount extends plugin
 
                                        /* Show main page */
                                        $smarty->assign("OGWstate"," disabled ");
-                                       foreach(array("LocationTeam","TemplateUser","is_locked","validTeams","opengwAccount","OGWPassword") as $ar){
+                                       foreach(array("LocationTeam","TemplateUser","is_locked","validTeams","opengwAccount"/*,"OGWPassword"*/) as $ar){
                                                $smarty->assign($ar."ACL",chkacl($this->acl,$ar));
                                        }
 
@@ -219,6 +219,7 @@ class opengwAccount extends plugin
 
                                } 
                        }
+      /*
       if($this->SetPassword == false){
         if($_SESSION['js'] == 1){
           $smarty->assign("OGWPasswordACL"," disabled ");
@@ -232,6 +233,7 @@ class opengwAccount extends plugin
         $smarty->assign("OGWPassword",$this->OGWPassword);
         $smarty->assign("OGWPasswordCHK"," checked ");
       }
+      */
                $display.= $smarty->fetch (get_template_path('opengw.tpl', TRUE, dirname(__FILE__)));
                return ($display);
        }
@@ -253,6 +255,7 @@ class opengwAccount extends plugin
                /* get post data */
                if($this->is_account){
 
+      /*
       if(isset($_POST['SetPassword'])){
         $this->SetPassword =true;
       }else{
@@ -269,6 +272,7 @@ class opengwAccount extends plugin
           unset($this->info['password']);
         }
       }
+      */
 
                        /* Get selected team chkboxes */
                        $this->info['TeamIDis'] = array();

diff --git a/plugins/personal/connectivity/opengw.tpl b/plugins/personal/connectivity/opengw.tpl
index fbda05dac48feb939258ae9bf2db3f29aa15c9ca..5744875a91b016032d5065137c1b3ab0e0472476 100644 (file)
--- a/plugins/personal/connectivity/opengw.tpl
+++ b/plugins/personal/connectivity/opengw.tpl
@@ -37,21 +37,6 @@
                                                <input type="checkbox" value="1" name="is_locked" {$is_lockedCHK}  
                                                   {if $is_lockedACL!="" || $OGWstate!=""}
                                 disabled
-                           {/if}>
-                                       </td>
-                               </tr>
-                               <tr>
-                                       <td valign="top">
-                                               <input type="checkbox" name="SetPassword" value="1" {$OGWPasswordCHK} onClick="changeState('OGWPassword');" 
-                                                  {if $OGWstate!=""}
-                                disabled
-                           {/if}>
-                                               {t}Set password{/t} &nbsp; 
-                                       </td>
-                                       <td valign="top">
-                                               <input type="text" name="OGWPassword" value="{$OGWPassword}" id="OGWPassword" 
-                                                  {if $OGWPasswordACL!="" || $OGWstate!=""}
-                                disabled
                            {/if}>
                                        </td>
                                </tr>