[evolvis-commits] r6804: toy around with aljeux’ error handler↵
mirabilos at evolvis.org
mirabilos at evolvis.org
Fri Jul 16 16:05:53 CEST 2010
Author: mirabilos
Date: 2010-07-16 16:05:53 +0200 (Fri, 16 Jul 2010)
New Revision: 6804
Modified:
trunk/gforge_base/evolvisforge/gforge/common/include/Group.class.php
trunk/gforge_base/evolvisforge/gforge/common/include/database-pgsql.php
trunk/gforge_base/evolvisforge/gforge/common/include/extras-debug.php
trunk/gforge_base/evolvisforge/gforge/common/tracker/ArtifactType.class.php
trunk/gforge_base/evolvisforge/gforge/debian/changelog
trunk/gforge_base/evolvisforge/gforge/www/search/include/SearchManager.class.php
trunk/gforge_base/evolvisforge/gforge/www/themes/css/evolvis.css
trunk/gforge_base/evolvisforge/gforge/www/themes/evolvis/template.class
Log:
toy around with aljeux’ error handler
Modified: trunk/gforge_base/evolvisforge/gforge/common/include/Group.class.php
===================================================================
--- trunk/gforge_base/evolvisforge/gforge/common/include/Group.class.php 2010-07-16 14:05:50 UTC (rev 6803)
+++ trunk/gforge_base/evolvisforge/gforge/common/include/Group.class.php 2010-07-16 14:05:53 UTC (rev 6804)
@@ -2010,7 +2010,7 @@
$res = db_query_params ('SELECT users.* FROM users INNER JOIN user_group ON users.user_id=user_group.user_id WHERE user_group.group_id=$1',
array ($this->getID())) ;
while ($arr =& db_fetch_array($res)) {
- $this->membersArr[] =& new GFUser($arr['user_id'],$arr);
+ $this->membersArr[] = new GFUser($arr['user_id'],$arr);
}
}
return $this->membersArr;
Modified: trunk/gforge_base/evolvisforge/gforge/common/include/database-pgsql.php
===================================================================
--- trunk/gforge_base/evolvisforge/gforge/common/include/database-pgsql.php 2010-07-16 14:05:50 UTC (rev 6803)
+++ trunk/gforge_base/evolvisforge/gforge/common/include/database-pgsql.php 2010-07-16 14:05:53 UTC (rev 6804)
@@ -303,19 +303,19 @@
*/
function db_reset_result($qhandle,$row=0) {
global $sys_db_row_pointer;
- return $sys_db_row_pointer[$qhandle]=$row;
+ return $sys_db_row_pointer[(int)$qhandle]=$row;
}
/**
* db_result() - Returns a field from a result set.
*
* @param int Query result set handle.
- * @param integer Row number.
- * @param string Field name.
+ * @param integer Row number.
+ * @param string Field name.
* @return contents of field from database.
*/
function db_result($qhandle,$row,$field) {
- return @pg_result($qhandle,$row,$field);
+ return @pg_fetch_result($qhandle,$row,$field);
}
/**
@@ -358,11 +358,12 @@
*/
function db_fetch_array($qhandle) {
global $sys_db_row_pointer;
- if(!isset($sys_db_row_pointer[$qhandle])) {
- $sys_db_row_pointer[$qhandle] = 0;
- }
- $sys_db_row_pointer[$qhandle]++;
- return @pg_fetch_array($qhandle,($sys_db_row_pointer[$qhandle]-1));
+
+ $rowptr = util_ifsetor($sys_db_row_pointer[(int)$qhandle], 0);
+ if ($rowptr < 0)
+ $rowptr = 0;
+ $sys_db_row_pointer[(int)$qhandle] = $rowptr + 1;
+ return @pg_fetch_array($qhandle, $rowptr);
}
/**
Modified: trunk/gforge_base/evolvisforge/gforge/common/include/extras-debug.php
===================================================================
--- trunk/gforge_base/evolvisforge/gforge/common/include/extras-debug.php 2010-07-16 14:05:50 UTC (rev 6803)
+++ trunk/gforge_base/evolvisforge/gforge/common/include/extras-debug.php 2010-07-16 14:05:53 UTC (rev 6804)
@@ -3,8 +3,12 @@
// error handler function
function ffErrorHandler($errno, $errstr, $errfile, $errline)
{
- global $ffErrors;
+ global $ffErrors, $sys_install_type;
+ if ($sys_install_type != 'development' && error_reporting() == 0)
+ /* prepended @ to statement => ignore */
+ return false;
+
if (!isset($ffErrors))
$ffErrors = array();
@@ -18,17 +22,26 @@
switch ($errno) {
case E_USER_ERROR:
+ case E_ERROR:
$type = 'error';
break;
case E_USER_WARNING:
+ case E_WARNING:
$type = 'warning';
break;
case E_USER_NOTICE:
+ case E_NOTICE:
$type = 'notice';
break;
+ case E_STRICT:
+ case E_USER_DEPRECATED:
+ case E_DEPRECATED:
+ $type = "strict";
+ break;
+
default:
$type = 'unknown';
break;
Modified: trunk/gforge_base/evolvisforge/gforge/common/tracker/ArtifactType.class.php
===================================================================
--- trunk/gforge_base/evolvisforge/gforge/common/tracker/ArtifactType.class.php 2010-07-16 14:05:50 UTC (rev 6803)
+++ trunk/gforge_base/evolvisforge/gforge/common/tracker/ArtifactType.class.php 2010-07-16 14:05:53 UTC (rev 6804)
@@ -657,7 +657,7 @@
$this->setError('Template Group Error '.$g->getErrorMessage());
return false;
}
- $at =& new ArtifactType($g,$clone_tracker_id);
+ $at = new ArtifactType($g,$clone_tracker_id);
if (!$at || !is_object($at)) {
$this->setError('Could Not Get Tracker To Clone');
return false;
Modified: trunk/gforge_base/evolvisforge/gforge/debian/changelog
===================================================================
--- trunk/gforge_base/evolvisforge/gforge/debian/changelog 2010-07-16 14:05:50 UTC (rev 6803)
+++ trunk/gforge_base/evolvisforge/gforge/debian/changelog 2010-07-16 14:05:53 UTC (rev 6804)
@@ -1,4 +1,4 @@
-gforge (4.8.3+evolvis21.3) unstable; urgency=low
+gforge (4.8.3+evolvis22) xunstable; urgency=low
* Unbreak PM/Tasks (browse and select columns)
* Provide PM/Tasks column choice way to reset to defaults
@@ -6,8 +6,9 @@
* Theme corrections to fix some 404 bugs
* Correct bugs in the Document Manager
* Unbreak $wgLogo in gforge-plugin-mediawiki
+ * Tweak extra development error handler
- -- Thorsten Glaser <t.glaser at tarent.de> Fri, 02 Jul 2010 14:28:51 +0200
+ -- Thorsten Glaser <t.glaser at tarent.de> Fri, 16 Jul 2010 13:18:02 +0200
gforge (4.8.3+evolvis21) unstable; urgency=low
Modified: trunk/gforge_base/evolvisforge/gforge/www/search/include/SearchManager.class.php
===================================================================
--- trunk/gforge_base/evolvisforge/gforge/www/search/include/SearchManager.class.php 2010-07-16 14:05:50 UTC (rev 6803)
+++ trunk/gforge_base/evolvisforge/gforge/www/search/include/SearchManager.class.php 2010-07-16 14:05:53 UTC (rev 6804)
@@ -21,7 +21,7 @@
function & getSearchManager() {
if(!isset($GLOBALS['OBJ_SEARCH_MANAGER'])) {
- $GLOBALS['OBJ_SEARCH_MANAGER'] =& new SearchManager();
+ $GLOBALS['OBJ_SEARCH_MANAGER'] = new SearchManager();
}
return $GLOBALS['OBJ_SEARCH_MANAGER'];
}
Modified: trunk/gforge_base/evolvisforge/gforge/www/themes/css/evolvis.css
===================================================================
--- trunk/gforge_base/evolvisforge/gforge/www/themes/css/evolvis.css 2010-07-16 14:05:50 UTC (rev 6803)
+++ trunk/gforge_base/evolvisforge/gforge/www/themes/css/evolvis.css 2010-07-16 14:05:53 UTC (rev 6804)
@@ -426,6 +426,24 @@
color:red;
}
+#ffErrors .warning {
+ border-width:0px;
+ padding:0px;
+ color:black;
+}
+
+#ffErrors .notice {
+ border-width:0px;
+ padding:0px;
+ color:#999999;
+}
+
+#ffErrors .strict {
+ border-width:0px;
+ padding:0px;
+ color:green;
+}
+
/* the following style are for displaying items in different states */
.active {
Modified: trunk/gforge_base/evolvisforge/gforge/www/themes/evolvis/template.class
===================================================================
--- trunk/gforge_base/evolvisforge/gforge/www/themes/evolvis/template.class 2010-07-16 14:05:50 UTC (rev 6803)
+++ trunk/gforge_base/evolvisforge/gforge/www/themes/evolvis/template.class 2010-07-16 14:05:53 UTC (rev 6804)
@@ -315,7 +315,7 @@
$code1 = array('<?php');
$code = preg_replace('#\{([a-z0-9\-_]*?)\}#is', '\'. ( ( isset($this->_tpldata[\'.\'][0][\'\1\']) ) ? $this->_tpldata[\'.\'][0][\'\1\'] : \'\' ).\'', $code);
- $code = preg_replace_callback('#\{(([a-z0-9\-_]+?\.)+?)([a-z0-9\-_]+?)\}#is', array("Template", "trans_namespaces"), $code);
+ $code = preg_replace_callback('#\{(([a-z0-9\-_]+?\.)+?)([a-z0-9\-_]+?)\}#is', array($this, "trans_namespaces"), $code);
$code = explode("\n", $code);
More information about the evolvis-commits
mailing list