Skip to content
Snippets Groups Projects

Fix notices warnings

Merged Tim Mohrbach requested to merge preexo/vtigercrm:fix_notices_warnings into master
1 file
+ 3
3
Compare changes
  • Side-by-side
  • Inline
@@ -109,7 +109,7 @@ class Install_Utils_Model {
* Returns the recommended php settings for vtigerCRM
* @return type
*/
function getRecommendedDirectives(){
public static function getRecommendedDirectives(){
if(version_compare(PHP_VERSION, '5.5.0') >= 0){
self::$recommendedDirectives['error_reporting'] = 'E_WARNING & ~E_NOTICE & ~E_DEPRECATED & ~E_STRICT';
}
@@ -123,7 +123,7 @@ class Install_Utils_Model {
* Function checks for vtigerCRM installation prerequisites
* @return <Array>
*/
function getSystemPreInstallParameters() {
public static function getSystemPreInstallParameters() {
$preInstallConfig = array();
// Name => array( System Value, Recommended value, supported or not(true/false) );
$preInstallConfig['LBL_PHP_VERSION'] = array(phpversion(), '5.4.0', (version_compare(phpversion(), '5.4.0', '>=')));
@@ -152,7 +152,7 @@ class Install_Utils_Model {
* Function that provides default configuration based on installer setup
* @return <Array>
*/
function getDefaultPreInstallParameters() {
public static function getDefaultPreInstallParameters() {
include 'config.db.php';
$parameters = array(
@@ -348,7 +348,7 @@ class Install_Utils_Model {
//Checking for database connection parameters
if($db_type) {
$conn = &NewADOConnection($db_type);
$conn = NewADOConnection($db_type);
$db_type_status = true;
if(@$conn->Connect($db_hostname,$db_username,$db_password)) {
$db_server_status = true;
@@ -358,7 +358,7 @@ class Install_Utils_Model {
}
if($create_db) {
// drop the current database if it exists
$dropdb_conn = &NewADOConnection($db_type);
$dropdb_conn = NewADOConnection($db_type);
if(@$dropdb_conn->Connect($db_hostname, $root_user, $root_password, $db_name)) {
$query = "DROP DATABASE ".$db_name;
$dropdb_conn->Execute($query);
@@ -367,7 +367,7 @@ class Install_Utils_Model {
// create the new database
$db_creation_failed = true;
$createdb_conn = &NewADOConnection($db_type);
$createdb_conn = NewADOConnection($db_type);
if(@$createdb_conn->Connect($db_hostname, $root_user, $root_password)) {
$query = "CREATE DATABASE ".$db_name;
if($create_utf8_db == 'true') {
Loading