Changeset 1073

Timestamp:

03/23/08 14:40:46 (6 months ago)

Author:

rats

Message:

Fixed: Warnings and Notices if no Database found or no conection to it
Other small fixes

Files:

• trunk/CHANGELOG (modified) (1 diff)
• trunk/configs/dists/freebsd/ispcp.conf (modified) (2 diffs)
• trunk/configs/dists/freebsd/postfix/main.cf (modified) (2 diffs)
• trunk/configs/dists/opensuse/proftpd/proftpd.conf (modified) (2 diffs)
• trunk/docs/OpenSuse/opensuse103-packages (modified) (1 diff)
• trunk/gui/admin/ip_manage.php (modified) (1 diff)
• trunk/gui/include/input-checks.php (modified) (1 diff)
• trunk/gui/include/ispcp-config.php (modified) (4 diffs)
• trunk/gui/include/ispcp-lib.php (modified) (3 diffs)
• trunk/gui/include/sql.php (modified) (3 diffs)
• trunk/gui/include/system-message.php (modified) (2 diffs)

trunk/CHANGELOG

@@ -1 +1 @@
-ispCP ω 1.0.0 Changelog
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+2008-03-23 Benedikt Heintel
+        - GUI:
+                * Fixed: Warnings and Notices if no Database found or no conection to it
+
+2008-03-22 Benedikt Heintel
+        - GUI:
+                * Fixed: Error in input check and IP management
+        - DISTS:
+                * Fixed #1130: (FreeBSD) Fix program path in freebsd distro
-
-2008-03-22 Christian Hernmarck

trunk/configs/dists/freebsd/ispcp.conf

@@ -300 +300 @@
-CMD_HTTPD = /usr/local/sbin/apachectl
-
-.sh
+
-
-CMD_IMAP_SSL = no
@@ -306 +306 @@
-CMD_MTA = /usr/local/etc/rc.d/postfix
-
-local/etc/named.r
-
-.sh
+sbin/rnd
+
+
-
-CMD_POP_SSL = no

trunk/configs/dists/freebsd/postfix/main.cf

@@ -20 +20 @@
-
-# Postfix directory settings; These are critical for normal Postfix MTA functionallity
-
-ib
-ib
+local/
+ocal/libexec
+ocal/libexec
-
-# Some common configuration parameters
@@ -33 +33 @@
-
-smtpd_banner                 = $myhostname ESMTP ispCP {MTA_VERSION} Managed
-post
+mail
-
-# Receiving messages parameters

trunk/configs/dists/opensuse/proftpd/proftpd.conf

@@ -46 +46 @@
-
-DisplayLogin               welcome.msg
-FirstChdir
+Chdir     
-
-ListOptions                "-l"
@@ -161 +161 @@
-
-# ispCP SQL Managment
-
-
+
-SQLAuthTypes               Crypt
-SQLAuthenticate            on

trunk/docs/OpenSuse/opensuse103-packages

@@ -80 +80 @@
-php5
-php5-fastcgi
+php5-ftp
-php5-mbstring
-php5-mcrypt

trunk/gui/admin/ip_manage.php

@@ -133 +133 @@
-        }
-
-
+ && isset($_POST['ip_number_1'])
-                $tpl->assign(
-                        array(

trunk/gui/include/input-checks.php

@@ -150 +150 @@
-        }
-
-
+!empty($permitted) && 
-                return false;
-        }

trunk/gui/include/ispcp-config.php

@@ -28 +28 @@
-$cfg_obj = new Config($cfgfile);
-
-* Status not ok -> Try to get the error and display a message */
+/ Status not ok -> Try to get the error and display a message
-if ($cfg_obj->status != 'ok') {
-        if ($cfg_obj->status == 'err') {
-* cannot open ispcp.conf file - we must show warning */
- "<center><b><font color=red>Cannot open the ispcp.conf config file !<br><br>Please contact your system administrator</font></b></center>";
-
+/ cannot open ispcp.conf file - we must show warning
+
+"<center><b><font color=red>Cannot open the ispcp.conf config file!<br />Please contact your system administrator</font></b></center>"
-        }
-
-        if (substr($cfg_obj->status, 0, 24) == 'missing config variable:') {
-
-
-
+
+
-        }
-}
@@ -45 +44 @@
-$cfg = $cfg_obj->getValues();
-
+// this class will parse config file and get all variables avaible in PHP
-class Config {
-* this class will parse config file and get all variables avaible in PHP */
+/ config filename
-        var $config_file;
-
-
-* IMPORTANT: any adding & removing of variables in /etc/ispcp/ispcp.conf should also be made here! */
-/* array with all options from config file - predefined with null */
+
+
+/ array with all options from config file - predefined with null
+
-                'BuildDate' => null,
-                'Version' => null,
@@ -225 +225 @@
-
-        function parseFile() {
-* open file ... parse it and put it in $cfg_values */
+/ open file ... parse it and put it in $cfg_values
-                @$fd = fopen($this->config_file, 'r');
-                if ($fd == false) {
-                        /* ooops error */
-                        $this->status = 'err';
-                        return false;
-                } while (!feof($fd)) {
-                        $buffer = fgets($fd, 4096);
-* remove spaces  */
+/ remove spaces
-                        $buffer = ltrim($buffer);
-
-
-
-
-
-
-
+
+
-                                $pair = explode('=', $buffer, 2);
-
-
-
-
-
-
-
-
+
+
+
+
-                                $this->cfg_values[$pair[0]] = $pair[1];
-                        }
@@ -279 +270 @@
-        if (extension_loaded('mcrypt') || @dl('mcrypt.' . PHP_SHLIB_SUFFIX)) {
-                $text = @base64_decode($db_pass . "\n");
-* Open the cipher */
+/ Open the cipher
-                $td = @mcrypt_module_open ('blowfish', '', 'cbc', '');
-* Create key */
+/ Create key
-                $key = $ispcp_db_pass_key;
-* Create the IV and determine the keysize length */
+/ Create the IV and determine the keysize length
-                $iv = $ispcp_db_pass_iv;
-
-* Intialize encryption */
+/ Intialize encryption
-                @mcrypt_generic_init ($td, $key, $iv);
-* Decrypt encrypted string */
+/ Decrypt encrypted string
-                $decrypted = @mdecrypt_generic ($td, $text);
-                @mcrypt_module_close ($td);
-
-* Show string */
+/ Show string
-                return trim($decrypted);
-        } else {
- 
+
-                die();
-        }

trunk/gui/include/ispcp-lib.php

@@ -30 +30 @@
-//error_reporting(0);
-// setting for development edition - see all error messages
-|E_STRICT
+
-
-require_once(INCLUDEPATH.'/spGzip.php');
-require_once(INCLUDEPATH.'/class.pTemplate.php');
-require_once(INCLUDEPATH.'/i18n.php');
+
+// Template pathes
+$cfg['ROOT_TEMPLATE_PATH'] = 'themes/';
+$cfg['USER_INITIAL_THEME'] = 'omega_original';
+$cfg['LOGIN_TEMPLATE_PATH'] = $cfg['ROOT_TEMPLATE_PATH'].$cfg['USER_INITIAL_THEME'];
+$cfg['ADMIN_TEMPLATE_PATH'] = '../'.$cfg['ROOT_TEMPLATE_PATH'].$cfg['USER_INITIAL_THEME'].'/admin';
+$cfg['RESELLER_TEMPLATE_PATH'] = '../'.$cfg['ROOT_TEMPLATE_PATH'].$cfg['USER_INITIAL_THEME'].'/reseller';
+$cfg['CLIENT_TEMPLATE_PATH'] = '../'.$cfg['ROOT_TEMPLATE_PATH'].$cfg['USER_INITIAL_THEME'].'/client';
+$cfg['IPS_LOGO_PATH'] = '../themes/user_logos';
+$cfg['PURCHASE_TEMPLATE_PATH'] = '../'.$cfg['ROOT_TEMPLATE_PATH'].$cfg['USER_INITIAL_THEME'].'/orderpanel';
+
+// Standard Language (if not set)
+$cfg['USER_INITIAL_LANG'] = 'lang_English';
+
-require_once(INCLUDEPATH.'/system-message.php');
-require_once(INCLUDEPATH.'/ispcp-db-keys.php');
@@ -60 +74 @@
-$cfg['MAX_SQL_USER_LENGTH'] = 16;
-$cfg['MAX_SQL_PASS_LENGTH'] = 32;
-// Template pathes
-$cfg['ROOT_TEMPLATE_PATH'] = 'themes/';
-$cfg['LOGIN_TEMPLATE_PATH'] = $cfg['ROOT_TEMPLATE_PATH'].$cfg['USER_INITIAL_THEME'];
-$cfg['ADMIN_TEMPLATE_PATH'] = '../'.$cfg['ROOT_TEMPLATE_PATH'].$cfg['USER_INITIAL_THEME'].'/admin';
-$cfg['RESELLER_TEMPLATE_PATH'] = '../'.$cfg['ROOT_TEMPLATE_PATH'].$cfg['USER_INITIAL_THEME'].'/reseller';
-$cfg['CLIENT_TEMPLATE_PATH'] = '../'.$cfg['ROOT_TEMPLATE_PATH'].$cfg['USER_INITIAL_THEME'].'/client';
-$cfg['IPS_LOGO_PATH'] = '../themes/user_logos';
-$cfg['PURCHASE_TEMPLATE_PATH'] = '../'.$cfg['ROOT_TEMPLATE_PATH'].$cfg['USER_INITIAL_THEME'].'/orderpanel';
-
-// the following variables are overriden via admin cp
@@ -74 +80 @@
-// 'reseller' => hosting plans are available only in reseller level
-$cfg['HOSTING_PLANS_LEVEL'] = 'reseller';
-$cfg['USER_INITIAL_LANG'] = 'lang_English';
-
-// enable or disable supportsystem

trunk/gui/include/sql.php

@@ -1 +1 @@
-<?php
-/**
- ispCP (OMEGA) a Virtual Hosting Control Panel
+ispCP ω (OMEGA) a Virtual Hosting Control System
- *
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
+
+
-
-$cfg['DB_TYPE'] = $cfg['DATABASE_TYPE'];
-
-$cfg['DB_HOST'] = $cfg['DATABASE_HOST'];
-
-$cfg['DB_USER'] = $cfg['DATABASE_USER'];
-
-$cfg['DB_PASS'] = decrypt_db_password($cfg['DATABASE_PASSWORD']);
-
-$cfg['DB_NAME'] = $cfg['DATABASE_NAME'];
-
-$sql = &ADONewConnection($cfg['DB_TYPE']);
-
- -> Connect($cfg['DB_HOST'], $cfg['DB_USER'], $cfg['DB_PASS'], $cfg['DB_NAME']) OR
-.$sql -> ErrorMsg() 
+->Connect($cfg['DB_HOST'], $cfg['DB_USER'], $cfg['DB_PASS'], $cfg['DB_NAME']) or
+ . $sql->ErrorMsg()
-
-* switch optionally to utf8 based communication with the database */
+/ switch optionally to utf8 based communication with the database
-if (isset($cfg['DATABASE_UTF8']) && $cfg['DATABASE_UTF8'] == 'yes') {
- 
+       
-}
-
-* No longer needed */
+/ No longer needed - unset for safety
-unset($cfg['DB_USER']);
-
-unset($cfg['DB_PASS']);
-/* unset for safety */
-
-function execute_query (&$sql, $query) {
- -> 
- -> 
+->
+->
-        return $rs;
-}
@@ -60 +51 @@
-
-        if (!$rs && $failDie) {
-    
+       
-        }
-
@@ -67 +58 @@
-
-function quoteIdentifier($identifier) {
-    
+       
-
-    
+       
-
-    
+       
-}
-
-function match_sqlinjection($value, &$matches) {
-    
->
+       
+ > 
-}
-
-function check_query($exclude = array()) {
-    
+       
-
-
-
-
+
+
+
+
+
+
-
-    
-        
-    
+       
+               
+       
-
-
+
+
+
+
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-        if (!is_array($value)) {
-            if (match_sqlinjection($value, $matches)) {
-                $message = "Possible SQL injection detected: $key=>$value. <b>${matches[0]}</b>. Script terminated.";
-                write_log($message);
-                system_message($message);
-                die('<b>WARNING</b>: Possible SQL injection detected. Script terminated.');
-            }
-        } else {
-            foreach($value as $skey=>$svalue) {
-                if (!is_array($svalue)) {
-                    if (match_sqlinjection($svalue, $matches)) {
-                        $message = "Possible SQL injection detected: $skey=>$svalue <b>${matches[0]}</b>. Script terminated.";
-                        write_log($message);
-                        system_message($message);
-                        die('<b>WARNING</b>: Possible SQL injection detected. Script terminated.');
-                    }
-                }
-            }
-        }
-    }
-}
-?>

trunk/gui/include/system-message.php

@@ -1 +1 @@
-<?php
-/**
- ispCP (OMEGA) - Virtual Hosting Control System | Omega Version
+ispCP ω (OMEGA) a Virtual Hosting Control System
- *
-
-
-
-
+
+
+
+
+
- *
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-function system_message($msg) {
@@ -23 +25 @@
-
-        if (isset($_SESSION['user_theme'])) {
-
-                $theme_color = $_SESSION['user_theme'];
-
-        } else {
-
-                $theme_color = $cfg['USER_INITIAL_THEME'];
-
-        }
-