fixes for PHP 5.4 warnings and strict warnings, thought disabled E_STRICT for now, because of various strict warnings in working code, which could not be easy fixed in all areas (see comment in phpgwapi/inc/functions.inc.php)

addressbook/inc/class.addressbook_so.inc.php

@@ -305,7 +305,7 @@ class addressbook_so
 		$this->content_types = config::get_content_types('addressbook');
 		if (!$this->content_types)
 		{
-			$this->content_types = $custom->content_types = array('n' => array(
+			$this->content_types = array('n' => array(
 				'name' => 'contact',
 				'options' => array(
 					'template' => 'addressbook.edit',

addressbook/inc/class.addressbook_sql.inc.php

@@ -723,7 +723,7 @@ class addressbook_sql extends so_sql_cf
 	 * @param string|array $extra_where=null extra where clause, eg. to check the etag, returns 'nothing_affected' if not affected rows
 	 * @return int 0 on success and errno != 0 else
 	 */
-	function save($keys=null)
+	function save($keys = NULL, $extra_where = NULL)
 	{
 		if (isset($GLOBALS['egw_info']['user']['preferences']['syncml']['minimum_uid_length'])) {
 			$minimum_uid_length = $GLOBALS['egw_info']['user']['preferences']['syncml']['minimum_uid_length'];

addressbook/inc/class.addressbook_tracking.inc.php

@@ -174,9 +174,10 @@ class addressbook_tracking extends bo_tracking
 	 *
 	 * @param array $data
 	 * @param array $old
+	 * @param int|string $receiver nummeric account_id or email address
 	 * @return string
 	 */
-	function get_message($data,$old)
+	protected function get_message($data,$old,$receiver=null)
 	{
 		if (!$data['modified'] || !$old)
 		{
@@ -194,9 +195,11 @@ class addressbook_tracking extends bo_tracking
 	 *
 	 * @param array $data
 	 * @param array $old
+	 * @param boolean $deleted=null can be set to true to let the tracking know the item got deleted or undelted
+	 * @param int|string $receiver nummeric account_id or email address
 	 * @return string
 	 */
-	function get_subject($data,$old)
+	protected function get_subject($data,$old,$deleted=null,$receiver=null)
 	{
 		if ($data['is_contactform'])
 		{
@@ -208,11 +211,11 @@ class addressbook_tracking extends bo_tracking
 	/**
 	 * Get the details of an entry
 	 *
-	 * @param array $data
-	 *
+	 * @param array|object $data
+	 * @param int|string $receiver nummeric account_id or email address
 	 * @return array of details as array with values for keys 'label','value','type'
 	 */
-	function get_details($data)
+	function get_details($data,$receiver=null)
 	{
 		foreach($this->contacts->contact_fields as $name => $label)
 		{

etemplate/inc/class.bo_merge.inc.php

@@ -558,9 +558,9 @@ abstract class bo_merge
 				);
 				$content = preg_replace(array_keys($replace_tags),array_values($replace_tags),$content, -1, $count);
 
-				/* 
-				In the case where you have something like <span><span></w:t><w:br/><w:t></span></span> (invalid - mismatched tags), 
-				it takes multiple runs to get rid of both spans.  So, loop.  
+				/*
+				In the case where you have something like <span><span></w:t><w:br/><w:t></span></span> (invalid - mismatched tags),
+				it takes multiple runs to get rid of both spans.  So, loop.
 				OO.o files have not yet been shown to have this problem.
 				*/
 				$count = $i = 0;
@@ -1051,13 +1051,13 @@ abstract class bo_merge
 			if($values[$key])
 			{
 				$date = new egw_time($values[$key]);
-			
+
 				if($mimetype == 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet')//Excel WTF
 				{
 					$interval = $date->diff(new egw_time('1900-01-00 0:00'));
 					$values[$key] = $interval->format('%a')+1;// 1900-02-29 did not exist
 					// 1440 minutes in a day - fractional part
-					$values[$key] += ($date->format('H') * 60 + $date->format('i'))/1440; 
+					$values[$key] += ($date->format('H') * 60 + $date->format('i'))/1440;
 				}
 				else
 				{
@@ -1415,7 +1415,8 @@ abstract class bo_merge
 				foreach($files as $file)
 				{
 					// return only the mime-types we support
-					if (!self::is_implemented($file['mime'],'.'.array_pop($parts=explode('.',$file['name'])))) continue;
+					$parts = explode('.',$file['name']);
+					if (!self::is_implemented($file['mime'],'.'.array_pop($parts))) continue;
 					if ($mime_filter && $negativ_filter === in_array($file['mime'], (array)$mime_filter)) continue;
 					$list[$prefix.$file['name']] = egw_vfs::decodePath($file['name']);
 				}
@@ -1477,7 +1478,8 @@ abstract class bo_merge
 		foreach($files as $key => $file)
 		{
 			// use only the mime-types we support
-			if (!self::is_implemented($file['mime'],'.'.array_pop($parts=explode('.',$file['name']))) ||
+			$parts = explode('.',$file['name']);
+			if (!self::is_implemented($file['mime'],'.'.array_pop($parts)) ||
 				!egw_vfs::check_access($file['path'], egw_vfs::READABLE, $file) ||	// remove files not readable by user
 				$file['path'] === $default_doc)	// default doc already added
 			{

etemplate/inc/class.vfs_widget.inc.php

@@ -195,7 +195,8 @@ class vfs_widget
 				}
 				if (($cell_name = $cell['name']) == '$row')
 				{
-					$cell_name = array_pop($arr=explode('][',substr($form_name,0,-1)));
+					$arr = explode('][',substr($form_name,0,-1));
+					$cell_name = array_pop($arr);
 				}
 				$cell['name'] = '';
 				$cell['type'] = 'hbox';

filemanager/inc/class.filemanager_ui.inc.php

@@ -84,7 +84,7 @@ class filemanager_ui
 	 *
 	 * @return string
 	 */
-	public function get_view()
+	public static function get_view()
 	{
 		$view =& egw_cache::getSession('filemanager', 'view');
 		if (isset($_GET['view']))

infolog/inc/class.infolog_ui.inc.php

@@ -660,9 +660,9 @@ class infolog_ui
 		}
 		if (!$action)
 		{
-			$action = $values['action'] ? $values['action'] : get_var('action',array('POST','GET'));
-			$action_id = $values['action_id'] ? $values['action_id'] : get_var('action_id',array('POST','GET'));
-			$action_title = $values['action_title'] ? $values['action_title'] : get_var('action_title',array('POST','GET'));
+			$action = is_array($values) && $values['action'] ? $values['action'] : get_var('action',array('POST','GET'));
+			$action_id = is_array($values) && $values['action_id'] ? $values['action_id'] : get_var('action_id',array('POST','GET'));
+			$action_title = is_array($values) && $values['action_title'] ? $values['action_title'] : get_var('action_title',array('POST','GET'));
 		}
 		//echo "<p>".__METHOD__."(action='$action/$action_id',called_as='$called_as/$values[referer]',own_referer='$own_referer') values=\n"; _debug_array($values);
 		if (!is_array($values))

phpgwapi/inc/adodb/drivers/adodb-mysql.inc.php

@@ -1,16 +1,16 @@
 <?php
 /*
 V4.65 22 July 2005  (c) 2000-2005 John Lim (jlim@natsoft.com.my). All rights reserved.
-  Released under both BSD license and Lesser GPL library license. 
-  Whenever there is any discrepancy between the two licenses, 
+  Released under both BSD license and Lesser GPL library license.
+  Whenever there is any discrepancy between the two licenses,
   the BSD license will take precedence.
   Set tabs to 8.
-  
+
   MySQL code that does not support transactions. Use mysqlt if you need transactions.
   Requires mysql client. Works on Windows and Unix.
-  
+
  28 Feb 2001: MetaColumns bug fix - suggested by  Freek Dijkstra (phpeverywhere@macfreek.com)
-*/ 
+*/
 
 // security - hide paths
 if (!defined('ADODB_DIR')) die();
@@ -22,8 +22,8 @@ class ADODB_mysql extends ADOConnection {
 	var $databaseType = 'mysql';
 	var $dataProvider = 'mysql';
 	var $hasInsertID = true;
-	var $hasAffectedRows = true;	
-	var $metaTablesSQL = "SHOW TABLES";	
+	var $hasAffectedRows = true;
+	var $metaTablesSQL = "SHOW TABLES";
 	var $metaColumnsSQL = "SHOW COLUMNS FROM %s";
 	var $fmtTimeStamp = "'Y-m-d H:i:s'";
 	var $hasLimit = true;
@@ -38,100 +38,100 @@ class ADODB_mysql extends ADOConnection {
 	var $clientFlags = 0;
 	var $substr = "substring";
 	var $nameQuote = '`';		/// string to use to quote identifiers and names
-	
-	function ADODB_mysql() 
-	{			
+
+	function ADODB_mysql()
+	{
 		if (defined('ADODB_EXTENSION')) $this->rsPrefix .= 'ext_';
 	}
-	
+
 	function ServerInfo()
 	{
 		$arr['description'] = ADOConnection::GetOne("select version()");
 		$arr['version'] = ADOConnection::_findvers($arr['description']);
 		return $arr;
 	}
-	
-	function IfNull( $field, $ifNull ) 
+
+	function IfNull( $field, $ifNull )
 	{
 		return " IFNULL($field, $ifNull) "; // if MySQL
 	}
-	
-	function &MetaTables($ttype=false,$showSchema=false,$mask=false) 
-	{	
+
+	function &MetaTables($ttype=false,$showSchema=false,$mask=false)
+	{
 		$save = $this->metaTablesSQL;
 		if ($showSchema && is_string($showSchema)) {
 			$this->metaTablesSQL .= " from $showSchema";
 		}
-		
+
 		if ($mask) {
 			$mask = $this->qstr($mask);
 			$this->metaTablesSQL .= " like $mask";
 		}
 		$ret =& ADOConnection::MetaTables($ttype,$showSchema);
-		
+
 		$this->metaTablesSQL = $save;
 		return $ret;
 	}
-	
-	
+
+
 	function &MetaIndexes ($table, $primary = FALSE, $owner=false)
 	{
         // save old fetch mode
         global $ADODB_FETCH_MODE;
-        
+
 		$false = false;
         $save = $ADODB_FETCH_MODE;
         $ADODB_FETCH_MODE = ADODB_FETCH_NUM;
         if ($this->fetchMode !== FALSE) {
                $savem = $this->SetFetchMode(FALSE);
         }
-        
+
         // get index details
         $rs = $this->Execute(sprintf('SHOW INDEX FROM %s',$table));
-        
+
         // restore fetchmode
         if (isset($savem)) {
                 $this->SetFetchMode($savem);
         }
         $ADODB_FETCH_MODE = $save;
-        
+
         if (!is_object($rs)) {
                 return $false;
         }
-        
+
         $indexes = array ();
-        
+
         // parse index data into array
         while ($row = $rs->FetchRow()) {
                 if ($primary == FALSE AND $row[2] == 'PRIMARY') {
                         continue;
                 }
-                
+
                 if (!isset($indexes[$row[2]])) {
                         $indexes[$row[2]] = array(
                                 'unique' => ($row[1] == 0),
                                 'columns' => array()
                         );
                 }
-                
+
                 $indexes[$row[2]]['columns'][$row[3] - 1] = $row[4];
         }
-        
+
         // sort columns by order in the index
         foreach ( array_keys ($indexes) as $index )
         {
                 ksort ($indexes[$index]['columns']);
         }
-        
+
         return $indexes;
 	}
 
-	
+
 	// if magic quotes disabled, use mysql_real_escape_string()
 	function qstr($s,$magic_quotes=false)
 	{
 		if (!$magic_quotes) {
-		
+
 			if (ADODB_PHPVER >= 0x4300) {
 				if (is_resource($this->_connectionID))
 					return "'".mysql_real_escape_string($s,$this->_connectionID)."'";
@@ -139,20 +139,20 @@ class ADODB_mysql extends ADOConnection {
 			if ($this->replaceQuote[0] == '\\'){
 				$s = adodb_str_replace(array('\\',"\0"),array('\\\\',"\\\0"),$s);
 			}
-			return  "'".str_replace("'",$this->replaceQuote,$s)."'"; 
+			return  "'".str_replace("'",$this->replaceQuote,$s)."'";
 		}
-		
+
 		// undo magic quotes for "
 		$s = str_replace('\\"','"',$s);
 		return "'$s'";
 	}
-	
+
 	function _insertid()
 	{
 		return ADOConnection::GetOne('SELECT LAST_INSERT_ID()');
 		//return mysql_insert_id($this->_connectionID);
 	}
-	
+
 	function GetOne($sql,$inputarr=false)
 	{
 		if (strncasecmp($sql,'sele',4) == 0) {
@@ -167,40 +167,40 @@ class ADODB_mysql extends ADOConnection {
 		}
 		return false;
 	}
-	
+
 	function BeginTrans()
 	{
 		if ($this->debug) ADOConnection::outp("Transactions not supported in 'mysql' driver. Use 'mysqlt' or 'mysqli' driver");
 	}
-	
+
 	function _affectedrows()
 	{
 			return mysql_affected_rows($this->_connectionID);
 	}
-  
+
  	// See http://www.mysql.com/doc/M/i/Miscellaneous_functions.html
 	// Reference on Last_Insert_ID on the recommended way to simulate sequences
  	var $_genIDSQL = "update %s set id=LAST_INSERT_ID(id+1);";
 	var $_genSeqSQL = "create table %s (id int not null)";
 	var $_genSeq2SQL = "insert into %s values (%s)";
 	var $_dropSeqSQL = "drop table %s";
-	
+
 	function CreateSequence($seqname='adodbseq',$startID=1)
 	{
 		if (empty($this->_genSeqSQL)) return false;
 		$u = strtoupper($seqname);
-		
+
 		$ok = $this->Execute(sprintf($this->_genSeqSQL,$seqname));
 		if (!$ok) return false;
 		return $this->Execute(sprintf($this->_genSeq2SQL,$seqname,$startID-1));
 	}
-	
+
 
 	function GenID($seqname='adodbseq',$startID=1)
 	{
 		// post-nuke sets hasGenID to false
 		if (!$this->hasGenID) return false;
-		
+
 		$savelog = $this->_logsql;
 		$this->_logsql = false;
 		$getnext = sprintf($this->_genIDSQL,$seqname);
@@ -214,13 +214,13 @@ class ADODB_mysql extends ADOConnection {
 			$rs = $this->Execute($getnext);
 		}
 		$this->genID = mysql_insert_id($this->_connectionID);
-		
+
 		if ($rs) $rs->Close();
-		
+
 		$this->_logsql = $savelog;
 		return $this->genID;
 	}
-	
+
   	function &MetaDatabases()
 	{
 		$qid = mysql_list_dbs($this->_connectionID);
@@ -234,11 +234,11 @@ class ADODB_mysql extends ADOConnection {
 		}
 		return $arr;
 	}
-	
-		
+
+
 	// Format date column in sql string given an input format that understands Y M D
 	function SQLDate($fmt, $col=false)
-	{	
+	{
 		if (!$col) $col = $this->sysTimeStamp;
 		$s = 'DATE_FORMAT('.$col.",'";
 		$concat = false;
@@ -246,7 +246,7 @@ class ADODB_mysql extends ADOConnection {
 		for ($i=0; $i < $len; $i++) {
 			$ch = $fmt[$i];
 			switch($ch) {
-				
+
 			default:
 				if ($ch == '\\') {
 					$i++;
@@ -257,7 +257,7 @@ class ADODB_mysql extends ADOConnection {
 			case '/':
 				$s .= $ch;
 				break;
-				
+
 			case 'Y':
 			case 'y':
 				$s .= '%Y';
@@ -265,7 +265,7 @@ class ADODB_mysql extends ADOConnection {
 			case 'M':
 				$s .= '%b';
 				break;
-				
+
 			case 'm':
 				$s .= '%m';
 				break;
@@ -273,41 +273,41 @@ class ADODB_mysql extends ADOConnection {
 			case 'd':
 				$s .= '%d';
 				break;
-			
+
 			case 'Q':
 			case 'q':
 				$s .= "'),Quarter($col)";
-				
+
 				if ($len > $i+1) $s .= ",DATE_FORMAT($col,'";
 				else $s .= ",('";
 				$concat = true;
 				break;
-			
-			case 'H': 
+
+			case 'H':
 				$s .= '%H';
 				break;
-				
+
 			case 'h':
 				$s .= '%I';
 				break;
-				
+
 			case 'i':
 				$s .= '%i';
 				break;
-				
+
 			case 's':
 				$s .= '%s';
 				break;
-				
+
 			case 'a':
 			case 'A':
 				$s .= '%p';
 				break;
-				
+
 			case 'w':
 				$s .= '%w';
 				break;
-				
+
 			case 'l':
 				$s .= '%W';
 				break;
@@ -317,7 +317,7 @@ class ADODB_mysql extends ADOConnection {
 		if ($concat) $s = "CONCAT($s)";
 		return $s;
 	}
-	
+
 
 	// returns concatenated string
 	// much easier to run "mysqld --ansi" or "mysqld --sql-mode=PIPES_AS_CONCAT" and use || operator
@@ -325,24 +325,24 @@ class ADODB_mysql extends ADOConnection {
 	{
 		$s = "";
 		$arr = func_get_args();
-		
+
 		// suggestion by andrew005@mnogo.ru
-		$s = implode(',',$arr); 
+		$s = implode(',',$arr);
 		if (strlen($s) > 0) return "CONCAT($s)";
 		else return '';
 	}
-	
+
 	function OffsetDate($dayFraction,$date=false)
-	{		
+	{
 		if (!$date) $date = $this->sysDate;
 		return "from_unixtime(unix_timestamp($date)+($dayFraction)*24*3600)";
 	}
-	
+
 	// returns true or false
 	function _connect($argHostname, $argUsername, $argPassword, $argDatabasename)
 	{
 		if (!empty($this->port)) $argHostname .= ":".$this->port;
-		
+
 		if (ADODB_PHPVER >= 0x4300)
 			$this->_connectionID = mysql_connect($argHostname,$argUsername,$argPassword,
 												$this->forceNewConnect,$this->clientFlags);
@@ -351,17 +351,17 @@ class ADODB_mysql extends ADOConnection {
 												$this->forceNewConnect);
 		else
 			$this->_connectionID = mysql_connect($argHostname,$argUsername,$argPassword);
-	
+
 		if ($this->_connectionID === false) return false;
 		if ($argDatabasename) return $this->SelectDB($argDatabasename);
-		return true;	
+		return true;
 	}
-	
+
 	// returns true or false
 	function _pconnect($argHostname, $argUsername, $argPassword, $argDatabasename)
 	{
 		if (!empty($this->port)) $argHostname .= ":".$this->port;
-		
+
 		if (ADODB_PHPVER >= 0x4300)
 			$this->_connectionID = mysql_pconnect($argHostname,$argUsername,$argPassword,$this->clientFlags);
 		else
@@ -369,16 +369,16 @@ class ADODB_mysql extends ADOConnection {
 		if ($this->_connectionID === false) return false;
 		if ($this->autoRollback) $this->RollbackTrans();
 		if ($argDatabasename) return $this->SelectDB($argDatabasename);
-		return true;	
+		return true;
 	}
-	
+
 	function _nconnect($argHostname, $argUsername, $argPassword, $argDatabasename)
 	{
 		$this->forceNewConnect = true;
 		return $this->_connect($argHostname, $argUsername, $argPassword, $argDatabasename);
 	}
-	
- 	function &MetaColumns($table) 
+
+	function &MetaColumns($table,$upper=true)
 	{
 		$this->_findschema($table,$schema);
 		if ($schema) {
@@ -388,27 +388,27 @@ class ADODB_mysql extends ADOConnection {
 		global $ADODB_FETCH_MODE;
 		$save = $ADODB_FETCH_MODE;
 		$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-		
+
 		if ($this->fetchMode !== false) $savem = $this->SetFetchMode(false);
 		$rs = $this->Execute(sprintf($this->metaColumnsSQL,$table));
-		
+
 		if ($schema) {
 			$this->SelectDB($dbName);
 		}
-		
+
 		if (isset($savem)) $this->SetFetchMode($savem);
 		$ADODB_FETCH_MODE = $save;
 		if (!is_object($rs)) {
 			$false = false;
 			return $false;
 		}
-			
+
 		$retarr = array();
 		while (!$rs->EOF){
 			$fld = new ADOFieldObject();
 			$fld->name = $rs->fields[0];
 			$type = $rs->fields[1];
-			
+
 			// split type into type(length):
 			$fld->scale = null;
 			if (preg_match("/^(.+)\((\d+),(\d+)/", $type, $query_array)) {
@@ -433,7 +433,7 @@ class ADODB_mysql extends ADOConnection {
 			$fld->auto_increment = (strpos($rs->fields[5], 'auto_increment') !== false);
 			$fld->binary = (strpos($type,'blob') !== false);
 			$fld->unsigned = (strpos($type,'unsigned') !== false);
-				
+
 			if (!$fld->binary) {
 				$d = $rs->fields[4];
 				if ($d != '' && $d != 'NULL') {
@@ -443,7 +443,7 @@ class ADODB_mysql extends ADOConnection {
 					$fld->has_default = false;
 				}
 			}
-			
+
 			if ($save == ADODB_FETCH_NUM) {
 				$retarr[] = $fld;
 			} else {
@@ -451,26 +451,26 @@ class ADODB_mysql extends ADOConnection {
 			}
 				$rs->MoveNext();
 			}
-		
+
 			$rs->Close();
-			return $retarr;	
+			return $retarr;
 	}
-		
+
 	// returns true or false
-	function SelectDB($dbName) 
+	function SelectDB($dbName)
 	{
 		$this->database = $dbName;
 		if ($this->_connectionID) {
-			return @mysql_select_db($dbName,$this->_connectionID);		
+			return @mysql_select_db($dbName,$this->_connectionID);
 		}
-		else return false;	
+		else return false;
 	}
-	
+
 	// parameters use PostgreSQL convention, not MySQL
 	function &SelectLimit($sql,$nrows=-1,$offset=-1,$inputarr=false,$secs=0)
 	{
 		// jason judge, see http://phplens.com/lens/lensforum/msgs.php?id=9220
-		if ($nrows < 0) $nrows = '18446744073709551615'; 
+		if ($nrows < 0) $nrows = '18446744073709551615';
 
 		$offsetStr = (($offset>=0) ? (int)$offset.',' : '').(int)$nrows;
 
@@ -491,34 +491,34 @@ class ADODB_mysql extends ADOConnection {
 			$rs =& $this->Execute($sql.' LIMIT '.$offsetStr.' '.$FORUPDATE,$inputarr);
 		return $rs;
 	}
-	
+
 	// returns queryID or false
 	function _query($sql,$inputarr)
 	{
 	//global $ADODB_COUNTRECS;
-		//if($ADODB_COUNTRECS) 
+		//if($ADODB_COUNTRECS)
 		return mysql_query($sql,$this->_connectionID);
 		//else return @mysql_unbuffered_query($sql,$this->_connectionID); // requires PHP >= 4.0.6
 	}
 
-	/*	Returns: the last error message from previous database operation	*/	
-	function ErrorMsg() 
+	/*	Returns: the last error message from previous database operation	*/
+	function ErrorMsg()
 	{
-	
+
 		if ($this->_logsql) return $this->_errorMsg;
 		if (empty($this->_connectionID)) $this->_errorMsg = @mysql_error();
 		else $this->_errorMsg = @mysql_error($this->_connectionID);
 		return $this->_errorMsg;
 	}
-	
-	/*	Returns: the last error number from previous database operation	*/	
-	function ErrorNo() 
+
+	/*	Returns: the last error number from previous database operation	*/
+	function ErrorNo()
 	{
 		if ($this->_logsql) return $this->_errorCode;
 		if (empty($this->_connectionID))  return @mysql_errno();
 		else return @mysql_errno($this->_connectionID);
 	}
-	
+
 	// returns true or false
 	function _close()
 	{
@@ -526,23 +526,23 @@ class ADODB_mysql extends ADOConnection {
 		$this->_connectionID = false;
 	}
 
-	
+
 	/*
 	* Maximum size of C field
 	*/
 	function CharMax()
 	{
-		return 255; 
+		return 255;
 	}
-	
+
 	/*
 	* Maximum size of X field
 	*/
 	function TextMax()
 	{
-		return 4294967295; 
+		return 4294967295;
 	}
-	
+
 	// "Innox - Juan Carlos Gonzalez" <jgonzalez#innox.com.mx>
 	function MetaForeignKeys( $table, $owner = FALSE, $upper = FALSE, $asociative = FALSE )
      {
@@ -578,7 +578,7 @@ class ADODB_mysql extends ADOConnection {
          }
          return  $foreign_keys;
      }
-     
+
 	/**
      * @var array $charset2mysql translate www charsets to mysql ones
      */
@@ -611,7 +611,7 @@ class ADODB_mysql extends ADOConnection {
 		}
 		return $this->charSet ? $this->charSet : false;
 	}
-	
+
 	/**
 	 * sets the client encoding from the connection
 	 *
@@ -629,20 +629,20 @@ class ADODB_mysql extends ADOConnection {
 	}
 }
 
-	
+
 /*--------------------------------------------------------------------------------------
 	 Class Name: Recordset
 --------------------------------------------------------------------------------------*/
 
 
-class ADORecordSet_mysql extends ADORecordSet{	
-	
+class ADORecordSet_mysql extends ADORecordSet{
+
 	var $databaseType = "mysql";
 	var $canSeek = true;
-	
-	function ADORecordSet_mysql($queryID,$mode=false) 
+
+	function ADORecordSet_mysql($queryID,$mode=false)
 	{
-		if ($mode === false) { 
+		if ($mode === false) {
 			global $ADODB_FETCH_MODE;
 			$mode = $ADODB_FETCH_MODE;
 		}
@@ -656,9 +656,9 @@ class ADORecordSet_mysql extends ADORecordSet{
 			$this->fetchMode = MYSQL_BOTH; break;
 		}
 		$this->adodbFetchMode = $mode;
-		$this->ADORecordSet($queryID);	
+		$this->ADORecordSet($queryID);
 	}
-	
+
 	function _initrs()
 	{
 	//GLOBAL $ADODB_COUNTRECS;
@@ -666,9 +666,9 @@ class ADORecordSet_mysql extends ADORecordSet{
 		$this->_numOfRows = @mysql_num_rows($this->_queryID);
 		$this->_numOfFields = @mysql_num_fields($this->_queryID);
 	}
-	
-	function &FetchField($fieldOffset = -1) 
-	{	
+
+	function &FetchField($fieldOffset = -1)
+	{
 		if ($fieldOffset != -1) {
 			$o = @mysql_fetch_field($this->_queryID, $fieldOffset);
 			$f = @mysql_field_flags($this->_queryID,$fieldOffset);
@@ -681,7 +681,7 @@ class ADORecordSet_mysql extends ADORecordSet{
 			$o->max_length = @mysql_field_len($this->_queryID); // suggested by: Jim Nicholson (jnich@att.com)
 			//$o->max_length = -1; // mysql returns the max length less spaces -- so it is unrealiable
 		}
-			
+
 		return $o;
 	}
 
@@ -691,13 +691,13 @@ class ADORecordSet_mysql extends ADORecordSet{
 		$row =& ADORecordSet::GetRowAssoc($upper);
 		return $row;
 	}
-	
+
 	/* Use associative array to get fields array */
 	function Fields($colname)
-	{	
+	{
 		// added @ by "Michael William Miller" <mille562@pilot.msu.edu>
 		if ($this->fetchMode != MYSQL_NUM) return @$this->fields[$colname];
-		
+
 		if (!$this->bind) {
 			$this->bind = array();
 			for ($i=0; $i < $this->_numOfFields; $i++) {
@@ -707,13 +707,13 @@ class ADORecordSet_mysql extends ADORecordSet{
 		}
 		 return $this->fields[$this->bind[strtoupper($colname)]];
 	}
-	
+
 	function _seek($row)
 	{
 		if ($this->_numOfRows == 0) return false;
 		return @mysql_data_seek($this->_queryID,$row);
 	}
-	
+
 	function MoveNext()
 	{
 		//return adodb_movenext($this);
@@ -728,18 +728,18 @@ class ADORecordSet_mysql extends ADORecordSet{
 		}
 		return false;
 	}
-	
+
 	function _fetch()
 	{
 		$this->fields =  @mysql_fetch_array($this->_queryID,$this->fetchMode);
 		return is_array($this->fields);
 	}
-	
+
 	function _close() {
-		@mysql_free_result($this->_queryID);	
-		$this->_queryID = false;	
+		@mysql_free_result($this->_queryID);
+		$this->_queryID = false;
 	}
-	
+
 	function MetaType($t,$len=-1,$fieldobj=false)
 	{
 		if (is_object($t)) {
@@ -747,58 +747,58 @@ class ADORecordSet_mysql extends ADORecordSet{
 			$t = $fieldobj->type;
 			$len = $fieldobj->max_length;
 		}
-		
+
 		$len = -1; // mysql max_length is not accurate
 		switch (strtoupper($t)) {
-		case 'STRING': 
+		case 'STRING':
 		case 'CHAR':
-		case 'VARCHAR': 
-		case 'TINYBLOB': 
-		case 'TINYTEXT': 
-		case 'ENUM': 
-		case 'SET': 
+		case 'VARCHAR':
+		case 'TINYBLOB':
+		case 'TINYTEXT':
+		case 'ENUM':
+		case 'SET':
 			if ($len <= $this->blobSize) return 'C';
-			
+
 		case 'TEXT':
-		case 'LONGTEXT': 
+		case 'LONGTEXT':
 		case 'MEDIUMTEXT':
 			return 'X';
-			
+
 		// php_mysql extension always returns 'blob' even if 'text'
 		// so we have to check whether binary...
 		case 'IMAGE':
-		case 'LONGBLOB': 
+		case 'LONGBLOB':
 		case 'BLOB':
 		case 'MEDIUMBLOB':
 			return !empty($fieldobj->binary) ? 'B' : 'X';
-			
+
 		case 'YEAR':
 		case 'DATE': return 'D';
-		
+
 		case 'TIME':
 		case 'DATETIME':
 		case 'TIMESTAMP': return 'T';
-		
-		case 'INT': 
+
+		case 'INT':
 		case 'INTEGER':
 		case 'BIGINT':
 		case 'TINYINT':
 		case 'MEDIUMINT':
-		case 'SMALLINT': 
-			
+		case 'SMALLINT':
+
 			if (!empty($fieldobj->primary_key)) return 'R';
 			else return 'I';
-		
+
 		default: return 'N';
 		}
 	}
 
 }
 
-class ADORecordSet_ext_mysql extends ADORecordSet_mysql {	
-	function ADORecordSet_ext_mysql($queryID,$mode=false) 
+class ADORecordSet_ext_mysql extends ADORecordSet_mysql {
+	function ADORecordSet_ext_mysql($queryID,$mode=false)
 	{
-		if ($mode === false) { 
+		if ($mode === false) {
 			global $ADODB_FETCH_MODE;
 			$mode = $ADODB_FETCH_MODE;
 		}
@@ -814,7 +814,7 @@ class ADORecordSet_ext_mysql extends ADORecordSet_mysql {
 		$this->adodbFetchMode = $mode;
 		$this->ADORecordSet($queryID);
 	}
-	
+
 	function MoveNext()
 	{
 		return @adodb_movenext($this);

phpgwapi/inc/class.accounts_sql.inc.php

@@ -133,7 +133,7 @@ class accounts_sql
 			$data['account_lastname'] = $data['account_type'] == 'g' ? 'Group' : 'User';
 			// if we call lang() before the translation-class is correctly setup,
 			// we can't switch away from english language anymore!
-			if ($GLOBALS['egw']->translation->lang_arr)
+			if (translation::$lang_arr)
 			{
 				$data['account_lastname'] = lang($data['account_lastname']);
 			}

phpgwapi/inc/class.egw_framework.inc.php

@@ -86,7 +86,7 @@ abstract class egw_framework
 	/**
 	 * Constructor for static variables
 	 */
-	public function init_static()
+	public static function init_static()
 	{
 		self::$js_include_mgr = new egw_include_mgr(array(
 			// allways load jquery (not -ui) and egw_json first

phpgwapi/inc/class.solink.inc.php

@@ -54,9 +54,11 @@ class solink
 	 * @param string $id2 id in $app2
 	 * @param string $remark='' Remark to be saved with the link (defaults to '')
 	 * @param int $owner=0 Owner of the link (defaults to user)
-	 * @return boolean/int False (for db or param-error) or link_id for success
+	 * @param int $lastmod=0 timestamp of last modification (defaults to now=time())
+	 * @param int $no_notify=0 &1 dont notify $app1, &2 dont notify $app2
+	 * @return int/boolean False (for db or param-error) or on success link_id (Please not the return-value of $id1)
 	 */
-	static function link( $app1,$id1,$app2,$id2,$remark='',$owner=0,$lastmod=0 )
+	static function link( $app1,&$id1,$app2,$id2='',$remark='',$owner=0,$lastmod=0,$no_notify=0 )
 	{
 		if (self::DEBUG)
 		{
@@ -235,7 +237,7 @@ class solink
 	 * @param boolean $hold_for_purge Don't really delete the link, just mark it as deleted and wait for final delete of linked entry
 	 * @return array with deleted links
 	 */
-	static function &unlink($link_id,$app='',$id='',$owner=0,$app2='',$id2='',$hold_for_purge=false)
+	static function unlink($link_id,$app='',$id='',$owner=0,$app2='',$id2='',$hold_for_purge=false)
 	{
 		if (self::DEBUG)
 		{

phpgwapi/inc/class.translation.inc.php

@@ -260,7 +260,7 @@ class translation
 			//$start = microtime(true);
 			// for loginscreen we have to use a instance specific cache!
 			$instance_specific = in_array($app,self::$instance_specific_translations);
-			$loaded =& egw_cache::getCache($instance_specific ? egw_cache::INSTANCE : egw_cache::TREE,
+			$loaded = egw_cache::getCache($instance_specific ? egw_cache::INSTANCE : egw_cache::TREE,
 				__CLASS__,$app.':'.$lang);
 
 			// do NOT use automatic callback to cache result, as installing languages in setup can create

phpgwapi/inc/functions.inc.php

@@ -17,7 +17,11 @@
  * @version $Id$
  */
 
-error_reporting(E_ALL & ~E_NOTICE);
+// E_STRICT in PHP 5.4 gives various strict warnings in working code, which can NOT be easy fixed in all use-cases :-(
+// Only variables should be assigned by reference, eg. soetemplate::tree_walk()
+// Declaration of <extended method> should be compatible with <parent method>, varios places where method parameters change
+// --> switching it off for now, as it makes error-log unusable
+error_reporting(E_ALL & ~E_NOTICE & ~E_STRICT);
 if (function_exists('get_magic_quotes_runtime') && get_magic_quotes_runtime())
 {
 	set_magic_quotes_runtime(false);

phpgwapi/templates/idots/class.idots_framework.inc.php

@@ -629,7 +629,7 @@ egw.set_user('.$GLOBALS['egw']->accounts->json($GLOBALS['egw_info']['user']['acc
 	* @param array $apps
 	* @return string
 	*/
-	function topmenu(array &$vars,array &$apps)
+	function topmenu(array $vars,array $apps)
 	{
 		$this->tplsav2->menuitems = array();
 		$this->tplsav2->menuinfoitems = array();

phpgwapi/templates/jerryr/class.jerryr_framework.inc.php

@@ -31,7 +31,7 @@ class jerryr_framework extends idots_framework
 		parent::__construct($template);
 	}
 
-	function topmenu(array &$vars,array &$apps)
+	function topmenu(array $vars,array $apps)
 	{
 		$this->tplsav2->menuitems = array();
 		$this->tplsav2->menuinfoitems = array();