EGroupware / egroupware

phpgwapi/inc/class.mailDomainSigner.inc.php

Doc Comments +2 added lines, -4 removed lines

@@ -309,10 +309,8 @@
    * @param string $h Signed header fields, A colon-separated list of header field names that identify the header fields presented to the signing algorithm
    * @param array $_h Array of headers in same order with $h (Signed header fields)
    * @param string $body Raw Email Body String
-   * @param string $_c='relaxed/relaxed' header/body canonicalzation algorithm, default "relaxed/relaxed", can also be any combination of "relaxed" or "simple"
-   * @param string $_a='rsa-sha1' could also be eg. 'rsa/sha256' and other hashes supported by openssl for rsa signing
-   * @param string $_dkim=null template for creating DKIM signature, default as for email appropriate
-   * @return string|boolean DKIM-Signature Header String, or false if an error happend, eg. unimplemented canonicalization requested
+   * @param string $_dkim
+   * @return false|string DKIM-Signature Header String, or false if an error happend, eg. unimplemented canonicalization requested
    * @access public
    * @author Ahmad Amarullah
    */

Indentation +278 added lines, -278 removed lines

@@ -52,12 +52,12 @@ 
    * @author Ahmad Amarullah
    */
   public function __construct($private_key,$d,$s){
-    // Get a private key
-    $this->pkid = openssl_pkey_get_private($private_key);
+	// Get a private key
+	$this->pkid = openssl_pkey_get_private($private_key);
 
-    // Save Domain and Selector
-    $this->d    = $d;
-    $this->s    = $s;
+	// Save Domain and Selector
+	$this->d    = $d;
+	$this->s    = $s;
   }
 
   ///////////////////////
@@ -76,35 +76,35 @@ 
    * @author Ahmad Amarullah
    */
   public function nofws($raw_headers,$raw_body){
-    // nofws-ed headers
-    $headers = array();
-
-    // Loop the raw_headers
-    foreach ($raw_headers as $header){
-      // Replace all Folding Whitespace
-      $headers[] = preg_replace('/[\r\t\n ]++/','',$header);
-    }
-
-    // Join headers with LF then Add it into data
-    $data = implode("\n",$headers)."\n";
-
-    // Loop Body Lines
-    foreach(explode("\n","\n".str_replace("\r","",$raw_body)) as $line)
-    {
-      // Replace all Folding Whitespace from current line
-      // then Add it into data
-      $data .= preg_replace('/[\t\n ]++/','',$line)."\n";
-    }
-
-    // Remove Trailing empty lines then split it with LF
-    $data = explode("\n",rtrim($data,"\n"));
-
-    // Join array of data with CRLF and Append CRLF
-    // to the resulting line
-    $data = implode("\r\n",$data)."\r\n";
-
-    // Return Canonicalizated Data
-    return $data;
+	// nofws-ed headers
+	$headers = array();
+
+	// Loop the raw_headers
+	foreach ($raw_headers as $header){
+	  // Replace all Folding Whitespace
+	  $headers[] = preg_replace('/[\r\t\n ]++/','',$header);
+	}
+
+	// Join headers with LF then Add it into data
+	$data = implode("\n",$headers)."\n";
+
+	// Loop Body Lines
+	foreach(explode("\n","\n".str_replace("\r","",$raw_body)) as $line)
+	{
+	  // Replace all Folding Whitespace from current line
+	  // then Add it into data
+	  $data .= preg_replace('/[\t\n ]++/','',$line)."\n";
+	}
+
+	// Remove Trailing empty lines then split it with LF
+	$data = explode("\n",rtrim($data,"\n"));
+
+	// Join array of data with CRLF and Append CRLF
+	// to the resulting line
+	$data = implode("\r\n",$data)."\r\n";
+
+	// Return Canonicalizated Data
+	return $data;
   }
 
   /**
@@ -123,32 +123,32 @@ 
    * @author Eric Vyncke
    */
   public function headRelaxCanon($s) {
-    // Replace CR,LF and spaces into single SP
-    $s=preg_replace("/\r\n\s+/"," ",$s) ;
+	// Replace CR,LF and spaces into single SP
+	$s=preg_replace("/\r\n\s+/"," ",$s) ;
 
-    // Explode Header Line
-    $lines=explode("\r\n",$s) ;
+	// Explode Header Line
+	$lines=explode("\r\n",$s) ;
 
-    // Loop the lines
-    foreach ($lines as $key=>$line) {
-      // Split the key and value
-      list($heading,$value)=explode(":",$line,2) ;
+	// Loop the lines
+	foreach ($lines as $key=>$line) {
+	  // Split the key and value
+	  list($heading,$value)=explode(":",$line,2) ;
 
-      // Lowercase heading key
-      $heading=strtolower($heading);
+	  // Lowercase heading key
+	  $heading=strtolower($heading);
 
-      // Compress useless spaces
-      $value=preg_replace("/\s+/"," ",$value);
+	  // Compress useless spaces
+	  $value=preg_replace("/\s+/"," ",$value);
 
-      // Don't forget to remove WSP around the value
-      $lines[$key]=$heading.":".trim($value);
-    }
+	  // Don't forget to remove WSP around the value
+	  $lines[$key]=$heading.":".trim($value);
+	}
 
-    // Implode it again
-    $s=implode("\r\n",$lines);
+	// Implode it again
+	$s=implode("\r\n",$lines);
 
-    // Return Canonicalizated Headers
-    return $s;
+	// Return Canonicalizated Headers
+	return $s;
   }
 
   /**
@@ -168,40 +168,40 @@ 
    * @author Ralf Becker
    */
   public function headIScheduleRelaxCanon($s) {
-    // Replace CR,LF and spaces into single SP
-    $s=preg_replace("/\r\n\s+/"," ",$s) ;
+	// Replace CR,LF and spaces into single SP
+	$s=preg_replace("/\r\n\s+/"," ",$s) ;
 
-    // Loop exploded header lines
-    $lines=array();
-    foreach (explode("\r\n",$s) as $line) {
-      // Split the key and value
-      list($heading,$value)=explode(":",$line,2) ;
+	// Loop exploded header lines
+	$lines=array();
+	foreach (explode("\r\n",$s) as $line) {
+	  // Split the key and value
+	  list($heading,$value)=explode(":",$line,2) ;
 
-      // Lowercase heading key
-      $heading=strtolower($heading);
+	  // Lowercase heading key
+	  $heading=strtolower($heading);
 
-      // Compress useless spaces
-      $value=preg_replace("/\s+/"," ",$value);
+	  // Compress useless spaces
+	  $value=preg_replace("/\s+/"," ",$value);
 
-      // Don't forget to remove WSP around the value
-      $value = trim($value);
+	  // Don't forget to remove WSP around the value
+	  $value = trim($value);
 
-      // remove whitespace after comma in values
-      $value = preg_replace("/,\s+/",",",$value);
+	  // remove whitespace after comma in values
+	  $value = preg_replace("/,\s+/",",",$value);
 
-      // for multiple headers, add them comma-separated to existing headers
-      if (isset($lines[$heading])) {
-      	$lines[$heading] .= ','.$value;
-      } else {
-      	$lines[$heading] = $heading.':'.$value;
-      }
-    }
+	  // for multiple headers, add them comma-separated to existing headers
+	  if (isset($lines[$heading])) {
+	  	$lines[$heading] .= ','.$value;
+	  } else {
+	  	$lines[$heading] = $heading.':'.$value;
+	  }
+	}
 
-    // Implode it again
-    $s=implode("\r\n",$lines);
+	// Implode it again
+	$s=implode("\r\n",$lines);
 
-    // Return Canonicalizated Headers
-    return $s;
+	// Return Canonicalizated Headers
+	return $s;
   }
 
   /**
@@ -231,32 +231,32 @@ 
    * @author Ahmad Amarullah
    */
   public function bodyRelaxCanon($body) {
-    // Return CRLF for empty body
-    if ($body == ''){
-      return "\r\n";
-    }
+	// Return CRLF for empty body
+	if ($body == ''){
+	  return "\r\n";
+	}
 
-    // Replace all CRLF to LF
-    $body = str_replace("\r\n","\n",$body);
+	// Replace all CRLF to LF
+	$body = str_replace("\r\n","\n",$body);
 
-    // Replace LF to CRLF
-    $body = str_replace("\n","\r\n",$body);
+	// Replace LF to CRLF
+	$body = str_replace("\n","\r\n",$body);
 
-    // Ignores all whitespace at the end of lines
-    $body=rtrim($body,"\r\n");
+	// Ignores all whitespace at the end of lines
+	$body=rtrim($body,"\r\n");
 
-    // Canonicalizated String Variable
-    $canon_body = '';
+	// Canonicalizated String Variable
+	$canon_body = '';
 
-    // Split the body into lines
-    foreach(explode("\r\n",$body) as $line){
-      // Reduces all sequences of White Space within a line
-      // to a single SP character
-      $canon_body.= rtrim(preg_replace('/[\t\n ]++/',' ',$line))."\r\n";
-    }
+	// Split the body into lines
+	foreach(explode("\r\n",$body) as $line){
+	  // Reduces all sequences of White Space within a line
+	  // to a single SP character
+	  $canon_body.= rtrim(preg_replace('/[\t\n ]++/',' ',$line))."\r\n";
+	}
 
-    // Return the Canonicalizated Body
-    return $canon_body;
+	// Return the Canonicalizated Body
+	return $canon_body;
   }
 
   /**
@@ -278,8 +278,8 @@ 
   	// add a single CRLF at the end
   	$body .= "\r\n";
 
-    // Return the Canonicalizated Body
-    return $body;
+	// Return the Canonicalizated Body
+	return $body;
   }
 
   //////////////////////
@@ -318,47 +318,47 @@ 
    */
   public function getDKIM($h,$_h,$body,$_c='relaxed/relaxed',$_a='rsa-sha1',$_dkim=null) {
 
-    // Relax Canonicalization for Body
+	// Relax Canonicalization for Body
  	list($header_canon,$body_canon) = explode('/',$_c);
   	switch($body_canon)
   	{
   		case 'relaxed':
-    		$_b = $this->bodyRelaxCanon($body);
-    		break;
+			$_b = $this->bodyRelaxCanon($body);
+			break;
 
   		case 'simple':
-    		$_b = $this->bodySimpleCanon($body);
-    		break;
+			$_b = $this->bodySimpleCanon($body);
+			break;
 
   		default:
   			return false;	// unknown/unimplemented canonicalzation algorithm
   	}
 
-    // Canonicalizated Body Length [tag:l]
-    // use mb_strlen if availble to get length in bytes/octets, to kope with evtl. set mbstring.func_overload!
-    $_l = function_exists('mb_strlen') ? mb_strlen($_b, '8bit') : strlen($_b);
-
-    // Signature Timestamp [tag:t]
-    $_t = time();
-
-    // Hash of the canonicalized body [tag:bh]
-    list(,$hash_algo) = explode('-', $_a);
-    $_bh = base64_encode(hash($hash_algo,$_b,true));
-
-    // Creating DKIM-Signature
-    if (is_null($_dkim)) {
-	    $_dkim = "DKIM-Signature: ".
-	                "v=1; ".          // DKIM Version
-	                "a=\$a; ".        // The algorithm used to generate the signature "rsa-sha1"
-	                "s=\$s; ".        // The selector subdividing the namespace for the "d=" (domain) tag
-	                "d=\$d; ".        // The domain of the signing entity
-	                "l=\$l; ".        // Canonicalizated Body length count
-	                "t=\$t; ".        // Signature Timestamp
-	                "c=\$c; ".        // Message (Headers/Body) Canonicalization "relaxed/relaxed"
-	                "h=\$h; ".        // Signed header fields
-	                "bh=\$bh;\r\n\t". // The hash of the canonicalized body part of the message
-	                "b=";             // The signature data (Empty because we will calculate it later)
-    }
+	// Canonicalizated Body Length [tag:l]
+	// use mb_strlen if availble to get length in bytes/octets, to kope with evtl. set mbstring.func_overload!
+	$_l = function_exists('mb_strlen') ? mb_strlen($_b, '8bit') : strlen($_b);
+
+	// Signature Timestamp [tag:t]
+	$_t = time();
+
+	// Hash of the canonicalized body [tag:bh]
+	list(,$hash_algo) = explode('-', $_a);
+	$_bh = base64_encode(hash($hash_algo,$_b,true));
+
+	// Creating DKIM-Signature
+	if (is_null($_dkim)) {
+		$_dkim = "DKIM-Signature: ".
+					"v=1; ".          // DKIM Version
+					"a=\$a; ".        // The algorithm used to generate the signature "rsa-sha1"
+					"s=\$s; ".        // The selector subdividing the namespace for the "d=" (domain) tag
+					"d=\$d; ".        // The domain of the signing entity
+					"l=\$l; ".        // Canonicalizated Body length count
+					"t=\$t; ".        // Signature Timestamp
+					"c=\$c; ".        // Message (Headers/Body) Canonicalization "relaxed/relaxed"
+					"h=\$h; ".        // Signed header fields
+					"bh=\$bh;\r\n\t". // The hash of the canonicalized body part of the message
+					"b=";             // The signature data (Empty because we will calculate it later)
+	}
 	$_dkim = strtr($_dkim, array(
 		'$a' => $_a,
 		'$s' => $this->s,
@@ -369,39 +369,39 @@ 
 		'$h' => $h,
 		'$bh' => $_bh,
 	));
-    // Wrap DKIM Header
-    $_dkim = wordwrap($_dkim,76,"\r\n\t");
+	// Wrap DKIM Header
+	$_dkim = wordwrap($_dkim,76,"\r\n\t");
 
-    // Canonicalization Header Data
+	// Canonicalization Header Data
   	switch($header_canon)
   	{
   		case 'relaxed':
-    		$_unsigned  = $this->headRelaxCanon(implode("\r\n",$_h)."\r\n{$_dkim}");
-    		break;
+			$_unsigned  = $this->headRelaxCanon(implode("\r\n",$_h)."\r\n{$_dkim}");
+			break;
 
   		case 'ischedule-relaxed':
-    		$_unsigned  = $this->headIScheduleRelaxCanon(implode("\r\n",$_h)."\r\n{$_dkim}");
-    		break;
+			$_unsigned  = $this->headIScheduleRelaxCanon(implode("\r\n",$_h)."\r\n{$_dkim}");
+			break;
 
-    	case 'simple':
-    		$_unsigned  = $this->headSimpleCanon(implode("\r\n",$_h)."\r\n{$_dkim}");
-     		break;
+		case 'simple':
+			$_unsigned  = $this->headSimpleCanon(implode("\r\n",$_h)."\r\n{$_dkim}");
+	 		break;
 
   		default:
   			return false;	// unknown/unimplemented canonicalzation algorithm
   	}
 error_log(__METHOD__."() unsigned='".str_replace(array("\r","\n"),array('\\r','\\n'),$_unsigned)."'");
 
-    // Sign Canonicalization Header Data with Private Key
-    openssl_sign($_unsigned, $_signed, $this->pkid, $hash_algo);
+	// Sign Canonicalization Header Data with Private Key
+	openssl_sign($_unsigned, $_signed, $this->pkid, $hash_algo);
 
-    // Base64 encoded signed data
-    // Chunk Split it
-    // Then Append it $_dkim
-    $_dkim   .= chunk_split(base64_encode($_signed),76,"\r\n\t");
+	// Base64 encoded signed data
+	// Chunk Split it
+	// Then Append it $_dkim
+	$_dkim   .= chunk_split(base64_encode($_signed),76,"\r\n\t");
 
-    // Return trimmed $_dkim
-    return trim($_dkim);
+	// Return trimmed $_dkim
+	return trim($_dkim);
   }
 
   /**
@@ -428,34 +428,34 @@ 
    * @author Ahmad Amarullah
    */
   public function getDomainKey($h,$_h,$body){
-    // If $h = empty, dont add h tag into DomainKey-Signature
-    $hval = '';
-    if ($h)
-      $hval= "h={$h}; ";
-
-    // Creating DomainKey-Signature
-    $_dk = "DomainKey-Signature: ".
-              "a=rsa-sha1; ".           // The algorithm used to generate the signature "rsa-sha1"
-              "c=nofws; ".              // Canonicalization Alghoritm "nofws"
-              "d={$this->d}; ".         // The domain of the signing entity
-              "s={$this->s}; ".         // The selector subdividing the namespace for the "d=" (domain) tag
-              "{$hval}";                // If Exists - Signed header fields
-
-    // nofws Canonicalization for headers and body data
-    $_unsigned  = $this->nofws($_h,$body);
-
-    // Sign nofws Canonicalizated Data with Private Key
-    openssl_sign($_unsigned, $_signed, $this->pkid, OPENSSL_ALGO_SHA1);
-
-    // Base64 encoded signed data
-    // Chunk Split it
-    $b = chunk_split(base64_encode($_signed),76,"\r\n\t");
-
-    // Append sign data into b tag in $_dk
-    $_dk.="b={$b}";
-
-    // Return Wrapped and trimmed $_dk
-    return trim(wordwrap($_dk,76,"\r\n\t"));
+	// If $h = empty, dont add h tag into DomainKey-Signature
+	$hval = '';
+	if ($h)
+	  $hval= "h={$h}; ";
+
+	// Creating DomainKey-Signature
+	$_dk = "DomainKey-Signature: ".
+			  "a=rsa-sha1; ".           // The algorithm used to generate the signature "rsa-sha1"
+			  "c=nofws; ".              // Canonicalization Alghoritm "nofws"
+			  "d={$this->d}; ".         // The domain of the signing entity
+			  "s={$this->s}; ".         // The selector subdividing the namespace for the "d=" (domain) tag
+			  "{$hval}";                // If Exists - Signed header fields
+
+	// nofws Canonicalization for headers and body data
+	$_unsigned  = $this->nofws($_h,$body);
+
+	// Sign nofws Canonicalizated Data with Private Key
+	openssl_sign($_unsigned, $_signed, $this->pkid, OPENSSL_ALGO_SHA1);
+
+	// Base64 encoded signed data
+	// Chunk Split it
+	$b = chunk_split(base64_encode($_signed),76,"\r\n\t");
+
+	// Append sign data into b tag in $_dk
+	$_dk.="b={$b}";
+
+	// Return Wrapped and trimmed $_dk
+	return trim(wordwrap($_dk,76,"\r\n\t"));
   }
 
   /**
@@ -480,107 +480,107 @@ 
    * @author Ahmad Amarullah
    */
   public function sign(
-      $mail_data,                                 // Raw Mail Data
-      $suggested_h = "from:to:subject",           // Suggested Signed Header Fields
-      $create_dkim = true,                        // Create DKIM-Signature Header
-      $create_domainkey = true,                   // Create DomainKey-Signature Header
-      $out_sign_header_only = false               // Return Signature Header Only without original data
-    ){
-
-    if (!$suggested_h) $suggested_h = "from:to:subject"; // Default Suggested Signed Header Fields
-
-    // Remove all space and Lowercase Suggested Signed header fields then split it into array
-    $_h = explode(":",strtolower(preg_replace('/[\r\t\n ]++/','',$suggested_h)));
-
-    // Split Raw Mail data into $raw_headers and $body
-    list($raw_headers, $body) = explode("\r\n\r\n",$mail_data,2);
-
-    // Explode $raw_header into $header_list
-    $header_list = preg_split("/\r\n(?![\t ])/", $raw_headers);
-
-    // Empty Header Array
-    $headers = array();
-
-    // Loop $header_list
-    foreach($header_list as $header){
-      // Find Header Key for Array Key
-      list($key) = explode(':',$header, 2);
-
-      // Trim and Lowercase It
-      $key = strtolower(trim($key));
-
-      // If header with current key was exists
-      // Change it into array
-      if (isset($headers[$key])){
-        // If header not yet array set as Array
-        if (!is_array($headers[$key]))
-          $headers[$key] = array($headers[$key]);
-
-        // Add Current Header as next element
-        $headers[$key][] = $header;
-      }
-
-      // If header with current key not exists
-      // Insert header as string
-      else{
-        $headers[$key] = $header;
-      }
-    }
-
-    // Now, lets find accepted Suggested Signed header fields
-    // and reorder it to match headers position
-
-    $accepted_h = array();          // For Accepted Signed header fields
-    $accepted_headers = array();    // For Accepted Header
-
-    // Loop the Headers Array
-    foreach ($headers as $key=>$val){
-      // Check if $val wasn't array
-      // We don't want to include multiple headers as Signed header fields
-      if (!is_array($val)){
-        // Check if this header exists in Suggested Signed header fields
-        if (in_array($key,$_h)){
-          // If Exists, add it into accepted headers and accepted header fields
-          $accepted_h[] = $key;
-          $accepted_headers[] = $val;
-        }
-      }
-    }
-
-    // If it doesn't contain any $accepted_h
-    // return false, because we don't have enough data
-    // for signing email
-    if (count($accepted_h)==0)
-      return false;
-
-    // Create $_hdata for Signed header fields
-    // by imploding it with colon
-    $_hdata = implode(":",$accepted_h);
-
-    // New Headers Variable
-    $_nh = array("x-domain-signer"=>"X-Domain-Signer: {$this->__app_name} {$this->__app_ver} <$this->__app_url>");
-
-    // Create DKIM First
-    if ($create_dkim)
-      $_nh['dkim-signature'] = $this->getDKIM($_hdata,$accepted_headers,$body);
-
-    // Now Create Domain-Signature
-    if ($create_domainkey)
-      $_nh['domainKey-signature'] = $this->getDomainKey($_hdata,$accepted_headers,$body);
-
-    // Implode $_nh with \r\n
-    $to_be_appended_headers = implode("\r\n",$_nh);
-
-    // Return Immediately if
-    // * $out_sign_header_only=true (as headers string)
-    // * $out_sign_header_only=2    (as headers array)
-    if ($out_sign_header_only===2)
-      return $_nh;
-    elseif ($out_sign_header_only)
-      return "{$to_be_appended_headers}\r\n";
-
-    // Return signed headers with original data
-    return "{$to_be_appended_headers}\r\n{$mail_data}";
+	  $mail_data,                                 // Raw Mail Data
+	  $suggested_h = "from:to:subject",           // Suggested Signed Header Fields
+	  $create_dkim = true,                        // Create DKIM-Signature Header
+	  $create_domainkey = true,                   // Create DomainKey-Signature Header
+	  $out_sign_header_only = false               // Return Signature Header Only without original data
+	){
+
+	if (!$suggested_h) $suggested_h = "from:to:subject"; // Default Suggested Signed Header Fields
+
+	// Remove all space and Lowercase Suggested Signed header fields then split it into array
+	$_h = explode(":",strtolower(preg_replace('/[\r\t\n ]++/','',$suggested_h)));
+
+	// Split Raw Mail data into $raw_headers and $body
+	list($raw_headers, $body) = explode("\r\n\r\n",$mail_data,2);
+
+	// Explode $raw_header into $header_list
+	$header_list = preg_split("/\r\n(?![\t ])/", $raw_headers);
+
+	// Empty Header Array
+	$headers = array();
+
+	// Loop $header_list
+	foreach($header_list as $header){
+	  // Find Header Key for Array Key
+	  list($key) = explode(':',$header, 2);
+
+	  // Trim and Lowercase It
+	  $key = strtolower(trim($key));
+
+	  // If header with current key was exists
+	  // Change it into array
+	  if (isset($headers[$key])){
+		// If header not yet array set as Array
+		if (!is_array($headers[$key]))
+		  $headers[$key] = array($headers[$key]);
+
+		// Add Current Header as next element
+		$headers[$key][] = $header;
+	  }
+
+	  // If header with current key not exists
+	  // Insert header as string
+	  else{
+		$headers[$key] = $header;
+	  }
+	}
+
+	// Now, lets find accepted Suggested Signed header fields
+	// and reorder it to match headers position
+
+	$accepted_h = array();          // For Accepted Signed header fields
+	$accepted_headers = array();    // For Accepted Header
+
+	// Loop the Headers Array
+	foreach ($headers as $key=>$val){
+	  // Check if $val wasn't array
+	  // We don't want to include multiple headers as Signed header fields
+	  if (!is_array($val)){
+		// Check if this header exists in Suggested Signed header fields
+		if (in_array($key,$_h)){
+		  // If Exists, add it into accepted headers and accepted header fields
+		  $accepted_h[] = $key;
+		  $accepted_headers[] = $val;
+		}
+	  }
+	}
+
+	// If it doesn't contain any $accepted_h
+	// return false, because we don't have enough data
+	// for signing email
+	if (count($accepted_h)==0)
+	  return false;
+
+	// Create $_hdata for Signed header fields
+	// by imploding it with colon
+	$_hdata = implode(":",$accepted_h);
+
+	// New Headers Variable
+	$_nh = array("x-domain-signer"=>"X-Domain-Signer: {$this->__app_name} {$this->__app_ver} <$this->__app_url>");
+
+	// Create DKIM First
+	if ($create_dkim)
+	  $_nh['dkim-signature'] = $this->getDKIM($_hdata,$accepted_headers,$body);
+
+	// Now Create Domain-Signature
+	if ($create_domainkey)
+	  $_nh['domainKey-signature'] = $this->getDomainKey($_hdata,$accepted_headers,$body);
+
+	// Implode $_nh with \r\n
+	$to_be_appended_headers = implode("\r\n",$_nh);
+
+	// Return Immediately if
+	// * $out_sign_header_only=true (as headers string)
+	// * $out_sign_header_only=2    (as headers array)
+	if ($out_sign_header_only===2)
+	  return $_nh;
+	elseif ($out_sign_header_only)
+	  return "{$to_be_appended_headers}\r\n";
+
+	// Return signed headers with original data
+	return "{$to_be_appended_headers}\r\n{$mail_data}";
   }
 }
 

Spacing +88 added lines, -88 removed lines

@@ -28,12 +28,12 @@ 
  * @package mailDomainSigner
  * @author Ahmad Amarullah
  */
-class mailDomainSigner{
+class mailDomainSigner {
 
   ///////////////////////
   // PRIVATE VARIABLES //
   ///////////////////////
-  private $pkid=null;
+  private $pkid = null;
   private $s;
   private $d;
 
@@ -51,7 +51,7 @@ 
    * @param string $s The selector used to form the query for the public key
    * @author Ahmad Amarullah
    */
-  public function __construct($private_key,$d,$s){
+  public function __construct($private_key, $d, $s) {
     // Get a private key
     $this->pkid = openssl_pkey_get_private($private_key);
 
@@ -75,33 +75,33 @@ 
    * @access public
    * @author Ahmad Amarullah
    */
-  public function nofws($raw_headers,$raw_body){
+  public function nofws($raw_headers, $raw_body) {
     // nofws-ed headers
     $headers = array();
 
     // Loop the raw_headers
-    foreach ($raw_headers as $header){
+    foreach ($raw_headers as $header) {
       // Replace all Folding Whitespace
-      $headers[] = preg_replace('/[\r\t\n ]++/','',$header);
+      $headers[] = preg_replace('/[\r\t\n ]++/', '', $header);
     }
 
     // Join headers with LF then Add it into data
-    $data = implode("\n",$headers)."\n";
+    $data = implode("\n", $headers)."\n";
 
     // Loop Body Lines
-    foreach(explode("\n","\n".str_replace("\r","",$raw_body)) as $line)
+    foreach (explode("\n", "\n".str_replace("\r", "", $raw_body)) as $line)
     {
       // Replace all Folding Whitespace from current line
       // then Add it into data
-      $data .= preg_replace('/[\t\n ]++/','',$line)."\n";
+      $data .= preg_replace('/[\t\n ]++/', '', $line)."\n";
     }
 
     // Remove Trailing empty lines then split it with LF
-    $data = explode("\n",rtrim($data,"\n"));
+    $data = explode("\n", rtrim($data, "\n"));
 
     // Join array of data with CRLF and Append CRLF
     // to the resulting line
-    $data = implode("\r\n",$data)."\r\n";
+    $data = implode("\r\n", $data)."\r\n";
 
     // Return Canonicalizated Data
     return $data;
@@ -124,28 +124,28 @@ 
    */
   public function headRelaxCanon($s) {
     // Replace CR,LF and spaces into single SP
-    $s=preg_replace("/\r\n\s+/"," ",$s) ;
+    $s = preg_replace("/\r\n\s+/", " ", $s);
 
     // Explode Header Line
-    $lines=explode("\r\n",$s) ;
+    $lines = explode("\r\n", $s);
 
     // Loop the lines
     foreach ($lines as $key=>$line) {
       // Split the key and value
-      list($heading,$value)=explode(":",$line,2) ;
+      list($heading, $value) = explode(":", $line, 2);
 
       // Lowercase heading key
-      $heading=strtolower($heading);
+      $heading = strtolower($heading);
 
       // Compress useless spaces
-      $value=preg_replace("/\s+/"," ",$value);
+      $value = preg_replace("/\s+/", " ", $value);
 
       // Don't forget to remove WSP around the value
-      $lines[$key]=$heading.":".trim($value);
+      $lines[$key] = $heading.":".trim($value);
     }
 
     // Implode it again
-    $s=implode("\r\n",$lines);
+    $s = implode("\r\n", $lines);
 
     // Return Canonicalizated Headers
     return $s;
@@ -169,25 +169,25 @@ 
    */
   public function headIScheduleRelaxCanon($s) {
     // Replace CR,LF and spaces into single SP
-    $s=preg_replace("/\r\n\s+/"," ",$s) ;
+    $s = preg_replace("/\r\n\s+/", " ", $s);
 
     // Loop exploded header lines
-    $lines=array();
-    foreach (explode("\r\n",$s) as $line) {
+    $lines = array();
+    foreach (explode("\r\n", $s) as $line) {
       // Split the key and value
-      list($heading,$value)=explode(":",$line,2) ;
+      list($heading, $value) = explode(":", $line, 2);
 
       // Lowercase heading key
-      $heading=strtolower($heading);
+      $heading = strtolower($heading);
 
       // Compress useless spaces
-      $value=preg_replace("/\s+/"," ",$value);
+      $value = preg_replace("/\s+/", " ", $value);
 
       // Don't forget to remove WSP around the value
       $value = trim($value);
 
       // remove whitespace after comma in values
-      $value = preg_replace("/,\s+/",",",$value);
+      $value = preg_replace("/,\s+/", ",", $value);
 
       // for multiple headers, add them comma-separated to existing headers
       if (isset($lines[$heading])) {
@@ -198,7 +198,7 @@ 
     }
 
     // Implode it again
-    $s=implode("\r\n",$lines);
+    $s = implode("\r\n", $lines);
 
     // Return Canonicalizated Headers
     return $s;
@@ -232,27 +232,27 @@ 
    */
   public function bodyRelaxCanon($body) {
     // Return CRLF for empty body
-    if ($body == ''){
+    if ($body == '') {
       return "\r\n";
     }
 
     // Replace all CRLF to LF
-    $body = str_replace("\r\n","\n",$body);
+    $body = str_replace("\r\n", "\n", $body);
 
     // Replace LF to CRLF
-    $body = str_replace("\n","\r\n",$body);
+    $body = str_replace("\n", "\r\n", $body);
 
     // Ignores all whitespace at the end of lines
-    $body=rtrim($body,"\r\n");
+    $body = rtrim($body, "\r\n");
 
     // Canonicalizated String Variable
     $canon_body = '';
 
     // Split the body into lines
-    foreach(explode("\r\n",$body) as $line){
+    foreach (explode("\r\n", $body) as $line) {
       // Reduces all sequences of White Space within a line
       // to a single SP character
-      $canon_body.= rtrim(preg_replace('/[\t\n ]++/',' ',$line))."\r\n";
+      $canon_body .= rtrim(preg_replace('/[\t\n ]++/', ' ', $line))."\r\n";
     }
 
     // Return the Canonicalizated Body
@@ -316,11 +316,11 @@ 
    * @access public
    * @author Ahmad Amarullah
    */
-  public function getDKIM($h,$_h,$body,$_c='relaxed/relaxed',$_a='rsa-sha1',$_dkim=null) {
+  public function getDKIM($h, $_h, $body, $_c = 'relaxed/relaxed', $_a = 'rsa-sha1', $_dkim = null) {
 
     // Relax Canonicalization for Body
- 	list($header_canon,$body_canon) = explode('/',$_c);
-  	switch($body_canon)
+ 	list($header_canon, $body_canon) = explode('/', $_c);
+  	switch ($body_canon)
   	{
   		case 'relaxed':
     		$_b = $this->bodyRelaxCanon($body);
@@ -331,7 +331,7 @@ 
     		break;
 
   		default:
-  			return false;	// unknown/unimplemented canonicalzation algorithm
+  			return false; // unknown/unimplemented canonicalzation algorithm
   	}
 
     // Canonicalizated Body Length [tag:l]
@@ -343,21 +343,21 @@ 
 
     // Hash of the canonicalized body [tag:bh]
     list(,$hash_algo) = explode('-', $_a);
-    $_bh = base64_encode(hash($hash_algo,$_b,true));
+    $_bh = base64_encode(hash($hash_algo, $_b, true));
 
     // Creating DKIM-Signature
     if (is_null($_dkim)) {
 	    $_dkim = "DKIM-Signature: ".
-	                "v=1; ".          // DKIM Version
-	                "a=\$a; ".        // The algorithm used to generate the signature "rsa-sha1"
-	                "s=\$s; ".        // The selector subdividing the namespace for the "d=" (domain) tag
-	                "d=\$d; ".        // The domain of the signing entity
-	                "l=\$l; ".        // Canonicalizated Body length count
-	                "t=\$t; ".        // Signature Timestamp
-	                "c=\$c; ".        // Message (Headers/Body) Canonicalization "relaxed/relaxed"
-	                "h=\$h; ".        // Signed header fields
-	                "bh=\$bh;\r\n\t". // The hash of the canonicalized body part of the message
-	                "b=";             // The signature data (Empty because we will calculate it later)
+	                "v=1; ".// DKIM Version
+	                "a=\$a; ".// The algorithm used to generate the signature "rsa-sha1"
+	                "s=\$s; ".// The selector subdividing the namespace for the "d=" (domain) tag
+	                "d=\$d; ".// The domain of the signing entity
+	                "l=\$l; ".// Canonicalizated Body length count
+	                "t=\$t; ".// Signature Timestamp
+	                "c=\$c; ".// Message (Headers/Body) Canonicalization "relaxed/relaxed"
+	                "h=\$h; ".// Signed header fields
+	                "bh=\$bh;\r\n\t".// The hash of the canonicalized body part of the message
+	                "b="; // The signature data (Empty because we will calculate it later)
     }
 	$_dkim = strtr($_dkim, array(
 		'$a' => $_a,
@@ -370,27 +370,27 @@ 
 		'$bh' => $_bh,
 	));
     // Wrap DKIM Header
-    $_dkim = wordwrap($_dkim,76,"\r\n\t");
+    $_dkim = wordwrap($_dkim, 76, "\r\n\t");
 
     // Canonicalization Header Data
-  	switch($header_canon)
+  	switch ($header_canon)
   	{
   		case 'relaxed':
-    		$_unsigned  = $this->headRelaxCanon(implode("\r\n",$_h)."\r\n{$_dkim}");
+    		$_unsigned = $this->headRelaxCanon(implode("\r\n", $_h)."\r\n{$_dkim}");
     		break;
 
   		case 'ischedule-relaxed':
-    		$_unsigned  = $this->headIScheduleRelaxCanon(implode("\r\n",$_h)."\r\n{$_dkim}");
+    		$_unsigned = $this->headIScheduleRelaxCanon(implode("\r\n", $_h)."\r\n{$_dkim}");
     		break;
 
     	case 'simple':
-    		$_unsigned  = $this->headSimpleCanon(implode("\r\n",$_h)."\r\n{$_dkim}");
+    		$_unsigned = $this->headSimpleCanon(implode("\r\n", $_h)."\r\n{$_dkim}");
      		break;
 
   		default:
-  			return false;	// unknown/unimplemented canonicalzation algorithm
+  			return false; // unknown/unimplemented canonicalzation algorithm
   	}
-error_log(__METHOD__."() unsigned='".str_replace(array("\r","\n"),array('\\r','\\n'),$_unsigned)."'");
+error_log(__METHOD__."() unsigned='".str_replace(array("\r", "\n"), array('\\r', '\\n'), $_unsigned)."'");
 
     // Sign Canonicalization Header Data with Private Key
     openssl_sign($_unsigned, $_signed, $this->pkid, $hash_algo);
@@ -398,7 +398,7 @@ 
     // Base64 encoded signed data
     // Chunk Split it
     // Then Append it $_dkim
-    $_dkim   .= chunk_split(base64_encode($_signed),76,"\r\n\t");
+    $_dkim .= chunk_split(base64_encode($_signed), 76, "\r\n\t");
 
     // Return trimmed $_dkim
     return trim($_dkim);
@@ -427,35 +427,35 @@ 
    * @access public
    * @author Ahmad Amarullah
    */
-  public function getDomainKey($h,$_h,$body){
+  public function getDomainKey($h, $_h, $body) {
     // If $h = empty, dont add h tag into DomainKey-Signature
     $hval = '';
     if ($h)
-      $hval= "h={$h}; ";
+      $hval = "h={$h}; ";
 
     // Creating DomainKey-Signature
     $_dk = "DomainKey-Signature: ".
-              "a=rsa-sha1; ".           // The algorithm used to generate the signature "rsa-sha1"
-              "c=nofws; ".              // Canonicalization Alghoritm "nofws"
-              "d={$this->d}; ".         // The domain of the signing entity
-              "s={$this->s}; ".         // The selector subdividing the namespace for the "d=" (domain) tag
-              "{$hval}";                // If Exists - Signed header fields
+              "a=rsa-sha1; ".// The algorithm used to generate the signature "rsa-sha1"
+              "c=nofws; ".// Canonicalization Alghoritm "nofws"
+              "d={$this->d}; ".// The domain of the signing entity
+              "s={$this->s}; ".// The selector subdividing the namespace for the "d=" (domain) tag
+              "{$hval}"; // If Exists - Signed header fields
 
     // nofws Canonicalization for headers and body data
-    $_unsigned  = $this->nofws($_h,$body);
+    $_unsigned = $this->nofws($_h, $body);
 
     // Sign nofws Canonicalizated Data with Private Key
     openssl_sign($_unsigned, $_signed, $this->pkid, OPENSSL_ALGO_SHA1);
 
     // Base64 encoded signed data
     // Chunk Split it
-    $b = chunk_split(base64_encode($_signed),76,"\r\n\t");
+    $b = chunk_split(base64_encode($_signed), 76, "\r\n\t");
 
     // Append sign data into b tag in $_dk
-    $_dk.="b={$b}";
+    $_dk .= "b={$b}";
 
     // Return Wrapped and trimmed $_dk
-    return trim(wordwrap($_dk,76,"\r\n\t"));
+    return trim(wordwrap($_dk, 76, "\r\n\t"));
   }
 
   /**
@@ -480,20 +480,20 @@ 
    * @author Ahmad Amarullah
    */
   public function sign(
-      $mail_data,                                 // Raw Mail Data
-      $suggested_h = "from:to:subject",           // Suggested Signed Header Fields
-      $create_dkim = true,                        // Create DKIM-Signature Header
-      $create_domainkey = true,                   // Create DomainKey-Signature Header
+      $mail_data, // Raw Mail Data
+      $suggested_h = "from:to:subject", // Suggested Signed Header Fields
+      $create_dkim = true, // Create DKIM-Signature Header
+      $create_domainkey = true, // Create DomainKey-Signature Header
       $out_sign_header_only = false               // Return Signature Header Only without original data
-    ){
+    ) {
 
     if (!$suggested_h) $suggested_h = "from:to:subject"; // Default Suggested Signed Header Fields
 
     // Remove all space and Lowercase Suggested Signed header fields then split it into array
-    $_h = explode(":",strtolower(preg_replace('/[\r\t\n ]++/','',$suggested_h)));
+    $_h = explode(":", strtolower(preg_replace('/[\r\t\n ]++/', '', $suggested_h)));
 
     // Split Raw Mail data into $raw_headers and $body
-    list($raw_headers, $body) = explode("\r\n\r\n",$mail_data,2);
+    list($raw_headers, $body) = explode("\r\n\r\n", $mail_data, 2);
 
     // Explode $raw_header into $header_list
     $header_list = preg_split("/\r\n(?![\t ])/", $raw_headers);
@@ -502,16 +502,16 @@ 
     $headers = array();
 
     // Loop $header_list
-    foreach($header_list as $header){
+    foreach ($header_list as $header) {
       // Find Header Key for Array Key
-      list($key) = explode(':',$header, 2);
+      list($key) = explode(':', $header, 2);
 
       // Trim and Lowercase It
       $key = strtolower(trim($key));
 
       // If header with current key was exists
       // Change it into array
-      if (isset($headers[$key])){
+      if (isset($headers[$key])) {
         // If header not yet array set as Array
         if (!is_array($headers[$key]))
           $headers[$key] = array($headers[$key]);
@@ -522,7 +522,7 @@ 
 
       // If header with current key not exists
       // Insert header as string
-      else{
+      else {
         $headers[$key] = $header;
       }
     }
@@ -530,16 +530,16 @@ 
     // Now, lets find accepted Suggested Signed header fields
     // and reorder it to match headers position
 
-    $accepted_h = array();          // For Accepted Signed header fields
-    $accepted_headers = array();    // For Accepted Header
+    $accepted_h = array(); // For Accepted Signed header fields
+    $accepted_headers = array(); // For Accepted Header
 
     // Loop the Headers Array
-    foreach ($headers as $key=>$val){
+    foreach ($headers as $key=>$val) {
       // Check if $val wasn't array
       // We don't want to include multiple headers as Signed header fields
-      if (!is_array($val)){
+      if (!is_array($val)) {
         // Check if this header exists in Suggested Signed header fields
-        if (in_array($key,$_h)){
+        if (in_array($key, $_h)) {
           // If Exists, add it into accepted headers and accepted header fields
           $accepted_h[] = $key;
           $accepted_headers[] = $val;
@@ -550,31 +550,31 @@ 
     // If it doesn't contain any $accepted_h
     // return false, because we don't have enough data
     // for signing email
-    if (count($accepted_h)==0)
+    if (count($accepted_h) == 0)
       return false;
 
     // Create $_hdata for Signed header fields
     // by imploding it with colon
-    $_hdata = implode(":",$accepted_h);
+    $_hdata = implode(":", $accepted_h);
 
     // New Headers Variable
     $_nh = array("x-domain-signer"=>"X-Domain-Signer: {$this->__app_name} {$this->__app_ver} <$this->__app_url>");
 
     // Create DKIM First
     if ($create_dkim)
-      $_nh['dkim-signature'] = $this->getDKIM($_hdata,$accepted_headers,$body);
+      $_nh['dkim-signature'] = $this->getDKIM($_hdata, $accepted_headers, $body);
 
     // Now Create Domain-Signature
     if ($create_domainkey)
-      $_nh['domainKey-signature'] = $this->getDomainKey($_hdata,$accepted_headers,$body);
+      $_nh['domainKey-signature'] = $this->getDomainKey($_hdata, $accepted_headers, $body);
 
     // Implode $_nh with \r\n
-    $to_be_appended_headers = implode("\r\n",$_nh);
+    $to_be_appended_headers = implode("\r\n", $_nh);
 
     // Return Immediately if
     // * $out_sign_header_only=true (as headers string)
     // * $out_sign_header_only=2    (as headers array)
-    if ($out_sign_header_only===2)
+    if ($out_sign_header_only === 2)
       return $_nh;
     elseif ($out_sign_header_only)
       return "{$to_be_appended_headers}\r\n";

Braces +78 added lines, -34 removed lines

@@ -28,7 +28,8 @@ 
  * @package mailDomainSigner
  * @author Ahmad Amarullah
  */
-class mailDomainSigner{
+class mailDomainSigner
+{
 
   ///////////////////////
   // PRIVATE VARIABLES //
@@ -51,7 +52,8 @@ 
    * @param string $s The selector used to form the query for the public key
    * @author Ahmad Amarullah
    */
-  public function __construct($private_key,$d,$s){
+  public function __construct($private_key,$d,$s)
+  {
     // Get a private key
     $this->pkid = openssl_pkey_get_private($private_key);
 
@@ -75,12 +77,14 @@ 
    * @access public
    * @author Ahmad Amarullah
    */
-  public function nofws($raw_headers,$raw_body){
+  public function nofws($raw_headers,$raw_body)
+  {
     // nofws-ed headers
     $headers = array();
 
     // Loop the raw_headers
-    foreach ($raw_headers as $header){
+    foreach ($raw_headers as $header)
+    {
       // Replace all Folding Whitespace
       $headers[] = preg_replace('/[\r\t\n ]++/','',$header);
     }
@@ -122,7 +126,8 @@ 
    * @access public
    * @author Eric Vyncke
    */
-  public function headRelaxCanon($s) {
+  public function headRelaxCanon($s)
+  {
     // Replace CR,LF and spaces into single SP
     $s=preg_replace("/\r\n\s+/"," ",$s) ;
 
@@ -130,7 +135,8 @@ 
     $lines=explode("\r\n",$s) ;
 
     // Loop the lines
-    foreach ($lines as $key=>$line) {
+    foreach ($lines as $key=>$line)
+    {
       // Split the key and value
       list($heading,$value)=explode(":",$line,2) ;
 
@@ -167,13 +173,15 @@ 
    * @access public
    * @author Ralf Becker
    */
-  public function headIScheduleRelaxCanon($s) {
+  public function headIScheduleRelaxCanon($s)
+  {
     // Replace CR,LF and spaces into single SP
     $s=preg_replace("/\r\n\s+/"," ",$s) ;
 
     // Loop exploded header lines
     $lines=array();
-    foreach (explode("\r\n",$s) as $line) {
+    foreach (explode("\r\n",$s) as $line)
+    {
       // Split the key and value
       list($heading,$value)=explode(":",$line,2) ;
 
@@ -190,9 +198,12 @@ 
       $value = preg_replace("/,\s+/",",",$value);
 
       // for multiple headers, add them comma-separated to existing headers
-      if (isset($lines[$heading])) {
+      if (isset($lines[$heading]))
+      {
       	$lines[$heading] .= ','.$value;
-      } else {
+      }
+      else
+      {
       	$lines[$heading] = $heading.':'.$value;
       }
     }
@@ -215,7 +226,8 @@ 
    * @return string Simple Header Canonicalizated data
    * @access public
    */
-  public function headSimpleCanon($s) {
+  public function headSimpleCanon($s)
+  {
   	return $s;
   }
 
@@ -230,9 +242,11 @@ 
    * @access public
    * @author Ahmad Amarullah
    */
-  public function bodyRelaxCanon($body) {
+  public function bodyRelaxCanon($body)
+  {
     // Return CRLF for empty body
-    if ($body == ''){
+    if ($body == '')
+    {
       return "\r\n";
     }
 
@@ -249,7 +263,8 @@ 
     $canon_body = '';
 
     // Split the body into lines
-    foreach(explode("\r\n",$body) as $line){
+    foreach(explode("\r\n",$body) as $line)
+    {
       // Reduces all sequences of White Space within a line
       // to a single SP character
       $canon_body.= rtrim(preg_replace('/[\t\n ]++/',' ',$line))."\r\n";
@@ -269,9 +284,11 @@ 
    * @return string Simple Body Canonicalizated data
    * @access public
    */
-  public function bodySimpleCanon($body) {
+  public function bodySimpleCanon($body)
+  {
   	// remove all empty lines (CRLF pairs) at the end of the body
-  	while (substr($body, -2) === "\r\n") {
+  	while (substr($body, -2) === "\r\n")
+  	{
   		$body = substr($body, 0, -2);
   	}
 
@@ -316,7 +333,8 @@ 
    * @access public
    * @author Ahmad Amarullah
    */
-  public function getDKIM($h,$_h,$body,$_c='relaxed/relaxed',$_a='rsa-sha1',$_dkim=null) {
+  public function getDKIM($h,$_h,$body,$_c='relaxed/relaxed',$_a='rsa-sha1',$_dkim=null)
+  {
 
     // Relax Canonicalization for Body
  	list($header_canon,$body_canon) = explode('/',$_c);
@@ -346,7 +364,8 @@ 
     $_bh = base64_encode(hash($hash_algo,$_b,true));
 
     // Creating DKIM-Signature
-    if (is_null($_dkim)) {
+    if (is_null($_dkim))
+    {
 	    $_dkim = "DKIM-Signature: ".
 	                "v=1; ".          // DKIM Version
 	                "a=\$a; ".        // The algorithm used to generate the signature "rsa-sha1"
@@ -427,11 +446,14 @@ 
    * @access public
    * @author Ahmad Amarullah
    */
-  public function getDomainKey($h,$_h,$body){
+  public function getDomainKey($h,$_h,$body)
+  {
     // If $h = empty, dont add h tag into DomainKey-Signature
     $hval = '';
     if ($h)
-      $hval= "h={$h}; ";
+    {
+          $hval= "h={$h}; ";
+    }
 
     // Creating DomainKey-Signature
     $_dk = "DomainKey-Signature: ".
@@ -485,9 +507,13 @@ 
       $create_dkim = true,                        // Create DKIM-Signature Header
       $create_domainkey = true,                   // Create DomainKey-Signature Header
       $out_sign_header_only = false               // Return Signature Header Only without original data
-    ){
+    ) {
 
-    if (!$suggested_h) $suggested_h = "from:to:subject"; // Default Suggested Signed Header Fields
+    if (!$suggested_h)
+    {
+    	$suggested_h = "from:to:subject";
+    }
+    // Default Suggested Signed Header Fields
 
     // Remove all space and Lowercase Suggested Signed header fields then split it into array
     $_h = explode(":",strtolower(preg_replace('/[\r\t\n ]++/','',$suggested_h)));
@@ -502,7 +528,8 @@ 
     $headers = array();
 
     // Loop $header_list
-    foreach($header_list as $header){
+    foreach($header_list as $header)
+    {
       // Find Header Key for Array Key
       list($key) = explode(':',$header, 2);
 
@@ -511,10 +538,13 @@ 
 
       // If header with current key was exists
       // Change it into array
-      if (isset($headers[$key])){
+      if (isset($headers[$key]))
+      {
         // If header not yet array set as Array
         if (!is_array($headers[$key]))
-          $headers[$key] = array($headers[$key]);
+        {
+                  $headers[$key] = array($headers[$key]);
+        }
 
         // Add Current Header as next element
         $headers[$key][] = $header;
@@ -522,7 +552,8 @@ 
 
       // If header with current key not exists
       // Insert header as string
-      else{
+      else
+      {
         $headers[$key] = $header;
       }
     }
@@ -534,12 +565,15 @@ 
     $accepted_headers = array();    // For Accepted Header
 
     // Loop the Headers Array
-    foreach ($headers as $key=>$val){
+    foreach ($headers as $key=>$val)
+    {
       // Check if $val wasn't array
       // We don't want to include multiple headers as Signed header fields
-      if (!is_array($val)){
+      if (!is_array($val))
+      {
         // Check if this header exists in Suggested Signed header fields
-        if (in_array($key,$_h)){
+        if (in_array($key,$_h))
+        {
           // If Exists, add it into accepted headers and accepted header fields
           $accepted_h[] = $key;
           $accepted_headers[] = $val;
@@ -551,7 +585,9 @@ 
     // return false, because we don't have enough data
     // for signing email
     if (count($accepted_h)==0)
-      return false;
+    {
+          return false;
+    }
 
     // Create $_hdata for Signed header fields
     // by imploding it with colon
@@ -562,11 +598,15 @@ 
 
     // Create DKIM First
     if ($create_dkim)
-      $_nh['dkim-signature'] = $this->getDKIM($_hdata,$accepted_headers,$body);
+    {
+          $_nh['dkim-signature'] = $this->getDKIM($_hdata,$accepted_headers,$body);
+    }
 
     // Now Create Domain-Signature
     if ($create_domainkey)
-      $_nh['domainKey-signature'] = $this->getDomainKey($_hdata,$accepted_headers,$body);
+    {
+          $_nh['domainKey-signature'] = $this->getDomainKey($_hdata,$accepted_headers,$body);
+    }
 
     // Implode $_nh with \r\n
     $to_be_appended_headers = implode("\r\n",$_nh);
@@ -575,9 +615,13 @@ 
     // * $out_sign_header_only=true (as headers string)
     // * $out_sign_header_only=2    (as headers array)
     if ($out_sign_header_only===2)
-      return $_nh;
+    {
+          return $_nh;
+    }
     elseif ($out_sign_header_only)
-      return "{$to_be_appended_headers}\r\n";
+    {
+          return "{$to_be_appended_headers}\r\n";
+    }
 
     // Return signed headers with original data
     return "{$to_be_appended_headers}\r\n{$mail_data}";

phpgwapi/inc/class.network.inc.php

Doc Comments +11 added lines

@@ -36,6 +36,9 @@ 
 			$this->set_addcrlf($addcrlf);
 		}
 
+		/**
+		 * @param boolean $value
+		 */
 		function set_addcrlf($value)
 		{
 			$this->addcrlf = $value;
@@ -50,6 +53,11 @@ 
 			return $str;
 		}
 
+		/**
+		 * @param string $code
+		 * @param string $msg
+		 * @param string $desc
+		 */
 		function set_error($code,$msg,$desc)
 		{
 			$this->error = array('code','msg','desc');
@@ -61,6 +69,9 @@ 
 			return 0;
 		}
 
+		/**
+		 * @param integer $port
+		 */
 		function open_port($server,$port,$timeout=15)
 		{
 			switch($port)

Spacing +53 added lines, -53 removed lines

@@ -30,7 +30,7 @@ 
 		var $error;
 		var $errorset = 0;
 
-		function network($addcrlf=true)
+		function network($addcrlf = true)
 		{
 			$this->errorset = 0;
 			$this->set_addcrlf($addcrlf);
@@ -43,16 +43,16 @@ 
 
 		function add_crlf($str)
 		{
-			if($this->addcrlf)
+			if ($this->addcrlf)
 			{
 				$str .= "\r\n";
 			}
 			return $str;
 		}
 
-		function set_error($code,$msg,$desc)
+		function set_error($code, $msg, $desc)
 		{
-			$this->error = array('code','msg','desc');
+			$this->error = array('code', 'msg', 'desc');
 			$this->error['code'] = $code;
 			$this->error['msg'] = $msg;
 			$this->error['desc'] = $desc;
@@ -61,13 +61,13 @@ 
 			return 0;
 		}
 
-		function open_port($server,$port,$timeout=15)
+		function open_port($server, $port, $timeout = 15)
 		{
-			switch($port)
+			switch ($port)
 			{
 				case 80:
 				case 443:
-					if((isset($GLOBALS['egw_info']['server']['httpproxy_server']) && $GLOBALS['egw_info']['server']['httpproxy_server']) &&
+					if ((isset($GLOBALS['egw_info']['server']['httpproxy_server']) && $GLOBALS['egw_info']['server']['httpproxy_server']) &&
 						(isset($GLOBALS['egw_info']['server']['httpproxy_port']) && $GLOBALS['egw_info']['server']['httpproxy_port']))
 					{
 						$server = $GLOBALS['egw_info']['server']['httpproxy_server'];
@@ -75,21 +75,21 @@ 
 					}
 					break;
 			}
-			if(version_compare(phpversion(),'4.3.0') >= 0)
+			if (version_compare(phpversion(), '4.3.0') >= 0)
 			{
-				$this->socket = @fsockopen($server,$port,$errcode,$errmsg,$timeout);
-				if($this->socket)
+				$this->socket = @fsockopen($server, $port, $errcode, $errmsg, $timeout);
+				if ($this->socket)
 				{
-					stream_set_timeout($this->socket,$timeout,0);
+					stream_set_timeout($this->socket, $timeout, 0);
 				}
 			}
 			else
 			{
-				$this->socket = @fsockopen($server,$port,$errcode,$errmsg);
+				$this->socket = @fsockopen($server, $port, $errcode, $errmsg);
 			}
-			if(!$this->socket)
+			if (!$this->socket)
 			{
-				return $this->set_error('Error',$errcode.':'.$errmsg,'Connection to '.$server.':'.$port.' failed - could not open socket.');
+				return $this->set_error('Error', $errcode.':'.$errmsg, 'Connection to '.$server.':'.$port.' failed - could not open socket.');
 			}
 			else
 			{
@@ -114,10 +114,10 @@ 
 
 		function write_port($str)
 		{
-			$ok = fputs($this->socket,$this->add_crlf($str));
-			if(!$ok)
+			$ok = fputs($this->socket, $this->add_crlf($str));
+			if (!$ok)
 			{
-				return $this->set_error('Error','Connection Lost','lost connection to server');
+				return $this->set_error('Error', 'Connection Lost', 'lost connection to server');
 			}
 			else
 			{
@@ -125,19 +125,19 @@ 
 			}
 		}
 
-		function bs_write_port($str,$bytes=0)
+		function bs_write_port($str, $bytes = 0)
 		{
-			if($bytes)
+			if ($bytes)
 			{
-				$ok = fwrite($this->socket,$this->add_crlf($str),$bytes);
+				$ok = fwrite($this->socket, $this->add_crlf($str), $bytes);
 			}
 			else
 			{
-				$ok = fwrite($this->socket,$this->add_crlf($str));
+				$ok = fwrite($this->socket, $this->add_crlf($str));
 			}
-			if(!$ok)
+			if (!$ok)
 			{
-				return $this->set_error('Error','Connection Lost','lost connection to server');
+				return $this->set_error('Error', 'Connection Lost', 'lost connection to server');
 			}
 			else
 			{
@@ -145,18 +145,18 @@ 
 			}
 		}
 
-		function msg2socket($str,$expected_response,&$response)
+		function msg2socket($str, $expected_response, &$response)
 		{
-			if(!$this->socket)
+			if (!$this->socket)
 			{
-				return $this->set_error('521','socket does not exist',
+				return $this->set_error('521', 'socket does not exist',
 					'The required socket does not exist.  The settings for your mail server may be wrong.');
 			}
-			if(!$this->write_port($str))
+			if (!$this->write_port($str))
 			{
-				if(substr($expected_response,1,1) == '+')
+				if (substr($expected_response, 1, 1) == '+')
 				{
-					return $this->set_error('420','lost connection','Lost connection to pop server.');
+					return $this->set_error('420', 'lost connection', 'Lost connection to pop server.');
 				}
 				else
 				{
@@ -164,16 +164,16 @@ 
 				}
 			}
 			$response = $this->read_port();
-			if(!ereg(strtoupper($expected_response),strtoupper($response)))
+			if (!ereg(strtoupper($expected_response), strtoupper($response)))
 			{
-				if(substr($expected_response,1,1) == '+')
+				if (substr($expected_response, 1, 1) == '+')
 				{
-					return $this->set_error('550','','');
+					return $this->set_error('550', '', '');
 				}
-				$pos = strpos(' ',$response);
-				return $this->set_error(substr($response,0,$pos),
+				$pos = strpos(' ', $response);
+				return $this->set_error(substr($response, 0, $pos),
 					'invalid response('.$expected_response.')',
-					substr($response,($pos + 1),(strlen($response)-$pos)));
+					substr($response, ($pos + 1), (strlen($response) - $pos)));
 			}
 			else
 			{
@@ -182,14 +182,14 @@ 
 		}
 
 		// return contents of a web url as an array (or string) or false if timeout
-		function gethttpsocketfile($file,$user='',$passwd='',$string=False)
+		function gethttpsocketfile($file, $user = '', $passwd = '', $string = False)
 		{
-			$server = str_replace('http://','',$file);
-			$file = @strstr($server,'/');
-			$server = str_replace($file,'',$server);
+			$server = str_replace('http://', '', $file);
+			$file = @strstr($server, '/');
+			$server = str_replace($file, '', $server);
 
 			//allows for access to http-auth pages - added by Dave Hall <dave.hall@mbox.com.au>
-			if(!((empty($user))&&(empty($passwd))))
+			if (!((empty($user)) && (empty($passwd))))
 			{
 				$auth = 'Authorization: Basic '.base64_encode("$user:$passwd")."\r\n";
 			}
@@ -198,25 +198,25 @@ 
 				$auth = '';
 			}
 
-			if($GLOBALS['egw_info']['server']['httpproxy_server'])
+			if ($GLOBALS['egw_info']['server']['httpproxy_server'])
 			{
 				$proxyAuth = '';
-				if(!empty($GLOBALS['egw_info']['server']['httpproxy_server_username']))
+				if (!empty($GLOBALS['egw_info']['server']['httpproxy_server_username']))
 				{
 					$proxyUsername = $GLOBALS['egw_info']['server']['httpproxy_server_username'];
 					$proxyPassword = $GLOBALS['egw_info']['server']['httpproxy_server_password'];
 					$proxyAuth = 'Proxy-Authorization: Basic '.base64_encode("$proxyUsername:$proxyPassword")."\r\n";
 				}
-				if($this->open_port($server,80, 15))
+				if ($this->open_port($server, 80, 15))
 				{
-					if(!$this->write_port('GET http://' . $server . $file . ' HTTP/1.0'."\r\n".$proxyAuth.$auth."\r\n\r\n"))
+					if (!$this->write_port('GET http://'.$server.$file.' HTTP/1.0'."\r\n".$proxyAuth.$auth."\r\n\r\n"))
 					{
 						return False;
 					}
 					$i = 0;
-					while($line = $this->read_port())
+					while ($line = $this->read_port())
 					{
-						if(feof($this->socket))
+						if (feof($this->socket))
 						{
 							break;
 						}
@@ -224,9 +224,9 @@ 
 						$i++;
 					}
 					$this->close_port();
-					if($string)
+					if ($string)
 					{
-						return implode("\n",$lines);
+						return implode("\n", $lines);
 					}
 					return $lines;
 				}
@@ -237,21 +237,21 @@ 
 			}
 			else
 			{
-				if($this->open_port($server, 80, 30))
+				if ($this->open_port($server, 80, 30))
 				{
 					$lines = array();
-					if(!$this->write_port('GET '.$file.' HTTP/1.0'."\r\n".'Host: '.$server."\r\nAccept: */*".($auth?"\r\n".$auth:'')."\r\n\r\n"))
+					if (!$this->write_port('GET '.$file.' HTTP/1.0'."\r\n".'Host: '.$server."\r\nAccept: */*".($auth ? "\r\n".$auth : '')."\r\n\r\n"))
 					{
 						return 0;
 					}
-					while($line = $this->read_port())
+					while ($line = $this->read_port())
 					{
 						$lines[] = $line;
 					}
 					$this->close_port();
-					if($string)
+					if ($string)
 					{
-						return implode("\n",$lines);
+						return implode("\n", $lines);
 					}
 					return $lines;
 				}

phpgwapi/inc/class.nextmatchs.inc.php

Doc Comments +36 added lines

@@ -89,6 +89,11 @@ 
 		@param $img_src ?
 		@param $label ?
 		*/
+
+		/**
+		 * @param string $align
+		 * @param string $img
+		 */
 		function set_icon($align,$img,$label)
 		{
 			$var = array(
@@ -134,6 +139,11 @@ 
 		@param $link ?
 		@param $extravars ?
 		*/
+
+		/**
+		 * @param string $align
+		 * @param string $img
+		 */
 		function set_link($align,$img,$link,$alt,$extravars)
 		{
 			$var = Array(
@@ -244,6 +254,10 @@ 
 		@param $total ?
 		@param $extradate ?
 		*/
+
+		/**
+		 * @param integer $start
+		 */
 		function left($scriptname,$start,$total,$extradata = '')
 		{
 			$extravars = Array(
@@ -290,6 +304,10 @@ 
 		@param $total ?
 		@param $extradate ?
 		*/
+
+		/**
+		 * @param integer $start
+		 */
 		function right($scriptname,$start,$total,$extradata = '')
 		{
 			$extravars = Array(
@@ -470,6 +488,10 @@ 
 		@abstract ?
 		@param $filter_obj
 		*/
+
+		/**
+		 * @param integer $filter_obj
+		 */
 		function filter($filter_obj,$yours=0)
 		{
 			if (is_array($yours))
@@ -654,6 +676,11 @@ 
 		@param $text ?
 		@param $extra default ''
 		*/
+
+		/**
+		 * @param string $var
+		 * @param string $program
+		 */
 		function show_sort_order($sort,$var,$order,$program,$text,$extra='',$build_a_href=True)
 		{
 			if ($order == $var)
@@ -848,6 +875,11 @@ 
 		@param $link ?
 		@param $extravars ?
 		*/
+
+		/**
+		 * @param string $align
+		 * @param string $img
+		 */
 		function set_link_imap($align,$img,$alt_text,$out_vars)
 		{
 			$img_full = $GLOBALS['egw']->common->image('phpgwapi',$img);
@@ -855,6 +887,10 @@ 
 			return '<a href="'.$out_vars['common_uri'].'&start='.$out_vars['start'].'">'.$image_part.'</a>';
 		}
 
+		/**
+		 * @param string $align
+		 * @param string $img
+		 */
 		function set_icon_imap($align,$img,$alt_text)
 		{
 			$img_full = $GLOBALS['egw']->common->image('phpgwapi',$img);

Spacing +164 added lines, -170 removed lines

@@ -36,26 +36,26 @@ 
 		var $template;
 		var $extra_filters = array();
 
-		function nextmatchs($website=False)
+		function nextmatchs($website = False)
 		{
-			if(!$website)
+			if (!$website)
 			{
-				$this->template = createobject('phpgwapi.Template',EGW_TEMPLATE_DIR);
+				$this->template = createobject('phpgwapi.Template', EGW_TEMPLATE_DIR);
 				$this->template->set_file(array(
 					'_nextmatchs' => 'nextmatchs.tpl'
 				));
-				$this->template->set_block('_nextmatchs','nextmatchs');
-				$this->template->set_block('_nextmatchs','filter');
-				$this->template->set_block('_nextmatchs','form');
-				$this->template->set_block('_nextmatchs','icon');
-				$this->template->set_block('_nextmatchs','link');
-				$this->template->set_block('_nextmatchs','search');
-				$this->template->set_block('_nextmatchs','cats');
-				$this->template->set_block('_nextmatchs','search_filter');
-				$this->template->set_block('_nextmatchs','cats_search_filter');
-			}
-
-			if(isset($GLOBALS['egw_info']['user']['preferences']['common']['maxmatchs']) &&
+				$this->template->set_block('_nextmatchs', 'nextmatchs');
+				$this->template->set_block('_nextmatchs', 'filter');
+				$this->template->set_block('_nextmatchs', 'form');
+				$this->template->set_block('_nextmatchs', 'icon');
+				$this->template->set_block('_nextmatchs', 'link');
+				$this->template->set_block('_nextmatchs', 'search');
+				$this->template->set_block('_nextmatchs', 'cats');
+				$this->template->set_block('_nextmatchs', 'search_filter');
+				$this->template->set_block('_nextmatchs', 'cats_search_filter');
+			}
+
+			if (isset($GLOBALS['egw_info']['user']['preferences']['common']['maxmatchs']) &&
 				(int)$GLOBALS['egw_info']['user']['preferences']['common']['maxmatchs'] > 0)
 			{
 				$this->maxmatches = (int)$GLOBALS['egw_info']['user']['preferences']['common']['maxmatchs'];
@@ -65,13 +65,13 @@ 
 				$this->maxmatches = 15;
 			}
 
-			$this->_start = (int) get_var('start',array('GLOBAL','POST','GET'));
+			$this->_start = (int)get_var('start', array('GLOBAL', 'POST', 'GET'));
 
-			foreach(array('menuaction','filter','qfield','order','sort') as $name)
+			foreach (array('menuaction', 'filter', 'qfield', 'order', 'sort') as $name)
 			{
 				$var = '_'.$name;
-				$this->$var = get_var($name,array('GLOBAL','POST','GET'));
-				if (!preg_match('/^[a-z0-9_. -]*$/i',$this->$var))
+				$this->$var = get_var($name, array('GLOBAL', 'POST', 'GET'));
+				if (!preg_match('/^[a-z0-9_. -]*$/i', $this->$var))
 				{
 					$this->$var = '';
 				}
@@ -89,41 +89,41 @@ 
 		@param $img_src ?
 		@param $label ?
 		*/
-		function set_icon($align,$img,$label)
+		function set_icon($align, $img, $label)
 		{
 			$var = array(
 				'align'  => $align,
-				'img'    => $GLOBALS['egw']->common->image('phpgwapi',$img),
+				'img'    => $GLOBALS['egw']->common->image('phpgwapi', $img),
 				'label'  => lang($label),
 				'border' => 0
 			);
 			$this->template->set_var($var);
-			return $this->template->fp('out','link');
+			return $this->template->fp('out', 'link');
 		}
 
 		/*!
 		@function page
 		@abstract ?
 		*/
-		function page($extravars='')
+		function page($extravars = '')
 		{
-			if($extravars && is_string($extravars) && substr($extravars,0,1)!='&')
+			if ($extravars && is_string($extravars) && substr($extravars, 0, 1) != '&')
 			{
 				$extras = '&'.$extravars;
 			}
-			elseif($extravars && is_array($extravars))
+			elseif ($extravars && is_array($extravars))
 			{
-				foreach($extravars as $var => $value)
+				foreach ($extravars as $var => $value)
 				{
-					if($var != 'menuaction')
+					if ($var != 'menuaction')
 					{
 						$t_extras[] = $var.'='.$value;
 					}
 				}
-				$extras = implode($t_extras,'&');
+				$extras = implode($t_extras, '&');
 			}
 
-			return $GLOBALS['egw']->link('/index.php','menuaction='.$this->_menuaction.$extras);
+			return $GLOBALS['egw']->link('/index.php', 'menuaction='.$this->_menuaction.$extras);
 		}
 
 		/*!
@@ -134,20 +134,20 @@ 
 		@param $link ?
 		@param $extravars ?
 		*/
-		function set_link($align,$img,$link,$alt,$extravars)
+		function set_link($align, $img, $link, $alt, $extravars)
 		{
 			$var = Array(
 				'align'     => $align,
-				'action'    => ($this->_menuaction?$this->page():$GLOBALS['egw']->link($link)),
+				'action'    => ($this->_menuaction ? $this->page() : $GLOBALS['egw']->link($link)),
 				'form_name' => $img,
 				'hidden'    => $GLOBALS['egw']->html->input_hidden($extravars),
-				'img'       => $GLOBALS['egw']->common->image('phpgwapi',$img),
+				'img'       => $GLOBALS['egw']->common->image('phpgwapi', $img),
 				'label'     => $alt,
 				'border'    => 0,
 				'start'     => $extravars['start']
 			);
 			$this->template->set_var($var);
-			return $this->template->fp('out','form');
+			return $this->template->fp('out', 'form');
 		}
 
 		/*!
@@ -163,21 +163,21 @@ 
 		@param $filter_obj ?
 		@param $showsearch ?
 		*/
-		function show_tpl($sn,$localstart,$total,$extra, $twidth, $bgtheme,$search_obj=0,$filter_obj=1,$showsearch=1,$yours=0,$cat_id=0,$cat_field='fcat_id')
+		function show_tpl($sn, $localstart, $total, $extra, $twidth, $bgtheme, $search_obj = 0, $filter_obj = 1, $showsearch = 1, $yours = 0, $cat_id = 0, $cat_field = 'fcat_id')
 		{
 			if (!is_object($GLOBALS['egw']->categories))
 			{
 				$GLOBALS['egw']->categories = CreateObject('phpgwapi.categories');
 			}
-			$extravars = $this->split_extras($extravars,$extra);
+			$extravars = $this->split_extras($extravars, $extra);
 
 			$var = array(
-				'form_action'   => ($this->_menuaction?$this->page($extra):$GLOBALS['egw']->link($sn, $extra)),
+				'form_action'   => ($this->_menuaction ? $this->page($extra) : $GLOBALS['egw']->link($sn, $extra)),
 				'lang_category' => lang('Category'),
 				'lang_all'      => lang('All'),
 				'lang_select'   => lang('Select'),
 				'cat_field'     => $cat_field,
-				'categories'    => $GLOBALS['egw']->categories->formatted_list('select','all',$cat_id,'True'),
+				'categories'    => $GLOBALS['egw']->categories->formatted_list('select', 'all', $cat_id, 'True'),
 				'hidden'       => $GLOBALS['egw']->html->input_hidden(array(
 					'filter' => $this->_filter,
 					'qfield' => $this->_qfield,
@@ -189,28 +189,28 @@ 
 				'query_value'   => $GLOBALS['egw']->html->htmlspecialchars($GLOBALS['query']),
 				'table_width'   => $twidth,
 				'th_bg'         => $GLOBALS['egw_info']['theme']['th_bg'],
-				'left'          => $this->left($sn,(int)$localstart,$total,$extra),
-				'search'        => ($showsearch?$this->search($search_obj):''),
-				'filter'        => ($filter_obj?$this->filter($filter_obj,$yours):''),
-				'right'         => $this->right($sn,(int)$localstart,$total,$extra)
+				'left'          => $this->left($sn, (int)$localstart, $total, $extra),
+				'search'        => ($showsearch ? $this->search($search_obj) : ''),
+				'filter'        => ($filter_obj ? $this->filter($filter_obj, $yours) : ''),
+				'right'         => $this->right($sn, (int)$localstart, $total, $extra)
 			);
 			$this->template->set_var($var);
-			$this->template->parse('cats','cats');
-			$this->template->parse('cats_search_filter_data','cats_search_filter');
-			return $this->template->fp('out','nextmatchs');
+			$this->template->parse('cats', 'cats');
+			$this->template->parse('cats_search_filter_data', 'cats_search_filter');
+			return $this->template->fp('out', 'nextmatchs');
 		}
 
-		function split_extras($extravars,$extradata)
+		function split_extras($extravars, $extradata)
 		{
-			if($extradata)
+			if ($extradata)
 			{
-				if(!is_array($extradata))
+				if (!is_array($extradata))
 				{
-					parse_str($extradata,$extradata);
+					parse_str($extradata, $extradata);
 				}
-				foreach($extradata as $var => $value)
+				foreach ($extradata as $var => $value)
 				{
-					if($var != 'menuaction')
+					if ($var != 'menuaction')
 					{
 						$extravars[$var] = $value;
 					}
@@ -225,13 +225,13 @@ 
 
 		function extras_to_string($extra)
 		{
-			if(is_array($extra))
+			if (is_array($extra))
 			{
-				foreach($extra as $var => $value)
+				foreach ($extra as $var => $value)
 				{
-					$t_extras[] = $var . '=' . urlencode($value);
+					$t_extras[] = $var.'='.urlencode($value);
 				}
-				$extra_s = '&' . implode('&',$t_extras);
+				$extra_s = '&'.implode('&', $t_extras);
 			}
 			return $extra_s;
 		}
@@ -244,7 +244,7 @@ 
 		@param $total ?
 		@param $extradate ?
 		*/
-		function left($scriptname,$start,$total,$extradata = '')
+		function left($scriptname, $start, $total, $extradata = '')
 		{
 			$extravars = Array(
 				'order'   => $this->_order,
@@ -254,15 +254,15 @@ 
 				'query'   => stripslashes(@$GLOBALS['query'])
 			);
 
-			$extravars = $this->split_extras($extravars,$extradata);
+			$extravars = $this->split_extras($extravars, $extradata);
 			$ret_str = '';
 
-			$start = (int) $start;
+			$start = (int)$start;
 
 			if ($start != 0)
 			{
 				$extravars['start'] = 0;
-				$ret_str .= $this->set_link('left','first.png',$scriptname,lang('First page'),$extravars);
+				$ret_str .= $this->set_link('left', 'first.png', $scriptname, lang('First page'), $extravars);
 				// Changing the sorting order screaws up the starting number
 				if (($start - $this->maxmatches) < 0)
 				{
@@ -272,12 +272,12 @@ 
 				{
 					$extravars['start'] = ($start - $this->maxmatches);
 				}
-				$ret_str .= $this->set_link('left','left.png',$scriptname,lang('Previous page'),$extravars);
+				$ret_str .= $this->set_link('left', 'left.png', $scriptname, lang('Previous page'), $extravars);
 			}
 			else
 			{
-				$ret_str .= $this->set_icon('left','first-grey.png',lang('First page'));
-				$ret_str .= $this->set_icon('left','left-grey.png',lang('Previous page'));
+				$ret_str .= $this->set_icon('left', 'first-grey.png', lang('First page'));
+				$ret_str .= $this->set_icon('left', 'left-grey.png', lang('Previous page'));
 			}
 			return $ret_str;
 		} /* left() */
@@ -290,7 +290,7 @@ 
 		@param $total ?
 		@param $extradate ?
 		*/
-		function right($scriptname,$start,$total,$extradata = '')
+		function right($scriptname, $start, $total, $extradata = '')
 		{
 			$extravars = Array(
 				'order'   => $this->_order,
@@ -300,23 +300,23 @@ 
 				'query'   => stripslashes(@$GLOBALS['query'])
 			);
 
-			$extravars = $this->split_extras($extravars,$extradata);
+			$extravars = $this->split_extras($extravars, $extradata);
 			$ret_str = '';
 
-			$start = (int) $start;
+			$start = (int)$start;
 
 			if (($total > $this->maxmatches) &&
 				($total > $start + $this->maxmatches))
 			{
 				$extravars['start'] = ($start + $this->maxmatches);
-				$ret_str .= $this->set_link('right','right.png',$scriptname,lang('Next page'),$extravars);
+				$ret_str .= $this->set_link('right', 'right.png', $scriptname, lang('Next page'), $extravars);
 				$extravars['start'] = ($total - $this->maxmatches);
-				$ret_str .= $this->set_link('right','last.png',$scriptname,lang('Last page'),$extravars);
+				$ret_str .= $this->set_link('right', 'last.png', $scriptname, lang('Last page'), $extravars);
 			}
 			else
 			{
-				$ret_str .= $this->set_icon('right','right-grey.png',lang('Next page'));
-				$ret_str .= $this->set_icon('right','last-grey.png',lang('Last page'));
+				$ret_str .= $this->set_icon('right', 'right-grey.png', lang('Next page'));
+				$ret_str .= $this->set_icon('right', 'last-grey.png', lang('Last page'));
 			}
 			return $ret_str;
 		} /* right() */
@@ -326,10 +326,10 @@ 
 		@abstract ?
 		@param $search_obj default 0
 		*/
-		function search_filter($search_obj=0,$filter_obj=1,$yours=0,$link='',$extra='')
+		function search_filter($search_obj = 0, $filter_obj = 1, $yours = 0, $link = '', $extra = '')
 		{
 			$var = array(
-				'form_action'  => ($this->_menuaction?$this->page($extra):$GLOBALS['egw']->link($sn, $extra)),
+				'form_action'  => ($this->_menuaction ? $this->page($extra) : $GLOBALS['egw']->link($sn, $extra)),
 				'th_bg'        => $GLOBALS['egw_info']['theme']['th_bg'],
 				'hidden'       => $GLOBALS['egw']->html->input_hidden(array(
 					'filter' => $this->_filter,
@@ -340,10 +340,10 @@ 
 					'query'  => $GLOBALS['query'],
 				)),
 				'search'       => $this->search($search_obj),
-				'filter'       => ($filter_obj?$this->filter($filter_obj,$yours):'')
+				'filter'       => ($filter_obj ? $this->filter($filter_obj, $yours) : '')
 			);
 			$this->template->set_var($var);
-			return $this->template->fp('out','search_filter');
+			return $this->template->fp('out', 'search_filter');
 		}
 
 		/*!
@@ -351,19 +351,19 @@ 
 		@abstract ?
 		@param $search_obj default 0
 		*/
-		function cats_search_filter($search_obj=0,$filter_obj=1,$yours=0,$cat_id=0,$cat_field='fcat_id',$link='',$extra='')
+		function cats_search_filter($search_obj = 0, $filter_obj = 1, $yours = 0, $cat_id = 0, $cat_field = 'fcat_id', $link = '', $extra = '')
 		{
 			if (!is_object($GLOBALS['egw']->categories))
 			{
-				$GLOBALS['egw']->categories  = CreateObject('phpgwapi.categories');
+				$GLOBALS['egw']->categories = CreateObject('phpgwapi.categories');
 			}
 			$var = array(
-				'form_action'   => ($this->_menuaction?$this->page($extra):$GLOBALS['egw']->link($sn, $extra)),
+				'form_action'   => ($this->_menuaction ? $this->page($extra) : $GLOBALS['egw']->link($sn, $extra)),
 				'lang_category' => lang('Category'),
 				'lang_all'      => lang('All'),
 				'lang_select'   => lang('Select'),
 				'cat_field'     => $cat_field,
-				'categories'    => $GLOBALS['egw']->categories->formatted_list('select','all',(int)$cat_id,'True'),
+				'categories'    => $GLOBALS['egw']->categories->formatted_list('select', 'all', (int)$cat_id, 'True'),
 				'hidden'       => $GLOBALS['egw']->html->input_hidden(array(
 					'filter' => $this->_filter,
 					'qfield' => $this->_qfield,
@@ -374,10 +374,10 @@ 
 				)),
 				'th_bg'         => $GLOBALS['egw_info']['theme']['th_bg'],
 				'search'        => $this->search($search_obj),
-				'filter'        => ($filter_obj?$this->filter($filter_obj,$yours):'')
+				'filter'        => ($filter_obj ? $this->filter($filter_obj, $yours) : '')
 			);
 			$this->template->set_var($var);
-			return $this->template->fp('out','cats_search_filter');
+			return $this->template->fp('out', 'cats_search_filter');
 		}
 
 		/*!
@@ -385,11 +385,11 @@ 
 		@abstract ?
 		@param $search_obj default 0
 		*/
-		function search($search_obj=0)
+		function search($search_obj = 0)
 		{
-			if(is_array($search_obj))
+			if (is_array($search_obj))
 			{
-				$_query    = stripslashes($search_obj['query']);
+				$_query = stripslashes($search_obj['query']);
 				$search_obj = $search_obj['search_obj'];
 			}
 			else
@@ -399,12 +399,11 @@ 
 
 			// If they place a '"' in their search, it will mess everything up
 			// Our only option is to remove it
-			if(strpos($_query,'"')!==false)
+			if (strpos($_query, '"') !== false)
 			{
-				$_query = str_replace('"','',$_query);
+				$_query = str_replace('"', '', $_query);
 			}
-			$var = array
-			(
+			$var = array(
 				'query_value'   => $GLOBALS['egw']->html->htmlspecialchars($_query),
 				'lang_search' => lang('Search')
 			);
@@ -415,7 +414,7 @@ 
 			}
 
 			$this->template->set_var($var);
-			return $this->template->fp('out','search');
+			return $this->template->fp('out', 'search');
 		} /* search() */
 
 		/*!
@@ -427,11 +426,11 @@ 
 		*/
 		function filterobj($filtertable, $idxfieldname, $strfieldname)
 		{
-			$filter_obj = array(array('none','show all'));
+			$filter_obj = array(array('none', 'show all'));
 			$index = 0;
 
-			$GLOBALS['egw']->db->query("SELECT $idxfieldname, $strfieldname FROM $filtertable",__LINE__,__FILE__);
-			while($GLOBALS['egw']->db->next_record())
+			$GLOBALS['egw']->db->query("SELECT $idxfieldname, $strfieldname FROM $filtertable", __LINE__, __FILE__);
+			while ($GLOBALS['egw']->db->next_record())
 			{
 				$index++;
 				$filter_obj[$index][0] = $GLOBALS['egw']->db->f($idxfieldname);
@@ -452,15 +451,15 @@ 
 			if (is_array($search_obj))
 			{
 				$indexlimit = count($search_obj);
-				for ($index=0; $index<$indexlimit; $index++)
+				for ($index = 0; $index < $indexlimit; $index++)
 				{
 					if ($this->_qfield == '')
 					{
 						$this->_qfield = $search_obj[$index][0];
 					}
-					$str .= '<option value="' . $search_obj[$index][0] . '"' . ($this->_qfield == $search_obj[$index][0]?' selected':'') . '>' . lang($search_obj[$index][1]) . '</option>';
+					$str .= '<option value="'.$search_obj[$index][0].'"'.($this->_qfield == $search_obj[$index][0] ? ' selected' : '').'>'.lang($search_obj[$index][1]).'</option>';
 				}
-				$str = '<select name="qfield">' . $str . '</select>' . "\n";
+				$str = '<select name="qfield">'.$str.'</select>'."\n";
 			}
 			return $str;
 		} /* searchby() */
@@ -470,7 +469,7 @@ 
 		@abstract ?
 		@param $filter_obj
 		*/
-		function filter($filter_obj,$yours=0)
+		function filter($filter_obj, $yours = 0)
 		{
 			if (is_array($yours))
 			{
@@ -488,19 +487,17 @@ 
 
 					if ($yours)
 					{
-						$filter_obj = array
-						(
-							array('none',lang('Show all')),
-							array('yours',lang('Only yours')),
-							array('private',lang('private'))
+						$filter_obj = array(
+							array('none', lang('Show all')),
+							array('yours', lang('Only yours')),
+							array('private', lang('private'))
 						);
 					}
 					else
 					{
-						$filter_obj = array
-						(
-							array('none',lang('Show all')),
-							array('private',lang('private'))
+						$filter_obj = array(
+							array('none', lang('Show all')),
+							array('private', lang('private'))
 						);
 					}
 
@@ -509,10 +506,10 @@ 
 						$filter_obj[] = $efilter;
 					}
 
-					for ($index=0; $index<$indexlimit; $index++)
+					for ($index = 0; $index < $indexlimit; $index++)
 					{
-						$filter_obj[2+$index][0] = $user_groups[$index]['account_id'];
-						$filter_obj[2+$index][1] = 'Group - ' . $user_groups[$index]['account_name'];
+						$filter_obj[2 + $index][0] = $user_groups[$index]['account_id'];
+						$filter_obj[2 + $index][1] = 'Group - '.$user_groups[$index]['account_name'];
 					}
 				}
 			}
@@ -522,30 +519,30 @@ 
 				$str = '';
 				$indexlimit = count($filter_obj);
 
-				for ($index=0; $index<$indexlimit; $index++)
+				for ($index = 0; $index < $indexlimit; $index++)
 				{
 					if ($this->_filter == '')
 					{
 						$this->_filter = $filter_obj[$index][0];
 					}
-					$str .= '         <option value="' . $filter_obj[$index][0] . '"'.($this->_filter == $filter_obj[$index][0]?' selected="1"':'') . '>' . $filter_obj[$index][1] . '</option>'."\n";
+					$str .= '         <option value="'.$filter_obj[$index][0].'"'.($this->_filter == $filter_obj[$index][0] ? ' selected="1"' : '').'>'.$filter_obj[$index][1].'</option>'."\n";
 				}
 
-				$str = '        <select name="filter" onChange="this.form.submit()">'."\n" . $str . '        </select>';
-				$this->template->set_var('select',$str);
-				$this->template->set_var('lang_filter',lang('Filter'));
+				$str = '        <select name="filter" onChange="this.form.submit()">'."\n".$str.'        </select>';
+				$this->template->set_var('select', $str);
+				$this->template->set_var('lang_filter', lang('Filter'));
 			}
 
-			return $this->template->fp('out','filter');
+			return $this->template->fp('out', 'filter');
 		} /* filter() */
 
 		/* replacement for function filter */
-		function new_filter($data=0)
+		function new_filter($data = 0)
 		{
-			if(is_array($data))
+			if (is_array($data))
 			{
-				$filter = (isset($data['filter'])?$data['filter']:'');
-				$format = (isset($data['format'])?$data['format']:'all');
+				$filter = (isset($data['filter']) ? $data['filter'] : '');
+				$format = (isset($data['format']) ? $data['format'] : 'all');
 			}
 			else
 			{
@@ -554,48 +551,45 @@ 
 				$format = 'all';
 			}
 
-			switch($format)
+			switch ($format)
 			{
 				case 'yours':
-					$filter_obj = array
-					(
-						array('none',lang('show all')),
-						array('yours',lang('only yours'))
+					$filter_obj = array(
+						array('none', lang('show all')),
+						array('yours', lang('only yours'))
 					);
 					break;
 				case 'private':
-					$filter_obj = array
-					(
-						array('none',lang('show all')),
-						array('private',lang('only private'))
+					$filter_obj = array(
+						array('none', lang('show all')),
+						array('private', lang('only private'))
 					);
 					break;
 				default:
-					$filter_obj = array
-					(
-						array('none',lang('show all')),
-						array('yours',lang('only yours')),
-						array('private',lang('only private'))
+					$filter_obj = array(
+						array('none', lang('show all')),
+						array('yours', lang('only yours')),
+						array('private', lang('only private'))
 					);
 			}
 
 			$str = '';
 			$indexlimit = count($filter_obj);
 
-			for($index=0; $index<$indexlimit; $index++)
+			for ($index = 0; $index < $indexlimit; $index++)
 			{
-				if($filter == '')
+				if ($filter == '')
 				{
 					$filter = $filter_obj[$index][0];
 				}
-				$str .= '         <option value="' . $filter_obj[$index][0] . '"'.($filter == $filter_obj[$index][0]?' selected="1"':'') . '>' . $filter_obj[$index][1] . '</option>'."\n";
+				$str .= '         <option value="'.$filter_obj[$index][0].'"'.($filter == $filter_obj[$index][0] ? ' selected="1"' : '').'>'.$filter_obj[$index][1].'</option>'."\n";
 			}
 
-			$str = '        <select name="filter" onChange="this.form.submit()">'."\n" . $str . '        </select>';
-			$this->template->set_var('select',$str);
-			$this->template->set_var('lang_filter',lang('Filter'));
+			$str = '        <select name="filter" onChange="this.form.submit()">'."\n".$str.'        </select>';
+			$this->template->set_var('select', $str);
+			$this->template->set_var('lang_filter', lang('Filter'));
 
-			return $this->template->fp('out','filter');
+			return $this->template->fp('out', 'filter');
 		} /* filter() */
 
 		/*!
@@ -604,9 +598,9 @@ 
 		@param $currentcolor default ''
 		@param $do_class boolean default False return the color-value or just the class-name
 		*/
-		function alternate_row_color($currentcolor = '',$do_class=False)
+		function alternate_row_color($currentcolor = '', $do_class = False)
 		{
-			if (! $currentcolor)
+			if (!$currentcolor)
 			{
 				$currentcolor = @$GLOBALS['tr_color'];
 			}
@@ -641,7 +635,7 @@ 
 		*/
 		function template_alternate_row_color(&$tpl)
 		{
-			$tpl->set_var('tr_color',$this->alternate_row_color());
+			$tpl->set_var('tr_color', $this->alternate_row_color());
 		}
 
 		/*!
@@ -654,13 +648,13 @@ 
 		@param $text ?
 		@param $extra default ''
 		*/
-		function show_sort_order($sort,$var,$order,$program,$text,$extra='',$build_a_href=True)
+		function show_sort_order($sort, $var, $order, $program, $text, $extra = '', $build_a_href = True)
 		{
 			if ($order == $var)
 			{
 				$sort = $sort == 'ASC' ? 'DESC' : 'ASC';
 
-				$text = '<b>'.$text.'</b> <img border="0" src="'.$GLOBALS['egw']->common->image('phpgwapi',$sort=='ASC'?'up':'down').'">';
+				$text = '<b>'.$text.'</b> <img border="0" src="'.$GLOBALS['egw']->common->image('phpgwapi', $sort == 'ASC' ? 'up' : 'down').'">';
 			}
 			else
 			{
@@ -674,11 +668,11 @@ 
 
 			$extravar = 'order='.$var.'&sort='.$sort.'&filter='.$this->_filter.'&qfield='.$this->_qfield.'&start='.$this->_start.'&query='.urlencode(stripslashes(@$GLOBALS['query'])).$extra;
 
-			$link = ($this->_menuaction?$this->page($extravar):$GLOBALS['egw']->link($program,$extravar));
+			$link = ($this->_menuaction ? $this->page($extravar) : $GLOBALS['egw']->link($program, $extravar));
 
 			if ($build_a_href)
 			{
-				return '<a href="' . $link . '">' . $text . '</a>';
+				return '<a href="'.$link.'">'.$text.'</a>';
 			}
 			else
 			{
@@ -686,7 +680,7 @@ 
 			}
 		}
 
-		function show_hits($total_records='',$start=0)
+		function show_hits($total_records = '', $start = 0)
 		{
 			if ($total_records > $this->maxmatches)
 			{
@@ -698,11 +692,11 @@ 
 				{
 					$end = $start + $this->maxmatches;
 				}
-				return lang('showing %1 - %2 of %3',($start + 1),$end,$total_records);
+				return lang('showing %1 - %2 of %3', ($start + 1), $end, $total_records);
 			}
 			else
 			{
-				return lang('showing %1',$total_records);
+				return lang('showing %1', $total_records);
 			}
 		}
 
@@ -717,20 +711,20 @@ 
 		@param $text : Text the link will show
 		@param $extra : any extra stuff you want to pass, url style
 		*/
-		function show_sort_order_imap($old_sort,$new_sort,$default_order,$order,$program,$text,$extra='')
+		function show_sort_order_imap($old_sort, $new_sort, $default_order, $order, $program, $text, $extra = '')
 		{
-			if(is_array($extra))
+			if (is_array($extra))
 			{
 				$extra = $this->extras_to_string($extra);
 			}
-			if($old_sort == $new_sort)
+			if ($old_sort == $new_sort)
 			{
 				// alternate order, like on outkrook, click on present sorting reverses order
-				if((int)$order == 1)
+				if ((int)$order == 1)
 				{
 					$our_order = 0;
 				}
-				elseif((int)$order == 0)
+				elseif ((int)$order == 0)
 				{
 					$our_order = 1;
 				}
@@ -748,8 +742,8 @@ 
 
 			$extravar = 'order='.$our_order.'&sort='.$new_sort.$extra;
 
-			$link = ($this->_menuaction?$this->page($extravar):$GLOBALS['egw']->link($program,$extravar));
-			return '<a href="' .$link .'">' .$text .'</a>';
+			$link = ($this->_menuaction ? $this->page($extravar) : $GLOBALS['egw']->link($program, $extravar));
+			return '<a href="'.$link.'">'.$text.'</a>';
 		}
 
 		/*!
@@ -783,21 +777,21 @@ 
 			$out_vars['total'] = $feed_vars['total'];
 
 			// first page
-			if(($feed_vars['start'] != 0) &&
+			if (($feed_vars['start'] != 0) &&
 				($feed_vars['start'] > $this->maxmatches))
 			{
 				$out_vars['start'] = 0;
-				$return_array['first_page'] = $this->set_link_imap('left','first.png',lang('First page'),$out_vars);
+				$return_array['first_page'] = $this->set_link_imap('left', 'first.png', lang('First page'), $out_vars);
 			}
 			else
 			{
-				$return_array['first_page'] = $this->set_icon_imap('left','first-grey.png',lang('First page'));
+				$return_array['first_page'] = $this->set_icon_imap('left', 'first-grey.png', lang('First page'));
 			}
 			// previous page
-			if($feed_vars['start'] != 0)
+			if ($feed_vars['start'] != 0)
 			{
 				// Changing the sorting order screaws up the starting number
-				if(($feed_vars['start'] - $this->maxmatches) < 0)
+				if (($feed_vars['start'] - $this->maxmatches) < 0)
 				{
 					$out_vars['start'] = 0;
 				}
@@ -805,37 +799,37 @@ 
 				{
 					$out_vars['start'] = ($feed_vars['start'] - $this->maxmatches);
 				}
-				$return_array['prev_page'] = $this->set_link_imap('left','left.png',lang('Previous page'),$out_vars);
+				$return_array['prev_page'] = $this->set_link_imap('left', 'left.png', lang('Previous page'), $out_vars);
 			}
 			else
 			{
-				$return_array['prev_page'] = $this->set_icon_imap('left','left-grey.png',lang('Previous page'));
+				$return_array['prev_page'] = $this->set_icon_imap('left', 'left-grey.png', lang('Previous page'));
 			}
 
 			// re-initialize the out_vars
 			// things that might change
 			$out_vars['start'] = $feed_vars['start'];
 			// next page
-			if(($feed_vars['total'] > $this->maxmatches) &&
+			if (($feed_vars['total'] > $this->maxmatches) &&
 				($feed_vars['total'] > $feed_vars['start'] + $this->maxmatches))
 			{
 				$out_vars['start'] = ($feed_vars['start'] + $this->maxmatches);
-				$return_array['next_page'] = $this->set_link_imap('right','right.png',lang('Next page'),$out_vars);
+				$return_array['next_page'] = $this->set_link_imap('right', 'right.png', lang('Next page'), $out_vars);
 			}
 			else
 			{
-				$return_array['next_page'] = $this->set_icon_imap('right','right-grey.png',lang('Next page'));
+				$return_array['next_page'] = $this->set_icon_imap('right', 'right-grey.png', lang('Next page'));
 			}
 			// last page
-			if(($feed_vars['start'] != $feed_vars['total'] - $this->maxmatches) &&
+			if (($feed_vars['start'] != $feed_vars['total'] - $this->maxmatches) &&
 				(($feed_vars['total'] - $this->maxmatches) > ($feed_vars['start'] + $this->maxmatches)))
 			{
 				$out_vars['start'] = ($feed_vars['total'] - $this->maxmatches);
-				$return_array['last_page'] = $this->set_link_imap('right','last.png',lang('Last page'),$out_vars);
+				$return_array['last_page'] = $this->set_link_imap('right', 'last.png', lang('Last page'), $out_vars);
 			}
 			else
 			{
-				$return_array['last_page'] = $this->set_icon_imap('right','last-grey.png',lang('Last page'));
+				$return_array['last_page'] = $this->set_icon_imap('right', 'last-grey.png', lang('Last page'));
 			}
 			return $return_array;
 		}
@@ -848,16 +842,16 @@ 
 		@param $link ?
 		@param $extravars ?
 		*/
-		function set_link_imap($align,$img,$alt_text,$out_vars)
+		function set_link_imap($align, $img, $alt_text, $out_vars)
 		{
-			$img_full = $GLOBALS['egw']->common->image('phpgwapi',$img);
+			$img_full = $GLOBALS['egw']->common->image('phpgwapi', $img);
 			$image_part = '<img src="'.$img_full.'" border="0" alt="'.$alt_text.'" width="12" height="12">';
 			return '<a href="'.$out_vars['common_uri'].'&start='.$out_vars['start'].'">'.$image_part.'</a>';
 		}
 
-		function set_icon_imap($align,$img,$alt_text)
+		function set_icon_imap($align, $img, $alt_text)
 		{
-			$img_full = $GLOBALS['egw']->common->image('phpgwapi',$img);
+			$img_full = $GLOBALS['egw']->common->image('phpgwapi', $img);
 			return '<img src="'.$img_full.'" border="0" width="12" height="12" alt="'.$alt_text.'">'."\r\n";
 		}
 	} // End of nextmatchs class

Upper-Lower-Casing +5 added lines, -5 removed lines

@@ -136,7 +136,7 @@ 
 		*/
 		function set_link($align,$img,$link,$alt,$extravars)
 		{
-			$var = Array(
+			$var = array(
 				'align'     => $align,
 				'action'    => ($this->_menuaction?$this->page():$GLOBALS['egw']->link($link)),
 				'form_name' => $img,
@@ -246,7 +246,7 @@ 
 		*/
 		function left($scriptname,$start,$total,$extradata = '')
 		{
-			$extravars = Array(
+			$extravars = array(
 				'order'   => $this->_order,
 				'filter'  => $this->_filter,
 				'q_field' => $this->_qfield,
@@ -292,7 +292,7 @@ 
 		*/
 		function right($scriptname,$start,$total,$extradata = '')
 		{
-			$extravars = Array(
+			$extravars = array(
 				'order'   => $this->_order,
 				'filter'  => $this->_filter,
 				'q_field' => $this->_qfield,
@@ -430,7 +430,7 @@ 
 			$filter_obj = array(array('none','show all'));
 			$index = 0;
 
-			$GLOBALS['egw']->db->query("SELECT $idxfieldname, $strfieldname FROM $filtertable",__LINE__,__FILE__);
+			$GLOBALS['egw']->db->query("select $idxfieldname, $strfieldname FROM $filtertable",__LINE__,__FILE__);
 			while($GLOBALS['egw']->db->next_record())
 			{
 				$index++;
@@ -769,7 +769,7 @@ 
 		*/
 		function nav_left_right_imap($feed_vars)
 		{
-			$return_array = Array(
+			$return_array = array(
 				'first_page' => '',
 				'prev_page'  => '',
 				'next_page'  => '',

phpgwapi/inc/class.schema_proc.inc.php

Doc Comments +10 added lines, -20 removed lines

@@ -92,7 +92,6 @@ 
 	 * Constructor of schema-processor
 	 *
 	 * @param string $dbms type of the database: 'mysql','pgsql','mssql','maxdb'
-	 * @param object $db=null database class, if null we use $GLOBALS['egw']->db
 	 * @return schema_proc
 	 */
 	function __construct($dbms=False,$db=null)
@@ -416,7 +415,7 @@ 
 	/**
 	 * Check if we have an old, not automaticaly droped sequence and drop it
 	 *
-	 * @param $sTableName
+	 * @param string $sTableName
 	 * @param bool $preserveValue
 	 */
 	function _PostgresTestDropOldSequence($sTableName,$preserveValue=False)
@@ -529,9 +528,9 @@ 
 	/**
 	 * Create an (unique) Index over one or more columns
 	 *
-	 * @param string $sTablename table-name
+	 * @param string $sTableName table-name
 	 * @param array $aColumnNames columns for the index
-	 * @param boolean $bUnique=false true for a unique index, default false
+	 * @param boolean $bUnique true for a unique index, default false
 	 * @param array/string $options='' db-sepecific options, default '' = none
 	 * @param string $sIdxName='' name of the index, if not given (default) its created automaticaly
 	 * @return int 2: no error, 1: errors, but continued, 0: errors aborted
@@ -789,7 +788,7 @@ 
 	 * Creates all tables for one application
 	 *
 	 * @param array $aTables array of eGW table-definitions
-	 * @param boolean $bOutputHTML=false should we give diagnostics, default False
+	 * @param boolean $bOutputHTML should we give diagnostics, default False
 	 * @return boolean True on success, False if an (fatal) error occured
 	 */
 	function ExecuteScripts($aTables, $bOutputHTML=False)
@@ -827,9 +826,6 @@ 
 	/**
 	* Return the value of a column
 	*
-	* @param string/integer $Name name of field or positional index starting from 0
-	* @param bool $strip_slashes string escape chars from field(optional), default false
-	* @return string the field value
 	*/
 	function f($value,$strip_slashes=False)
 	{
@@ -859,12 +855,7 @@ 
 	/**
 	* Execute a query
 	*
-	* @param string $Query_String the query to be executed
-	* @param mixed $line the line method was called from - use __LINE__
-	* @param string $file the file method was called from - use __FILE__
-	* @param int $offset row to start from
-	* @param int $num_rows number of rows to return (optional), if unset will use $GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs']
-	* @return ADORecordSet or false, if the query fails
+	* @param integer $line
 	*/
 	function query($sQuery, $line='', $file='')
 	{
@@ -880,8 +871,6 @@ 
 	*	if the row exists db::update is called else a new row with $date merged with $where gets inserted (data has precedence)
 	* @param int $line line-number to pass to query
 	* @param string $file file-name to pass to query
-	* @param string $app=false string with name of app, this need to be set in setup anyway!!!
-	* @return ADORecordSet or false, if the query fails
 	*/
 	function insert($table,$data,$where,$line,$file,$app=False,$use_prepared_statement=false)
 	{
@@ -892,8 +881,8 @@ 
 	 * Execute the Sql statements in an array and give diagnostics, if any error occures
 	 *
 	 * @param $aSql array of SQL strings to execute
-	 * @param $debug_level int for which debug_level (and higher) should the diagnostics always been printed
-	 * @param $debug string variable number of arguments for the debug_message functions in case of an error
+	 * @param integer $debug_level int for which debug_level (and higher) should the diagnostics always been printed
+	 * @param string $debug string variable number of arguments for the debug_message functions in case of an error
 	 * @return int 2: no error, 1: errors, but continued, 0: errors aborted
 	 */
 	function ExecuteSqlArray($aSql,$debug_level,$debug)
@@ -935,7 +924,7 @@ 
 	 * b) we use the table-names plus all column-names and remove dublicate parts
 	 *
 	 * @internal
-	 * @param $sTableName string name of the table
+	 * @param string $sTableName string name of the table
 	 * @param $aColumnNames array of column-names or string with a single column-name
 	 * @return string the index-name
 	 */
@@ -992,6 +981,7 @@ 
 
 	/**
 	 * Giving a non-fatal error-message
+	 * @param string $str
 	 */
 	function error($str)
 	{
@@ -1020,7 +1010,7 @@ 
 	 *
 	 * The parameters get formated depending on their type.
 	 *
-	 * @param $msg string message with parameters/variables like lang(), eg. '%1'
+	 * @param string $msg string message with parameters/variables like lang(), eg. '%1'
 	 * @param $backtrace include a function-backtrace, default True=On
 	 *	should only be set to False=Off, if your code ensures a call with backtrace=On was made before !!!
 	 * @param $param mixed a variable number of parameters, to be inserted in $msg

Indentation +44 added lines, -44 removed lines

@@ -97,19 +97,19 @@ 
 	 */
 	function __construct($dbms=False,$db=null)
 	{
-	    if(is_object($db))
+		if(is_object($db))
 		{
 			$this->m_odb = $db;
-	    }
-	    else
-	    {
+		}
+		else
+		{
 			$this->m_odb = isset($GLOBALS['egw']->db) && is_object($GLOBALS['egw']->db) ? $GLOBALS['egw']->db : $GLOBALS['egw_setup']->db;
-	    }
-	    if (!($this->m_odb instanceof egw_db))
-	    {
-	    	throw new egw_exception_assertion_failed('no egw_db object!');
-	    }
-	    $this->m_odb->connect();
+		}
+		if (!($this->m_odb instanceof egw_db))
+		{
+			throw new egw_exception_assertion_failed('no egw_db object!');
+		}
+		$this->m_odb->connect();
 		$this->capabilities =& $this->m_odb->capabilities;
 
 		$this->sType = $dbms ? $dbms : $this->m_odb->Type;
@@ -825,64 +825,64 @@ 
 	}
 
 	/**
-	* Return the value of a column
-	*
-	* @param string/integer $Name name of field or positional index starting from 0
-	* @param bool $strip_slashes string escape chars from field(optional), default false
-	* @return string the field value
-	*/
+	 * Return the value of a column
+	 *
+	 * @param string/integer $Name name of field or positional index starting from 0
+	 * @param bool $strip_slashes string escape chars from field(optional), default false
+	 * @return string the field value
+	 */
 	function f($value,$strip_slashes=False)
 	{
 		return $this->m_odb->f($value,$strip_slashes);
 	}
 
 	/**
-	* Number of rows in current result set
-	*
-	* @return int number of rows
-	*/
+	 * Number of rows in current result set
+	 *
+	 * @return int number of rows
+	 */
 	function num_rows()
 	{
 		return $this->m_odb->num_rows();
 	}
 
 	/**
-	* Move to the next row in the results set
-	*
-	* @return bool was another row found?
-	*/
+	 * Move to the next row in the results set
+	 *
+	 * @return bool was another row found?
+	 */
 	function next_record()
 	{
 		return $this->m_odb->next_record();
 	}
 
 	/**
-	* Execute a query
-	*
-	* @param string $Query_String the query to be executed
-	* @param mixed $line the line method was called from - use __LINE__
-	* @param string $file the file method was called from - use __FILE__
-	* @param int $offset row to start from
-	* @param int $num_rows number of rows to return (optional), if unset will use $GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs']
-	* @return ADORecordSet or false, if the query fails
-	*/
+	 * Execute a query
+	 *
+	 * @param string $Query_String the query to be executed
+	 * @param mixed $line the line method was called from - use __LINE__
+	 * @param string $file the file method was called from - use __FILE__
+	 * @param int $offset row to start from
+	 * @param int $num_rows number of rows to return (optional), if unset will use $GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs']
+	 * @return ADORecordSet or false, if the query fails
+	 */
 	function query($sQuery, $line='', $file='')
 	{
 		return $this->m_odb->query($sQuery, $line, $file);
 	}
 
 	/**
-	* Insert a row of data into a table or updates it if $where is given, all data is quoted according to it's type
-	*
-	* @param string $table name of the table
-	* @param array $data with column-name / value pairs
-	* @param mixed $where string with where clause or array with column-name / values pairs to check if a row with that keys already exists, or false for an unconditional insert
-	*	if the row exists db::update is called else a new row with $date merged with $where gets inserted (data has precedence)
-	* @param int $line line-number to pass to query
-	* @param string $file file-name to pass to query
-	* @param string $app=false string with name of app, this need to be set in setup anyway!!!
-	* @return ADORecordSet or false, if the query fails
-	*/
+	 * Insert a row of data into a table or updates it if $where is given, all data is quoted according to it's type
+	 *
+	 * @param string $table name of the table
+	 * @param array $data with column-name / value pairs
+	 * @param mixed $where string with where clause or array with column-name / values pairs to check if a row with that keys already exists, or false for an unconditional insert
+	 *	if the row exists db::update is called else a new row with $date merged with $where gets inserted (data has precedence)
+	 * @param int $line line-number to pass to query
+	 * @param string $file file-name to pass to query
+	 * @param string $app=false string with name of app, this need to be set in setup anyway!!!
+	 * @return ADORecordSet or false, if the query fails
+	 */
 	function insert($table,$data,$where,$line,$file,$app=False,$use_prepared_statement=false)
 	{
 		return $this->m_odb->insert($table,$data,$where,$line,$file,$app,$use_prepared_statement);

Spacing +185 added lines, -186 removed lines

@@ -53,7 +53,7 @@ 
 	 *
 	 * @var array
 	 */
-	var $max_index_length=array(
+	var $max_index_length = array(
 		'maxdb'  => 32,
 		'oracle' => 30,
 	);
@@ -95,9 +95,9 @@ 
 	 * @param object $db=null database class, if null we use $GLOBALS['egw']->db
 	 * @return schema_proc
 	 */
-	function __construct($dbms=False,$db=null)
+	function __construct($dbms = False, $db = null)
 	{
-	    if(is_object($db))
+	    if (is_object($db))
 		{
 			$this->m_odb = $db;
 	    }
@@ -110,7 +110,7 @@ 
 	    	throw new egw_exception_assertion_failed('no egw_db object!');
 	    }
 	    $this->m_odb->connect();
-		$this->capabilities =& $this->m_odb->capabilities;
+		$this->capabilities = & $this->m_odb->capabilities;
 
 		$this->sType = $dbms ? $dbms : $this->m_odb->Type;
 		$this->adodb = &$this->m_odb->Link_ID;
@@ -122,7 +122,7 @@ 
 		// to allow some of the former translator-functions to be called, we assign ourself as the translator
 		$this->m_oTranslator = &$this;
 
-		switch($this->sType)
+		switch ($this->sType)
 		{
 			case 'maxdb':
 				$this->max_varchar_length = 8000;
@@ -138,7 +138,7 @@ 
 		}
 		if (is_object($GLOBALS['egw_setup']))
 		{
-			$this->system_charset =& $GLOBALS['egw_setup']->system_charset;
+			$this->system_charset = & $GLOBALS['egw_setup']->system_charset;
 		}
 		elseif (isset($GLOBALS['egw_info']['server']['system_charset']))
 		{
@@ -154,20 +154,20 @@ 
 	 * @param boolean $ignore_length_limit =false should we take lenght-limits of indexes into account or not
 	 * @return boolean true if index over $columns exist in the $indexes array
 	 */
-	function _in_index($columns, $indexs, $ignore_length_limit=false)
+	function _in_index($columns, $indexs, $ignore_length_limit = false)
 	{
 		if (is_array($columns))
 		{
 			unset($columns['options']);
-			$columns = implode('-',$columns);
+			$columns = implode('-', $columns);
 			if ($ignore_length_limit) $columns = preg_replace('/\(\d+\)/', '', $columns);
 		}
-		foreach($indexs as $index)
+		foreach ($indexs as $index)
 		{
 			if (is_array($index))
 			{
 				unset($index['options']);
-				$index = implode('-',$index);
+				$index = implode('-', $index);
 			}
 			if ($ignore_length_limit) $index = preg_replace('/\(\d+\)/', '', $index);
 			if ($columns == $index) return true;
@@ -183,21 +183,21 @@ 
 	 * @param bool $preserveSequence
 	 * @return int 2: no error, 1: errors, but continued, 0: errors aborted
 	 */
-	function CreateTable($sTableName, $aTableDef, $preserveSequence=False)
+	function CreateTable($sTableName, $aTableDef, $preserveSequence = False)
 	{
 		if ($this->debug)
 		{
-			$this->debug_message('schema_proc::CreateTable(%1,%2)',False,$sTableName, $aTableDef);
+			$this->debug_message('schema_proc::CreateTable(%1,%2)', False, $sTableName, $aTableDef);
 		}
 		// for mysql 4.0+ we set the charset for the table
-		if ($this->system_charset && substr($this->sType,0,5) == 'mysql' &&
-			(float) $this->m_odb->ServerInfo['version'] >= 4.0 && $this->m_odb->Link_ID->charset2mysql[$this->system_charset])
+		if ($this->system_charset && substr($this->sType, 0, 5) == 'mysql' &&
+			(float)$this->m_odb->ServerInfo['version'] >= 4.0 && $this->m_odb->Link_ID->charset2mysql[$this->system_charset])
 		{
 			$set_table_charset = array($this->sType => 'CHARACTER SET '.$this->m_odb->Link_ID->charset2mysql[$this->system_charset]);
 		}
 		// creating the table
-		$aSql = $this->dict->CreateTableSQL($sTableName,$ado_cols = $this->_egw2adodb_columndef($aTableDef),$set_table_charset);
-		if (!($retVal = $this->ExecuteSQLArray($aSql,2,'CreateTableSQL(%1,%2) sql=%3',False,$sTableName,$ado_cols,$aSql)))
+		$aSql = $this->dict->CreateTableSQL($sTableName, $ado_cols = $this->_egw2adodb_columndef($aTableDef), $set_table_charset);
+		if (!($retVal = $this->ExecuteSQLArray($aSql, 2, 'CreateTableSQL(%1,%2) sql=%3', False, $sTableName, $ado_cols, $aSql)))
 		{
 			return $retVal;
 		}
@@ -206,13 +206,13 @@ 
 		{
 			if (empty($mFields))
 			{
-				continue;	// cant create an index without fields (was observed in broken backups)
+				continue; // cant create an index without fields (was observed in broken backups)
 			}
-			if ($this->_in_index($mFields,array($aTableDef['pk'])))
+			if ($this->_in_index($mFields, array($aTableDef['pk'])))
 			{
-				continue;	// is already created as primary key
+				continue; // is already created as primary key
 			}
-			if (!($retVal = $this->CreateIndex($sTableName,$mFields,true,'',$name)))
+			if (!($retVal = $this->CreateIndex($sTableName, $mFields, true, '', $name)))
 			{
 				return $retVal;
 			}
@@ -222,12 +222,12 @@ 
 		{
 			if (empty($mFields))
 			{
-				continue;	// cant create an index without fields (was observed in broken backups)
+				continue; // cant create an index without fields (was observed in broken backups)
 			}
-			if ($this->_in_index($mFields,array($aTableDef['pk'])) ||
-				$this->_in_index($mFields,$aTableDef['uc']))
+			if ($this->_in_index($mFields, array($aTableDef['pk'])) ||
+				$this->_in_index($mFields, $aTableDef['uc']))
 			{
-				continue;	// is already created as primary key or unique index
+				continue; // is already created as primary key or unique index
 			}
 			$options = False;
 			if (is_array($mFields))
@@ -236,21 +236,21 @@ 
 				{
 					if (isset($mFields['options'][$this->sType]))
 					{
-						$options = $mFields['options'][$this->sType];	// db-specific options, eg. index-type
-						if (!$options) continue;	// no index for our db-type
+						$options = $mFields['options'][$this->sType]; // db-specific options, eg. index-type
+						if (!$options) continue; // no index for our db-type
 					}
 					unset($mFields['options']);
 				}
 			}
-			foreach((array)$mFields as $k => $col)
+			foreach ((array)$mFields as $k => $col)
 			{
 				// only create indexes on text-columns, if (db-)specifiy options are given or FULLTEXT for mysql
 				// most DB's cant do them and give errors
-				if (in_array($aTableDef['fd'][$col]['type'],array('text','longtext')))
+				if (in_array($aTableDef['fd'][$col]['type'], array('text', 'longtext')))
 				{
 					if (is_array($mFields))	// index over multiple columns including a text column
 					{
-						$mFields[$k] .= '(32)';	// 32=limit of egw_addressbook_extra.extra_value to fix old backups
+						$mFields[$k] .= '(32)'; // 32=limit of egw_addressbook_extra.extra_value to fix old backups
 					}
 					elseif (!$options)	// index over a single text column and no options given
 					{
@@ -260,12 +260,12 @@ 
 						}
 						else
 						{
-							continue 2;	// ignore that index, 2=not just column but whole index!
+							continue 2; // ignore that index, 2=not just column but whole index!
 						}
 					}
 				}
 			}
-			if (!($retVal = $this->CreateIndex($sTableName,$mFields,false,$options,$name)))
+			if (!($retVal = $this->CreateIndex($sTableName, $mFields, false, $options, $name)))
 			{
 				return $retVal;
 			}
@@ -276,7 +276,7 @@ 
 			if ($seq = $this->_PostgresHasOldSequence($sTableName))
 			{
 				$this->pgsql_old_seq = $this->pgsql_old_seq + 1;
-				$this->m_odb->query("ALTER SEQUENCE $seq RESTART WITH " . $this->pgsql_old_seq,__LINE__,__FILE__);
+				$this->m_odb->query("ALTER SEQUENCE $seq RESTART WITH ".$this->pgsql_old_seq, __LINE__, __FILE__);
 			}
 			$this->pgsql_old_seq = 0;
 		}
@@ -290,9 +290,9 @@ 
 	 * @param boolean $bOutputHTML should we give diagnostics, default False
 	 * @return boolean True if no error, else False
 	 */
-	function DropAllTables($aTables, $bOutputHTML=False)
+	function DropAllTables($aTables, $bOutputHTML = False)
 	{
-		if(!is_array($aTables) || !isset($this->m_odb))
+		if (!is_array($aTables) || !isset($this->m_odb))
 		{
 			return False;
 		}
@@ -300,13 +300,13 @@ 
 		if ($this->debug) $bOutputHTML = True;
 		if ($bOutputHTML && !$this->debug) $this->debug = 2;
 
-		foreach($aTables as $sTableName => $aTableDef)
+		foreach ($aTables as $sTableName => $aTableDef)
 		{
-			if($this->DropTable($sTableName))
+			if ($this->DropTable($sTableName))
 			{
-				if($bOutputHTML)
+				if ($bOutputHTML)
 				{
-					echo '<br>Drop Table <b>' . $sTableSQL . '</b>';
+					echo '<br>Drop Table <b>'.$sTableSQL.'</b>';
 				}
 			}
 			else
@@ -329,7 +329,7 @@ 
 
 		$aSql = $this->dict->DropTableSql($sTableName);
 
-		return $this->ExecuteSQLArray($aSql,2,'DropTable(%1) sql=%2',False,$sTableName,$aSql);
+		return $this->ExecuteSQLArray($aSql, 2, 'DropTable(%1) sql=%2', False, $sTableName, $aSql);
 	}
 
 	/**
@@ -346,9 +346,9 @@ 
 		$table_def = $this->GetTableDefinition($sTableName);
 		unset($table_def['fd'][$sColumnName]);
 
-		$aSql = $this->dict->DropColumnSql($sTableName,$sColumnName,$ado_table=$this->_egw2adodb_columndef($table_def));
+		$aSql = $this->dict->DropColumnSql($sTableName, $sColumnName, $ado_table = $this->_egw2adodb_columndef($table_def));
 
-		return $this->ExecuteSQLArray($aSql,2,'DropColumnSQL(%1,%2,%3) sql=%4',False,$sTableName,$sColumnName,$ado_table,$aSql);
+		return $this->ExecuteSQLArray($aSql, 2, 'DropColumnSQL(%1,%2,%3) sql=%4', False, $sTableName, $sColumnName, $ado_table, $aSql);
 	}
 
 	/**
@@ -366,12 +366,12 @@ 
 		{
 			$table_def = $this->GetTableDefinition($sOldTableName);
 
-			if ($this->_PostgresHasOldSequence($sOldTableName,True) || count($table_def['pk']) ||
+			if ($this->_PostgresHasOldSequence($sOldTableName, True) || count($table_def['pk']) ||
 				count($table_def['ix']) || count($table_def['uc']))
 			{
 				if ($this->adodb->BeginTrans() &&
-					$this->CreateTable($sNewTableName,$table_def,True) &&
-					$this->m_odb->query("INSERT INTO $sNewTableName SELECT * FROM $sOldTableName",__LINE__,__FILE__) &&
+					$this->CreateTable($sNewTableName, $table_def, True) &&
+					$this->m_odb->query("INSERT INTO $sNewTableName SELECT * FROM $sOldTableName", __LINE__, __FILE__) &&
 					$this->DropTable($sOldTableName))
 				{
 					$this->adodb->CommitTrans();
@@ -383,7 +383,7 @@ 
 		}
 		$aSql = $this->dict->RenameTableSQL($sOldTableName, $sNewTableName);
 
-		return $this->ExecuteSQLArray($aSql,2,'RenameTableSQL(%1,%2) sql=%3',False,$sOldTableName,$sNewTableName,$aSql);
+		return $this->ExecuteSQLArray($aSql, 2, 'RenameTableSQL(%1,%2) sql=%3', False, $sOldTableName, $sNewTableName, $aSql);
 	}
 
 	/**
@@ -393,21 +393,21 @@ 
 	 * @param bool $preserveValue
 	 * @return boolean/string sequence-name or false
 	 */
-	function _PostgresHasOldSequence($sTableName,$preserveValue=False)
+	function _PostgresHasOldSequence($sTableName, $preserveValue = False)
 	{
 		if ($this->sType != 'pgsql') return false;
 
 		$seq = $this->adodb->GetOne("SELECT d.adsrc FROM pg_attribute a, pg_class c, pg_attrdef d WHERE c.relname='$sTableName' AND c.oid=d.adrelid AND d.adsrc LIKE '%seq_$sTableName''::text)' AND a.attrelid=c.oid AND d.adnum=a.attnum");
 		$seq2 = $this->adodb->GetOne("SELECT d.adsrc FROM pg_attribute a, pg_class c, pg_attrdef d WHERE c.relname='$sTableName' AND c.oid=d.adrelid AND d.adsrc LIKE '%$sTableName%_seq''::text)' AND a.attrelid=c.oid AND d.adnum=a.attnum");
 
-		if ($seq && preg_match('/^nextval\(\'(.*)\'/',$seq,$matches))
+		if ($seq && preg_match('/^nextval\(\'(.*)\'/', $seq, $matches))
 		{
-			if ($preserveValue) $this->pgsql_old_seq = $this->adodb->GetOne("SELECT last_value FROM " . $matches[1]);
+			if ($preserveValue) $this->pgsql_old_seq = $this->adodb->GetOne("SELECT last_value FROM ".$matches[1]);
 			return $matches[1];
 		}
-		if ($seq2 && preg_match('/^nextval\(\'public\.(.*)\'/',$seq2,$matches))
+		if ($seq2 && preg_match('/^nextval\(\'public\.(.*)\'/', $seq2, $matches))
 		{
-			if ($preserveValue) $this->pgsql_old_seq = $this->adodb->GetOne("SELECT last_value FROM " . $matches[1]);
+			if ($preserveValue) $this->pgsql_old_seq = $this->adodb->GetOne("SELECT last_value FROM ".$matches[1]);
 			return $matches[1];
 		}
 		return false;
@@ -419,7 +419,7 @@ 
 	 * @param $sTableName
 	 * @param bool $preserveValue
 	 */
-	function _PostgresTestDropOldSequence($sTableName,$preserveValue=False)
+	function _PostgresTestDropOldSequence($sTableName, $preserveValue = False)
 	{
 		$this->pgsql_old_seq = 0;
 		if ($this->sType == 'pgsql' && ($seq = $this->_PostgresHasOldSequence($sTableName)))
@@ -427,7 +427,7 @@ 
 			// only drop sequence, if there is no dependency on it
 			if (!$this->adodb->GetOne("SELECT relname FROM pg_class JOIN pg_depend ON pg_class.relfilenode=pg_depend.objid WHERE relname='$seq' AND relkind='S' AND deptype='i'"))
 			{
-				$this->query('DROP SEQUENCE '.$seq,__LINE__,__FILE__);
+				$this->query('DROP SEQUENCE '.$seq, __LINE__, __FILE__);
 			}
 		}
 	}
@@ -441,12 +441,12 @@ 
 	 * @param boolean $bCopyData ???
 	 * @return int 2: no error, 1: errors, but continued, 0: errors aborted
 	 */
-	function AlterColumn($sTableName, $sColumnName, $aColumnDef, $bCopyData=True)
+	function AlterColumn($sTableName, $sColumnName, $aColumnDef, $bCopyData = True)
 	{
 		$table_def = $this->GetTableDefinition($sTableName);
 
 		// PostgreSQL: varchar or ascii column shortened, use substring to avoid error if current content is to long
-		if($this->sType == 'pgsql' && in_array($table_def['fd'][$sColumnName]['type'], array('varchar', 'ascii')) &&
+		if ($this->sType == 'pgsql' && in_array($table_def['fd'][$sColumnName]['type'], array('varchar', 'ascii')) &&
 			in_array($aColumnDef['type'], array('varchar', 'ascii')) &&
 			$table_def['fd'][$sColumnName]['precision'] > $aColumnDef['precision'])
 		{
@@ -461,12 +461,12 @@ 
 		}
 		$table_def['fd'][$sColumnName] = $aColumnDef;
 
-		$aSql = $this->dict->AlterColumnSQL($sTableName,$ado_col = $this->_egw2adodb_columndef(array(
+		$aSql = $this->dict->AlterColumnSQL($sTableName, $ado_col = $this->_egw2adodb_columndef(array(
 				'fd' => array($sColumnName => $aColumnDef),
 				'pk' => array(),
-			)),$ado_table=$this->_egw2adodb_columndef($table_def));
+			)), $ado_table = $this->_egw2adodb_columndef($table_def));
 
-		return $this->ExecuteSQLArray($aSql,2,'AlterColumnSQL(%1,%2,%3) sql=%4',False,$sTableName,$ado_col,$ado_table,$aSql);
+		return $this->ExecuteSQLArray($aSql, 2, 'AlterColumnSQL(%1,%2,%3) sql=%4', False, $sTableName, $ado_col, $ado_table, $aSql);
 	}
 
 	/**
@@ -478,7 +478,7 @@ 
 	 * @param boolean $bCopyData ???
 	 * @return int 2: no error, 1: errors, but continued, 0: errors aborted
 	 */
-	function RenameColumn($sTableName, $sOldColumnName, $sNewColumnName, $bCopyData=True)
+	function RenameColumn($sTableName, $sOldColumnName, $sNewColumnName, $bCopyData = True)
 	{
 		$table_def = $this->GetTableDefinition($sTableName);
 		$old_def = array();
@@ -489,7 +489,7 @@ 
 		}
 		else
 		{
-			foreach($table_def['fd'] as $col => $def)
+			foreach ($table_def['fd'] as $col => $def)
 			{
 				if (strtolower($col) == strtolower($sOldColumnName))
 				{
@@ -503,9 +503,9 @@ 
 				'pk' => array(),
 			));
 
-		$aSql = $this->dict->RenameColumnSQL($sTableName,$sOldColumnName,$sNewColumnName,$col_def);
+		$aSql = $this->dict->RenameColumnSQL($sTableName, $sOldColumnName, $sNewColumnName, $col_def);
 
-		return $this->ExecuteSQLArray($aSql,2,'RenameColumnSQL(%1,%2,%3) sql=%4',False,$sTableName,$sOldColumnName, $sNewColumnName,$aSql);
+		return $this->ExecuteSQLArray($aSql, 2, 'RenameColumnSQL(%1,%2,%3) sql=%4', False, $sTableName, $sOldColumnName, $sNewColumnName, $aSql);
 	}
 
 	/**
@@ -518,12 +518,12 @@ 
 	 */
 	function AddColumn($sTableName, $sColumnName, $aColumnDef)
 	{
-		$aSql = $this->dict->AddColumnSQL($sTableName,$ado_cols = $this->_egw2adodb_columndef(array(
+		$aSql = $this->dict->AddColumnSQL($sTableName, $ado_cols = $this->_egw2adodb_columndef(array(
 				'fd' => array($sColumnName => $aColumnDef),
 				'pk' => array(),
 			)));
 
-		return $this->ExecuteSQLArray($aSql,2,'AlterColumnSQL(%1,%2,%3) sql=%4',False,$sTableName,$sColumnName, $aColumnDef,$aSql);
+		return $this->ExecuteSQLArray($aSql, 2, 'AlterColumnSQL(%1,%2,%3) sql=%4', False, $sTableName, $sColumnName, $aColumnDef, $aSql);
 	}
 
 	/**
@@ -536,23 +536,23 @@ 
 	 * @param string $sIdxName='' name of the index, if not given (default) its created automaticaly
 	 * @return int 2: no error, 1: errors, but continued, 0: errors aborted
 	 */
-	function CreateIndex($sTableName,$aColumnNames,$bUnique=false,$options='',$sIdxName='')
+	function CreateIndex($sTableName, $aColumnNames, $bUnique = false, $options = '', $sIdxName = '')
 	{
 		// remove length limits from column names, if DB type is NOT MySQL
 		if ($this->sType != 'mysql')
 		{
-			$aColumnNames = preg_replace('/ *\(\d+\)$/','',$aColumnNames);
+			$aColumnNames = preg_replace('/ *\(\d+\)$/', '', $aColumnNames);
 		}
 		if (!$sIdxName || is_numeric($sIdxName))
 		{
-			$sIdxName = $this->_index_name($sTableName,$aColumnNames);
+			$sIdxName = $this->_index_name($sTableName, $aColumnNames);
 		}
 		if (!is_array($options)) $options = $options ? array($options) : array();
 		if ($bUnique) $options[] = 'UNIQUE';
 
-		$aSql = $this->dict->CreateIndexSQL($sIdxName,$sTableName,$aColumnNames,$options);
+		$aSql = $this->dict->CreateIndexSQL($sIdxName, $sTableName, $aColumnNames, $options);
 
-		return $this->ExecuteSQLArray($aSql,2,'CreateIndexSQL(%1,%2,%3,%4) sql=%5',False,$sTableName,$aColumnNames,$options,$sIdxName,$aSql);
+		return $this->ExecuteSQLArray($aSql, 2, 'CreateIndexSQL(%1,%2,%3,%4) sql=%5', False, $sTableName, $aColumnNames, $options, $sIdxName, $aSql);
 	}
 
 	/**
@@ -562,7 +562,7 @@ 
 	 * @param array/string $aColumnNames columns of the index or the name of the index
 	 * @return int 2: no error, 1: errors, but continued, 0: errors aborted
 	 */
-	function DropIndex($sTableName,$aColumnNames)
+	function DropIndex($sTableName, $aColumnNames)
 	{
 		if (is_array($aColumnNames))
 		{
@@ -572,13 +572,13 @@ 
 			{
 				// if MetaIndexes is not availible for the DB, we try the name the index was created with
 				// this fails if one of the columns have been renamed
-				$sIdxName = $this->_index_name($sTableName,$aColumnNames);
+				$sIdxName = $this->_index_name($sTableName, $aColumnNames);
 			}
 			else
 			{
-				foreach($indexes as $idx => $idx_data)
+				foreach ($indexes as $idx => $idx_data)
 				{
-					if (strtolower(implode(':',$idx_data['columns'])) == implode(':',$aColumnNames))
+					if (strtolower(implode(':', $idx_data['columns'])) == implode(':', $aColumnNames))
 					{
 						$sIdxName = $idx;
 						break;
@@ -590,13 +590,13 @@ 
 		{
 			$sIdxName = $aColumnNames;
 		}
-		if(!$sIdxName)
+		if (!$sIdxName)
 		{
 			return True;
 		}
-		$aSql = $this->dict->DropIndexSQL($sIdxName,$sTableName);
+		$aSql = $this->dict->DropIndexSQL($sIdxName, $sTableName);
 
-		return $this->ExecuteSQLArray($aSql,2,'DropIndexSQL(%1(%2),%3) sql=%4',False,$sIdxName,$aColumnNames,$sTableName,$aSql);
+		return $this->ExecuteSQLArray($aSql, 2, 'DropIndexSQL(%1(%2),%3) sql=%4', False, $sIdxName, $aColumnNames, $sTableName, $aSql);
 	}
 
 	/**
@@ -604,21 +604,21 @@ 
 	 * @param string $sTableName table-name
 	 * @param string $sColumnName column-name, which default is set to nextval()
 	 */
-	function UpdateSequence($sTableName,$sColumnName)
+	function UpdateSequence($sTableName, $sColumnName)
 	{
-		switch($this->sType)
+		switch ($this->sType)
 		{
 			case 'pgsql':
 				// identify the sequence name, ADOdb uses a different name or it might be renamed
 				$columns = $this->dict->MetaColumns($sTableName);
 				$seq_name = 'seq_'.$sTableName;
-				if (preg_match("/nextval\('([^']+)'::(text|regclass)\)/",$columns[strtoupper($sColumnName)]->default_value,$matches))
+				if (preg_match("/nextval\('([^']+)'::(text|regclass)\)/", $columns[strtoupper($sColumnName)]->default_value, $matches))
 				{
 					$seq_name = $matches[1];
 				}
 				$sql = "SELECT setval('$seq_name',MAX($sColumnName)) FROM $sTableName";
-				if($this->debug) { echo "<br>Updating sequence '$seq_name using: $sql"; }
-				return $this->query($sql,__LINE__,__FILE__);
+				if ($this->debug) { echo "<br>Updating sequence '$seq_name using: $sql"; }
+				return $this->query($sql, __LINE__, __FILE__);
 		}
 		return True;
 	}
@@ -635,9 +635,9 @@ 
 	 * @param array $aTableDef eGW table-defintion
 	 * @param array/boolean $aDefaults array with default for the colums during copying, values are either (old) column-names or quoted string-literals
 	 */
-	function RefreshTable($sTableName, $aTableDef, $aDefaults=False)
+	function RefreshTable($sTableName, $aTableDef, $aDefaults = False)
 	{
-		if($this->debug) { echo "<p>schema_proc::RefreshTable('$sTableName',"._debug_array($aTableDef,False).")<p>$sTableName="._debug_array($old_table_def,False)."\n"; }
+		if ($this->debug) { echo "<p>schema_proc::RefreshTable('$sTableName',"._debug_array($aTableDef, False).")<p>$sTableName="._debug_array($old_table_def, False)."\n"; }
 
 		$old_table_def = $this->GetTableDefinition($sTableName);
 
@@ -646,7 +646,7 @@ 
 
 		$select = array();
 		$blob_column_included = $auto_column_included = False;
-		foreach($aTableDef['fd'] as $name => $data)
+		foreach ($aTableDef['fd'] as $name => $data)
 		{
 			// new auto column with no default or explicit NULL as default (can be an existing column too!)
 			if ($data['type'] == 'auto' &&
@@ -654,7 +654,7 @@ 
 				$aDefaults && strtoupper($aDefaults[$name]) == 'NULL'))
 			{
 				$sequence_name = $sTableName.'_'.$name.'_seq';
-				switch($GLOBALS['egw_setup']->db->Type)
+				switch ($GLOBALS['egw_setup']->db->Type)
 				{
 					case 'mysql':
 						$value = 'NULL'; break;
@@ -675,25 +675,25 @@ 
 				if ($this->sType == 'pgsql')			// some postgres specific code
 				{
 					// this is eg. necessary to change a varchar into an int column under postgres
-					if (in_array($old_table_def['fd'][$name]['type'],array('char','varchar','text','blob')) &&
-						in_array($data['type'],array('int','decimal')))
+					if (in_array($old_table_def['fd'][$name]['type'], array('char', 'varchar', 'text', 'blob')) &&
+						in_array($data['type'], array('int', 'decimal')))
 					{
 						$value = "to_number($name,'S9999999999999D99')";
 					}
 					// blobs cant be casted to text
-					elseif($old_table_def['fd'][$name]['type'] == 'blob' && $data['type'] == 'text')
+					elseif ($old_table_def['fd'][$name]['type'] == 'blob' && $data['type'] == 'text')
 					{
 						$value = "ENCODE($value,'escape')";
 					}
 					// varchar or ascii column shortened, use substring to avoid error if current content is to long
-					elseif(in_array($old_table_def['fd'][$name]['type'], array('varchar', 'ascii')) &&
+					elseif (in_array($old_table_def['fd'][$name]['type'], array('varchar', 'ascii')) &&
 						in_array($data['type'], array('varchar', 'ascii')) &&
 						$old_table_def['fd'][$name]['precision'] > $data['precision'])
 					{
 						$value = "SUBSTRING($value FROM 1 FOR ".(int)$data['precision'].')';
 					}
 					// cast everything which is a different type
-					elseif($old_table_def['fd'][$name]['type'] != $data['type'] && ($type_translated = $this->TranslateType($data['type'])))
+					elseif ($old_table_def['fd'][$name]['type'] != $data['type'] && ($type_translated = $this->TranslateType($data['type'])))
 					{
 						$value = "CAST($value AS $type_translated)";
 					}
@@ -706,43 +706,43 @@ 
 					$value = 'NULL';
 				}
 				// some stuff is NOT to be quoted
-				elseif (in_array(strtoupper($data['default']),array('CURRENT_TIMESTAMP','CURRENT_DATE','NULL','NOW()')))
+				elseif (in_array(strtoupper($data['default']), array('CURRENT_TIMESTAMP', 'CURRENT_DATE', 'NULL', 'NOW()')))
 				{
 					$value = $data['default'];
 				}
 				else
 				{
-					$value = $this->m_odb->quote(isset($data['default']) ? $data['default'] : '',$data['type']);
+					$value = $this->m_odb->quote(isset($data['default']) ? $data['default'] : '', $data['type']);
 				}
 				if ($this->sType == 'pgsql')
 				{
 					// fix for postgres error "no '<' operator for type 'unknown'"
-					if(($type_translated = $this->TranslateType($data['type'])))
+					if (($type_translated = $this->TranslateType($data['type'])))
 					{
 						$value = "CAST($value AS $type_translated)";
 					}
 				}
 			}
-			$blob_column_included = $blob_column_included || in_array($data['type'],array('blob','text','longtext'));
+			$blob_column_included = $blob_column_included || in_array($data['type'], array('blob', 'text', 'longtext'));
 			$auto_column_included = $auto_column_included || $data['type'] == 'auto';
 			$select[] = $value;
 		}
-		$select = implode(',',$select);
+		$select = implode(',', $select);
 
 		$extra = '';
 		$distinct = 'DISTINCT';
-		switch($this->sType)
+		switch ($this->sType)
 		{
 			case 'mssql':
 				if ($auto_column_included) $extra = "SET IDENTITY_INSERT $sTableName ON\n";
-				if ($blob_column_included) $distinct = '';	// no distinct on blob-columns
+				if ($blob_column_included) $distinct = ''; // no distinct on blob-columns
 				break;
 		}
 		// because of all the trouble with sequences and indexes in the global namespace,
 		// we use an additional temp. table for postgres and not rename the existing one, but drop it.
 		if ($this->sType == 'pgsql')
 		{
-			$Ok = $this->m_odb->query("SELEcT * INTO TEMPORARY TABLE $tmp_name FROM $sTableName",__LINE__,__FILE__) &&
+			$Ok = $this->m_odb->query("SELEcT * INTO TEMPORARY TABLE $tmp_name FROM $sTableName", __LINE__, __FILE__) &&
 				$this->DropTable($sTableName);
 		}
 		else
@@ -752,12 +752,12 @@ 
 			{
 				$this->DropTable($tmp_name);
 			}
-			$Ok = $this->RenameTable($sTableName,$tmp_name);
+			$Ok = $this->RenameTable($sTableName, $tmp_name);
 		}
-		$Ok = $Ok && $this->CreateTable($sTableName,$aTableDef) &&
-			$this->m_odb->query($sql_copy_data="$extra INSERT INTO $sTableName (".
-				implode(',',array_keys($aTableDef['fd'])).
-				") SELEcT $distinct $select FROM $tmp_name",__LINE__,__FILE__) &&
+		$Ok = $Ok && $this->CreateTable($sTableName, $aTableDef) &&
+			$this->m_odb->query($sql_copy_data = "$extra INSERT INTO $sTableName (".
+				implode(',', array_keys($aTableDef['fd'])).
+				") SELEcT $distinct $select FROM $tmp_name", __LINE__, __FILE__) &&
 			$this->DropTable($tmp_name);
 		//error_log($sql_copy_data);
 
@@ -769,7 +769,7 @@ 
 		// do we need to update the new sequences value ?
 		if (count($aTableDef['pk']) == 1 && $aTableDef['fd'][$aTableDef['pk'][0]]['type'] == 'auto')
 		{
-			$this->UpdateSequence($sTableName,$aTableDef['pk'][0]);
+			$this->UpdateSequence($sTableName, $aTableDef['pk'][0]);
 		}
 		$this->m_odb->transaction_commit();
 
@@ -780,7 +780,7 @@ 
 	 * depricated Function does nothing any more
 	 * @depricated
 	 */
-	function GenerateScripts($aTables, $bOutputHTML=False)
+	function GenerateScripts($aTables, $bOutputHTML = False)
 	{
 		return True;
 	}
@@ -792,9 +792,9 @@ 
 	 * @param boolean $bOutputHTML=false should we give diagnostics, default False
 	 * @return boolean True on success, False if an (fatal) error occured
 	 */
-	function ExecuteScripts($aTables, $bOutputHTML=False)
+	function ExecuteScripts($aTables, $bOutputHTML = False)
 	{
-		if(!is_array($aTables) || !IsSet($this->m_odb))
+		if (!is_array($aTables) || !IsSet($this->m_odb))
 		{
 			return False;
 		}
@@ -802,20 +802,20 @@ 
 		if ($this->debug) $bOutputHTML = True;
 		if ($bOutputHTML && !$this->debug) $this->debug = 2;
 
-		foreach($aTables as $sTableName => $aTableDef)
+		foreach ($aTables as $sTableName => $aTableDef)
 		{
-			if($this->CreateTable($sTableName, $aTableDef))
+			if ($this->CreateTable($sTableName, $aTableDef))
 			{
-				if($bOutputHTML)
+				if ($bOutputHTML)
 				{
-					echo '<br>Create Table <b>' . $sTableName . '</b>';
+					echo '<br>Create Table <b>'.$sTableName.'</b>';
 				}
 			}
 			else
 			{
-				if($bOutputHTML)
+				if ($bOutputHTML)
 				{
-					echo '<br>Create Table Failed For <b>' . $sTableName . '</b>';
+					echo '<br>Create Table Failed For <b>'.$sTableName.'</b>';
 				}
 
 				return False;
@@ -831,9 +831,9 @@ 
 	* @param bool $strip_slashes string escape chars from field(optional), default false
 	* @return string the field value
 	*/
-	function f($value,$strip_slashes=False)
+	function f($value, $strip_slashes = False)
 	{
-		return $this->m_odb->f($value,$strip_slashes);
+		return $this->m_odb->f($value, $strip_slashes);
 	}
 
 	/**
@@ -866,7 +866,7 @@ 
 	* @param int $num_rows number of rows to return (optional), if unset will use $GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs']
 	* @return ADORecordSet or false, if the query fails
 	*/
-	function query($sQuery, $line='', $file='')
+	function query($sQuery, $line = '', $file = '')
 	{
 		return $this->m_odb->query($sQuery, $line, $file);
 	}
@@ -883,9 +883,9 @@ 
 	* @param string $app=false string with name of app, this need to be set in setup anyway!!!
 	* @return ADORecordSet or false, if the query fails
 	*/
-	function insert($table,$data,$where,$line,$file,$app=False,$use_prepared_statement=false)
+	function insert($table, $data, $where, $line, $file, $app = False, $use_prepared_statement = false)
 	{
-		return $this->m_odb->insert($table,$data,$where,$line,$file,$app,$use_prepared_statement);
+		return $this->m_odb->insert($table, $data, $where, $line, $file, $app, $use_prepared_statement);
 	}
 
 	/**
@@ -896,14 +896,14 @@ 
 	 * @param $debug string variable number of arguments for the debug_message functions in case of an error
 	 * @return int 2: no error, 1: errors, but continued, 0: errors aborted
 	 */
-	function ExecuteSqlArray($aSql,$debug_level,$debug)
+	function ExecuteSqlArray($aSql, $debug_level, $debug)
 	{
 		if ($this->m_odb->query_log)	// we use egw_db::query to log the queries
 		{
 			$retval = 2;
-			foreach($aSql as $sql)
+			foreach ($aSql as $sql)
 			{
-				if (!$this->m_odb->query($sql,__LINE__,__FILE__))
+				if (!$this->m_odb->query($sql, __LINE__, __FILE__))
 				{
 					$retval = 1;
 				}
@@ -918,7 +918,7 @@ 
 			$debug_params = func_get_args();
 			array_shift($debug_params);
 			array_shift($debug_params);
-			call_user_func_array(array($this,'debug_message'),$debug_params);
+			call_user_func_array(array($this, 'debug_message'), $debug_params);
 			if ($retval < 2 && !$this->dict->debug)
 			{
 				echo '<p><b>'.$this->adodb->ErrorMsg()."</b></p>\n";
@@ -939,7 +939,7 @@ 
 	 * @param $aColumnNames array of column-names or string with a single column-name
 	 * @return string the index-name
 	 */
-	function _index_name($sTableName,$aColumnNames)
+	function _index_name($sTableName, $aColumnNames)
 	{
 		// this code creates extrem short index-names, eg. for MaxDB
 //			if (isset($this->max_index_length[$this->sType]) && $this->max_index_length[$this->sType] <= 32)
@@ -964,28 +964,28 @@ 
 //				return $name;
 //			}
 		// This code creates longer index-names incl. the table-names and the used columns
-		$table = str_replace(array('phpgw_','egw_'),'',$sTableName);
+		$table = str_replace(array('phpgw_', 'egw_'), '', $sTableName);
 		// if the table-name or a part of it is repeated in the column-name, remove it there
 		$remove[] = $table.'_';
 		// also remove 3 or 4 letter shortcuts of the table- or app-name
-		$remove[] = substr($table,0,3).'_';
-		$remove[] = substr($table,0,4).'_';
+		$remove[] = substr($table, 0, 3).'_';
+		$remove[] = substr($table, 0, 4).'_';
 		// if the table-name consists of '_' limtied parts, remove occurences of these parts too
-		foreach (explode('_',$table) as $part)
+		foreach (explode('_', $table) as $part)
 		{
 			$remove[] = $part.'_';
 		}
-		$aColumnNames = str_replace($remove,'',$aColumnNames);
+		$aColumnNames = str_replace($remove, '', $aColumnNames);
 
-		$name = $sTableName.'_'.(is_array($aColumnNames) ? implode('_',$aColumnNames) : $aColumnNames);
+		$name = $sTableName.'_'.(is_array($aColumnNames) ? implode('_', $aColumnNames) : $aColumnNames);
 		// remove length limits from column names
-		$name = preg_replace('/ *\(\d+\)/','',$name);
+		$name = preg_replace('/ *\(\d+\)/', '', $name);
 
 		// this code creates a fixed short index-names (30 chars) from the long and unique name, eg. for MaxDB or Oracle
 		if (isset($this->max_index_length[$this->sType]) && $this->max_index_length[$this->sType] <= 32 && strlen($name) > 30 ||
 			strlen($name) >= 64)	// even mysql has a limit here ;-)
 		{
-			$name = "i".substr(md5($name),0,29);
+			$name = "i".substr(md5($name), 0, 29);
 		}
 		return $name;
 	}
@@ -1026,19 +1026,19 @@ 
 	 * @param $param mixed a variable number of parameters, to be inserted in $msg
 	 *	arrays get serialized with print_r() !
 	 */
-	function debug_message($msg,$backtrace=True)
+	function debug_message($msg, $backtrace = True)
 	{
-		for($i = 2; $i < func_num_args(); ++$i)
+		for ($i = 2; $i < func_num_args(); ++$i)
 		{
 			$param = func_get_arg($i);
 
 			if (is_null($param))
 			{
-				$param='NULL';
+				$param = 'NULL';
 			}
 			else
 			{
-				switch(gettype($param))
+				switch (gettype($param))
 				{
 					case 'string':
 						$param = "'$param'";
@@ -1046,15 +1046,15 @@ 
 					case 'array':
 					case 'object':
 						list(,$content) = @each($param);
-						$do_pre = is_array($param) ? count($param) > 6 || is_array($content)&&count($content) : True;
-						$param = ($do_pre ? '<pre>' : '').print_r($param,True).($do_pre ? '</pre>' : '');
+						$do_pre = is_array($param) ? count($param) > 6 || is_array($content) && count($content) : True;
+						$param = ($do_pre ? '<pre>' : '').print_r($param, True).($do_pre ? '</pre>' : '');
 						break;
 					case 'boolean':
 						$param = $param ? 'True' : 'False';
 						break;
 				}
 			}
-			$msg = str_replace('%'.($i-1),$param,$msg);
+			$msg = str_replace('%'.($i - 1), $param, $msg);
 		}
 		echo '<p>'.$msg."<br>\n".($backtrace ? 'Backtrace: '.function_backtrace(1)."</p>\n" : '');
 	}
@@ -1069,15 +1069,15 @@ 
 	function _egw2adodb_columndef($aTableDef)
 	{
 		$ado_defs = array();
-		foreach($aTableDef['fd'] as $col => $col_data)
+		foreach ($aTableDef['fd'] as $col => $col_data)
 		{
 			$ado_col = False;
 
-			switch($col_data['type'])
+			switch ($col_data['type'])
 			{
 				case 'auto':
 					$ado_col = 'I AUTOINCREMENT NOTNULL';
-					unset($col_data['nullable']);	// else we set it twice
+					unset($col_data['nullable']); // else we set it twice
 					break;
 				case 'blob':
 					$ado_col = 'B';
@@ -1090,11 +1090,11 @@ 
 				case 'ascii':
 				case 'varchar':
 					$ado_col = "C";
-					if(0 < $col_data['precision'] && $col_data['precision'] <= $this->max_varchar_length)
+					if (0 < $col_data['precision'] && $col_data['precision'] <= $this->max_varchar_length)
 					{
 						$ado_col .= "($col_data[precision])";
 					}
-					if($col_data['precision'] > $this->max_varchar_length)
+					if ($col_data['precision'] > $this->max_varchar_length)
 					{
 						$ado_col = 'X';
 					}
@@ -1106,7 +1106,7 @@ 
 				case 'date':
 					$ado_col = 'D';
 					// allow to use now() beside current_date, as Postgres backups contain it and it's easier to remember anyway
-					if (in_array($col_data['default'],array('current_date','now()')))
+					if (in_array($col_data['default'], array('current_date', 'now()')))
 					{
 						$ado_col .= ' DEFDATE';
 						unset($col_data['default']);
@@ -1122,7 +1122,7 @@ 
 					break;
 				case 'int':
 					$ado_col = 'I';
-					switch($col_data['precision'])
+					switch ($col_data['precision'])
 					{
 						case 1:
 						case 2:
@@ -1141,7 +1141,7 @@ 
 				case 'timestamp':
 					$ado_col = 'T';
 					// allow to use now() beside current_timestamp, as Postgres backups contain it and it's easier to remember anyway
-					if (in_array($col_data['default'],array('current_timestamp','now()')))
+					if (in_array($col_data['default'], array('current_timestamp', 'now()')))
 					{
 						$ado_col .= ' DEFTIMESTAMP';
 						unset($col_data['default']);
@@ -1159,17 +1159,17 @@ 
 			}
 			if (isset($col_data['default']))
 			{
-				$ado_col .= (in_array($col_data['type'],array('bool','int','decimal','float','double')) && $col_data['default'] != 'NULL' ? ' NOQUOTE' : '').
-					' DEFAULT '.$this->m_odb->quote($col_data['default'],$col_data['type']);
+				$ado_col .= (in_array($col_data['type'], array('bool', 'int', 'decimal', 'float', 'double')) && $col_data['default'] != 'NULL' ? ' NOQUOTE' : '').
+					' DEFAULT '.$this->m_odb->quote($col_data['default'], $col_data['type']);
 			}
-			if (in_array($col,$aTableDef['pk']))
+			if (in_array($col, $aTableDef['pk']))
 			{
 				$ado_col .= ' PRIMARY';
 			}
-			$ado_defs[] = $col . ' ' . $ado_col;
+			$ado_defs[] = $col.' '.$ado_col;
 		}
 		//print_r($aTableDef); echo implode(",\n",$ado_defs)."\n";
-		return implode(",\n",$ado_defs);
+		return implode(",\n", $ado_defs);
 	}
 
 	/**
@@ -1184,7 +1184,7 @@ 
 			'fd' => array('test' => array('type' => $egw_type)),
 			'pk' => array(),
 		));
-		return preg_match('/test ([A-Z0-9]+)/i',$ado_col,$matches) ? $this->dict->ActualType($matches[1]) : false;
+		return preg_match('/test ([A-Z0-9]+)/i', $ado_col, $matches) ? $this->dict->ActualType($matches[1]) : false;
 	}
 
 	/**
@@ -1200,7 +1200,7 @@ 
 		// MetaType returns all varchar >= blobSize as blob, it's by default 100, which is wrong
 		$this->dict->blobSize = $this->max_varchar_length;
 
-		if (!method_exists($this->dict,'MetaColumns') ||
+		if (!method_exists($this->dict, 'MetaColumns') ||
 			!($columns = $this->dict->MetaColumns($sTableName)))
 		{
 			return False;
@@ -1213,11 +1213,11 @@ 
 			'uc' => array(),
 		);
 		//echo "$sTableName: <pre>".print_r($columns,true)."</pre>";
-		foreach($columns as $column)
+		foreach ($columns as $column)
 		{
 			$name = $this->capabilities['name_case'] == 'upper' ? strtolower($column->name) : $column->name;
 
-			$type = method_exists($this->dict,'MetaType') ? $this->dict->MetaType($column) : strtoupper($column->type);
+			$type = method_exists($this->dict, 'MetaType') ? $this->dict->MetaType($column) : strtoupper($column->type);
 
 			// fix longtext not correctly handled by ADOdb
 			if ($type == 'X' && $column->type == 'longtext') $type = 'XL';
@@ -1239,11 +1239,11 @@ 
 			);
 			$definition['fd'][$name]['type'] = $ado_type2egw[$type];
 
-			switch($type)
+			switch ($type)
 			{
 				case 'D': case 'T':
 					// detecting the automatic timestamps again
-					if ($column->has_default && preg_match('/(0000-00-00|timestamp)/i',$column->default_value))
+					if ($column->has_default && preg_match('/(0000-00-00|timestamp)/i', $column->default_value))
 					{
 						$column->default_value = $type == 'D' ? 'current_date' : 'current_timestamp';
 					}
@@ -1270,10 +1270,10 @@ 
 					$column->auto_increment = true;
 					// fall-through
 				case 'I': case 'I1': case 'I2': case 'I4': case 'I8':
-					switch($type)
+					switch ($type)
 					{
 						case 'I1': case 'I2': case 'I4': case 'I8':
-							$definition['fd'][$name]['precision'] = (int) $type[1];
+							$definition['fd'][$name]['precision'] = (int)$type[1];
 							break;
 						default:
 							if ($column->max_length > 11)
@@ -1308,7 +1308,7 @@ 
 					{
 						$definition['fd'][$name]['type'] = 'int';
 						// detect postgres type-spec and remove it
-						if ($this->sType == 'pgsql' && $column->has_default && preg_match('/\(([^)])\)::/',$column->default_value,$matches))
+						if ($this->sType == 'pgsql' && $column->has_default && preg_match('/\(([^)])\)::/', $column->default_value, $matches))
 						{
 							$definition['fd'][$name]['default'] = $matches[1];
 							$column->has_default = False;
@@ -1326,7 +1326,7 @@ 
 			}
 			if ($column->has_default)
 			{
-				if (preg_match("/^'(.*)'::.*$/",$column->default_value,$matches))	// postgres
+				if (preg_match("/^'(.*)'::.*$/", $column->default_value, $matches))	// postgres
 				{
 					$column->default_value = $matches[1];
 				}
@@ -1336,27 +1336,27 @@ 
 			{
 				$definition['fd'][$name]['nullable'] = False;
 			}
-			if ($column->primary_key && !in_array($name,$definition['pk']))
+			if ($column->primary_key && !in_array($name, $definition['pk']))
 			{
 				$definition['pk'][] = $name;
 			}
 		}
-		if ($this->debug > 2) $this->debug_message("schema_proc::GetTableDefintion: MetaColumns(%1) = %2",False,$sTableName,$columns);
+		if ($this->debug > 2) $this->debug_message("schema_proc::GetTableDefintion: MetaColumns(%1) = %2", False, $sTableName, $columns);
 
 		// not all DB's (odbc) return the primary keys via MetaColumns
-		if (!count($definition['pk']) && method_exists($this->dict,'MetaPrimaryKeys') &&
+		if (!count($definition['pk']) && method_exists($this->dict, 'MetaPrimaryKeys') &&
 			is_array($primary = $this->dict->MetaPrimaryKeys($sTableName)) && count($primary))
 		{
-			if($this->capabilities['name_case'] == 'upper')
+			if ($this->capabilities['name_case'] == 'upper')
 			{
-				array_walk($primary,create_function('&$s','$s = strtolower($s);'));
+				array_walk($primary, create_function('&$s', '$s = strtolower($s);'));
 			}
 			$definition['pk'] = $primary;
 		}
-		if ($this->debug > 1) $this->debug_message("schema_proc::GetTableDefintion: MetaPrimaryKeys(%1) = %2",False,$sTableName,$primary);
+		if ($this->debug > 1) $this->debug_message("schema_proc::GetTableDefintion: MetaPrimaryKeys(%1) = %2", False, $sTableName, $primary);
 
 		$this->GetIndexes($sTableName, $definition);
-		if ($this->debug > 1) $this->debug_message("schema_proc::GetTableDefintion(%1) = %2",False,$sTableName,$definition);
+		if ($this->debug > 1) $this->debug_message("schema_proc::GetTableDefintion(%1) = %2", False, $sTableName, $definition);
 
 		return $definition;
 	}
@@ -1368,27 +1368,27 @@ 
 	 * @param array& $definition=array()
 	 * @return array of arrays with keys 'ix' and 'uc'
 	 */
-	public function GetIndexes($sTableName, array &$definition=array())
+	public function GetIndexes($sTableName, array &$definition = array())
 	{
-		if (method_exists($this->dict,'MetaIndexes') &&
+		if (method_exists($this->dict, 'MetaIndexes') &&
 			is_array($indexes = $this->dict->MetaIndexes($sTableName)) && count($indexes))
 		{
-			foreach($indexes as $index)
+			foreach ($indexes as $index)
 			{
-				if($this->capabilities['name_case'] == 'upper')
+				if ($this->capabilities['name_case'] == 'upper')
 				{
-					array_walk($index['columns'],create_function('&$s','$s = strtolower($s);'));
+					array_walk($index['columns'], create_function('&$s', '$s = strtolower($s);'));
 				}
-				if (count($definition['pk']) && (implode(':',$definition['pk']) == implode(':',$index['columns']) ||
-					$index['unique'] && count(array_intersect($definition['pk'],$index['columns'])) == count($definition['pk'])))
+				if (count($definition['pk']) && (implode(':', $definition['pk']) == implode(':', $index['columns']) ||
+					$index['unique'] && count(array_intersect($definition['pk'], $index['columns'])) == count($definition['pk'])))
 				{
-					continue;	// is already the primary key => ignore it
+					continue; // is already the primary key => ignore it
 				}
 				$kind = $index['unique'] ? 'uc' : 'ix';
 
 				$definition[$kind][] = count($index['columns']) > 1 ? $index['columns'] : $index['columns'][0];
 			}
-			if ($this->debug > 2) $this->debug_message("schema_proc::GetTableDefintion: MetaIndexes(%1) = %2",False,$sTableName,$indexes);
+			if ($this->debug > 2) $this->debug_message("schema_proc::GetTableDefintion: MetaIndexes(%1) = %2", False, $sTableName, $indexes);
 		}
 		return $definition;
 	}
@@ -1400,7 +1400,7 @@ 
 	 */
 	function CheckCreateIndexes()
 	{
-		foreach($this->adodb->MetaTables('TABLES') as $table)
+		foreach ($this->adodb->MetaTables('TABLES') as $table)
 		{
 			if (!($table_def = $this->m_odb->get_table_definitions(true, $table))) continue;
 
@@ -1408,9 +1408,9 @@ 
 			$this->GetIndexes($table, $definition);
 
 			// iterate though indexes we should have according to tables_current
-			foreach(array('uc', 'ix') as $type)
+			foreach (array('uc', 'ix') as $type)
 			{
-				foreach($table_def[$type] as $columns)
+				foreach ($table_def[$type] as $columns)
 				{
 					// sometimes primary key is listed as (unique) index too --> ignore it
 					if ($this->_in_index($columns, array($table_def['pk']), true)) continue;
@@ -1441,26 +1441,25 @@ 
 	 * old translator function, use GetTableDefition() instead
 	 * @depricated
 	 */
-	function _GetColumns($oProc,$sTableName,&$sColumns)
+	function _GetColumns($oProc, $sTableName, &$sColumns)
 	{
 		$this->sCol = $this->pk = $this->fk = $this->ix = $this->uc = array();
 
 		$tabledef = $this->GetTableDefinition($sTableName);
 
-		$sColumns = implode(',',array_keys($tabledef['fd']));
+		$sColumns = implode(',', array_keys($tabledef['fd']));
 
-		foreach($tabledef['fd'] as $column => $data)
+		foreach ($tabledef['fd'] as $column => $data)
 		{
 			$col_def = "'type' => '$data[type]'";
 			unset($data['type']);
-			foreach($data as $key => $val)
+			foreach ($data as $key => $val)
 			{
-				$col_def .= ", '$key' => ".(is_bool($val) ? ($val ? 'true' : 'false') :
-					(is_int($val) ? $val : "'$val'"));
+				$col_def .= ", '$key' => ".(is_bool($val) ? ($val ? 'true' : 'false') : (is_int($val) ? $val : "'$val'"));
 			}
 			$this->sCol[] = "\t\t\t\t'$column' => array($col_def),\n";
 		}
-		foreach(array('pk','fk','ix','uc') as $kind)
+		foreach (array('pk', 'fk', 'ix', 'uc') as $kind)
 		{
 			$this->$kind = $tabledef[$kind];
 		}

Braces +149 added lines, -39 removed lines

@@ -98,7 +98,7 @@ 
 	function __construct($dbms=False,$db=null)
 	{
 	    if(is_object($db))
-		{
+	    {
 			$this->m_odb = $db;
 	    }
 	    else
@@ -117,7 +117,10 @@ 
 		$this->dict = NewDataDictionary($this->adodb);
 
 		// enable the debuging in ADOdb's datadictionary if the debug-level is greater then 1
-		if ($this->debug > 1) $this->dict->debug = True;
+		if ($this->debug > 1)
+		{
+			$this->dict->debug = True;
+		}
 
 		// to allow some of the former translator-functions to be called, we assign ourself as the translator
 		$this->m_oTranslator = &$this;
@@ -160,7 +163,10 @@ 
 		{
 			unset($columns['options']);
 			$columns = implode('-',$columns);
-			if ($ignore_length_limit) $columns = preg_replace('/\(\d+\)/', '', $columns);
+			if ($ignore_length_limit)
+			{
+				$columns = preg_replace('/\(\d+\)/', '', $columns);
+			}
 		}
 		foreach($indexs as $index)
 		{
@@ -169,8 +175,14 @@ 
 				unset($index['options']);
 				$index = implode('-',$index);
 			}
-			if ($ignore_length_limit) $index = preg_replace('/\(\d+\)/', '', $index);
-			if ($columns == $index) return true;
+			if ($ignore_length_limit)
+			{
+				$index = preg_replace('/\(\d+\)/', '', $index);
+			}
+			if ($columns == $index)
+			{
+				return true;
+			}
 		}
 		return false;
 	}
@@ -232,12 +244,20 @@ 
 			$options = False;
 			if (is_array($mFields))
 			{
-				if (isset($mFields['options']))		// array sets additional options
+				if (isset($mFields['options']))
+				{
+					// array sets additional options
 				{
 					if (isset($mFields['options'][$this->sType]))
 					{
-						$options = $mFields['options'][$this->sType];	// db-specific options, eg. index-type
-						if (!$options) continue;	// no index for our db-type
+						$options = $mFields['options'][$this->sType];
+				}
+				// db-specific options, eg. index-type
+						if (!$options)
+						{
+							continue;
+						}
+						// no index for our db-type
 					}
 					unset($mFields['options']);
 				}
@@ -248,15 +268,22 @@ 
 				// most DB's cant do them and give errors
 				if (in_array($aTableDef['fd'][$col]['type'],array('text','longtext')))
 				{
-					if (is_array($mFields))	// index over multiple columns including a text column
+					if (is_array($mFields))
+					{
+						// index over multiple columns including a text column
 					{
-						$mFields[$k] .= '(32)';	// 32=limit of egw_addressbook_extra.extra_value to fix old backups
+						$mFields[$k] .= '(32)';
 					}
-					elseif (!$options)	// index over a single text column and no options given
+					// 32=limit of egw_addressbook_extra.extra_value to fix old backups
+					}
+					elseif (!$options)
+					{
+						// index over a single text column and no options given
 					{
 						if ($this->sType == 'mysql')
 						{
 							$options = 'FULLTEXT';
+					}
 						}
 						else
 						{
@@ -297,8 +324,14 @@ 
 			return False;
 		}
 		// set our debug-mode or $bOutputHTML is the other one is set
-		if ($this->debug) $bOutputHTML = True;
-		if ($bOutputHTML && !$this->debug) $this->debug = 2;
+		if ($this->debug)
+		{
+			$bOutputHTML = True;
+		}
+		if ($bOutputHTML && !$this->debug)
+		{
+			$this->debug = 2;
+		}
 
 		foreach($aTables as $sTableName => $aTableDef)
 		{
@@ -325,7 +358,10 @@ 
 	 */
 	function DropTable($sTableName)
 	{
-		if ($this->sType == 'pgsql') $this->_PostgresTestDropOldSequence($sTableName);
+		if ($this->sType == 'pgsql')
+		{
+			$this->_PostgresTestDropOldSequence($sTableName);
+		}
 
 		$aSql = $this->dict->DropTableSql($sTableName);
 
@@ -395,19 +431,28 @@ 
 	 */
 	function _PostgresHasOldSequence($sTableName,$preserveValue=False)
 	{
-		if ($this->sType != 'pgsql') return false;
+		if ($this->sType != 'pgsql')
+		{
+			return false;
+		}
 
 		$seq = $this->adodb->GetOne("SELECT d.adsrc FROM pg_attribute a, pg_class c, pg_attrdef d WHERE c.relname='$sTableName' AND c.oid=d.adrelid AND d.adsrc LIKE '%seq_$sTableName''::text)' AND a.attrelid=c.oid AND d.adnum=a.attnum");
 		$seq2 = $this->adodb->GetOne("SELECT d.adsrc FROM pg_attribute a, pg_class c, pg_attrdef d WHERE c.relname='$sTableName' AND c.oid=d.adrelid AND d.adsrc LIKE '%$sTableName%_seq''::text)' AND a.attrelid=c.oid AND d.adnum=a.attnum");
 
 		if ($seq && preg_match('/^nextval\(\'(.*)\'/',$seq,$matches))
 		{
-			if ($preserveValue) $this->pgsql_old_seq = $this->adodb->GetOne("SELECT last_value FROM " . $matches[1]);
+			if ($preserveValue)
+			{
+				$this->pgsql_old_seq = $this->adodb->GetOne("SELECT last_value FROM " . $matches[1]);
+			}
 			return $matches[1];
 		}
 		if ($seq2 && preg_match('/^nextval\(\'public\.(.*)\'/',$seq2,$matches))
 		{
-			if ($preserveValue) $this->pgsql_old_seq = $this->adodb->GetOne("SELECT last_value FROM " . $matches[1]);
+			if ($preserveValue)
+			{
+				$this->pgsql_old_seq = $this->adodb->GetOne("SELECT last_value FROM " . $matches[1]);
+			}
 			return $matches[1];
 		}
 		return false;
@@ -547,8 +592,14 @@ 
 		{
 			$sIdxName = $this->_index_name($sTableName,$aColumnNames);
 		}
-		if (!is_array($options)) $options = $options ? array($options) : array();
-		if ($bUnique) $options[] = 'UNIQUE';
+		if (!is_array($options))
+		{
+			$options = $options ? array($options) : array();
+		}
+		if ($bUnique)
+		{
+			$options[] = 'UNIQUE';
+		}
 
 		$aSql = $this->dict->CreateIndexSQL($sIdxName,$sTableName,$aColumnNames,$options);
 
@@ -617,7 +668,9 @@ 
 					$seq_name = $matches[1];
 				}
 				$sql = "SELECT setval('$seq_name',MAX($sColumnName)) FROM $sTableName";
-				if($this->debug) { echo "<br>Updating sequence '$seq_name using: $sql"; }
+				if($this->debug)
+				{
+echo "<br>Updating sequence '$seq_name using: $sql"; }
 				return $this->query($sql,__LINE__,__FILE__);
 		}
 		return True;
@@ -637,7 +690,9 @@ 
 	 */
 	function RefreshTable($sTableName, $aTableDef, $aDefaults=False)
 	{
-		if($this->debug) { echo "<p>schema_proc::RefreshTable('$sTableName',"._debug_array($aTableDef,False).")<p>$sTableName="._debug_array($old_table_def,False)."\n"; }
+		if($this->debug)
+		{
+echo "<p>schema_proc::RefreshTable('$sTableName',"._debug_array($aTableDef,False).")<p>$sTableName="._debug_array($old_table_def,False)."\n"; }
 
 		$old_table_def = $this->GetTableDefinition($sTableName);
 
@@ -664,21 +719,30 @@ 
 						$value = "nextval('$sequence_name')"; break;
 				}
 			}
-			elseif ($aDefaults && isset($aDefaults[$name]))	// use given default
+			elseif ($aDefaults && isset($aDefaults[$name]))
+			{
+				// use given default
 			{
 				$value = $aDefaults[$name];
 			}
-			elseif (isset($old_table_def['fd'][$name]))	// existing column, use its value => column-name in query
+			}
+			elseif (isset($old_table_def['fd'][$name]))
+			{
+				// existing column, use its value => column-name in query
 			{
 				$value = $name;
+			}
 
-				if ($this->sType == 'pgsql')			// some postgres specific code
+				if ($this->sType == 'pgsql')
+				{
+					// some postgres specific code
 				{
 					// this is eg. necessary to change a varchar into an int column under postgres
 					if (in_array($old_table_def['fd'][$name]['type'],array('char','varchar','text','blob')) &&
 						in_array($data['type'],array('int','decimal')))
 					{
 						$value = "to_number($name,'S9999999999999D99')";
+				}
 					}
 					// blobs cant be casted to text
 					elseif($old_table_def['fd'][$name]['type'] == 'blob' && $data['type'] == 'text')
@@ -734,8 +798,15 @@ 
 		switch($this->sType)
 		{
 			case 'mssql':
-				if ($auto_column_included) $extra = "SET IDENTITY_INSERT $sTableName ON\n";
-				if ($blob_column_included) $distinct = '';	// no distinct on blob-columns
+				if ($auto_column_included)
+				{
+					$extra = "SET IDENTITY_INSERT $sTableName ON\n";
+				}
+				if ($blob_column_included)
+				{
+					$distinct = '';
+				}
+				// no distinct on blob-columns
 				break;
 		}
 		// because of all the trouble with sequences and indexes in the global namespace,
@@ -799,8 +870,14 @@ 
 			return False;
 		}
 		// set our debug-mode or $bOutputHTML is the other one is set
-		if ($this->debug) $bOutputHTML = True;
-		if ($bOutputHTML && !$this->debug) $this->debug = 2;
+		if ($this->debug)
+		{
+			$bOutputHTML = True;
+		}
+		if ($bOutputHTML && !$this->debug)
+		{
+			$this->debug = 2;
+		}
 
 		foreach($aTables as $sTableName => $aTableDef)
 		{
@@ -898,9 +975,12 @@ 
 	 */
 	function ExecuteSqlArray($aSql,$debug_level,$debug)
 	{
-		if ($this->m_odb->query_log)	// we use egw_db::query to log the queries
+		if ($this->m_odb->query_log)
+		{
+			// we use egw_db::query to log the queries
 		{
 			$retval = 2;
+		}
 			foreach($aSql as $sql)
 			{
 				if (!$this->m_odb->query($sql,__LINE__,__FILE__))
@@ -983,10 +1063,13 @@ 
 
 		// this code creates a fixed short index-names (30 chars) from the long and unique name, eg. for MaxDB or Oracle
 		if (isset($this->max_index_length[$this->sType]) && $this->max_index_length[$this->sType] <= 32 && strlen($name) > 30 ||
-			strlen($name) >= 64)	// even mysql has a limit here ;-)
+			strlen($name) >= 64)
+		{
+			// even mysql has a limit here ;-)
 		{
 			$name = "i".substr(md5($name),0,29);
 		}
+		}
 		return $name;
 	}
 
@@ -1220,7 +1303,10 @@ 
 			$type = method_exists($this->dict,'MetaType') ? $this->dict->MetaType($column) : strtoupper($column->type);
 
 			// fix longtext not correctly handled by ADOdb
-			if ($type == 'X' && $column->type == 'longtext') $type = 'XL';
+			if ($type == 'X' && $column->type == 'longtext')
+			{
+				$type = 'XL';
+			}
 
 			static $ado_type2egw = array(
 				'C'		=> 'varchar',
@@ -1326,10 +1412,13 @@ 
 			}
 			if ($column->has_default)
 			{
-				if (preg_match("/^'(.*)'::.*$/",$column->default_value,$matches))	// postgres
+				if (preg_match("/^'(.*)'::.*$/",$column->default_value,$matches))
+				{
+					// postgres
 				{
 					$column->default_value = $matches[1];
 				}
+				}
 				$definition['fd'][$name]['default'] = $column->default_value;
 			}
 			if ($column->not_null)
@@ -1341,7 +1430,10 @@ 
 				$definition['pk'][] = $name;
 			}
 		}
-		if ($this->debug > 2) $this->debug_message("schema_proc::GetTableDefintion: MetaColumns(%1) = %2",False,$sTableName,$columns);
+		if ($this->debug > 2)
+		{
+			$this->debug_message("schema_proc::GetTableDefintion: MetaColumns(%1) = %2",False,$sTableName,$columns);
+		}
 
 		// not all DB's (odbc) return the primary keys via MetaColumns
 		if (!count($definition['pk']) && method_exists($this->dict,'MetaPrimaryKeys') &&
@@ -1353,10 +1445,16 @@ 
 			}
 			$definition['pk'] = $primary;
 		}
-		if ($this->debug > 1) $this->debug_message("schema_proc::GetTableDefintion: MetaPrimaryKeys(%1) = %2",False,$sTableName,$primary);
+		if ($this->debug > 1)
+		{
+			$this->debug_message("schema_proc::GetTableDefintion: MetaPrimaryKeys(%1) = %2",False,$sTableName,$primary);
+		}
 
 		$this->GetIndexes($sTableName, $definition);
-		if ($this->debug > 1) $this->debug_message("schema_proc::GetTableDefintion(%1) = %2",False,$sTableName,$definition);
+		if ($this->debug > 1)
+		{
+			$this->debug_message("schema_proc::GetTableDefintion(%1) = %2",False,$sTableName,$definition);
+		}
 
 		return $definition;
 	}
@@ -1388,7 +1486,10 @@ 
 
 				$definition[$kind][] = count($index['columns']) > 1 ? $index['columns'] : $index['columns'][0];
 			}
-			if ($this->debug > 2) $this->debug_message("schema_proc::GetTableDefintion: MetaIndexes(%1) = %2",False,$sTableName,$indexes);
+			if ($this->debug > 2)
+			{
+				$this->debug_message("schema_proc::GetTableDefintion: MetaIndexes(%1) = %2",False,$sTableName,$indexes);
+			}
 		}
 		return $definition;
 	}
@@ -1402,7 +1503,10 @@ 
 	{
 		foreach($this->adodb->MetaTables('TABLES') as $table)
 		{
-			if (!($table_def = $this->m_odb->get_table_definitions(true, $table))) continue;
+			if (!($table_def = $this->m_odb->get_table_definitions(true, $table)))
+			{
+				continue;
+			}
 
 			$definition = array();
 			$this->GetIndexes($table, $definition);
@@ -1413,7 +1517,10 @@ 
 				foreach($table_def[$type] as $columns)
 				{
 					// sometimes primary key is listed as (unique) index too --> ignore it
-					if ($this->_in_index($columns, array($table_def['pk']), true)) continue;
+					if ($this->_in_index($columns, array($table_def['pk']), true))
+					{
+						continue;
+					}
 
 					// check if they exist in real table and create them if not
 					if (!$this->_in_index($columns, $definition[$type]) &&
@@ -1424,7 +1531,10 @@ 
 						if ($this->_in_index($columns, $definition[$type], true))
 						{
 							// for PostgreSQL we dont use length-limited indexes --> nothing to do
-							if ($this->m_odb->Type == 'pgsql') continue;
+							if ($this->m_odb->Type == 'pgsql')
+							{
+								continue;
+							}
 							// for MySQL we drop current index and create it with correct length
 							$this->DropIndex($table, $columns);
 						}

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -797,7 +797,7 @@
 	 */
 	function ExecuteScripts($aTables, $bOutputHTML=False)
 	{
-		if(!is_array($aTables) || !IsSet($this->m_odb))
+		if(!is_array($aTables) || !isset($this->m_odb))
 		{
 			return False;
 		}

phpgwapi/inc/class.solink.inc.php

Doc Comments +7 added lines, -2 removed lines

@@ -94,7 +94,7 @@ 
 	 *
 	 * @param int $link_id link to update
 	 * @param string $remark new text for the remark
-	 * @return boolean true on success, else false
+	 * @return ADORecordSet true on success, else false
 	 */
 	static function update_remark($link_id,$remark)
 	{
@@ -172,6 +172,11 @@ 
 		return is_array($id) ? $links : ($links[$id] ? $links[$id] : array());
 	}
 
+	/**
+	 * @param boolean $left
+	 * @param string $only_app
+	 * @param boolean $not_only
+	 */
 	private function _add2links($row,$left,$only_app,$not_only,array &$links)
 	{
 		$linked_app = $left ? $row['link_app2'] : $row['link_app1'];
@@ -202,7 +207,7 @@ 
 	 * @param string $id ='' id in $app, if no integer link_id given in $app_link_id
 	 * @param string $app2 ='' appname of 2. endpoint of the link, if no integer link_id given in $app_link_id
 	 * @param string $id2 ='' id in $app2, if no integer link_id given in $app_link_id
-	 * @return array with link-data or False
+	 * @return boolean with link-data or False
 	 */
 	static function get_link($app_link_id,$id='',$app2='',$id2='')
 	{

Indentation +9 added lines, -9 removed lines

@@ -66,7 +66,7 @@ 
 			echo "<p>solink.link('$app1',$id1,'$app2',$id2,'$remark',$owner)</p>\n";
 		}
 		if ($app1 == $app2 && $id1 == $id2 ||
-		    $id1 == '' || $id2 == '' || $app1 == '' || $app2 == '')
+			$id1 == '' || $id2 == '' || $app1 == '' || $app2 == '')
 		{
 			return False;	// dont link to self or other nosense
 		}
@@ -412,26 +412,26 @@ 
 			array('table'=>self::TABLE,
 				'cols'=>'c.*,b.link_app1 AS app3,b.link_id1 AS id3,b.link_id AS link3',
 				'where'=>'a.link_app1='.self::$db->quote($app).' AND c.link_app2='.self::$db->quote($target_app).
-                        		(!$target_id ? '' : self::$db->expression(self::TABLE,' AND c.',array('link_id2' => $target_id))),
-                        	'join'=>" a
+								(!$target_id ? '' : self::$db->expression(self::TABLE,' AND c.',array('link_id2' => $target_id))),
+							'join'=>" a
                         		JOIN $table b ON a.link_id2=b.link_id1 AND a.link_app2=b.link_app1
                        			JOIN $table c ON a.link_id1=c.link_id1 AND a.link_app1=c.link_app1 AND a.link_id!=c.link_id AND c.link_app2=b.link_app2 AND c.link_id2=b.link_id2",
 			),
 			// retrieve the type of links, where the relation is realized as timesheet->infolog/tracker and projectmanager->timesheet
 			array('table'=>self::TABLE,
 				'cols'=>'b.link_id, b.link_app2 as app1, b.link_id2 as id1, b.link_app1 as app2, b.link_id1 as id2, b.link_remark,b.link_lastmod,b.link_owner,b.deleted,c.link_app1 AS app3,c.link_id1 AS id3,c.link_id AS link3',
-                       		'where'=>'a.link_app1='.self::$db->quote($app).' AND b.link_app1='.self::$db->quote($target_app).
-                        		(!$target_id ? '' : self::$db->expression(self::TABLE,' AND b.',array('link_id1' => $target_id))),
-                        	'join'=>" a
+					   		'where'=>'a.link_app1='.self::$db->quote($app).' AND b.link_app1='.self::$db->quote($target_app).
+								(!$target_id ? '' : self::$db->expression(self::TABLE,' AND b.',array('link_id1' => $target_id))),
+							'join'=>" a
                         		JOIN $table b ON a.link_id1=b.link_id2 AND a.link_app1=b.link_app2
                         		JOIN $table c ON a.link_id2=c.link_id1 AND a.link_app2=c.link_app1 AND a.link_id!=c.link_id AND c.link_app2=b.link_app1 AND c.link_id2=b.link_id1",
 			),
 			// retrieve the type of links, where the relation is realized as timesheet->projectmanager and infolog->timesheet
 			array('table'=>self::TABLE,
 				'cols'=>'a.*,c.link_app1 AS app3,c.link_id1 AS id3,c.link_id AS link3',
-                     		'where'=>'a.link_app1='.self::$db->quote($app).' AND a.link_app2='.self::$db->quote($target_app).
-                        		(!$target_id ? '' : self::$db->expression(self::TABLE,' AND a.',array('link_id2' => $target_id))),
-                       		'join'=>" a
+					 		'where'=>'a.link_app1='.self::$db->quote($app).' AND a.link_app2='.self::$db->quote($target_app).
+								(!$target_id ? '' : self::$db->expression(self::TABLE,' AND a.',array('link_id2' => $target_id))),
+					   		'join'=>" a
                        			JOIN $table b ON a.link_id1=b.link_id2 AND a.link_app1=b.link_app2
                         		JOIN $table c ON a.link_id2=c.link_id2 AND a.link_app2=c.link_app2 AND a.link_id!=c.link_id AND c.link_app1=b.link_app1 AND c.link_id1=b.link_id1",
 			),

Spacing +58 added lines, -58 removed lines

@@ -55,7 +55,7 @@ 
 	 * @param int $lastmod =0 timestamp of last modification (defaults to now=time())
 	 * @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)
 	{
 		if (self::DEBUG)
 		{
@@ -64,21 +64,21 @@ 
 		if ($app1 == $app2 && $id1 == $id2 ||
 		    $id1 == '' || $id2 == '' || $app1 == '' || $app2 == '')
 		{
-			return False;	// dont link to self or other nosense
+			return False; // dont link to self or other nosense
 		}
-		if (($link = self::get_link($app1,$id1,$app2,$id2)))
+		if (($link = self::get_link($app1, $id1, $app2, $id2)))
 		{
 			if ($link['link_remark'] != $remark)
 			{
-				self::update_remark($link['link_id'],$remark);
+				self::update_remark($link['link_id'], $remark);
 			}
-			return $link['link_id'];	// link alread exist
+			return $link['link_id']; // link alread exist
 		}
 		if (!$owner)
 		{
 			$owner = $GLOBALS['egw_info']['user']['account_id'];
 		}
-		return self::$db->insert(self::TABLE,array(
+		return self::$db->insert(self::TABLE, array(
 				'link_app1'		=> $app1,
 				'link_id1'		=> $id1,
 				'link_app2'		=> $app2,
@@ -86,7 +86,7 @@ 
 				'link_remark'	=> $remark,
 				'link_lastmod'	=> $lastmod ? $lastmod : time(),
 				'link_owner'	=> $owner,
-			),False,__LINE__,__FILE__) ? self::$db->get_last_insert_id(self::TABLE,'link_id') : false;
+			), False, __LINE__, __FILE__) ? self::$db->get_last_insert_id(self::TABLE, 'link_id') : false;
 	}
 
 	/**
@@ -96,14 +96,14 @@ 
 	 * @param string $remark new text for the remark
 	 * @return boolean true on success, else false
 	 */
-	static function update_remark($link_id,$remark)
+	static function update_remark($link_id, $remark)
 	{
-		return self::$db->update(self::TABLE,array(
+		return self::$db->update(self::TABLE, array(
 				'link_remark'	=> $remark,
 				'link_lastmod'	=> time(),
-			),array(
+			), array(
 				'link_id'	=> $link_id,
-			),__LINE__,__FILE__);
+			), __LINE__, __FILE__);
 	}
 
 	/**
@@ -117,15 +117,15 @@ 
 	 * @param int|array $limit =null number of entries to return, default null = all or array(offset, num_rows) to return num_rows starting from offset
 	 * @return array id => links pairs if $id is an array or just the links (only_app: ids) or empty array if no matching links found
 	 */
-	static function get_links($app, $id, $only_app='', $order='link_lastmod DESC', $deleted=false, $limit=null)
+	static function get_links($app, $id, $only_app = '', $order = 'link_lastmod DESC', $deleted = false, $limit = null)
 	{
 		if (self::DEBUG)
 		{
-			echo "<p>solink.get_links($app,".print_r($id,true).",$only_app,$order,$deleted)</p>\n";
+			echo "<p>solink.get_links($app,".print_r($id, true).",$only_app,$order,$deleted)</p>\n";
 		}
 		if (($not_only = $only_app[0] == '!'))
 		{
-			$only_app = substr($only_app,1);
+			$only_app = substr($only_app, 1);
 		}
 
 		$offset = false;
@@ -133,32 +133,32 @@ 
 		{
 			list($offset, $limit) = $limit;
 		}
-		elseif($limit)
+		elseif ($limit)
 		{
 			$offset = 0;
 		}
 
 		$links = array();
 		try {
-			foreach(self::$db->select(self::TABLE, '*', self::$db->expression(self::TABLE, '((', array(
+			foreach (self::$db->select(self::TABLE, '*', self::$db->expression(self::TABLE, '((', array(
 						'link_app1'	=> $app,
 						'link_id1'	=> $id,
-					),') OR (',array(
+					), ') OR (', array(
 						'link_app2'	=> $app,
 						'link_id2'	=> $id,
-					),'))',
+					), '))',
 					$deleted ? '' : ' AND deleted IS NULL'
 				), __LINE__, __FILE__, $offset, $order ? " ORDER BY $order" : '', 'phpgwapi', $limit) as $row)
 			{
 				// check if left side (1) is one of our targets --> add it
-				if ($row['link_app1'] == $app && in_array($row['link_id1'],(array)$id))
+				if ($row['link_app1'] == $app && in_array($row['link_id1'], (array)$id))
 				{
-					self::_add2links($row,true,$only_app,$not_only,$links);
+					self::_add2links($row, true, $only_app, $not_only, $links);
 				}
 				// check if right side (2) is one of our targets --> add it (both can be true for multiple targets!)
-				if ($row['link_app2'] == $app && in_array($row['link_id2'],(array)$id))
+				if ($row['link_app2'] == $app && in_array($row['link_id2'], (array)$id))
 				{
-					self::_add2links($row,false,$only_app,$not_only,$links);
+					self::_add2links($row, false, $only_app, $not_only, $links);
 				}
 			}
 			// if query returns exactly limit rows, we assume there are more and therefore set self::$limit_exceeded
@@ -166,18 +166,18 @@ 
 		}
 		// catch Illegal mix of collations (ascii_general_ci,IMPLICIT) and (utf8_general_ci,COERCIBLE) for operation '=' (1267)
 		// caused by non-ascii chars compared with ascii field uid
-		catch(egw_exception_db $e) {
+		catch (egw_exception_db $e) {
 			_egw_log_exception($e);
 		}
 		return is_array($id) ? $links : ($links[$id] ? $links[$id] : array());
 	}
 
-	private function _add2links($row,$left,$only_app,$not_only,array &$links)
+	private function _add2links($row, $left, $only_app, $not_only, array &$links)
 	{
 		$linked_app = $left ? $row['link_app2'] : $row['link_app1'];
 		$linked_id  = $left ? $row['link_id2'] : $row['link_id1'];
 		$app_id = $left ? $row['link_id1'] : $row['link_id2'];
-		list($app) = explode('-',$linked_app);
+		list($app) = explode('-', $linked_app);
 		if ($only_app && $not_only == ($linked_app == $only_app) || !$GLOBALS['egw_info']['user']['apps'][$app])
 		{
 			#echo "$linked_app == $only_app, ";var_dump($linked_app == $only_app);echo "	->dont return a link<br>";
@@ -204,13 +204,13 @@ 
 	 * @param string $id2 ='' id in $app2, if no integer link_id given in $app_link_id
 	 * @return array with link-data or False
 	 */
-	static function get_link($app_link_id,$id='',$app2='',$id2='')
+	static function get_link($app_link_id, $id = '', $app2 = '', $id2 = '')
 	{
 		if (self::DEBUG)
 		{
 			echo "<p>solink.get_link('$app_link_id',$id,'$app2','$id2')</p>\n";
 		}
-		if ((int) $app_link_id > 0)
+		if ((int)$app_link_id > 0)
 		{
 			$where = array('link_id' => $app_link_id);
 		}
@@ -220,24 +220,24 @@ 
 			{
 				return False;
 			}
-			$where = self::$db->expression(self::TABLE,'(',array(
+			$where = self::$db->expression(self::TABLE, '(', array(
 					'link_app1'	=> $app_link_id,
 					'link_id1'	=> $id,
 					'link_app2'	=> $app2,
 					'link_id2'	=> $id2,
-				),') OR (',array(
+				), ') OR (', array(
 					'link_app2'	=> $app_link_id,
 					'link_id2'	=> $id,
 					'link_app1'	=> $app2,
 					'link_id1'	=> $id2,
-				),')');
+				), ')');
 		}
 		try {
-			return self::$db->select(self::TABLE,'*',$where,__LINE__,__FILE__)->fetch(ADODB_FETCH_ASSOC);
+			return self::$db->select(self::TABLE, '*', $where, __LINE__, __FILE__)->fetch(ADODB_FETCH_ASSOC);
 		}
 		// catch Illegal mix of collations (ascii_general_ci,IMPLICIT) and (utf8_general_ci,COERCIBLE) for operation '=' (1267)
 		// caused by non-ascii chars compared with ascii field uid
-		catch(egw_exception_db $e) {
+		catch (egw_exception_db $e) {
 			_egw_log_exception($e);
 		}
 		return false;
@@ -255,7 +255,7 @@ 
 	 * @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)
 		{
@@ -280,21 +280,21 @@ 
 					$check1['link_id1'] = $id;
 					$check2['link_id2'] = $id;
 				}
-				$where = self::$db->expression(self::TABLE,'((',$check1,') OR (',$check2,'))');
+				$where = self::$db->expression(self::TABLE, '((', $check1, ') OR (', $check2, '))');
 			}
 			elseif ($app != '' && $app2 != '')
 			{
-				$where = self::$db->expression(self::TABLE,'(',array(
+				$where = self::$db->expression(self::TABLE, '(', array(
 						'link_app1'	=> $app,
 						'link_id1'	=> $id,
 						'link_app2'	=> $app2,
 						'link_id2'	=> $id2,
-					),') OR (',array(
+					), ') OR (', array(
 						'link_app1'	=> $app2,
 						'link_id1'	=> $id2,
 						'link_app2'	=> $app,
 						'link_id2'	=> $id,
-					),')');
+					), ')');
 			}
 			if ($owner)
 			{
@@ -304,25 +304,25 @@ 
 		}
 		$deleted = array();
 		try {
-			foreach(self::$db->select(self::TABLE,'*',$where,__LINE__,__FILE__) as $row)
+			foreach (self::$db->select(self::TABLE, '*', $where, __LINE__, __FILE__) as $row)
 			{
 				$deleted[] = $row;
 			}
-			if($hold_for_purge)
+			if ($hold_for_purge)
 			{
-				self::$db->update(self::TABLE,array(
+				self::$db->update(self::TABLE, array(
 					'deleted' => time(),
 					'link_lastmod' => time(),
-				), $where, __LINE__,__FILE__);
+				), $where, __LINE__, __FILE__);
 			}
 			else
 			{
-				self::$db->delete(self::TABLE,$where,__LINE__,__FILE__);
+				self::$db->delete(self::TABLE, $where, __LINE__, __FILE__);
 			}
 		}
 		// catch Illegal mix of collations (ascii_general_ci,IMPLICIT) and (utf8_general_ci,COERCIBLE) for operation '=' (1267)
 		// caused by non-ascii chars compared with ascii field uid
-		catch(egw_exception_db $e) {
+		catch (egw_exception_db $e) {
 			_egw_log_exception($e);
 		}
 
@@ -353,8 +353,8 @@ 
 			$check1['link_id1'] = $id;
 			$check2['link_id2'] = $id;
 		}
-		$where = self::$db->expression(self::TABLE,'((',$check1,') OR (',$check2,'))');
-		self::$db->update(self::TABLE,array('deleted'=> null), $where, __LINE__,__FILE__);
+		$where = self::$db->expression(self::TABLE, '((', $check1, ') OR (', $check2, '))');
+		self::$db->update(self::TABLE, array('deleted'=> null), $where, __LINE__, __FILE__);
 	}
 
 	/**
@@ -367,13 +367,13 @@ 
 	 * @param int $new_owner account_id of new owner
 	 * @return int number of links changed
 	 */
-	static function chown($owner,$new_owner)
+	static function chown($owner, $new_owner)
 	{
-		if ((int)$owner <= 0 || (int) $new_owner <= 0)
+		if ((int)$owner <= 0 || (int)$new_owner <= 0)
 		{
 			return 0;
 		}
-		self::$db->update(self::TABLE,array('owner'=>$new_owner),array('owner'=>$owner),__LINE__,__FILE__);
+		self::$db->update(self::TABLE, array('owner'=>$new_owner), array('owner'=>$owner), __LINE__, __FILE__);
 
 		return self::$db->affected_rows();
 	}
@@ -400,15 +400,15 @@ 
 	 * @param int|array $limit =null number of entries to return, default null = all or array(offset, num_rows) to return num_rows starting from offset
 	 * @return array with links from entries from $app to $target_app/$target_id plus the other (b) link_id/app/id in the keys 'link3'/'app3'/'id3'
 	 */
-	static function get_3links($app, $target_app, $target_id=null, $just_app_ids=false, $order='link_lastmod DESC', $limit=null)
+	static function get_3links($app, $target_app, $target_id = null, $just_app_ids = false, $order = 'link_lastmod DESC', $limit = null)
 	{
 		$table = self::TABLE;
-		$arrayofselects=array(
+		$arrayofselects = array(
 			// retrieve the type of links, where the relation is realized as timesheet->infolog/tracker via infolog->projectmanager to timesheet->projectmanager
 			array('table'=>self::TABLE,
 				'cols'=>'c.*,b.link_app1 AS app3,b.link_id1 AS id3,b.link_id AS link3',
 				'where'=>'a.link_app1='.self::$db->quote($app).' AND c.link_app2='.self::$db->quote($target_app).
-                        		(!$target_id ? '' : self::$db->expression(self::TABLE,' AND c.',array('link_id2' => $target_id))),
+                        		(!$target_id ? '' : self::$db->expression(self::TABLE, ' AND c.', array('link_id2' => $target_id))),
                         	'join'=>" a
                         		JOIN $table b ON a.link_id2=b.link_id1 AND a.link_app2=b.link_app1
                        			JOIN $table c ON a.link_id1=c.link_id1 AND a.link_app1=c.link_app1 AND a.link_id!=c.link_id AND c.link_app2=b.link_app2 AND c.link_id2=b.link_id2",
@@ -417,7 +417,7 @@ 
 			array('table'=>self::TABLE,
 				'cols'=>'b.link_id, b.link_app2 as app1, b.link_id2 as id1, b.link_app1 as app2, b.link_id1 as id2, b.link_remark,b.link_lastmod,b.link_owner,b.deleted,c.link_app1 AS app3,c.link_id1 AS id3,c.link_id AS link3',
                        		'where'=>'a.link_app1='.self::$db->quote($app).' AND b.link_app1='.self::$db->quote($target_app).
-                        		(!$target_id ? '' : self::$db->expression(self::TABLE,' AND b.',array('link_id1' => $target_id))),
+                        		(!$target_id ? '' : self::$db->expression(self::TABLE, ' AND b.', array('link_id1' => $target_id))),
                         	'join'=>" a
                         		JOIN $table b ON a.link_id1=b.link_id2 AND a.link_app1=b.link_app2
                         		JOIN $table c ON a.link_id2=c.link_id1 AND a.link_app2=c.link_app1 AND a.link_id!=c.link_id AND c.link_app2=b.link_app1 AND c.link_id2=b.link_id1",
@@ -426,7 +426,7 @@ 
 			array('table'=>self::TABLE,
 				'cols'=>'a.*,c.link_app1 AS app3,c.link_id1 AS id3,c.link_id AS link3',
                      		'where'=>'a.link_app1='.self::$db->quote($app).' AND a.link_app2='.self::$db->quote($target_app).
-                        		(!$target_id ? '' : self::$db->expression(self::TABLE,' AND a.',array('link_id2' => $target_id))),
+                        		(!$target_id ? '' : self::$db->expression(self::TABLE, ' AND a.', array('link_id2' => $target_id))),
                        		'join'=>" a
                        			JOIN $table b ON a.link_id1=b.link_id2 AND a.link_app1=b.link_app2
                         		JOIN $table c ON a.link_id2=c.link_id2 AND a.link_app2=c.link_app2 AND a.link_id!=c.link_id AND c.link_app1=b.link_app1 AND c.link_id1=b.link_id1",
@@ -438,17 +438,17 @@ 
 		{
 			list($offset, $limit) = $limit;
 		}
-		elseif($limit)
+		elseif ($limit)
 		{
 			$offset = 0;
 		}
 
 		$links = array();
-		foreach(self::$db->union($arrayofselects, __LINE__, __FILE__, $order, $offset, $limit) as $row)
+		foreach (self::$db->union($arrayofselects, __LINE__, __FILE__, $order, $offset, $limit) as $row)
 		{
 			if ($just_app_ids)
 			{
-				if ($row['link_app1'] == $target_app && (is_null($target_id) || in_array($row['link_id1'],(array)$target_id)))
+				if ($row['link_app1'] == $target_app && (is_null($target_id) || in_array($row['link_id1'], (array)$target_id)))
 				{
 					$links[$row['link_id']] = $row['link_id2'];
 				}
@@ -459,7 +459,7 @@ 
 			}
 			else
 			{
-				$links[] = egw_db::strip_array_keys($row,'link_');
+				$links[] = egw_db::strip_array_keys($row, 'link_');
 			}
 		}
 		// if query returns exactly limit rows, we assume there are more and therefore set self::$limit_exceeded
@@ -473,7 +473,7 @@ 
 	 */
 	static function init_static( )
 	{
-		self::$db     = $GLOBALS['egw']->db;
+		self::$db = $GLOBALS['egw']->db;
 	}
 }
 solink::init_static();

Braces +4 added lines, -1 removed lines

@@ -302,7 +302,10 @@
 			}
 			if ($owner)
 			{
-				if ($app) $where = array($where);
+				if ($app)
+				{
+					$where = array($where);
+				}
 				$where['link_owner'] = $owner;
 			}
 		}

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -269,7 +269,7 @@
 		{
 			$where = array('link_id' => $link_id);
 		}
-		elseif ($app == '' AND $owner == '')
+		elseif ($app == '' and $owner == '')
 		{
 			return 0;
 		}

phpgwapi/inc/class.Template.inc.php

Doc Comments +32 added lines

@@ -64,6 +64,10 @@ 
 		/* public: setroot(pathname $root)
 		 * root:   new template directory.
 		 */
+
+		/**
+		 * @param string $root
+		 */
 		function set_root($root)
 		{
 			if ($this->debug && $this->check_debug('set_root'))
@@ -127,6 +131,11 @@ 
 		 * extract the template $handle from $parent,
 		 * place variable {$name} instead.
 		 */
+
+		/**
+		 * @param string $parent
+		 * @param string $handle
+		 */
 		function set_block($parent, $handle, $name = '')
 		{
 			if ($this->debug && $this->check_debug('set_block',$parent,$handle,$name))
@@ -253,6 +262,10 @@ 
 			return $str;
 		}
 
+		/**
+		 * @param string $target
+		 * @param string $handle
+		 */
 		function pparse($target, $handle, $append = false)
 		{
 			print $this->parse($target, $handle, $append);
@@ -260,12 +273,24 @@ 
 		}
 
 		/* This is short for finish parse */
+
+		/**
+		 * @param string $target
+		 * @param string $handle
+		 *
+		 * @return string
+		 */
 		function fp($target, $handle, $append = False)
 		{
 			return $this->finish($this->parse($target, $handle, $append));
 		}
 
 		/* This is a short cut for print finish parse */
+
+		/**
+		 * @param string $target
+		 * @param string $handle
+		 */
 		function pfp($target, $handle, $append = False)
 		{
 			echo $this->finish($this->parse($target, $handle, $append));
@@ -307,6 +332,10 @@ 
 		/* public: get_undefined($handle)
 		 * handle: handle of a template.
 		 */
+
+		/**
+		 * @param string $handle
+		 */
 		function get_undefined($handle)
 		{
 			if (!$this->loadfile($handle))
@@ -476,6 +505,9 @@ 
 			}
 		}
 
+		/**
+		 * @param string $str
+		 */
 		function check_debug($str)
 		{
 			if (!$this->debug) return False;

Spacing +32 added lines, -32 removed lines

@@ -23,7 +23,7 @@ 
 		 *	- function-name like set_var to get eg. all assignments or
 		 *	- handle- / variable-names - if you are only interested in some variables ;-)
 		 */
-		var $debug = False;	// array('cat_list','cat_list_t');
+		var $debug = False; // array('cat_list','cat_list_t');
 
 		/* $file[handle] = 'filename'; */
 		var $file = array();
@@ -101,9 +101,9 @@ 
 		 */
 		function set_file($handle, $filename = '')
 		{
-			if ($this->debug && $this->check_debug('set_file',$handle,$filename))
+			if ($this->debug && $this->check_debug('set_file', $handle, $filename))
 			{
-				echo "<p>Template::set_file('".print_r($handle,true)."','$filename')</p>\n";
+				echo "<p>Template::set_file('".print_r($handle, true)."','$filename')</p>\n";
 			}
 			if (!is_array($handle))
 			{
@@ -116,7 +116,7 @@ 
 			}
 			else
 			{
-				foreach($handle as $h => $f)
+				foreach ($handle as $h => $f)
 				{
 					$this->file[$h] = $this->filename($f);
 				}
@@ -129,7 +129,7 @@ 
 		 */
 		function set_block($parent, $handle, $name = '')
 		{
-			if ($this->debug && $this->check_debug('set_block',$parent,$handle,$name))
+			if ($this->debug && $this->check_debug('set_block', $parent, $handle, $name))
 			{
 				echo "<p>Template::set_block('$parent','$handle','$name')</p>\n";
 			}
@@ -145,14 +145,14 @@ 
 			$str = $this->get_var($parent);
 			$qhandle = preg_quote($handle);
 			$reg = "/<!--\\s+BEGIN $qhandle\\s+-->(.*)\n\\s*<!--\\s+END $qhandle\\s+-->/s";
-			if (!preg_match($reg,$str,$match))
+			if (!preg_match($reg, $str, $match))
 			{
 				// unfortunaly some apps set non-existing blocks, therefor I have to disable this diagnostics again for now
 				$this->halt("set_block: unable to find block '$handle' in '$parent'=<pre>".htmlspecialchars($str)."</pre> this->root=$this->root");
 				// return False;
 			}
-			$this->set_var($handle,$match[1]);
-			$this->set_var($parent,preg_replace($reg, '{' . "$name}",$str));
+			$this->set_var($handle, $match[1]);
+			$this->set_var($parent, preg_replace($reg, '{'."$name}", $str));
 		}
 
 		/* public: set_var(array $values)
@@ -174,18 +174,18 @@ 
 					$varname => $value
 				);
 			}
-			foreach($varname as $k => $v)
+			foreach ($varname as $k => $v)
 			{
 				if (!empty($k))
 				{
-					if ($this->debug && $this->check_debug('set_var',$k))
+					if ($this->debug && $this->check_debug('set_var', $k))
 					{
 						echo "<p>Template::set_var('$k','$v')</p>\n";
 					}
 					$this->varkeys[$k] = $this->varname($k);
 					$this->varvals[$k] = $this->egroupware_hack ? str_replace(
-						array('phpGroupWare','www.phpgroupware.org'),
-						array('eGroupWare','www.eGroupWare.org'),$v
+						array('phpGroupWare', 'www.phpgroupware.org'),
+						array('eGroupWare', 'www.eGroupWare.org'), $v
 					) : $v;
 				}
 			}
@@ -196,7 +196,7 @@ 
 		 */
 		function subst($handle)
 		{
-			if ($this->debug && $this->check_debug('subst',$handle))
+			if ($this->debug && $this->check_debug('subst', $handle))
 			{
 				echo "<p>Template::subst('$handle')</p>\n";
 			}
@@ -207,7 +207,7 @@ 
 			}
 
 			$str = $this->get_var($handle);
-			foreach($this->varkeys as $k => $v)
+			foreach ($this->varkeys as $k => $v)
 			{
 				$str = str_replace($v, $this->varvals[$k], $str);
 			}
@@ -235,7 +235,7 @@ 
 				$str = $this->subst($handle);
 				if ($append)
 				{
-					$this->set_var($target, $this->get_var($target) . $str);
+					$this->set_var($target, $this->get_var($target).$str);
 				}
 				else
 				{
@@ -244,7 +244,7 @@ 
 			}
 			else
 			{
-				foreach($handle as $i => $h)
+				foreach ($handle as $i => $h)
 				{
 					$str = $this->subst($h);
 					$this->set_var($target, $str);
@@ -275,7 +275,7 @@ 
 		 */
 		function get_vars()
 		{
-			foreach($this->varkeys as $k => $v)
+			foreach ($this->varkeys as $k => $v)
 			{
 				$result[$k] = $this->varvals[$k];
 			}
@@ -296,7 +296,7 @@ 
 			}
 			else
 			{
-				foreach($varname as $k => $v)
+				foreach ($varname as $k => $v)
 				{
 					$result[$k] = $this->varvals[$k];
 				}
@@ -321,7 +321,7 @@ 
 			{
 				return false;
 			}
-			foreach($m as $k => $v)
+			foreach ($m as $k => $v)
 			{
 				if (!isset($this->varkeys[$v]))
 				{
@@ -376,15 +376,15 @@ 
 		/* private: filename($filename)
 		 * filename: name to be completed.
 		 */
-		function filename($filename,$root='',$time=1)
+		function filename($filename, $root = '', $time = 1)
 		{
-			if($root == '')
+			if ($root == '')
 			{
 				$root = $this->root;
 			}
-			if(substr($filename, 0, 1) != '/')
+			if (substr($filename, 0, 1) != '/')
 			{
-				$new_filename = $root . '/' . $filename;
+				$new_filename = $root.'/'.$filename;
 			}
 			else
 			{
@@ -393,7 +393,7 @@ 
 
 			if (!file_exists($new_filename))
 			{
-				if($time==2)
+				if ($time == 2)
 				{
 					$this->halt("filename: file $new_filename does not exist.");
 				}
@@ -402,8 +402,8 @@ 
 //					$new_root = str_replace($GLOBALS['phpgw_info']['server']['template_set'],'default',$root);
 //					$new_root = substr($root, 0, strrpos($root, $GLOBALS['phpgw_info']['server']['template_set'])).'default';
 //					$new_root = substr($root, 0, strlen($root) - strlen($GLOBALS['phpgw_info']['server']['template_set'])) . 'default';
-					$new_root = dirname($root) . DIRECTORY_SEPARATOR . 'default';
-					$new_filename = $this->filename(str_replace($root.'/','',$new_filename),$new_root,2);
+					$new_root = dirname($root).DIRECTORY_SEPARATOR.'default';
+					$new_filename = $this->filename(str_replace($root.'/', '', $new_filename), $new_root, 2);
 				}
 			}
 			return $new_filename;
@@ -422,9 +422,9 @@ 
 		 */
 		function loadfile($handle)
 		{
-			if ($this->debug && $this->check_debug('loadfile',$handle))
+			if ($this->debug && $this->check_debug('loadfile', $handle))
 			{
-				echo "<p>Template::loadfile('$handle') file=<pre>\n".print_r($this->file,True)."</pre>\n";
+				echo "<p>Template::loadfile('$handle') file=<pre>\n".print_r($this->file, True)."</pre>\n";
 				echo "<p>backtrace: ".function_backtrace()."</p>\n";
 			}
 			if (isset($this->varkeys[$handle]) && !empty($this->varvals[$handle]))
@@ -433,9 +433,9 @@ 
 			}
 			if (!isset($this->file[$handle]))
 			{
-				if ($this->debug && $this->check_debug('loadfile',$handle))
+				if ($this->debug && $this->check_debug('loadfile', $handle))
 				{
-					echo "varkeys =<pre>".print_r($this->varkeys,True)."</pre>varvals =<pre>".print_r($this->varvals,True)."</pre>\n";
+					echo "varkeys =<pre>".print_r($this->varkeys, True)."</pre>varvals =<pre>".print_r($this->varvals, True)."</pre>\n";
 				}
 				$this->halt("loadfile: $handle is not a valid handle.");
 				return false;
@@ -480,10 +480,10 @@ 
 		{
 			if (!$this->debug) return False;
 
-			foreach(func_get_args() as $arg)
+			foreach (func_get_args() as $arg)
 			{
 				if (!is_array($this->debug) && $this->debug === $arg ||
-					(is_array($this->debug) && (@$this->debug[$arg] || in_array($arg,$this->debug,True))))
+					(is_array($this->debug) && (@$this->debug[$arg] || in_array($arg, $this->debug, True))))
 				{
 					return True;
 				}

Braces +4 added lines, -1 removed lines

@@ -478,7 +478,10 @@
 
 		function check_debug($str)
 		{
-			if (!$this->debug) return False;
+			if (!$this->debug)
+			{
+				return False;
+			}
 
 			foreach(func_get_args() as $arg)
 			{

phpgwapi/inc/class.tplsavant2.inc.php

Doc Comments +1 added lines, -1 removed lines

@@ -120,7 +120,7 @@
 	   * @param bool $fallback if true the default fallback template dir is returned
 	   * @param string $appname appication name optional can be derived from $GLOBALS['egw_info']['flags']['currentapp'];
 	   * @access public
-	   * @return void
+	   * @return string|false
 	   */
 	  function get_tpl_dir($fallback=false,$appname = '')
 	  {

Indentation +1 added lines, -1 removed lines

@@ -68,7 +68,7 @@
 	  @function version_check
 	  @abstract check version of this wrapper with installed savant2 version and halts when version differs
 	  @return void
-	  */
+	   */
 	  function version_check()
 	  {
 		 $Sav2Version = @file_get_contents(EGW_INCLUDE_ROOT.'/phpgwapi/inc/savant2/VERSION',"rb");

Spacing +24 added lines, -24 removed lines

@@ -24,7 +24,7 @@ 
 
    /* $Id$ */
 
-   if(is_file(EGW_INCLUDE_ROOT.'/phpgwapi/inc/savant2/Savant2.php'))
+   if (is_file(EGW_INCLUDE_ROOT.'/phpgwapi/inc/savant2/Savant2.php'))
    {
 	  include_once(EGW_INCLUDE_ROOT.'/phpgwapi/inc/savant2/Savant2.php');
    }
@@ -56,7 +56,7 @@ 
 		 // run constructor of the Savant2 class
 		 $this->Savant2();
 
-		 if($this->do_version_check)
+		 if ($this->do_version_check)
 		 {
 			$this->version_check();
 		 }
@@ -71,11 +71,11 @@ 
 	  */
 	  function version_check()
 	  {
-		 $Sav2Version = @file_get_contents(EGW_INCLUDE_ROOT.'/phpgwapi/inc/savant2/VERSION',"rb");
+		 $Sav2Version = @file_get_contents(EGW_INCLUDE_ROOT.'/phpgwapi/inc/savant2/VERSION', "rb");
 
-		 if(trim($Sav2Version) != trim($this->version))
+		 if (trim($Sav2Version) != trim($this->version))
 		 { 
-			$this->halt(lang('Savant2 version differs from Savant2 wrapper. <br/>This version: %1 <br/>Savants version: %2',$this->version, $Sav2Version));					
+			$this->halt(lang('Savant2 version differs from Savant2 wrapper. <br/>This version: %1 <br/>Savants version: %2', $this->version, $Sav2Version));					
 		 }
 	  }
 
@@ -86,30 +86,30 @@ 
 	   * @access public
 	   * @return void
 	   */
-	  function set_tpl_path($man_dir=null)
+	  function set_tpl_path($man_dir = null)
 	  {
-		 $preferred_dir=$this->get_tpl_dir(); 
-		 $fallback_dir=$this->get_tpl_dir(true); 
+		 $preferred_dir = $this->get_tpl_dir(); 
+		 $fallback_dir = $this->get_tpl_dir(true); 
 
-		 if(!$preferred_dir && $man_dir && $fallback_dir)
+		 if (!$preferred_dir && $man_dir && $fallback_dir)
 		 {
 			$this->halt(lang('No Savant2 template directories were found in:'.EGW_APP_ROOT)); 
 		 }
 		 else
 		 {
-			if($fallback_dir)
+			if ($fallback_dir)
 			{
-			   $this->addPath('template',$fallback_dir);
+			   $this->addPath('template', $fallback_dir);
 			}
 			// add preferred tpl dir last because savant set the last added first in the search array  
-			if($preferred_dir)
+			if ($preferred_dir)
 			{
-			   $this->addPath('template',$preferred_dir);
+			   $this->addPath('template', $preferred_dir);
 			}
 
-			if($man_dir)
+			if ($man_dir)
 			{
-			   $this->addPath('template',$man_dir);
+			   $this->addPath('template', $man_dir);
 			}
 		 }
 	  }
@@ -122,9 +122,9 @@ 
 	   * @access public
 	   * @return void
 	   */
-	  function get_tpl_dir($fallback=false,$appname = '')
+	  function get_tpl_dir($fallback = false, $appname = '')
 	  {
-		 if (! $appname)
+		 if (!$appname)
 		 {
 			$appname = $GLOBALS['egw_info']['flags']['currentapp'];
 		 }
@@ -156,8 +156,8 @@ 
 			$GLOBALS['egw_info']['server']['template_set'] = 'default';
 		 }
 
-		 $tpldir         = EGW_SERVER_ROOT . '/' . $appname . '/templatesSavant2/' . $GLOBALS['egw_info']['server']['template_set'];
-		 $tpldir_default = EGW_SERVER_ROOT . '/' . $appname . '/templatesSavant2/default';
+		 $tpldir         = EGW_SERVER_ROOT.'/'.$appname.'/templatesSavant2/'.$GLOBALS['egw_info']['server']['template_set'];
+		 $tpldir_default = EGW_SERVER_ROOT.'/'.$appname.'/templatesSavant2/default';
 
 		 if (!$fallback && @is_dir($tpldir))
 		 {
@@ -205,12 +205,12 @@ 
 
 	  function fetch_string($string)
 	  {
-		 $tmpfname = tempnam ("/tmp", "sav");
+		 $tmpfname = tempnam("/tmp", "sav");
 		 $fp = fopen($tmpfname, "w");
 		 fwrite($fp, $string);
 		 fclose($fp);
-		 $this->addPath('template','/tmp');
-		 $file_arr= explode('/',$tmpfname);
+		 $this->addPath('template', '/tmp');
+		 $file_arr = explode('/', $tmpfname);
 		 return $this->fetch($file_arr[2]);
 		 unlink($tmpfname);
 	  }
@@ -223,9 +223,9 @@ 
 	   * @access public
 	   * @return void
 	   */
-	  function set_var($tplvar,$val='')
+	  function set_var($tplvar, $val = '')
 	  {
-		 $this->assign($tplvar,$val);
+		 $this->assign($tplvar, $val);
 	  }
 
    }

Braces +1 added lines, -1 removed lines

@@ -74,7 +74,7 @@
 		 $Sav2Version = @file_get_contents(EGW_INCLUDE_ROOT.'/phpgwapi/inc/savant2/VERSION',"rb");
 
 		 if(trim($Sav2Version) != trim($this->version))
-		 { 
+		 {
 			$this->halt(lang('Savant2 version differs from Savant2 wrapper. <br/>This version: %1 <br/>Savants version: %2',$this->version, $Sav2Version));					
 		 }
 	  }

phpgwapi/inc/class.translation.inc.php

Doc Comments +2 added lines, -2 removed lines

@@ -740,7 +740,7 @@ 
 	 *
 	 * @param string $app application name
 	 * @param string $lang language code
-	 * @return the full path of the filename for the requested app and language
+	 * @return string full path of the filename for the requested app and language
 	 */
 	static function get_lang_file($app,$lang)
 	{
@@ -1305,7 +1305,7 @@ 
 	 * @param string $displayCharset : charset to use; should be a valid charset
 	 * @param bool $stripcrl :  flag to indicate for the removal of all crlf \r\n
 	 * @param bool $stripalltags : flag to indicate wether or not to strip $_html from all remaining tags
-	 * @return text $_html : the modified text.
+	 * @return string $_html : the modified text.
 	 */
 	static function convertHTMLToText($_html,$displayCharset=false,$stripcrl=false,$stripalltags=true)
 	{

Indentation +13 added lines, -13 removed lines

@@ -738,12 +738,12 @@ 
 	}
 
  	/**
-	 * provides centralization and compatibility to locate the lang files
-	 *
-	 * @param string $app application name
-	 * @param string $lang language code
-	 * @return the full path of the filename for the requested app and language
-	 */
+ 	 * provides centralization and compatibility to locate the lang files
+ 	 *
+ 	 * @param string $app application name
+ 	 * @param string $lang language code
+ 	 * @return the full path of the filename for the requested app and language
+ 	 */
 	static function get_lang_file($app,$lang)
 	{
 		if ($app == 'common') $app = 'phpgwapi';
@@ -1074,13 +1074,13 @@ 
 	}
 
  	/**
-	 * detect_encoding - try to detect the encoding
-	 *    only to be used if the string in question has no structure that determines his encoding
-	 *
-	 * @param string - to be evaluated
-	 * @param string $verify =null encoding to verify, get checked first and have a match for only ascii or no detection available
-	 * @return string - encoding
-	 */
+ 	 * detect_encoding - try to detect the encoding
+ 	 *    only to be used if the string in question has no structure that determines his encoding
+ 	 *
+ 	 * @param string - to be evaluated
+ 	 * @param string $verify =null encoding to verify, get checked first and have a match for only ascii or no detection available
+ 	 * @return string - encoding
+ 	 */
 	static function detect_encoding($string, $verify=null)
 	{
 		if (function_exists('iconv'))

Spacing +214 added lines, -214 removed lines

@@ -97,7 +97,7 @@ 
 	 *
 	 * @var array
 	 */
-	static $instance_specific_translations = array('loginscreen','mainscreen','custom');
+	static $instance_specific_translations = array('loginscreen', 'mainscreen', 'custom');
 
 	/**
 	 * returns the charset to use (!$lang) or the charset of the lang-files or $lang
@@ -105,7 +105,7 @@ 
 	 * @param string/boolean $lang =False return charset of the active user-lang, or $lang if specified
 	 * @return string charset
 	 */
-	static function charset($lang=False)
+	static function charset($lang = False)
 	{
 		static $charsets = array();
 
@@ -113,11 +113,11 @@ 
 		{
 			if (!isset($charsets[$lang]))
 			{
-				if (!($charsets[$lang] = self::$db->select(self::LANG_TABLE,'content',array(
+				if (!($charsets[$lang] = self::$db->select(self::LANG_TABLE, 'content', array(
 					'lang'		=> $lang,
 					'message_id'=> 'charset',
 					'app_name'	=> 'common',
-				),__LINE__,__FILE__)->fetchColumn()))
+				), __LINE__, __FILE__)->fetchColumn()))
 				{
 					$charsets[$lang] = 'utf-8';
 				}
@@ -151,7 +151,7 @@ 
 	 *
 	 * @param boolean $load_translations =true should we also load translations for common and currentapp
 	 */
-	static function init($load_translations=true)
+	static function init($load_translations = true)
 	{
 		if (!isset(self::$db))
 		{
@@ -163,11 +163,11 @@ 
 		}
 		else
 		{
-			self::$system_charset =& $GLOBALS['egw_setup']->system_charset;
+			self::$system_charset = & $GLOBALS['egw_setup']->system_charset;
 		}
 		if ((self::$mbstring = check_load_extension('mbstring')))
 		{
-			if(!empty(self::$system_charset))
+			if (!empty(self::$system_charset))
 			{
 				$ini_default_charset = version_compare(PHP_VERSION, '5.6', '<') ? 'mbstring.internal_encoding' : 'default_charset';
 				ini_set($ini_default_charset, self::$system_charset);
@@ -176,7 +176,7 @@ 
 
 		// try loading load_via from tree-wide cache and check if it contains more rules
 		if (($load_via = egw_cache::getTree(__CLASS__, 'load_via')) &&
-			$load_via >= self::$load_via && 	// > for array --> contains more elements
+			$load_via >= self::$load_via && // > for array --> contains more elements
 			// little sanity check: cached array contains all stock keys, otherwise ignore it
 			!array_diff_key(self::$load_via, $load_via))
 		{
@@ -215,13 +215,13 @@ 
 	 * @param string $not_found ='*' what to add to not found phrases, default '*'
 	 * @return string with translation
 	 */
-	static function translate($key, $vars=null, $not_found='' )
+	static function translate($key, $vars = null, $not_found = '')
 	{
 		if (!self::$lang_arr)
 		{
 			self::init();
 		}
-		$ret = $key;				// save key if we dont find a translation
+		$ret = $key; // save key if we dont find a translation
 		if ($not_found) $ret .= $not_found;
 
 		if (isset(self::$lang_arr[$key]))
@@ -241,16 +241,16 @@ 
 		{
 			if (count($vars) > 1)
 			{
-				static $placeholders = array('%3','%2','%1','|%2|','|%3|','%4','%5','%6','%7','%8','%9','%10');
+				static $placeholders = array('%3', '%2', '%1', '|%2|', '|%3|', '%4', '%5', '%6', '%7', '%8', '%9', '%10');
 				// to cope with $vars[0] containing '%2' (eg. an urlencoded path like a referer),
 				// we first replace '%2' in $ret with '|%2|' and then use that as 2. placeholder
 				// we do that for %3 as well, ...
-				$vars = array_merge(array('|%3|','|%2|'),$vars);	// push '|%2|' (and such) as first replacement on $vars
-				$ret = str_replace($placeholders,$vars,$ret);
+				$vars = array_merge(array('|%3|', '|%2|'), $vars); // push '|%2|' (and such) as first replacement on $vars
+				$ret = str_replace($placeholders, $vars, $ret);
 			}
 			else
 			{
-				$ret = str_replace('%1',$vars[0],$ret);
+				$ret = str_replace('%1', $vars[0], $ret);
 			}
 		}
 		return $ret;
@@ -265,14 +265,14 @@ 
 	 * 	if multiple names given, they are requested in one request from cache and loaded in given order
 	 * @param string $lang =false 2 or 5 char lang-code or false for the users language
 	 */
-	static function add_app($apps, $lang=null)
+	static function add_app($apps, $lang = null)
 	{
 		//error_log(__METHOD__."(".array2string($apps).", $lang) count(self::\$lang_arr)=".count(self::$lang_arr));
 		//$start = microtime(true);
 		if (!$lang) $lang = self::$userlang;
 		$tree_level = $instance_level = array();
 		if (!is_array($apps)) $apps = (array)$apps;
-		foreach($apps as $key => $app)
+		foreach ($apps as $key => $app)
 		{
 			if (!isset(self::$loaded_apps[$app]) || self::$loaded_apps[$app] != $lang && $app != 'common')
 			{
@@ -296,26 +296,26 @@ 
 
 		// merging loaded translations together
 		$updated_load_via = false;
-		foreach((array)$apps as $app)
+		foreach ((array)$apps as $app)
 		{
 			$l = $app == 'custom' ? 'en' : $lang;
 			if (isset($tree_level[$app.':'.$l]))
 			{
-				$loaded =& $tree_level[$app.':'.$l];
+				$loaded = & $tree_level[$app.':'.$l];
 			}
 			elseif (isset($instance_level[$app.':'.$l]))
 			{
-				$loaded =& $instance_level[$app.':'.$l];
+				$loaded = & $instance_level[$app.':'.$l];
 			}
 			else
 			{
 				if (($instance_specific = in_array($app, self::$instance_specific_translations)))
 				{
-					$loaded =& self::load_app($app, $l);
+					$loaded = & self::load_app($app, $l);
 				}
 				else
 				{
-					$loaded =& self::load_app_files($app, $l, null, $updated_load_via);
+					$loaded = & self::load_app_files($app, $l, null, $updated_load_via);
 				}
 				//error_log(__METHOD__."('$app', '$lang') instance_specific=$instance_specific, load_app(_files)() returned ".(is_array($loaded)?'Array('.count($loaded).')':array2string($loaded)));
 				if ($loaded || $instance_specific)
@@ -328,14 +328,14 @@ 
 			if ($loaded)
 			{
 				self::$lang_arr = array_merge(self::$lang_arr, $loaded);
-				self::$loaded_apps[$app] = $l;	// dont set something not existing to $loaded_apps, no need to load client-side
+				self::$loaded_apps[$app] = $l; // dont set something not existing to $loaded_apps, no need to load client-side
 			}
 		}
 		// Re-merge custom over instance level, they have higher precidence
-		if($tree_level && !$instance_level && self::$instance_specific_translations)
+		if ($tree_level && !$instance_level && self::$instance_specific_translations)
 		{
 			$custom = egw_cache::getInstance(__CLASS__, 'custom:en');
-			if($custom)
+			if ($custom)
 			{
 				self::$lang_arr = array_merge(self::$lang_arr, $custom);
 			}
@@ -356,15 +356,15 @@ 
 	 * @param string $lang =false 2 or 5 char lang-code or false for the users language
 	 * @return array the loaded strings
 	 */
-	static function &load_app($app,$lang)
+	static function &load_app($app, $lang)
 	{
 		//$start = microtime(true);
 		if (is_null(self::$db)) self::init(false);
 		$loaded = array();
-		foreach(self::$db->select(self::LANG_TABLE,'message_id,content',array(
+		foreach (self::$db->select(self::LANG_TABLE, 'message_id,content', array(
 			'lang'		=> $lang,
 			'app_name'	=> $app,
-		),__LINE__,__FILE__) as $row)
+		), __LINE__, __FILE__) as $row)
 		{
 			$loaded[strtolower($row['message_id'])] = $row['content'];
 		}
@@ -388,7 +388,7 @@ 
 		'sitemgr-link' => array('sitemgr'),
 		'groupdav' => array('phpgwapi'),
 		'developer_tools' => array('etemplate'),
-		'login' => array('phpgwapi','registration'),
+		'login' => array('phpgwapi', 'registration'),
 	);
 
 	/**
@@ -400,7 +400,7 @@ 
 	{
 		$lang = $GLOBALS['egw_info']['user']['preferences']['common']['lang'];
 		$apps = array_keys($GLOBALS['egw_info']['apps']);
-		foreach($apps as $app)
+		foreach ($apps as $app)
 		{
 			$file = self::get_lang_file($app, $lang);
 			// check if file has changed compared to what's cached
@@ -430,7 +430,7 @@ 
 		egw_cache::unsetTree(__CLASS__, $app.':'.$lang);
 		egw_cache::unsetTree(__CLASS__, self::get_lang_file($app, $lang));
 
-		foreach(self::$load_via as $load => $via)
+		foreach (self::$load_via as $load => $via)
 		{
 			//error_log("load_via[load='$load'] = via = ".array2string($via));
 			if ($via === 'all-apps' || in_array($app, (array)$via))
@@ -452,7 +452,7 @@ 
 	 * @param string $_lang =null
 	 * @return array $lang or $app => number pairs
 	 */
-	static function statistics($_lang=null)
+	static function statistics($_lang = null)
 	{
 		$cache = egw_cache::getTree(__CLASS__, 'statistics');
 
@@ -463,7 +463,7 @@ 
 			{
 				$en_phrases = array_keys(self::load_app_files(null, 'en', 'all-apps'));
 				$cache['']['en'] = count($en_phrases);
-				foreach(array_keys(self::get_available_langs()) as $lang)
+				foreach (array_keys(self::get_available_langs()) as $lang)
 				{
 					if ($lang == 'en') continue;
 					$lang_phrases = array_keys(self::load_app_files(null, $lang, 'all-apps'));
@@ -474,7 +474,7 @@ 
 			else
 			{
 				$cache['en'] = array();
-				foreach(scandir(EGW_SERVER_ROOT) as $app)
+				foreach (scandir(EGW_SERVER_ROOT) as $app)
 				{
 					if ($app[0] == '.' || !is_dir(EGW_SERVER_ROOT.'/'.$app) ||
 						!file_exists(self::get_lang_file($app, 'en')))
@@ -512,7 +512,7 @@ 
 		if (!in_array($_app, translation::$instance_specific_translations))
 		{
 			// check if cache is NOT invalided by checking if we have a modification time for concerned lang-file
-			$time = egw_cache::getTree(__CLASS__, $file=self::get_lang_file($_app, $_lang));
+			$time = egw_cache::getTree(__CLASS__, $file = self::get_lang_file($_app, $_lang));
 			// if we dont have one, cache has been invalidated and we need to load translations
 			if (!isset($time)) self::add_app($_app, $_lang);
 
@@ -532,7 +532,7 @@ 
 	 * @param type $time
 	 * @return type
 	 */
-	static function max_lang_time($time=null)
+	static function max_lang_time($time = null)
 	{
 		static $max_lang_time = null;
 
@@ -543,7 +543,7 @@ 
 		if (isset($time) && $time > $max_lang_time)
 		{
 			//error_log(__METHOD__."($time) updating previous max_lang_time=$max_lang_time to $time");
-			egw_cache::setTree(__CLASS__, 'max_lang_time', $max_lang_time=$time);
+			egw_cache::setTree(__CLASS__, 'max_lang_time', $max_lang_time = $time);
 		}
 		return $max_lang_time;
 	}
@@ -559,34 +559,34 @@ 
 	 * @param boolean $updated_load_via =false on return true if self::$load_via was updated
 	 * @return array the loaded strings
 	 */
-	static function &load_app_files($app, $lang, $just_app_file=null, &$updated_load_via=false)
+	static function &load_app_files($app, $lang, $just_app_file = null, &$updated_load_via = false)
 	{
 		//$start = microtime(true);
 		$load_app = isset($just_app_file) ? $just_app_file : (isset(self::$load_via[$app]) ? self::$load_via[$app] : $app);
 		$loaded = array();
-		foreach($load_app == 'all-apps' ? scandir(EGW_SERVER_ROOT) : (array)$load_app as $app_dir)
+		foreach ($load_app == 'all-apps' ? scandir(EGW_SERVER_ROOT) : (array)$load_app as $app_dir)
 		{
-			if ($load_app == 'all-apps' && $app_dir=='..') continue; // do not try to break out of egw server root
+			if ($load_app == 'all-apps' && $app_dir == '..') continue; // do not try to break out of egw server root
 			if ($app_dir[0] == '.' || !is_dir(EGW_SERVER_ROOT.'/'.$app_dir) ||
-				!@file_exists($file=self::get_lang_file($app_dir, $lang)) ||
+				!@file_exists($file = self::get_lang_file($app_dir, $lang)) ||
 				!($f = fopen($file, 'r')))
 			{
 				continue;
 			}
 			// store ctime of file we parse
-			egw_cache::setTree(__CLASS__, $file, $time=filemtime($file));
+			egw_cache::setTree(__CLASS__, $file, $time = filemtime($file));
 			self::max_lang_time($time);
 
 			$line_nr = 0;
 			//use fgets and split the line, as php5.3.3 with squeeze does not support splitting lines with fgetcsv while reading properly
 			//if the first letter after the delimiter is a german umlaut (UTF8 representation thereoff)
 			//while(($line = fgetcsv($f, 1024, "\t")))
-			while(($read = fgets($f)))
+			while (($read = fgets($f)))
 			{
 				$line = explode("\t", trim($read));
 				++$line_nr;
 				if (count($line) != 4) continue;
-				list($l_id,$l_app,$l_lang,$l_translation) = $line;
+				list($l_id, $l_app, $l_lang, $l_translation) = $line;
 				if ($l_lang != $lang) continue;
 				if (!isset($just_app_file) && $l_app != $app)
 				{
@@ -627,7 +627,7 @@ 
 			// little sanity check: cached array contains all stock keys, otherwise ignore it
 			!array_diff_key(self::$load_via, $load_via))
 		{
-			foreach($load_via as $app => $via)
+			foreach ($load_via as $app => $via)
 			{
 				if (self::$load_via[$app] != $via)
 				{
@@ -653,15 +653,15 @@ 
 	 * @param boolean $force_read =false force a re-read of the languages
 	 * @return array with lang-code => descriptiv lang-name pairs
 	 */
-	static function get_available_langs($translate=true, $force_read=false)
+	static function get_available_langs($translate = true, $force_read = false)
 	{
 		if (!is_array(self::$langs) || $force_read)
 		{
-			if (!($f = fopen($file=EGW_SERVER_ROOT.'/setup/lang/languages','rb')))
+			if (!($f = fopen($file = EGW_SERVER_ROOT.'/setup/lang/languages', 'rb')))
 			{
 				throw new egw_exception("List of available languages (%1) missing!", $file);
 			}
-			while(($line = fgetcsv($f, null, "\t")))
+			while (($line = fgetcsv($f, null, "\t")))
 			{
 				self::$langs[$line[0]] = $line[1];
 			}
@@ -671,12 +671,12 @@ 
 			{
 				if (is_null(self::$db)) self::init(false);
 
-				foreach(self::$langs as $lang => $name)
+				foreach (self::$langs as $lang => $name)
 				{
-					self::$langs[$lang] = self::translate($name,False,'');
+					self::$langs[$lang] = self::translate($name, False, '');
 				}
 			}
-			uasort(self::$langs,'strcasecmp');
+			uasort(self::$langs, 'strcasecmp');
 		}
 		return self::$langs;
 	}
@@ -689,7 +689,7 @@ 
 	 * @param boolean $force_read =false force a re-read of the languages
 	 * @return array with lang-code => descriptiv lang-name pairs
 	 */
-	static function get_installed_langs($force_read=false)
+	static function get_installed_langs($force_read = false)
 	{
 		return self::get_available_langs($force_read);
 	}
@@ -706,7 +706,7 @@ 
 		{
 			return self::$langs[$lang];
 		}
-		return self::$db->select(self::LANGUAGES_TABLE,'lang_name',array('lang_id' => $lang),__LINE__,__FILE__)->fetchColumn();
+		return self::$db->select(self::LANGUAGES_TABLE, 'lang_name', array('lang_id' => $lang), __LINE__, __FILE__)->fetchColumn();
 	}
 
 	/**
@@ -715,20 +715,20 @@ 
 	 * @param boolean $force_read =false
 	 * @return array with lang_id => lang_name pairs
 	 */
-	static function list_langs($force_read=false)
+	static function list_langs($force_read = false)
 	{
 		if (!$force_read)
 		{
-			return egw_cache::getInstance(__CLASS__,'list_langs',array(__CLASS__,'list_langs'),array(true));
+			return egw_cache::getInstance(__CLASS__, 'list_langs', array(__CLASS__, 'list_langs'), array(true));
 		}
-		$languages = self::get_installed_langs();	// available languages
-		$availible = "('".implode("','",array_keys($languages))."')";
+		$languages = self::get_installed_langs(); // available languages
+		$availible = "('".implode("','", array_keys($languages))."')";
 
 		// this shows first the installed, then the available and then the rest
-		foreach(self::$db->select(self::LANGUAGES_TABLE,array(
-			'lang_id','lang_name',
+		foreach (self::$db->select(self::LANGUAGES_TABLE, array(
+			'lang_id', 'lang_name',
 			"CASE WHEN lang_id IN $availible THEN 1 ELSE 0 END AS availible",
-		),"lang_id NOT IN ('".implode("','",array_keys($languages))."')",__LINE__,__FILE__,false,' ORDER BY availible DESC,lang_name') as $row)
+		), "lang_id NOT IN ('".implode("','", array_keys($languages))."')", __LINE__, __FILE__, false, ' ORDER BY availible DESC,lang_name') as $row)
 		{
 			$languages[$row['lang_id']] = $row['lang_name'];
 		}
@@ -742,7 +742,7 @@ 
 	 * @param string $lang language code
 	 * @return the full path of the filename for the requested app and language
 	 */
-	static function get_lang_file($app,$lang)
+	static function get_lang_file($app, $lang)
 	{
 		if ($app == 'common') $app = 'phpgwapi';
 		return EGW_SERVER_ROOT.'/'.$app.'/'.self::LANG_DIR.'/'.self::LANGFILE_PREFIX.$lang.self::LANGFILE_EXTENSION;
@@ -755,7 +755,7 @@ 
 	 */
 	static function get_installed_charsets()
 	{
-		static $charsets=null;
+		static $charsets = null;
 
 		if (!isset($charsets))
 		{
@@ -785,13 +785,13 @@ 
 		static $extra = array(
 			'&szlig;' => 'ss',
 		);
-		$entities = htmlentities($_str,ENT_QUOTES,self::charset());
+		$entities = htmlentities($_str, ENT_QUOTES, self::charset());
 
-		$estr = str_replace(array_keys($extra),array_values($extra), $entities);
-		$ustr = preg_replace('/&([aAuUoO])uml;/','\\1e', $estr);	// replace german umlauts with the letter plus one 'e'
-		$astr = preg_replace('/&([a-zA-Z])(grave|acute|circ|ring|cedil|tilde|slash|uml);/','\\1', $ustr);	// remove all types of accents
+		$estr = str_replace(array_keys($extra), array_values($extra), $entities);
+		$ustr = preg_replace('/&([aAuUoO])uml;/', '\\1e', $estr); // replace german umlauts with the letter plus one 'e'
+		$astr = preg_replace('/&([a-zA-Z])(grave|acute|circ|ring|cedil|tilde|slash|uml);/', '\\1', $ustr); // remove all types of accents
 
-		return preg_replace('/&([a-zA-Z]+|#[0-9]+|);/','', $astr);	// remove all other entities
+		return preg_replace('/&([a-zA-Z]+|#[0-9]+|);/', '', $astr); // remove all other entities
 	}
 
 	/**
@@ -803,7 +803,7 @@ 
 	 * @param boolean $check_to_from =true internal to bypass all charset replacements
 	 * @return string/array converted string(s) from $data
 	 */
-	static function convert($data,$from=False,$to=False,$check_to_from=true)
+	static function convert($data, $from = False, $to = False, $check_to_from = true)
 	{
 		if ($check_to_from)
 		{
@@ -814,7 +814,7 @@ 
 			if (!$from)
 			{
 				$from = self::$mbstring ? strtolower(mb_detect_encoding($data)) : 'iso-8859-1';
-				if($from == 'ascii')
+				if ($from == 'ascii')
 				{
 					$from = 'iso-8859-1';
 				}
@@ -824,7 +824,7 @@ 
 				 php does not seem to support gb2312
 				 but seems to be able to decode it as EUC-CN
 			*/
-			switch($from)
+			switch ($from)
 			{
 				case 'ks_c_5601-1987':
 					$from = 'CP949';
@@ -870,9 +870,9 @@ 
 		}
 		if (is_array($data))
 		{
-			foreach($data as $key => $str)
+			foreach ($data as $key => $str)
 			{
-				$ret[$key] = self::convert($str,$from,$to,false);	// false = bypass the above checks, as they are already done
+				$ret[$key] = self::convert($str, $from, $to, false); // false = bypass the above checks, as they are already done
 			}
 			return $ret;
 		}
@@ -884,7 +884,7 @@ 
 		{
 			return utf8_decode($data);
 		}
-		if (self::$mbstring && !$prefer_iconv && ($data = @mb_convert_encoding($data,$to,$from)) != '')
+		if (self::$mbstring && !$prefer_iconv && ($data = @mb_convert_encoding($data, $to, $from)) != '')
 		{
 			return $data;
 		}
@@ -912,12 +912,12 @@ 
 			// in an email on the first Traditional/Japanese/Korean character,
 			// but in reality when people send mails in GB2312, UMA mostly use
 			// extended GB13000/GB18030 which allow T/Jap/Korean characters.
-			if($from == 'euc-cn')
+			if ($from == 'euc-cn')
 			{
 				$from = 'gb18030';
 			}
 
-			if (($convertedData = iconv($from,$to,$data)))
+			if (($convertedData = iconv($from, $to, $data)))
 			{
 				return $convertedData;
 			}
@@ -932,21 +932,21 @@ 
 	 * @param string/boolean $from charset $data is in or False if it should be detected
 	 * @return string/array converted string(s) from $data
 	 */
-	static function convert_jsonsafe($data,$from=False)
+	static function convert_jsonsafe($data, $from = False)
 	{
-		if ($from===false) $from = self::detect_encoding($data);
-		$data = self::convert($data,strtolower($from));
+		if ($from === false) $from = self::detect_encoding($data);
+		$data = self::convert($data, strtolower($from));
 		// in a way, this tests if we are having real utf-8 (the displayCharset) by now; we should if charsets reported (or detected) are correct
 		if (strtoupper(self::charset()) == 'UTF-8')
 		{
 			$test = @json_encode($data);
 			//error_log(__METHOD__.__LINE__.' ->'.strlen($data).' Error:'.json_last_error().'<- data:#'.$test.'#');
-			if (($test=="null" || $test === false || is_null($test)) && strlen($data)>0)
+			if (($test == "null" || $test === false || is_null($test)) && strlen($data) > 0)
 			{
 				// try to fix broken utf8
-				$x = (function_exists('mb_convert_encoding')?mb_convert_encoding($data,'UTF-8','UTF-8'):(function_exists('iconv')?@iconv("UTF-8","UTF-8//IGNORE",$data):$data));
+				$x = (function_exists('mb_convert_encoding') ? mb_convert_encoding($data, 'UTF-8', 'UTF-8') : (function_exists('iconv') ? @iconv("UTF-8", "UTF-8//IGNORE", $data) : $data));
 				$test = @json_encode($x);
-				if (($test=="null" || $test === false || is_null($test)) && strlen($data)>0)
+				if (($test == "null" || $test === false || is_null($test)) && strlen($data) > 0)
 				{
 					// this should not be needed, unless something fails with charset detection/ wrong charset passed
 					error_log(__METHOD__.__LINE__.' Charset Reported:'.$from.' Charset Detected:'.translation::detect_encoding($data));
@@ -969,36 +969,36 @@ 
 	 * @param string $message_id
 	 * @param string $content translation or null to delete translation
 	 */
-	static function write($lang,$app,$message_id,$content)
+	static function write($lang, $app, $message_id, $content)
 	{
 		if ($content)
 		{
-			self::$db->insert(self::LANG_TABLE,array(
+			self::$db->insert(self::LANG_TABLE, array(
 				'content' => $content,
-			),array(
+			), array(
 				'lang' => $lang,
 				'app_name' => $app,
 				'message_id' => $message_id,
-			),__LINE__,__FILE__);
+			), __LINE__, __FILE__);
 		}
 		else
 		{
-			self::$db->delete(self::LANG_TABLE,array(
+			self::$db->delete(self::LANG_TABLE, array(
 				'lang' => $lang,
 				'app_name' => $app,
 				'message_id' => $message_id,
-			),__LINE__,__FILE__);
+			), __LINE__, __FILE__);
 		}
 		// invalidate the cache
-		if(!in_array($app,self::$instance_specific_translations))
+		if (!in_array($app, self::$instance_specific_translations))
 		{
-			egw_cache::unsetCache(egw_cache::TREE,__CLASS__,$app.':'.$lang);
+			egw_cache::unsetCache(egw_cache::TREE, __CLASS__, $app.':'.$lang);
 		}
 		else
 		{
-			foreach(array_keys((array)self::get_installed_langs()) as $key)
+			foreach (array_keys((array)self::get_installed_langs()) as $key)
 			{
-				egw_cache::unsetCache(egw_cache::INSTANCE,__CLASS__,$app.':'.$key);
+				egw_cache::unsetCache(egw_cache::INSTANCE, __CLASS__, $app.':'.$key);
 			}
 		}
  	}
@@ -1011,13 +1011,13 @@ 
 	 * @param string $message_id
 	 * @return string/boolean content or false if not found
 	 */
-	static function read($lang,$app_name,$message_id)
+	static function read($lang, $app_name, $message_id)
 	{
-		return self::$db->select(self::LANG_TABLE,'content',array(
+		return self::$db->select(self::LANG_TABLE, 'content', array(
 			'lang' => $lang,
 			'app_name' => $app_name,
 			'message_id' => $message_id,
-		),__LINE__,__FILE__)->fetchColumn();
+		), __LINE__, __FILE__)->fetchColumn();
 	}
 
 	/**
@@ -1028,23 +1028,23 @@ 
 	 * @param string $lang ='' default check all langs
 	 * @return string
 	 */
-	static function get_message_id($translation,$app=null,$lang=null)
+	static function get_message_id($translation, $app = null, $lang = null)
 	{
 		$where = array('content '.self::$db->capabilities[egw_db::CAPABILITY_CASE_INSENSITIV_LIKE].' '.self::$db->quote($translation));
 		if ($app) $where['app_name'] = $app;
 		if ($lang) $where['lang'] = $lang;
 
-		$id = self::$db->select(self::LANG_TABLE,'message_id',$where,__LINE__,__FILE__)->fetchColumn();
+		$id = self::$db->select(self::LANG_TABLE, 'message_id', $where, __LINE__, __FILE__)->fetchColumn();
 
 		// Check cache, since most things aren't in the DB anymore
-		if(!$id)
+		if (!$id)
 		{
-			$lang_arr = self::$lang_arr;	// PHP 5.3 does NOT allow to use class scope / self in closure
+			$lang_arr = self::$lang_arr; // PHP 5.3 does NOT allow to use class scope / self in closure
 			$ids = array_filter(array_keys(self::$lang_arr), function($haystack) use($translation, $lang_arr) {
-				return stripos($lang_arr[$haystack],$translation) !== false;
+				return stripos($lang_arr[$haystack], $translation) !== false;
 			});
 			$id = array_shift($ids);
-			if(!$id && ($lang && $lang !== 'en' || self::$userlang != 'en'))
+			if (!$id && ($lang && $lang !== 'en' || self::$userlang != 'en'))
 			{
 				// Try english
 				if (in_array($app, self::$instance_specific_translations))
@@ -1061,7 +1061,7 @@ 
 				if ($instance_level) $lang_arr = egw_cache::getInstance(__CLASS__, $instance_level);
 				$lang_arr = $lang_arr[$app.':en'];
 				$ids = array_filter(array_keys($lang_arr), function($haystack) use($translation, $lang_arr) {
-					return stripos($lang_arr[$haystack],$translation) !== false;
+					return stripos($lang_arr[$haystack], $translation) !== false;
 				});
 				$id = array_shift($ids);
 			}
@@ -1078,7 +1078,7 @@ 
 	 * @param string $verify =null encoding to verify, get checked first and have a match for only ascii or no detection available
 	 * @return string - encoding
 	 */
-	static function detect_encoding($string, $verify=null)
+	static function detect_encoding($string, $verify = null)
 	{
 		if (function_exists('iconv'))
 		{
@@ -1101,7 +1101,7 @@ 
 		}
 		if ($verify && (!isset($detected) || $detected === 'ascii'))
 		{
-			return $verify;	// ascii matches all charsets
+			return $verify; // ascii matches all charsets
 		}
 		return isset($detected) ? $detected : 'iso-8859-1'; // we choose to return iso-8859-1 as default
 	}
@@ -1113,10 +1113,10 @@ 
 	 * @param string $displayCharset the charset parameter specifies the character set to represent the result by (if iconv_mime_decode is to be used)
 	 * @return string
 	 */
-	static function decodeMailHeader($_string, $displayCharset='utf-8')
+	static function decodeMailHeader($_string, $displayCharset = 'utf-8')
 	{
 		//error_log(__FILE__.','.__METHOD__.':'."called with $_string and CHARSET $displayCharset");
-		if(function_exists(imap_mime_header_decode))
+		if (function_exists(imap_mime_header_decode))
 		{
 			// some characterreplacements, as they fail to translate
 			$sar = array(
@@ -1138,23 +1138,23 @@ 
 
 			$string = preg_replace('/\?=\s+=\?/', '?= =?', $_string);
 
-			$elements=imap_mime_header_decode($string);
+			$elements = imap_mime_header_decode($string);
 
 			$convertAtEnd = false;
-			foreach((array)$elements as $element)
+			foreach ((array)$elements as $element)
 			{
 				if ($element->charset == 'default') $element->charset = self::detect_encoding($element->text);
 				if ($element->charset != 'x-unknown')
 				{
-					if( strtoupper($element->charset) != 'UTF-8') $element->text = preg_replace($sar,$rar,$element->text);
+					if (strtoupper($element->charset) != 'UTF-8') $element->text = preg_replace($sar, $rar, $element->text);
 					// check if there is a possible nested encoding; make sure that the inputstring and the decoded result are different to avoid loops
-					$openTags = substr_count($element->text,'?=');
-					if(preg_match('/\?=.+=\?/', $element->text) && $openTags>0 && $openTags==substr_count($element->text,'=?') && $element->text != $_string)
+					$openTags = substr_count($element->text, '?=');
+					if (preg_match('/\?=.+=\?/', $element->text) && $openTags > 0 && $openTags == substr_count($element->text, '=?') && $element->text != $_string)
 					{
 						$element->text = self::decodeMailHeader($element->text, $element->charset);
 						$element->charset = $displayCharset;
 					}
-					$newString .= self::convert($element->text,$element->charset);
+					$newString .= self::convert($element->text, $element->charset);
 				}
 				else
 				{
@@ -1162,34 +1162,34 @@ 
 					$convertAtEnd = true;
 				}
 			}
-			if ($convertAtEnd) $newString = self::decodeMailHeader($newString,$displayCharset);
-			return preg_replace('/([\000-\012\015\016\020-\037\075])/','',$newString);
+			if ($convertAtEnd) $newString = self::decodeMailHeader($newString, $displayCharset);
+			return preg_replace('/([\000-\012\015\016\020-\037\075])/', '', $newString);
 		}
-		elseif(function_exists(mb_decode_mimeheader))
+		elseif (function_exists(mb_decode_mimeheader))
 		{
 			$matches = null;
-			if(preg_match_all('/=\?.*\?Q\?.*\?=/iU', $string=$_string, $matches))
+			if (preg_match_all('/=\?.*\?Q\?.*\?=/iU', $string = $_string, $matches))
 			{
-				foreach($matches[0] as $match)
+				foreach ($matches[0] as $match)
 				{
 					$fixedMatch = str_replace('_', ' ', $match);
 					$string = str_replace($match, $fixedMatch, $string);
 				}
-				$string = str_replace('=?ISO8859-','=?ISO-8859-',
-					str_replace('=?windows-1258','=?ISO-8859-1',$string));
+				$string = str_replace('=?ISO8859-', '=?ISO-8859-',
+					str_replace('=?windows-1258', '=?ISO-8859-1', $string));
 			}
 			$string = mb_decode_mimeheader($string);
-			return preg_replace('/([\000-\012\015\016\020-\037\075])/','',$string);
+			return preg_replace('/([\000-\012\015\016\020-\037\075])/', '', $string);
 		}
-		elseif(function_exists(iconv_mime_decode))
+		elseif (function_exists(iconv_mime_decode))
 		{
 			// continue decoding also if an error occurs
 			$string = @iconv_mime_decode($_string, 2, $displayCharset);
-			return preg_replace('/([\000-\012\015\016\020-\037\075])/','',$string);
+			return preg_replace('/([\000-\012\015\016\020-\037\075])/', '', $string);
 		}
 
 		// no decoding function available
-		return preg_replace('/([\000-\012\015\016\020-\037\075])/','',$_string);
+		return preg_replace('/([\000-\012\015\016\020-\037\075])/', '', $_string);
 	}
 
 	/**
@@ -1202,15 +1202,15 @@ 
 	{
 		//error_log($text);
 		//replace CRLF with something other to be preserved via preg_replace as CRLF seems to vanish
-		$text = str_replace("\r\n",'<#cr-lf#>',$text);
+		$text = str_replace("\r\n", '<#cr-lf#>', $text);
 		// replace emailaddresses eclosed in <> (eg.: <me@you.de>) with the emailaddress only (e.g: me@you.de)
-		$text = preg_replace("/(<|&lt;a href=\")*(mailto:([\w\.,-.,_.,0-9.]+)(@)([\w\.,-.,_.,0-9.]+))(>|&gt;)*/i","$2 ", $text);
+		$text = preg_replace("/(<|&lt;a href=\")*(mailto:([\w\.,-.,_.,0-9.]+)(@)([\w\.,-.,_.,0-9.]+))(>|&gt;)*/i", "$2 ", $text);
 		//$text = preg_replace_callback("/(<|&lt;a href=\")*(mailto:([\w\.,-.,_.,0-9.]+)(@)([\w\.,-.,_.,0-9.]+))(>|&gt;)*/i",'self::transform_mailto2text',$text);
 		//$text = preg_replace('~<a[^>]+href=\"(mailto:)+([^"]+)\"[^>]*>~si','$2 ',$text);
-		$text = preg_replace_callback('~<a[^>]+href=\"(mailto:)+([^"]+)\"[^>]*>([ @\w\.,-.,_.,0-9.]+)<\/a>~si','self::transform_mailto2text',$text);
-		$text = preg_replace("/(([\w\.,-.,_.,0-9.]+)(@)([\w\.,-.,_.,0-9.]+))( |\s)*(<\/a>)*( |\s)*(>|&gt;)*/i","$1 ", $text);
-		$text = preg_replace("/(<|&lt;)*(([\w\.,-.,_.,0-9.]+)@([\w\.,-.,_.,0-9.]+))(>|&gt;)*/i","$2 ", $text);
-		$text = str_replace('<#cr-lf#>',"\r\n",$text);
+		$text = preg_replace_callback('~<a[^>]+href=\"(mailto:)+([^"]+)\"[^>]*>([ @\w\.,-.,_.,0-9.]+)<\/a>~si', 'self::transform_mailto2text', $text);
+		$text = preg_replace("/(([\w\.,-.,_.,0-9.]+)(@)([\w\.,-.,_.,0-9.]+))( |\s)*(<\/a>)*( |\s)*(>|&gt;)*/i", "$1 ", $text);
+		$text = preg_replace("/(<|&lt;)*(([\w\.,-.,_.,0-9.]+)@([\w\.,-.,_.,0-9.]+))(>|&gt;)*/i", "$2 ", $text);
+		$text = str_replace('<#cr-lf#>', "\r\n", $text);
 		return 1;
 	}
 
@@ -1224,11 +1224,11 @@ 
 	 *				or if you want the string to be matched as is
 	 * @return void the modified text is passed via reference
 	 */
-	static function replaceTagsCompletley(&$_body,$tag,$endtag='',$addbracesforendtag=true)
+	static function replaceTagsCompletley(&$_body, $tag, $endtag = '', $addbracesforendtag = true)
 	{
 		if ($tag) $tag = strtolower($tag);
 		$singleton = false;
-		if ($endtag=='/>') $singleton =true;
+		if ($endtag == '/>') $singleton = true;
 		if ($endtag == '' || empty($endtag) || !isset($endtag))
 		{
 			$endtag = $tag;
@@ -1241,31 +1241,31 @@ 
 			if ($singleton)
 			{
 				//$_body = preg_replace('~<'.$tag.'[^>].*? '.$endtag.'~simU','',$_body);
-				$_body = preg_replace('~<?'.$tag.'[^>].* '.$endtag.'~simU','',$_body); // we are in Ungreedy mode, so we expect * to be ungreedy without specifying ?
+				$_body = preg_replace('~<?'.$tag.'[^>].* '.$endtag.'~simU', '', $_body); // we are in Ungreedy mode, so we expect * to be ungreedy without specifying ?
 			}
 			else
 			{
-				$found=null;
-				if ($addbracesforendtag === true )
+				$found = null;
+				if ($addbracesforendtag === true)
 				{
-					if (stripos($_body,'<'.$tag)!==false)  $ct = preg_match_all('#<'.$tag.'(?:\s.*)?>(.+)</'.$endtag.'>#isU', $_body, $found);
-					if ($ct>0)
+					if (stripos($_body, '<'.$tag) !== false)  $ct = preg_match_all('#<'.$tag.'(?:\s.*)?>(.+)</'.$endtag.'>#isU', $_body, $found);
+					if ($ct > 0)
 					{
 						//error_log(__METHOD__.__LINE__.array2string($found[0]));
 						// only replace what we have found
-						$_body = str_ireplace($found[0],'',$_body);
+						$_body = str_ireplace($found[0], '', $_body);
 					}
 					// remove left over tags, unfinished ones, and so on
-					$_body = preg_replace('~<'.$tag.'[^>]*?>~si','',$_body);
+					$_body = preg_replace('~<'.$tag.'[^>]*?>~si', '', $_body);
 				}
-				if ($addbracesforendtag === false )
+				if ($addbracesforendtag === false)
 				{
-					if (stripos($_body,'<'.$tag)!==false)  $ct = preg_match_all('#<'.$tag.'(?:\s.*)?>(.+)'.$endtag.'#isU', $_body, $found);
-					if ($ct>0)
+					if (stripos($_body, '<'.$tag) !== false)  $ct = preg_match_all('#<'.$tag.'(?:\s.*)?>(.+)'.$endtag.'#isU', $_body, $found);
+					if ($ct > 0)
 					{
 						//error_log(__METHOD__.__LINE__.array2string($found[0]));
 						// only replace what we have found
-						$_body = str_ireplace($found[0],'',$_body);
+						$_body = str_ireplace($found[0], '', $_body);
 					}
 /*
 					$_body = preg_replace('~<'.$tag.'[^>]*?>(.*?)'.$endtag.'~simU','',$_body);
@@ -1283,9 +1283,9 @@ 
 		// this is the actual url
 		$matches[2] = trim(strip_tags($matches[2]));
 		$matches[3] = trim(strip_tags($matches[3]));
-		$matches[2] = str_replace(array('%40','%20'),array('@',' '),$matches[2]);
-		$matches[3] = str_replace(array('%40','%20'),array('@',' '),$matches[3]);
-		return $matches[1].$matches[2].($matches[2]==$matches[3]?' ':' -> '.$matches[3].' ');
+		$matches[2] = str_replace(array('%40', '%20'), array('@', ' '), $matches[2]);
+		$matches[3] = str_replace(array('%40', '%20'), array('@', ' '), $matches[3]);
+		return $matches[1].$matches[2].($matches[2] == $matches[3] ? ' ' : ' -> '.$matches[3].' ');
 	}
 
 	static function transform_url2text($matches)
@@ -1294,9 +1294,9 @@ 
 		$linkTextislink = false;
 		// this is the actual url
 		$matches[2] = trim(strip_tags($matches[2]));
-		if ($matches[2]==$matches[1]) $linkTextislink = true;
-		$matches[1] = str_replace(' ','%20',$matches[1]);
-		return ($linkTextislink?' ':'[ ').$matches[1].($linkTextislink?'':' -> '.$matches[2]).($linkTextislink?' ':' ]');
+		if ($matches[2] == $matches[1]) $linkTextislink = true;
+		$matches[1] = str_replace(' ', '%20', $matches[1]);
+		return ($linkTextislink ? ' ' : '[ ').$matches[1].($linkTextislink ? '' : ' -> '.$matches[2]).($linkTextislink ? ' ' : ' ]');
 	}
 
 	/**
@@ -1307,7 +1307,7 @@ 
 	 * @param bool $stripalltags : flag to indicate wether or not to strip $_html from all remaining tags
 	 * @return text $_html : the modified text.
 	 */
-	static function convertHTMLToText($_html,$displayCharset=false,$stripcrl=false,$stripalltags=true)
+	static function convertHTMLToText($_html, $displayCharset = false, $stripcrl = false, $stripalltags = true)
 	{
 		// assume input isHTML, but test the input anyway, because,
 		// if it is not, we may not want to strip whitespace
@@ -1323,27 +1323,27 @@ 
 		#print "<pre>"; print htmlspecialchars($_html);
 		#print "</pre>";
 		#print "<hr>";
-		if (stripos($_html,'style')!==false) self::replaceTagsCompletley($_html,'style'); // clean out empty or pagewide style definitions / left over tags
-		if (stripos($_html,'head')!==false) self::replaceTagsCompletley($_html,'head'); // Strip out stuff in head
-		if (stripos($_html,'![if')!==false && stripos($_html,'<![endif]>')!==false) self::replaceTagsCompletley($_html,'!\[if','<!\[endif\]>',false); // Strip out stuff in ifs
-		if (stripos($_html,'!--[if')!==false && stripos($_html,'<![endif]-->')!==false) self::replaceTagsCompletley($_html,'!--\[if','<!\[endif\]-->',false); // Strip out stuff in ifs
-		$Rules = array ('@<script[^>]*?>.*?</script>@siU', // Strip out javascript
-			'@&(quot|#34);@i',                // Replace HTML entities
-			'@&(amp|#38);@i',                 //   Ampersand &
-			'@&(lt|#60);@i',                  //   Less Than <
-			'@&(gt|#62);@i',                  //   Greater Than >
-			'@&(nbsp|#160);@i',               //   Non Breaking Space
-			'@&(iexcl|#161);@i',              //   Inverted Exclamation point
-			'@&(cent|#162);@i',               //   Cent
-			'@&(pound|#163);@i',              //   Pound
-			'@&(copy|#169);@i',               //   Copyright
-			'@&(reg|#174);@i',                //   Registered
-			'@&(trade|#8482);@i',             //   trade
-			'@&#39;@i',                       //   singleQuote
-			'@(\xc2\xa0)@',                   //   nbsp or tab (encoded windows-style)
-			'@(\xe2\x80\x8b)@',               //   ZERO WIDTH SPACE
+		if (stripos($_html, 'style') !== false) self::replaceTagsCompletley($_html, 'style'); // clean out empty or pagewide style definitions / left over tags
+		if (stripos($_html, 'head') !== false) self::replaceTagsCompletley($_html, 'head'); // Strip out stuff in head
+		if (stripos($_html, '![if') !== false && stripos($_html, '<![endif]>') !== false) self::replaceTagsCompletley($_html, '!\[if', '<!\[endif\]>', false); // Strip out stuff in ifs
+		if (stripos($_html, '!--[if') !== false && stripos($_html, '<![endif]-->') !== false) self::replaceTagsCompletley($_html, '!--\[if', '<!\[endif\]-->', false); // Strip out stuff in ifs
+		$Rules = array('@<script[^>]*?>.*?</script>@siU', // Strip out javascript
+			'@&(quot|#34);@i', // Replace HTML entities
+			'@&(amp|#38);@i', //   Ampersand &
+			'@&(lt|#60);@i', //   Less Than <
+			'@&(gt|#62);@i', //   Greater Than >
+			'@&(nbsp|#160);@i', //   Non Breaking Space
+			'@&(iexcl|#161);@i', //   Inverted Exclamation point
+			'@&(cent|#162);@i', //   Cent
+			'@&(pound|#163);@i', //   Pound
+			'@&(copy|#169);@i', //   Copyright
+			'@&(reg|#174);@i', //   Registered
+			'@&(trade|#8482);@i', //   trade
+			'@&#39;@i', //   singleQuote
+			'@(\xc2\xa0)@', //   nbsp or tab (encoded windows-style)
+			'@(\xe2\x80\x8b)@', //   ZERO WIDTH SPACE
 		);
-		$Replace = array ('',
+		$Replace = array('',
 			'"',
 			'#amper#sand#',
 			'<',
@@ -1352,9 +1352,9 @@ 
 			chr(161),
 			chr(162),
 			chr(163),
-			'(C)',//chr(169),// copyrighgt
-			'(R)',//chr(174),// registered
-			'(TM)',// trade
+			'(C)', //chr(169),// copyrighgt
+			'(R)', //chr(174),// registered
+			'(TM)', // trade
 			"'",
 			' ',
 			'',
@@ -1362,27 +1362,27 @@ 
 		$_html = preg_replace($Rules, $Replace, $_html);
 
 		//   removing carriage return linefeeds, preserve those enclosed in <pre> </pre> tags
-		if ($stripcrl === true )
+		if ($stripcrl === true)
 		{
-			if (stripos($_html,'<pre ')!==false || stripos($_html,'<pre>')!==false)
+			if (stripos($_html, '<pre ') !== false || stripos($_html, '<pre>') !== false)
 			{
 				$contentArr = html::splithtmlByPRE($_html);
 				foreach ($contentArr as $k =>&$elem)
 				{
-					if (stripos($elem,'<pre ')===false && stripos($elem,'<pre>')===false)
+					if (stripos($elem, '<pre ') === false && stripos($elem, '<pre>') === false)
 					{
 						//$elem = str_replace('@(\r\n)@i',' ',$elem);
-						$elem = str_replace(array("\r\n","\n"),($isHTML?'':' '),$elem);
+						$elem = str_replace(array("\r\n", "\n"), ($isHTML ? '' : ' '), $elem);
 					}
 				}
-				$_html = implode('',$contentArr);
+				$_html = implode('', $contentArr);
 			}
 			else
 			{
-				$_html = str_replace(array("\r\n","\n"),($isHTML?'':' '),$_html);
+				$_html = str_replace(array("\r\n", "\n"), ($isHTML ? '' : ' '), $_html);
 			}
 		}
-		$tags = array (
+		$tags = array(
 			0 => '~<h[123][^>]*>\r*\n*~si',
 			1 => '~<h[456][^>]*>\r*\n*~si',
 			2 => '~<table[^>]*>\r*\n*~si',
@@ -1403,7 +1403,7 @@ 
 			17 => '/<([1234567890])/',
 			18 => '/>([1234567890])/',
 		);
-		$Replace = array (
+		$Replace = array(
 			0 => "\r\n",
 			1 => "\r\n",
 			2 => "\r\n",
@@ -1424,113 +1424,113 @@ 
 			17 => '#lower#than#$1',
 			18 => '#greater#than#$1',
 		);
-		$_html = preg_replace($tags,$Replace,$_html);
+		$_html = preg_replace($tags, $Replace, $_html);
 		//error_log(__METHOD__.__LINE__.'#'.$_html);
-		$_html = preg_replace('~</t(d|h)>\s*<t(d|h)[^>]*>~si',' - ',$_html);
-		$_html = preg_replace('~<img[^>]+>~s','',$_html);
+		$_html = preg_replace('~</t(d|h)>\s*<t(d|h)[^>]*>~si', ' - ', $_html);
+		$_html = preg_replace('~<img[^>]+>~s', '', $_html);
 		// replace emailaddresses eclosed in <> (eg.: <me@you.de>) with the emailaddress only (e.g: me@you.de)
 		self::replaceEmailAdresses($_html);
 		//convert hrefs to description -> URL
 		//$_html = preg_replace('~<a[^>]+href=\"([^"]+)\"[^>]*>(.*)</a>~si','[$2 -> $1]',$_html);
-		$_html = preg_replace_callback('~<a[^>]+href=\"([^"]+)\"[^>]*>(.*?)</a>~si','self::transform_url2text',$_html);
+		$_html = preg_replace_callback('~<a[^>]+href=\"([^"]+)\"[^>]*>(.*?)</a>~si', 'self::transform_url2text', $_html);
 
 		// reducing double \r\n to single ones, dont mess with pre sections
 		if ($stripcrl === true && $isHTML)
 		{
-			if (stripos($_html,'<pre ')!==false || stripos($_html,'<pre>')!==false)
+			if (stripos($_html, '<pre ') !== false || stripos($_html, '<pre>') !== false)
 			{
 				$contentArr = html::splithtmlByPRE($_html);
 				foreach ($contentArr as $k =>&$elem)
 				{
-					if (stripos($elem,'<pre ')===false && stripos($elem,'<pre>')===false)
+					if (stripos($elem, '<pre ') === false && stripos($elem, '<pre>') === false)
 					{
 						//this is supposed to strip out all remaining stuff in tags, this is sometimes taking out whole sections off content
-						if ( $stripalltags ) {
-							$_html = preg_replace('~<[^>^@]+>~s','',$_html);
+						if ($stripalltags) {
+							$_html = preg_replace('~<[^>^@]+>~s', '', $_html);
 						}
 						// strip out whitespace inbetween CR/LF
 						$elem = preg_replace('~\r\n\s+\r\n~si', "\r\n\r\n", $elem);
 						// strip out / reduce exess CR/LF
-						$elem = preg_replace('~\r\n{3,}~si',"\r\n\r\n",$elem);
+						$elem = preg_replace('~\r\n{3,}~si', "\r\n\r\n", $elem);
 					}
 				}
-				$_html = implode('',$contentArr);
+				$_html = implode('', $contentArr);
 			}
 			else
 			{
 				//this is supposed to strip out all remaining stuff in tags, this is sometimes taking out whole sections off content
-				if ( $stripalltags ) {
-					$_html = preg_replace('~<[^>^@]+>~s','',$_html);
+				if ($stripalltags) {
+					$_html = preg_replace('~<[^>^@]+>~s', '', $_html);
 				}
 				// strip out whitespace inbetween CR/LF
 				$_html = preg_replace('~\r\n\s+\r\n~si', "\r\n\r\n", $_html);
 				// strip out / reduce exess CR/LF
-				$_html = preg_replace('~(\r\n){3,}~si',"\r\n\r\n",$_html);
+				$_html = preg_replace('~(\r\n){3,}~si', "\r\n\r\n", $_html);
 			}
 		}
 		//this is supposed to strip out all remaining stuff in tags, this is sometimes taking out whole sections off content
-		if ( $stripalltags ) {
-			$_html = preg_replace('~<[^>^@]+>~s','',$_html);
+		if ($stripalltags) {
+			$_html = preg_replace('~<[^>^@]+>~s', '', $_html);
 			//$_html = strip_tags($_html, '<a>');
 		}
 		// reducing spaces (not for input that was plain text from the beginning)
-		if ($isHTML) $_html = preg_replace('~ +~s',' ',$_html);
+		if ($isHTML) $_html = preg_replace('~ +~s', ' ', $_html);
 		// restoring ampersands
-		$_html = str_replace('#amper#sand#','&',$_html);
+		$_html = str_replace('#amper#sand#', '&', $_html);
 		// restoring lower|greater[or equal] than
-		$_html = str_replace('#lowerorequal#than#','<=',$_html);
-		$_html = str_replace('#greaterorequal#than#','>=',$_html);
-		$_html = str_replace('#lower#than#','<',$_html);
-		$_html = str_replace('#greater#than#','>',$_html);
+		$_html = str_replace('#lowerorequal#than#', '<=', $_html);
+		$_html = str_replace('#greaterorequal#than#', '>=', $_html);
+		$_html = str_replace('#lower#than#', '<', $_html);
+		$_html = str_replace('#greater#than#', '>', $_html);
 		//error_log(__METHOD__.__LINE__.' Charset:'.$displayCharset.' -> '.$_html);
 		$_html = html_entity_decode($_html, ENT_COMPAT, $displayCharset);
 		//error_log(__METHOD__.__LINE__.' Charset:'.$displayCharset.' After html_entity_decode: -> '.$_html);
 		//self::replaceEmailAdresses($_html);
 		$pos = strpos($_html, 'blockquote');
 		//error_log("convert HTML2Text: $_html");
-		if($pos === false) {
+		if ($pos === false) {
 			return $_html;
 		} else {
 			$indent = 0;
 			$indentString = '';
 
 			$quoteParts = preg_split('/#blockquote#type#cite#/', $_html, -1, PREG_SPLIT_OFFSET_CAPTURE);
-			foreach($quoteParts as $quotePart) {
-				if($quotePart[1] > 0) {
+			foreach ($quoteParts as $quotePart) {
+				if ($quotePart[1] > 0) {
 					$indent++;
 					$indentString .= '>';
 				}
 				$quoteParts2 = preg_split('/#blockquote#end#cite#/', $quotePart[0], -1, PREG_SPLIT_OFFSET_CAPTURE);
 
-				foreach($quoteParts2 as $quotePart2) {
-					if($quotePart2[1] > 0) {
+				foreach ($quoteParts2 as $quotePart2) {
+					if ($quotePart2[1] > 0) {
 						$indent--;
 						$indentString = substr($indentString, 0, $indent);
 					}
 
 					$quoteParts3 = explode("\r\n", $quotePart2[0]);
 
-					foreach($quoteParts3 as $quotePart3) {
+					foreach ($quoteParts3 as $quotePart3) {
 						//error_log(__METHOD__.__LINE__.'Line:'.$quotePart3);
-						$allowedLength = 76-strlen("\r\n$indentString");
+						$allowedLength = 76 - strlen("\r\n$indentString");
 						// only break lines, if not already indented
-						if (substr($quotePart3,0,strlen($indentString)) != $indentString)
+						if (substr($quotePart3, 0, strlen($indentString)) != $indentString)
 						{
 							if (strlen($quotePart3) > $allowedLength) {
-								$s=explode(" ", $quotePart3);
+								$s = explode(" ", $quotePart3);
 								$quotePart3 = "";
 								$linecnt = 0;
 								foreach ($s as $k=>$v) {
 									$cnt = strlen($v);
 									// only break long words within the wordboundaries,
 									// but it may destroy links, so we check for href and dont do it if we find it
-									if($cnt > $allowedLength && stripos($v,'href=')===false) {
+									if ($cnt > $allowedLength && stripos($v, 'href=') === false) {
 										//error_log(__METHOD__.__LINE__.'LongWordFound:'.$v);
-										$v=wordwrap($v, $allowedLength, "\r\n$indentString", true);
+										$v = wordwrap($v, $allowedLength, "\r\n$indentString", true);
 									}
 									// the rest should be broken at the start of the new word that exceeds the limit
-									if ($linecnt+$cnt > $allowedLength) {
-										$v="\r\n$indentString$v";
+									if ($linecnt + $cnt > $allowedLength) {
+										$v = "\r\n$indentString$v";
 										//error_log(__METHOD__.__LINE__.'breaking here:'.$v);
 										$linecnt = 0;
 									} else {
@@ -1541,11 +1541,11 @@ 
 							}
 						}
 						//error_log(__METHOD__.__LINE__.'partString to return:'.$indentString . $quotePart3);
-						$asciiTextBuff[] = $indentString . $quotePart3 ;
+						$asciiTextBuff[] = $indentString.$quotePart3;
 					}
 				}
 			}
-			return implode("\r\n",$asciiTextBuff);
+			return implode("\r\n", $asciiTextBuff);
 		}
 	}
 }

Braces +222 added lines, -63 removed lines

@@ -124,17 +124,23 @@ 
 			}
 			return $charsets[$lang];
 		}
-		if (self::$system_charset)	// do we have a system-charset ==> return it
+		if (self::$system_charset)
+		{
+			// do we have a system-charset ==> return it
 		{
 			$charset = self::$system_charset;
 		}
+		}
 		else
 		{
 			// if no translations are loaded (system-startup) use a default, else lang('charset')
 			$charset = !self::$lang_arr ? 'utf-8' : strtolower(self::translate('charset'));
 		}
 		// in case no charset is set, default to utf-8
-		if (empty($charset) || $charset == 'charset') $charset = 'utf-8';
+		if (empty($charset) || $charset == 'charset')
+		{
+			$charset = 'utf-8';
+		}
 
 		// we need to set our charset as mbstring.internal_encoding if mbstring.func_overlaod > 0
 		// else we get problems for a charset is different from the default utf-8
@@ -193,8 +199,14 @@ 
 			}
 			$apps = array('common');
 			// for eTemplate apps, load etemplate before app itself (allowing app to overwrite etemplate translations)
-			if (class_exists('etemplate_new', false) || class_exists('etemplate', false)) $apps[] = 'etemplate';
-			if ($GLOBALS['egw_info']['flags']['currentapp']) $apps[] = $GLOBALS['egw_info']['flags']['currentapp'];
+			if (class_exists('etemplate_new', false) || class_exists('etemplate', false))
+			{
+				$apps[] = 'etemplate';
+			}
+			if ($GLOBALS['egw_info']['flags']['currentapp'])
+			{
+				$apps[] = $GLOBALS['egw_info']['flags']['currentapp'];
+			}
 			// load instance specific translations last, so they can overwrite everything
 			$apps[] = 'custom';
 			self::add_app($apps);
@@ -222,7 +234,10 @@ 
 			self::init();
 		}
 		$ret = $key;				// save key if we dont find a translation
-		if ($not_found) $ret .= $not_found;
+		if ($not_found)
+		{
+			$ret .= $not_found;
+		}
 
 		if (isset(self::$lang_arr[$key]))
 		{
@@ -269,9 +284,15 @@ 
 	{
 		//error_log(__METHOD__."(".array2string($apps).", $lang) count(self::\$lang_arr)=".count(self::$lang_arr));
 		//$start = microtime(true);
-		if (!$lang) $lang = self::$userlang;
+		if (!$lang)
+		{
+			$lang = self::$userlang;
+		}
 		$tree_level = $instance_level = array();
-		if (!is_array($apps)) $apps = (array)$apps;
+		if (!is_array($apps))
+		{
+			$apps = (array)$apps;
+		}
 		foreach($apps as $key => $app)
 		{
 			if (!isset(self::$loaded_apps[$app]) || self::$loaded_apps[$app] != $lang && $app != 'common')
@@ -291,8 +312,14 @@ 
 			}
 		}
 		// load all translations from cache at once
-		if ($tree_level) $tree_level = egw_cache::getTree(__CLASS__, $tree_level);
-		if ($instance_level) $instance_level = egw_cache::getInstance(__CLASS__, $instance_level);
+		if ($tree_level)
+		{
+			$tree_level = egw_cache::getTree(__CLASS__, $tree_level);
+		}
+		if ($instance_level)
+		{
+			$instance_level = egw_cache::getInstance(__CLASS__, $instance_level);
+		}
 
 		// merging loaded translations together
 		$updated_load_via = false;
@@ -359,7 +386,10 @@ 
 	static function &load_app($app,$lang)
 	{
 		//$start = microtime(true);
-		if (is_null(self::$db)) self::init(false);
+		if (is_null(self::$db))
+		{
+			self::init(false);
+		}
 		$loaded = array();
 		foreach(self::$db->select(self::LANG_TABLE,'message_id,content',array(
 			'lang'		=> $lang,
@@ -465,7 +495,10 @@ 
 				$cache['']['en'] = count($en_phrases);
 				foreach(array_keys(self::get_available_langs()) as $lang)
 				{
-					if ($lang == 'en') continue;
+					if ($lang == 'en')
+					{
+						continue;
+					}
 					$lang_phrases = array_keys(self::load_app_files(null, $lang, 'all-apps'));
 					$valid_phrases = array_intersect($lang_phrases, $en_phrases);
 					$cache[''][$lang] = count($valid_phrases);
@@ -482,7 +515,10 @@ 
 						continue;
 					}
 					$en_phrases = array_keys(self::load_app_files(null, 'en', $app));
-					if (count($en_phrases) <= 2) continue;
+					if (count($en_phrases) <= 2)
+					{
+						continue;
+					}
 					$cache['en'][$app] = count($en_phrases);
 					$lang_phrases = array_keys(self::load_app_files(null, $_lang, $app));
 					$valid_phrases = array_intersect($lang_phrases, $en_phrases);
@@ -514,7 +550,10 @@ 
 			// check if cache is NOT invalided by checking if we have a modification time for concerned lang-file
 			$time = egw_cache::getTree(__CLASS__, $file=self::get_lang_file($_app, $_lang));
 			// if we dont have one, cache has been invalidated and we need to load translations
-			if (!isset($time)) self::add_app($_app, $_lang);
+			if (!isset($time))
+			{
+				self::add_app($_app, $_lang);
+			}
 
 			$etag = self::max_lang_time();
 		}
@@ -566,7 +605,11 @@ 
 		$loaded = array();
 		foreach($load_app == 'all-apps' ? scandir(EGW_SERVER_ROOT) : (array)$load_app as $app_dir)
 		{
-			if ($load_app == 'all-apps' && $app_dir=='..') continue; // do not try to break out of egw server root
+			if ($load_app == 'all-apps' && $app_dir=='..')
+			{
+				continue;
+			}
+			// do not try to break out of egw server root
 			if ($app_dir[0] == '.' || !is_dir(EGW_SERVER_ROOT.'/'.$app_dir) ||
 				!@file_exists($file=self::get_lang_file($app_dir, $lang)) ||
 				!($f = fopen($file, 'r')))
@@ -585,9 +628,15 @@ 
 			{
 				$line = explode("\t", trim($read));
 				++$line_nr;
-				if (count($line) != 4) continue;
+				if (count($line) != 4)
+				{
+					continue;
+				}
 				list($l_id,$l_app,$l_lang,$l_translation) = $line;
-				if ($l_lang != $lang) continue;
+				if ($l_lang != $lang)
+				{
+					continue;
+				}
 				if (!isset($just_app_file) && $l_app != $app)
 				{
 					// check if $l_app contained in file in $app_dir is mentioned in $load_via
@@ -601,8 +650,14 @@ 
 						}
 						// if not update load_via accordingly and store it as config
 						//error_log(__METHOD__."() load_via does not contain $l_app => $app_dir");
-						if (!isset(self::$load_via[$l_app])) self::$load_via[$l_app] = array($l_app);
-						if (!is_array(self::$load_via[$l_app])) self::$load_via[$l_app] = array(self::$load_via[$l_app]);
+						if (!isset(self::$load_via[$l_app]))
+						{
+							self::$load_via[$l_app] = array($l_app);
+						}
+						if (!is_array(self::$load_via[$l_app]))
+						{
+							self::$load_via[$l_app] = array(self::$load_via[$l_app]);
+						}
 						self::$load_via[$l_app][] = $app_dir;
 						$updated_load_via = true;
 					}
@@ -669,7 +724,10 @@ 
 
 			if ($translate)
 			{
-				if (is_null(self::$db)) self::init(false);
+				if (is_null(self::$db))
+				{
+					self::init(false);
+				}
 
 				foreach(self::$langs as $lang => $name)
 				{
@@ -702,10 +760,13 @@ 
 	 */
 	static function lang2language($lang)
 	{
-		if (isset(self::$langs[$lang]))	// no need to query the DB
+		if (isset(self::$langs[$lang]))
+		{
+			// no need to query the DB
 		{
 			return self::$langs[$lang];
 		}
+		}
 		return self::$db->select(self::LANGUAGES_TABLE,'lang_name',array('lang_id' => $lang),__LINE__,__FILE__)->fetchColumn();
 	}
 
@@ -744,7 +805,10 @@ 
 	 */
 	static function get_lang_file($app,$lang)
 	{
-		if ($app == 'common') $app = 'phpgwapi';
+		if ($app == 'common')
+		{
+			$app = 'phpgwapi';
+		}
 		return EGW_SERVER_ROOT.'/'.$app.'/'.self::LANG_DIR.'/'.self::LANGFILE_PREFIX.$lang.self::LANGFILE_EXTENSION;
 	}
 
@@ -807,9 +871,15 @@ 
 	{
 		if ($check_to_from)
 		{
-			if ($from) $from = strtolower($from);
+			if ($from)
+			{
+				$from = strtolower($from);
+			}
 
-			if ($to) $to = strtolower($to);
+			if ($to)
+			{
+				$to = strtolower($to);
+			}
 
 			if (!$from)
 			{
@@ -934,7 +1004,10 @@ 
 	 */
 	static function convert_jsonsafe($data,$from=False)
 	{
-		if ($from===false) $from = self::detect_encoding($data);
+		if ($from===false)
+		{
+			$from = self::detect_encoding($data);
+		}
 		$data = self::convert($data,strtolower($from));
 		// in a way, this tests if we are having real utf-8 (the displayCharset) by now; we should if charsets reported (or detected) are correct
 		if (strtoupper(self::charset()) == 'UTF-8')
@@ -1031,8 +1104,14 @@ 
 	static function get_message_id($translation,$app=null,$lang=null)
 	{
 		$where = array('content '.self::$db->capabilities[egw_db::CAPABILITY_CASE_INSENSITIV_LIKE].' '.self::$db->quote($translation));
-		if ($app) $where['app_name'] = $app;
-		if ($lang) $where['lang'] = $lang;
+		if ($app)
+		{
+			$where['app_name'] = $app;
+		}
+		if ($lang)
+		{
+			$where['lang'] = $lang;
+		}
 
 		$id = self::$db->select(self::LANG_TABLE,'message_id',$where,__LINE__,__FILE__)->fetchColumn();
 
@@ -1040,7 +1119,8 @@ 
 		if(!$id)
 		{
 			$lang_arr = self::$lang_arr;	// PHP 5.3 does NOT allow to use class scope / self in closure
-			$ids = array_filter(array_keys(self::$lang_arr), function($haystack) use($translation, $lang_arr) {
+			$ids = array_filter(array_keys(self::$lang_arr), function($haystack) use($translation, $lang_arr)
+			{
 				return stripos($lang_arr[$haystack],$translation) !== false;
 			});
 			$id = array_shift($ids);
@@ -1057,10 +1137,17 @@ 
 				}
 
 				// load all translations from cache at once
-				if ($tree_level) $lang_arr = egw_cache::getTree(__CLASS__, $tree_level);
-				if ($instance_level) $lang_arr = egw_cache::getInstance(__CLASS__, $instance_level);
+				if ($tree_level)
+				{
+					$lang_arr = egw_cache::getTree(__CLASS__, $tree_level);
+				}
+				if ($instance_level)
+				{
+					$lang_arr = egw_cache::getInstance(__CLASS__, $instance_level);
+				}
 				$lang_arr = $lang_arr[$app.':en'];
-				$ids = array_filter(array_keys($lang_arr), function($haystack) use($translation, $lang_arr) {
+				$ids = array_filter(array_keys($lang_arr), function($haystack) use($translation, $lang_arr)
+				{
 					return stripos($lang_arr[$haystack],$translation) !== false;
 				});
 				$id = array_shift($ids);
@@ -1084,7 +1171,10 @@ 
 		{
 			$list = array('utf-8', 'iso-8859-1', 'windows-1251'); // list may be extended
 
-			if ($verify) array_unshift($list, $verify);
+			if ($verify)
+			{
+				array_unshift($list, $verify);
+			}
 
 			foreach ($list as $item)
 			{
@@ -1143,10 +1233,16 @@ 
 			$convertAtEnd = false;
 			foreach((array)$elements as $element)
 			{
-				if ($element->charset == 'default') $element->charset = self::detect_encoding($element->text);
+				if ($element->charset == 'default')
+				{
+					$element->charset = self::detect_encoding($element->text);
+				}
 				if ($element->charset != 'x-unknown')
 				{
-					if( strtoupper($element->charset) != 'UTF-8') $element->text = preg_replace($sar,$rar,$element->text);
+					if( strtoupper($element->charset) != 'UTF-8')
+					{
+						$element->text = preg_replace($sar,$rar,$element->text);
+					}
 					// check if there is a possible nested encoding; make sure that the inputstring and the decoded result are different to avoid loops
 					$openTags = substr_count($element->text,'?=');
 					if(preg_match('/\?=.+=\?/', $element->text) && $openTags>0 && $openTags==substr_count($element->text,'=?') && $element->text != $_string)
@@ -1162,7 +1258,10 @@ 
 					$convertAtEnd = true;
 				}
 			}
-			if ($convertAtEnd) $newString = self::decodeMailHeader($newString,$displayCharset);
+			if ($convertAtEnd)
+			{
+				$newString = self::decodeMailHeader($newString,$displayCharset);
+			}
 			return preg_replace('/([\000-\012\015\016\020-\037\075])/','',$newString);
 		}
 		elseif(function_exists(mb_decode_mimeheader))
@@ -1226,18 +1325,27 @@ 
 	 */
 	static function replaceTagsCompletley(&$_body,$tag,$endtag='',$addbracesforendtag=true)
 	{
-		if ($tag) $tag = strtolower($tag);
+		if ($tag)
+		{
+			$tag = strtolower($tag);
+		}
 		$singleton = false;
-		if ($endtag=='/>') $singleton =true;
+		if ($endtag=='/>')
+		{
+			$singleton =true;
+		}
 		if ($endtag == '' || empty($endtag) || !isset($endtag))
 		{
 			$endtag = $tag;
-		} else {
+		}
+		else
+		{
 			$endtag = strtolower($endtag);
 			//error_log(__METHOD__.' Using EndTag:'.$endtag);
 		}
 		// strip tags out of the message completely with their content
-		if ($_body) {
+		if ($_body)
+		{
 			if ($singleton)
 			{
 				//$_body = preg_replace('~<'.$tag.'[^>].*? '.$endtag.'~simU','',$_body);
@@ -1248,7 +1356,10 @@ 
 				$found=null;
 				if ($addbracesforendtag === true )
 				{
-					if (stripos($_body,'<'.$tag)!==false)  $ct = preg_match_all('#<'.$tag.'(?:\s.*)?>(.+)</'.$endtag.'>#isU', $_body, $found);
+					if (stripos($_body,'<'.$tag)!==false)
+					{
+						$ct = preg_match_all('#<'.$tag.'(?:\s.*)?>(.+)</'.$endtag.'>#isU', $_body, $found);
+					}
 					if ($ct>0)
 					{
 						//error_log(__METHOD__.__LINE__.array2string($found[0]));
@@ -1260,7 +1371,10 @@ 
 				}
 				if ($addbracesforendtag === false )
 				{
-					if (stripos($_body,'<'.$tag)!==false)  $ct = preg_match_all('#<'.$tag.'(?:\s.*)?>(.+)'.$endtag.'#isU', $_body, $found);
+					if (stripos($_body,'<'.$tag)!==false)
+					{
+						$ct = preg_match_all('#<'.$tag.'(?:\s.*)?>(.+)'.$endtag.'#isU', $_body, $found);
+					}
 					if ($ct>0)
 					{
 						//error_log(__METHOD__.__LINE__.array2string($found[0]));
@@ -1294,7 +1408,10 @@ 
 		$linkTextislink = false;
 		// this is the actual url
 		$matches[2] = trim(strip_tags($matches[2]));
-		if ($matches[2]==$matches[1]) $linkTextislink = true;
+		if ($matches[2]==$matches[1])
+		{
+			$linkTextislink = true;
+		}
 		$matches[1] = str_replace(' ','%20',$matches[1]);
 		return ($linkTextislink?' ':'[ ').$matches[1].($linkTextislink?'':' -> '.$matches[2]).($linkTextislink?' ':' ]');
 	}
@@ -1317,16 +1434,35 @@ 
 			$isHTML = false;
 			// return $_html; // maybe we should not proceed at all
 		}
-		if ($displayCharset === false) $displayCharset = self::$system_charset;
+		if ($displayCharset === false)
+		{
+			$displayCharset = self::$system_charset;
+		}
 		//error_log(__METHOD__.$_html);
 		#print '<hr>';
 		#print "<pre>"; print htmlspecialchars($_html);
 		#print "</pre>";
 		#print "<hr>";
-		if (stripos($_html,'style')!==false) self::replaceTagsCompletley($_html,'style'); // clean out empty or pagewide style definitions / left over tags
-		if (stripos($_html,'head')!==false) self::replaceTagsCompletley($_html,'head'); // Strip out stuff in head
-		if (stripos($_html,'![if')!==false && stripos($_html,'<![endif]>')!==false) self::replaceTagsCompletley($_html,'!\[if','<!\[endif\]>',false); // Strip out stuff in ifs
-		if (stripos($_html,'!--[if')!==false && stripos($_html,'<![endif]-->')!==false) self::replaceTagsCompletley($_html,'!--\[if','<!\[endif\]-->',false); // Strip out stuff in ifs
+		if (stripos($_html,'style')!==false)
+		{
+			self::replaceTagsCompletley($_html,'style');
+		}
+		// clean out empty or pagewide style definitions / left over tags
+		if (stripos($_html,'head')!==false)
+		{
+			self::replaceTagsCompletley($_html,'head');
+		}
+		// Strip out stuff in head
+		if (stripos($_html,'![if')!==false && stripos($_html,'<![endif]>')!==false)
+		{
+			self::replaceTagsCompletley($_html,'!\[if','<!\[endif\]>',false);
+		}
+		// Strip out stuff in ifs
+		if (stripos($_html,'!--[if')!==false && stripos($_html,'<![endif]-->')!==false)
+		{
+			self::replaceTagsCompletley($_html,'!--\[if','<!\[endif\]-->',false);
+		}
+		// Strip out stuff in ifs
 		$Rules = array ('@<script[^>]*?>.*?</script>@siU', // Strip out javascript
 			'@&(quot|#34);@i',                // Replace HTML entities
 			'@&(amp|#38);@i',                 //   Ampersand &
@@ -1445,7 +1581,8 @@ 
 					if (stripos($elem,'<pre ')===false && stripos($elem,'<pre>')===false)
 					{
 						//this is supposed to strip out all remaining stuff in tags, this is sometimes taking out whole sections off content
-						if ( $stripalltags ) {
+						if ( $stripalltags )
+						{
 							$_html = preg_replace('~<[^>^@]+>~s','',$_html);
 						}
 						// strip out whitespace inbetween CR/LF
@@ -1459,7 +1596,8 @@ 
 			else
 			{
 				//this is supposed to strip out all remaining stuff in tags, this is sometimes taking out whole sections off content
-				if ( $stripalltags ) {
+				if ( $stripalltags )
+				{
 					$_html = preg_replace('~<[^>^@]+>~s','',$_html);
 				}
 				// strip out whitespace inbetween CR/LF
@@ -1469,12 +1607,16 @@ 
 			}
 		}
 		//this is supposed to strip out all remaining stuff in tags, this is sometimes taking out whole sections off content
-		if ( $stripalltags ) {
+		if ( $stripalltags )
+		{
 			$_html = preg_replace('~<[^>^@]+>~s','',$_html);
 			//$_html = strip_tags($_html, '<a>');
 		}
 		// reducing spaces (not for input that was plain text from the beginning)
-		if ($isHTML) $_html = preg_replace('~ +~s',' ',$_html);
+		if ($isHTML)
+		{
+			$_html = preg_replace('~ +~s',' ',$_html);
+		}
 		// restoring ampersands
 		$_html = str_replace('#amper#sand#','&',$_html);
 		// restoring lower|greater[or equal] than
@@ -1488,55 +1630,72 @@ 
 		//self::replaceEmailAdresses($_html);
 		$pos = strpos($_html, 'blockquote');
 		//error_log("convert HTML2Text: $_html");
-		if($pos === false) {
+		if($pos === false)
+		{
 			return $_html;
-		} else {
+		}
+		else
+		{
 			$indent = 0;
 			$indentString = '';
 
 			$quoteParts = preg_split('/#blockquote#type#cite#/', $_html, -1, PREG_SPLIT_OFFSET_CAPTURE);
-			foreach($quoteParts as $quotePart) {
-				if($quotePart[1] > 0) {
+			foreach($quoteParts as $quotePart)
+			{
+				if($quotePart[1] > 0)
+				{
 					$indent++;
 					$indentString .= '>';
 				}
 				$quoteParts2 = preg_split('/#blockquote#end#cite#/', $quotePart[0], -1, PREG_SPLIT_OFFSET_CAPTURE);
 
-				foreach($quoteParts2 as $quotePart2) {
-					if($quotePart2[1] > 0) {
+				foreach($quoteParts2 as $quotePart2)
+				{
+					if($quotePart2[1] > 0)
+					{
 						$indent--;
 						$indentString = substr($indentString, 0, $indent);
 					}
 
 					$quoteParts3 = explode("\r\n", $quotePart2[0]);
 
-					foreach($quoteParts3 as $quotePart3) {
+					foreach($quoteParts3 as $quotePart3)
+					{
 						//error_log(__METHOD__.__LINE__.'Line:'.$quotePart3);
 						$allowedLength = 76-strlen("\r\n$indentString");
 						// only break lines, if not already indented
 						if (substr($quotePart3,0,strlen($indentString)) != $indentString)
 						{
-							if (strlen($quotePart3) > $allowedLength) {
+							if (strlen($quotePart3) > $allowedLength)
+							{
 								$s=explode(" ", $quotePart3);
 								$quotePart3 = "";
 								$linecnt = 0;
-								foreach ($s as $k=>$v) {
+								foreach ($s as $k=>$v)
+								{
 									$cnt = strlen($v);
 									// only break long words within the wordboundaries,
 									// but it may destroy links, so we check for href and dont do it if we find it
-									if($cnt > $allowedLength && stripos($v,'href=')===false) {
+									if($cnt > $allowedLength && stripos($v,'href=')===false)
+									{
 										//error_log(__METHOD__.__LINE__.'LongWordFound:'.$v);
 										$v=wordwrap($v, $allowedLength, "\r\n$indentString", true);
 									}
 									// the rest should be broken at the start of the new word that exceeds the limit
-									if ($linecnt+$cnt > $allowedLength) {
+									if ($linecnt+$cnt > $allowedLength)
+									{
 										$v="\r\n$indentString$v";
 										//error_log(__METHOD__.__LINE__.'breaking here:'.$v);
 										$linecnt = 0;
-									} else {
+									}
+									else
+									{
 										$linecnt += $cnt;
 									}
-									if (strlen($v))  $quotePart3 .= (strlen($quotePart3) ? " " : "").$v;
+									if (strlen($v))
+									{
+										$quotePart3 .= (strlen($quotePart3) ? " " : "").$v;
+									}
 								}
 							}
 						}

phpgwapi/inc/class.uiaccountsel.inc.php

Doc Comments +1 added lines, -1 removed lines

@@ -80,7 +80,7 @@
 	 *  Or a string which gets added as first Option with value='', eg. lang('all'), can also be specified in the array with key ''
 	 * @param boolean $nohtml if true, returns an array with the key 'selected' as the selected participants,
 	 *  and with the key 'participants' as the participants data as would fit in a select.
-	 * @param callback $label_callback=null callback to fetch a label for non-accounts
+	 * @param callback $label_callback callback to fetch a label for non-accounts
 	 * @return string/array string with html for !$nohtml, array('selected' => $selected,'participants' => $select)
 	 */
 	function selection($name,$element_id,$selected,$use='accounts',$lines=0,$not=False,$options='',$onchange='',$select=False,$nohtml=false,$label_callback=null)

Spacing +135 added lines, -137 removed lines

@@ -83,10 +83,10 @@ 
 	 * @param callback $label_callback=null callback to fetch a label for non-accounts
 	 * @return string/array string with html for !$nohtml, array('selected' => $selected,'participants' => $select)
 	 */
-	function selection($name,$element_id,$selected,$use='accounts',$lines=0,$not=False,$options='',$onchange='',$select=False,$nohtml=false,$label_callback=null)
+	function selection($name, $element_id, $selected, $use = 'accounts', $lines = 0, $not = False, $options = '', $onchange = '', $select = False, $nohtml = false, $label_callback = null)
 	{
 		//error_log(__METHOD__."('$name',".array2string($selected).",'$use',rows=$lines,$not,'$options','$onchange',".array2string($select).",$nohtml,$label_callback) account_selection=$this->account_selection");
-		$multi_size=4;
+		$multi_size = 4;
 		if ($lines < 0)
 		{
 			$multi_size = abs($lines);
@@ -98,20 +98,20 @@ 
 
 		if ($this->account_selection == 'none')	// dont show user-selection at all!
 		{
-			return html::input_hidden($name,$selected);
+			return html::input_hidden($name, $selected);
 		}
 		if (!is_array($selected))
 		{
-			$selected = $selected ? explode(',',$selected) : array();
+			$selected = $selected ? explode(',', $selected) : array();
 		}
 		$account_sel = $this->account_selection;
 		$app = False;
-		switch($use)
+		switch ($use)
 		{
 			default:
-				if (substr($use,-1) == '+')
+				if (substr($use, -1) == '+')
 				{
-					$app = substr($use,0,-1);
+					$app = substr($use, 0, -1);
 					$use = 'both';
 				}
 				else
@@ -131,7 +131,7 @@ 
 
 			case 'owngroups':
 				$only_groups = true;
-				$account_sel = 'selectbox';	// groups always use only the selectbox
+				$account_sel = 'selectbox'; // groups always use only the selectbox
 				break;
 		}
 		$extra_label = is_string($select) && !empty($select) ? $select : False;
@@ -140,7 +140,7 @@ 
 			$extra_label = $select[''];
 			unset($select['']);
 		}
-		switch($account_sel)
+		switch ($account_sel)
 		{
 			case 'popup':
 				$select = $selected;
@@ -154,23 +154,23 @@ 
 				}
 				else
 				{
-					$memberships = (array)$this->accounts->memberships($GLOBALS['egw_info']['user']['account_id'],true);
+					$memberships = (array)$this->accounts->memberships($GLOBALS['egw_info']['user']['account_id'], true);
 				}
 				$select = count($selected) && !isset($selected[0]) ? array_keys($selected) : $selected;
-				foreach($memberships as $gid)
+				foreach ($memberships as $gid)
 				{
-					foreach((array)$this->accounts->members($gid,true) as $member)
+					foreach ((array)$this->accounts->members($gid, true) as $member)
 					{
-						if (!in_array($member,$select) && $this->accounts->is_active($member)) $select[] = $member;
+						if (!in_array($member, $select) && $this->accounts->is_active($member)) $select[] = $member;
 					}
 				}
 				if ($use == 'both')	// show all memberships
 				{
 					if ($account_sel == 'primary_group')
 					{
-						$memberships = (array)$this->accounts->memberships($GLOBALS['egw_info']['user']['account_id'],true);
+						$memberships = (array)$this->accounts->memberships($GLOBALS['egw_info']['user']['account_id'], true);
 					}
-					$select = array_merge($select,$memberships);
+					$select = array_merge($select, $memberships);
 				}
 				break;
 
@@ -181,14 +181,14 @@ 
 					$select = $GLOBALS['egw']->accounts->search(array(
 						'type' => $use,
 						'app' => $app,
-						'active' => true,	// return only active accounts
+						'active' => true, // return only active accounts
 					));
 					//error_log(__METHOD__."() account_selection='$this->account_selection', accounts->search(array('type'=>'$use', 'app' => '$app')) returns ".array2string($select));
 				}
 				// make sure everything in $selected is also in $select, as in the other account-selection methods
-				if ($selected && ($missing = array_diff_key($selected,$select)))
+				if ($selected && ($missing = array_diff_key($selected, $select)))
 				{
-					foreach($missing as $k => $v)	// merge missing (cant use array_merge, because of nummeric keys!)
+					foreach ($missing as $k => $v)	// merge missing (cant use array_merge, because of nummeric keys!)
 					{
 						$select[$k] = $v;
 					}
@@ -196,29 +196,28 @@ 
 				break;
 		}
 		$already_selected = $users = $groups = array();
-		$use_keys = count($select) && !isset($select[0]);	// id's are the keys
-		foreach($select as $key => $val)
+		$use_keys = count($select) && !isset($select[0]); // id's are the keys
+		foreach ($select as $key => $val)
 		{
 			$id = $use_keys ? $key : (is_array($val) ? $val['account_id'] : $val);
 
-			if ($not && ($id == $not || is_array($not) && in_array($id,$not)))
+			if ($not && ($id == $not || is_array($not) && in_array($id, $not)))
 			{
-				continue;	// dont display that one
+				continue; // dont display that one
 			}
 			$label = common::grab_owner_name($id);
 			if ($label[0] === '#' && $label_callback)
 			{
 				if (!($label = call_user_func($label_callback, $id))) continue;
 			}
-			if (in_array($id,$selected))	// show already selected accounts first
+			if (in_array($id, $selected))	// show already selected accounts first
 			{
 				$already_selected[$id] = $label;
 			}
 			elseif ($this->accounts->get_type($id) == 'u')
 			{
-				$users[$id] = !is_array($val) ? $label :
-					common::display_fullname(
-						$val['account_lid'],$val['account_firstname'],$val['account_lastname'],$id);
+				$users[$id] = !is_array($val) ? $label : common::display_fullname(
+						$val['account_lid'], $val['account_firstname'], $val['account_lastname'], $id);
 			}
 			else
 			{
@@ -226,12 +225,12 @@ 
 			}
 		}
 		// sort users and groups alphabeticaly and put the groups behind the users
-		uasort($users,strcasecmp);
-		uasort($groups,strcasecmp);
+		uasort($users, strcasecmp);
+		uasort($groups, strcasecmp);
 		$select = $already_selected + $users + $groups;
 		if (count($selected) && !isset($selected[0]))	// id's are the keys
 		{
-			foreach($selected as $id => $val)
+			foreach ($selected as $id => $val)
 			{
 				if (is_string($val) && isset($users[$id]))	// add string to option-label
 				{
@@ -241,13 +240,13 @@ 
 			$selected = array_keys($selected);
 		}
 		// add necessary popup trigers
-		$link = egw::link('/index.php',array(
+		$link = egw::link('/index.php', array(
 			'menuaction' => 'phpgwapi.uiaccountsel.popup',
 			'app' => $app,
 			'use' => $use,
 			'element_id'  => $element_id,
-			'multiple' => $lines,	// single selection (multiple=0), closes after the first selection
-		),false);
+			'multiple' => $lines, // single selection (multiple=0), closes after the first selection
+		), false);
 		$app = $GLOBALS['egw_info']['flags']['currentapp'];
 		if (!$only_groups && ($lines <= 1 && $this->account_selection == 'popup' || !$lines && $this->account_selection == 'primary_group'))
 		{
@@ -256,14 +255,14 @@ 
 				$select['popup'] = lang('Search').' ...';
 			}
 		}
-		if ($onchange) $options .= ' onchange="'.$onchange.'"';	// no working under CSP without 'unsafe-inline'
+		if ($onchange) $options .= ' onchange="'.$onchange.'"'; // no working under CSP without 'unsafe-inline'
 
 		if ($extra_label)
 		{
 			//in php5 this put's the extra-label at the end: $select = array($extra_label) + $select;
 			$select2 = array('' => $extra_label);
 			$select2 += $select;
-			$select =& $select2; unset($select2);
+			$select = & $select2; unset($select2);
 		}
 		//error_log(__METHOD__."(..., use='$use', ...) account_selection='$this->account_selection', select=".array2string($select));
 
@@ -275,20 +274,20 @@ 
 			);
 		}
 		//echo "<p>html::select('$name',".print_r($selected,True).",".print_r($select,True).",True,'$options')</p>\n";
-		$html = html::select($name,$selected,$select,True,$options.' id="'.$element_id.
-			'" data-popup-link="'.htmlspecialchars($link).'"',$lines > 1 ? $lines : 0,false);
+		$html = html::select($name, $selected, $select, True, $options.' id="'.$element_id.
+			'" data-popup-link="'.htmlspecialchars($link).'"', $lines > 1 ? $lines : 0, false);
 
 		if (!$only_groups && ($lines > 0 && $this->account_selection == 'popup' || $lines > 1 && $this->account_selection == 'primary_group'))
 		{
-			$html .= html::submit_button('search','Search accounts',$js,false,
+			$html .= html::submit_button('search', 'Search accounts', $js, false,
 				' title="'.html::htmlspecialchars(lang('Search accounts')).
-				'" class="uiaccountselection_trigger" id="'.$element_id.'_popup"','search','phpgwapi','button');
+				'" class="uiaccountselection_trigger" id="'.$element_id.'_popup"', 'search', 'phpgwapi', 'button');
 		}
 		elseif (!$only_groups && ($lines == 1 || $lines > 0 && $this->account_selection == 'primary_group'))
 		{
-			$html .= html::submit_button('search','Select multiple accounts','',false,
+			$html .= html::submit_button('search', 'Select multiple accounts', '', false,
 				' title="'.html::htmlspecialchars(lang('Select multiple accounts')).
-				'" class="uiaccountselection_trigger" id="'.$element_id.'_multiple"','users','phpgwapi','button');
+				'" class="uiaccountselection_trigger" id="'.$element_id.'_multiple"', 'users', 'phpgwapi', 'button');
 		}
 		return $html;
 	}
@@ -298,20 +297,20 @@ 
 		// switch CSP to script-src 'unsafe-inline', until code get fixed here to work without
 		egw_framework::csp_script_src_attrs('unsafe-inline');
 
-		global $query;	// nextmatch requires that !!!
+		global $query; // nextmatch requires that !!!
 
-		$app = get_var('app',array('POST','GET'));
-		$use = get_var('use',array('POST','GET'));
-		$group_id = get_var('group_id',array('POST','GET'), $GLOBALS['egw_info']['user']['account_primary_group']);
-		$element_id = get_var('element_id',array('POST','GET'));
-		$multiple = get_var('multiple',array('POST','GET'));
+		$app = get_var('app', array('POST', 'GET'));
+		$use = get_var('use', array('POST', 'GET'));
+		$group_id = get_var('group_id', array('POST', 'GET'), $GLOBALS['egw_info']['user']['account_primary_group']);
+		$element_id = get_var('element_id', array('POST', 'GET'));
+		$multiple = get_var('multiple', array('POST', 'GET'));
 
-		$query = get_var('query',array('POST','GET'));
-		$query_type = get_var('query_type',array('POST','GET'));
+		$query = get_var('query', array('POST', 'GET'));
+		$query_type = get_var('query_type', array('POST', 'GET'));
 
-		$start = (int) get_var('start',array('POST'),0);
-		$order = get_var('order',array('POST','GET'),'account_lid');
-		$sort = get_var('sort',array('POST','GET'),'ASC');
+		$start = (int)get_var('start', array('POST'), 0);
+		$order = get_var('order', array('POST', 'GET'), 'account_lid');
+		$sort = get_var('sort', array('POST', 'GET'), 'ASC');
 
 		//echo "<p>uiaccountsel::popup(): app='$app', use='$use', multiple='$multiple', group_id='$group_id', element_id='$element_id', start='$start', order='$order', sort='$sort'</p>\n";
 
@@ -320,47 +319,47 @@ 
 		$GLOBALS['egw']->template->set_root(common::get_tpl_dir('phpgwapi'));
 
 		$GLOBALS['egw']->template->set_file(array('accounts_list_t' => 'uiaccountsel.tpl'));
-		$GLOBALS['egw']->template->set_block('accounts_list_t','letter_search','letter_search_cells');
-		$GLOBALS['egw']->template->set_block('accounts_list_t','group_cal','cal');
-		$GLOBALS['egw']->template->set_block('accounts_list_t','group_selectAll','selectAllGroups');
-		$GLOBALS['egw']->template->set_block('accounts_list_t','groups_multiple','multipleGroups');
-		$GLOBALS['egw']->template->set_block('accounts_list_t','group_other','other');
-		$GLOBALS['egw']->template->set_block('accounts_list_t','group_all','all');
-
-		$GLOBALS['egw']->template->set_block('accounts_list_t','bla_intro','ibla');
-		$GLOBALS['egw']->template->set_block('accounts_list_t','other_intro','iother');
-		$GLOBALS['egw']->template->set_block('accounts_list_t','all_intro','iall');
-
-		$GLOBALS['egw']->template->set_block('accounts_list_t','accounts_selectAll','selectAllAccounts');
-		$GLOBALS['egw']->template->set_block('accounts_list_t','accounts_multiple','multipleAccounts');
-		$GLOBALS['egw']->template->set_block('accounts_list_t','accounts_list','list');
-
-		$GLOBALS['egw']->template->set_var('font',$GLOBALS['egw_info']['theme']['font']);
-		$GLOBALS['egw']->template->set_var('lang_search',lang('search'));
-		$GLOBALS['egw']->template->set_var('lang_groups',lang('user groups'));
-		$GLOBALS['egw']->template->set_var('lang_accounts',lang('user accounts'));
-		$GLOBALS['egw']->template->set_var('lang_all',lang('all'));
-
-		$GLOBALS['egw']->template->set_var('img',common::image('phpgwapi','select'));
-		$GLOBALS['egw']->template->set_var('lang_select_user',lang('Select user'));
-		$GLOBALS['egw']->template->set_var('lang_select_group',lang('Select group'));
+		$GLOBALS['egw']->template->set_block('accounts_list_t', 'letter_search', 'letter_search_cells');
+		$GLOBALS['egw']->template->set_block('accounts_list_t', 'group_cal', 'cal');
+		$GLOBALS['egw']->template->set_block('accounts_list_t', 'group_selectAll', 'selectAllGroups');
+		$GLOBALS['egw']->template->set_block('accounts_list_t', 'groups_multiple', 'multipleGroups');
+		$GLOBALS['egw']->template->set_block('accounts_list_t', 'group_other', 'other');
+		$GLOBALS['egw']->template->set_block('accounts_list_t', 'group_all', 'all');
+
+		$GLOBALS['egw']->template->set_block('accounts_list_t', 'bla_intro', 'ibla');
+		$GLOBALS['egw']->template->set_block('accounts_list_t', 'other_intro', 'iother');
+		$GLOBALS['egw']->template->set_block('accounts_list_t', 'all_intro', 'iall');
+
+		$GLOBALS['egw']->template->set_block('accounts_list_t', 'accounts_selectAll', 'selectAllAccounts');
+		$GLOBALS['egw']->template->set_block('accounts_list_t', 'accounts_multiple', 'multipleAccounts');
+		$GLOBALS['egw']->template->set_block('accounts_list_t', 'accounts_list', 'list');
+
+		$GLOBALS['egw']->template->set_var('font', $GLOBALS['egw_info']['theme']['font']);
+		$GLOBALS['egw']->template->set_var('lang_search', lang('search'));
+		$GLOBALS['egw']->template->set_var('lang_groups', lang('user groups'));
+		$GLOBALS['egw']->template->set_var('lang_accounts', lang('user accounts'));
+		$GLOBALS['egw']->template->set_var('lang_all', lang('all'));
+
+		$GLOBALS['egw']->template->set_var('img', common::image('phpgwapi', 'select'));
+		$GLOBALS['egw']->template->set_var('lang_select_user', lang('Select user'));
+		$GLOBALS['egw']->template->set_var('lang_select_group', lang('Select group'));
 
 		if ($app)	// split the groups in the ones with run-rights and without
 		{
 			if ($use == 'both')		// groups with run-rights too, eg. calendar
 			{
-				$GLOBALS['egw']->template->fp('ibla','bla_intro',True);
+				$GLOBALS['egw']->template->fp('ibla', 'bla_intro', True);
 			}
 			else
 			{
-				$GLOBALS['egw']->template->fp('iother','other_intro',True);
+				$GLOBALS['egw']->template->fp('iother', 'other_intro', True);
 			}
-			$GLOBALS['egw']->template->fp('iall','all_intro',True);
+			$GLOBALS['egw']->template->fp('iall', 'all_intro', True);
 		}
 		else	// use all groups and account, eg. admin
 		{
-			$GLOBALS['egw']->template->set_var('lang_perm',lang('group name'));
-			$GLOBALS['egw']->template->fp('iother','other_intro',True);
+			$GLOBALS['egw']->template->set_var('lang_perm', lang('group name'));
+			$GLOBALS['egw']->template->fp('iother', 'other_intro', True);
 		}
 
 		if ($multiple >= 1)
@@ -370,11 +369,10 @@ 
 		$GLOBALS['egw_info']['flags']['app_header'] = lang('search or select accounts');
 		common::egw_header();
 
-		$GLOBALS['egw']->template->set_var('lang_perm',lang('Groups with permission for %1',lang($app)));
-		$GLOBALS['egw']->template->set_var('lang_nonperm',lang('Groups without permission for %1',lang($app)));
+		$GLOBALS['egw']->template->set_var('lang_perm', lang('Groups with permission for %1', lang($app)));
+		$GLOBALS['egw']->template->set_var('lang_nonperm', lang('Groups without permission for %1', lang($app)));
 
-		$link_data = array
-		(
+		$link_data = array(
 			'menuaction' => 'phpgwapi.uiaccountsel.popup',
 			'app'        => $app,
 			'use'        => $use,
@@ -386,27 +384,27 @@ 
 		);
 
 // -------------- list header variable template-declaration ------------------------
-		$GLOBALS['egw']->template->set_var('sort_lid',$nextmatchs->show_sort_order($sort,'account_lid',$order,'/index.php',lang('LoginID'),$link_data));
-		$GLOBALS['egw']->template->set_var('sort_firstname',$nextmatchs->show_sort_order($sort,'account_firstname',$order,'/index.php',lang('Firstname'),$link_data));
-		$GLOBALS['egw']->template->set_var('sort_lastname',$nextmatchs->show_sort_order($sort,'account_lastname',$order,'/index.php',lang('Lastname'),$link_data));
+		$GLOBALS['egw']->template->set_var('sort_lid', $nextmatchs->show_sort_order($sort, 'account_lid', $order, '/index.php', lang('LoginID'), $link_data));
+		$GLOBALS['egw']->template->set_var('sort_firstname', $nextmatchs->show_sort_order($sort, 'account_firstname', $order, '/index.php', lang('Firstname'), $link_data));
+		$GLOBALS['egw']->template->set_var('sort_lastname', $nextmatchs->show_sort_order($sort, 'account_lastname', $order, '/index.php', lang('Lastname'), $link_data));
 
 // ------------------------- end header declaration --------------------------------
 
 		$link_data['sort'] = $sort;
 		$link_data['order'] = $order;
 
-		$GLOBALS['egw']->template->set_var('lang_list_members',lang('List members'));
-		$GLOBALS['egw']->template->set_var('lang_firstname',lang('firstname'));
-		$GLOBALS['egw']->template->set_var('lang_lastname',lang('lastname'));
+		$GLOBALS['egw']->template->set_var('lang_list_members', lang('List members'));
+		$GLOBALS['egw']->template->set_var('lang_firstname', lang('firstname'));
+		$GLOBALS['egw']->template->set_var('lang_lastname', lang('lastname'));
 
 		if ($multiple)
 		{
-			$GLOBALS['egw']->template->fp('multipleGroups','groups_multiple',True);
+			$GLOBALS['egw']->template->fp('multipleGroups', 'groups_multiple', True);
 		}
 
 		if ($app)
 		{
-			$app_groups = $this->accounts->split_accounts($app,'groups');
+			$app_groups = $this->accounts->split_accounts($app, 'groups');
 		}
 		$all_groups = $this->accounts->search(array(
 			'type'  => 'groups',
@@ -414,44 +412,44 @@ 
 			'sort'  => 'ASC',
 		));
 		$tr_color_app_groups = $tr_color_all_groups = 'row_off';
-		foreach($all_groups as $group)
+		foreach ($all_groups as $group)
 		{
 			$link_data['group_id'] = $group['account_id'];
 
-			$GLOBALS['egw']->template->set_var('onclick',"ownAddOption('$element_id','".
-				addslashes(common::grab_owner_name($group['account_id']))."','$group[account_id]',".(int)($multiple==1).")".
+			$GLOBALS['egw']->template->set_var('onclick', "ownAddOption('$element_id','".
+				addslashes(common::grab_owner_name($group['account_id']))."','$group[account_id]',".(int)($multiple == 1).")".
 				(!$multiple ? '; window.close()' : ''));
 
-			if (!$app || in_array($group['account_id'],$app_groups))
+			if (!$app || in_array($group['account_id'], $app_groups))
 			{
-				$GLOBALS['egw']->template->set_var('tr_color',$tr_color_app_groups=$nextmatchs->alternate_row_color($tr_color_app_groups,True));
-				$GLOBALS['egw']->template->set_var('link_user_group',egw::link('/index.php',$link_data));
+				$GLOBALS['egw']->template->set_var('tr_color', $tr_color_app_groups = $nextmatchs->alternate_row_color($tr_color_app_groups, True));
+				$GLOBALS['egw']->template->set_var('link_user_group', egw::link('/index.php', $link_data));
 				$GLOBALS['egw']->template->set_var('name_user_group', ($group['account_id'] == $group_id ? '<b>' : '').
 					common::grab_owner_name($group['account_id']).($group['account_id'] == $group_id ? '</b>' : ''));
 
-				if($use == 'both')	// allow selection of groups
+				if ($use == 'both')	// allow selection of groups
 				{
-					$GLOBALS['egw']->template->fp('cal','group_cal',True);
-					$GLOBALS['egw']->template->set_var('js_addAllGroups',"ownAddOption('$element_id','".
-						addslashes(common::grab_owner_name($group['account_id']))."','$group[account_id]',".(int)($multiple==1).")".
+					$GLOBALS['egw']->template->fp('cal', 'group_cal', True);
+					$GLOBALS['egw']->template->set_var('js_addAllGroups', "ownAddOption('$element_id','".
+						addslashes(common::grab_owner_name($group['account_id']))."','$group[account_id]',".(int)($multiple == 1).")".
 						(!$multiple ? '; window.close();' : ';'));
-					$GLOBALS['egw']->template->fp('selectAllGroups','group_selectAll',True);
+					$GLOBALS['egw']->template->fp('selectAllGroups', 'group_selectAll', True);
 				}
 				else
 				{
-					$GLOBALS['egw']->template->fp('other','group_other',True);
+					$GLOBALS['egw']->template->fp('other', 'group_other', True);
 				}
 			}
 			else
 			{
-				$GLOBALS['egw']->template->set_var('tr_color',$tr_color_all_groups=$nextmatchs->alternate_row_color($tr_color_all_groups,True));
-				$GLOBALS['egw']->template->set_var('link_all_group',egw::link('/index.php',$link_data));
-				$GLOBALS['egw']->template->set_var('name_all_group',common::grab_owner_name($group['account_id']));
-				$GLOBALS['egw']->template->set_var('accountid',$group['account_id']);
-				$GLOBALS['egw']->template->fp('all','group_all',True);
+				$GLOBALS['egw']->template->set_var('tr_color', $tr_color_all_groups = $nextmatchs->alternate_row_color($tr_color_all_groups, True));
+				$GLOBALS['egw']->template->set_var('link_all_group', egw::link('/index.php', $link_data));
+				$GLOBALS['egw']->template->set_var('name_all_group', common::grab_owner_name($group['account_id']));
+				$GLOBALS['egw']->template->set_var('accountid', $group['account_id']);
+				$GLOBALS['egw']->template->fp('all', 'group_all', True);
 			}
 		}
-		$link_data['group_id'] = $group_id;		// reset it
+		$link_data['group_id'] = $group_id; // reset it
 
 // --------------------------------- nextmatch ---------------------------
 		$users = $this->accounts->search(array(
@@ -465,30 +463,30 @@ 
 		));
 
 		$GLOBALS['egw']->template->set_var(array(
-			'left'  => $nextmatchs->left('/index.php',$start,$this->accounts->total,$link_data+array('query'=>$query)),
-			'right' => $nextmatchs->right('/index.php',$start,$this->accounts->total,$link_data+array('query'=>$query)),
+			'left'  => $nextmatchs->left('/index.php', $start, $this->accounts->total, $link_data + array('query'=>$query)),
+			'right' => $nextmatchs->right('/index.php', $start, $this->accounts->total, $link_data + array('query'=>$query)),
 			'lang_showing' => ($group_id ? common::grab_owner_name($group_id).': ' : '').
-				($query ? lang("Search %1 '%2'",lang($this->accounts->query_types[$query_type]),$query).': ' : '')
-				.$nextmatchs->show_hits($this->accounts->total,$start),
+				($query ? lang("Search %1 '%2'", lang($this->accounts->query_types[$query_type]), $query).': ' : '')
+				.$nextmatchs->show_hits($this->accounts->total, $start),
 		));
 
 // -------------------------- end nextmatch ------------------------------------
 
-		$GLOBALS['egw']->template->set_var('search_action',egw::link('/index.php',$link_data));
+		$GLOBALS['egw']->template->set_var('search_action', egw::link('/index.php', $link_data));
 		$GLOBALS['egw']->template->set_var('prev_query', $query);
-		$GLOBALS['egw']->template->set_var('search_list',$nextmatchs->search(array('query' => $query, 'search_obj' => 1)));
+		$GLOBALS['egw']->template->set_var('search_list', $nextmatchs->search(array('query' => $query, 'search_obj' => 1)));
 		$GLOBALS['egw']->template->set_var('lang_firstname', lang("firstname"));
 		$GLOBALS['egw']->template->set_var('lang_lastname', lang("lastname"));
 
 		if ($multiple)
 		{
-			$GLOBALS['egw']->template->fp('multipleAccounts','accounts_multiple',True);
+			$GLOBALS['egw']->template->fp('multipleAccounts', 'accounts_multiple', True);
 		}
 
 		$tr_color = 'row_off';
-		foreach($users as $user)
+		foreach ($users as $user)
 		{
-			$GLOBALS['egw']->template->set_var('tr_color',$tr_color=$nextmatchs->alternate_row_color($tr_color,True));
+			$GLOBALS['egw']->template->set_var('tr_color', $tr_color = $nextmatchs->alternate_row_color($tr_color, True));
 
 // ---------------- template declaration for list records --------------------------
 
@@ -497,40 +495,40 @@ 
 				'firstname'	=> $user['account_firstname'] ? $user['account_firstname'] : '&nbsp;',
 				'lastname'	=> $user['account_lastname'] ? $user['account_lastname'] : '&nbsp;',
 				'onclick'	=> "ownAddOption('$element_id','".
-					addslashes(common::grab_owner_name($user['account_id']))."','$user[account_id]',".(int)($multiple==1).")".
+					addslashes(common::grab_owner_name($user['account_id']))."','$user[account_id]',".(int)($multiple == 1).")".
 					(!$multiple ? '; window.close()' : ''),
 			));
-			$GLOBALS['egw']->template->fp('list','accounts_list',True);
-			$GLOBALS['egw']->template->set_var('js_addAllAccounts',"ownAddOption('$element_id','".
-					addslashes(common::grab_owner_name($user['account_id']))."','$user[account_id]',".(int)($multiple==1).")".
+			$GLOBALS['egw']->template->fp('list', 'accounts_list', True);
+			$GLOBALS['egw']->template->set_var('js_addAllAccounts', "ownAddOption('$element_id','".
+					addslashes(common::grab_owner_name($user['account_id']))."','$user[account_id]',".(int)($multiple == 1).")".
 					(!$multiple ? '; window.close()' : ';'));
-			$GLOBALS['egw']->template->fp('selectAllAccounts','accounts_selectAll',True);
+			$GLOBALS['egw']->template->fp('selectAllAccounts', 'accounts_selectAll', True);
 		}
 
-		$GLOBALS['egw']->template->set_var('accountsel_icon',html::image('phpgwapi','users-big'));
-		$GLOBALS['egw']->template->set_var('query_type',is_array($this->accounts->query_types) ? html::select('query_type',$query_type,$this->accounts->query_types) : '');
+		$GLOBALS['egw']->template->set_var('accountsel_icon', html::image('phpgwapi', 'users-big'));
+		$GLOBALS['egw']->template->set_var('query_type', is_array($this->accounts->query_types) ? html::select('query_type', $query_type, $this->accounts->query_types) : '');
 
 		$link_data['query_type'] = 'start';
 		$letters = lang('alphabet');
-		$letters = explode(',',substr($letters,-1) != '*' ? $letters : 'a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z');
-		foreach($letters as $letter)
+		$letters = explode(',', substr($letters, -1) != '*' ? $letters : 'a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z');
+		foreach ($letters as $letter)
 		{
 			$link_data['query'] = $letter;
 			$GLOBALS['egw']->template->set_var(array(
 				'letter' => $letter,
-				'link'   => egw::link('/index.php',$link_data),
+				'link'   => egw::link('/index.php', $link_data),
 				'class'  => $query == $letter && $query_type == 'start' ? 'letter_box_active' : 'letter_box',
 			));
-			$GLOBALS['egw']->template->fp('letter_search_cells','letter_search',True);
+			$GLOBALS['egw']->template->fp('letter_search_cells', 'letter_search', True);
 		}
 		unset($link_data['query']);
 		unset($link_data['query_type']);
 		$GLOBALS['egw']->template->set_var(array(
 			'letter' => lang('all'),
-			'link'   => egw::link('/index.php',$link_data),
-			'class'  => $query_type != 'start' || !in_array($query,$letters) ? 'letter_box_active' : 'letter_box',
+			'link'   => egw::link('/index.php', $link_data),
+			'class'  => $query_type != 'start' || !in_array($query, $letters) ? 'letter_box_active' : 'letter_box',
 		));
-		$GLOBALS['egw']->template->fp('letter_search_cells','letter_search',True);
+		$GLOBALS['egw']->template->fp('letter_search_cells', 'letter_search', True);
 
 		$GLOBALS['egw']->template->set_var(array(
 			'lang_selection' => lang('selection'),
@@ -551,12 +549,12 @@ 
 		if ($multiple)
 		{
 			$GLOBALS['egw']->template->set_var(array(
-				'selection' => html::select('selected',False,array(),True,' id="uiaccountsel_popup_selection" style="width: 100%;"',13),
-				'remove' => html::submit_button('remove','remove',
-					"removeSelectedOptions('$element_id'); return false;",True,' title="'.lang('Remove selected accounts').'"','delete'),
+				'selection' => html::select('selected', False, array(), True, ' id="uiaccountsel_popup_selection" style="width: 100%;"', 13),
+				'remove' => html::submit_button('remove', 'remove',
+					"removeSelectedOptions('$element_id'); return false;", True, ' title="'.lang('Remove selected accounts').'"', 'delete'),
 			));
 		}
-		$GLOBALS['egw']->template->pfp('out','accounts_list_t',True);
+		$GLOBALS['egw']->template->pfp('out', 'accounts_list_t', True);
 
 		common::egw_footer();
 	}

Braces +49 added lines, -12 removed lines

@@ -93,13 +93,19 @@ 
 			$lines = 1;
 		}
 		// add "uiaccountselection" and account_selection-type class, to be able to style and select it with jQuery
-		if (strpos($options, 'class="') === false) $options .= ' class=""';
+		if (strpos($options, 'class="') === false)
+		{
+			$options .= ' class=""';
+		}
 		$options = str_replace('class="', 'class="uiaccountselection '.$this->account_selection.' ', $options);
 
-		if ($this->account_selection == 'none')	// dont show user-selection at all!
+		if ($this->account_selection == 'none')
+		{
+			// dont show user-selection at all!
 		{
 			return html::input_hidden($name,$selected);
 		}
+		}
 		if (!is_array($selected))
 		{
 			$selected = $selected ? explode(',',$selected) : array();
@@ -126,7 +132,10 @@ 
 				break;
 
 			case 'groups':
-				if ($this->account_selection == 'groupmembers') $use = 'owngroups';
+				if ($this->account_selection == 'groupmembers')
+				{
+					$use = 'owngroups';
+				}
 				// fall-through
 
 			case 'owngroups':
@@ -161,14 +170,20 @@ 
 				{
 					foreach((array)$this->accounts->members($gid,true) as $member)
 					{
-						if (!in_array($member,$select) && $this->accounts->is_active($member)) $select[] = $member;
+						if (!in_array($member,$select) && $this->accounts->is_active($member))
+						{
+							$select[] = $member;
+						}
 					}
 				}
-				if ($use == 'both')	// show all memberships
+				if ($use == 'both')
+				{
+					// show all memberships
 				{
 					if ($account_sel == 'primary_group')
 					{
 						$memberships = (array)$this->accounts->memberships($GLOBALS['egw_info']['user']['account_id'],true);
+				}
 					}
 					$select = array_merge($select,$memberships);
 				}
@@ -188,10 +203,13 @@ 
 				// make sure everything in $selected is also in $select, as in the other account-selection methods
 				if ($selected && ($missing = array_diff_key($selected,$select)))
 				{
-					foreach($missing as $k => $v)	// merge missing (cant use array_merge, because of nummeric keys!)
+					foreach($missing as $k => $v)
+					{
+						// merge missing (cant use array_merge, because of nummeric keys!)
 					{
 						$select[$k] = $v;
 					}
+					}
 				}
 				break;
 		}
@@ -208,12 +226,18 @@ 
 			$label = common::grab_owner_name($id);
 			if ($label[0] === '#' && $label_callback)
 			{
-				if (!($label = call_user_func($label_callback, $id))) continue;
+				if (!($label = call_user_func($label_callback, $id)))
+				{
+					continue;
+				}
 			}
-			if (in_array($id,$selected))	// show already selected accounts first
+			if (in_array($id,$selected))
+			{
+				// show already selected accounts first
 			{
 				$already_selected[$id] = $label;
 			}
+			}
 			elseif ($this->accounts->get_type($id) == 'u')
 			{
 				$users[$id] = !is_array($val) ? $label :
@@ -229,13 +253,16 @@ 
 		uasort($users,strcasecmp);
 		uasort($groups,strcasecmp);
 		$select = $already_selected + $users + $groups;
-		if (count($selected) && !isset($selected[0]))	// id's are the keys
+		if (count($selected) && !isset($selected[0]))
+		{
+			// id's are the keys
 		{
 			foreach($selected as $id => $val)
 			{
 				if (is_string($val) && isset($users[$id]))	// add string to option-label
 				{
 					$users[$id] .= " ($val)";
+		}
 				}
 			}
 			$selected = array_keys($selected);
@@ -256,7 +283,11 @@ 
 				$select['popup'] = lang('Search').' ...';
 			}
 		}
-		if ($onchange) $options .= ' onchange="'.$onchange.'"';	// no working under CSP without 'unsafe-inline'
+		if ($onchange)
+		{
+			$options .= ' onchange="'.$onchange.'"';
+		}
+		// no working under CSP without 'unsafe-inline'
 
 		if ($extra_label)
 		{
@@ -345,11 +376,14 @@ 
 		$GLOBALS['egw']->template->set_var('lang_select_user',lang('Select user'));
 		$GLOBALS['egw']->template->set_var('lang_select_group',lang('Select group'));
 
-		if ($app)	// split the groups in the ones with run-rights and without
+		if ($app)
+		{
+			// split the groups in the ones with run-rights and without
 		{
 			if ($use == 'both')		// groups with run-rights too, eg. calendar
 			{
 				$GLOBALS['egw']->template->fp('ibla','bla_intro',True);
+		}
 			}
 			else
 			{
@@ -429,9 +463,12 @@ 
 				$GLOBALS['egw']->template->set_var('name_user_group', ($group['account_id'] == $group_id ? '<b>' : '').
 					common::grab_owner_name($group['account_id']).($group['account_id'] == $group_id ? '</b>' : ''));
 
-				if($use == 'both')	// allow selection of groups
+				if($use == 'both')
+				{
+					// allow selection of groups
 				{
 					$GLOBALS['egw']->template->fp('cal','group_cal',True);
+				}
 					$GLOBALS['egw']->template->set_var('js_addAllGroups',"ownAddOption('$element_id','".
 						addslashes(common::grab_owner_name($group['account_id']))."','$group[account_id]',".(int)($multiple==1).")".
 						(!$multiple ? '; window.close();' : ';'));