Fixed: FS#660 - Cannot choose user type "admin"

tbrehm

2009-03-27 e8993b9a9a16c7bf7cb6c9b7a84fbe9741e0e47a

 interface/lib/classes/tform.inc.php

@@ -394,7 +394,8 @@
                                                        $out = '';

                                                        foreach($field['value'] as $k => $v) {

                                                                $checked = ($k == $val)?' CHECKED':'';

                                                                $out .= "<label for=\"".$key."[]\" class=\"inlineLabel\"><input name=\"".$key."[]\" id=\"".$key."[]\" value=\"$k\" type=\"radio\" $checked/> $v</label>\r\n";

                                                                //$out .= "<label for=\"".$key."[]\" class=\"inlineLabel\"><input name=\"".$key."[]\" id=\"".$key."[]\" value=\"$k\" type=\"radio\" $checked/> $v</label>\r\n";

                                                $out .= "<input name=\"".$key."[]\" id=\"".$key."[]\" value=\"$k\" type=\"radio\" $checked/> $v\r\n";

                                                        }

                                                }

                                                $new_record[$key] = $out;

@@ -484,7 +485,8 @@
                                                $out = '';

                                                foreach($field['value'] as $k => $v) {

                                                        $checked = ($k == $field["default"])?' CHECKED':'';

                                                        $out .= "<label for=\"".$key."[]\" class=\"inlineLabel\"><input name=\"".$key."[]\" id=\"".$key."[]\" value=\"$k\" type=\"radio\" $checked/> $v</label>\r\n";

                                                        //$out .= "<label for=\"".$key."[]\" class=\"inlineLabel\"><input name=\"".$key."[]\" id=\"".$key."[]\" value=\"$k\" type=\"radio\" $checked/> $v</label>\r\n";

                                          $out .= "<input name=\"".$key."[]\" id=\"".$key."[]\" value=\"$k\" type=\"radio\" $checked/> $v\r\n";

                                                }

                                        }

                                        $new_record[$key] = $out;

@@ -738,10 +740,10 @@
                $sql_insert_val = '';

                $sql_update = '';



                if(!is_array($this->formDef)) $app->error("Keine Formulardefinition vorhanden.");

                if(!is_array($this->formDef['tabs'][$tab])) $app->error("Tab ist leer oder existiert nicht (TAB: $tab).");

                if(!is_array($this->formDef)) $app->error("Form definition not found.");

                if(!is_array($this->formDef['tabs'][$tab])) $app->error("The tab is empty or does not exist (TAB: $tab).");



                // gehe durch alle Felder des Tabs

                // go trough all fields of the tab

                if(is_array($record)) {

                foreach($this->formDef['tabs'][$tab]['fields'] as $key => $field) {

                                // Wenn es kein leeres Passwortfeld ist

@@ -865,6 +867,8 @@
                                $app->error("Primary ID fehlt!");

                        }

               }

               //* return a empty string if there is nothing to update

               if(trim($sql_update) == '') $sql = '';

                }

                

                return $sql;

@@ -1109,8 +1113,21 @@
                return $_SESSION["s"]["form"]["tab"];

        }

      

      function isReadonlyTab($tab) {

         if(isset($this->formDef['tabs'][$tab]['readonly']) && $this->formDef['tabs'][$tab]['readonly'] == true) {

      function isReadonlyTab($tab, $primary_id) {

         global $app, $conf;

			
         // Add backticks for incomplete table names.

            if(stristr($this->formDef['db_table'],'.')) {

                $escape = '';

            } else {

                $escape = '`';

            }

			
         $sql = "SELECT sys_userid FROM ".$escape.$this->formDef['db_table'].$escape." WHERE ".$this->formDef['db_table_idx']." = ".$primary_id;

            $record = $app->db->queryOneRecord($sql);

			
         // return true if the readonly flag of the form is set and the current loggedin user is not the owner of the record.

         if(isset($this->formDef['tabs'][$tab]['readonly']) && $this->formDef['tabs'][$tab]['readonly'] == true && $record['sys_userid'] != $_SESSION["s"]["user"]["userid"]) {

            return true;

         } else {

            return false;