EGroupware / egroupware

etemplate/inc/class.tab_widget.inc.php

Doc Comments -1 removed lines

@@ -55,7 +55,6 @@
 		 *
 		 * This function is called before the extension gets rendered
 		 *
-		 * @param string $name form-name of the control
 		 * @param mixed &$value value / existing content, can be modified
 		 * @param array &$cell array with the widget, can be modified for ui-independent widgets
 		 * @param array &$readonlys names of widgets as key, to be made readonly

Spacing +42 added lines, -42 removed lines

@@ -33,13 +33,13 @@ 
 		var $public_functions = array(
 			'pre_process' => True,
 			'post_process' => True,
-			'noReadonlysALL' => true,	// mark extension as not to set readonly for $readonlys['__ALL__']
+			'noReadonlysALL' => true, // mark extension as not to set readonly for $readonlys['__ALL__']
 		);
 		/**
 		 * availible extensions and there names for the editor
 		 * @var string
 		 */
-		var $human_name = 'Tabs';	// this is the name for the editor
+		var $human_name = 'Tabs'; // this is the name for the editor
 
 		/**
 		 * Constructor of the extension
@@ -63,7 +63,7 @@ 
 		 * @param etemplate &$tmpl reference to the template we belong too
 		 * @return boolean true if extra label is allowed, false otherwise
 		 */
-		function pre_process($form_name,&$value,&$cell,&$readonlys,&$extension_data,&$tmpl)
+		function pre_process($form_name, &$value, &$cell, &$readonlys, &$extension_data, &$tmpl)
 		{
 			//echo "<p>tab_widget::pre_process('$form_name',".array2string($value).','.array2string($readonlys).','.array2string($extension_data).")</p>\n";
 
@@ -71,38 +71,38 @@ 
 			{
 				$dom_enabled = true;
 			}
-			if (strpos($cell_name=$tab_names=$cell['name'],'=') !== false)
+			if (strpos($cell_name = $tab_names = $cell['name'], '=') !== false)
 			{
-				list($cell_name,$tab_names) = explode('=',$cell['name']);
+				list($cell_name, $tab_names) = explode('=', $cell['name']);
 				$cell['name'] = $cell_name;
 			}
 			$labels = $helps = $names = $templates = $ids = array();
 			if ($cell['tabs'])	// set via etemplate::setElementAttribute()
 			{
-				foreach($cell['tabs'] as $tab)
+				foreach ($cell['tabs'] as $tab)
 				{
 					$labels[] = $tab['label'];
 					$helps[] = $tab['help'];
 					$names[] = $tab['id'] ? $tab['id'] : $tab['template'];
-					if ($tab['template']) $templates[count($names)-1] = $tab['template'];
-					if ($tab['id']) $ids[count($names)-1] = $tab['id'];
+					if ($tab['template']) $templates[count($names) - 1] = $tab['template'];
+					if ($tab['id']) $ids[count($names) - 1] = $tab['id'];
 				}
 			}
 			else
 			{
-				$labels = explode('|',$cell['label']);
-				$helps = explode('|',$cell['help']);
-				$names = explode('|',$tab_names);
+				$labels = explode('|', $cell['label']);
+				$helps = explode('|', $cell['help']);
+				$names = explode('|', $tab_names);
 			}
 
 			$short_names = array();
-			foreach($names as $name)
+			foreach ($names as $name)
 			{
 				$nparts = explode('.', $name);
 				$short_names[] = array_pop($nparts);
 			}
 			// disable tab mentioned in readonlys
-			foreach(is_array($readonlys) ? $readonlys : array($readonlys => true) as $name => $disable)
+			foreach (is_array($readonlys) ? $readonlys : array($readonlys => true) as $name => $disable)
 			{
 				if ($name && $disable && (($key = array_search($name, $names)) !== false ||
 					($key = array_search($name, $short_names)) !== false))
@@ -125,34 +125,34 @@ 
 			$tab_widget = new etemplate('etemplate.tab_widget');
 			$tab_widget->no_onclick = true;
 
-			if ($value && strpos($value,'.') === false)
+			if ($value && strpos($value, '.') === false)
 			{
-				$value = $tmpl->name . '.' . $value;
+				$value = $tmpl->name.'.'.$value;
 			}
-			foreach($names as $k => $name)
+			foreach ($names as $k => $name)
 			{
-				if (strpos($name,'.') === false)
+				if (strpos($name, '.') === false)
 				{
-					$name = $names[$k] = $tmpl->name . '.' . $name;
+					$name = $names[$k] = $tmpl->name.'.'.$name;
 				}
 				if ($value == $name)
 				{
 					$selected_tab = $name;
 				}
 			}
-			$all_names = implode('|',$names);
+			$all_names = implode('|', $names);
 
 			if (empty($selected_tab))
 			{
 				$value = $selected_tab = $names[0];
 			}
-			$extension_data = $value;	// remember the active tab in the extension_data
+			$extension_data = $value; // remember the active tab in the extension_data
 
-			foreach($names as $k => $name)
+			foreach ($names as $k => $name)
 			{
-				if (strpos($name,'.') === false)
+				if (strpos($name, '.') === false)
 				{
-					$name = $names[$k] = $tmpl->name . '.' . $name;
+					$name = $names[$k] = $tmpl->name.'.'.$name;
 				}
 				$tcell = boetemplate::empty_cell();
 				if ($value == $name)
@@ -177,44 +177,44 @@ 
 				$tcell['label'] = '<div>'.lang($labels[$k]).'</div>';
 				$tcell['help'] = $helps[$k];
 
-				$tab_widget->set_cell_attribute('tabs',1+$k,$tcell);
+				$tab_widget->set_cell_attribute('tabs', 1 + $k, $tcell);
 			}
-			$tab_widget->set_cell_attribute('tabs','type','hbox');
-			$tab_widget->set_cell_attribute('tabs','size',count($names));
-			$tab_widget->set_cell_attribute('tabs','name','');
+			$tab_widget->set_cell_attribute('tabs', 'type', 'hbox');
+			$tab_widget->set_cell_attribute('tabs', 'size', count($names));
+			$tab_widget->set_cell_attribute('tabs', 'name', '');
 
 			if ($dom_enabled)
 			{
-				foreach($names as $n => $name)
+				foreach ($names as $n => $name)
 				{
-					$bcell = boetemplate::empty_cell('template',$name);
-					$bcell['obj'] = new etemplate(empty($templates[$n]) ? $name : $templates[$n],$tmpl->as_array());
+					$bcell = boetemplate::empty_cell('template', $name);
+					$bcell['obj'] = new etemplate(empty($templates[$n]) ? $name : $templates[$n], $tmpl->as_array());
 					// hack to set id / content attribute on first grid, as it's not supported on template itself
 					if (!empty($ids[$n]) && $bcell['obj']->children[0]['type'] == 'grid')
 					{
 						$bcell['obj']->children[0]['name'] = $ids[$n];
 					}
-					$tab_widget->set_cell_attribute('body',$n+1,$bcell);
+					$tab_widget->set_cell_attribute('body', $n + 1, $bcell);
 				}
-				$tab_widget->set_cell_attribute('body','type','deck');
-				$tab_widget->set_cell_attribute('body','size',count($names));
-				$tab_widget->set_cell_attribute('body','span',',tab_body');
-				$tab_widget->set_cell_attribute('body','name',$cell_name);
+				$tab_widget->set_cell_attribute('body', 'type', 'deck');
+				$tab_widget->set_cell_attribute('body', 'size', count($names));
+				$tab_widget->set_cell_attribute('body', 'span', ',tab_body');
+				$tab_widget->set_cell_attribute('body', 'name', $cell_name);
 			}
 			else
 			{
-				$stab = new etemplate($selected_tab,$tmpl->as_array());
-				$tab_widget->set_cell_attribute('body','type','template');
-				$tab_widget->set_cell_attribute('body','size','');	// the deck has a '1' there
-				$tab_widget->set_cell_attribute('body','obj',$stab);
+				$stab = new etemplate($selected_tab, $tmpl->as_array());
+				$tab_widget->set_cell_attribute('body', 'type', 'template');
+				$tab_widget->set_cell_attribute('body', 'size', ''); // the deck has a '1' there
+				$tab_widget->set_cell_attribute('body', 'obj', $stab);
 			}
-			$tab_widget->set_cell_attribute('body','name',$selected_tab);
+			$tab_widget->set_cell_attribute('body', 'name', $selected_tab);
 
 			$cell['type'] = 'template';
 			$cell['obj'] = &$tab_widget;
 			$cell['label'] = $cell['help'] = '';
 
-			return False;	// NO extra Label
+			return False; // NO extra Label
 		}
 
 		/**
@@ -234,7 +234,7 @@ 
 		 * @param mixed &value_in the posted values (already striped of magic-quotes)
 		 * @return boolean true if $value has valid content, on false no content will be returned!
 		 */
-		function post_process($name,&$value,&$extension_data,&$loop,&$tmpl,$value_in)
+		function post_process($name, &$value, &$extension_data, &$loop, &$tmpl, $value_in)
 		{
 			//echo "<p>tab_widget::post_process($name): value_in = "; _debug_array($value_in);
 

Braces +16 added lines, -4 removed lines

@@ -67,25 +67,37 @@
 		{
 			//echo "<p>tab_widget::pre_process('$form_name',".array2string($value).','.array2string($readonlys).','.array2string($extension_data).")</p>\n";
 
-			if (!$cell['onchange'])	// onchange allows to use the old behavior (submit for each new tab)
+			if (!$cell['onchange'])
+			{
+				// onchange allows to use the old behavior (submit for each new tab)
 			{
 				$dom_enabled = true;
 			}
+			}
 			if (strpos($cell_name=$tab_names=$cell['name'],'=') !== false)
 			{
 				list($cell_name,$tab_names) = explode('=',$cell['name']);
 				$cell['name'] = $cell_name;
 			}
 			$labels = $helps = $names = $templates = $ids = array();
-			if ($cell['tabs'])	// set via etemplate::setElementAttribute()
+			if ($cell['tabs'])
+			{
+				// set via etemplate::setElementAttribute()
 			{
 				foreach($cell['tabs'] as $tab)
 				{
 					$labels[] = $tab['label'];
+			}
 					$helps[] = $tab['help'];
 					$names[] = $tab['id'] ? $tab['id'] : $tab['template'];
-					if ($tab['template']) $templates[count($names)-1] = $tab['template'];
-					if ($tab['id']) $ids[count($names)-1] = $tab['id'];
+					if ($tab['template'])
+					{
+						$templates[count($names)-1] = $tab['template'];
+					}
+					if ($tab['id'])
+					{
+						$ids[count($names)-1] = $tab['id'];
+					}
 				}
 			}
 			else

etemplate/inc/class.uilangfile.inc.php

Doc Comments +6 added lines

@@ -484,6 +484,9 @@ 
 		return str_replace(array('[',']','&','"'),array('%5B','%5D','&','"'),$id);
 	}
 
+	/**
+	 * @return string
+	 */
 	function recode_id($id)
 	{
 		if (get_magic_quotes_gpc())
@@ -493,6 +496,9 @@ 
 		return str_replace(array('%5B','%5D'),array('[',']'),$id);	// & + " are recode by php
 	}
 
+	/**
+	 * @param string $which
+	 */
 	function download($which,$userlang)
 	{
 		switch ($which)

Spacing +209 added lines, -209 removed lines

@@ -47,7 +47,7 @@ 
 	function __construct()
 	{
 		$this->template = new Template(EGW_SERVER_ROOT.'/etemplate/templates/default');
-		$this->template->egroupware_hack = False;	// else the phrases got translated
+		$this->template->egroupware_hack = False; // else the phrases got translated
 		$this->bo = new bolangfile();
 		$this->nextmatchs = new nextmatchs();
 		translation::add_app('developer_tools');
@@ -62,19 +62,19 @@ 
 
 	function addphrase()
 	{
-		$app_name   = get_var('app_name',array('POST','GET'));
-		$sourcelang = get_var('sourcelang',array('POST','GET'));
-		$targetlang = get_var('targetlang',array('POST','GET'));
+		$app_name   = get_var('app_name', array('POST', 'GET'));
+		$sourcelang = get_var('sourcelang', array('POST', 'GET'));
+		$targetlang = get_var('targetlang', array('POST', 'GET'));
 		$entry      = $_POST['entry'];
 
 		$this->bo->read_sessiondata();
-		if($_POST['add'] || $_POST['cancel'] || $_POST['more'])
+		if ($_POST['add'] || $_POST['cancel'] || $_POST['more'])
 		{
-			if($_POST['add'] || $_POST['more'])
+			if ($_POST['add'] || $_POST['more'])
 			{
 				if (get_magic_quotes_gpc())
 				{
-					foreach(array('message_id','content','target') as $name)
+					foreach (array('message_id', 'content', 'target') as $name)
 					{
 						$entry[$name] = stripslashes($entry[$name]);
 					}
@@ -88,7 +88,7 @@ 
 			}
 			if (!$_POST['more'])
 			{
-				$GLOBALS['egw']->redirect_link('/index.php',array(
+				$GLOBALS['egw']->redirect_link('/index.php', array(
 					'menuaction' => $this->use_app.'.uilangfile.edit',
 					'app_name'   => $app_name,
 					'sourcelang' => $sourcelang,
@@ -102,42 +102,42 @@ 
 		common::egw_header();
 		echo parse_navbar();
 
-		$this->template->set_var('form_action',$GLOBALS['egw']->link('/index.php', "menuaction=$this->use_app.uilangfile.addphrase"));
-		$this->template->set_var('sourcelang',$sourcelang);
-		$this->template->set_var('targetlang',$targetlang);
-		$this->template->set_var('app_name',$app_name);
+		$this->template->set_var('form_action', $GLOBALS['egw']->link('/index.php', "menuaction=$this->use_app.uilangfile.addphrase"));
+		$this->template->set_var('sourcelang', $sourcelang);
+		$this->template->set_var('targetlang', $targetlang);
+		$this->template->set_var('app_name', $app_name);
 
 		$this->template->set_file(array('form' => 'addphrase.tpl'));
-		$this->template->set_var('message_id_field','<textarea rows="5" style="width: 100%;" name="entry[message_id]"></textarea>');
+		$this->template->set_var('message_id_field', '<textarea rows="5" style="width: 100%;" name="entry[message_id]"></textarea>');
 		if ($app_name == 'api') $app_name = 'common';
-		$this->template->set_var('app_field',$this->lang_option($app_name,isset($entry)?$entry['app_name']:$app_name,'entry[app_name]'));
-		$this->template->set_var('translation_field','<textarea rows="5" style="width: 100%;"  name="entry[content]"></textarea>');
-		$this->template->set_var('target_field','<textarea rows="5" style="width: 100%;" name="entry[target]"></textarea>');
-
-		$this->template->set_var('lang_message_id',lang('message_id in English'));
-		$this->template->set_var('lang_app',lang('Application'));
-		$this->template->set_var('lang_translation',lang('Phrase in English (or empty if identical)'));
-		$this->template->set_var('lang_target',lang('Translation of phrase'));
-		$this->template->set_var('lang_add',lang('Add'));
-		$this->template->set_var('lang_more',lang('Add more'));
-		$this->template->set_var('lang_cancel',lang('Cancel'));
-
-		$this->template->pfp('phpgw_body','form');
+		$this->template->set_var('app_field', $this->lang_option($app_name, isset($entry) ? $entry['app_name'] : $app_name, 'entry[app_name]'));
+		$this->template->set_var('translation_field', '<textarea rows="5" style="width: 100%;"  name="entry[content]"></textarea>');
+		$this->template->set_var('target_field', '<textarea rows="5" style="width: 100%;" name="entry[target]"></textarea>');
+
+		$this->template->set_var('lang_message_id', lang('message_id in English'));
+		$this->template->set_var('lang_app', lang('Application'));
+		$this->template->set_var('lang_translation', lang('Phrase in English (or empty if identical)'));
+		$this->template->set_var('lang_target', lang('Translation of phrase'));
+		$this->template->set_var('lang_add', lang('Add'));
+		$this->template->set_var('lang_more', lang('Add more'));
+		$this->template->set_var('lang_cancel', lang('Cancel'));
+
+		$this->template->pfp('phpgw_body', 'form');
 	}
 
 	function missingphrase()
 	{
-		$app_name    = get_var('app_name',array('POST','GET'));
-		$sourcelang  = get_var('sourcelang',array('POST','GET'));
-		$targetlang  = get_var('targetlang',array('POST','GET'));
+		$app_name    = get_var('app_name', array('POST', 'GET'));
+		$sourcelang  = get_var('sourcelang', array('POST', 'GET'));
+		$targetlang  = get_var('targetlang', array('POST', 'GET'));
 
 		$this->bo->read_sessiondata();
-		$this->bo->missing_app($app_name,$sourcelang);
+		$this->bo->missing_app($app_name, $sourcelang);
 		$this->bo->save_sessiondata();
 
 		// we have to redirect here, as solangfile defines function sidebox_menu, which clashes with the iDots func.
 		//
-		$GLOBALS['egw']->redirect_link('/index.php',array(
+		$GLOBALS['egw']->redirect_link('/index.php', array(
 			'menuaction' => $this->use_app.'.uilangfile.missingphrase2',
 			'app_name'   => $app_name,
 			'sourcelang' => $sourcelang,
@@ -147,9 +147,9 @@ 
 
 	function missingphrase2()
 	{
-		$app_name    = get_var('app_name',array('POST','GET'));
-		$sourcelang  = get_var('sourcelang',array('POST','GET'));
-		$targetlang  = get_var('targetlang',array('POST','GET'));
+		$app_name    = get_var('app_name', array('POST', 'GET'));
+		$sourcelang  = get_var('sourcelang', array('POST', 'GET'));
+		$targetlang  = get_var('targetlang', array('POST', 'GET'));
 		$newlang     = $_POST['newlang'];
 		$dlsource    = $_POST['dlsource'];
 		$writesource = $_POST['writesource'];
@@ -161,16 +161,16 @@ 
 		$this->bo->read_sessiondata();
 
 		$this->template->set_file(array('langfile' => 'langmissing.tpl'));
-		$this->template->set_block('langfile','header','header');
-		$this->template->set_block('langfile','postheader','postheader');
-		$this->template->set_block('langfile','detail','detail');
-		$this->template->set_block('langfile','prefooter','prefooter');
-		$this->template->set_block('langfile','footer','footer');
-		if(!$sourcelang)
+		$this->template->set_block('langfile', 'header', 'header');
+		$this->template->set_block('langfile', 'postheader', 'postheader');
+		$this->template->set_block('langfile', 'detail', 'detail');
+		$this->template->set_block('langfile', 'prefooter', 'prefooter');
+		$this->template->set_block('langfile', 'footer', 'footer');
+		if (!$sourcelang)
 		{
 			$sourcelang = 'en';
 		}
-		if(!$targetlang)
+		if (!$targetlang)
 		{
 			$targetlang = 'en';
 		}
@@ -178,12 +178,12 @@ 
 		//echo "missingarray=<pre>"; print_r($this->bo->missing_langarray); echo "</pre>\n";
 		if ($update)
 		{
-			$deleteme     = $_POST['delete'];
+			$deleteme = $_POST['delete'];
 			//echo "deleteme=<pre>"; print_r($deleteme); echo "</pre>\n";
 
-			while (list($_mess,$_checked) = @each($deleteme))
+			while (list($_mess, $_checked) = @each($deleteme))
 			{
-				if($_checked == 'on')
+				if ($_checked == 'on')
 				{
 					$_mess = $this->recode_id($_mess);
 					$this->bo->movephrase($_mess);
@@ -195,7 +195,7 @@ 
 			unset($deleteme);
 
 			$this->bo->save_sessiondata();
-			$GLOBALS['egw']->redirect_link('/index.php',array(
+			$GLOBALS['egw']->redirect_link('/index.php', array(
 				'menuaction' => $this->use_app.'.uilangfile.edit',
 				'app_name'   => $app_name,
 				'sourcelang' => $sourcelang,
@@ -205,40 +205,40 @@ 
 		common::egw_header();
 		echo parse_navbar();
 
-		$this->template->set_var('lang_remove',lang('Add phrase'));
-		$this->template->set_var('lang_application',lang('Application'));
-		$this->template->set_var('lang_update',lang('Add'));
-		$this->template->set_var('lang_view',lang('Cancel'));
-
-		$this->template->set_var('action_url',$GLOBALS['egw']->link('/index.php', "menuaction=$this->use_app.uilangfile.missingphrase2"));
-		$this->template->set_var('sourcelang',$sourcelang);
-		$this->template->set_var('targetlang',$targetlang);
-		$this->template->set_var('app_name',$app_name);
-		$this->template->set_var('app_title',$GLOBALS['egw_info']['apps'][$app_name]['title']);
-		$this->template->pfp('out','header');
-		if($sourcelang && $targetlang)
-		{
-			$this->template->set_var('lang_appname',lang('Application'));
-			$this->template->set_var('lang_message',lang('Message'));
-			$this->template->set_var('lang_original',lang('Original'));
+		$this->template->set_var('lang_remove', lang('Add phrase'));
+		$this->template->set_var('lang_application', lang('Application'));
+		$this->template->set_var('lang_update', lang('Add'));
+		$this->template->set_var('lang_view', lang('Cancel'));
+
+		$this->template->set_var('action_url', $GLOBALS['egw']->link('/index.php', "menuaction=$this->use_app.uilangfile.missingphrase2"));
+		$this->template->set_var('sourcelang', $sourcelang);
+		$this->template->set_var('targetlang', $targetlang);
+		$this->template->set_var('app_name', $app_name);
+		$this->template->set_var('app_title', $GLOBALS['egw_info']['apps'][$app_name]['title']);
+		$this->template->pfp('out', 'header');
+		if ($sourcelang && $targetlang)
+		{
+			$this->template->set_var('lang_appname', lang('Application'));
+			$this->template->set_var('lang_message', lang('Message'));
+			$this->template->set_var('lang_original', lang('Original'));
 			$this->template->set_var('view_link',
 				$GLOBALS['egw']->link(
 					'/index.php',
-					"menuaction=$this->use_app.uilangfile.edit&app_name=".$app_name.'&sourcelang=' . $sourcelang . '&targetlang=' . $targetlang
+					"menuaction=$this->use_app.uilangfile.edit&app_name=".$app_name.'&sourcelang='.$sourcelang.'&targetlang='.$targetlang
 				)
 			);
-			$this->template->pfp('out','postheader');
-			while(list($key,$data) = @each($missingarray))
+			$this->template->pfp('out', 'postheader');
+			while (list($key, $data) = @each($missingarray))
 			{
-				$mess_id  = $this->encode_id($key);
-				$this->template->set_var('mess_id',$mess_id);
-				$this->template->set_var('source_content',html::htmlspecialchars($data['content']));
-				$this->template->set_var('transapp',$this->lang_option($app_name,$data['app_name'],"transapp[$mess_id]"));
-				$this->template->set_var('tr_class',$this->nextmatchs->alternate_row_color('',true));
-				$this->template->pfp('out','detail');
+				$mess_id = $this->encode_id($key);
+				$this->template->set_var('mess_id', $mess_id);
+				$this->template->set_var('source_content', html::htmlspecialchars($data['content']));
+				$this->template->set_var('transapp', $this->lang_option($app_name, $data['app_name'], "transapp[$mess_id]"));
+				$this->template->set_var('tr_class', $this->nextmatchs->alternate_row_color('', true));
+				$this->template->pfp('out', 'detail');
 			}
-			$this->template->pfp('out','prefooter');
-			$this->template->pfp('out','footer');
+			$this->template->pfp('out', 'prefooter');
+			$this->template->pfp('out', 'footer');
 		}
 		/* _debug_array($this->bo->loaded_apps); */
 		$this->bo->save_sessiondata();
@@ -250,15 +250,15 @@ 
 		{
 			$GLOBALS['egw']->redirect_link('/index.php', "menuaction=$this->use_app.uilangfile.index");
 		}
-		$app_name   = get_var('app_name',array('POST','GET'));
-		$sourcelang = get_var('sourcelang',array('POST','GET'));
-		$targetlang = get_var('targetlang',array('POST','GET'));
-		$entry       = $_POST['entry'];
+		$app_name   = get_var('app_name', array('POST', 'GET'));
+		$sourcelang = get_var('sourcelang', array('POST', 'GET'));
+		$targetlang = get_var('targetlang', array('POST', 'GET'));
+		$entry = $_POST['entry'];
 
-		if($_POST['addphrase'] || $_POST['missingphrase'])
+		if ($_POST['addphrase'] || $_POST['missingphrase'])
 		{
-			$GLOBALS['egw']->redirect_link('/index.php',array(
-				'menuaction' => $this->use_app.'.uilangfile.'.($_POST['addphrase']?'addphrase':'missingphrase'),
+			$GLOBALS['egw']->redirect_link('/index.php', array(
+				'menuaction' => $this->use_app.'.uilangfile.'.($_POST['addphrase'] ? 'addphrase' : 'missingphrase'),
 				'app_name'   => $app_name,
 				'sourcelang' => $sourcelang,
 				'targetlang' => $targetlang
@@ -270,95 +270,95 @@ 
 		}
 		$this->bo->read_sessiondata();
 
-		if($_POST['dlsource'])
+		if ($_POST['dlsource'])
 		{
-			$this->download('source',$sourcelang);
+			$this->download('source', $sourcelang);
 		}
-		if($_POST['dltarget'])
+		if ($_POST['dltarget'])
 		{
-			$this->download('target',$targetlang);
+			$this->download('target', $targetlang);
 		}
 		$GLOBALS['egw_info']['flags']['css'] .= ".untranslated { background-color: #dab0b0; }\n";
 		common::egw_header();
 		echo parse_navbar();
 
 		$this->template->set_file(array('langfile' => 'langfile.tpl'));
-		$this->template->set_block('langfile','header','header');
-		$this->template->set_block('langfile','postheader','postheader');
-		$this->template->set_block('langfile','detail','detail');
-		$this->template->set_block('langfile','detail_long','detail_long');
-		$this->template->set_block('langfile','footer','footer');
-
-		$this->template->set_var('action_url',$GLOBALS['egw']->link('/index.php', "menuaction=$this->use_app.uilangfile.edit"));
-		$this->template->set_var('lang_remove',lang('Remove'));
-		$this->template->set_var('lang_application',lang('Application'));
-		$this->template->set_var('lang_source',lang('Source Language'));
-		$this->template->set_var('lang_target',lang('Target Language'));
-		$this->template->set_var('lang_submit',lang('Load'));
-		$this->template->set_var('lang_update',lang('Save'));
-		$this->template->set_var('lang_revert',lang('Revert'));
-		$this->template->set_var('lang_cancel',lang('Cancel'));
-		$this->template->set_var('lang_step',lang('Step'));
+		$this->template->set_block('langfile', 'header', 'header');
+		$this->template->set_block('langfile', 'postheader', 'postheader');
+		$this->template->set_block('langfile', 'detail', 'detail');
+		$this->template->set_block('langfile', 'detail_long', 'detail_long');
+		$this->template->set_block('langfile', 'footer', 'footer');
+
+		$this->template->set_var('action_url', $GLOBALS['egw']->link('/index.php', "menuaction=$this->use_app.uilangfile.edit"));
+		$this->template->set_var('lang_remove', lang('Remove'));
+		$this->template->set_var('lang_application', lang('Application'));
+		$this->template->set_var('lang_source', lang('Source Language'));
+		$this->template->set_var('lang_target', lang('Target Language'));
+		$this->template->set_var('lang_submit', lang('Load'));
+		$this->template->set_var('lang_update', lang('Save'));
+		$this->template->set_var('lang_revert', lang('Revert'));
+		$this->template->set_var('lang_cancel', lang('Cancel'));
+		$this->template->set_var('lang_step', lang('Step'));
 		$help = 'onMouseOver="self.status=\'%s\'; return true;" onMouseOut="self.status=\'\'; return true;"';
-		$this->template->set_var('cancel_help',sprintf($help,str_replace("'","\\'",lang('Returns to the application list, not saved changes get lost !!!'))));
-		$this->template->set_var('load_help',sprintf($help,str_replace("'","\\'",lang('Loads the selected lang-files, to be modified in the next steps'))));
-		$this->template->set_var('update_help',sprintf($help,str_replace("'","\\'",lang('Saves the added/changed translations to an internal buffer, to be used in further steps'))));
-		$this->template->set_var('search_help',sprintf($help,str_replace("'","\\'",lang('Searches the source-code for phrases not in the actual source-lang-file'))));
-		$this->template->set_var('add_help',sprintf($help,str_replace("'","\\'",lang('Allows you to add a single phrase'))));
-		$this->template->set_var('revert_help',sprintf($help,str_replace("'","\\'",lang('Clears the internal buffer, all changes made sofar are lost'))));
-		$this->template->set_var('download_help',sprintf($help,str_replace("'","\\'",lang('Download the lang-file to be saved in the apps setup-dir'))));
-		$this->template->set_var('write_help',sprintf($help,str_replace("'","\\'",lang('Write the lang-file to the apps setup-dir'))));
+		$this->template->set_var('cancel_help', sprintf($help, str_replace("'", "\\'", lang('Returns to the application list, not saved changes get lost !!!'))));
+		$this->template->set_var('load_help', sprintf($help, str_replace("'", "\\'", lang('Loads the selected lang-files, to be modified in the next steps'))));
+		$this->template->set_var('update_help', sprintf($help, str_replace("'", "\\'", lang('Saves the added/changed translations to an internal buffer, to be used in further steps'))));
+		$this->template->set_var('search_help', sprintf($help, str_replace("'", "\\'", lang('Searches the source-code for phrases not in the actual source-lang-file'))));
+		$this->template->set_var('add_help', sprintf($help, str_replace("'", "\\'", lang('Allows you to add a single phrase'))));
+		$this->template->set_var('revert_help', sprintf($help, str_replace("'", "\\'", lang('Clears the internal buffer, all changes made sofar are lost'))));
+		$this->template->set_var('download_help', sprintf($help, str_replace("'", "\\'", lang('Download the lang-file to be saved in the apps setup-dir'))));
+		$this->template->set_var('write_help', sprintf($help, str_replace("'", "\\'", lang('Write the lang-file to the apps setup-dir'))));
 
-		if(!$sourcelang)
+		if (!$sourcelang)
 		{
 			$sourcelang = 'en';
 		}
-		if(!$targetlang)
+		if (!$targetlang)
 		{
 			$targetlang = $GLOBALS['egw_info']['user']['preferences']['common']['lang'];
 		}
 
-		foreach(translation::list_langs() as $lang_id => $lang_name)
+		foreach (translation::list_langs() as $lang_id => $lang_name)
 		{
-			$sourcelangs .= '      <option value="' . $lang_id . '"';
+			$sourcelangs .= '      <option value="'.$lang_id.'"';
 			if ($lang_id == $sourcelang || !$sourcelang && $lang_id == 'en')
 			{
 				$sourcelangs .= ' selected="selected"';
 			}
-			$sourcelangs .= '>' . $lang_name . '</option>' . "\n";
+			$sourcelangs .= '>'.$lang_name.'</option>'."\n";
 
-			$targetlangs .= '      <option value="' . $lang_id . '"';
+			$targetlangs .= '      <option value="'.$lang_id.'"';
 			if ($lang_id == $targetlang || !$targetlang && $lang_id == 'en')
 			{
 				$targetlangs .= ' selected="selected"';
 			}
-			$targetlangs .= '>' . $lang_name . '</option>' . "\n";
+			$targetlangs .= '>'.$lang_name.'</option>'."\n";
 		}
-		$this->template->set_var('sourcelangs',$sourcelangs);
-		$this->template->set_var('targetlangs',$targetlangs);
-		$this->template->set_var('app_name',$app_name);
-		$this->template->set_var('app_title',$GLOBALS['egw_info']['apps'][$app_name]['title']);
-		$this->template->pfp('out','header');
+		$this->template->set_var('sourcelangs', $sourcelangs);
+		$this->template->set_var('targetlangs', $targetlangs);
+		$this->template->set_var('app_name', $app_name);
+		$this->template->set_var('app_title', $GLOBALS['egw_info']['apps'][$app_name]['title']);
+		$this->template->pfp('out', 'header');
 
-		foreach($GLOBALS['egw_info']['apps']+array('setup' => array('title' => lang('Setup'))) as $app => $data)
+		foreach ($GLOBALS['egw_info']['apps'] + array('setup' => array('title' => lang('Setup'))) as $app => $data)
 		{
-			$userapps .= '<option value="' . $userapp . '"';
+			$userapps .= '<option value="'.$userapp.'"';
 			if ($application_name == $userapp)
 			{
 				$userapps .= ' selected="selected"';
 			}
-			$userapps .= '>' . $data['title'] . '</option>' . "\n";
+			$userapps .= '>'.$data['title'].'</option>'."\n";
 		}
-		$this->template->set_var('userapps',$userapps);
+		$this->template->set_var('userapps', $userapps);
 
 		if ($_POST['update'] || $_POST['update_too'])
 		{
 			$transapp     = $_POST['transapp'];
 			$translations = $_POST['translations'];
 			$deleteme     = $_POST['delete'];
-			foreach($transapp as $_mess => $_app)
+			foreach ($transapp as $_mess => $_app)
 			{
-				if($_mess)
+				if ($_mess)
 				{
 					$_mess = strtolower(trim($this->recode_id($_mess)));
 					$this->bo->source_langarray[$_mess]['app_name'] = $_app;
@@ -369,9 +369,9 @@ 
 			{
 				$this->bo->target_langarray = array();
 			}
-			foreach($translations as $_mess => $_cont)
+			foreach ($translations as $_mess => $_cont)
 			{
-				if($_mess && $_cont)
+				if ($_mess && $_cont)
 				{
 					$_mess = strtolower(trim($this->recode_id($_mess)));
 					$this->bo->target_langarray[$_mess]['message_id'] = $_mess;
@@ -381,16 +381,16 @@ 
 						$_cont = stripslashes($_cont);
 					}
 					$this->bo->target_langarray[$_mess]['content'] = $_cont;
-					if($sourcelang == $targetlang)
+					if ($sourcelang == $targetlang)
 					{
 						$this->bo->source_langarray[$_mess]['content'] = $_cont;
 					}
 				}
 			}
 			if ($deleteme)
-			foreach($deleteme as $_mess => $_checked)
+			foreach ($deleteme as $_mess => $_checked)
 			{
-				if($_checked == 'on')
+				if ($_checked == 'on')
 				{
 					$_mess = strtolower(trim($this->recode_id($_mess)));
 					unset($this->bo->source_langarray[$_mess]);
@@ -402,78 +402,78 @@ 
 			/* $this->bo->save_sessiondata($this->bo->source_langarray,$this->bo->target_langarray); */
 			unset($transapp);
 			unset($translations);
-			if($deleteme)
+			if ($deleteme)
 			{
 				$this->bo->save_sessiondata();
 			}
 			unset($deleteme);
 		}
-		if($_POST['writesource'] || $_POST['writesource_too'])
+		if ($_POST['writesource'] || $_POST['writesource_too'])
 		{
-			echo '<br>'.lang("Writing langfile for '%1' ...",$sourcelang);
-			$this->bo->write_file('source',$app_name,$sourcelang);
+			echo '<br>'.lang("Writing langfile for '%1' ...", $sourcelang);
+			$this->bo->write_file('source', $app_name, $sourcelang);
 		}
-		if($_POST['writetarget'] || $_POST['writetarget_too'])
+		if ($_POST['writetarget'] || $_POST['writetarget_too'])
 		{
-			echo '<br>'.lang("Writing langfile for '%1' ...",$targetlang);
-			$this->bo->write_file('target',$app_name,$targetlang);
+			echo '<br>'.lang("Writing langfile for '%1' ...", $targetlang);
+			$this->bo->write_file('target', $app_name, $targetlang);
 		}
 
-		if($sourcelang && $targetlang)
+		if ($sourcelang && $targetlang)
 		{
-			$this->template->set_var('lang_appname',lang('Application'));
-			$this->template->set_var('lang_message',lang('Message'));
-			$this->template->set_var('lang_original',lang('Original'));
-			$this->template->set_var('lang_translation',lang('Translation'));
-			$this->template->set_var('lang_missingphrase',lang('Search new phrases'));
-			$this->template->set_var('lang_addphrase',lang('Add new phrase'));
-			$this->template->set_var('sourcelang',$sourcelang);
-			$this->template->set_var('targetlang',$targetlang);
-			$this->template->pfp('out','postheader');
+			$this->template->set_var('lang_appname', lang('Application'));
+			$this->template->set_var('lang_message', lang('Message'));
+			$this->template->set_var('lang_original', lang('Original'));
+			$this->template->set_var('lang_translation', lang('Translation'));
+			$this->template->set_var('lang_missingphrase', lang('Search new phrases'));
+			$this->template->set_var('lang_addphrase', lang('Add new phrase'));
+			$this->template->set_var('sourcelang', $sourcelang);
+			$this->template->set_var('targetlang', $targetlang);
+			$this->template->pfp('out', 'postheader');
 
-			$langarray = $this->bo->add_app($app_name,$sourcelang);
-			$translation = $this->bo->load_app($app_name,$targetlang);
+			$langarray = $this->bo->add_app($app_name, $sourcelang);
+			$translation = $this->bo->load_app($app_name, $targetlang);
 
-			while(list($key,$data) = @each($langarray))
+			while (list($key, $data) = @each($langarray))
 			{
 				$mess_id  = $this->encode_id($key);
 				$content  = html::htmlspecialchars($mess_id == 'charset' ? $mess_id : $data['content']);
 				$transy   = html::htmlspecialchars($translation[$key]['content']);
-				$this->template->set_var('mess_id',$mess_id);
-				$this->template->set_var('source_content',$content);
-				$this->template->set_var('content',$transy);
-				$this->template->set_var('transapp',$this->lang_option($app_name,$data['app_name'],"transapp[$mess_id]"));
-				$this->template->set_var('tr_class',empty($transy) ? 'untranslated' : $this->nextmatchs->alternate_row_color('',true));
-				if (($len = max(strlen($key),strlen($content))) > 50)
+				$this->template->set_var('mess_id', $mess_id);
+				$this->template->set_var('source_content', $content);
+				$this->template->set_var('content', $transy);
+				$this->template->set_var('transapp', $this->lang_option($app_name, $data['app_name'], "transapp[$mess_id]"));
+				$this->template->set_var('tr_class', empty($transy) ? 'untranslated' : $this->nextmatchs->alternate_row_color('', true));
+				if (($len = max(strlen($key), strlen($content))) > 50)
 				{
-					$this->template->set_var('rows',min(intval($len/80+0.5),10));
-					$this->template->pfp('out','detail_long');
+					$this->template->set_var('rows', min(intval($len / 80 + 0.5), 10));
+					$this->template->pfp('out', 'detail_long');
 				}
 				else
 				{
-					$this->template->pfp('out','detail');
+					$this->template->pfp('out', 'detail');
 				}
 			}
-			$this->template->set_var('sourcelang',$sourcelang);
-			$this->template->set_var('targetlang',$targetlang);
-			$this->template->set_var('lang_write',lang('Write'));
-			$this->template->set_var('lang_download',lang('Download'));
-			$this->template->set_var('src_file',$this->bo->src_file);
-			if(!$this->bo->loaded_apps[$sourcelang]['writeable'])
+			$this->template->set_var('sourcelang', $sourcelang);
+			$this->template->set_var('targetlang', $targetlang);
+			$this->template->set_var('lang_write', lang('Write'));
+			$this->template->set_var('lang_download', lang('Download'));
+			$this->template->set_var('src_file', $this->bo->src_file);
+			if (!$this->bo->loaded_apps[$sourcelang]['writeable'])
 			{
-				$this->template->set_block('footer','srcwrite','srcwrite');
-				$this->template->set_var('srcwrite','');
+				$this->template->set_block('footer', 'srcwrite', 'srcwrite');
+				$this->template->set_var('srcwrite', '');
 			}
-			$this->template->set_var('tgt_file',$this->bo->tgt_file);
-			$this->template->set_var('targetlang',$targetlang);
-			if(!$this->bo->loaded_apps[$targetlang]['writeable'])
+			$this->template->set_var('tgt_file', $this->bo->tgt_file);
+			$this->template->set_var('targetlang', $targetlang);
+			if (!$this->bo->loaded_apps[$targetlang]['writeable'])
 			{
-				$this->template->set_block('footer','tgtwrite','tgtwrite');
-				$this->template->set_var('tgtwrite','');
+				$this->template->set_block('footer', 'tgtwrite', 'tgtwrite');
+				$this->template->set_var('tgtwrite', '');
 			}
 
-			$this->template->set_var('helpmsg',lang('you have to [Save] every manual change in the above fields, before you can go to the next step !!!'));
-			$this->template->pfp('out','footer');
+			$this->template->set_var('helpmsg', lang('you have to [Save] every manual change in the above fields, before you can go to the next step !!!'));
+			$this->template->pfp('out', 'footer');
 		}
 		/* _debug_array($this->bo->loaded_apps); */
 		$this->bo->save_sessiondata();
@@ -481,7 +481,7 @@ 
 
 	function encode_id($id)
 	{
-		return str_replace(array('[',']','&','"'),array('%5B','%5D','&amp;','&quot;'),$id);
+		return str_replace(array('[', ']', '&', '"'), array('%5B', '%5D', '&amp;', '&quot;'), $id);
 	}
 
 	function recode_id($id)
@@ -490,10 +490,10 @@ 
 		{
 			$id = stripslashes($id);
 		}
-		return str_replace(array('%5B','%5D'),array('[',']'),$id);	// &amp; + &quot; are recode by php
+		return str_replace(array('%5B', '%5D'), array('[', ']'), $id); // &amp; + &quot; are recode by php
 	}
 
-	function download($which,$userlang)
+	function download($which, $userlang)
 	{
 		switch ($which)
 		{
@@ -502,20 +502,20 @@ 
 				break;
 			case 'target':
 				// removing phrases not in the source language
-				$langarray = $this->bo->target_langarray = array_intersect_assoc($this->bo->target_langarray,$this->bo->source_langarray);
+				$langarray = $this->bo->target_langarray = array_intersect_assoc($this->bo->target_langarray, $this->bo->source_langarray);
 				break;
 			default:
 				break;
 		}
-		html::content_header(translation::LANGFILE_PREFIX . $userlang . '.lang');
+		html::content_header(translation::LANGFILE_PREFIX.$userlang.'.lang');
 		$to = translation::charset($userlang);
 		$from = translation::charset();
-		while(list($mess_id,$data) = @each($langarray))
+		while (list($mess_id, $data) = @each($langarray))
 		{
-			$content = translation::convert(trim($data['content']),$from,$to);
+			$content = translation::convert(trim($data['content']), $from, $to);
 			if (!empty($content))
 			{
-				echo $mess_id . "\t" . $data['app_name'] . "\t" . $userlang . "\t" . $content . "\n";
+				echo $mess_id."\t".$data['app_name']."\t".$userlang."\t".$content."\n";
 			}
 		}
 		common::egw_exit();
@@ -528,15 +528,15 @@ 
 		$order = $_POST['order'];
 		$query = $_POST['query'];
 
-		$this->bo->save_sessiondata('','');
+		$this->bo->save_sessiondata('', '');
 		$GLOBALS['egw_info']['flags']['app_header'] = $GLOBALS['egw_info']['apps'][$GLOBALS['egw_info']['flags']['currentapp']]['title'].
 			' - '.lang('Installed applications');
 		common::egw_header();
 		echo parse_navbar();
 
 		$this->template->set_file(array('applications' => 'applications.tpl'));
-		$this->template->set_block('applications','list','list');
-		$this->template->set_block('applications','row','row');
+		$this->template->set_block('applications', 'list', 'list');
+		$this->template->set_block('applications', 'row', 'row');
 
 		$offset = $GLOBALS['egw_info']['user']['preferences']['common']['maxmatchs'];
 
@@ -546,18 +546,18 @@ 
 				'title' => lang('Setup')
 			)
 		);
-		foreach($GLOBALS['egw_info']['apps'] as $app => $data)
+		foreach ($GLOBALS['egw_info']['apps'] as $app => $data)
 		{
 			$apps[strtolower($data['title'])] = $data;
 		}
 		$total = count($apps);
 
-		if(!$sort)
+		if (!$sort)
 		{
 			$sort = 'ASC';
 		}
 
-		if($sort == 'ASC')
+		if ($sort == 'ASC')
 		{
 			ksort($apps);
 		}
@@ -574,7 +574,7 @@ 
 		{
 			$limit = $start;
 		}
-		elseif(!$start && !$offset)
+		elseif (!$start && !$offset)
 		{
 			$limit = $total;
 		}
@@ -589,39 +589,39 @@ 
 			$limit = $total;
 		}
 
-		$this->template->set_var('sort_title',$this->nextmatchs->show_sort_order($sort,'title','title','/index.php',lang('Title'),"&menuaction=$this->use_app.uilangfile.index"));
-		$this->template->set_var('lang_showing',$this->nextmatchs->show_hits($total,$start));
-		$this->template->set_var('left',$this->nextmatchs->left('/index.php',$start,$total,"&menuaction=$this->use_app.uilangfile.index"));
-		$this->template->set_var('right',$this->nextmatchs->right('/index.php',$start,$total,"&menuaction=$this->use_app.uilangfile.index"));
+		$this->template->set_var('sort_title', $this->nextmatchs->show_sort_order($sort, 'title', 'title', '/index.php', lang('Title'), "&menuaction=$this->use_app.uilangfile.index"));
+		$this->template->set_var('lang_showing', $this->nextmatchs->show_hits($total, $start));
+		$this->template->set_var('left', $this->nextmatchs->left('/index.php', $start, $total, "&menuaction=$this->use_app.uilangfile.index"));
+		$this->template->set_var('right', $this->nextmatchs->right('/index.php', $start, $total, "&menuaction=$this->use_app.uilangfile.index"));
 
-		$this->template->set_var('lang_edit',lang('Edit'));
+		$this->template->set_var('lang_edit', lang('Edit'));
 		//$this->template->set_var('lang_translate',lang('Translate'));
-		$this->template->set_var('new_action',$GLOBALS['egw']->link('/index.php', "menuaction=$this->use_app.uilangfile.create"));
-		$this->template->set_var('create_new',lang('Create New Language File'));
+		$this->template->set_var('new_action', $GLOBALS['egw']->link('/index.php', "menuaction=$this->use_app.uilangfile.create"));
+		$this->template->set_var('create_new', lang('Create New Language File'));
 
 		$i = 0;
-		foreach($apps as $data)
+		foreach ($apps as $data)
 		{
-			if($start <= $i && $i < $limit)
+			if ($start <= $i && $i < $limit)
 			{
-				$this->template->set_var('tr_class',$this->nextmatchs->alternate_row_color('',true));
+				$this->template->set_var('tr_class', $this->nextmatchs->alternate_row_color('', true));
 
-				$this->template->set_var('name',$data['title']);
+				$this->template->set_var('name', $data['title']);
 
-				$this->template->set_var('edit','<a href="' . $GLOBALS['egw']->link('/index.php', "menuaction=$this->use_app.uilangfile.edit&app_name=" . urlencode($data['name'])) . '"> ' . lang('Edit') . ' </a>');
+				$this->template->set_var('edit', '<a href="'.$GLOBALS['egw']->link('/index.php', "menuaction=$this->use_app.uilangfile.edit&app_name=".urlencode($data['name'])).'"> '.lang('Edit').' </a>');
 			//	$this->template->set_var('translate','<a href="' . $GLOBALS['egw']->link('/index.php',"menuaction=$this->use_app.uilangfile.translate&app_name=" . urlencode($app['name'])) . '"> ' . lang('Translate') . ' </a>');
 
-				$this->template->set_var('status',$status);
+				$this->template->set_var('status', $status);
 
-				$this->template->parse('rows','row',True);
+				$this->template->parse('rows', 'row', True);
 			}
 			++$i;
 		}
 
-		$this->template->pparse('phpgw_body','list');
+		$this->template->pparse('phpgw_body', 'list');
 	}
 
-	function lang_option($app_name,$current,$name)
+	function lang_option($app_name, $current, $name)
 	{
 		$list = (is_array($this->bo->src_apps) ? $this->bo->src_apps : array()) + array(
 			$app_name     => $app_name,
@@ -631,15 +631,15 @@ 
 			'preferences' => 'preferences'
 		);
 
-		$select  = "\n" .'<select name="' . $name . '">' . "\n";
-		foreach($list as $key => $val)
+		$select = "\n".'<select name="'.$name.'">'."\n";
+		foreach ($list as $key => $val)
 		{
-			$select .= '<option value="' . $key . '"';
+			$select .= '<option value="'.$key.'"';
 			if ($key == $current && $current != '')
 			{
 				$select .= ' selected="selected"';
 			}
-			$select .= '>' . $val . '</option>'."\n";
+			$select .= '>'.$val.'</option>'."\n";
 		}
 
 		$select .= '</select>'."\n";

Braces +7 added lines, -2 removed lines

@@ -109,7 +109,10 @@ 
 
 		$this->template->set_file(array('form' => 'addphrase.tpl'));
 		$this->template->set_var('message_id_field','<textarea rows="5" style="width: 100%;" name="entry[message_id]"></textarea>');
-		if ($app_name == 'api') $app_name = 'common';
+		if ($app_name == 'api')
+		{
+			$app_name = 'common';
+		}
 		$this->template->set_var('app_field',$this->lang_option($app_name,isset($entry)?$entry['app_name']:$app_name,'entry[app_name]'));
 		$this->template->set_var('translation_field','<textarea rows="5" style="width: 100%;"  name="entry[content]"></textarea>');
 		$this->template->set_var('target_field','<textarea rows="5" style="width: 100%;" name="entry[target]"></textarea>');
@@ -388,11 +391,13 @@ 
 				}
 			}
 			if ($deleteme)
-			foreach($deleteme as $_mess => $_checked)
+			{
+						foreach($deleteme as $_mess => $_checked)
 			{
 				if($_checked == 'on')
 				{
 					$_mess = strtolower(trim($this->recode_id($_mess)));
+			}
 					unset($this->bo->source_langarray[$_mess]);
 					unset($this->bo->target_langarray[$_mess]);
 				}

etemplate/inc/class.url_widget.inc.php

Doc Comments +1 added lines, -1 removed lines

@@ -230,7 +230,7 @@
 	 * replaces '%1' with the phonenumber to call, '%u' with the user's account_lid and '%t' with his work-phone-number
 	 *
 	 * @param string $number phone number
-	 * @return string|boolean string with link or false if no no telephony integration configured
+	 * @return false|string string with link or false if no no telephony integration configured
 	 */
 	static function phone2link($number)
 	{

Spacing +39 added lines, -39 removed lines

@@ -78,15 +78,15 @@ 
 	 * @param object &$tmpl reference to the template we belong too
 	 * @return boolean true if extra label is allowed, false otherwise
 	 */
-	function pre_process($name,&$value,&$cell,&$readonlys,&$extension_data,&$tmpl)
+	function pre_process($name, &$value, &$cell, &$readonlys, &$extension_data, &$tmpl)
 	{
 		$readonly = $cell['readonly'] || $readonlys;
 
-		switch($cell['type'])
+		switch ($cell['type'])
 		{
 			case 'url-email':	// size: size,max-size,{2=no validation,1=rfc822 name part allowed, default only email},default if value empty
-				list($size,$max_size,$validation_type,$default) = explode(',',$cell['size'],4);	// 4 = allow default to contain commas
-				if (!$value) $value = $default;	// use default from size/options if empty
+				list($size, $max_size, $validation_type, $default) = explode(',', $cell['size'], 4); // 4 = allow default to contain commas
+				if (!$value) $value = $default; // use default from size/options if empty
 				$cell['no_lang'] = 1;
 
 				if (!$readonly)
@@ -95,7 +95,7 @@ 
 					$cell['size'] = $size.','.$max_size.',';
 					if ((int)$validation_type < 2)
 					{
-						$cell['size'] .= $cell['needed'] ? '/^(' : '/^(|';	// if not needed allow empty, as EMAIL_PREG does not
+						$cell['size'] .= $cell['needed'] ? '/^(' : '/^(|'; // if not needed allow empty, as EMAIL_PREG does not
 						$cell['size'] .= self::EMAIL_PREG;
 						if ($validation_type == 1)	// allow rfc822 name part too: Ralf Becker <ralf@out.de>
 						{
@@ -108,76 +108,76 @@ 
 					break;
 				}
 				$rfc822 = $value;
-				if (!(int)$size) $size = 22;	// default size for display
+				if (!(int)$size) $size = 22; // default size for display
 				if (is_numeric($value))
 				{
-					$email = $GLOBALS['egw']->accounts->id2name($value,'account_email');
-					$value = $GLOBALS['egw']->accounts->id2name($value,'account_fullname');
+					$email = $GLOBALS['egw']->accounts->id2name($value, 'account_email');
+					$value = $GLOBALS['egw']->accounts->id2name($value, 'account_fullname');
 					$rfc822 = $value.' <'.$email.'>';
 				}
-				elseif (preg_match('/^(.*) ?<(.*)>/',$value,$matches))
+				elseif (preg_match('/^(.*) ?<(.*)>/', $value, $matches))
 				{
 					$value = $matches[1];
 					$email = $matches[2];
 				}
-				elseif (($at_pos = strpos($email=$value,'@')) !== false)
+				elseif (($at_pos = strpos($email = $value, '@')) !== false)
 				{
-					if (($amp_pos = strpos(substr($value,$at_pos),'&')) !== false)
+					if (($amp_pos = strpos(substr($value, $at_pos), '&')) !== false)
 					{
 						//list($email,$addoptions) = explode('&',$value,2);
-						$email = substr($value,0,$amp_pos+$at_pos);
-						$addoptions = substr($value, $amp_pos+$at_pos+1);
+						$email = substr($value, 0, $amp_pos + $at_pos);
+						$addoptions = substr($value, $amp_pos + $at_pos + 1);
 						//error_log(__METHOD__.__LINE__.$email.' '.$addoptions);
 						$rfc822 = $value = $email;
 					}
 					else
 					{
-						if (($q_pos = strpos(substr($value,$at_pos),'?')) !== false)
+						if (($q_pos = strpos(substr($value, $at_pos), '?')) !== false)
 						{
-							$email = substr($value,0,$q_pos+$at_pos);
-							$addoptions = substr($value, $q_pos+$at_pos+1);
+							$email = substr($value, 0, $q_pos + $at_pos);
+							$addoptions = substr($value, $q_pos + $at_pos + 1);
 							$rfc822 = $value = $email;
 						}
 					}
 					if (strlen($value) > $size)		// shorten the name to size-2 plus '...'
 					{
-						$value = substr($value,0,$size-2).'...';
+						$value = substr($value, 0, $size - 2).'...';
 					}
 				}
-				$link = $this->email2link($email,$rfc822).($addoptions ? '&'.$addoptions : '');
+				$link = $this->email2link($email, $rfc822).($addoptions ? '&'.$addoptions : '');
 
 				$cell['type'] = 'label';
-				$cell['size'] = ','.$link.',,,,'.($link[0]=='f'?'700x750':'').($value != $email ? ','.$email : '');
+				$cell['size'] = ','.$link.',,,,'.($link[0] == 'f' ? '700x750' : '').($value != $email ? ','.$email : '');
 				break;
 
 			case 'url':		// options: [size[,max-size[,preg]]]
-				list($size,$max_size,$preg) = explode(',',$cell['size'],3); // 3 = allow default to contain commas
+				list($size, $max_size, $preg) = explode(',', $cell['size'], 3); // 3 = allow default to contain commas
 				if (!$readonly)
 				{
 					$cell['type'] = 'text';
-					$cell['size'] = "$size,$max_size,$preg";	// ,url"; not using html url type, as it requires a scheme
+					$cell['size'] = "$size,$max_size,$preg"; // ,url"; not using html url type, as it requires a scheme
 					// todo: (optional) validation
 					break;
 				}
-				if (!(int)$size) $size = 24;	// default size for display
+				if (!(int)$size) $size = 24; // default size for display
 				$cell['type'] = 'label';
 				if ($value)
 				{
-					$link = (strpos($value,'://') === false) ? 'http://'.$value : $value;
+					$link = (strpos($value, '://') === false) ? 'http://'.$value : $value;
 					$cell['size'] = ','.$link.',,,_blank';
 				}
-				if (substr($value,0,7) == 'http://')
+				if (substr($value, 0, 7) == 'http://')
 				{
-					$value = substr($value,7);		// cut off http:// in display
+					$value = substr($value, 7); // cut off http:// in display
 				}
 				if (strlen($value) > $size)		// shorten the name to size-2 plus '...'
 				{
-					$value = substr($value,0,$size-2).'...';
+					$value = substr($value, 0, $size - 2).'...';
 				}
 				break;
 
 			case 'url-phone':		// options: [size[,max-size[,preg]]]
-				list($size,$max_size,$preg) = explode(',',$cell['size'],3); // 3 = allow default to contain commas
+				list($size, $max_size, $preg) = explode(',', $cell['size'], 3); // 3 = allow default to contain commas
 				if (!$readonly)
 				{
 					$cell['type'] = 'text';
@@ -189,12 +189,12 @@ 
 				if ($value)
 				{
 					$link = self::phone2link($value);
-					$cell['size'] = ','.$link.($GLOBALS['egw_info']['server']['call_popup']=='none' ? '' :	// 'none' = no target
+					$cell['size'] = ','.$link.($GLOBALS['egw_info']['server']['call_popup'] == 'none' ? '' : // 'none' = no target
 						',,,calling,'.$GLOBALS['egw_info']['server']['call_popup']);
 				}
 				break;
 		}
-		return True;	// extra Label Ok
+		return True; // extra Label Ok
 	}
 
 	/**
@@ -205,23 +205,23 @@ 
 	 * @param string $rfc822 complete rfc822 addresse to use eg. for fmail
 	 * @return array/string array with get-params or mailto:$email, or '' or no mail addresse
 	 */
-	static function email2link($email,$rfc822='')
+	static function email2link($email, $rfc822 = '')
 	{
-		if (!$email || strpos($email,'@') === false) return '';
+		if (!$email || strpos($email, '@') === false) return '';
 
 		if (!$GLOBALS['egw_info']['user']['preferences']['addressbook']['force_mailto'])
 		{
-			if($GLOBALS['egw_info']['user']['apps']['felamimail'])
+			if ($GLOBALS['egw_info']['user']['apps']['felamimail'])
 			{
 				//return 'felamimail.uicompose.compose&preset[to]='.($rfc822 ? $rfc822 : $email);
 				return 'felamimail.uicompose.compose&send_to='.base64_encode($rfc822 ? $rfc822 : $email);
 			}
-			if($GLOBALS['egw_info']['user']['apps']['email'])
+			if ($GLOBALS['egw_info']['user']['apps']['email'])
 			{
 				return 'email.uicompose.compose&to='.$email;
 			}
 		}
-		return 'mailto:' . $email;
+		return 'mailto:'.$email;
 	}
 
 	/**
@@ -238,8 +238,8 @@ 
 		if (is_null($call_link))
 		{
 			// for iPhone and Android: replace evtl. configured telephony integration link with tel: protocol
-			if (strpos($_SERVER['HTTP_USER_AGENT'],'AppleWebKit') !== false &&
-				(strpos($_SERVER['HTTP_USER_AGENT'],'iPhone') !== false || strpos($_SERVER['HTTP_USER_AGENT'],'Android') !== false))
+			if (strpos($_SERVER['HTTP_USER_AGENT'], 'AppleWebKit') !== false &&
+				(strpos($_SERVER['HTTP_USER_AGENT'], 'iPhone') !== false || strpos($_SERVER['HTTP_USER_AGENT'], 'Android') !== false))
 			{
 				$call_link = 'tel:%1';
 			}
@@ -251,14 +251,14 @@ 
 		if (empty($number) || empty($call_link)) return false;
 
 		static $userphone;
-		if (is_null($userphone) && strpos($call_link,'%t') !== false)
+		if (is_null($userphone) && strpos($call_link, '%t') !== false)
 		{
 			$user = $GLOBALS['egw']->contacts->read('account:'.$GLOBALS['egw_info']['user']['account_id']);
 			$userphone = is_array($user) ? ($user['tel_work'] ? $user['tel_work'] : $user['tel_home']) : false;
 		}
-		$number = preg_replace('/[^0-9+]+/','',str_replace(array('&#9829;','(0)'),'',$number));	// remove number formatting chars messing up the links
+		$number = preg_replace('/[^0-9+]+/', '', str_replace(array('&#9829;', '(0)'), '', $number)); // remove number formatting chars messing up the links
 
-		return str_replace(array('%1','%u','%t'),array(urlencode($number),$GLOBALS['egw_info']['user']['account_lid'],$userphone),
+		return str_replace(array('%1', '%u', '%t'), array(urlencode($number), $GLOBALS['egw_info']['user']['account_lid'], $userphone),
 			$call_link);
 	}
 }

Braces +35 added lines, -8 removed lines

@@ -86,7 +86,11 @@ 
 		{
 			case 'url-email':	// size: size,max-size,{2=no validation,1=rfc822 name part allowed, default only email},default if value empty
 				list($size,$max_size,$validation_type,$default) = explode(',',$cell['size'],4);	// 4 = allow default to contain commas
-				if (!$value) $value = $default;	// use default from size/options if empty
+				if (!$value)
+				{
+					$value = $default;
+				}
+				// use default from size/options if empty
 				$cell['no_lang'] = 1;
 
 				if (!$readonly)
@@ -97,10 +101,13 @@ 
 					{
 						$cell['size'] .= $cell['needed'] ? '/^(' : '/^(|';	// if not needed allow empty, as EMAIL_PREG does not
 						$cell['size'] .= self::EMAIL_PREG;
-						if ($validation_type == 1)	// allow rfc822 name part too: Ralf Becker <ralf@out.de>
+						if ($validation_type == 1)
+						{
+							// allow rfc822 name part too: Ralf Becker <ralf@out.de>
 						{
 							$cell['size'] .= '|[^<]+ ?<'.self::EMAIL_PREG.'>';
 						}
+						}
 						//$cell['size'] .= ')$/iu,email';// ,email causes browser-side validation. browser is more restrictive, so we disable browserside validation
 						$cell['size'] .= ')$/iu';
 					}
@@ -108,7 +115,11 @@ 
 					break;
 				}
 				$rfc822 = $value;
-				if (!(int)$size) $size = 22;	// default size for display
+				if (!(int)$size)
+				{
+					$size = 22;
+				}
+				// default size for display
 				if (is_numeric($value))
 				{
 					$email = $GLOBALS['egw']->accounts->id2name($value,'account_email');
@@ -139,10 +150,13 @@ 
 							$rfc822 = $value = $email;
 						}
 					}
-					if (strlen($value) > $size)		// shorten the name to size-2 plus '...'
+					if (strlen($value) > $size)
+					{
+						// shorten the name to size-2 plus '...'
 					{
 						$value = substr($value,0,$size-2).'...';
 					}
+					}
 				}
 				$link = $this->email2link($email,$rfc822).($addoptions ? '&'.$addoptions : '');
 
@@ -159,7 +173,11 @@ 
 					// todo: (optional) validation
 					break;
 				}
-				if (!(int)$size) $size = 24;	// default size for display
+				if (!(int)$size)
+				{
+					$size = 24;
+				}
+				// default size for display
 				$cell['type'] = 'label';
 				if ($value)
 				{
@@ -170,10 +188,13 @@ 
 				{
 					$value = substr($value,7);		// cut off http:// in display
 				}
-				if (strlen($value) > $size)		// shorten the name to size-2 plus '...'
+				if (strlen($value) > $size)
+				{
+					// shorten the name to size-2 plus '...'
 				{
 					$value = substr($value,0,$size-2).'...';
 				}
+				}
 				break;
 
 			case 'url-phone':		// options: [size[,max-size[,preg]]]
@@ -207,7 +228,10 @@ 
 	 */
 	static function email2link($email,$rfc822='')
 	{
-		if (!$email || strpos($email,'@') === false) return '';
+		if (!$email || strpos($email,'@') === false)
+		{
+			return '';
+		}
 
 		if (!$GLOBALS['egw_info']['user']['preferences']['addressbook']['force_mailto'])
 		{
@@ -248,7 +272,10 @@ 
 				$call_link = (string)$GLOBALS['egw_info']['server']['call_link'];
 			}
 		}
-		if (empty($number) || empty($call_link)) return false;
+		if (empty($number) || empty($call_link))
+		{
+			return false;
+		}
 
 		static $userphone;
 		if (is_null($userphone) && strpos($call_link,'%t') !== false)

etemplate/inc/class.vfs_widget.inc.php

Doc Comments +1 added lines, -2 removed lines

@@ -368,7 +368,6 @@ 
 	 * @param mixed &$value
 	 * @param string $path vfs path of download
 	 * @param string $name name of widget
-	 * @param string $label=null label, if not set basename($path) is used
 	 * @return array
 	 */
 	static function file_widget(&$value,$path,$name,$label=null)
@@ -404,7 +403,7 @@ 
 	 * If you rename a file, you have to clear the cache ($clear_after=true)!
 	 *
 	 * @param string &$path on call path without extension, if existing on return full path incl. extension
-	 * @param boolean $clear_after=null clear file-cache after (true) or before (false), default dont clear
+	 * @param boolean $clear_after clear file-cache after (true) or before (false), default dont clear
 	 * @return
 	 */
 	static function file_exists(&$path,$clear_after=null)

Spacing +100 added lines, -100 removed lines

@@ -43,7 +43,7 @@ 
 	 */
 	var $public_functions = array(
 		'pre_process' => True,
-		'post_process' => true,		// post_process is only used for vfs-upload (all other widgets set $cell['readlonly']!)
+		'post_process' => true, // post_process is only used for vfs-upload (all other widgets set $cell['readlonly']!)
 	);
 	/**
 	 * availible extensions and there names for the editor
@@ -51,14 +51,14 @@ 
 	 * @var array
 	 */
 	var $human_name = array(
-		'vfs'      => 'File name+link',	// clickable filename, with evtl. clickable path-components
-		'vfs-name' => 'File name',		// filename automatically urlencoded
-		'vfs-size' => 'File size',		// human readable filesize
-		'vfs-mode' => 'File mode',		// posix mode as string eg. drwxr-x---
-		'vfs-mime' => 'File icon',		// mime type icon or thumbnail
-		'vfs-uid'  => 'File owner',		// Owner of file, or 'root' if none
-		'vfs-gid'  => 'File group',		// Group of file, or 'root' if none
-		'vfs-upload' => 'VFS file',		// displays either download and delete (x) links or a file upload
+		'vfs'      => 'File name+link', // clickable filename, with evtl. clickable path-components
+		'vfs-name' => 'File name', // filename automatically urlencoded
+		'vfs-size' => 'File size', // human readable filesize
+		'vfs-mode' => 'File mode', // posix mode as string eg. drwxr-x---
+		'vfs-mime' => 'File icon', // mime type icon or thumbnail
+		'vfs-uid'  => 'File owner', // Owner of file, or 'root' if none
+		'vfs-gid'  => 'File group', // Group of file, or 'root' if none
+		'vfs-upload' => 'VFS file', // displays either download and delete (x) links or a file upload
 	);
 
 	/**
@@ -74,53 +74,53 @@ 
 	 * @param object &$tmpl reference to the template we belong too
 	 * @return boolean true if extra label is allowed, false otherwise
 	 */
-	function pre_process($form_name,&$value,&$cell,&$readonlys,&$extension_data,&$tmpl)
+	function pre_process($form_name, &$value, &$cell, &$readonlys, &$extension_data, &$tmpl)
 	{
 		//echo "<p>".__METHOD__."($form_name,$value,".array2string($cell).",...)</p>\n";
 		$type = $cell['type'];
-		if (!in_array($type,array('vfs-name','vfs-upload'))) $cell['readonly'] = true;	// to not call post-process
+		if (!in_array($type, array('vfs-name', 'vfs-upload'))) $cell['readonly'] = true; // to not call post-process
 
 		// check if we have a path and not the raw value, in that case we have to do a stat first
-		if (in_array($type,array('vfs-size','vfs-mode','vfs-uid','vfs-gid')) && !is_numeric($value) || $type == 'vfs' && !$value)
+		if (in_array($type, array('vfs-size', 'vfs-mode', 'vfs-uid', 'vfs-gid')) && !is_numeric($value) || $type == 'vfs' && !$value)
 		{
 			if (!$value || !($stat = egw_vfs::stat($value)))
 			{
-				if ($value) $value = lang("File '%1' not found!",egw_vfs::decodePath($value));
+				if ($value) $value = lang("File '%1' not found!", egw_vfs::decodePath($value));
 				$cell = boetemplate::empty_cell();
-				return true;	// allow extra value;
+				return true; // allow extra value;
 			}
 		}
 		$cell['type'] = 'label';
 
-		switch($type)
+		switch ($type)
 		{
 			case 'vfs-upload':		// option: required mimetype or regular expression for mimetype to match, eg. '/^text\//i' for all text files
-				if (empty($value) && preg_match('/^exec.*\[([^]]+)\]$/',$form_name,$matches))	// if no value via content array, use widget name
+				if (empty($value) && preg_match('/^exec.*\[([^]]+)\]$/', $form_name, $matches))	// if no value via content array, use widget name
 				{
 					$value = $matches[1];
 				}
 				$extension_data = array('value' => $value, 'mimetype' => $cell['size'], 'type' => $type);
 				if ($value[0] != '/')
 				{
-					list($app,$id,$relpath) = explode(':',$value,3);
+					list($app, $id, $relpath) = explode(':', $value, 3);
 					if (empty($id))
 					{
-						static $tmppath = array();	// static var, so all vfs-uploads get created in the same temporary dir
+						static $tmppath = array(); // static var, so all vfs-uploads get created in the same temporary dir
 						if (!isset($tmppath[$app])) $tmppath[$app] = '/home/'.$GLOBALS['egw_info']['user']['account_lid'].'/.'.$app.'_'.md5(time().session_id());
 						$value = $tmppath[$app];
-						unset($cell['onchange']);	// no onchange, if we have to use a temporary dir
+						unset($cell['onchange']); // no onchange, if we have to use a temporary dir
 					}
 					else
 					{
-						$value = egw_link::vfs_path($app,$id,'',true);
+						$value = egw_link::vfs_path($app, $id, '', true);
 					}
 					if (!empty($relpath)) $value .= '/'.$relpath;
 				}
 				$path = $extension_data['path'] = $value;
-				if (substr($path,-1) != '/' && self::file_exists($path) && !egw_vfs::is_dir($path))	// display download link and delete icon
+				if (substr($path, -1) != '/' && self::file_exists($path) && !egw_vfs::is_dir($path))	// display download link and delete icon
 				{
 					$extension_data['path'] = $path;
-					$cell = $this->file_widget($value,$path,$cell['name'],$cell['label']);
+					$cell = $this->file_widget($value, $path, $cell['name'], $cell['label']);
 				}
 				else	// file does NOT exists --> display file upload
 				{
@@ -136,26 +136,26 @@ 
 						{
 							$type = $cell['size'];
 						}
-						$cell['help'] = lang('Allowed file type: %1',$type);
+						$cell['help'] = lang('Allowed file type: %1', $type);
 					}
 				}
 				// check if directory (trailing slash) is given --> upload of multiple files
-				if (substr($path,-1) == '/' && egw_vfs::file_exists($path) && ($files = egw_vfs::scandir($path)))
+				if (substr($path, -1) == '/' && egw_vfs::file_exists($path) && ($files = egw_vfs::scandir($path)))
 				{
 					//echo $path; _debug_array($files);
 					$upload = $cell;
-					$cell = boetemplate::empty_cell('vbox','',array('size' => ',,0,0'));
+					$cell = boetemplate::empty_cell('vbox', '', array('size' => ',,0,0'));
 					$extension_data['files'] = $files;
 					$value = array();
-					foreach($files as $file)
+					foreach ($files as $file)
 					{
 						$file = $path.$file;
 						$basename = basename($file);
 						unset($widget);
-						$widget = $this->file_widget($value[$basename],$file,$upload['name']."[$basename]");
-						boetemplate::add_child($cell,$widget);
+						$widget = $this->file_widget($value[$basename], $file, $upload['name']."[$basename]");
+						boetemplate::add_child($cell, $widget);
 					}
-					boetemplate::add_child($cell,$upload);
+					boetemplate::add_child($cell, $upload);
 				}
 				break;
 
@@ -167,23 +167,23 @@ 
 
 			case 'vfs-mode':
 				$value = egw_vfs::int2mode(is_numeric($value) ? $value : $stat['mode']);
-				list($span,$class) = explode(',',$cell['span'],2);
-				$class .= ($class ? ' ' : '') . 'vfsMode';
+				list($span, $class) = explode(',', $cell['span'], 2);
+				$class .= ($class ? ' ' : '').'vfsMode';
 				$cell['span'] = $span.','.$class;
 				$cell['no_lang'] = true;
 				break;
 
 			case 'vfs-uid':
 			case 'vfs-gid':
-				$uid = !is_numeric($value) ? $stat[$type=='vfs-uid'?'uid':'gid'] : $value;
-				$value = !$uid ? 'root' : $GLOBALS['egw']->accounts->id2name($type=='vfs-uid'?$uid:-$uid);	// our internal gid's are negative!
+				$uid = !is_numeric($value) ? $stat[$type == 'vfs-uid' ? 'uid' : 'gid'] : $value;
+				$value = !$uid ? 'root' : $GLOBALS['egw']->accounts->id2name($type == 'vfs-uid' ? $uid : -$uid); // our internal gid's are negative!
 				break;
 
 			case 'vfs':
 				if (is_array($value))
 				{
 					$name = $value['name'];
-					$path = substr($value['path'],0,-strlen($name)-1);
+					$path = substr($value['path'], 0, -strlen($name) - 1);
 					$mime = $value['mime'];
 				}
 				else
@@ -195,27 +195,27 @@ 
 				}
 				if (($cell_name = $cell['name']) == '$row')
 				{
-					$arr = explode('][',substr($form_name,0,-1));
+					$arr = explode('][', substr($form_name, 0, -1));
 					$cell_name = array_pop($arr);
 				}
 				$cell['name'] = '';
 				$cell['type'] = 'hbox';
 				$cell['size'] = '0,,0,0';
-				foreach($name != '/' ? explode('/',$name) : array('') as $n => $component)
+				foreach ($name != '/' ? explode('/', $name) : array('') as $n => $component)
 				{
 					if ($n > (int)($path === '/'))
 					{
-						$sep = soetemplate::empty_cell('label','',array('label' => '/'));
-						soetemplate::add_child($cell,$sep);
+						$sep = soetemplate::empty_cell('label', '', array('label' => '/'));
+						soetemplate::add_child($cell, $sep);
 						unset($sep);
 					}
 					$value['c'.$n] = $component !== '' ? egw_vfs::decodePath($component) : '/';
 					$path .= ($path != '/' ? '/' : '').$component;
 					// replace id's in /apps again with human readable titles
-					$path_parts = explode('/',$path);
+					$path_parts = explode('/', $path);
 					if ($path_parts[1] == 'apps')
 					{
-						switch(count($path_parts))
+						switch (count($path_parts))
 						{
 							case 2:
 								$value['c'.$n] = lang('Applications');
@@ -224,14 +224,14 @@ 
 								$value['c'.$n] = lang($path_parts[2]);
 								break;
 							case 4:
-								if (is_numeric($value['c'.$n])) $value['c'.$n] .= egw_link::title($path_parts[2],$path_parts[3]);
+								if (is_numeric($value['c'.$n])) $value['c'.$n] .= egw_link::title($path_parts[2], $path_parts[3]);
 								break;
 						}
 					}
 					$popup = null;
 					if (egw_vfs::is_readable($path))	// show link only if we have access to the file or dir
 					{
-						if ($n < count($comps)-1 || $mime == egw_vfs::DIR_MIME_TYPE || egw_vfs::is_dir($path))
+						if ($n < count($comps) - 1 || $mime == egw_vfs::DIR_MIME_TYPE || egw_vfs::is_dir($path))
 						{
 							$value['l'.$n] = egw_link::mime_open($path, egw_vfs::DIR_MIME_TYPE, $popup);
 							$target = '';
@@ -245,36 +245,36 @@ 
 
 					if ($cell['onclick'])
 					{
-						$comp = boetemplate::empty_cell('button',$cell_name.'[c'.$n.']',array(
+						$comp = boetemplate::empty_cell('button', $cell_name.'[c'.$n.']', array(
 							'size'    => '1',
 							'no_lang' => true,
 							'span'    => ',vfsFilename',
 							'label'   => $value['c'.$n],
-							'onclick' => str_replace('$path',"'".addslashes($path)."'",$cell['onclick']),
+							'onclick' => str_replace('$path', "'".addslashes($path)."'", $cell['onclick']),
 						));
 					}
 					else
 					{
-						$comp = boetemplate::empty_cell('label',$cell_name.'[c'.$n.']',array(
+						$comp = boetemplate::empty_cell('label', $cell_name.'[c'.$n.']', array(
 							'size'    => ',@'.$cell_name.'[l'.$n.'],,,'.$target.','.$popup,
 							'no_lang' => true,
 							'span'    => ',vfsFilename',
 						));
 					}
-					boetemplate::add_child($cell,$comp);
+					boetemplate::add_child($cell, $comp);
 					unset($comp);
 				}
-				unset($cell['onclick']);	// otherwise it's handled by the grid too
+				unset($cell['onclick']); // otherwise it's handled by the grid too
 				//_debug_array($comps); _debug_array($cell); _debug_array($value);
 				break;
 
 			case 'vfs-name':	// size: [length][,maxLength[,allowPath]]
 				$cell['type'] = 'text';
-				list($length,$maxLength,$allowPath) = $options = explode(',',$cell['size']);
-				$preg = $allowPath ? '' : '/[^\\/]/';	// no slash '/' allowed, if not allowPath set
+				list($length, $maxLength, $allowPath) = $options = explode(',', $cell['size']);
+				$preg = $allowPath ? '' : '/[^\\/]/'; // no slash '/' allowed, if not allowPath set
 				$cell['size'] = "$length,$maxLength,$preg";
 				$value = egw_vfs::decodePath($value);
-				$extension_data = array('type' => $type,'allowPath' => $allowPath);
+				$extension_data = array('type' => $type, 'allowPath' => $allowPath);
 				break;
 
 			case 'vfs-mime':  // size: [thsize] (thumbnail size)
@@ -292,9 +292,9 @@ 
 				}
 				if (!is_array($value))
 				{
-					if ($value[0] == '/' || count(explode('/',$value)) != 2)
+					if ($value[0] == '/' || count(explode('/', $value)) != 2)
 					{
-						$mime = egw_vfs::mime_content_type($path=$value);
+						$mime = egw_vfs::mime_content_type($path = $value);
 					}
 					else
 					{
@@ -310,24 +310,24 @@ 
 				$cell['type'] = 'image';
 				$cell['label'] = mime_magic::mime2label($mime);
 
-				list($mime_main,$mime_sub) = explode('/',$mime);
+				list($mime_main, $mime_sub) = explode('/', $mime);
 				if ($mime_main == 'egw' || isset($GLOBALS['egw_info']['apps'][$mime_main]))
 				{
-					$value = $mime_main == 'egw' ? $mime_sub.'/navbar' : $mime;	// egw-applications for link-widget
+					$value = $mime_main == 'egw' ? $mime_sub.'/navbar' : $mime; // egw-applications for link-widget
 					$cell['label'] = lang($mime_main == 'egw' ? $mime_sub : $mime_main);
-					list($span,$class) = explode(',',$cell['span'],2);
-					$class .= ($class ? ' ' : '') . 'vfsMimeIcon';
+					list($span, $class) = explode(',', $cell['span'], 2);
+					$class .= ($class ? ' ' : '').'vfsMimeIcon';
 					$cell['span'] = $span.','.$class;
 				}
-				elseif($path && $mime_main == 'image' && in_array($mime_sub,array('png','jpeg','jpg','gif','bmp')) &&
+				elseif ($path && $mime_main == 'image' && in_array($mime_sub, array('png', 'jpeg', 'jpg', 'gif', 'bmp')) &&
 					(string)$GLOBALS['egw_info']['server']['link_list_thumbnail'] != '0' &&
 					(string)$GLOBALS['egw_info']['user']['preferences']['common']['link_list_thumbnail'] != '0' &&
 					// check the size of the image, as too big images get no icon, but a PHP Fatal error:  Allowed memory size exhausted
 					(!is_array($value) && ($stat = egw_vfs::stat($path)) ? $stat['size'] : $value['size']) < 1600000)
 				{
-					if (substr($path,0,6) == '/apps/')
+					if (substr($path, 0, 6) == '/apps/')
 					{
-						$path = egw_vfs::parse_url(egw_vfs::resolve_url_symlinks($path),PHP_URL_PATH);
+						$path = egw_vfs::parse_url(egw_vfs::resolve_url_symlinks($path), PHP_URL_PATH);
 					}
 
 					//Assemble the thumbnail parameters
@@ -345,11 +345,11 @@ 
 					$value = egw_vfs::mime_icon($mime);
 				}
 				// mark symlinks (check if method exists, to allow etemplate to run on 1.6 API!)
-				if (method_exists('egw_vfs','is_link') && egw_vfs::is_link($path))
+				if (method_exists('egw_vfs', 'is_link') && egw_vfs::is_link($path))
 				{
 					$broken = !egw_vfs::stat($path);
-					list($span,$class) = explode(',',$cell['span'],2);
-					$class .= ($class ? ' ' : '') . ($broken ? 'vfsIsBrokenLink' : 'vfsIsLink');
+					list($span, $class) = explode(',', $cell['span'], 2);
+					$class .= ($class ? ' ' : '').($broken ? 'vfsIsBrokenLink' : 'vfsIsLink');
 					$cell['span'] = $span.','.$class;
 					$cell['label'] = ($broken ? lang('Broken link') : lang('Link')).': '.egw_vfs::decodePath(egw_vfs::readlink($path)).
 						(!$broken ? ' ('.$cell['label'].')' : '');
@@ -371,25 +371,25 @@ 
 	 * @param string $label=null label, if not set basename($path) is used
 	 * @return array
 	 */
-	static function file_widget(&$value,$path,$name,$label=null)
+	static function file_widget(&$value, $path, $name, $label = null)
 	{
-		$value = empty($label) ? egw_vfs::decodePath(egw_vfs::basename($path)) : lang($label);	// display (translated) Label or filename (if label empty)
+		$value = empty($label) ? egw_vfs::decodePath(egw_vfs::basename($path)) : lang($label); // display (translated) Label or filename (if label empty)
 
-		$vfs_link = boetemplate::empty_cell('label',$name,array(
+		$vfs_link = boetemplate::empty_cell('label', $name, array(
 			'size' => ','.egw_vfs::download_url($path).',,,_blank,,'.$path,
 		));
 		// if dir is writable, add delete link
 		if (egw_vfs::is_writable(egw_vfs::dirname($path)))
 		{
-			$cell = boetemplate::empty_cell('hbox','',array('size' => ',,0,0'));
-			boetemplate::add_child($cell,$vfs_link);
-			$delete_icon = boetemplate::empty_cell('button',$path,array(
+			$cell = boetemplate::empty_cell('hbox', '', array('size' => ',,0,0'));
+			boetemplate::add_child($cell, $vfs_link);
+			$delete_icon = boetemplate::empty_cell('button', $path, array(
 				'label' => 'delete',
-				'size'  => 'delete',	// icon
+				'size'  => 'delete', // icon
 				'onclick' => "return confirm('Delete this file');",
 				'span' => ',leftPad5',
 			));
-			boetemplate::add_child($cell,$delete_icon);
+			boetemplate::add_child($cell, $delete_icon);
 		}
 		else
 		{
@@ -407,9 +407,9 @@ 
 	 * @param boolean $clear_after=null clear file-cache after (true) or before (false), default dont clear
 	 * @return
 	 */
-	static function file_exists(&$path,$clear_after=null)
+	static function file_exists(&$path, $clear_after = null)
 	{
-		static $files = array();	// static var, to scan each directory only once
+		static $files = array(); // static var, to scan each directory only once
 		$dir = egw_vfs::dirname($path);
 		if ($clear_after === false) unset($files[$dir]);
 		if (!isset($files[$dir])) $files[$dir] = egw_vfs::file_exists($dir) ? egw_vfs::scandir($dir) : array();
@@ -417,9 +417,9 @@ 
 		$basename = egw_vfs::basename($path);
 		$basename_len = strlen($basename);
 		$found = false;
-		foreach($files[$dir] as $file)
+		foreach ($files[$dir] as $file)
 		{
-			if (substr($file,0,$basename_len) == $basename)
+			if (substr($file, 0, $basename_len) == $basename)
 			{
 				$path = $dir.'/'.$file;
 				$found = true;
@@ -447,21 +447,21 @@ 
 	 * @param mixed &value_in the posted values (already striped of magic-quotes)
 	 * @return boolean true if $value has valid content, on false no content will be returned!
 	 */
-	function post_process($name,&$value,&$extension_data,&$loop,&$tmpl,$value_in)
+	function post_process($name, &$value, &$extension_data, &$loop, &$tmpl, $value_in)
 	{
 		//error_log(__METHOD__."('$name',".array2string($value).','.array2string($extension_data).",$loop,,".array2string($value_in).')');
 		//echo '<p>'.__METHOD__."('$name',".array2string($value).','.array2string($extension_data).",$loop,,".array2string($value_in).")</p>\n";
 
 		if (!$extension_data) return false;
 
-		switch($extension_data['type'])
+		switch ($extension_data['type'])
 		{
 			case 'vfs-name':
 				$value = $extension_data['allowPath'] ? egw_vfs::encodePath($value_in) : egw_vfs::encodePathComponent($value_in);
 				return true;
 
 			case 'vfs-upload':
-				break;	// handeled below
+				break; // handeled below
 
 			default:
 				return false;
@@ -469,18 +469,18 @@ 
 		// from here on vfs-upload only!
 
 		// check if delete icon clicked
-		if ($_POST['submit_button'] == ($fname = str_replace($extension_data['value'],$extension_data['path'],$name)) ||
-			substr($extension_data['path'],-1) == '/' && substr($_POST['submit_button'],0,strlen($fname)-1) == substr($fname,0,-1))
+		if ($_POST['submit_button'] == ($fname = str_replace($extension_data['value'], $extension_data['path'], $name)) ||
+			substr($extension_data['path'], -1) == '/' && substr($_POST['submit_button'], 0, strlen($fname) - 1) == substr($fname, 0, -1))
 		{
-			if (substr($extension_data['path'],-1) == '/')	// multiple files?
+			if (substr($extension_data['path'], -1) == '/')	// multiple files?
 			{
-				foreach($extension_data['files'] as $file)	// check of each single file, to not allow deleting of arbitrary files
+				foreach ($extension_data['files'] as $file)	// check of each single file, to not allow deleting of arbitrary files
 				{
-					if ($_POST['submit_button'] == substr($fname,0,-1).$file.']')
+					if ($_POST['submit_button'] == substr($fname, 0, -1).$file.']')
 					{
 						if (!egw_vfs::unlink($extension_data['path'].$file))
 						{
-							etemplate::set_validation_error($name,lang('Error deleting %1!',egw_vfs::decodePath($extension_data['path'].$file)));
+							etemplate::set_validation_error($name, lang('Error deleting %1!', egw_vfs::decodePath($extension_data['path'].$file)));
 						}
 						break;
 					}
@@ -488,24 +488,24 @@ 
 			}
 			elseif (!egw_vfs::unlink($extension_data['path']))
 			{
-				etemplate::set_validation_error($name,lang('Error deleting %1!',egw_vfs::decodePath($extension_data['path'])));
+				etemplate::set_validation_error($name, lang('Error deleting %1!', egw_vfs::decodePath($extension_data['path'])));
 			}
 			$loop = true;
 			return false;
 		}
 
 		// handle file upload
-		$name = preg_replace('/^exec\[([^]]+)\](.*)$/','\\1\\2',$name);	// remove exec prefix
+		$name = preg_replace('/^exec\[([^]]+)\](.*)$/', '\\1\\2', $name); // remove exec prefix
 
-		if (!is_array($_FILES['exec']) || !($filename = boetemplate::get_array($_FILES['exec']['name'],$name)))
+		if (!is_array($_FILES['exec']) || !($filename = boetemplate::get_array($_FILES['exec']['name'], $name)))
 		{
-			return false;	// no file attached
+			return false; // no file attached
 		}
-		$tmp_name = boetemplate::get_array($_FILES['exec']['tmp_name'],$name);
-		$error = boetemplate::get_array($_FILES['exec']['error'],$name);
+		$tmp_name = boetemplate::get_array($_FILES['exec']['tmp_name'], $name);
+		$error = boetemplate::get_array($_FILES['exec']['error'], $name);
 		if ($error)
 		{
-			etemplate::set_validation_error($name,lang('Error uploading file!')."\n".
+			etemplate::set_validation_error($name, lang('Error uploading file!')."\n".
 				etemplate::max_upload_size_message());
 			$loop = true;
 			return false;
@@ -517,19 +517,19 @@ 
 		// check if type matches required mime-type, if specified
 		if (!empty($extension_data['mimetype']))
 		{
-			$type = boetemplate::get_array($_FILES['exec']['type'],$name);
+			$type = boetemplate::get_array($_FILES['exec']['type'], $name);
 			$is_preg = $extension_data['mimetype'][0] == '/';
-			if (!$is_preg && strcasecmp($extension_data['mimetype'],$type) || $is_preg && !preg_match($extension_data['mimetype'],$type))
+			if (!$is_preg && strcasecmp($extension_data['mimetype'], $type) || $is_preg && !preg_match($extension_data['mimetype'], $type))
 			{
-				etemplate::set_validation_error($name,lang('File is of wrong type (%1 != %2)!',$type,$extension_data['mimetype']));
+				etemplate::set_validation_error($name, lang('File is of wrong type (%1 != %2)!', $type, $extension_data['mimetype']));
 				return false;
 			}
 		}
 		$path = $extension_data['path'];
-		if (substr($path,-1) != '/')
+		if (substr($path, -1) != '/')
 		{
 			// add extension to path
-			$parts = explode('.',$filename);
+			$parts = explode('.', $filename);
 			if (($extension = array_pop($parts)) && mime_magic::ext2mime($extension))	// really an extension --> add it to path
 			{
 				$path .= '.'.$extension;
@@ -539,17 +539,17 @@ 
 		{
 			$path .= egw_vfs::encodePathComponent($filename);
 		}
-		if (!egw_vfs::file_exists($dir = egw_vfs::dirname($path)) && !egw_vfs::mkdir($dir,null,STREAM_MKDIR_RECURSIVE))
+		if (!egw_vfs::file_exists($dir = egw_vfs::dirname($path)) && !egw_vfs::mkdir($dir, null, STREAM_MKDIR_RECURSIVE))
 		{
-			etemplate::set_validation_error($name,lang('Error create parent directory %1!',egw_vfs::decodePath($dir)));
+			etemplate::set_validation_error($name, lang('Error create parent directory %1!', egw_vfs::decodePath($dir)));
 			return false;
 		}
-		if (!copy($tmp_name,egw_vfs::PREFIX.$path))
+		if (!copy($tmp_name, egw_vfs::PREFIX.$path))
 		{
-			etemplate::set_validation_error($name,lang('Error copying uploaded file to vfs!'));
+			etemplate::set_validation_error($name, lang('Error copying uploaded file to vfs!'));
 			return false;
 		}
-		$value = $path;	// return path of file, important if only a temporary location is used
+		$value = $path; // return path of file, important if only a temporary location is used
 
 		return true;
 	}

Braces +61 added lines, -15 removed lines

@@ -78,14 +78,21 @@ 
 	{
 		//echo "<p>".__METHOD__."($form_name,$value,".array2string($cell).",...)</p>\n";
 		$type = $cell['type'];
-		if (!in_array($type,array('vfs-name','vfs-upload'))) $cell['readonly'] = true;	// to not call post-process
+		if (!in_array($type,array('vfs-name','vfs-upload')))
+		{
+			$cell['readonly'] = true;
+		}
+		// to not call post-process
 
 		// check if we have a path and not the raw value, in that case we have to do a stat first
 		if (in_array($type,array('vfs-size','vfs-mode','vfs-uid','vfs-gid')) && !is_numeric($value) || $type == 'vfs' && !$value)
 		{
 			if (!$value || !($stat = egw_vfs::stat($value)))
 			{
-				if ($value) $value = lang("File '%1' not found!",egw_vfs::decodePath($value));
+				if ($value)
+				{
+					$value = lang("File '%1' not found!",egw_vfs::decodePath($value));
+				}
 				$cell = boetemplate::empty_cell();
 				return true;	// allow extra value;
 			}
@@ -95,10 +102,13 @@ 
 		switch($type)
 		{
 			case 'vfs-upload':		// option: required mimetype or regular expression for mimetype to match, eg. '/^text\//i' for all text files
-				if (empty($value) && preg_match('/^exec.*\[([^]]+)\]$/',$form_name,$matches))	// if no value via content array, use widget name
+				if (empty($value) && preg_match('/^exec.*\[([^]]+)\]$/',$form_name,$matches))
+				{
+					// if no value via content array, use widget name
 				{
 					$value = $matches[1];
 				}
+				}
 				$extension_data = array('value' => $value, 'mimetype' => $cell['size'], 'type' => $type);
 				if ($value[0] != '/')
 				{
@@ -106,7 +116,10 @@ 
 					if (empty($id))
 					{
 						static $tmppath = array();	// static var, so all vfs-uploads get created in the same temporary dir
-						if (!isset($tmppath[$app])) $tmppath[$app] = '/home/'.$GLOBALS['egw_info']['user']['account_lid'].'/.'.$app.'_'.md5(time().session_id());
+						if (!isset($tmppath[$app]))
+						{
+							$tmppath[$app] = '/home/'.$GLOBALS['egw_info']['user']['account_lid'].'/.'.$app.'_'.md5(time().session_id());
+						}
 						$value = $tmppath[$app];
 						unset($cell['onchange']);	// no onchange, if we have to use a temporary dir
 					}
@@ -114,12 +127,18 @@ 
 					{
 						$value = egw_link::vfs_path($app,$id,'',true);
 					}
-					if (!empty($relpath)) $value .= '/'.$relpath;
+					if (!empty($relpath))
+					{
+						$value .= '/'.$relpath;
+					}
 				}
 				$path = $extension_data['path'] = $value;
-				if (substr($path,-1) != '/' && self::file_exists($path) && !egw_vfs::is_dir($path))	// display download link and delete icon
+				if (substr($path,-1) != '/' && self::file_exists($path) && !egw_vfs::is_dir($path))
+				{
+					// display download link and delete icon
 				{
 					$extension_data['path'] = $path;
+				}
 					$cell = $this->file_widget($value,$path,$cell['name'],$cell['label']);
 				}
 				else	// file does NOT exists --> display file upload
@@ -161,7 +180,10 @@ 
 
 			case 'vfs-size':	// option: add size in bytes in brackets
 				$value = egw_vfs::hsize($size = is_numeric($value) ? $value : $stat['size']);
-				if ($cell['size']) $value .= ' ('.$size.')';
+				if ($cell['size'])
+				{
+					$value .= ' ('.$size.')';
+				}
 				$cell['type'] = 'label';
 				break;
 
@@ -224,16 +246,22 @@ 
 								$value['c'.$n] = lang($path_parts[2]);
 								break;
 							case 4:
-								if (is_numeric($value['c'.$n])) $value['c'.$n] .= egw_link::title($path_parts[2],$path_parts[3]);
+								if (is_numeric($value['c'.$n]))
+								{
+									$value['c'.$n] .= egw_link::title($path_parts[2],$path_parts[3]);
+								}
 								break;
 						}
 					}
 					$popup = null;
-					if (egw_vfs::is_readable($path))	// show link only if we have access to the file or dir
+					if (egw_vfs::is_readable($path))
+					{
+						// show link only if we have access to the file or dir
 					{
 						if ($n < count($comps)-1 || $mime == egw_vfs::DIR_MIME_TYPE || egw_vfs::is_dir($path))
 						{
 							$value['l'.$n] = egw_link::mime_open($path, egw_vfs::DIR_MIME_TYPE, $popup);
+					}
 							$target = '';
 						}
 						else
@@ -411,8 +439,14 @@ 
 	{
 		static $files = array();	// static var, to scan each directory only once
 		$dir = egw_vfs::dirname($path);
-		if ($clear_after === false) unset($files[$dir]);
-		if (!isset($files[$dir])) $files[$dir] = egw_vfs::file_exists($dir) ? egw_vfs::scandir($dir) : array();
+		if ($clear_after === false)
+		{
+			unset($files[$dir]);
+		}
+		if (!isset($files[$dir]))
+		{
+			$files[$dir] = egw_vfs::file_exists($dir) ? egw_vfs::scandir($dir) : array();
+		}
 
 		$basename = egw_vfs::basename($path);
 		$basename_len = strlen($basename);
@@ -425,7 +459,10 @@ 
 				$found = true;
 			}
 		}
-		if ($clear_after === true) unset($files[$dir]);
+		if ($clear_after === true)
+		{
+			unset($files[$dir]);
+		}
 		//echo "<p>".__METHOD__."($path) returning ".array2string($found)."</p>\n";
 		return $found;
 	}
@@ -452,7 +489,10 @@ 
 		//error_log(__METHOD__."('$name',".array2string($value).','.array2string($extension_data).",$loop,,".array2string($value_in).')');
 		//echo '<p>'.__METHOD__."('$name',".array2string($value).','.array2string($extension_data).",$loop,,".array2string($value_in).")</p>\n";
 
-		if (!$extension_data) return false;
+		if (!$extension_data)
+		{
+			return false;
+		}
 
 		switch($extension_data['type'])
 		{
@@ -472,7 +512,9 @@ 
 		if ($_POST['submit_button'] == ($fname = str_replace($extension_data['value'],$extension_data['path'],$name)) ||
 			substr($extension_data['path'],-1) == '/' && substr($_POST['submit_button'],0,strlen($fname)-1) == substr($fname,0,-1))
 		{
-			if (substr($extension_data['path'],-1) == '/')	// multiple files?
+			if (substr($extension_data['path'],-1) == '/')
+			{
+				// multiple files?
 			{
 				foreach($extension_data['files'] as $file)	// check of each single file, to not allow deleting of arbitrary files
 				{
@@ -481,6 +523,7 @@ 
 						if (!egw_vfs::unlink($extension_data['path'].$file))
 						{
 							etemplate::set_validation_error($name,lang('Error deleting %1!',egw_vfs::decodePath($extension_data['path'].$file)));
+			}
 						}
 						break;
 					}
@@ -530,10 +573,13 @@ 
 		{
 			// add extension to path
 			$parts = explode('.',$filename);
-			if (($extension = array_pop($parts)) && mime_magic::ext2mime($extension))	// really an extension --> add it to path
+			if (($extension = array_pop($parts)) && mime_magic::ext2mime($extension))
+			{
+				// really an extension --> add it to path
 			{
 				$path .= '.'.$extension;
 			}
+			}
 		}
 		else	// multiple upload with dir given (trailing slash)
 		{

etemplate/inc/class.xmltool.inc.php

Doc Comments +10 added lines

@@ -158,6 +158,9 @@ 
 			return $this->attributes;
 		}
 		
+		/**
+		 * @param string $comment
+		 */
 		function add_comment ($comment)
 		{
 			$this->comments[] = $comment;
@@ -382,6 +385,10 @@ 
 		}
 
 		
+		/**
+		 * @param integer $i
+		 * @param xmltool $parent_node
+		 */
 		function import_xml_children($data, &$i, $parent_node)
 		{
 			while (++$i < count($data))
@@ -594,6 +601,9 @@ 
 			$this->set_version($version);
 		}
 
+		/**
+		 * @param xmlnode $root_node
+		 */
 		function add_root($root_node)
 		{
 			return $this->add_node($root_node);

Spacing +82 added lines, -82 removed lines

@@ -12,8 +12,8 @@ 
 
 	function var2xml($name, $data)
 	{
-		$doc = new xmltool('root','','');
-		return $doc->import_var($name,$data,True,True);
+		$doc = new xmltool('root', '', '');
+		return $doc->import_var($name, $data, True, True);
 	}
 
 	class xmltool
@@ -32,13 +32,13 @@ 
 		var $indentstring = "\t";
 		
 		/* start the class as either a root or a node */
-		function xmltool ($node_type = 'root', $name='',$indentstring="\t")
+		function xmltool($node_type = 'root', $name = '', $indentstring = "\t")
 		{
 			$this->node_type = $node_type;
 			$this->indentstring = $indentstring;
 			if ($this->node_type == 'node')
 			{
-				if($name != '')
+				if ($name != '')
 				{
 					$this->name = $name;
 				}
@@ -50,13 +50,13 @@ 
 			}
 		}
 		
-		function set_version ($version = '1.0')
+		function set_version($version = '1.0')
 		{
 			$this->xmlversion = $version;
 			return True;
 		}
 
-		function set_doctype ($name, $uri = '')
+		function set_doctype($name, $uri = '')
 		{
 			if ($this->node_type == 'root')
 			{
@@ -69,7 +69,7 @@ 
 			}
 		}
 
-		function add_node ($node_object, $name = '')
+		function add_node($node_object, $name = '')
 		{
 			switch ($this->node_type)
 			{
@@ -84,7 +84,7 @@ 
 					}
 					break;
 				case 'node':
-					if(!is_array($this->data))
+					if (!is_array($this->data))
 					{
 						$this->data = Array();
 						$this->data_type = 'node';
@@ -109,9 +109,9 @@ 
 			}
 		}
 
-		function get_node ($name = '')	// what is that function doing: NOTHING !!!
+		function get_node($name = '')	// what is that function doing: NOTHING !!!
 		{
-			switch	($this->data_type)
+			switch ($this->data_type)
 			{
 				case 'root':
 					break;
@@ -123,16 +123,16 @@ 
 		
 		}
 
-		function set_value ($string)
+		function set_value($string)
 		{
 			$this->data = $string;
 			$this->data_type = 'value';
 			return True;
 		}
 		
-		function get_value ()
+		function get_value()
 		{
-			if($this->data_type == 'value')
+			if ($this->data_type == 'value')
 			{
 				return $this->data;
 			}
@@ -142,32 +142,32 @@ 
 			}
 		}
 
-		function set_attribute ($name, $value = '')
+		function set_attribute($name, $value = '')
 		{
 			$this->attributes[$name] = $value;
 			return True;
 		}
 
-		function get_attribute ($name)
+		function get_attribute($name)
 		{
 			return $this->attributes[$name];
 		}
 
-		function get_attributes ()
+		function get_attributes()
 		{
 			return $this->attributes;
 		}
 		
-		function add_comment ($comment)
+		function add_comment($comment)
 		{
 			$this->comments[] = $comment;
 			return True;
 		}
 
-		function import_var($name, $value,$is_root=False,$export_xml=False)
+		function import_var($name, $value, $is_root = False, $export_xml = False)
 		{
 			//echo "<p>import_var: this->indentstring='$this->indentstring'</p>\n";
-			$node = new xmltool('node',$name,$this->indentstring);
+			$node = new xmltool('node', $name, $this->indentstring);
 			switch (gettype($value))
 			{
 				case 'string':
@@ -177,7 +177,7 @@ 
 					$node->set_value($value);
 					break;
 				case 'boolean':
-					if($value == True)
+					if ($value == True)
 					{
 						$node->set_value('1');
 					}
@@ -188,11 +188,11 @@ 
 					break;
 				case 'array':
 					$new_index = False;
-					while (list ($idxkey, $idxval) = each ($value))
+					while (list ($idxkey, $idxval) = each($value))
 					{
-						if(is_array($idxval))
+						if (is_array($idxval))
 						{
-							while (list ($k, $i) = each ($idxval))
+							while (list ($k, $i) = each($idxval))
 							{
 								if (is_int($k))
 								{
@@ -202,9 +202,9 @@ 
 						}
 					}
 					reset($value);	
-					while (list ($key, $val) = each ($value))
+					while (list ($key, $val) = each($value))
 					{
-						if($new_index)
+						if ($new_index)
 						{
 							$keyname = $name;
 							$nextkey = $key;
@@ -220,13 +220,13 @@ 
 							case 'integer':
 							case 'double':
 							case 'NULL':
-								$subnode = new xmltool('node', $nextkey,$this->indentstring);
+								$subnode = new xmltool('node', $nextkey, $this->indentstring);
 								$subnode->set_value($val);
 								$node->add_node($subnode);							
 								break;
 							case 'boolean':
-								$subnode = new xmltool('node', $nextkey,$this->indentstring);
-								if($val == True)
+								$subnode = new xmltool('node', $nextkey, $this->indentstring);
+								if ($val == True)
 								{
 									$subnode->set_value('1');
 								}
@@ -237,9 +237,9 @@ 
 								$node->add_node($subnode);							
 								break;
 							case 'array':
-								if($new_index)
+								if ($new_index)
 								{
-									while (list ($subkey, $subval) = each ($val))
+									while (list ($subkey, $subval) = each($val))
 									{
 										$node->add_node($this->import_var($nextkey, $subval));
 									}
@@ -251,7 +251,7 @@ 
 								}
 								break;
 							case 'object':
-								$subnode = new xmltool('node', $nextkey,$this->indentstring);
+								$subnode = new xmltool('node', $nextkey, $this->indentstring);
 								$subnode->set_value('PHP_SERIALIZED_OBJECT&:'.serialize($val));
 								$node->add_node($subnode);							
 								break;
@@ -275,10 +275,10 @@ 
 					exit;
 			}
 	
-			if($is_root)
+			if ($is_root)
 			{
 				$this->add_node($node);
-				if($export_xml)
+				if ($export_xml)
 				{
 					$xml = $this->export_xml();
 					return $xml;
@@ -297,17 +297,17 @@ 
 
 		function export_var()
 		{
-			if($this->node_type == 'root')
+			if ($this->node_type == 'root')
 			{
 				return $this->data->export_var();
 			}
 
-			if($this->data_type != 'node')
+			if ($this->data_type != 'node')
 			{	
-				$found_at = strpos($this->data,'PHP_SERIALIZED_OBJECT&:');
-				if($found_at !== False)
+				$found_at = strpos($this->data, 'PHP_SERIALIZED_OBJECT&:');
+				if ($found_at !== False)
 				{
-					return unserialize(str_replace ('PHP_SERIALIZED_OBJECT&:', '', $this->data));
+					return unserialize(str_replace('PHP_SERIALIZED_OBJECT&:', '', $this->data));
 				}
 				return $this->data;
 			}
@@ -315,9 +315,9 @@ 
 			{
 				$new_index = False;
 				reset($this->data);
-				while(list($key,$val) = each($this->data))
+				while (list($key, $val) = each($this->data))
 				{
-					if(!isset($found_keys[$val->name]))
+					if (!isset($found_keys[$val->name]))
 					{
 						$found_keys[$val->name] = True;
 					}
@@ -327,10 +327,10 @@ 
 					}
 				}
 
-				if($new_index)
+				if ($new_index)
 				{
 					reset($this->data);
-					while(list($key,$val) = each($this->data))
+					while (list($key, $val) = each($this->data))
 					{
 
 						$return_array[$val->name][] = $val->export_var();
@@ -339,7 +339,7 @@ 
 				else
 				{
 					reset($this->data);
-					while(list($key,$val) = each($this->data))
+					while (list($key, $val) = each($this->data))
 					{
 						$return_array[$val->name] = $val->export_var();
 					}
@@ -350,19 +350,19 @@ 
 
 		function export_struct()
 		{
-			if($this->node_type == 'root')
+			if ($this->node_type == 'root')
 			{
 				return $this->data->export_struct();
 			}
 
 			$retval['tag'] = $this->name;
 			$retval['attributes'] = $this->attributes;
-			if($this->data_type != 'node')
+			if ($this->data_type != 'node')
 			{	
-				$found_at = strpos($this->data,'PHP_SERIALIZED_OBJECT&:');
-				if($found_at !== False)
+				$found_at = strpos($this->data, 'PHP_SERIALIZED_OBJECT&:');
+				if ($found_at !== False)
 				{
-					$retval['value'] = unserialize(str_replace ('PHP_SERIALIZED_OBJECT&:', '', $this->data));
+					$retval['value'] = unserialize(str_replace('PHP_SERIALIZED_OBJECT&:', '', $this->data));
 				}
 				else
 				{
@@ -373,7 +373,7 @@ 
 			else
 			{
 				reset($this->data);
-				while(list($key,$val) = each($this->data))
+				while (list($key, $val) = each($this->data))
 				{
 					$retval['children'][] = $val->export_struct();
 				}				
@@ -390,24 +390,24 @@ 
 				{
 					case 'cdata':
 					case 'complete':
-						$node = new xmltool('node',$data[$i]['tag'],$this->indentstring);
-						if(is_array($data[$i]['attributes']) && count($data[$i]['attributes']) > 0)
+						$node = new xmltool('node', $data[$i]['tag'], $this->indentstring);
+						if (is_array($data[$i]['attributes']) && count($data[$i]['attributes']) > 0)
 						{
-							while(list($k,$v)=each($data[$i]['attributes']))
+							while (list($k, $v) = each($data[$i]['attributes']))
 							{
-								$node->set_attribute($k,$v);
+								$node->set_attribute($k, $v);
 							}
 						}
 						$node->set_value($data[$i]['value']);
 						$parent_node->add_node($node);
 						break;
 					case 'open':
-						$node = new xmltool('node',$data[$i]['tag'],$this->indentstring);
-						if(is_array($data[$i]['attributes']) && count($data[$i]['attributes']) > 0)
+						$node = new xmltool('node', $data[$i]['tag'], $this->indentstring);
+						if (is_array($data[$i]['attributes']) && count($data[$i]['attributes']) > 0)
 						{
-							while(list($k,$v)=each($data[$i]['attributes']))
+							while (list($k, $v) = each($data[$i]['attributes']))
 							{
-								$node->set_attribute($k,$v);
+								$node->set_attribute($k, $v);
 							}
 						}
 						
@@ -424,14 +424,14 @@ 
 		{
 			$parser = xml_parser_create();
 			xml_parser_set_option($parser, XML_OPTION_CASE_FOLDING, 0);
-			xml_parser_set_option($parser, XML_OPTION_SKIP_WHITE,   1);
+			xml_parser_set_option($parser, XML_OPTION_SKIP_WHITE, 1);
 			xml_parse_into_struct($parser, $xmldata, $vals, $index);
 			xml_parser_free($parser);
 			unset($index);	
-			$node = new xmltool('node',$vals[0]['tag'],$this->indentstring);
-			if(isset($vals[0]['attributes']))
+			$node = new xmltool('node', $vals[0]['tag'], $this->indentstring);
+			if (isset($vals[0]['attributes']))
 			{
-				while(list($key,$value) = each($vals[0]['attributes']))
+				while (list($key, $value) = each($vals[0]['attributes']))
 				{
 					$node->set_attribute($key, $value);
 				}
@@ -458,20 +458,20 @@ 
 			if ($this->node_type == 'root')
 			{
 				$result = '<?xml version="'.$this->xmlversion.'"?>'."\n";
-				if(count($this->doctype) == 1)
+				if (count($this->doctype) == 1)
 				{
-					list($doctype_name,$doctype_uri) = each($this->doctype);
+					list($doctype_name, $doctype_uri) = each($this->doctype);
 					$result .= '<!DOCTYPE '.$doctype_name.' SYSTEM "'.$doctype_uri.'">'."\n";
 				}
-				if(count($this->comments) > 0 )
+				if (count($this->comments) > 0)
 				{
 					//reset($this->comments);
-					while(list($key,$val) = each ($this->comments))
+					while (list($key, $val) = each($this->comments))
 					{
 						$result .= "<!-- $val -->\n";
 					}
 				}
-				if(is_object($this->data))
+				if (is_object($this->data))
 				{
 					$indent = 0;
 					$result .= $this->data->export_xml($indent);
@@ -486,12 +486,12 @@ 
 				}
 
 				$result = $indentstring.'<'.$this->name;
-				if(count($this->attributes) > 0 )
+				if (count($this->attributes) > 0)
 				{
 					reset($this->attributes);
-					while(list($key,$val) = each ($this->attributes))
+					while (list($key, $val) = each($this->attributes))
 					{
-						if (!is_array($val)) $result .= ' '.$key.'="'.htmlspecialchars($val,ENT_COMPAT,'utf-8').'"';
+						if (!is_array($val)) $result .= ' '.$key.'="'.htmlspecialchars($val, ENT_COMPAT, 'utf-8').'"';
 					}
 				}
 
@@ -507,7 +507,7 @@ 
 					switch ($this->data_type)
 					{
 						case 'value':
-							if(is_array($this->data))
+							if (is_array($this->data))
 							{
 								$type_error = True;
 								break;
@@ -518,37 +518,37 @@ 
 								$result .= '<![CDATA['.$this->data.']]>';
 								$endtag_indent = '';		
 							}
-							else*/if(strlen($this->data) > 30 && !empty($this->indentstring))
+							else*/if (strlen($this->data) > 30 && !empty($this->indentstring))
 							{
-								$result .= "\n".$indentstring.$this->indentstring.htmlspecialchars($this->data,ENT_COMPAT,'utf-8')."\n";
+								$result .= "\n".$indentstring.$this->indentstring.htmlspecialchars($this->data, ENT_COMPAT, 'utf-8')."\n";
 								$endtag_indent = $indentstring;
 							}
 							else
 							{
-								$result .= htmlspecialchars($this->data,ENT_COMPAT,'utf-8');
+								$result .= htmlspecialchars($this->data, ENT_COMPAT, 'utf-8');
 								$endtag_indent = '';
 							}
 							break;
 						case 'node':
 							$result .= "\n";
-							if(!is_array($this->data))
+							if (!is_array($this->data))
 							{
 								$type_error = True;
 								break;
 							}
 				
-							$subindent = $indent+1;
+							$subindent = $indent + 1;
 							reset($this->data);
-							while(list($key,$val) = each ($this->data))
+							while (list($key, $val) = each($this->data))
 							{
-								if(is_object($val))
+								if (is_object($val))
 								{
 									$result .= $val->export_xml($subindent);
 								}
 							}
 							break;
 						default:
-						if($this->data != '')
+						if ($this->data != '')
 						{
 							echo 'Invalid or unset data type ('.$this->data_type.'). This should not be possible if using the class as intended<br>';
 						}
@@ -560,15 +560,15 @@ 
 					}
 
 					$result .= $endtag_indent.'</'.$this->name.'>';
-					if($indent != 0)
+					if ($indent != 0)
 					{
 						$result .= "\n";
 					}
 				}
-				if(count($this->comments) > 0 )
+				if (count($this->comments) > 0)
 				{
 					reset($this->comments);
-					while(list($key,$val) = each ($this->comments))
+					while (list($key, $val) = each($this->comments))
 					{
 						$result .= $endtag_indent."<!-- $val -->\n";
 					}
@@ -582,7 +582,7 @@ 
 	{
 		function xmlnode($name)
 		{
-			$this->xmltool('node',$name);
+			$this->xmltool('node', $name);
 		}
 	}
 

Braces +7 added lines, -4 removed lines

@@ -303,7 +303,7 @@ 
 			}
 
 			if($this->data_type != 'node')
-			{	
+			{
 				$found_at = strpos($this->data,'PHP_SERIALIZED_OBJECT&:');
 				if($found_at !== False)
 				{
@@ -358,7 +358,7 @@ 
 			$retval['tag'] = $this->name;
 			$retval['attributes'] = $this->attributes;
 			if($this->data_type != 'node')
-			{	
+			{
 				$found_at = strpos($this->data,'PHP_SERIALIZED_OBJECT&:');
 				if($found_at !== False)
 				{
@@ -420,7 +420,7 @@ 
 			}
 		}
 		
-		function import_xml($xmldata) 
+		function import_xml($xmldata)
 		{
 			$parser = xml_parser_create();
 			xml_parser_set_option($parser, XML_OPTION_CASE_FOLDING, 0);
@@ -491,7 +491,10 @@ 
 					reset($this->attributes);
 					while(list($key,$val) = each ($this->attributes))
 					{
-						if (!is_array($val)) $result .= ' '.$key.'="'.htmlspecialchars($val,ENT_COMPAT,'utf-8').'"';
+						if (!is_array($val))
+						{
+							$result .= ' '.$key.'="'.htmlspecialchars($val,ENT_COMPAT,'utf-8').'"';
+						}
 					}
 				}
 

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

@@ -20,15 +20,15 @@ 
 	{
 		/* for root nodes */
 		var $xmlversion = '1.0';
-		var $doctype = Array();
+		var $doctype = array();
 		/* shared */
 		var $node_type = '';
 		var $name = '';
 		var $data_type;
 		var $data;
 		/* for nodes */
-		var $attributes = Array();
-		var $comments = Array();
+		var $attributes = array();
+		var $comments = array();
 		var $indentstring = "\t";
 		
 		/* start the class as either a root or a node */
@@ -86,7 +86,7 @@ 
 				case 'node':
 					if(!is_array($this->data))
 					{
-						$this->data = Array();
+						$this->data = array();
 						$this->data_type = 'node';
 					}
 					if (is_object($node_object))

etemplate/thumbnail.php

Doc Comments +1 added lines

@@ -80,6 +80,7 @@
 
 /**
  * Returns the maximum width/height of a thumbnail
+ * @return integer|null
  */
 function get_maxsize()
 {

Spacing +25 added lines, -26 removed lines

@@ -68,9 +68,9 @@ 
 		}
 	}
 
-	if (!preg_match('/^[a-z0-9_-]+$/i',$app))
+	if (!preg_match('/^[a-z0-9_-]+$/i', $app))
 	{
-		die('Stop');	// just to prevent someone doing nasty things
+		die('Stop'); // just to prevent someone doing nasty things
 	}
 
 	return $app;
@@ -81,8 +81,7 @@ 
  */
 function get_maxsize()
 {
-	$preset = !($GLOBALS['egw_info']['server']['link_list_thumbnail'] > 0) ? 64 :
-		$GLOBALS['egw_info']['server']['link_list_thumbnail'];
+	$preset = !($GLOBALS['egw_info']['server']['link_list_thumbnail'] > 0) ? 64 : $GLOBALS['egw_info']['server']['link_list_thumbnail'];
 
 	// Another maximum size may be passed if thumbnails are turned on
 	if ($preset != 0 && isset($_GET['thsize']) && is_numeric($_GET['thsize']))
@@ -148,7 +147,7 @@ 
 	}
 	$dst = gen_dstfile($stat && !empty($stat['url']) ? $stat['url'] : $src, $maxsize, $height, $width, $minsize);
 	$dst_dir = dirname($dst);
-	if(file_exists($dst_dir))
+	if (file_exists($dst_dir))
 	{
 		// Check whether the destination file already exists and is newer than
 		// the source file. Assume the file doesn't exist if thumbnailing is turned off.
@@ -188,7 +187,7 @@ 
 		{
 			// Allow client to cache these, makes scrolling in filemanager much nicer
 			// setting maximum allow caching time of one year, if url contains (non-empty) moditication time
-			egw_session::cache_control(empty($_GET['mtime']) ? 300 : 31536000, true);	// true = private / browser only caching
+			egw_session::cache_control(empty($_GET['mtime']) ? 300 : 31536000, true); // true = private / browser only caching
 			header('Content-Type: '.$output_mime);
 			readfile($dst);
 			return true;
@@ -210,7 +209,7 @@ 
  * @param int $minsize =null
  * @return string
  */
-function gen_dstfile($src, $maxsize, $height=null, $width=null, $minsize=null)
+function gen_dstfile($src, $maxsize, $height = null, $width = null, $minsize = null)
 {
 	// Use the egroupware file cache to store the thumbnails on a per instance basis
 	$cachefile = new egw_cache_files(array());
@@ -236,7 +235,7 @@ 
  * TODO: As this is a general purpose function, it might probably be moved
  *   to some other php file or an "image utils" class.
  */
-function get_scaled_image_size($w, $h, $maxw, $maxh, $minw=0, $minh=0)
+function get_scaled_image_size($w, $h, $maxw, $maxh, $minw = 0, $minh = 0)
 {
 	//Scale will contain the factor by which the image has to be scaled down
 	$scale = 1.0;
@@ -297,7 +296,7 @@ 
  * @param int $maxh the maximum height of the thumbnail
  * @returns boolean|resource false or a gd_image
  */
-function gd_image_load($file,$maxw,$maxh)
+function gd_image_load($file, $maxw, $maxh)
 {
 	// Get mime type
 	list($type, $image_type) = explode('/', egw_vfs::mime_content_type($file));
@@ -305,9 +304,9 @@ 
 	if (!$type) list($type, $image_type) = explode('/', mime_magic::filename2mime($file));
 
 	// Call the according gd constructor depending on the file type
-	if($type == 'image')
+	if ($type == 'image')
 	{
-		if (in_array($image_type, array('tiff','jpeg')) && ($image = exif_thumbnail_load($file)))
+		if (in_array($image_type, array('tiff', 'jpeg')) && ($image = exif_thumbnail_load($file)))
 		{
 			return $image;
 		}
@@ -326,12 +325,12 @@ 
 	else if ($type == 'application')
 	{
 		$thumb = false;
-		if(strpos($image_type,'vnd.oasis.opendocument.') === 0)
+		if (strpos($image_type, 'vnd.oasis.opendocument.') === 0)
 		{
 			// OpenDocuments have thumbnails inside already
 			$thumb = get_opendocument_thumbnail($file);
 		}
-		else if($image_type == 'pdf')
+		else if ($image_type == 'pdf')
 		{
 			$thumb = get_pdf_thumbnail($file);
 		}
@@ -341,7 +340,7 @@ 
 			//$thumb = get_msoffice_thumbnail($file);
 		}
 		// Mark it with mime type icon
-		if($thumb)
+		if ($thumb)
 		{
 			// Need to scale first, or the mark will be wrong size
 			$scaled = get_scaled_image_size(imagesx($thumb), imagesy($thumb), $maxw, $maxh);
@@ -381,8 +380,8 @@ 
 
 	// Image is already there, but we can't access them directly through VFS
 	$ext = $mimetype == 'application/vnd.oasis.opendocument.text' ? '.odt' : '.ods';
-	$archive = tempnam($GLOBALS['egw_info']['server']['temp_dir'], basename($file,$ext).'-');
-	copy($file,$archive);
+	$archive = tempnam($GLOBALS['egw_info']['server']['temp_dir'], basename($file, $ext).'-');
+	copy($file, $archive);
 
 	$thumbnail_url = 'zip://'.$archive.'#Thumbnails/thumbnail.png';
 	$image = imagecreatefromstring(file_get_contents($thumbnail_url));
@@ -436,7 +435,7 @@ 
  */
 function get_pdf_thumbnail($file)
 {
-	if(!pdf_thumbnails_available()) return false;
+	if (!pdf_thumbnails_available()) return false;
 
 	// switch off max_excution_time, as some thumbnails take longer and
 	// will be startet over and over again, if they dont finish
@@ -465,7 +464,7 @@ 
 	$target_height = imagesy($target_image);
 
 	// Find mime image, if no tag image set
-	if(!$tag_image && $mime)
+	if (!$tag_image && $mime)
 	{
 		list($app, $icon) = explode('/', egw_vfs::mime_icon($mime), 2);
 		list(, $path) = explode($GLOBALS['egw_info']['server']['webserver_url'],
@@ -476,16 +475,16 @@ 
 
 	// Find correct size - max 1/3 target
 	$tag_size = get_scaled_image_size(imagesx($tag_image), imagesy($tag_image), $target_width / 3, $target_height / 3);
-	if(!$tag_size) return;
-	list($tag_width,$tag_height) = $tag_size;
+	if (!$tag_size) return;
+	list($tag_width, $tag_height) = $tag_size;
 
 	// Put it in
-	if($mime)
+	if ($mime)
 	{
-		imagecopyresampled($target_image,$tag_image,
+		imagecopyresampled($target_image, $tag_image,
 			$target_width - $tag_width,
 			$target_height - $tag_height,
-			0,0,
+			0, 0,
 			$tag_width,
 			$tag_height,
 			imagesx($tag_image),
@@ -539,7 +538,7 @@ 
 function gd_image_thumbnail($file, $maxw, $maxh, $minw, $minh)
 {
 	//Load the image
-	if (($img_src = gd_image_load($file,$maxw,$maxh)) !== false)
+	if (($img_src = gd_image_load($file, $maxw, $maxh)) !== false)
 	{
 		//Get the constraints of the image
 		$w = imagesx($img_src);
@@ -569,14 +568,14 @@ 
 */
 function gdVersion($user_ver = 0)
 {
-	if (! extension_loaded('gd')) { return; }
+	if (!extension_loaded('gd')) { return; }
 	static $gd_ver = 0;
 
 	// Just accept the specified setting if it's 1.
 	if ($user_ver == 1) { $gd_ver = 1; return 1; }
 
 	// Use the static variable if function was called previously.
-	if ($user_ver !=2 && $gd_ver > 0 ) { return $gd_ver; }
+	if ($user_ver != 2 && $gd_ver > 0) { return $gd_ver; }
 
 	// Use the gd_info() function if possible.
 	if (function_exists('gd_info')) {

Braces +38 added lines, -12 removed lines

@@ -242,10 +242,13 @@ 
 	$scale = 1.0;
 
 	//Select the constraining dimension
-	if ($w > $h) // landscape image: constraining factor $minh or $maxw
+	if ($w > $h)
+	{
+		// landscape image: constraining factor $minh or $maxw
 	{
 		$scale = $minh ? $minh / $h : $maxw / $w;
 	}
+	}
 	else // portrail image: constraining factor $minw or $maxh
 	{
 		$scale = $minw ? $minw / $w : $maxh / $h;
@@ -302,7 +305,10 @@ 
 	// Get mime type
 	list($type, $image_type) = explode('/', egw_vfs::mime_content_type($file));
 	// if $file is not from vfs, use mime_magic::filename2mime to get mime-type from extension
-	if (!$type) list($type, $image_type) = explode('/', mime_magic::filename2mime($file));
+	if (!$type)
+	{
+		list($type, $image_type) = explode('/', mime_magic::filename2mime($file));
+	}
 
 	// Call the according gd constructor depending on the file type
 	if($type == 'image')
@@ -436,7 +442,10 @@ 
  */
 function get_pdf_thumbnail($file)
 {
-	if(!pdf_thumbnails_available()) return false;
+	if(!pdf_thumbnails_available())
+	{
+		return false;
+	}
 
 	// switch off max_excution_time, as some thumbnails take longer and
 	// will be startet over and over again, if they dont finish
@@ -476,7 +485,10 @@ 
 
 	// Find correct size - max 1/3 target
 	$tag_size = get_scaled_image_size(imagesx($tag_image), imagesy($tag_image), $target_width / 3, $target_height / 3);
-	if(!$tag_size) return;
+	if(!$tag_size)
+	{
+		return;
+	}
 	list($tag_width,$tag_height) = $tag_size;
 
 	// Put it in
@@ -569,17 +581,24 @@ 
 */
 function gdVersion($user_ver = 0)
 {
-	if (! extension_loaded('gd')) { return; }
+	if (! extension_loaded('gd'))
+	{
+return; }
 	static $gd_ver = 0;
 
 	// Just accept the specified setting if it's 1.
-	if ($user_ver == 1) { $gd_ver = 1; return 1; }
+	if ($user_ver == 1)
+	{
+$gd_ver = 1; return 1; }
 
 	// Use the static variable if function was called previously.
-	if ($user_ver !=2 && $gd_ver > 0 ) { return $gd_ver; }
+	if ($user_ver !=2 && $gd_ver > 0 )
+	{
+return $gd_ver; }
 
 	// Use the gd_info() function if possible.
-	if (function_exists('gd_info')) {
+	if (function_exists('gd_info'))
+	{
 		$ver_info = gd_info();
 		$match = null;
 		preg_match('/\d/', $ver_info['GD Version'], $match);
@@ -588,11 +607,15 @@ 
 	}
 
 	// If phpinfo() is disabled use a specified / fail-safe choice...
-	if (preg_match('/phpinfo/', ini_get('disable_functions'))) {
-		if ($user_ver == 2) {
+	if (preg_match('/phpinfo/', ini_get('disable_functions')))
+	{
+		if ($user_ver == 2)
+		{
 			$gd_ver = 2;
 			return 2;
-		} else {
+		}
+		else
+		{
 			$gd_ver = 1;
 			return 1;
 		}
@@ -601,6 +624,9 @@ 
 	ob_start();
 	phpinfo(8);
 	$info = stristr(ob_get_clean(), 'gd version');
-	if (preg_match('/\d/', $info, $match)) $gd_ver = $match[0];
+	if (preg_match('/\d/', $info, $match))
+	{
+		$gd_ver = $match[0];
+	}
 	return $match[0];
 }

home/inc/class.home_ui.inc.php

Doc Comments +1 added lines, -1 removed lines

@@ -150,7 +150,7 @@
 	 * Get a list of the user's portlets, and their associated values & settings, for display
 	 *
 	 * Actual portlet content is provided by each portlet.
-	 * @param template etemplate so attributes can be set
+	 * @param template etemplate_new so attributes can be set
 	 */
 	protected function get_user_portlets(etemplate_new &$template)
 	{

Spacing +105 added lines, -105 removed lines

@@ -45,21 +45,21 @@ 
 		$content = array(
 			'portlets' => $this->get_user_portlets($template)
 		);
-		$template->setElementAttribute('home.index','actions',$this->get_actions());
+		$template->setElementAttribute('home.index', 'actions', $this->get_actions());
 
 		$GLOBALS['egw_info']['flags']['app_header'] = lang('home');
 		$GLOBALS['egw_info']['flags']['currentapp'] = 'home';
 
 		// Main screen message
 		translation::add_app('mainscreen');
-		$greeting = translation::translate('mainscreen_message',false,'');
+		$greeting = translation::translate('mainscreen_message', false, '');
 
-		if($greeting == 'mainscreen_message'|| empty($greeting))
+		if ($greeting == 'mainscreen_message' || empty($greeting))
 		{
-			translation::add_app('mainscreen','en');    // trying the en one
-			$greeting = translation::translate('mainscreen_message',false,'');
+			translation::add_app('mainscreen', 'en'); // trying the en one
+			$greeting = translation::translate('mainscreen_message', false, '');
 		}
-		if(!($greeting == 'mainscreen_message'|| empty($greeting)))
+		if (!($greeting == 'mainscreen_message' || empty($greeting)))
 		{
 			$content['mainscreen_message'] = $greeting;
 		}
@@ -67,11 +67,11 @@ 
 		$template->exec('home.home_ui.index', $content);
 
 		// Now run the portlets themselves
-		foreach($content['portlets'] as $portlet => $p_data)
+		foreach ($content['portlets'] as $portlet => $p_data)
 		{
 			$id = $p_data['id'];
 
-			if(!$id) continue;
+			if (!$id) continue;
 			$portlet = $this->get_portlet($id, $p_data, $content, $attrs, true);
 		}
 
@@ -89,15 +89,15 @@ 
 		$add_portlets = $portlets;
 		$change_for_add = function(&$add_portlets) use (&$change_for_add)
 		{
-			foreach($add_portlets as $id => &$add)
+			foreach ($add_portlets as $id => &$add)
 			{
-				if(is_array($add['children']))
+				if (is_array($add['children']))
 				{
 					$change_for_add($add['children']);
 				}
-				if($id && !$add['children'])
+				if ($id && !$add['children'])
 				{
-					$add['id'] = 'add_' . $id;
+					$add['id'] = 'add_'.$id;
 					$add['class'] = 'add_'.$id;
 				}
 			}
@@ -116,10 +116,10 @@ 
 
 		// Add all known portlets as drop actions too.  If there are multiple matches, there will be a menu
 		$drop_execute = 'javaScript:app.home.add_from_drop';
-		foreach($portlets as $app => &$children)
+		foreach ($portlets as $app => &$children)
 		{
 			// Home portlets - uses link system, so all apps that support that are accepted
-			if(!$children['children'])
+			if (!$children['children'])
 			{
 				$children['class'] = $app;
 				$children['onExecute'] = $drop_execute;
@@ -128,11 +128,11 @@ 
 			}
 			else
 			{
-				foreach($children['children'] as $portlet => $app_portlet)
+				foreach ($children['children'] as $portlet => $app_portlet)
 				{
-					if(!is_array($app_portlet)) continue;
+					if (!is_array($app_portlet)) continue;
 					$app_portlet['class'] = $portlet;
-					$app_portlet['id'] = 'drop_' . $app_portlet['id'];
+					$app_portlet['id'] = 'drop_'.$app_portlet['id'];
 					$app_portlet['onExecute'] = $drop_execute;
 					$app_portlet['acceptedTypes'] = $app;
 					$app_portlet['type'] = 'drop';
@@ -152,13 +152,13 @@ 
 	 * Actual portlet content is provided by each portlet.
 	 * @param template etemplate so attributes can be set
 	 */
-	protected function get_user_portlets(etemplate_new &$template)
+	protected function get_user_portlets(etemplate_new&$template)
 	{
 		$portlets = array();
 
-		foreach((array)$GLOBALS['egw_info']['user']['preferences']['home']as $id => $context)
+		foreach ((array)$GLOBALS['egw_info']['user']['preferences']['home']as $id => $context)
 		{
-			if(strpos($id,'portlet_') !== 0 || // Not a portlet
+			if (strpos($id, 'portlet_') !== 0 || // Not a portlet
 				in_array($id, array_keys($GLOBALS['egw_info']['user']['apps'])) || // Some other app put it's pref in here
 				!is_array($context) // Not a valid portlet (probably user deleted a default)
 			) continue;
@@ -174,12 +174,12 @@ 
 			// Get settings
 			// Exclude common attributes changed through UI and settings lacking a type
 			$settings = $portlet->get_properties();
-			foreach($settings as $key => $setting)
+			foreach ($settings as $key => $setting)
 			{
-				if(is_array($setting) && !array_key_exists('type',$setting)) unset($settings[$key]);
+				if (is_array($setting) && !array_key_exists('type', $setting)) unset($settings[$key]);
 			}
 			$settings += $context;
-			foreach(home_portlet::$common_attributes as $attr)
+			foreach (home_portlet::$common_attributes as $attr)
 			{
 				unset($settings[$attr]);
 			}
@@ -192,7 +192,7 @@ 
 			// Add in default for admins
 			self::create_default_actions($actions, $id);
 
-			$template->setElementAttribute("portlets[" . count($portlets) . "[$id]", 'actions', $actions);
+			$template->setElementAttribute("portlets[".count($portlets)."[$id]", 'actions', $actions);
 
 			$portlets[] = $portlet_content;
 		}
@@ -216,11 +216,11 @@ 
 	 */
 	protected function get_portlet($id, &$context, &$content, &$attributes, $full_exec = false)
 	{
-		if(!$context['class']) $context['class'] = 'home_link_portlet';
+		if (!$context['class']) $context['class'] = 'home_link_portlet';
 
 		// This should be set already, but just in case the execution path
 		// is different from normal...
-		if(egw_json_response::isJSONResponse())
+		if (egw_json_response::isJSONResponse())
 		{
 			$GLOBALS['egw']->framework->response = egw_json_response::get();
 		}
@@ -235,12 +235,12 @@ 
 
 		// Exclude common attributes changed through UI and settings lacking a type
 		$settings = $portlet->get_properties();
-		foreach($settings as $key => $setting)
+		foreach ($settings as $key => $setting)
 		{
-			if(is_array($setting) && !array_key_exists('type',$setting)) unset($settings[$key]);
+			if (is_array($setting) && !array_key_exists('type', $setting)) unset($settings[$key]);
 		}
 		$settings += $context;
-		foreach(home_portlet::$common_attributes as $attr)
+		foreach (home_portlet::$common_attributes as $attr)
 		{
 			unset($settings[$attr]);
 		}
@@ -255,31 +255,31 @@ 
 		self::create_default_actions($attributes['actions'], $id);
 
 		// Set any provided common attributes (size, etc)
-		foreach(home_portlet::$common_attributes as $name)
+		foreach (home_portlet::$common_attributes as $name)
 		{
-			if(array_key_exists($name, $context))
+			if (array_key_exists($name, $context))
 			{
 				$attributes[$name] = $context[$name];
 			}
 		}
-		foreach($attributes as $attr => $value)
+		foreach ($attributes as $attr => $value)
 		{
 			$etemplate->setElementAttribute($id, $attr, $value);
 		}
 
 		// Make sure custom javascript is loaded
 		$appname = $context['appname'];
-		if(!$appname)
+		if (!$appname)
 		{
-			list($app) = explode('_',$classname);
-			if($GLOBALS['egw_info']['apps'][$app])
+			list($app) = explode('_', $classname);
+			if ($GLOBALS['egw_info']['apps'][$app])
 			{
 				$appname = $app;
 			}
 		}
 		egw_framework::validate_file('', $classname, $appname ? $appname : 'home');
 
-		if($full_exec)
+		if ($full_exec)
 		{
 			$content = $portlet->exec($id, $etemplate, $full_exec ? 2 : -1);
 		}
@@ -296,23 +296,23 @@ 
 	protected function get_legacy_portlets(&$content, &$attributes)
 	{
 		$sorted_apps = array_keys($GLOBALS['egw_info']['user']['apps']);
-		$portal_oldvarnames = array('mainscreen_showevents', 'homeShowEvents','homeShowLatest','mainscreen_showmail','mainscreen_showbirthdays','mainscreen_show_new_updated', 'homepage_display');
+		$portal_oldvarnames = array('mainscreen_showevents', 'homeShowEvents', 'homeShowLatest', 'mainscreen_showmail', 'mainscreen_showbirthdays', 'mainscreen_show_new_updated', 'homepage_display');
 
-		foreach($sorted_apps as $appname)
+		foreach ($sorted_apps as $appname)
 		{
 			// If there's already [new] settings, or no preference, skip it
-			if($content[$appname]) continue;
+			if ($content[$appname]) continue;
 			$no_pref = true;
-			foreach($portal_oldvarnames as $varcheck)
+			foreach ($portal_oldvarnames as $varcheck)
 			{
 				$thisd = $GLOBALS['egw_info']['user']['preferences'][$appname][$varcheck];
-				if($thisd)
+				if ($thisd)
 				{
 					$no_pref = false;
 					break;
 				}
 			}
-			if($no_pref || !$GLOBALS['egw']->hooks->hook_exists('home', $appname))
+			if ($no_pref || !$GLOBALS['egw']->hooks->hook_exists('home', $appname))
 			{
 				continue;
 			}
@@ -323,7 +323,7 @@ 
 			$_content = '';
 			$_attributes = array();
 			$this->get_portlet($appname, $context, $_content, $_attributes);
-			if(trim($_content))
+			if (trim($_content))
 			{
 				$content[$appname] = $_content;
 				$attributes[$appname] = $_attributes;
@@ -342,7 +342,7 @@ 
 
 			// Ignore some problem files and base classes that shouldn't be options
 			$ignore = array(
-				'.','..',
+				'.', '..',
 				'class.home_portlet.inc.php',
 				'class.home_legacy_portlet.inc.php',
 				'class.home_favorite_portlet.inc.php',
@@ -350,18 +350,18 @@ 
 				'class.home_weather_portlet.inc.php'
 			);
 			// Look through all known classes for portlets - for now, they need 'portlet' in the file name
-			foreach(array_keys($GLOBALS['egw_info']['apps']) as $appname)
+			foreach (array_keys($GLOBALS['egw_info']['apps']) as $appname)
 			{
-				if(in_array($appname, array('phpgwapi', 'felamimail'))) continue;
-				$files = (array)@scandir(EGW_SERVER_ROOT . '/'.$appname .'/inc/');
-				if(!$files) continue;
+				if (in_array($appname, array('phpgwapi', 'felamimail'))) continue;
+				$files = (array)@scandir(EGW_SERVER_ROOT.'/'.$appname.'/inc/');
+				if (!$files) continue;
 
-				foreach($files as $entry)
+				foreach ($files as $entry)
 				{
-					if (!in_array($entry, $ignore) && substr($entry,-8) == '.inc.php' && strpos($entry,'portlet'))
+					if (!in_array($entry, $ignore) && substr($entry, -8) == '.inc.php' && strpos($entry, 'portlet'))
 					{
 						list(,$classname) = explode('.', $entry);
-						if(class_exists($classname) &&
+						if (class_exists($classname) &&
 							in_array('home_portlet', class_parents($classname, false)))
 						{
 							$classes[$appname][] = $classname;
@@ -373,19 +373,19 @@ 
 					}
 				}
 
-				if(!$classes[$appname]) continue;
+				if (!$classes[$appname]) continue;
 
 				// Build 'Add' actions for each discovered portlet.
 				// Portlets from other apps go in sub-actions
-				$add_to =& $list;
-				if($classes[$appname] && $appname != 'home')
+				$add_to = & $list;
+				if ($classes[$appname] && $appname != 'home')
 				{
 					$list[$appname] = array(
 						'caption' => lang($appname),
 					);
-					$add_to =& $list[$appname]['children'];
+					$add_to = & $list[$appname]['children'];
 				}
-				foreach($classes[$appname] as $portlet)
+				foreach ($classes[$appname] as $portlet)
 				{
 					$instance = new $portlet();
 					$desc = $instance->get_description();
@@ -405,10 +405,10 @@ 
 		}, array(), 60);
 
 		// Filter list by current user's permissions
-		foreach($list as $appname => $children)
+		foreach ($list as $appname => $children)
 		{
-			if(in_array($appname, array_keys($GLOBALS['egw_info']['apps']))) {
-				if(!in_array($appname, array_keys($GLOBALS['egw_info']['user']['apps'])))
+			if (in_array($appname, array_keys($GLOBALS['egw_info']['apps']))) {
+				if (!in_array($appname, array_keys($GLOBALS['egw_info']['user']['apps'])))
 				{
 					unset($list[$appname]);
 				}
@@ -425,7 +425,7 @@ 
 	 */
 	protected static function create_default_actions(&$actions, $portlet_id = null)
 	{
-		if($GLOBALS['egw_info']['user']['apps']['admin'])
+		if ($GLOBALS['egw_info']['user']['apps']['admin'])
 		{
 			$actions['add_default'] = array(
 				'type'		=> 'popup',
@@ -435,25 +435,25 @@ 
 				'icon'		=> 'preference'
 			);
 			// Customize for the given portlet
-			if($portlet_id !== null)
+			if ($portlet_id !== null)
 			{
-				foreach(array('forced','group','default') as $location)
+				foreach (array('forced', 'group', 'default') as $location)
 				{
 					$loc = $GLOBALS['egw']->preferences->$location;
 
-					if($loc['home'][$portlet_id])
+					if ($loc['home'][$portlet_id])
 					{
 						// If it's forced, no point in setting default
-						if($location == 'forced')
+						if ($location == 'forced')
 						{
 							unset($actions['add_default']);
 						}
 						// If it's a group, we'd like to know which
-						if($location == 'group')
+						if ($location == 'group')
 						{
 							$options = array('account_type' => $type);
-							$groups = accounts::link_query('',$options);
-							foreach($groups as $gid => $name)
+							$groups = accounts::link_query('', $options);
+							foreach ($groups as $gid => $name)
 							{
 								$prefs = new preferences($gid);
 								$prefs->read_repository();
@@ -466,7 +466,7 @@ 
 						}
 						$actions['remove_default_'.$location] = array(
 							'type'		=> 'popup',
-							'caption'	=> lang('Remove default %1',is_numeric($location) ? accounts::id2name($location) : $location),
+							'caption'	=> lang('Remove default %1', is_numeric($location) ? accounts::id2name($location) : $location),
 							'onExecute'	=> 'javaScript:app.home.set_default',
 							'group'		=> 'Admins',
 							'portlet_group' => $location
@@ -477,14 +477,14 @@ 
 		}
 
 		// Change action for forced
-		if($portlet_id && $GLOBALS['egw']->preferences->forced['home'][$portlet_id])
+		if ($portlet_id && $GLOBALS['egw']->preferences->forced['home'][$portlet_id])
 		{
 			// No one can remove it
 			$actions['remove_portlet']['enabled'] = false;
-			$actions['remove_portlet']['caption'] .= ' ('.lang('Forced') .')';
+			$actions['remove_portlet']['caption'] .= ' ('.lang('Forced').')';
 
 			// Non-admins can't edit it
-			if($actions['edit_settings'] && !$GLOBALS['egw_info']['user']['apps']['admin'])
+			if ($actions['edit_settings'] && !$GLOBALS['egw_info']['user']['apps']['admin'])
 			{
 				$actions['edit_settings']['enabled'] = false;
 				$actions['edit_settings']['visible'] = false;
@@ -503,14 +503,14 @@ 
 	public function ajax_set_properties($portlet_id, $attributes, $values, $group = false)
 	{
 		//error_log(__METHOD__ . "($portlet_id, " .array2string($attributes).','.array2string($values).",$group)");
-		if(!$attributes)
+		if (!$attributes)
 		{
 			$attributes = array();
 		}
 
-		if(!$GLOBALS['egw_info']['user']['apps']['admin'])
+		if (!$GLOBALS['egw_info']['user']['apps']['admin'])
 		{
-			if($group == 'forced')
+			if ($group == 'forced')
 			{
 				// Quietly reject
 				return;
@@ -518,7 +518,7 @@ 
 			// Not an admin, can only override.
 			$group = false;
 		}
-		if($group && $GLOBALS['egw_info']['user']['apps']['admin'])
+		if ($group && $GLOBALS['egw_info']['user']['apps']['admin'])
 		{
 			$prefs = new preferences(is_numeric($group) ? $group : $GLOBALS['egw_info']['user']['account_id']);
 		}
@@ -532,23 +532,23 @@ 
 
 		$response = egw_json_response::get();
 
-		if($values =='~reload~')
+		if ($values == '~reload~')
 		{
 			$full_exec = true;
 			$values = array();
 		}
-		if($values == '~remove~')
+		if ($values == '~remove~')
 		{
 			// Already removed client side, needs to be removed permanently
-			$default = $prefs->default_prefs('home',$portlet_id) || $prefs->group['home'][$portlet_id];
+			$default = $prefs->default_prefs('home', $portlet_id) || $prefs->group['home'][$portlet_id];
 
-			if($default)
+			if ($default)
 			{
 				// Can't delete forced - not a UI option though
-				if(!$GLOBALS['egw']->preferences->forced['home'][$portlet_id])
+				if (!$GLOBALS['egw']->preferences->forced['home'][$portlet_id])
 				{
 					// Set a flag to override default instead of just delete
-					$GLOBALS['egw']->preferences->add('home',$portlet_id, 'deleted');
+					$GLOBALS['egw']->preferences->add('home', $portlet_id, 'deleted');
 					$GLOBALS['egw']->preferences->save_repository();
 				}
 			}
@@ -565,19 +565,19 @@ 
 			// Remove some constant stuff that winds up here
 			unset($values['edit_template']);
 			unset($values['readonly']);
-			unset($values['disabled']);unset($values['no_lang']);
+			unset($values['disabled']); unset($values['no_lang']);
 			unset($values['actions']);
 			unset($values['statustext']);
-			unset($values['type']);unset($values['label']);unset($values['status']);
-			unset($values['value']);unset($values['align']);
+			unset($values['type']); unset($values['label']); unset($values['status']);
+			unset($values['value']); unset($values['align']);
 
 			// Get portlet settings, and merge new with old
 			$context = array_merge((array)$portlets[$portlet_id], $values);
 			$context['group'] = $group;
 
 			// Handle add IDs
-			$classname =& $context['class'];
-			if(strpos($classname,'add_') == 0 && !class_exists($classname))
+			$classname = & $context['class'];
+			if (strpos($classname, 'add_') == 0 && !class_exists($classname))
 			{
 				$add = true;
 				$classname = substr($classname, 4);
@@ -585,13 +585,13 @@ 
 			$portlet = $this->get_portlet($portlet_id, $context, $content, $attributes, $full_exec);
 
 			$context['class'] = get_class($portlet);
-			foreach($portlet->get_properties() as $property)
+			foreach ($portlet->get_properties() as $property)
 			{
-				if($values[$property['name']])
+				if ($values[$property['name']])
 				{
 					$context[$property['name']] = $values[$property['name']];
 				}
-				elseif($portlets[$portlet_id][$property['name']])
+				elseif ($portlets[$portlet_id][$property['name']])
 				{
 					$context[$property['name']] = $portlets[$portlet_id][$property['name']];
 				}
@@ -601,7 +601,7 @@ 
 			$update = array('attributes' => $attributes);
 
 			// New portlet?  Flag going straight to edit mode
-			if($add)
+			if ($add)
 			{
 				$update['edit_settings'] = true;
 			}
@@ -613,7 +613,7 @@ 
 		}
 
 		// Save updated preferences
-		$prefs->save_repository(True,$type);
+		$prefs->save_repository(True, $type);
 	}
 
 	/**
@@ -626,10 +626,10 @@ 
 	public static function ajax_set_default($action, $portlet_ids, $group)
 	{
 		// Admins only
-		if(!$GLOBALS['egw_info']['apps']['admin']) return;
+		if (!$GLOBALS['egw_info']['apps']['admin']) return;
 
 		// Load the appropriate group
-		if($group)
+		if ($group)
 		{
 			$prefs = new preferences(is_numeric($group) ? $group : $GLOBALS['egw_info']['user']['account_id']);
 		}
@@ -641,30 +641,30 @@ 
 
 		$type = is_numeric($group) ? "user" : $group;
 
-		if($action == 'add')
+		if ($action == 'add')
 		{
-			foreach($portlet_ids as $id)
+			foreach ($portlet_ids as $id)
 			{
 				egw_json_response::get()->call('egw.message', lang("Set default"));
 				// Current user is setting the default, copy their settings
 				$settings = $GLOBALS['egw_info']['user']['preferences']['home'][$id];
 				$settings['group'] = $group;
-				$prefs->add('home',$id,$settings,$type);
+				$prefs->add('home', $id, $settings, $type);
 
 				// Remove user's copy
-				$GLOBALS['egw']->preferences->delete('home',$id);
+				$GLOBALS['egw']->preferences->delete('home', $id);
 				$GLOBALS['egw']->preferences->save_repository(true);
 			}
 		}
 		else if ($action == "delete")
 		{
-			foreach($portlet_ids as $id)
+			foreach ($portlet_ids as $id)
 			{
 				egw_json_response::get()->call('egw.message', lang("Removed default"));
-				$prefs->delete('home',$id, $type);
+				$prefs->delete('home', $id, $type);
 			}
 		}
-		$prefs->save_repository(false,$type);
+		$prefs->save_repository(false, $type);
 
 		// Update preferences client side for consistency
 		$prefs = $GLOBALS['egw']->preferences;
@@ -717,7 +717,7 @@ 
 						'state' => array(
 							'cat_id' => '0',
 							'filter' => 'default',
-							'owner' => 0,	// current user
+							'owner' => 0, // current user
 							'sortby' => 'user',
 							'planner_days' => '0',
 							'view' => 'week',
@@ -766,9 +766,9 @@ 
 		{
 			unset($app_prefs['home']['portlet_setup142n']);
 		}
-		foreach($app_prefs as $app => $prefs)
+		foreach ($app_prefs as $app => $prefs)
 		{
-			foreach($prefs as $name => $value)
+			foreach ($prefs as $name => $value)
 			{
 				preferences::delete_preference($app, $name, 'default');
 				$preferences->add($app, $name, $value, 'default');
@@ -789,10 +789,10 @@ 
 	 */
 	public static function setup_default_home()
 	{
-		switch($GLOBALS['egw_info']['server'][self::HOME_VERSION])
+		switch ($GLOBALS['egw_info']['server'][self::HOME_VERSION])
 		{
 			case self::CURRENT_HOME_VERSION:
-				return;	// already up to date --> nothing to do
+				return; // already up to date --> nothing to do
 
 			default:
 				call_user_func(array(__CLASS__, 'setup_default_home_'.str_replace('.', '_', self::CURRENT_HOME_VERSION)));

Braces +52 added lines, -14 removed lines

@@ -71,7 +71,10 @@ 
 		{
 			$id = $p_data['id'];
 
-			if(!$id) continue;
+			if(!$id)
+			{
+				continue;
+			}
 			$portlet = $this->get_portlet($id, $p_data, $content, $attrs, true);
 		}
 
@@ -130,7 +133,10 @@ 
 			{
 				foreach($children['children'] as $portlet => $app_portlet)
 				{
-					if(!is_array($app_portlet)) continue;
+					if(!is_array($app_portlet))
+					{
+						continue;
+					}
 					$app_portlet['class'] = $portlet;
 					$app_portlet['id'] = 'drop_' . $app_portlet['id'];
 					$app_portlet['onExecute'] = $drop_execute;
@@ -161,7 +167,10 @@ 
 			if(strpos($id,'portlet_') !== 0 || // Not a portlet
 				in_array($id, array_keys($GLOBALS['egw_info']['user']['apps'])) || // Some other app put it's pref in here
 				!is_array($context) // Not a valid portlet (probably user deleted a default)
-			) continue;
+			)
+			{
+				continue;
+			}
 
 			$classname = $context['class'];
 			$portlet = new $classname($context);
@@ -176,7 +185,10 @@ 
 			$settings = $portlet->get_properties();
 			foreach($settings as $key => $setting)
 			{
-				if(is_array($setting) && !array_key_exists('type',$setting)) unset($settings[$key]);
+				if(is_array($setting) && !array_key_exists('type',$setting))
+				{
+					unset($settings[$key]);
+				}
 			}
 			$settings += $context;
 			foreach(home_portlet::$common_attributes as $attr)
@@ -216,7 +228,10 @@ 
 	 */
 	protected function get_portlet($id, &$context, &$content, &$attributes, $full_exec = false)
 	{
-		if(!$context['class']) $context['class'] = 'home_link_portlet';
+		if(!$context['class'])
+		{
+			$context['class'] = 'home_link_portlet';
+		}
 
 		// This should be set already, but just in case the execution path
 		// is different from normal...
@@ -237,7 +252,10 @@ 
 		$settings = $portlet->get_properties();
 		foreach($settings as $key => $setting)
 		{
-			if(is_array($setting) && !array_key_exists('type',$setting)) unset($settings[$key]);
+			if(is_array($setting) && !array_key_exists('type',$setting))
+			{
+				unset($settings[$key]);
+			}
 		}
 		$settings += $context;
 		foreach(home_portlet::$common_attributes as $attr)
@@ -301,7 +319,10 @@ 
 		foreach($sorted_apps as $appname)
 		{
 			// If there's already [new] settings, or no preference, skip it
-			if($content[$appname]) continue;
+			if($content[$appname])
+			{
+				continue;
+			}
 			$no_pref = true;
 			foreach($portal_oldvarnames as $varcheck)
 			{
@@ -336,7 +357,8 @@ 
 	 */
 	protected function get_portlet_list()
 	{
-		$list = egw_cache::getTree('home', 'portlet_classes', function() {
+		$list = egw_cache::getTree('home', 'portlet_classes', function()
+		{
 			$list = array();
 			$classes = array();
 
@@ -352,9 +374,15 @@ 
 			// Look through all known classes for portlets - for now, they need 'portlet' in the file name
 			foreach(array_keys($GLOBALS['egw_info']['apps']) as $appname)
 			{
-				if(in_array($appname, array('phpgwapi', 'felamimail'))) continue;
+				if(in_array($appname, array('phpgwapi', 'felamimail')))
+				{
+					continue;
+				}
 				$files = (array)@scandir(EGW_SERVER_ROOT . '/'.$appname .'/inc/');
-				if(!$files) continue;
+				if(!$files)
+				{
+					continue;
+				}
 
 				foreach($files as $entry)
 				{
@@ -373,7 +401,10 @@ 
 					}
 				}
 
-				if(!$classes[$appname]) continue;
+				if(!$classes[$appname])
+				{
+					continue;
+				}
 
 				// Build 'Add' actions for each discovered portlet.
 				// Portlets from other apps go in sub-actions
@@ -407,7 +438,8 @@ 
 		// Filter list by current user's permissions
 		foreach($list as $appname => $children)
 		{
-			if(in_array($appname, array_keys($GLOBALS['egw_info']['apps']))) {
+			if(in_array($appname, array_keys($GLOBALS['egw_info']['apps'])))
+			{
 				if(!in_array($appname, array_keys($GLOBALS['egw_info']['user']['apps'])))
 				{
 					unset($list[$appname]);
@@ -626,7 +658,10 @@ 
 	public static function ajax_set_default($action, $portlet_ids, $group)
 	{
 		// Admins only
-		if(!$GLOBALS['egw_info']['apps']['admin']) return;
+		if(!$GLOBALS['egw_info']['apps']['admin'])
+		{
+			return;
+		}
 
 		// Load the appropriate group
 		if($group)
@@ -689,7 +724,10 @@ 
 		$preferences = $GLOBALS['egw']->preferences;
 		$preferences->read_repository();
 		$lang = $preferences->default['common']['lang'];
-		if (empty($lang)) $lang = 'en';
+		if (empty($lang))
+		{
+			$lang = 'en';
+		}
 
 		translation::add_app('calendar', $lang);
 		$weekview = lang('Weekview');

infolog/inc/class.infolog_activesync.inc.php

Doc Comments +3 added lines, -3 removed lines

@@ -69,7 +69,7 @@ 
 	 *
 	 * Currently we only return an own infolog
 	 *
-	 * @param int $account=null account_id of addressbook or null to get array of all addressbooks
+	 * @param int $account account_id of addressbook or null to get array of all addressbooks
 	 * @return string|array folder name of array with int account_id => folder name pairs
 	 */
 	private function get_folders($account=null)
@@ -183,7 +183,7 @@ 
 	 * will work OK apart from that.
 	 *
 	 * @param string $id folder id
-	 * @param int $cutoffdate=null
+	 * @param int $cutoffdate
 	 * @return array
   	 */
 	function GetMessageList($id, $cutoffdate=NULL)
@@ -220,7 +220,7 @@ 
 	 * @param string $id
 	 * @param int $truncsize
 	 * @param int $bodypreference
-	 * @param bool $mimesupport
+	 * @param integer $mimesupport
 	 * @return $messageobject|boolean false on error
 	 */
 	public function GetMessage($folderid, $id, $truncsize, $bodypreference=false, $optionbodypreference=false, $mimesupport = 0)

Indentation +1 added lines, -1 removed lines

@@ -177,7 +177,7 @@
 	 * @param int $cutoffdate =null
 	 * @param array $not_uids =null uids NOT to return for meeting requests
 	 * @return array
-  	 */
+	 */
 	function GetMessageList($id, $cutoffdate=NULL, array $not_uids=null)
 	{
 		if (!isset($this->calendar)) $this->calendar = new calendar_boupdate();

Spacing +20 added lines, -20 removed lines

@@ -34,12 +34,12 @@ 
 	 */
 	static public $mapping = array(
 		'body'	=> 'info_des',
-		'categories' => 'info_cat',	// infolog supports only a single category
-		'complete' => 'info_status', 	// 0 or 1 <--> 'done', ....
+		'categories' => 'info_cat', // infolog supports only a single category
+		'complete' => 'info_status', // 0 or 1 <--> 'done', ....
 		'datecompleted' => 'info_datecompleted',
 		'duedate' => 'info_enddate',
-		'importance' => 'info_priority',	// 0=Low, 1=Normal, 2=High (EGW additional 3=Urgent)
-		'sensitivity' => 'info_access',	// 0=Normal, 1=Personal, 2=Private, 3=Confiential <--> 'public', 'private'
+		'importance' => 'info_priority', // 0=Low, 1=Normal, 2=High (EGW additional 3=Urgent)
+		'sensitivity' => 'info_access', // 0=Normal, 1=Personal, 2=Private, 3=Confiential <--> 'public', 'private'
 		'startdate' => 'info_startdate',
 		'subject' => 'info_subject',
 		//'recurrence' => EGroupware InfoLog does NOT support recuring tasks
@@ -72,7 +72,7 @@ 
 	 * @param int $account=null account_id of addressbook or null to get array of all addressbooks
 	 * @return string|array folder name of array with int account_id => folder name pairs
 	 */
-	private function get_folders($account=null)
+	private function get_folders($account = null)
 	{
 		$folders = array(
 			$GLOBALS['egw_info']['user']['account_id'] => lang('InfoLog'),
@@ -92,7 +92,7 @@ 
 		foreach ($this->get_folders() as $account => $label)
 		{
 			$folderlist[] = array(
-				'id'	=>	$this->backend->createID('infolog',$account),
+				'id'	=>	$this->backend->createID('infolog', $account),
 				'mod'	=>	$label,
 				'parent'=>	'0',
 			);
@@ -186,11 +186,11 @@ 
 	 * @param int $cutoffdate=null
 	 * @return array
   	 */
-	function GetMessageList($id, $cutoffdate=NULL)
+	function GetMessageList($id, $cutoffdate = NULL)
 	{
 		if (!isset($this->infolog)) $this->infolog = new infolog_bo();
 
-		$this->backend->splitID($id,$type,$user);
+		$this->backend->splitID($id, $type, $user);
 		if (!($infolog_types = $GLOBALS['egw_info']['user']['preferences']['activesync']['infolog-types']))
 		{
 			$infolog_types = 'task';
@@ -202,9 +202,9 @@ 
 		);
 
 		$messagelist = array();
-		if (($infologs =& $this->infolog->search($filter)))
+		if (($infologs = & $this->infolog->search($filter)))
 		{
-			foreach($infologs as $infolog)
+			foreach ($infologs as $infolog)
 			{
 				$messagelist[] = $this->StatMessage($id, $infolog);
 			}
@@ -223,11 +223,11 @@ 
 	 * @param bool $mimesupport
 	 * @return $messageobject|boolean false on error
 	 */
-	public function GetMessage($folderid, $id, $truncsize, $bodypreference=false, $optionbodypreference=false, $mimesupport = 0)
+	public function GetMessage($folderid, $id, $truncsize, $bodypreference = false, $optionbodypreference = false, $mimesupport = 0)
 	{
 		if (!isset($this->infolog)) $this->infolog = new infolog_bo();
 
-		debugLog (__METHOD__."('$folderid', $id, truncsize=$truncsize, bodyprefence=$bodypreference, mimesupport=$mimesupport)");
+		debugLog(__METHOD__."('$folderid', $id, truncsize=$truncsize, bodyprefence=$bodypreference, mimesupport=$mimesupport)");
 		$this->backend->splitID($folderid, $type, $account);
 		if ($type != 'infolog' || !($infolog = $this->infolog->read($id, true, 'server')))
 		{
@@ -235,7 +235,7 @@ 
 			return false;
 		}
 		$message = new SyncTask();
-		foreach(self::$mapping as $key => $attr)
+		foreach (self::$mapping as $key => $attr)
 		{
 			switch ($attr)
 			{
@@ -248,11 +248,11 @@ 
 					}
 					else
 					{
-						if (strlen ($infolog[$attr]) > 0)
+						if (strlen($infolog[$attr]) > 0)
 						{
 							debugLog("airsyncbasebody!");
 							$message->airsyncbasebody = new SyncAirSyncBaseBody();
-							$message->airsyncbasenativebodytype=1;
+							$message->airsyncbasenativebodytype = 1;
 							$this->backend->note2messagenote($infolog[$attr], $bodypreference, $message->airsyncbasebody);
 						}
 					}
@@ -261,7 +261,7 @@ 
 
 				case 'info_cat':
 					$message->$key = array();
-					foreach($infolog[$attr] ? explode(',',$infolog[$attr]) : array() as $cat_id)
+					foreach ($infolog[$attr] ? explode(',', $infolog[$attr]) : array() as $cat_id)
 					{
 						$message->categories[] = categories::id2name($cat_id);
 					}
@@ -276,7 +276,7 @@ 
 					break;
 
 				case 'info_priority':
-					if ($infolog[$attr] > 2) $infolog[$attr] = 2;	// AS does not know 3=Urgent (only 0=Low, 1=Normal, 2=High)
+					if ($infolog[$attr] > 2) $infolog[$attr] = 2; // AS does not know 3=Urgent (only 0=Low, 1=Normal, 2=High)
 					// fall through
 				default:
 					if (!empty($infolog[$attr])) $message->$key = $infolog[$attr];
@@ -395,7 +395,7 @@ 
 					case 'info_cat':
 						if (is_array($message->$key))
 						{
-							$infolog[$attr] = implode(',', array_filter($this->infolog->find_or_add_categories($message->$key, $id),'strlen'));
+							$infolog[$attr] = implode(',', array_filter($this->infolog->find_or_add_categories($message->$key, $id), 'strlen'));
 						}
 						break;
 
@@ -412,7 +412,7 @@ 
 						break;
 
 					case 'info_priority':	// AS does not know 3=Urgent (only 0=Low, 1=Normal, 2=High)
-						if ($infolog[$attr] == 3 && $message->$key == 2) break;	// --> do NOT change Urgent, if AS reports High
+						if ($infolog[$attr] == 3 && $message->$key == 2) break; // --> do NOT change Urgent, if AS reports High
 						// fall through
 					default:
 						$infolog[$attr] = $message->$key;
@@ -527,7 +527,7 @@ 
 			'info_type' => explode(',', $infolog_types),
 		));
 
-		$changes = array();	// no change
+		$changes = array(); // no change
 		$syncstate_was = $syncstate;
 
 		if ($ctag !== $syncstate)

Braces +70 added lines, -17 removed lines

@@ -188,7 +188,10 @@ 
   	 */
 	function GetMessageList($id, $cutoffdate=NULL)
 	{
-		if (!isset($this->infolog)) $this->infolog = new infolog_bo();
+		if (!isset($this->infolog))
+		{
+			$this->infolog = new infolog_bo();
+		}
 
 		$this->backend->splitID($id,$type,$user);
 		if (!($infolog_types = $GLOBALS['egw_info']['user']['preferences']['activesync']['infolog-types']))
@@ -225,7 +228,10 @@ 
 	 */
 	public function GetMessage($folderid, $id, $truncsize, $bodypreference=false, $optionbodypreference=false, $mimesupport = 0)
 	{
-		if (!isset($this->infolog)) $this->infolog = new infolog_bo();
+		if (!isset($this->infolog))
+		{
+			$this->infolog = new infolog_bo();
+		}
 
 		debugLog (__METHOD__."('$folderid', $id, truncsize=$truncsize, bodyprefence=$bodypreference, mimesupport=$mimesupport)");
 		$this->backend->splitID($folderid, $type, $account);
@@ -276,10 +282,17 @@ 
 					break;
 
 				case 'info_priority':
-					if ($infolog[$attr] > 2) $infolog[$attr] = 2;	// AS does not know 3=Urgent (only 0=Low, 1=Normal, 2=High)
+					if ($infolog[$attr] > 2)
+					{
+						$infolog[$attr] = 2;
+					}
+					// AS does not know 3=Urgent (only 0=Low, 1=Normal, 2=High)
 					// fall through
 				default:
-					if (!empty($infolog[$attr])) $message->$key = $infolog[$attr];
+					if (!empty($infolog[$attr]))
+					{
+						$message->$key = $infolog[$attr];
+					}
 			}
 		}
 		//debugLog(__METHOD__."(folder='$folderid',$id,...) returning ".array2string($message));
@@ -300,9 +313,15 @@ 
 	 */
 	public function StatMessage($folderid, $infolog)
 	{
-		if (!isset($this->infolog)) $this->infolog = new infolog_bo();
+		if (!isset($this->infolog))
+		{
+			$this->infolog = new infolog_bo();
+		}
 
-		if (!is_array($infolog)) $infolog = $this->infolog->read($infolog, true, 'server');
+		if (!is_array($infolog))
+		{
+			$infolog = $this->infolog->read($infolog, true, 'server');
+		}
 
 		if (!$infolog)
 		{
@@ -370,20 +389,29 @@ 
 	 */
 	public function ChangeMessage($folderid, $id, $message)
 	{
-		if (!isset($this->infolog)) $this->infolog = new infolog_bo();
+		if (!isset($this->infolog))
+		{
+			$this->infolog = new infolog_bo();
+		}
 
 		$this->backend->splitID($folderid, $type, $account);
 		//debugLog(__METHOD__. " Id " .$id. " Account ". $account . " FolderID " . $folderid);
-		if ($type != 'infolog') // || !($infolog = $this->addressbook->read($id)))
+		if ($type != 'infolog')
+		{
+			// || !($infolog = $this->addressbook->read($id)))
 		{
 			debugLog(__METHOD__." Folder wrong or infolog not existing");
+		}
 			return false;
 		}
 		$infolog = array();
 		if (empty($id) && $this->infolog->check_access(0, EGW_ACL_EDIT, $account) ||
 			($infolog = $this->infolog->read($id)) && $this->infolog->check_access($infolog, EGW_ACL_EDIT))
 		{
-			if (!$infolog) $infolog = array();
+			if (!$infolog)
+			{
+				$infolog = array();
+			}
 			foreach (self::$mapping as $key => $attr)
 			{
 				switch ($attr)
@@ -407,12 +435,19 @@ 
 						if ((in_array($infolog[$attr], self::$done_status) !== (boolean)$message->$key) || !isset($infolog[$attr]))
 						{
 							$infolog[$attr] = $message->$key ? 'done' : 'not-started';
-							if (!(boolean)$message->$key) $infolog['info_percent'] = 0;
+							if (!(boolean)$message->$key)
+							{
+								$infolog['info_percent'] = 0;
+							}
 						}
 						break;
 
 					case 'info_priority':	// AS does not know 3=Urgent (only 0=Low, 1=Normal, 2=High)
-						if ($infolog[$attr] == 3 && $message->$key == 2) break;	// --> do NOT change Urgent, if AS reports High
+						if ($infolog[$attr] == 3 && $message->$key == 2)
+						{
+							break;
+						}
+						// --> do NOT change Urgent, if AS reports High
 						// fall through
 					default:
 						$infolog[$attr] = $message->$key;
@@ -420,7 +455,10 @@ 
 				}
 			}
 			// $infolog['info_owner'] = $account;
-			if (!empty($id)) $infolog['info_id'] = $id;
+			if (!empty($id))
+			{
+				$infolog['info_id'] = $id;
+			}
 			$newid = $this->infolog->write($infolog);
 			debugLog(__METHOD__."($folderid,$id) infolog(".array2string($infolog).") returning ".array2string($newid));
 			return $this->StatMessage($folderid, $newid);
@@ -465,7 +503,10 @@ 
 	 */
 	public function DeleteMessage($folderid, $id)
 	{
-		if (!isset($this->infolog)) $this->infolog = new infolog_bo();
+		if (!isset($this->infolog))
+		{
+			$this->infolog = new infolog_bo();
+		}
 
 		$ret = $this->infolog->delete($id);
 		debugLog(__METHOD__."('$folderid', $id) delete($id) returned ".array2string($ret));
@@ -513,9 +554,15 @@ 
 	{
 		$this->backend->splitID($folderid, $type, $owner);
 
-		if ($type != 'infolog') return false;
+		if ($type != 'infolog')
+		{
+			return false;
+		}
 
-		if (!isset($this->infolog)) $this->infolog = new infolog_bo();
+		if (!isset($this->infolog))
+		{
+			$this->infolog = new infolog_bo();
+		}
 
 		if (!($infolog_types = $GLOBALS['egw_info']['user']['preferences']['activesync']['infolog-types']))
 		{
@@ -547,8 +594,14 @@ 
 	 */
 	function settings($hook_data)
 	{
-		if (!$hook_data['setup']) translation::add_app('infolog');
-		if (!isset($this->infolog)) $this->infolog = new infolog_bo();
+		if (!$hook_data['setup'])
+		{
+			translation::add_app('infolog');
+		}
+		if (!isset($this->infolog))
+		{
+			$this->infolog = new infolog_bo();
+		}
 
 		if (!($types = $this->infolog->enums['type']))
 		{

infolog/inc/class.infolog_groupdav.inc.php

Doc Comments +8 added lines, -13 removed lines

@@ -138,7 +138,7 @@ 
 	 * @param array &$options
 	 * @param array &$files
 	 * @param int $user account_id
-	 * @return mixed boolean true on success, false on failure or string with http status (eg. '404 Not Found')
+	 * @return boolean boolean true on success, false on failure or string with http status (eg. '404 Not Found')
 	 */
 	function propfind($path,&$options,&$files,$user,$id='')
 	{
@@ -217,7 +217,6 @@ 
 	 *
 	 * @param string $path
 	 * @param array $filter
-	 * @param array|boolean $start=false false=return all or array(start,num)
 	 * @return array with "files" array with values for keys path and props
 	 */
 	function &propfind_callback($path,array $filter,$start=false)
@@ -517,8 +516,7 @@ 
 	 *
 	 * @param array &$options
 	 * @param int $id
-	 * @param int $user=null account_id
-	 * @return mixed boolean true on success, false on failure or string with http status (eg. '404 Not Found')
+	 * @return string|boolean boolean true on success, false on failure or string with http status (eg. '404 Not Found')
 	 */
 	function get(&$options,$id,$user=null)
 	{
@@ -539,9 +537,8 @@ 
 	 *
 	 * @param array &$options
 	 * @param int $id
-	 * @param int $user=null account_id of owner, default null
-	 * @param string $prefix=null user prefix from path (eg. /ralf from /ralf/addressbook)
-	 * @return mixed boolean true on success, false on failure or string with http status (eg. '404 Not Found')
+	 * @param string $prefix user prefix from path (eg. /ralf from /ralf/addressbook)
+	 * @return string|boolean boolean true on success, false on failure or string with http status (eg. '404 Not Found')
 	 */
 	function put(&$options,$id,$user=null,$prefix=null)
 	{
@@ -609,7 +606,7 @@ 
 	 * Callback for infolog_ical::importVTODO to implement infolog-cat-action
 	 *
 	 * @param array $task
-	 * @param array $oldTask=null
+	 * @param array $oldTask
 	 * @return array modified task data
 	 */
 	public function cat_action(array $task, $oldTask=null)
@@ -675,7 +672,7 @@ 
 	 *
 	 * @param array &$options
 	 * @param int $id
-	 * @return mixed boolean true on success, false on failure or string with http status (eg. '404 Not Found')
+	 * @return string|boolean boolean true on success, false on failure or string with http status (eg. '404 Not Found')
 	 */
 	function delete(&$options,$id)
 	{
@@ -750,7 +747,7 @@ 
 	 * etag currently uses the modifcation time (info_datemodified), 1.9.002 adds etag column, but it's not yet used!
 	 *
 	 * @param array|int $info array with infolog entry or info_id
-	 * @return string|boolean string with etag or false
+	 * @return false|string string with etag or false
 	 */
 	function get_etag($info)
 	{
@@ -768,10 +765,8 @@ 
 	/**
 	 * Add extra properties for calendar collections
 	 *
-	 * @param array $props=array() regular props by the groupdav handler
 	 * @param string $displayname
-	 * @param string $base_uri=null base url of handler
-	 * @param int $user=null account_id of owner of collection
+	 * @param string $base_uri base url of handler
 	 * @return array
 	 */
 	public function extra_properties(array $props=array(), $displayname, $base_uri=null,$user=null)

Spacing +69 added lines, -69 removed lines

@@ -109,7 +109,7 @@ 
 		}
 		if ($path == '/infolog/')
 		{
-			$task_filter= 'own';
+			$task_filter = 'own';
 		}
 		else
 		{
@@ -119,7 +119,7 @@ 
 			}
 			else
 			{
-				$task_filter = 'user' . $user;
+				$task_filter = 'user'.$user;
 			}
 		}
 
@@ -140,7 +140,7 @@ 
 	 * @param int $user account_id
 	 * @return mixed boolean true on success, false on failure or string with http status (eg. '404 Not Found')
 	 */
-	function propfind($path,&$options,&$files,$user,$id='')
+	function propfind($path, &$options, &$files, $user, $id = '')
 	{
 		// todo add a filter to limit how far back entries from the past get synced
 		$filter = $this->get_infolog_filter($path, $user);
@@ -155,7 +155,7 @@ 
 		// enable time-range filter for tests via propfind / autoindex
 		//$filter[] = $sql = $this->_time_range_filter(array('end' => '20001231T000000Z'));
 
-		if ($id) $path = dirname($path).'/';	// caldav_name get's added anyway in the callback
+		if ($id) $path = dirname($path).'/'; // caldav_name get's added anyway in the callback
 
 		if ($this->debug > 1)
 		{
@@ -167,7 +167,7 @@ 
 		if (!($filter['calendar_data'] = $options['props'] == 'all' &&
 			$options['root']['ns'] == groupdav::CALDAV) && is_array($options['props']))
 		{
-			foreach($options['props'] as $prop)
+			foreach ($options['props'] as $prop)
 			{
 				if ($prop['name'] == 'calendar-data')
 				{
@@ -187,7 +187,7 @@ 
 
 			$this->sync_collection_token = null;
 
-			$filter['order'] = 'info_datemodified ASC';	// return oldest modifications first
+			$filter['order'] = 'info_datemodified ASC'; // return oldest modifications first
 			$filter['sync-collection'] = true;
 		}
 
@@ -201,13 +201,13 @@ 
 			if ($options['root']['name'] == 'sync-collection' && $this->bo->total > $nresults)
 			{
 				--$this->sync_collection_token;
-				$files['sync-token-params'][] = true;	// tel get_sync_collection_token that we have more entries
+				$files['sync-token-params'][] = true; // tel get_sync_collection_token that we have more entries
 			}
 		}
 		else
 		{
 			// return iterator, calling ourself to return result in chunks
-			$files['files'] = new groupdav_propfind_iterator($this,$path,$filter,$files['files']);
+			$files['files'] = new groupdav_propfind_iterator($this, $path, $filter, $files['files']);
 		}
 		return true;
 	}
@@ -220,7 +220,7 @@ 
 	 * @param array|boolean $start=false false=return all or array(start,num)
 	 * @return array with "files" array with values for keys path and props
 	 */
-	function &propfind_callback($path,array $filter,$start=false)
+	function &propfind_callback($path, array $filter, $start = false)
 	{
 		if ($this->debug) $starttime = microtime(true);
 
@@ -246,7 +246,7 @@ 
 			'filter'    	=> $task_filter,
 			'date_format'	=> 'server',
 			'col_filter'	=> $filter,
-			'custom_fields' => true,	// otherwise custom fields get NOT loaded!
+			'custom_fields' => true, // otherwise custom fields get NOT loaded!
 		);
 
 		if (!$calendar_data)
@@ -268,10 +268,10 @@ 
 
 		$files = array();
 		// ToDo: add parameter to only return id & etag
-		$tasks =& $this->bo->search($query);
+		$tasks = & $this->bo->search($query);
 		if ($tasks && $offset == $query['start'])
 		{
-			foreach($tasks as $task)
+			foreach ($tasks as $task)
 			{
 				// remove task from requested multiget ids, to be able to report not found urls
 				if ($requested_multiget_ids && ($k = array_search($task[self::$path_attr], $requested_multiget_ids)) !== false)
@@ -285,15 +285,15 @@ 
 					continue;
 				}
 				$props = array(
-					'getcontenttype' => $this->agent != 'kde' ? 'text/calendar; charset=utf-8; component=VTODO' : 'text/calendar',	// Konqueror (3.5) dont understand it otherwise
+					'getcontenttype' => $this->agent != 'kde' ? 'text/calendar; charset=utf-8; component=VTODO' : 'text/calendar', // Konqueror (3.5) dont understand it otherwise
 					'getlastmodified' => $task['info_datemodified'],
 					'displayname' => $task['info_subject'],
 				);
 				if ($calendar_data)
 				{
-					$content = $handler->exportVTODO($task, '2.0', null);	// no METHOD:PUBLISH for CalDAV
+					$content = $handler->exportVTODO($task, '2.0', null); // no METHOD:PUBLISH for CalDAV
 					$props['getcontentlength'] = bytes($content);
-					$props[] = HTTP_WebDAV_Server::mkprop(groupdav::CALDAV,'calendar-data',$content);
+					$props[] = HTTP_WebDAV_Server::mkprop(groupdav::CALDAV, 'calendar-data', $content);
 				}
 				$files[] = $this->add_resource($path, $task, $props);
 			}
@@ -301,13 +301,13 @@ 
 		// report not found multiget urls
 		if ($requested_multiget_ids)
 		{
-			foreach($requested_multiget_ids as $id)
+			foreach ($requested_multiget_ids as $id)
 			{
 				$files[] = array('path' => $path.$id.self::$path_extension);
 			}
 		}
 		// sync-collection report --> return modified of last contact as sync-token
-		$sync_collection_report =  $filter['sync-collection'];
+		$sync_collection_report = $filter['sync-collection'];
 		if ($sync_collection_report)
 		{
 			$this->sync_collection_token = $task['date_modified'];
@@ -333,20 +333,20 @@ 
 	 * @param int &$nresult on return limit for number or results or unchanged/null
 	 * @return boolean true if filter could be processed
 	 */
-	function _report_filters($options,&$cal_filters,$id, &$nresults)
+	function _report_filters($options, &$cal_filters, $id, &$nresults)
 	{
 		if ($options['filters'])
 		{
-			$cal_filters_in = $cal_filters;	// remember filter, to be able to reset standard open-filter, if client sets own filters
+			$cal_filters_in = $cal_filters; // remember filter, to be able to reset standard open-filter, if client sets own filters
 
-			foreach($options['filters'] as $filter)
+			foreach ($options['filters'] as $filter)
 			{
-				switch($filter['name'])
+				switch ($filter['name'])
 				{
 					case 'comp-filter':
 						if ($this->debug > 1) error_log(__METHOD__."($options[path],...) comp-filter='{$filter['attrs']['name']}'");
 
-						switch($filter['attrs']['name'])
+						switch ($filter['attrs']['name'])
 						{
 							case 'VTODO':
 							case 'VCALENDAR':
@@ -389,9 +389,9 @@ 
 		    <B:nresults>10</B:nresults>
 		  </B:limit>
 		*/
-		foreach((array)$options['other'] as $option)
+		foreach ((array)$options['other'] as $option)
 		{
-			switch($option['name'])
+			switch ($option['name'])
 			{
 				case 'nresults':
 					$nresults = (int)$option['data'];
@@ -400,7 +400,7 @@ 
 				case 'limit':
 					break;
 				case 'href':
-					break;	// from addressbook-multiget, handled below
+					break; // from addressbook-multiget, handled below
 				// rfc 6578 sync-report
 				case 'sync-token':
 					if (!empty($option['data']))
@@ -408,7 +408,7 @@ 
 						$parts = explode('/', $option['data']);
 						$sync_token = array_pop($parts);
 						$cal_filters[] = 'info_datemodified>'.(int)$sync_token;
-						$cal_filters['filter'] .= '+deleted';	// to return deleted entries too
+						$cal_filters['filter'] .= '+deleted'; // to return deleted entries too
 					}
 					break;
 				case 'sync-level':
@@ -430,24 +430,24 @@ 
 			if ($id)
 			{
 				$cal_filters[self::$path_attr] = groupdav_handler::$path_extension ?
-					basename($id,groupdav_handler::$path_extension) : $id;
+					basename($id, groupdav_handler::$path_extension) : $id;
 			}
 			else	// fetch all given url's
 			{
-				foreach($options['other'] as $option)
+				foreach ($options['other'] as $option)
 				{
 					if ($option['name'] == 'href')
 					{
-						$parts = explode('/',$option['data']);
+						$parts = explode('/', $option['data']);
 						if (($id = basename(urldecode(array_pop($parts)))))
 						{
 							$cal_filters[self::$path_attr][] = groupdav_handler::$path_extension ?
-								basename($id,groupdav_handler::$path_extension) : $id;
+								basename($id, groupdav_handler::$path_extension) : $id;
 						}
 					}
 				}
 			}
-			if ($this->debug > 1) error_log(__METHOD__ ."($options[path],...,$id) calendar-multiget: ids=".implode(',',$ids));
+			if ($this->debug > 1) error_log(__METHOD__."($options[path],...,$id) calendar-multiget: ids=".implode(',', $ids));
 		}
 		return true;
 	}
@@ -475,7 +475,7 @@ 
 		elseif (empty($attrs['start']))
 		{
 			$this->groupdav->log(__METHOD__.'('.array2string($attrs).') minimum one of start or end is required!');
-			return '1';	// to not give sql error, but simply not filter out anything
+			return '1'; // to not give sql error, but simply not filter out anything
 		}
 		// we dont need to care for DURATION line in rfc4791#section-9.9, as we always put that in DUE/info_enddate
 
@@ -505,10 +505,10 @@ 
 			"info_datecompleted > 0".(isset($start) ? " AND ($start <= info_datecompleted OR $start <= info_created)" : '').
 				(isset($end) ? " AND (info_datecompleted <= $end OR info_created <= $end)" : '').' OR '.
 			// we have no completed date, but always a created date
- 			"NOT info_datecompleted > 0". (isset($end) ? " AND info_created < $end" : '').
+ 			"NOT info_datecompleted > 0".(isset($end) ? " AND info_created < $end" : '').
 		')';
 		$sql = '('.implode(' OR ', $to_or).')';
-		if ($this->debug > 1) error_log(__FILE__ . __METHOD__.'('.array2string($attrs).") time-range={$filter['attrs']['start']}-{$filter['attrs']['end']} --> $sql");
+		if ($this->debug > 1) error_log(__FILE__.__METHOD__.'('.array2string($attrs).") time-range={$filter['attrs']['start']}-{$filter['attrs']['end']} --> $sql");
 		return $sql;
 	}
 
@@ -520,14 +520,14 @@ 
 	 * @param int $user=null account_id
 	 * @return mixed boolean true on success, false on failure or string with http status (eg. '404 Not Found')
 	 */
-	function get(&$options,$id,$user=null)
+	function get(&$options, $id, $user = null)
 	{
-		if (!is_array($task = $this->_common_get_put_delete('GET',$options,$id)))
+		if (!is_array($task = $this->_common_get_put_delete('GET', $options, $id)))
 		{
 			return $task;
 		}
 		$handler = $this->_get_handler();
-		$options['data'] = $handler->exportVTODO($task, '2.0', null);	// no METHOD:PUBLISH for CalDAV
+		$options['data'] = $handler->exportVTODO($task, '2.0', null); // no METHOD:PUBLISH for CalDAV
 		$options['mimetype'] = 'text/calendar; charset=utf-8';
 		header('Content-Encoding: identity');
 		header('ETag: "'.$this->get_etag($task).'"');
@@ -543,11 +543,11 @@ 
 	 * @param string $prefix=null user prefix from path (eg. /ralf from /ralf/addressbook)
 	 * @return mixed boolean true on success, false on failure or string with http status (eg. '404 Not Found')
 	 */
-	function put(&$options,$id,$user=null,$prefix=null)
+	function put(&$options, $id, $user = null, $prefix = null)
 	{
-		if ($this->debug) error_log(__METHOD__."($id, $user)".print_r($options,true));
+		if ($this->debug) error_log(__METHOD__."($id, $user)".print_r($options, true));
 
-		$oldTask = $this->_common_get_put_delete('PUT',$options,$id);
+		$oldTask = $this->_common_get_put_delete('PUT', $options, $id);
 		if (!is_null($oldTask) && !is_array($oldTask))
 		{
 			return $oldTask;
@@ -612,7 +612,7 @@ 
 	 * @param array $oldTask=null
 	 * @return array modified task data
 	 */
-	public function cat_action(array $task, $oldTask=null)
+	public function cat_action(array $task, $oldTask = null)
 	{
 		$action = $GLOBALS['egw_info']['user']['preferences']['groupdav']['infolog-cat-action'];
 
@@ -643,13 +643,13 @@ 
 			{
 				unset($task['info_responsible'][$key]);
 			}
-			switch($action)
+			switch ($action)
 			{
 				case 'set':
 					$task['info_responsible'] = array();
 					// fall through
 				case 'set-user':
-					foreach($task['info_responsible'] as $key => $account_id)
+					foreach ($task['info_responsible'] as $key => $account_id)
 					{
 						if ($GLOBALS['egw']->accounts->get_type($account_id) == 'u')
 						{
@@ -677,9 +677,9 @@ 
 	 * @param int $id
 	 * @return mixed boolean true on success, false on failure or string with http status (eg. '404 Not Found')
 	 */
-	function delete(&$options,$id)
+	function delete(&$options, $id)
 	{
-		if (!is_array($task = $this->_common_get_put_delete('DELETE',$options,$id)))
+		if (!is_array($task = $this->_common_get_put_delete('DELETE', $options, $id)))
 		{
 			return $task;
 		}
@@ -697,7 +697,7 @@ 
 	 */
 	function read($id)
 	{
-		return $this->bo->read(array(self::$path_attr => $id, "info_status!='deleted'"),false,'server');
+		return $this->bo->read(array(self::$path_attr => $id, "info_status!='deleted'"), false, 'server');
 	}
 
 	/**
@@ -720,15 +720,15 @@ 
 	 * @param array|int $task task-array or id
 	 * @return boolean null if entry does not exist, false if no access, true if access permitted
 	 */
-	function check_access($acl,$task)
+	function check_access($acl, $task)
 	{
 		if (is_null($task)) return true;
 
-		$access = $this->bo->check_access($task,$acl);
+		$access = $this->bo->check_access($task, $acl);
 
 		if (!$access && $acl == EGW_ACL_EDIT && $this->bo->is_responsible($task))
 		{
-			$access = true;	// access limited to $this->bo->responsible_edit fields (handled in infolog_bo::write())
+			$access = true; // access limited to $this->bo->responsible_edit fields (handled in infolog_bo::write())
 		}
 		if ($this->debug > 1) error_log(__METHOD__."($acl, ".array2string($task).') returning '.array2string($access));
 		return $access;
@@ -739,7 +739,7 @@ 
 	 *
 	 * @return string
 	 */
-	public function getctag($path,$user)
+	public function getctag($path, $user)
 	{
 		return $this->bo->getctag($this->get_infolog_filter($path, $user));
 	}
@@ -756,7 +756,7 @@ 
 	{
 		if (!is_array($info))
 		{
-			$info = $this->bo->read($info,true,'server');
+			$info = $this->bo->read($info, true, 'server');
 		}
 		if (!is_array($info) || !isset($info['info_id']) || !isset($info['info_datemodified']))
 		{
@@ -774,37 +774,37 @@ 
 	 * @param int $user=null account_id of owner of collection
 	 * @return array
 	 */
-	public function extra_properties(array $props=array(), $displayname, $base_uri=null,$user=null)
+	public function extra_properties(array $props = array(), $displayname, $base_uri = null, $user = null)
 	{
 		// calendar description
-		$displayname = translation::convert(lang('Tasks of'),translation::charset(),'utf-8').' '.$displayname;
-		$props['calendar-description'] = HTTP_WebDAV_Server::mkprop(groupdav::CALDAV,'calendar-description',$displayname);
+		$displayname = translation::convert(lang('Tasks of'), translation::charset(), 'utf-8').' '.$displayname;
+		$props['calendar-description'] = HTTP_WebDAV_Server::mkprop(groupdav::CALDAV, 'calendar-description', $displayname);
 		// supported components, currently only VEVENT
-		$props['supported-calendar-component-set'] = HTTP_WebDAV_Server::mkprop(groupdav::CALDAV,'supported-calendar-component-set',array(
-			HTTP_WebDAV_Server::mkprop(groupdav::CALDAV,'comp',array('name' => 'VCALENDAR')),
-			HTTP_WebDAV_Server::mkprop(groupdav::CALDAV,'comp',array('name' => 'VTODO')),
+		$props['supported-calendar-component-set'] = HTTP_WebDAV_Server::mkprop(groupdav::CALDAV, 'supported-calendar-component-set', array(
+			HTTP_WebDAV_Server::mkprop(groupdav::CALDAV, 'comp', array('name' => 'VCALENDAR')),
+			HTTP_WebDAV_Server::mkprop(groupdav::CALDAV, 'comp', array('name' => 'VTODO')),
 		));
 		// supported reports
 		$props['supported-report-set'] = array(
-			'calendar-query' => HTTP_WebDAV_Server::mkprop('supported-report',array(
-				HTTP_WebDAV_Server::mkprop('report',array(
-					HTTP_WebDAV_Server::mkprop(groupdav::CALDAV,'calendar-query',''))))),
-			'calendar-multiget' => HTTP_WebDAV_Server::mkprop('supported-report',array(
-				HTTP_WebDAV_Server::mkprop('report',array(
-					HTTP_WebDAV_Server::mkprop(groupdav::CALDAV,'calendar-multiget',''))))),
+			'calendar-query' => HTTP_WebDAV_Server::mkprop('supported-report', array(
+				HTTP_WebDAV_Server::mkprop('report', array(
+					HTTP_WebDAV_Server::mkprop(groupdav::CALDAV, 'calendar-query', ''))))),
+			'calendar-multiget' => HTTP_WebDAV_Server::mkprop('supported-report', array(
+				HTTP_WebDAV_Server::mkprop('report', array(
+					HTTP_WebDAV_Server::mkprop(groupdav::CALDAV, 'calendar-multiget', ''))))),
 		);
 		// only advertice rfc 6578 sync-collection report, if "delete-prevention" is switched on (deleted entries get marked deleted but not actualy deleted
 		$config = config::read('infolog');
 		if ($config['history'])
 		{
-			$props['supported-report-set']['sync-collection'] = HTTP_WebDAV_Server::mkprop('supported-report',array(
-				HTTP_WebDAV_Server::mkprop('report',array(
-					HTTP_WebDAV_Server::mkprop('sync-collection','')))));
+			$props['supported-report-set']['sync-collection'] = HTTP_WebDAV_Server::mkprop('supported-report', array(
+				HTTP_WebDAV_Server::mkprop('report', array(
+					HTTP_WebDAV_Server::mkprop('sync-collection', '')))));
 		}
 		// get timezone of calendar
 		if ($this->groupdav->prop_requested('calendar-timezone'))
 		{
-			$props['calendar-timezone'] = HTTP_WebDAV_Server::mkprop(groupdav::CALDAV,'calendar-timezone',
+			$props['calendar-timezone'] = HTTP_WebDAV_Server::mkprop(groupdav::CALDAV, 'calendar-timezone',
 				calendar_timezones::user_timezone($user));
 		}
 		return $props;
@@ -818,8 +818,8 @@ 
 	private function _get_handler()
 	{
 		$handler = new infolog_ical();
-		$handler->tzid = false;	//	as we read server-time timestamps (!= null=user-time), exports UTC times
-		$handler->setSupportedFields('GroupDAV',$this->agent);
+		$handler->tzid = false; //	as we read server-time timestamps (!= null=user-time), exports UTC times
+		$handler->setSupportedFields('GroupDAV', $this->agent);
 
 		return $handler;
 	}

Braces +73 added lines, -18 removed lines

@@ -88,7 +88,10 @@ 
 		}
 		else
 		{
-			if (!is_array($info)) $info = $this->bo->read($info);
+			if (!is_array($info))
+			{
+				$info = $this->bo->read($info);
+			}
 			$name = $info[self::$path_attr];
 		}
 		return $name.groupdav_handler::$path_extension;
@@ -155,7 +158,11 @@ 
 		// enable time-range filter for tests via propfind / autoindex
 		//$filter[] = $sql = $this->_time_range_filter(array('end' => '20001231T000000Z'));
 
-		if ($id) $path = dirname($path).'/';	// caldav_name get's added anyway in the callback
+		if ($id)
+		{
+			$path = dirname($path).'/';
+		}
+		// caldav_name get's added anyway in the callback
 
 		if ($this->debug > 1)
 		{
@@ -222,7 +229,10 @@ 
 	 */
 	function &propfind_callback($path,array $filter,$start=false)
 	{
-		if ($this->debug) $starttime = microtime(true);
+		if ($this->debug)
+		{
+			$starttime = microtime(true);
+		}
 
 		if (($calendar_data = $filter['calendar_data']))
 		{
@@ -237,7 +247,10 @@ 
 		if (preg_match('/^([a-z0-9_]+)( DESC| ASC)?$/i', $filter['order'], $matches))
 		{
 			$order = $matches[1];
-			if ($matches[2]) $sort = $matches[2];
+			if ($matches[2])
+			{
+				$sort = $matches[2];
+			}
 			unset($filter['order']);
 		}
 		$query = array(
@@ -320,7 +333,10 @@ 
 				--$this->sync_collection_token;
 			}
 		}
-		if ($this->debug) error_log(__METHOD__."($path) took ".(microtime(true) - $starttime).' to return '.count($files).' items');
+		if ($this->debug)
+		{
+			error_log(__METHOD__."($path) took ".(microtime(true) - $starttime).' to return '.count($files).' items');
+		}
 		return $files;
 	}
 
@@ -344,7 +360,10 @@ 
 				switch($filter['name'])
 				{
 					case 'comp-filter':
-						if ($this->debug > 1) error_log(__METHOD__."($options[path],...) comp-filter='{$filter['attrs']['name']}'");
+						if ($this->debug > 1)
+						{
+							error_log(__METHOD__."($options[path],...) comp-filter='{$filter['attrs']['name']}'");
+						}
 
 						switch($filter['attrs']['name'])
 						{
@@ -356,14 +375,23 @@ 
 						}
 						break;
 					case 'prop-filter':
-						if ($this->debug > 1) error_log(__METHOD__."($options[path],...) prop-filter='{$filter['attrs']['name']}'");
+						if ($this->debug > 1)
+						{
+							error_log(__METHOD__."($options[path],...) prop-filter='{$filter['attrs']['name']}'");
+						}
 						$prop_filter = $filter['attrs']['name'];
 						break;
 					case 'text-match':
-						if ($this->debug > 1) error_log(__METHOD__."($options[path],...) text-match: $prop_filter='{$filter['data']}'");
+						if ($this->debug > 1)
+						{
+							error_log(__METHOD__."($options[path],...) text-match: $prop_filter='{$filter['data']}'");
+						}
 						if (!isset($this->filter_prop2infolog[strtoupper($prop_filter)]))
 						{
-							if ($this->debug) error_log(__METHOD__."($options[path],".array2string($options).",...) unknown property '$prop_filter' --> ignored");
+							if ($this->debug)
+							{
+								error_log(__METHOD__."($options[path],".array2string($options).",...) unknown property '$prop_filter' --> ignored");
+							}
 						}
 						else
 						{
@@ -372,13 +400,19 @@ 
 						unset($prop_filter);
 						break;
 					case 'param-filter':
-						if ($this->debug) error_log(__METHOD__."($options[path],...) param-filter='{$filter['attrs']['name']}' not (yet) implemented!");
+						if ($this->debug)
+						{
+							error_log(__METHOD__."($options[path],...) param-filter='{$filter['attrs']['name']}' not (yet) implemented!");
+						}
 						break;
 					case 'time-range':
 						$cal_filters[] = $this->_time_range_filter($filter['attrs']);
 						break;
 					default:
-						if ($this->debug) error_log(__METHOD__."($options[path],".array2string($options).",...) unknown filter --> ignored");
+						if ($this->debug)
+						{
+							error_log(__METHOD__."($options[path],".array2string($options).",...) unknown filter --> ignored");
+						}
 						break;
 				}
 			}
@@ -447,7 +481,10 @@ 
 					}
 				}
 			}
-			if ($this->debug > 1) error_log(__METHOD__ ."($options[path],...,$id) calendar-multiget: ids=".implode(',',$ids));
+			if ($this->debug > 1)
+			{
+				error_log(__METHOD__ ."($options[path],...,$id) calendar-multiget: ids=".implode(',',$ids));
+			}
 		}
 		return true;
 	}
@@ -508,7 +545,10 @@ 
  			"NOT info_datecompleted > 0". (isset($end) ? " AND info_created < $end" : '').
 		')';
 		$sql = '('.implode(' OR ', $to_or).')';
-		if ($this->debug > 1) error_log(__FILE__ . __METHOD__.'('.array2string($attrs).") time-range={$filter['attrs']['start']}-{$filter['attrs']['end']} --> $sql");
+		if ($this->debug > 1)
+		{
+			error_log(__FILE__ . __METHOD__.'('.array2string($attrs).") time-range={$filter['attrs']['start']}-{$filter['attrs']['end']} --> $sql");
+		}
 		return $sql;
 	}
 
@@ -545,7 +585,10 @@ 
 	 */
 	function put(&$options,$id,$user=null,$prefix=null)
 	{
-		if ($this->debug) error_log(__METHOD__."($id, $user)".print_r($options,true));
+		if ($this->debug)
+		{
+			error_log(__METHOD__."($id, $user)".print_r($options,true));
+		}
 
 		$oldTask = $this->_common_get_put_delete('PUT',$options,$id);
 		if (!is_null($oldTask) && !is_array($oldTask))
@@ -573,7 +616,10 @@ 
 		}
 		if (!($infoId = $handler->importVTODO($vTodo, $taskId, false, $user, null, $id, $callback_data)))
 		{
-			if ($this->debug) error_log(__METHOD__."(,$id) import_vtodo($options[content]) returned false");
+			if ($this->debug)
+			{
+				error_log(__METHOD__."(,$id) import_vtodo($options[content]) returned false");
+			}
 			return '403 Forbidden';
 		}
 
@@ -600,7 +646,10 @@ 
 	 */
 	public function update_tags($entry)
 	{
-		if (!is_array($entry)) $entry = $this->read($entry);
+		if (!is_array($entry))
+		{
+			$entry = $this->read($entry);
+		}
 
 		$this->bo->write($entry, true);
 	}
@@ -722,7 +771,10 @@ 
 	 */
 	function check_access($acl,$task)
 	{
-		if (is_null($task)) return true;
+		if (is_null($task))
+		{
+			return true;
+		}
 
 		$access = $this->bo->check_access($task,$acl);
 
@@ -730,7 +782,10 @@ 
 		{
 			$access = true;	// access limited to $this->bo->responsible_edit fields (handled in infolog_bo::write())
 		}
-		if ($this->debug > 1) error_log(__METHOD__."($acl, ".array2string($task).') returning '.array2string($access));
+		if ($this->debug > 1)
+		{
+			error_log(__METHOD__."($acl, ".array2string($task).') returning '.array2string($access));
+		}
 		return $access;
 	}