Merged revisions 4069-4117 from stable branch.

tbrehm

2013-08-21 7b47c0aa0aeee6f059f00008e36cc210ca89ecb9

 interface/lib/classes/tform.inc.php

@@ -552,9 +552,10 @@
                                    $new_record[$key] = $out;
                              break;

                        case 'PASSWORD':
                              $new_record[$key] = '';
                        break;
                                case 'PASSWORD':
                                        //$new_record[$key] = '';
                              $new_record[$key] = htmlspecialchars($field['default']);
                                break;

                        case 'CHECKBOX':
                              // $checked = (empty($field["default"]))?'':' CHECKED';
@@ -1257,7 +1258,7 @@
      function getDataRecord($primary_id) {
         global $app;
         $escape = '`';
         $sql = "SELECT * FROM ".$escape.$this->formDef['db_table'].$escape." WHERE ".$this->formDef['db_table_idx']." = ".$primary_id;
         $sql = "SELECT * FROM ".$escape.$this->formDef['db_table'].$escape." WHERE ".$this->formDef['db_table_idx']." = ".$primary_id." AND ".$this->getAuthSQL('r',$this->formDef['db_table']);
         return $app->db->queryOneRecord($sql);
      }

@@ -1267,7 +1268,7 @@

            $app->db->datalogSave($this->formDef['db_table'], $action, $this->formDef['db_table_idx'], $primary_id, $record_old, $record_new);
            return true;

<<<<<<< .mine
            /*
            // Add backticks for incomplete table names.
            if(stristr($this->formDef['db_table'],'.')) {
@@ -1331,7 +1332,7 @@
            return true;
            */

      }
=======>>>>>>> .theirs      }

      function getAuthSQL($perm, $table = '') {
            if($_SESSION["s"]["user"]["typ"] == 'admin') {