From 3e05075cf3aeff4d23dc9eba7af236ea47cb919d Mon Sep 17 00:00:00 2001 From: Roland Hieber Date: Sun, 22 Feb 2009 00:16:47 +0100 Subject: [PATCH 1/1] dos2unix on all files; new .project; chklocale from testing (9.02.20) bothers about whitespace on endline and tabs, added .buildpath to hgignore --- .hgignore | 1 + .project | 5 + debian/copyright | 86 +++--- inc/class_erConfig.inc | 48 ++-- inc/class_erErrorReport.inc | 48 ++-- inc/class_erErrorReportManager.inc | 48 ++-- inc/class_erErrorReportView.inc | 48 ++-- inc/functions.inc | 78 +++--- inc/init.inc | 48 ++-- lang/mod_error-reporter.po | 366 ++++++++++++------------- maint/update.php | 46 ++-- nav/79mod_error-reporter.mod | 48 ++-- nav/admin/99mod_error-reporter-cfg.mod | 48 ++-- src/config.php | 50 ++-- src/detail.php | 48 ++-- src/index.php | 50 ++-- 16 files changed, 535 insertions(+), 531 deletions(-) diff --git a/.hgignore b/.hgignore index 3a4d459..0e618cd 100644 --- a/.hgignore +++ b/.hgignore @@ -4,3 +4,4 @@ src/newfile.php inc/config.inc debian/files debian/iserv-mod-error-reporter +.buildpath diff --git a/.project b/.project index b054eb7..e97c762 100644 --- a/.project +++ b/.project @@ -5,6 +5,11 @@ + + org.eclipse.dltk.core.scriptbuilder + + + org.eclipse.php.core.PhpIncrementalProjectBuilder diff --git a/debian/copyright b/debian/copyright index 411363f..05038f4 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,43 +1,43 @@ -== License == - -The module has been released under the terms of the MIT License, as printed -following in its original version. Some images which have been used have been -released under the terms of the GNU Lesser General Public License (see -http://www.fsf.org/licensing/licenses/lgpl.html). These are in particular: - * /opt/iserv/idesk/img/16/mod_error-reporter.png - * /opt/iserv/idesk/img/32/mod_error-reporter.png - -If you enjoy this software, you are free to support his author with a small -donation: - - Roland Hieber - IBAN: DE98 250 500 000 150 2141 79 - BIC: NOLADE2HXXX (Norddeutsche Landesbank Hannover) - -You can also send material donations to - Roland Hieber - Großer Hilligenhof 7 - 38154 Königslutter - GERMANY - - -=== License terms === -Copyright (c) 2007 Roland Hieber - -Permission is hereby granted, free of charge, to any person obtaining -a copy of this software and associated documentation files (the "Software"), -to deal in the Software without restriction, including without limitation -the rights to use, copy, modify, merge, publish, distribute, sublicense, -and/or sell copies of the Software, and to permit persons to whom the -Software is furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. +== License == + +The module has been released under the terms of the MIT License, as printed +following in its original version. Some images which have been used have been +released under the terms of the GNU Lesser General Public License (see +http://www.fsf.org/licensing/licenses/lgpl.html). These are in particular: + * /opt/iserv/idesk/img/16/mod_error-reporter.png + * /opt/iserv/idesk/img/32/mod_error-reporter.png + +If you enjoy this software, you are free to support his author with a small +donation: + + Roland Hieber + IBAN: DE98 250 500 000 150 2141 79 + BIC: NOLADE2HXXX (Norddeutsche Landesbank Hannover) + +You can also send material donations to + Roland Hieber + Großer Hilligenhof 7 + 38154 Königslutter + GERMANY + + +=== License terms === +Copyright (c) 2007 Roland Hieber + +Permission is hereby granted, free of charge, to any person obtaining +a copy of this software and associated documentation files (the "Software"), +to deal in the Software without restriction, including without limitation +the rights to use, copy, modify, merge, publish, distribute, sublicense, +and/or sell copies of the Software, and to permit persons to whom the +Software is furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. diff --git a/inc/class_erConfig.inc b/inc/class_erConfig.inc index c183623..8cdfbf6 100644 --- a/inc/class_erConfig.inc +++ b/inc/class_erConfig.inc @@ -1,29 +1,29 @@ 0); } @@ -92,14 +92,14 @@ function erIsAct($strAct) { * @throws Exception */ function erGetRealUserName($strAct) { - $hQuery = db_query("SELECT firstname, lastname FROM users WHERE act = $1;", $strAct); - if(!is_resource($hQuery)) { - throw new Exception(ER_ERROR_SQL); - return null; + $hQuery = db_query("SELECT firstname, lastname FROM users WHERE act = $1;", $strAct); + if(!is_resource($hQuery)) { + throw new Exception(ER_ERROR_SQL); + return null; } if(pg_num_rows($hQuery) == 0) { return $strAct; // User not found in database, return account name - } + } $arResult = pg_fetch_array($hQuery); return user_join_name($arResult); } @@ -126,11 +126,11 @@ function erIsGroup($strAct) { * @throws Exception */ function erGetGroupName($strAct) { - $hQuery = db_query(sprintf("SELECT * FROM groups WHERE act=%s;", qdb($strAct))); - if(!is_resource($hQuery)) { - throw new Exception(ER_ERROR_SQL); - return null; - } + $hQuery = db_query(sprintf("SELECT * FROM groups WHERE act=%s;", qdb($strAct))); + if(!is_resource($hQuery)) { + throw new Exception(ER_ERROR_SQL); + return null; + } if(pg_num_rows($hQuery) == 0) { return $strAct; // Group not found in database, return account name } @@ -165,5 +165,5 @@ function erIsMailAddress($strAddr) { function erInsertLog($sMsg) { log_insert($sMsg, null, "Error Report Wizard"); -} +} ?> \ No newline at end of file diff --git a/inc/init.inc b/inc/init.inc index b780dec..cee8691 100644 --- a/inc/init.inc +++ b/inc/init.inc @@ -1,29 +1,29 @@ userHasAccess()) { diff --git a/nav/admin/99mod_error-reporter-cfg.mod b/nav/admin/99mod_error-reporter-cfg.mod index 09f515e..50854ce 100644 --- a/nav/admin/99mod_error-reporter-cfg.mod +++ b/nav/admin/99mod_error-reporter-cfg.mod @@ -1,28 +1,28 @@