From 316369a0a0b7f24085b3d137a2acfa746d9a34d6 Mon Sep 17 00:00:00 2001
From: pedro_morgan <pedro_morgan@ispconfig3>
Date: Sun, 19 Aug 2007 05:18:10 +0000
Subject: [PATCH] * Fixed `update` column in mysql definition which had no
backticks * Silenced error in login/index.php
---
CODING_NOTES.php.txt | 12 ++++--
interface/sql/ispconfig3db.sql | 78 +++++++++++++++++-----------------
interface/web/login/index.php | 5 ++-
3 files changed, 51 insertions(+), 44 deletions(-)
diff --git a/CODING_NOTES.php.txt b/CODING_NOTES.php.txt
index 210895654..0330fb6c7 100644
--- a/CODING_NOTES.php.txt
+++ b/CODING_NOTES.php.txt
@@ -1,8 +1,14 @@
Some guidelines for web development with php.
-----------------------------------------------------
-Unix Line Breaks Only, NO windows breaks please.
-
-Tabs set at 4 spaces either as tabs or spaces.
+* Unix Line Breaks Only, NO windows breaks please.
+* Tabs set at 4 spaces either as tabs or spaces.
+* no accidental _<?php space before, within or after a file
+* every php file starts and end with <?php ?> no spaces before or after
+* error_reporting(E_ALL|E_STRICT) , yep php5
+* Magic quotes is gone in php6, get used to it now. config = magic_quotes_gpc() Everything must be quoted
+
+please mark any section that nned review or work on with
+// TODO
Pear coding guiidelines
diff --git a/interface/sql/ispconfig3db.sql b/interface/sql/ispconfig3db.sql
index 7d2fe6e52..1b79ac742 100644
--- a/interface/sql/ispconfig3db.sql
+++ b/interface/sql/ispconfig3db.sql
@@ -10,7 +10,7 @@
# --------------------------------------------------------
#
-# Tabellenstruktur für Tabelle `mail_blacklist`
+# Tabellenstruktur f�r Tabelle `mail_blacklist`
#
DROP TABLE IF EXISTS mail_blacklist;
@@ -30,14 +30,14 @@ CREATE TABLE mail_blacklist (
) TYPE=MyISAM;
#
-# Daten für Tabelle `mail_blacklist`
+# Daten f�r Tabelle `mail_blacklist`
#
INSERT INTO mail_blacklist VALUES (2, 1, 0, 'riud', 'riud', '', 1, 'till@test.int', 'till@test.int', '0');
# --------------------------------------------------------
#
-# Tabellenstruktur für Tabelle `mail_box`
+# Tabellenstruktur f�r Tabelle `mail_box`
#
DROP TABLE IF EXISTS mail_box;
@@ -65,7 +65,7 @@ CREATE TABLE mail_box (
) TYPE=MyISAM;
#
-# Daten für Tabelle `mail_box`
+# Daten f�r Tabelle `mail_box`
#
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');
@@ -73,7 +73,7 @@ INSERT INTO mail_box VALUES (2, 1, 0, 'riud', 'riud', '', 1, 'moin@test.int', '$
# --------------------------------------------------------
#
-# Tabellenstruktur für Tabelle `mail_domain`
+# Tabellenstruktur f�r Tabelle `mail_domain`
#
DROP TABLE IF EXISTS mail_domain;
@@ -94,7 +94,7 @@ CREATE TABLE mail_domain (
) TYPE=MyISAM;
#
-# Daten für Tabelle `mail_domain`
+# Daten f�r Tabelle `mail_domain`
#
INSERT INTO mail_domain VALUES (1, 1, 0, 'riud', 'riud', '', 1, 'test.int', 'local', '', 1);
@@ -102,7 +102,7 @@ INSERT INTO mail_domain VALUES (2, 1, 0, 'riud', 'riud', '', 1, 'test2.int', 'al
# --------------------------------------------------------
#
-# Tabellenstruktur für Tabelle `mail_domain_catchall`
+# Tabellenstruktur f�r Tabelle `mail_domain_catchall`
#
DROP TABLE IF EXISTS mail_domain_catchall;
@@ -122,14 +122,14 @@ CREATE TABLE mail_domain_catchall (
) TYPE=MyISAM;
#
-# Daten für Tabelle `mail_domain_catchall`
+# Daten f�r Tabelle `mail_domain_catchall`
#
INSERT INTO mail_domain_catchall VALUES (1, 1, 1, 'riud', 'riud', '', 1, 'test.int', 'till@test.int', '1');
# --------------------------------------------------------
#
-# Tabellenstruktur für Tabelle `mail_greylist`
+# Tabellenstruktur f�r Tabelle `mail_greylist`
#
DROP TABLE IF EXISTS mail_greylist;
@@ -145,13 +145,13 @@ CREATE TABLE mail_greylist (
) TYPE=MyISAM;
#
-# Daten für Tabelle `mail_greylist`
+# Daten f�r Tabelle `mail_greylist`
#
# --------------------------------------------------------
#
-# Tabellenstruktur für Tabelle `mail_mailman_domain`
+# Tabellenstruktur f�r Tabelle `mail_mailman_domain`
#
DROP TABLE IF EXISTS mail_mailman_domain;
@@ -167,13 +167,13 @@ CREATE TABLE mail_mailman_domain (
) TYPE=MyISAM;
#
-# Daten für Tabelle `mail_mailman_domain`
+# Daten f�r Tabelle `mail_mailman_domain`
#
# --------------------------------------------------------
#
-# Tabellenstruktur für Tabelle `mail_redirect`
+# Tabellenstruktur f�r Tabelle `mail_redirect`
#
DROP TABLE IF EXISTS mail_redirect;
@@ -194,14 +194,14 @@ CREATE TABLE mail_redirect (
) TYPE=MyISAM;
#
-# Daten für Tabelle `mail_redirect`
+# Daten f�r Tabelle `mail_redirect`
#
INSERT INTO mail_redirect VALUES (1, 1, 0, 'riud', 'riud', '', 1, 'tom@test.int', 'tt@test.int', 'alias', '1');
# --------------------------------------------------------
#
-# Tabellenstruktur für Tabelle `mail_spamfilter`
+# Tabellenstruktur f�r Tabelle `mail_spamfilter`
#
DROP TABLE IF EXISTS mail_spamfilter;
@@ -226,7 +226,7 @@ CREATE TABLE mail_spamfilter (
) TYPE=MyISAM;
#
-# Daten für Tabelle `mail_spamfilter`
+# Daten f�r Tabelle `mail_spamfilter`
#
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');
@@ -234,7 +234,7 @@ INSERT INTO mail_spamfilter VALUES (2, 1, 0, 'riud', 'riud', '', 1, 'till2@test.
# --------------------------------------------------------
#
-# Tabellenstruktur für Tabelle `mail_transport`
+# Tabellenstruktur f�r Tabelle `mail_transport`
#
DROP TABLE IF EXISTS mail_transport;
@@ -255,13 +255,13 @@ CREATE TABLE mail_transport (
) TYPE=MyISAM;
#
-# Daten für Tabelle `mail_transport`
+# Daten f�r Tabelle `mail_transport`
#
# --------------------------------------------------------
#
-# Tabellenstruktur für Tabelle `mail_whitelist`
+# Tabellenstruktur f�r Tabelle `mail_whitelist`
#
DROP TABLE IF EXISTS mail_whitelist;
@@ -281,13 +281,13 @@ CREATE TABLE mail_whitelist (
) TYPE=MyISAM;
#
-# Daten für Tabelle `mail_whitelist`
+# Daten f�r Tabelle `mail_whitelist`
#
# --------------------------------------------------------
#
-# Tabellenstruktur für Tabelle `reseller`
+# Tabellenstruktur f�r Tabelle `reseller`
#
DROP TABLE IF EXISTS reseller;
@@ -326,13 +326,13 @@ CREATE TABLE reseller (
) TYPE=MyISAM;
#
-# Daten für Tabelle `reseller`
+# Daten f�r Tabelle `reseller`
#
# --------------------------------------------------------
#
-# Tabellenstruktur für Tabelle `rr`
+# Tabellenstruktur f�r Tabelle `rr`
#
DROP TABLE IF EXISTS rr;
@@ -354,7 +354,7 @@ CREATE TABLE rr (
) TYPE=MyISAM;
#
-# Daten für Tabelle `rr`
+# Daten f�r Tabelle `rr`
#
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
# --------------------------------------------------------
#
-# Tabellenstruktur für Tabelle `server`
+# Tabellenstruktur f�r Tabelle `server`
#
DROP TABLE IF EXISTS server;
@@ -382,20 +382,20 @@ CREATE TABLE server (
db_server tinyint(4) NOT NULL default '0',
vserver_server tinyint(4) NOT NULL default '0',
config text NOT NULL,
- update tinyint(4) NOT NULL default '0',
+ `update` tinyint(4) NOT NULL default '0',
active tinyint(4) NOT NULL default '1',
PRIMARY KEY (server_id)
) TYPE=MyISAM;
#
-# Daten für Tabelle `server`
+# Daten f�r Tabelle `server`
#
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);
# --------------------------------------------------------
#
-# Tabellenstruktur für Tabelle `soa`
+# Tabellenstruktur f�r Tabelle `soa`
#
DROP TABLE IF EXISTS soa;
@@ -423,7 +423,7 @@ CREATE TABLE soa (
) TYPE=MyISAM;
#
-# Daten für Tabelle `soa`
+# Daten f�r Tabelle `soa`
#
INSERT INTO soa VALUES (1, 'ensign.de.', 'ns1.example.com.', 'admin.example.com.', 2006012103, 28800, 7200, 604800, 86400, 86400, 'Y', '', 1, 0, 'riud', 'riud', '');
@@ -431,7 +431,7 @@ INSERT INTO soa VALUES (2, '0.168.192.in-addr.arpa.', 'ns1.example.com.', 'admin
# --------------------------------------------------------
#
-# Tabellenstruktur für Tabelle `sys_datalog`
+# Tabellenstruktur f�r Tabelle `sys_datalog`
#
DROP TABLE IF EXISTS sys_datalog;
@@ -448,13 +448,13 @@ CREATE TABLE sys_datalog (
) TYPE=MyISAM;
#
-# Daten für Tabelle `sys_datalog`
+# Daten f�r Tabelle `sys_datalog`
#
# --------------------------------------------------------
#
-# Tabellenstruktur für Tabelle `sys_dbsync`
+# Tabellenstruktur f�r Tabelle `sys_dbsync`
#
DROP TABLE IF EXISTS sys_dbsync;
@@ -477,13 +477,13 @@ CREATE TABLE sys_dbsync (
) TYPE=MyISAM;
#
-# Daten für Tabelle `sys_dbsync`
+# Daten f�r Tabelle `sys_dbsync`
#
# --------------------------------------------------------
#
-# Tabellenstruktur für Tabelle `sys_filesync`
+# Tabellenstruktur f�r Tabelle `sys_filesync`
#
DROP TABLE IF EXISTS sys_filesync;
@@ -502,13 +502,13 @@ CREATE TABLE sys_filesync (
) TYPE=MyISAM;
#
-# Daten für Tabelle `sys_filesync`
+# Daten f�r Tabelle `sys_filesync`
#
# --------------------------------------------------------
#
-# Tabellenstruktur für Tabelle `sys_group`
+# Tabellenstruktur f�r Tabelle `sys_group`
#
DROP TABLE IF EXISTS sys_group;
@@ -520,7 +520,7 @@ CREATE TABLE sys_group (
) TYPE=MyISAM;
#
-# Daten für Tabelle `sys_group`
+# Daten f�r Tabelle `sys_group`
#
INSERT INTO sys_group VALUES (1, 'admin', 'Administrators group');
@@ -528,7 +528,7 @@ INSERT INTO sys_group VALUES (2, 'user', 'Users Group');
# --------------------------------------------------------
#
-# Tabellenstruktur für Tabelle `sys_user`
+# Tabellenstruktur f�r Tabelle `sys_user`
#
DROP TABLE IF EXISTS sys_user;
@@ -564,7 +564,7 @@ CREATE TABLE sys_user (
) TYPE=MyISAM;
#
-# Daten für Tabelle `sys_user`
+# Daten f�r Tabelle `sys_user`
#
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);
diff --git a/interface/web/login/index.php b/interface/web/login/index.php
index 1ed915832..eddb14240 100644
--- a/interface/web/login/index.php
+++ b/interface/web/login/index.php
@@ -56,14 +56,15 @@ public function render() {
if($username != '' and $passwort != '') {
$sql = "SELECT * FROM sys_user WHERE USERNAME = '$username' and ( PASSWORT = '".md5($passwort)."' or PASSWORT = password('$passwort') )";
- if($user = $app->db->queryOneRecord($sql)) {
+ $user = $app->db->queryOneRecord($sql);
+ if($user) {
if($user['active'] == 1) {
$user = $app->db->toLower($user);
$_SESSION = array();
$_SESSION['s']['user'] = $user;
$_SESSION['s']['user']['theme'] = $user['app_theme'];
$_SESSION['s']['language'] = $user['language'];
-
+ //print_r($_SESSION);
if(is_file($_SESSION['s']['user']['startmodule'].'/lib/module.conf.php')) {
include_once($_SESSION['s']['user']['startmodule'].'/lib/module.conf.php');
$_SESSION['s']['module'] = $module;
--
GitLab