Merged revisions 1917-2036 from trunk.

tbrehm

2010-09-26 89e4554cb0bbf4b515f1e9f4ec6d48d0a95706c5

 interface/lib/classes/remoting_lib.inc.php

@@ -166,7 +166,9 @@
            $this->sys_userid            = $user['userid'];
            $this->sys_default_group     = $user['default_group'];
            $this->sys_groups             = $user['groups'];
            $_SESSION["s"]["user"]["typ"] = $user['typ'];
            // $_SESSION["s"]["user"]["typ"] = $user['typ'];
            // we have to force admin priveliges for the remoting API as some function calls might fail otherwise.
            $_SESSION["s"]["user"]["typ"] = 'admin';
         }

      return true;
@@ -192,9 +194,16 @@
                                        $new_record[$key] = stripslashes($record[$key]);
                                break;

                                case 'DATE':
                                case 'DATETSTAMP':
                                        if($record[$key] > 0) {
                                                $new_record[$key] = date($this->dateformat,$record[$key]);
                                        }
                                break;
								
                        case 'DATE':
                                        if($record[$key] != '' && $record[$key] != '0000-00-00') {
                                    $tmp = explode('-',$record[$key]);
                                                $new_record[$key] = date($this->dateformat,mktime(0, 0, 0, $tmp[1]  , $tmp[2], $tmp[0]));
                                        }
                                break;

@@ -306,12 +315,22 @@
                                                $new_record[$key] = implode($field['separator'],$record[$key]);
                                        }
                                break;
                                case 'DATE':
                                case 'DATETSTAMP':
                                        if($record[$key] > 0) {
                                                list($tag,$monat,$jahr) = explode('.',$record[$key]);
                                                $new_record[$key] = mktime(0,0,0,$monat,$tag,$jahr);
                                        } else {
                                 $new_record[$key] = 0;
                              }
                                break;
                        case 'DATE':
                                        if($record[$key] != '' && $record[$key] != '0000-00-00') {
                                                list($tag,$monat,$jahr) = explode('.',$record[$key]);
                                                $new_record[$key] = $jahr.'-'.$monat.'-'.$tag;
                                    //$tmp = strptime($record[$key],$this->dateformat);
                                    //$new_record[$key] = ($tmp['tm_year']+1900).'-'.($tmp['tm_mon']+1).'-'.$tmp['tm_mday'];
                                        } else {
                                 $new_record[$key] = '0000-00-00';
                              }
                                break;
                                case 'INTEGER':
@@ -645,8 +664,20 @@
         global $app,$sql1;
         $username = $app->db->quote($params["username"]);
         $password = $app->db->quote($params["password"]);
         $modules = 'mail,sites,dns,tools';
         $startmodule = 'mail';
         if(!isset($params['modules'])) {
            $modules = 'dashboard,mail,sites,dns,tools';
         } else {
            $modules = $app->db->quote($params['modules']);
         }
         if(!isset($params['startmodule'])) {			
            $startmodule = 'dashboard';
         } else {						
            $startmodule = $app->db->quote($params["startmodule"]);
            if(!preg_match('/'.$startmodule.'/',$modules)) {
               $_modules = explode(',',$modules);
               $startmodule=$_modules[0];
            }
         }
         $usertheme = $app->db->quote($params["usertheme"]);
         $type = 'user';
         $active = 1;
@@ -677,6 +708,10 @@

        function datalogSave($action,$primary_id, $record_old, $record_new) {
                global $app,$conf;
				
            $app->db->datalogSave($this->formDef['db_table'], $action, $this->formDef['db_table_idx'], $primary_id, $record_old, $record_new);
            return true;
            /*

                if(stristr($this->formDef['db_table'],'.')) {
                        $escape = '';
@@ -733,11 +768,6 @@
                        }
                }
            
            /*
            echo "<pre>";
            print_r($diffrec_full);
            echo "</pre>";
            */
            
            // Insert the server_id, if the record has a server_id
            $server_id = (isset($record_old["server_id"]) && $record_old["server_id"] > 0)?$record_old["server_id"]:0;
@@ -757,6 +787,7 @@
                }

                return true;
            */

        }