Skip to content

Commit 336a577

Browse files
committed
Added Server table
1 parent aa51370 commit 336a577

File tree

11 files changed

+648
-250
lines changed

11 files changed

+648
-250
lines changed

interface/lib/app.inc.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -136,9 +136,11 @@ function lng($text)
136136
}
137137

138138
function tpl_defaults() {
139+
global $conf;
139140

140141
$this->tpl->setVar('theme',$_SESSION["s"]["theme"]);
141142
$this->tpl->setVar('phpsessid',session_id());
143+
$this->tpl->setVar('html_content_encoding',$conf["html_content_encoding"]);
142144

143145
}
144146

interface/lib/classes/tform_tpl_generator.inc.php

Lines changed: 47 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ function buildHTML($formDef,$tab) {
153153
// ansonsten wird sie angelegt
154154
$tables = $app->db->getTables();
155155

156-
if(!in_array($formDef['db_table'],$tables)) {
156+
if(!@in_array($formDef['db_table'],$tables)) {
157157
// Datenbank noch nicht vorhanden
158158

159159
$columns = array();
@@ -172,6 +172,52 @@ function buildHTML($formDef,$tab) {
172172
$columns[] = $col;
173173
$app->db->show_error_messages = true;
174174

175+
if($formDef["auth"] == 'yes') {
176+
177+
$col = array( 'action' => 'add',
178+
'name' => 'sys_userid',
179+
'type' => 'int32',
180+
'typeValue' => '',
181+
'defaultValue' => '',
182+
'notNull' => true
183+
);
184+
$columns[] = $col;
185+
$col = array( 'action' => 'add',
186+
'name' => 'sys_groupid',
187+
'type' => 'int32',
188+
'typeValue' => '',
189+
'defaultValue' => '',
190+
'notNull' => true
191+
);
192+
$columns[] = $col;
193+
$col = array( 'action' => 'add',
194+
'name' => 'sys_perm_user',
195+
'type' => 'varchar',
196+
'typeValue' => '5',
197+
'defaultValue' => '',
198+
'notNull' => true
199+
);
200+
$columns[] = $col;
201+
$col = array( 'action' => 'add',
202+
'name' => 'sys_perm_group',
203+
'type' => 'varchar',
204+
'typeValue' => '5',
205+
'defaultValue' => '',
206+
'notNull' => true
207+
);
208+
$columns[] = $col;
209+
$col = array( 'action' => 'add',
210+
'name' => 'sys_perm_other',
211+
'type' => 'varchar',
212+
'typeValue' => '5',
213+
'defaultValue' => '',
214+
'notNull' => true
215+
);
216+
$columns[] = $col;
217+
218+
}
219+
220+
175221
foreach($formDef['tabs'] as $tab) {
176222
foreach($tab["fields"] as $name => $field) {
177223
/*

interface/lib/config.inc.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,8 @@
6262
Themes
6363
*/
6464

65-
$conf["theme"] = 'default';
65+
$conf["theme"] = 'default';
66+
$conf["html_content_encoding"] = 'text/html; charset=iso-8859-1';
6667

6768
/*
6869
Default Language

0 commit comments

Comments
 (0)