From df935fc5564e7ef5535ef21a1790521d42eba895 Mon Sep 17 00:00:00 2001 From: cajus Date: Mon, 3 Sep 2007 13:15:33 +0000 Subject: [PATCH] Moved to E_STRICT git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@7201 594d385d-05f5-0310-b6e9-bd551577e9d8 --- html/combine.php | 2 +- html/getFAIscript.php | 2 +- html/getbin.php | 2 +- html/getkiosk.php | 2 +- html/getldif.php | 2 +- html/helpviewer.php | 2 +- html/index.php | 2 +- include/class_config.inc | 2 +- include/class_ldap.inc | 2 +- include/class_mail-methods-cyrus.inc | 2 +- include/class_mail-methods-golab.inc | 2 +- include/class_mail-methods-kolab.inc | 2 +- include/class_pgsql_opengw.inc | 2 +- include/class_plugin.inc | 4 ++-- include/functions_helpviewer.inc | 2 +- include/php_setup.inc | 2 +- plugins/addons/addressbook/class_addressbook.inc | 4 ++-- plugins/admin/groups/class_groupMail.inc | 2 +- plugins/admin/ogroups/class_ogroup.inc | 2 +- plugins/personal/mail/class_mailAccount.inc | 2 +- plugins/personal/posix/class_posixAccount.inc | 2 +- 21 files changed, 23 insertions(+), 23 deletions(-) diff --git a/html/combine.php b/html/combine.php index 2eadab8a9..d5c23fc79 100644 --- a/html/combine.php +++ b/html/combine.php @@ -60,7 +60,7 @@ imagecopy ($pic, $image1, 0, 0, 0, 0, imagesx($image1), imagesy($image1)); imagecopy ($pic, $image2, imagesx($image1), 0, 0, 0, imagesx($image2), imagesy($image2)); imagePng($pic); -error_reporting (E_ALL); +error_reporting (E_ALL | E_STRICT); // vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler: ?> diff --git a/html/getFAIscript.php b/html/getFAIscript.php index 6c3cfeb37..8be8f02fb 100644 --- a/html/getFAIscript.php +++ b/html/getFAIscript.php @@ -62,7 +62,7 @@ restore_error_handler(); /* Basic setup, remove eventually registered sessions */ @require_once ("../include/php_setup.inc"); @require_once ("functions.inc"); -error_reporting (E_ALL); +error_reporting (E_ALL | E_STRICT); session_start (); /* Logged in? Simple security check */ diff --git a/html/getbin.php b/html/getbin.php index 1817439c4..daa16de6e 100644 --- a/html/getbin.php +++ b/html/getbin.php @@ -45,7 +45,7 @@ if (isset($_SESSION['binaryfile'])) { } echo $_SESSION['binary']; -error_reporting (E_ALL); +error_reporting (E_ALL | E_STRICT); // vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler: ?> diff --git a/html/getkiosk.php b/html/getkiosk.php index cde88c5a0..ba0ea77ee 100644 --- a/html/getkiosk.php +++ b/html/getkiosk.php @@ -49,7 +49,7 @@ function getkiosk ($id) /* Basic setup, remove eventually registered sessions */ @require_once ("../include/php_setup.inc"); @require_once ("functions.inc"); -error_reporting (E_ALL); +error_reporting (E_ALL | E_STRICT); session_start (); /* Logged in? Simple security check */ diff --git a/html/getldif.php b/html/getldif.php index 6241d4fa7..95964d3ff 100644 --- a/html/getldif.php +++ b/html/getldif.php @@ -60,7 +60,7 @@ function dump_ldap ($mode= 0) /* Basic setup, remove eventually registered sessions */ @require_once ("../include/php_setup.inc"); @require_once ("functions.inc"); -error_reporting (E_ALL); +error_reporting (E_ALL | E_STRICT); session_start (); /* Logged in? Simple security check */ diff --git a/html/helpviewer.php b/html/helpviewer.php index b07cfb551..4cbc459ab 100644 --- a/html/helpviewer.php +++ b/html/helpviewer.php @@ -23,7 +23,7 @@ @require_once ("functions.inc"); @require_once ("functions_helpviewer.inc"); -error_reporting(E_ALL); +error_reporting(E_ALL | E_STRICT); restore_error_handler(); header("Content-type: text/html; charset=UTF-8"); diff --git a/html/index.php b/html/index.php index 813ef72dc..77c375bc9 100644 --- a/html/index.php +++ b/html/index.php @@ -27,7 +27,7 @@ header("Content-type: text/html; charset=UTF-8"); function displayLogin() { global $smarty,$message,$config,$ssl,$error_collector; - error_reporting(E_ALL); + error_reporting(E_ALL | E_STRICT); /* Fill template with required values */ $username = ""; if(isset($_POST["username"])){ diff --git a/include/class_config.inc b/include/class_config.inc index c466c9797..e16945b88 100644 --- a/include/class_config.inc +++ b/include/class_config.inc @@ -327,7 +327,7 @@ class config { "sieve_server" => $attrs['goImapSieveServer'][0], "sieve_port" => $attrs['goImapSievePort'][0]); } - error_reporting(E_ALL); + error_reporting(E_ALL | E_STRICT); /* Get kerberos server. FIXME: only one is supported currently */ $ldap->cd ($this->current['BASE']); diff --git a/include/class_ldap.inc b/include/class_ldap.inc index 6ae00e896..dbc76f585 100644 --- a/include/class_ldap.inc +++ b/include/class_ldap.inc @@ -445,7 +445,7 @@ class LDAP{ */ function copy_FAI_resource_recursive($sourcedn,$destinationdn,$destinationName,$type="branch",$is_first = true,$depth=0) { - error_reporting(E_ALL); + error_reporting(E_ALL | E_STRICT); if($is_first){ echo "

".sprintf(_("Creating copy of %s"),"".@LDAP::fix($sourcedn)."")."

"; diff --git a/include/class_mail-methods-cyrus.inc b/include/class_mail-methods-cyrus.inc index 8fecaa217..3993f96a4 100644 --- a/include/class_mail-methods-cyrus.inc +++ b/include/class_mail-methods-cyrus.inc @@ -98,7 +98,7 @@ var $uattrib= "uid"; return(array("quotaUsage"=>"","gosaMailQuota"=>"")); } - error_reporting (E_ALL); + error_reporting (E_ALL | E_STRICT); return ($result); } diff --git a/include/class_mail-methods-golab.inc b/include/class_mail-methods-golab.inc index 0991b8ef7..36304f25a 100644 --- a/include/class_mail-methods-golab.inc +++ b/include/class_mail-methods-golab.inc @@ -73,7 +73,7 @@ class mailMethodGolab extends mailMethodCyrus return(false); } - error_reporting(E_ALL); + error_reporting(E_ALL | E_STRICT); return ($result); } diff --git a/include/class_mail-methods-kolab.inc b/include/class_mail-methods-kolab.inc index e37b80ce3..d2eecd487 100644 --- a/include/class_mail-methods-kolab.inc +++ b/include/class_mail-methods-kolab.inc @@ -73,7 +73,7 @@ class mailMethodKolab extends mailMethodCyrus return(false); } - error_reporting(E_ALL); + error_reporting(E_ALL | E_STRICT); return ($result); } diff --git a/include/class_pgsql_opengw.inc b/include/class_pgsql_opengw.inc index d3432226f..3615bb4c6 100644 --- a/include/class_pgsql_opengw.inc +++ b/include/class_pgsql_opengw.inc @@ -26,7 +26,7 @@ class pgre_sql{ function _connect() { - error_reporting(E_ALL); + error_reporting(E_ALL | E_STRICT); if(is_callable("pg_connect")){ if(!empty($this->pwd)){ $this->handle = @pg_connect("dbname=".$this->db." host=".$this->server." user=".$this->user); diff --git a/include/class_plugin.inc b/include/class_plugin.inc index 8bb0a2ce3..53c27b8ed 100644 --- a/include/class_plugin.inc +++ b/include/class_plugin.inc @@ -186,7 +186,7 @@ class plugin break; } } - error_reporting(E_ALL); + error_reporting(E_ALL | E_STRICT); if ($found){ $this->is_account= TRUE; @DEBUG (DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__, @@ -784,7 +784,7 @@ class plugin } /* close conncetion */ - error_reporting (E_ALL); + error_reporting (E_ALL | E_STRICT); ldap_unbind($ds); /* Adapt naming attribute */ diff --git a/include/functions_helpviewer.inc b/include/functions_helpviewer.inc index aad1af72b..ab9b3a1d7 100644 --- a/include/functions_helpviewer.inc +++ b/include/functions_helpviewer.inc @@ -274,7 +274,7 @@ function search($arr,$word) unset($_SESSION['parsed_search_keyword']); $_SESSION['parsed_search_keyword']=""; - error_reporting(E_ALL); + error_reporting(E_ALL | E_STRICT); /* prepare searchwords */ $word = trim($word); diff --git a/include/php_setup.inc b/include/php_setup.inc index 324a6b740..cf9c5cf6f 100644 --- a/include/php_setup.inc +++ b/include/php_setup.inc @@ -225,7 +225,7 @@ function dummy_error_handler() /* Get base dir for reference */ $BASE_DIR= dirname(dirname(__FILE__)); $ROOT_DIR= $BASE_DIR."/html"; -error_reporting (E_ALL); +error_reporting (E_ALL | E_STRICT); /* Register error handler */ $error_collector= ""; diff --git a/plugins/addons/addressbook/class_addressbook.inc b/plugins/addons/addressbook/class_addressbook.inc index 6ac0591e7..730d6367c 100644 --- a/plugins/addons/addressbook/class_addressbook.inc +++ b/plugins/addons/addressbook/class_addressbook.inc @@ -465,7 +465,7 @@ class addressbook extends plugin $this->telephone_list[$attrs['sn'][0].$attrs['dn']].= ""; } } - error_reporting(E_ALL); + error_reporting(E_ALL | E_STRICT); } /* Sort up list */ @@ -560,7 +560,7 @@ class addressbook extends plugin } else { $smarty->assign("info_$name", preg_replace("/\n/", "
", $info["$name"][0])); } - error_reporting(E_ALL); + error_reporting(E_ALL | E_STRICT); } elseif ($_SESSION['show_info'] == "ADD" && isset($this->$name)) { $smarty->assign("info_$name", $this->$name); } else { diff --git a/plugins/admin/groups/class_groupMail.inc b/plugins/admin/groups/class_groupMail.inc index a7225c4db..dc99297ce 100644 --- a/plugins/admin/groups/class_groupMail.inc +++ b/plugins/admin/groups/class_groupMail.inc @@ -525,7 +525,7 @@ class mailgroup extends plugin $mailusers[$attrs['mail'][0]]= $name."<". $attrs['mail'][0].">"; } - error_reporting (E_ALL); + error_reporting (E_ALL | E_STRICT); natcasesort ($mailusers); reset ($mailusers); diff --git a/plugins/admin/ogroups/class_ogroup.inc b/plugins/admin/ogroups/class_ogroup.inc index 5e3e121d3..f5eab4910 100644 --- a/plugins/admin/ogroups/class_ogroup.inc +++ b/plugins/admin/ogroups/class_ogroup.inc @@ -317,7 +317,7 @@ class ogroup extends plugin } else { $smarty->assign("combinedObjects", "$p1"); } - error_reporting(E_ALL); + error_reporting(E_ALL | E_STRICT); } /* Assign variables */ diff --git a/plugins/personal/mail/class_mailAccount.inc b/plugins/personal/mail/class_mailAccount.inc index ef48fdd07..381351314 100644 --- a/plugins/personal/mail/class_mailAccount.inc +++ b/plugins/personal/mail/class_mailAccount.inc @@ -505,7 +505,7 @@ class mailAccount extends plugin $mailusers[$attrs['mail'][0]]= $name."<". $attrs['mail'][0].">"; } - error_reporting (E_ALL); + error_reporting (E_ALL | E_STRICT); natcasesort ($mailusers); reset ($mailusers); diff --git a/plugins/personal/posix/class_posixAccount.inc b/plugins/personal/posix/class_posixAccount.inc index 94b8a1b58..e2bddd34d 100644 --- a/plugins/personal/posix/class_posixAccount.inc +++ b/plugins/personal/posix/class_posixAccount.inc @@ -1027,7 +1027,7 @@ class posixAccount extends plugin $dsc= preg_replace ('/^Group of user/', _("Group of user"), $attrs["description"][0]); $entry= $attrs["cn"][0]." [$dsc]"; } - error_reporting (E_ALL); + error_reporting (E_ALL | E_STRICT); if(obj_is_writable($attrs['dn'],"groups/group","memberUid")){ $this->groupMembership[$attrs['dn']]= $entry; -- 2.30.2