EGroupware / egroupware

phpgwapi/inc/class.schema_proc.inc.php

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);

phpgwapi/inc/class.egw_datetime.inc.php

Indentation +4 added lines, -4 removed lines

@@ -38,10 +38,10 @@
 	unset($d3);
 
 	/**
-	* eGroupWare datetime class that contains common date/time functions
-	* 
-	* renamed to egw_datetime to support php5.2
-	*/
+	 * eGroupWare datetime class that contains common date/time functions
+	 * 
+	 * renamed to egw_datetime to support php5.2
+	 */
 	class egw_datetime
 	{
 		var $zone_offset_list = array(

phpgwapi/inc/htmLawed/htmLawedTest.php

Indentation +5 added lines, -5 removed lines

@@ -119,7 +119,7 @@ 
    $j = 0;
    // Add newline
    if ($i !== $len-1){
-    echo "\n";
+	echo "\n";
    }
   }
  }
@@ -544,12 +544,12 @@ 
   if(!empty($v[4])){ // + input text box
    echo '<input type="radio" name="h', $k, '" value="', $j, '"', (((isset($_POST['h'. $k]) && $_POST['h'. $k] == $j) or (!isset($_POST['h'. $k]) && $j == $v[1])) ? ' checked="checked"' : ''), (isset($v['d']) ? ' disabled="disabled"' : ''), ' />';
    if(!is_array($v[4])){
-    echo $v[6], ': <input type="text" size="', $v[4], '" name="h', $k. $j, '" value="', htmlspecialchars(isset($_POST['h'. $k. $j][0]) ? $_POST['h'. $k. $j] : $v[5]), '"', (isset($v['d']) ? ' disabled="disabled"' : ''), ' />';
+	echo $v[6], ': <input type="text" size="', $v[4], '" name="h', $k. $j, '" value="', htmlspecialchars(isset($_POST['h'. $k. $j][0]) ? $_POST['h'. $k. $j] : $v[5]), '"', (isset($v['d']) ? ' disabled="disabled"' : ''), ' />';
    }
    else{
-    foreach($v[4] as $z){
-     echo ' ', $z[3], ': <input type="text" size="', $z[0], '" name="h', $k. $j. $z[1], '" value="', htmlspecialchars(isset($_POST['h'. $k. $j. $z[1]][0]) ? $_POST['h'. $k. $j. $z[1]] : $z[2]), '"', (isset($v['d']) ? ' disabled="disabled"' : ''), ' />';
-    }
+	foreach($v[4] as $z){
+	 echo ' ', $z[3], ': <input type="text" size="', $z[0], '" name="h', $k. $j. $z[1], '" value="', htmlspecialchars(isset($_POST['h'. $k. $j. $z[1]][0]) ? $_POST['h'. $k. $j. $z[1]] : $z[2]), '"', (isset($v['d']) ? ' disabled="disabled"' : ''), ' />';
+	}
    }
   }
  }

phpgwapi/inc/htmLawed/htmLawed.php

Indentation +27 added lines, -27 removed lines

@@ -204,7 +204,7 @@ 
   elseif($do < 3 or isset($ok['#pcdata'])){echo $x;}
   elseif(strpos($x, "\x02\x04")){
    foreach(preg_split('`(\x01\x02[^\x01\x02]+\x02\x01)`', $x, -1, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY) as $v){
-    echo (substr($v, 0, 2) == "\x01\x02" ? $v : ($do > 4 ? preg_replace('`\S`', '', $v) : ''));
+	echo (substr($v, 0, 2) == "\x01\x02" ? $v : ($do > 4 ? preg_replace('`\S`', '', $v) : ''));
    }
   }elseif($do > 4){echo preg_replace('`\S`', '', $x);}
  }
@@ -357,7 +357,7 @@ 
    preg_match('`^([a-zA-Z\d\-+.]+://[^/]+)(.*)`', $C['base_url'], $m);
    $p = preg_replace('`(?<=/)\./`', '', $m[2]. $p);
    while(preg_match('`(?<=/)([^/]{3,}|[^/.]+?|\.[^/.]|[^/.]\.)/\.\./`', $p)){
-    $p = preg_replace('`(?<=/)([^/]{3,}|[^/.]+?|\.[^/.]|[^/.]\.)/\.\./`', '', $p);
+	$p = preg_replace('`(?<=/)([^/]{3,}|[^/.]+?|\.[^/.]|[^/.]\.)/\.\./`', '', $p);
    }
    $p = $m[1]. $p;
   }
@@ -471,20 +471,20 @@ 
  switch($mode){
   case 0: // Name
    if(preg_match('`^[a-zA-Z][\-a-zA-Z:]+`', $a, $m)){
-    $nm = strtolower($m[0]);
-    $w = $mode = 1; $a = ltrim(substr_replace($a, '', 0, strlen($m[0])));
+	$nm = strtolower($m[0]);
+	$w = $mode = 1; $a = ltrim(substr_replace($a, '', 0, strlen($m[0])));
    }
   break; case 1:
    if($a[0] == '='){ // =
-    $w = 1; $mode = 2; $a = ltrim($a, '= ');
+	$w = 1; $mode = 2; $a = ltrim($a, '= ');
    }else{ // No val
-    $w = 1; $mode = 0; $a = ltrim($a);
-    $aA[$nm] = '';
+	$w = 1; $mode = 0; $a = ltrim($a);
+	$aA[$nm] = '';
    }
   break; case 2: // Val
    if(preg_match('`^((?:"[^"]*")|(?:\'[^\']*\')|(?:\s*[^\s"\']+))(.*)`', $a, $m)){
-    $a = ltrim($m[2]); $m = $m[1]; $w = 1; $mode = 0;
-    $aA[$nm] = trim(($m[0] == '"' or $m[0] == '\'') ? substr($m, 1, -1) : $m);
+	$a = ltrim($m[2]); $m = $m[1]; $w = 1; $mode = 0;
+	$aA[$nm] = trim(($m[0] == '"' or $m[0] == '\'') ? substr($m, 1, -1) : $m);
    }
   break;
  }
@@ -507,8 +507,8 @@ 
   }
   if($k == 'style' && !$C['style_pass']){
    if(false !== strpos($v, '&#')){
-    static $sC = array('&#x20;'=>' ', '&#32;'=>' ', '&#x45;'=>'e', '&#69;'=>'e', '&#x65;'=>'e', '&#101;'=>'e', '&#x58;'=>'x', '&#88;'=>'x', '&#x78;'=>'x', '&#120;'=>'x', '&#x50;'=>'p', '&#80;'=>'p', '&#x70;'=>'p', '&#112;'=>'p', '&#x53;'=>'s', '&#83;'=>'s', '&#x73;'=>'s', '&#115;'=>'s', '&#x49;'=>'i', '&#73;'=>'i', '&#x69;'=>'i', '&#105;'=>'i', '&#x4f;'=>'o', '&#79;'=>'o', '&#x6f;'=>'o', '&#111;'=>'o', '&#x4e;'=>'n', '&#78;'=>'n', '&#x6e;'=>'n', '&#110;'=>'n', '&#x55;'=>'u', '&#85;'=>'u', '&#x75;'=>'u', '&#117;'=>'u', '&#x52;'=>'r', '&#82;'=>'r', '&#x72;'=>'r', '&#114;'=>'r', '&#x4c;'=>'l', '&#76;'=>'l', '&#x6c;'=>'l', '&#108;'=>'l', '&#x28;'=>'(', '&#40;'=>'(', '&#x29;'=>')', '&#41;'=>')', '&#x20;'=>':', '&#32;'=>':', '&#x22;'=>'"', '&#34;'=>'"', '&#x27;'=>"'", '&#39;'=>"'", '&#x2f;'=>'/', '&#47;'=>'/', '&#x2a;'=>'*', '&#42;'=>'*', '&#x5c;'=>'\\', '&#92;'=>'\\');
-    $v = strtr($v, $sC);
+	static $sC = array('&#x20;'=>' ', '&#32;'=>' ', '&#x45;'=>'e', '&#69;'=>'e', '&#x65;'=>'e', '&#101;'=>'e', '&#x58;'=>'x', '&#88;'=>'x', '&#x78;'=>'x', '&#120;'=>'x', '&#x50;'=>'p', '&#80;'=>'p', '&#x70;'=>'p', '&#112;'=>'p', '&#x53;'=>'s', '&#83;'=>'s', '&#x73;'=>'s', '&#115;'=>'s', '&#x49;'=>'i', '&#73;'=>'i', '&#x69;'=>'i', '&#105;'=>'i', '&#x4f;'=>'o', '&#79;'=>'o', '&#x6f;'=>'o', '&#111;'=>'o', '&#x4e;'=>'n', '&#78;'=>'n', '&#x6e;'=>'n', '&#110;'=>'n', '&#x55;'=>'u', '&#85;'=>'u', '&#x75;'=>'u', '&#117;'=>'u', '&#x52;'=>'r', '&#82;'=>'r', '&#x72;'=>'r', '&#114;'=>'r', '&#x4c;'=>'l', '&#76;'=>'l', '&#x6c;'=>'l', '&#108;'=>'l', '&#x28;'=>'(', '&#40;'=>'(', '&#x29;'=>')', '&#41;'=>')', '&#x20;'=>':', '&#32;'=>':', '&#x22;'=>'"', '&#34;'=>'"', '&#x27;'=>"'", '&#39;'=>"'", '&#x2f;'=>'/', '&#47;'=>'/', '&#x2a;'=>'*', '&#42;'=>'*', '&#x5c;'=>'\\', '&#92;'=>'\\');
+	$v = strtr($v, $sC);
    }
    $v = preg_replace_callback('`(url(?:\()(?: )*(?:\'|"|&(?:quot|apos);)?)(.+?)((?:\'|"|&(?:quot|apos);)?(?: )*(?:\)))`iS', 'hl_prot', $v);
    $v = !$C['css_expression'] ? preg_replace('`expression`i', ' ', preg_replace('`\\\\\S|(/|(%2f))(\*|(%2a))`i', ' ', $v)) : $v;
@@ -516,20 +516,20 @@ 
    $v = str_replace("\xad", ' ', (strpos($v, '&') !== false ? str_replace(array('&#xad;', '&#173;', '&shy;'), ' ', $v) : $v));
    $v = hl_prot($v, $k);
    if($k == 'href'){ // X-spam
-    if($C['anti_mail_spam'] && strpos($v, 'mailto:') === 0){
-     $v = str_replace('@', htmlspecialchars($C['anti_mail_spam']), $v);
-    }elseif($C['anti_link_spam']){
-     $r1 = $C['anti_link_spam'][1];
-     if(!empty($r1) && preg_match($r1, $v)){continue;}
-     $r0 = $C['anti_link_spam'][0];
-     if(!empty($r0) && preg_match($r0, $v)){
-      if(isset($a['rel'])){
-       if(!preg_match('`\bnofollow\b`i', $a['rel'])){$a['rel'] .= ' nofollow';}
-      }elseif(isset($aA['rel'])){
-       if(!preg_match('`\bnofollow\b`i', $aA['rel'])){$nfr = 1;}
-      }else{$a['rel'] = 'nofollow';}
-     }
-    }
+	if($C['anti_mail_spam'] && strpos($v, 'mailto:') === 0){
+	 $v = str_replace('@', htmlspecialchars($C['anti_mail_spam']), $v);
+	}elseif($C['anti_link_spam']){
+	 $r1 = $C['anti_link_spam'][1];
+	 if(!empty($r1) && preg_match($r1, $v)){continue;}
+	 $r0 = $C['anti_link_spam'][0];
+	 if(!empty($r0) && preg_match($r0, $v)){
+	  if(isset($a['rel'])){
+	   if(!preg_match('`\bnofollow\b`i', $a['rel'])){$a['rel'] .= ' nofollow';}
+	  }elseif(isset($aA['rel'])){
+	   if(!preg_match('`\bnofollow\b`i', $aA['rel'])){$nfr = 1;}
+	  }else{$a['rel'] = 'nofollow';}
+	 }
+	}
    }
   }
   if(isset($rl[$k]) && is_array($rl[$k]) && ($v = hl_attrval($v, $rl[$k])) === 0){continue;}
@@ -685,8 +685,8 @@ 
   $e = "<$e>";
   if(isset($d[$y])){
    if(!$x){
-    if($n){echo "\n", str_repeat($s, --$n), "$e\n", str_repeat($s, $n);}
-    else{++$N; ob_end_clean(); continue 2;}
+	if($n){echo "\n", str_repeat($s, --$n), "$e\n", str_repeat($s, $n);}
+	else{++$N; ob_end_clean(); continue 2;}
    }
    else{echo "\n", str_repeat($s, $n), "$e\n", str_repeat($s, ($x != 1 ? ++$n : $n));}
    echo $r; continue;

phpgwapi/inc/class.egw_grid_columns.inc.php

Indentation +1 added lines, -1 removed lines

@@ -214,7 +214,7 @@
 	public function set_visible($val)
 	{
 		if ($this->visibility != EGW_COL_VISIBILITY_ALWAYS &&
-		    $this->visibility != EGW_COL_VISIBILITY_ALWAYS_NOSELECT)
+			$this->visibility != EGW_COL_VISIBILITY_ALWAYS_NOSELECT)
 		{
 			$this->visibility = $val ? EGW_COL_VISIBILITY_VISIBLE : EGW_COL_VISIBILITY_INVISIBLE;
 		}

phpgwapi/inc/class.translation.inc.php

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'))

phpgwapi/inc/class.egw_link.inc.php

Indentation +3 added lines, -3 removed lines

@@ -480,7 +480,7 @@ 
 		}
 		$ids = Link\Storage::get_links($app, $id, $only_app, $order, $deleted, $limit);
 		if (empty($only_app) || $only_app == self::VFS_APPNAME ||
-		    ($only_app[0] == '!' && $only_app != '!'.self::VFS_APPNAME))
+			($only_app[0] == '!' && $only_app != '!'.self::VFS_APPNAME))
 		{
 			if (($vfs_ids = self::list_attached($app,$id)))
 			{
@@ -536,7 +536,7 @@ 
 		$links = Link\Storage::get_links($app,$ids,$only_app,$order,$deleted);
 
 		if (empty($only_app) || $only_app == self::VFS_APPNAME ||
-		    ($only_app[0] == '!' && $only_app != '!'.self::VFS_APPNAME))
+			($only_app[0] == '!' && $only_app != '!'.self::VFS_APPNAME))
 		{
 			// todo do that in a single query, eg. directory listing, too
 			foreach($ids as $id)
@@ -793,7 +793,7 @@ 
 
 		if (!isset($options['total']))
 		{
-		       $options['total'] = count($result);
+			   $options['total'] = count($result);
 		}
 		if (is_array($result) && (isset($options['start']) || (isset($options['num_rows']) && count($result) > $options['num_rows'])))
 		{

phpgwapi/inc/class.tplsavant2.inc.php

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");

phpgwapi/inc/class.hooks.inc.php

Indentation +1 added lines, -1 removed lines

@@ -266,7 +266,7 @@
 	/**
 	 * Add or/update a single application hook
 	 *
- 	 * setup file of app will be included and the hook required will be added/or updated
+	 * setup file of app will be included and the hook required will be added/or updated
 	 *
 	 * @param string $appname Application 'name'
 	 * @param string $location is required, the hook itself