EGroupware / egroupware

mail/inc/class.mail_ui.inc.php

Indentation +5 added lines, -5 removed lines

@@ -3510,7 +3510,7 @@ 
 		 * @param string $_partID
 		 * @param string $_type
 		 * @return string|boolean returns the replace
-		*/
+		 */
 		$replace_callback = function ($matches) use ($_mailbox,$_uid, $_partID,  $_type, $_link_callback)
 		{
 			if (!$_type)	return false;
@@ -3635,10 +3635,10 @@ 
 			try
 			{
 				$messageUid = $this->importMessageToFolder($file,$destination,$importID);
-			    $linkData = array
-			    (
+				$linkData = array
+				(
 					'id' => $this->createRowID($destination, $messageUid, true),
-			    );
+				);
 			}
 			catch (Api\Exception\WrongUserinput $e)
 			{
@@ -3808,7 +3808,7 @@ 
 			$messageUid = $this->importMessageToFolder($formData,$draftFolder,$importID);
 			$linkData = array
 			(
-		        'menuaction'    => ($mode=='display'?'mail.mail_ui.displayMessage':'mail.mail_compose.composeFromDraft'),
+				'menuaction'    => ($mode=='display'?'mail.mail_ui.displayMessage':'mail.mail_compose.composeFromDraft'),
 				'id'		=> $this->createRowID($draftFolder,$messageUid,true),
 				'deleteDraftOnClose' => 1,
 			);

infolog/tests/SetProjectManagerTest.php

Indentation +9 added lines, -9 removed lines

@@ -74,7 +74,7 @@ 
 	{
 		// Saving the infolog should try to send a notification
 		$this->bo->tracking->expects($this->atLeastOnce())
-                ->method('track')
+				->method('track')
 				->with($this->callback(function($subject) { return $subject['pm_id'] == $this->pm_id;}));
 
 		// Mock the etemplate call to check the results
@@ -112,7 +112,7 @@ 
 	{
 		// Saving the infolog should try to send a notification
 		$this->bo->tracking->expects($this->exactly(2))
-                ->method('track')
+				->method('track')
 				->withConsecutive(
 					// First call - creation
 					[$this->callback(function($subject) { return is_null($subject['pm_status']);})],
@@ -159,7 +159,7 @@ 
 	{
 		// Saving the infolog should try to send a notification
 		$this->bo->tracking->expects($this->exactly(2))
-                ->method('track')
+				->method('track')
 				->withConsecutive(
 					// First call - creation
 					[$this->callback(function($subject) { return is_null($subject['pm_status']);})],
@@ -207,7 +207,7 @@ 
 	{
 		// Saving the infolog should try to send a notification
 		$this->bo->tracking->expects($this->once())
-                ->method('track')
+				->method('track')
 				->with($this->callback(function($subject) { return $subject['pm_id'] == $this->pm_id;}));
 
 		$info = $this->getTestInfolog();
@@ -242,7 +242,7 @@ 
 	{
 		// Saving the infolog should try to send a notification
 		$this->bo->tracking->expects($this->once())
-                ->method('track')
+				->method('track')
 				->with($this->callback(function($subject) { return $subject['pm_id'] == $this->pm_id;}));
 
 		$info = $this->getTestInfolog();
@@ -326,7 +326,7 @@ 
 	{
 		// Saving the infolog should try to send a notification
 		$this->bo->tracking->expects($this->once())
-                ->method('track')
+				->method('track')
 				->will($this->returnCallback(function($subject) { return $subject['pm_id'] == $this->pm_id;}));
 
 		$info = $this->getTestInfolog();
@@ -363,7 +363,7 @@ 
 	{
 		// Saving the infolog should try to send a notification
 		$this->bo->tracking->expects($this->exactly(2))
-                ->method('track')
+				->method('track')
 				->will($this->returnCallback(function($subject) { return $subject['pm_id'] == $this->pm_id;}));
 
 		$info = $this->getTestInfolog();
@@ -441,7 +441,7 @@ 
 	{
 		// Saving the infolog should try to send a notification
 		$this->bo->tracking->expects($this->exactly(2))
-                ->method('track')
+				->method('track')
 				->withConsecutive(
 					// First call - set the project
 					[$this->callback(function($subject) { return $subject['pm_id'] == $this->pm_id;})],
@@ -515,7 +515,7 @@ 
 	{
 		// Saving the infolog should try to send a notification
 		$this->bo->tracking->expects($this->exactly(2))
-                ->method('track')
+				->method('track')
 				->withConsecutive(
 					// First call - set the project
 					[$this->callback(function($subject) { return $subject['pm_id'] == $this->pm_id;})],

calendar/tests/ImportParticipantsTest.php

Indentation +3 added lines, -3 removed lines

@@ -46,8 +46,8 @@ 
 
 		// Make parse_participants method accessable
 		$class = new \ReflectionClass($this->import);
-        $this->parse_method = $class->getMethod('parse_participants');
-        $this->parse_method->setAccessible(true);
+		$this->parse_method = $class->getMethod('parse_participants');
+		$this->parse_method->setAccessible(true);
 	}
 
 	public function tearDown()
@@ -71,7 +71,7 @@ 
 		$record = new ParticipantRecord($test_string);
 
 		// Parse the string
-        $parsed = $this->parse_method->invokeArgs($this->import, array($record, &$warning));
+		$parsed = $this->parse_method->invokeArgs($this->import, array($record, &$warning));
 
 		// Get numeric ID for this system
 		foreach ($expected as $id => $status)

notifications/inc/class.notifications_jpopup.inc.php

Indentation +51 added lines, -51 removed lines

@@ -15,63 +15,63 @@ 
 {
 
 	/**
-	* Appname
-	*/
+	 * Appname
+	 */
 	const _appname = 'notifications';
 
 	/**
-	* Notification table in SQL database
-	*/
+	 * Notification table in SQL database
+	 */
 	const _notification_table = 'egw_notificationpopup';
 
 	/**
-	* Notification type
-	*/
+	 * Notification type
+	 */
 	const _type = 'jpopup';
 
 	/**
-	* holds account object for user who sends the message
-	*
-	* @var object
-	*/
+	 * holds account object for user who sends the message
+	 *
+	 * @var object
+	 */
 	private $sender;
 
 	/**
-	* holds account object for user to notify
-	*
-	* @var object
-	*/
+	 * holds account object for user to notify
+	 *
+	 * @var object
+	 */
 	private $recipient;
 
 	/**
-	* holds config object (sitewide application config)
-	*
-	* @var object
-	*/
+	 * holds config object (sitewide application config)
+	 *
+	 * @var object
+	 */
 	private $config;
 
 	/**
-	* holds preferences object of user to notify
-	*
-	* @var object
-	*/
+	 * holds preferences object of user to notify
+	 *
+	 * @var object
+	 */
 	private $preferences;
 
 	/**
-	* holds db object of SQL database
-	*
-	* @var Api\Db
-	*/
+	 * holds db object of SQL database
+	 *
+	 * @var Api\Db
+	 */
 	private $db;
 
 	/**
-	* constructor of notifications_egwpopup
-	*
-	* @param object $_sender
-	* @param object $_recipient
-	* @param object $_config
-	* @param object $_preferences
-	*/
+	 * constructor of notifications_egwpopup
+	 *
+	 * @param object $_sender
+	 * @param object $_recipient
+	 * @param object $_config
+	 * @param object $_preferences
+	 */
 	public function __construct($_sender, $_recipient, $_config = null, $_preferences = null)
 	{
 		if( !is_object($_sender) ) { throw new Exception("no sender given."); }
@@ -85,14 +85,14 @@ 
 	}
 
 	/**
-	* sends notification if user is online
-	*
-	* @param array $_messages
-	* @param string $_subject
-	* @param array $_links
-	* @param array $_attachments
-	* @param array $_data
-	*/
+	 * sends notification if user is online
+	 *
+	 * @param array $_messages
+	 * @param string $_subject
+	 * @param array $_links
+	 * @param array $_attachments
+	 * @param array $_data
+	 */
 	public function send(array $_messages, $_subject=false, $_links=false, $_attachments=false, $_data = false)
 	{
 		unset($_attachments, $_data);	// not used
@@ -134,11 +134,11 @@ 
 	}
 
 	/**
-	* renders additional infos from sender and subject
-	*
-	* @param string $_subject
-	* @return string html rendered info as complete string
-	*/
+	 * renders additional infos from sender and subject
+	 *
+	 * @param string $_subject
+	 * @return string html rendered info as complete string
+	 */
 	private function render_infos($_subject = false) {
 		$infos = array();
 		$newline = "<br />";
@@ -150,11 +150,11 @@ 
 	}
 
 	/**
-	* saves notification into database so that the client can fetch it from there
-	*
-	* @param string $_message
-	* @param array $_user_sessions
-	*/
+	 * saves notification into database so that the client can fetch it from there
+	 *
+	 * @param string $_message
+	 * @param array $_user_sessions
+	 */
 	private function save( $_message ) {
 		$result = $this->db->insert( self::_notification_table, array(
 			'account_id'     => $this->recipient->account_id,

api/src/Contacts.php

Indentation +30 added lines, -30 removed lines

@@ -152,19 +152,19 @@ 
 	var $categories;
 
 	/**
-	* Tracking changes
-	*
-	* @var Contacts\Tracking
-	*/
+	 * Tracking changes
+	 *
+	 * @var Contacts\Tracking
+	 */
 	protected $tracking;
 
 	/**
-	* Keep deleted addresses, or really delete them
-	* Set in Admin -> Addressbook -> Site Configuration
-	* ''=really delete, 'history'=keep, only admins delete, 'userpurge'=keep, users delete
- 	*
-	* @var string
- 	*/
+	 * Keep deleted addresses, or really delete them
+	 * Set in Admin -> Addressbook -> Site Configuration
+	 * ''=really delete, 'history'=keep, only admins delete, 'userpurge'=keep, users delete
+	 *
+	 * @var string
+	 */
 	protected $delete_history = '';
 
 	/**
@@ -797,13 +797,13 @@ 
 	}
 
 	/**
-	* deletes contact in db
-	*
-	* @param mixed &$contact contact array with key id or (array of) id(s)
-	* @param boolean $deny_account_delete =true if true never allow to delete accounts
-	* @param int $check_etag =null
-	* @return boolean|int true on success or false on failiure, 0 if etag does not match
-	*/
+	 * deletes contact in db
+	 *
+	 * @param mixed &$contact contact array with key id or (array of) id(s)
+	 * @param boolean $deny_account_delete =true if true never allow to delete accounts
+	 * @param int $check_etag =null
+	 * @return boolean|int true on success or false on failiure, 0 if etag does not match
+	 */
 	function delete($contact,$deny_account_delete=true,$check_etag=null)
 	{
 		if (is_array($contact) && isset($contact['id']))
@@ -855,13 +855,13 @@ 
 	}
 
 	/**
-	* saves contact to db
-	*
-	* @param array &$contact contact array from etemplate::exec
-	* @param boolean $ignore_acl =false should the acl be checked or not
-	* @param boolean $touch_modified =true should modified/r be updated
-	* @return int/string/boolean id on success, false on failure, the error-message is in $this->error
-	*/
+	 * saves contact to db
+	 *
+	 * @param array &$contact contact array from etemplate::exec
+	 * @param boolean $ignore_acl =false should the acl be checked or not
+	 * @param boolean $touch_modified =true should modified/r be updated
+	 * @return int/string/boolean id on success, false on failure, the error-message is in $this->error
+	 */
 	function save(&$contact, $ignore_acl=false, $touch_modified=true)
 	{
 		// Make sure photo remains unchanged unless its purposely set to be false
@@ -1110,12 +1110,12 @@ 
 	}
 
 	/**
-	* reads contacts matched by key and puts all cols in the data array
-	*
-	* @param int|string $contact_id
-	* @param boolean $ignore_acl =false true: no acl check
-	* @return array|boolean array with contact data, null if not found or false on no view perms
-	*/
+	 * reads contacts matched by key and puts all cols in the data array
+	 *
+	 * @param int|string $contact_id
+	 * @param boolean $ignore_acl =false true: no acl check
+	 * @return array|boolean array with contact data, null if not found or false on no view perms
+	 */
 	function read($contact_id, $ignore_acl=false)
 	{
 		// get so_sql_cf to read private customfields too, if we ignore acl

api/tests/LoggedInTest.php

Indentation +11 added lines, -11 removed lines

@@ -102,12 +102,12 @@ 
 	}
 
 	/**
-	* Start the eGW session, skips the test if there are problems connecting
-	*
-	* @param string $user
-	* @param string $passwd
-	* @param string $domain
-	*/
+	 * Start the eGW session, skips the test if there are problems connecting
+	 *
+	 * @param string $user
+	 * @param string $passwd
+	 * @param string $domain
+	 */
 	public static function load_egw($user,$passwd,$domain='default',$info=array())
 	{
 		$_REQUEST['domain'] = $domain;
@@ -175,11 +175,11 @@ 
 
 
 	/**
-	* callback to authenticate with the user/pw specified on the commandline
-	*
-	* @param array &$account account_info with keys 'login', 'passwd' and optional 'passwd_type'
-	* @return boolean/string true if we allow the access and account is set, a sessionid or false otherwise
-	*/
+	 * callback to authenticate with the user/pw specified on the commandline
+	 *
+	 * @param array &$account account_info with keys 'login', 'passwd' and optional 'passwd_type'
+	 * @return boolean/string true if we allow the access and account is set, a sessionid or false otherwise
+	 */
 	public static function create_session(&$account)
 	{
 		if (!($sessionid = $GLOBALS['egw']->session->create($GLOBALS['egw_login_data'])))

calendar/inc/class.calendar_merge.inc.php

Indentation +36 added lines, -36 removed lines

@@ -179,7 +179,7 @@ 
 				{
 					$value = date($format, $key == 'end' ? $id['end'] : $id['start']);
 					if($key == 'month') $value = lang($value);
-					$values["$\$range/$key$$"] = $value;
+					$values["$\$range/$key$key$"] = $value;
 				}
 			}
 			$replacements += $values;
@@ -246,7 +246,7 @@ 
 			}
 			foreach($types as $t_id => $type)
 			{
-				$replacements['$$'.($prefix ? $prefix . '/' : '') . "calendar_participants/{$t_id}$$"] = implode(', ',$type);
+				$replacements['$$'.($prefix ? $prefix . '/' : '') . "calendar_participants/{$t_id}}$"] = implode(', ',$type);
 			}
 		}
 		// Participant email list (not declined)
@@ -377,20 +377,20 @@ 
 	}
 
 	/**
-	* Table plugin for event
-	* Lists events for a certain day of the week.  Only works for one week at a time, so for multiple weeks,
-	* use multiple date ranges.
-	*
-	* Use:
-	* $$table/Monday$$ $$starttime$$ $$title$$ $$endtable$$
-	* The day of the week may be language specific (date('l')).
-	*
-	* @param string $plugin (Monday-Sunday)
-	* @param int/array date or date range
-	* @param int $n Row number
-	* @param string $repeat Text being repeated for each entry
-	* @return array
-	*/
+	 * Table plugin for event
+	 * Lists events for a certain day of the week.  Only works for one week at a time, so for multiple weeks,
+	 * use multiple date ranges.
+	 *
+	 * Use:
+	 * $$table/Monday$$ $$starttime$$ $$title$$ $$endtable$$
+	 * The day of the week may be language specific (date('l')).
+	 *
+	 * @param string $plugin (Monday-Sunday)
+	 * @param int/array date or date range
+	 * @param int $n Row number
+	 * @param string $repeat Text being repeated for each entry
+	 * @return array
+	 */
 	public function day_plugin($plugin,$date,$n,$repeat)
 	{
 		static $days = null;
@@ -471,16 +471,16 @@ 
 	}
 
 	/**
-	* Table plugin for a certain date
-	*
-	* Can be either a particular date (2011-02-15) or a day of the month (15)
-	*
-	* @param string $plugin
-	* @param int $id ID for this record
-	* @param int $n Repeated row number
-	* @param string $repeat Text being repeated for each entry
-	* @return array
-	*/
+	 * Table plugin for a certain date
+	 *
+	 * Can be either a particular date (2011-02-15) or a day of the month (15)
+	 *
+	 * @param string $plugin
+	 * @param int $id ID for this record
+	 * @param int $n Repeated row number
+	 * @param string $repeat Text being repeated for each entry
+	 * @return array
+	 */
 	public function day($plugin,$id,$n,$repeat)
 	{
 		static $days = null;
@@ -569,15 +569,15 @@ 
 	}
 
 	/**
-	* Table plugin for participants
-	*
-	* Copied from eventmgr resources
-	*
-	* @param string $plugin
-	* @param int $id
-	* @param int $n
-	* @return array
-	*/
+	 * Table plugin for participants
+	 *
+	 * Copied from eventmgr resources
+	 *
+	 * @param string $plugin
+	 * @param int $id
+	 * @param int $n
+	 * @return array
+	 */
 	public function participant($plugin,$id,$n)
 	{
 		unset($plugin);	// not used, but required by function signature
@@ -636,7 +636,7 @@ 
 				{
 					foreach($resource as $name => $value)
 					{
-					    $replacements['$$'.$name.'$$'] = $value;
+						$replacements['$$'.$name.'$$'] = $value;
 					}
 				}
 				break;

calendar/inc/class.calendar_import_ical.inc.php

Indentation +30 added lines, -30 removed lines

@@ -64,8 +64,8 @@ 
 	private $bo;
 
 	/**
-	* For figuring out if an entry has changed
-	*/
+	 * For figuring out if an entry has changed
+	 */
 	protected $tracking;
 
 	/**
@@ -94,8 +94,8 @@ 
 	protected $errors = array();
 
 	/**
-	* List of actions, and how many times that action was taken
-	*/
+	 * List of actions, and how many times that action was taken
+	 */
 	protected $results = array();
 
 	/**
@@ -305,38 +305,38 @@ 
 		return 'calendar_egw_record';
 	}
 	/**
-        * Returns warnings that were encountered during importing
-        * Maximum of one warning message per record, but you can append if you need to
-        *
-        * @return Array (
-        *       record_# => warning message
-        *       )
-        */
-        public function get_warnings() {
+	 * Returns warnings that were encountered during importing
+	 * Maximum of one warning message per record, but you can append if you need to
+	 *
+	 * @return Array (
+	 *       record_# => warning message
+	 *       )
+	 */
+		public function get_warnings() {
 		return $this->warnings;
 	}
 
 	/**
-        * Returns errors that were encountered during importing
-        * Maximum of one error message per record, but you can append if you need to
-        *
-        * @return Array (
-        *       record_# => error message
-        *       )
-        */
-        public function get_errors() {
+	 * Returns errors that were encountered during importing
+	 * Maximum of one error message per record, but you can append if you need to
+	 *
+	 * @return Array (
+	 *       record_# => error message
+	 *       )
+	 */
+		public function get_errors() {
 		return $this->errors;
 	}
 
 	/**
-        * Returns a list of actions taken, and the number of records for that action.
-        * Actions are things like 'insert', 'update', 'delete', and may be different for each plugin.
-        *
-        * @return Array (
-        *       action => record count
-        * )
-        */
-        public function get_results() {
-                return $this->results;
-        }
+	 * Returns a list of actions taken, and the number of records for that action.
+	 * Actions are things like 'insert', 'update', 'delete', and may be different for each plugin.
+	 *
+	 * @return Array (
+	 *       action => record count
+	 * )
+	 */
+		public function get_results() {
+				return $this->results;
+		}
 }
\ No newline at end of file

calendar/inc/class.calendar_wizard_import_ical.inc.php

Indentation +5 added lines, -5 removed lines

@@ -15,18 +15,18 @@
 class calendar_wizard_import_ical
 {
 	/**
-	* List of steps.  Key is the function, value is the translated title.
-	*/
+	 * List of steps.  Key is the function, value is the translated title.
+	 */
 	public $steps;
 
 	/**
-	* List of eTemplates to use for each step.  You can override this with your own etemplates steps.
-	*/
+	 * List of eTemplates to use for each step.  You can override this with your own etemplates steps.
+	 */
 	protected $step_templates = array(
 		'wizard_step55' => 'calendar.import.ical_conditions',
 		'wizard_step60' => 'calendar.importexport_wizard_ical_chooseowner'
 	);
-    /**
+	/**
 	 * constructor
 	 */
 	function __construct()