Skip to content

Commit 316369a

Browse files
author
pedro_morgan
committed
* Fixed update column in mysql definition which had no backticks
* Silenced error in login/index.php
1 parent 100be1a commit 316369a

File tree

3 files changed

+51
-44
lines changed

3 files changed

+51
-44
lines changed

‎CODING_NOTES.php.txt‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,14 @@
11
Some guidelines for web development with php.
22
-----------------------------------------------------
3-
Unix Line Breaks Only, NO windows breaks please.
4-
5-
Tabs set at 4 spaces either as tabs or spaces.
3+
* Unix Line Breaks Only, NO windows breaks please.
4+
* Tabs set at 4 spaces either as tabs or spaces.
5+
* no accidental _<?php space before, within or after a file
6+
* every php file starts and end with <?php ?> no spaces before or after
7+
* error_reporting(E_ALL|E_STRICT) , yep php5
8+
* Magic quotes is gone in php6, get used to it now. config = magic_quotes_gpc() Everything must be quoted
9+
10+
please mark any section that nned review or work on with
11+
// TODO
612

713
Pear coding guiidelines
814

‎interface/sql/ispconfig3db.sql‎

Lines changed: 39 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
# --------------------------------------------------------
1111

1212
#
13-
# Tabellenstruktur für Tabelle `mail_blacklist`
13+
# Tabellenstruktur f�r Tabelle `mail_blacklist`
1414
#
1515

1616
DROP TABLE IF EXISTS mail_blacklist;
@@ -30,14 +30,14 @@ CREATE TABLE mail_blacklist (
3030
) TYPE=MyISAM;
3131

3232
#
33-
# Daten für Tabelle `mail_blacklist`
33+
# Daten f�r Tabelle `mail_blacklist`
3434
#
3535

3636
INSERT INTO mail_blacklist VALUES (2, 1, 0, 'riud', 'riud', '', 1, 'till@test.int', 'till@test.int', '0');
3737
# --------------------------------------------------------
3838

3939
#
40-
# Tabellenstruktur für Tabelle `mail_box`
40+
# Tabellenstruktur f�r Tabelle `mail_box`
4141
#
4242

4343
DROP TABLE IF EXISTS mail_box;
@@ -65,15 +65,15 @@ CREATE TABLE mail_box (
6565
) TYPE=MyISAM;
6666

6767
#
68-
# Daten für Tabelle `mail_box`
68+
# Daten f�r Tabelle `mail_box`
6969
#
7070

7171
INSERT INTO mail_box VALUES (1, 1, 0, 'riud', 'riud', '', 1, 'tt@test.int', '$1$tRlfKeOB$iHJgCn8mH8x/dh/XWy6v0/', '', '', 0, 0, '/var/spool/mail/till', '100', '0', '', '1');
7272
INSERT INTO mail_box VALUES (2, 1, 0, 'riud', 'riud', '', 1, 'moin@test.int', '$1$Ee/.7y3.$wZ4BLXs/Pa80ka9X4ikN8.', '', '', 0, 0, '/var/spool/mail/test.int/moin', '10', '0', '', '1');
7373
# --------------------------------------------------------
7474

7575
#
76-
# Tabellenstruktur für Tabelle `mail_domain`
76+
# Tabellenstruktur f�r Tabelle `mail_domain`
7777
#
7878

7979
DROP TABLE IF EXISTS mail_domain;
@@ -94,15 +94,15 @@ CREATE TABLE mail_domain (
9494
) TYPE=MyISAM;
9595

9696
#
97-
# Daten für Tabelle `mail_domain`
97+
# Daten f�r Tabelle `mail_domain`
9898
#
9999

100100
INSERT INTO mail_domain VALUES (1, 1, 0, 'riud', 'riud', '', 1, 'test.int', 'local', '', 1);
101101
INSERT INTO mail_domain VALUES (2, 1, 0, 'riud', 'riud', '', 1, 'test2.int', 'alias', 'test.int', 1);
102102
# --------------------------------------------------------
103103

104104
#
105-
# Tabellenstruktur für Tabelle `mail_domain_catchall`
105+
# Tabellenstruktur f�r Tabelle `mail_domain_catchall`
106106
#
107107

108108
DROP TABLE IF EXISTS mail_domain_catchall;
@@ -122,14 +122,14 @@ CREATE TABLE mail_domain_catchall (
122122
) TYPE=MyISAM;
123123

124124
#
125-
# Daten für Tabelle `mail_domain_catchall`
125+
# Daten f�r Tabelle `mail_domain_catchall`
126126
#
127127

128128
INSERT INTO mail_domain_catchall VALUES (1, 1, 1, 'riud', 'riud', '', 1, 'test.int', 'till@test.int', '1');
129129
# --------------------------------------------------------
130130

131131
#
132-
# Tabellenstruktur für Tabelle `mail_greylist`
132+
# Tabellenstruktur f�r Tabelle `mail_greylist`
133133
#
134134

135135
DROP TABLE IF EXISTS mail_greylist;
@@ -145,13 +145,13 @@ CREATE TABLE mail_greylist (
145145
) TYPE=MyISAM;
146146

147147
#
148-
# Daten für Tabelle `mail_greylist`
148+
# Daten f�r Tabelle `mail_greylist`
149149
#
150150

151151
# --------------------------------------------------------
152152

153153
#
154-
# Tabellenstruktur für Tabelle `mail_mailman_domain`
154+
# Tabellenstruktur f�r Tabelle `mail_mailman_domain`
155155
#
156156

157157
DROP TABLE IF EXISTS mail_mailman_domain;
@@ -167,13 +167,13 @@ CREATE TABLE mail_mailman_domain (
167167
) TYPE=MyISAM;
168168

169169
#
170-
# Daten für Tabelle `mail_mailman_domain`
170+
# Daten f�r Tabelle `mail_mailman_domain`
171171
#
172172

173173
# --------------------------------------------------------
174174

175175
#
176-
# Tabellenstruktur für Tabelle `mail_redirect`
176+
# Tabellenstruktur f�r Tabelle `mail_redirect`
177177
#
178178

179179
DROP TABLE IF EXISTS mail_redirect;
@@ -194,14 +194,14 @@ CREATE TABLE mail_redirect (
194194
) TYPE=MyISAM;
195195

196196
#
197-
# Daten für Tabelle `mail_redirect`
197+
# Daten f�r Tabelle `mail_redirect`
198198
#
199199

200200
INSERT INTO mail_redirect VALUES (1, 1, 0, 'riud', 'riud', '', 1, 'tom@test.int', 'tt@test.int', 'alias', '1');
201201
# --------------------------------------------------------
202202

203203
#
204-
# Tabellenstruktur für Tabelle `mail_spamfilter`
204+
# Tabellenstruktur f�r Tabelle `mail_spamfilter`
205205
#
206206

207207
DROP TABLE IF EXISTS mail_spamfilter;
@@ -226,15 +226,15 @@ CREATE TABLE mail_spamfilter (
226226
) TYPE=MyISAM;
227227

228228
#
229-
# Daten für Tabelle `mail_spamfilter`
229+
# Daten f�r Tabelle `mail_spamfilter`
230230
#
231231

232232
INSERT INTO mail_spamfilter VALUES (1, 0, 0, '', '', '', 1, 'till@test.int', 100, 100, 1, '***SPAM mag ich nicht***', '/var/spool/mail/spam', 0, '1');
233233
INSERT INTO mail_spamfilter VALUES (2, 1, 0, 'riud', 'riud', '', 1, 'till2@test.int', 500, 1500, 700, '***SPAM***', '/var/spool/mail/till', 14, '1');
234234
# --------------------------------------------------------
235235

236236
#
237-
# Tabellenstruktur für Tabelle `mail_transport`
237+
# Tabellenstruktur f�r Tabelle `mail_transport`
238238
#
239239

240240
DROP TABLE IF EXISTS mail_transport;
@@ -255,13 +255,13 @@ CREATE TABLE mail_transport (
255255
) TYPE=MyISAM;
256256

257257
#
258-
# Daten für Tabelle `mail_transport`
258+
# Daten f�r Tabelle `mail_transport`
259259
#
260260

261261
# --------------------------------------------------------
262262

263263
#
264-
# Tabellenstruktur für Tabelle `mail_whitelist`
264+
# Tabellenstruktur f�r Tabelle `mail_whitelist`
265265
#
266266

267267
DROP TABLE IF EXISTS mail_whitelist;
@@ -281,13 +281,13 @@ CREATE TABLE mail_whitelist (
281281
) TYPE=MyISAM;
282282

283283
#
284-
# Daten für Tabelle `mail_whitelist`
284+
# Daten f�r Tabelle `mail_whitelist`
285285
#
286286

287287
# --------------------------------------------------------
288288

289289
#
290-
# Tabellenstruktur für Tabelle `reseller`
290+
# Tabellenstruktur f�r Tabelle `reseller`
291291
#
292292

293293
DROP TABLE IF EXISTS reseller;
@@ -326,13 +326,13 @@ CREATE TABLE reseller (
326326
) TYPE=MyISAM;
327327

328328
#
329-
# Daten für Tabelle `reseller`
329+
# Daten f�r Tabelle `reseller`
330330
#
331331

332332
# --------------------------------------------------------
333333

334334
#
335-
# Tabellenstruktur für Tabelle `rr`
335+
# Tabellenstruktur f�r Tabelle `rr`
336336
#
337337

338338
DROP TABLE IF EXISTS rr;
@@ -354,7 +354,7 @@ CREATE TABLE rr (
354354
) TYPE=MyISAM;
355355

356356
#
357-
# Daten für Tabelle `rr`
357+
# Daten f�r Tabelle `rr`
358358
#
359359

360360
INSERT INTO rr VALUES (1, 2, '1', 'PTR', 'www.ensign.de.', 0, 86400, 1, 0, 'riud', 'riud', '');
@@ -363,7 +363,7 @@ INSERT INTO rr VALUES (3, 1, 'ensign.de', 'A', '192.168.0.1', 0, 86400, 1, 0, 'r
363363
# --------------------------------------------------------
364364

365365
#
366-
# Tabellenstruktur für Tabelle `server`
366+
# Tabellenstruktur f�r Tabelle `server`
367367
#
368368

369369
DROP TABLE IF EXISTS server;
@@ -382,20 +382,20 @@ CREATE TABLE server (
382382
db_server tinyint(4) NOT NULL default '0',
383383
vserver_server tinyint(4) NOT NULL default '0',
384384
config text NOT NULL,
385-
update tinyint(4) NOT NULL default '0',
385+
`update` tinyint(4) NOT NULL default '0',
386386
active tinyint(4) NOT NULL default '1',
387387
PRIMARY KEY (server_id)
388388
) TYPE=MyISAM;
389389

390390
#
391-
# Daten für Tabelle `server`
391+
# Daten f�r Tabelle `server`
392392
#
393393

394394
INSERT INTO server VALUES (1, 1, 1, 'riud', 'riud', '', 'Server 1', 1, 0, 0, 0, 0, 0, '[global]\r\nwebserver=apache\r\nmailserver=exim\r\ndnsserver=mydns\r\n\r\n[mail]\r\nmodule=exim_mysql\r\nmaildir_path=/var/spool/mail/[domain]/[localpart]\r\nmailuser_uid=0\r\nmailuser_gid=0', 0, 1);
395395
# --------------------------------------------------------
396396

397397
#
398-
# Tabellenstruktur für Tabelle `soa`
398+
# Tabellenstruktur f�r Tabelle `soa`
399399
#
400400

401401
DROP TABLE IF EXISTS soa;
@@ -423,15 +423,15 @@ CREATE TABLE soa (
423423
) TYPE=MyISAM;
424424

425425
#
426-
# Daten für Tabelle `soa`
426+
# Daten f�r Tabelle `soa`
427427
#
428428

429429
INSERT INTO soa VALUES (1, 'ensign.de.', 'ns1.example.com.', 'admin.example.com.', 2006012103, 28800, 7200, 604800, 86400, 86400, 'Y', '', 1, 0, 'riud', 'riud', '');
430430
INSERT INTO soa VALUES (2, '0.168.192.in-addr.arpa.', 'ns1.example.com.', 'admin.example.com.', 2006012101, 28800, 7200, 604800, 86400, 86400, 'Y', '', 1, 0, 'riud', 'riud', '');
431431
# --------------------------------------------------------
432432

433433
#
434-
# Tabellenstruktur für Tabelle `sys_datalog`
434+
# Tabellenstruktur f�r Tabelle `sys_datalog`
435435
#
436436

437437
DROP TABLE IF EXISTS sys_datalog;
@@ -448,13 +448,13 @@ CREATE TABLE sys_datalog (
448448
) TYPE=MyISAM;
449449

450450
#
451-
# Daten für Tabelle `sys_datalog`
451+
# Daten f�r Tabelle `sys_datalog`
452452
#
453453

454454
# --------------------------------------------------------
455455

456456
#
457-
# Tabellenstruktur für Tabelle `sys_dbsync`
457+
# Tabellenstruktur f�r Tabelle `sys_dbsync`
458458
#
459459

460460
DROP TABLE IF EXISTS sys_dbsync;
@@ -477,13 +477,13 @@ CREATE TABLE sys_dbsync (
477477
) TYPE=MyISAM;
478478

479479
#
480-
# Daten für Tabelle `sys_dbsync`
480+
# Daten f�r Tabelle `sys_dbsync`
481481
#
482482

483483
# --------------------------------------------------------
484484

485485
#
486-
# Tabellenstruktur für Tabelle `sys_filesync`
486+
# Tabellenstruktur f�r Tabelle `sys_filesync`
487487
#
488488

489489
DROP TABLE IF EXISTS sys_filesync;
@@ -502,13 +502,13 @@ CREATE TABLE sys_filesync (
502502
) TYPE=MyISAM;
503503

504504
#
505-
# Daten für Tabelle `sys_filesync`
505+
# Daten f�r Tabelle `sys_filesync`
506506
#
507507

508508
# --------------------------------------------------------
509509

510510
#
511-
# Tabellenstruktur für Tabelle `sys_group`
511+
# Tabellenstruktur f�r Tabelle `sys_group`
512512
#
513513

514514
DROP TABLE IF EXISTS sys_group;
@@ -520,15 +520,15 @@ CREATE TABLE sys_group (
520520
) TYPE=MyISAM;
521521

522522
#
523-
# Daten für Tabelle `sys_group`
523+
# Daten f�r Tabelle `sys_group`
524524
#
525525

526526
INSERT INTO sys_group VALUES (1, 'admin', 'Administrators group');
527527
INSERT INTO sys_group VALUES (2, 'user', 'Users Group');
528528
# --------------------------------------------------------
529529

530530
#
531-
# Tabellenstruktur für Tabelle `sys_user`
531+
# Tabellenstruktur f�r Tabelle `sys_user`
532532
#
533533

534534
DROP TABLE IF EXISTS sys_user;
@@ -564,7 +564,7 @@ CREATE TABLE sys_user (
564564
) TYPE=MyISAM;
565565

566566
#
567-
# Daten für Tabelle `sys_user`
567+
# Daten f�r Tabelle `sys_user`
568568
#
569569

570570
INSERT INTO sys_user VALUES (1, 1, 0, 'riud', 'riud', '', 'admin', '21232f297a57a5a743894a0e4a801fc3', 'admin,designer,mail,dns', 'admin', 'default', 'admin', 1, '', 'Administrator', '', '', '', '', '', '', '', '', '', 'en', '1,2', 0);

‎interface/web/login/index.php‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,14 +56,15 @@ public function render() {
5656

5757
if($username != '' and $passwort != '') {
5858
$sql = "SELECT * FROM sys_user WHERE USERNAME = '$username' and ( PASSWORT = '".md5($passwort)."' or PASSWORT = password('$passwort') )";
59-
if($user = $app->db->queryOneRecord($sql)) {
59+
$user = $app->db->queryOneRecord($sql);
60+
if($user) {
6061
if($user['active'] == 1) {
6162
$user = $app->db->toLower($user);
6263
$_SESSION = array();
6364
$_SESSION['s']['user'] = $user;
6465
$_SESSION['s']['user']['theme'] = $user['app_theme'];
6566
$_SESSION['s']['language'] = $user['language'];
66-
67+
//print_r($_SESSION);
6768
if(is_file($_SESSION['s']['user']['startmodule'].'/lib/module.conf.php')) {
6869
include_once($_SESSION['s']['user']['startmodule'].'/lib/module.conf.php');
6970
$_SESSION['s']['module'] = $module;

0 commit comments

Comments
 (0)