Merge branch 'master' into 'master'

Marius Cramer

2015-06-03 1e24e990804732a0f6981cd2db7fda2da11b29ed

 interface/lib/classes/tform_base.inc.php

@@ -471,7 +471,7 @@
                  if(is_array($field['value'])) {
                     foreach($field['value'] as $k => $v) {
                        $selected = ($k == $val)?' SELECTED':'';
                        if(!empty($this->wordbook[$v]))
                        if(isset($this->wordbook[$v]))
                           $v = $this->wordbook[$v];
                        $out .= "<option value='$k'$selected>".$this->lng($v)."</option>\r\n";
                     }
@@ -714,8 +714,8 @@
               unset($_POST);
               unset($record);
            }
            $_SESSION['_csrf'][$_csrf_id] = ' ';
            $_SESSION['_csrf_timeout'][$_csrf_id] = ' ';
            $_SESSION['_csrf'][$_csrf_id] = null;
            $_SESSION['_csrf_timeout'][$_csrf_id] = null;
            unset($_SESSION['_csrf'][$_csrf_id]);
            unset($_SESSION['_csrf_timeout'][$_csrf_id]);
            
@@ -725,6 +725,8 @@
                  if($timeout < time()) $to_unset[] = $_csrf_id;
               }
               foreach($to_unset as $_csrf_id) {
                  $_SESSION['_csrf'][$_csrf_id] = null;
                  $_SESSION['_csrf_timeout'][$_csrf_id] = null;
                  unset($_SESSION['_csrf'][$_csrf_id]);
                  unset($_SESSION['_csrf_timeout'][$_csrf_id]);
               }
@@ -945,7 +947,7 @@
            }
            break;
         case 'NOTEMPTY':
            if(empty($field_value)) {
            if(!isset($field_value) || $field_value === '') {
               $errmsg = $validator['errmsg'];
               if(isset($this->wordbook[$errmsg])) {
                  $this->errorMessage .= $this->wordbook[$errmsg]."<br />\r\n";