Skip to content

Commit 87a4a65

Browse files
committed
server base system
1 parent e22f1ee commit 87a4a65

File tree

14 files changed

+1801
-887
lines changed

14 files changed

+1801
-887
lines changed

interface/lib/classes/tform.inc.php

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -805,13 +805,16 @@ function datalogSave($action,$primary_id,$record_new) {
805805
}
806806
}
807807
}
808+
809+
// Insert the server_id, if the record has a server_id
810+
$server_id = ($record_old["server_id"] > 0)?$record_old["server_id"]:0;
808811

809812
if(count($diffrec) > 0) {
810813
$diffstr = $app->db->quote(serialize($diffrec));
811814
$username = $app->db->quote($_SESSION["s"]["user"]["username"]);
812815
$dbidx = $this->formDef['db_table_idx'].":".$primary_id;
813816
$action = ($action == 'INSERT')?'i':'u';
814-
$sql = "INSERT INTO sys_datalog (dbtable,dbidx,action,tstamp,user,data) VALUES ('".$this->formDef['db_table']."','$dbidx','$action','".time()."','$username','$diffstr')";
817+
$sql = "INSERT INTO sys_datalog (dbtable,dbidx,server_id,action,tstamp,user,data) VALUES ('".$this->formDef['db_table']."','$dbidx','$server_id','$action','".time()."','$username','$diffstr')";
815818
$app->db->query($sql);
816819
}
817820

interface/lib/server_conf.master

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
[global]
2+
webserver=apache
3+
mailserver=exim
4+
dnsserver=mydns
5+
6+
[mail]
7+
module=exim_mysql
8+
maildir_path=/var/spool/mail/[domain]/[localpart]
9+
mailuser_uid=0
10+
mailuser_gid=0
11+
12+
[web]
13+
module=generic
14+
15+
[dns]
16+
module=generic
17+
18+
[db]
19+
module=generic
20+
21+
[file]
22+
module=generic
23+
24+
[vserver]
25+
module=generic

0 commit comments

Comments
 (0)