Completed
Push — 14.2 ( e07840...cec2da )
by Ralf
83:18 queued 52:04
created
timesheet/inc/class.timesheet_wizard_import_csv.inc.php 1 patch
Indentation   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -35,9 +35,9 @@  discard block
 block discarded – undo
35 35
 		$this->mapping_fields = array('ts_id' => lang('Timesheet ID')) + $bo->field2label;
36 36
 
37 37
 		// These aren't in the list
38
-                $this->mapping_fields += array(
39
-                        'ts_modified'   => lang('Modified'),
40
-                );
38
+				$this->mapping_fields += array(
39
+						'ts_modified'   => lang('Modified'),
40
+				);
41 41
 
42 42
 		// List each custom field
43 43
 		unset($this->mapping_fields['customfields']);
@@ -113,9 +113,9 @@  discard block
 block discarded – undo
113 113
 				);
114 114
 			}
115 115
 			$sel_options = array(
116
-                                'translate_status'	=> $options + array($set_to => $ui->status_labels),
117
-                                'translate_cat_id'	=> $options + array($set_to => $cat_list),
118
-                        );
116
+								'translate_status'	=> $options + array($set_to => $ui->status_labels),
117
+								'translate_cat_id'	=> $options + array($set_to => $cat_list),
118
+						);
119 119
 			$preserv = $content;
120 120
 			foreach($sel_options as $field => $options) {
121 121
 				if(!array_key_exists($field,$content)) $content[$field] = $content['plugin_options'][$field];
Please login to merge, or discard this patch.
timesheet/inc/class.timesheet_bo.inc.php 1 patch
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -152,8 +152,8 @@
 block discarded – undo
152 152
 	const EXTRA_TABLE = 'egw_timesheet_extra';
153 153
 
154 154
 	/**
155
-	* Columns to search when user does a text search
156
-	*/
155
+	 * Columns to search when user does a text search
156
+	 */
157 157
 	var $columns_to_search = array('egw_timesheet.ts_id', 'ts_project', 'ts_title', 'ts_description', 'ts_duration', 'ts_quantity', 'ts_unitprice');
158 158
 
159 159
 	/**
Please login to merge, or discard this patch.
notifications/inc/class.notifications.inc.php 1 patch
Indentation   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -660,14 +660,14 @@
 block discarded – undo
660 660
 	 }
661 661
 
662 662
 	 /**
663
-	 * returns notification chains based on admin prefs
664
-	 * @abstract the available chains can be retrieved in two different output formats:
665
-	 * routing: array with common and enabled chains, chain-name as key and the chain-array as value (used for message-routing)
666
-	 * human: array with common, enabled and disabled chains, chain-name as key and a human-readable description as value (used for config)
667
-	 *
668
-	 * @param string $_output one of: 'routing' or 'human', defaults to 'routing'
669
-	 * @return array containing notification chains, output like given in $_output
670
-	 */
663
+	  * returns notification chains based on admin prefs
664
+	  * @abstract the available chains can be retrieved in two different output formats:
665
+	  * routing: array with common and enabled chains, chain-name as key and the chain-array as value (used for message-routing)
666
+	  * human: array with common, enabled and disabled chains, chain-name as key and a human-readable description as value (used for config)
667
+	  *
668
+	  * @param string $_output one of: 'routing' or 'human', defaults to 'routing'
669
+	  * @return array containing notification chains, output like given in $_output
670
+	  */
671 671
 	public function get_available_chains($_output = 'routing') {
672 672
 		// determine enabled backends from Api\Config
673 673
 		$enabled_backends = array();
Please login to merge, or discard this patch.
mail/inc/class.mail_sieve.inc.php 1 patch
Indentation   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -275,7 +275,7 @@  discard block
 block discarded – undo
275 275
 
276 276
 			//$ruleID is calculated by priority from the selected rule and is an unique ID
277 277
 			$content['ruleID'] = $ruleID = ($this->rulesByID['priority'] -1) / 2;
278
-            $error = 0;
278
+			$error = 0;
279 279
 			switch ($button)
280 280
 			{
281 281
 				case 'save':
@@ -1202,7 +1202,7 @@  discard block
 block discarded – undo
1202 1202
 	/**
1203 1203
 	 *
1204 1204
 	 * Get the data for iterating the rows on rules list grid
1205
- 	 *
1205
+	 *
1206 1206
 	 * @return {boolean|array} Array of rows | false if failed
1207 1207
 	 */
1208 1208
 	function get_rows()
@@ -1222,7 +1222,7 @@  discard block
 block discarded – undo
1222 1222
 				{
1223 1223
 					$row['class'] = 'mail_sieve_DISABLED';
1224 1224
 				}
1225
-            }
1225
+			}
1226 1226
 		}
1227 1227
 		else
1228 1228
 		{
@@ -1247,7 +1247,7 @@  discard block
 block discarded – undo
1247 1247
 				'caption' => 'Edit',
1248 1248
 				'default' => true,
1249 1249
 				'onExecute' => 'javaScript:app.mail.action',
1250
-                'disableClass' => 'th'
1250
+				'disableClass' => 'th'
1251 1251
 			),
1252 1252
 			'add' => array(
1253 1253
 				'caption' => 'Add',
@@ -1257,13 +1257,13 @@  discard block
 block discarded – undo
1257 1257
 				'caption' => 'Enable',
1258 1258
 				'onExecute' => 'javaScript:app.mail.action',
1259 1259
 				'enableClass' => 'mail_sieve_DISABLED',
1260
-                'hideOnDisabled' => true
1260
+				'hideOnDisabled' => true
1261 1261
 			),
1262 1262
 			'disable' => array(
1263 1263
 				'caption' => 'Disable',
1264 1264
 				'onExecute' => 'javaScript:app.mail.action',
1265 1265
 				'disableClass' => 'mail_sieve_DISABLED',
1266
-                'hideOnDisabled' => true
1266
+				'hideOnDisabled' => true
1267 1267
 			),
1268 1268
 			'delete' => array(
1269 1269
 				'caption' => 'Delete',
Please login to merge, or discard this patch.
mail/inc/class.mail_compose.inc.php 1 patch
Indentation   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -2126,11 +2126,11 @@  discard block
 block discarded – undo
2126 2126
 		} else {
2127 2127
 			//$this->sessionData['body']	= @htmlspecialchars(lang("on")." ".$headers['DATE']." ".$mail_bo->decode_header($fromAddress), ENT_QUOTES) . " ".lang("wrote").":\r\n";
2128 2128
 			// take care the way the ReplyHeader is created here, is used later on in uicompose::compose, in case you force replys to be HTML (prefs)
2129
-            $this->sessionData['body']  = " \r\n \r\n".'----------------'.lang("original message").'-----------------'."\r\n".
2130
-                @htmlspecialchars(lang("from")).": ".$fromAddress."\r\n".
2129
+			$this->sessionData['body']  = " \r\n \r\n".'----------------'.lang("original message").'-----------------'."\r\n".
2130
+				@htmlspecialchars(lang("from")).": ".$fromAddress."\r\n".
2131 2131
 				$toAddress.$ccAddress.
2132 2132
 				@htmlspecialchars(lang("date").": ".$headers['DATE'], ENT_QUOTES | ENT_IGNORE,Mail::$displayCharset, false)."\r\n".
2133
-                '-------------------------------------------------'."\r\n \r\n ";
2133
+				'-------------------------------------------------'."\r\n \r\n ";
2134 2134
 			$this->sessionData['mimeType']	= 'plain';
2135 2135
 
2136 2136
 			for($i=0; $i<count($bodyParts); $i++) {
@@ -2968,7 +2968,7 @@  discard block
 block discarded – undo
2968 2968
 		//error_log(__METHOD__.__LINE__."Number of Folders to move copy the message to:".count($folder));
2969 2969
 		//error_log(__METHOD__.__LINE__.array2string($folder));
2970 2970
 		if ((count($folder) > 0) || (isset($this->sessionData['uid']) && isset($this->sessionData['messageFolder']))
2971
-            || (isset($this->sessionData['forwardFlag']) && isset($this->sessionData['sourceFolder']))) {
2971
+			|| (isset($this->sessionData['forwardFlag']) && isset($this->sessionData['sourceFolder']))) {
2972 2972
 			$mail_bo = $this->mail_bo;
2973 2973
 			$mail_bo->openConnection();
2974 2974
 			//$mail_bo->reopen($this->sessionData['messageFolder']);
Please login to merge, or discard this patch.
mail/inc/class.mail_ui.inc.php 1 patch
Indentation   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -3117,7 +3117,7 @@  discard block
 block discarded – undo
3117 3117
 		 * @param string $_partID
3118 3118
 		 * @param string $_type
3119 3119
 		 * @return string|boolean returns the replace
3120
-		*/
3120
+		 */
3121 3121
 		$replace_callback = function ($matches) use ($_mailbox,$_uid, $_partID,  $_type)
3122 3122
 		{
3123 3123
 			if (!$_type)	return false;
@@ -3249,10 +3249,10 @@  discard block
 block discarded – undo
3249 3249
 			try
3250 3250
 			{
3251 3251
 				$messageUid = $this->importMessageToFolder($file,$destination,$importID);
3252
-			    $linkData = array
3253
-			    (
3252
+				$linkData = array
3253
+				(
3254 3254
 					'id' => $this->createRowID($destination, $messageUid, true),
3255
-			    );
3255
+				);
3256 3256
 			}
3257 3257
 			catch (Api\Exception\WrongUserinput $e)
3258 3258
 			{
@@ -3418,7 +3418,7 @@  discard block
 block discarded – undo
3418 3418
 			$messageUid = $this->importMessageToFolder($formData,$draftFolder,$importID);
3419 3419
 			$linkData = array
3420 3420
 			(
3421
-		        'menuaction'    => ($mode=='display'?'mail.mail_ui.displayMessage':'mail.mail_compose.composeFromDraft'),
3421
+				'menuaction'    => ($mode=='display'?'mail.mail_ui.displayMessage':'mail.mail_compose.composeFromDraft'),
3422 3422
 				'id'		=> $this->createRowID($draftFolder,$messageUid,true),
3423 3423
 				'deleteDraftOnClose' => 1,
3424 3424
 			);
Please login to merge, or discard this patch.
mail/index.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -11,4 +11,4 @@
 block discarded – undo
11 11
  * @version $Id$
12 12
  */
13 13
 header('Location: ../index.php?menuaction=mail.mail_ui.index'.
14
-    	(isset($_GET['sessionid']) ? '&sessionid='.$_GET['sessionid'].'&kp3='.$_GET['kp3'] : ''));
14
+		(isset($_GET['sessionid']) ? '&sessionid='.$_GET['sessionid'].'&kp3='.$_GET['kp3'] : ''));
Please login to merge, or discard this patch.
resources/inc/class.resources_wizard_import_csv.inc.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -44,7 +44,7 @@
 block discarded – undo
44 44
 			'long_description'      => lang('Long description'),
45 45
 			'inventory_number'      => lang('inventory number'),
46 46
 			'accessory_of'	=> lang('Accessory of')
47
-                );
47
+				);
48 48
 
49 49
 		$custom = Api\Storage\Customfields::get('resources', true);
50 50
 		foreach($custom as $name => $data) {
Please login to merge, or discard this patch.
resources/inc/class.resources_export_csv.inc.php 1 patch
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -170,9 +170,9 @@
 block discarded – undo
170 170
 	 * Get selectbox values
171 171
 	 */
172 172
 	protected function get_selects()
173
-        {
173
+		{
174 174
 		$this->selects = array();
175
-        }
175
+		}
176 176
 
177 177
 	/**
178 178
 	 * Customize automatically generated filter fields
Please login to merge, or discard this patch.