Completed
Push — 16.1 ( 7ccc73...046888 )
by Nathan
64:46 queued 51:15
created
admin/inc/class.admin_export_groups_csv.inc.php 1 patch
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -81,8 +81,8 @@
 block discarded – undo
81 81
 	}
82 82
 
83 83
 	public static function get_mimetype() {
84
-                return 'text/csv';
85
-        }
84
+				return 'text/csv';
85
+		}
86 86
 
87 87
 	/**
88 88
 	 * return html for options.
Please login to merge, or discard this patch.
admin/inc/class.admin_wizard_export_groups_csv.inc.php 1 patch
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -18,11 +18,11 @@
 block discarded – undo
18 18
 		parent::__construct();
19 19
 
20 20
 		// Field mapping
21
-                $this->export_fields = array(
21
+				$this->export_fields = array(
22 22
 			'account_id'		=> lang('Account ID'),
23 23
 			'account_lid'		=> lang('Group Name'),
24 24
 			'account_members'	=> lang('Members'),
25
-                );
25
+				);
26 26
 
27 27
 		// Custom fields - not really used in admin...
28 28
 		unset($this->export_fields['customfields']);
Please login to merge, or discard this patch.
admin/inc/class.admin_wizard_export_users_csv.inc.php 1 patch
Indentation   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -18,20 +18,20 @@
 block discarded – undo
18 18
 		parent::__construct();
19 19
 
20 20
 		// Field mapping
21
-                $this->export_fields = array(
21
+				$this->export_fields = array(
22 22
 			'account_id'		=> lang('Account ID'),
23
-                        'account_lid'		=> lang('LoginID'),
24
-                        'account_firstname'	=> lang('First Name'),
25
-                        'account_lastname'	=> lang('Last Name'),
26
-                        'account_email'		=> lang('email'),
27
-                        'account_pwd'		=> lang('Password'),
28
-                        'account_status'	=> lang('Status'),
29
-                        'account_primary_group'	=> lang('Primary Group'),
30
-                        'account_groups'	=> lang('Groups'),
31
-                        'account_expires'	=> lang('Expires'),
32
-                        'account_lastlogin'	=> lang('Last login'),
33
-                        'account_lastpwd_change'=> lang('Last password change'),
34
-                );
23
+						'account_lid'		=> lang('LoginID'),
24
+						'account_firstname'	=> lang('First Name'),
25
+						'account_lastname'	=> lang('Last Name'),
26
+						'account_email'		=> lang('email'),
27
+						'account_pwd'		=> lang('Password'),
28
+						'account_status'	=> lang('Status'),
29
+						'account_primary_group'	=> lang('Primary Group'),
30
+						'account_groups'	=> lang('Groups'),
31
+						'account_expires'	=> lang('Expires'),
32
+						'account_lastlogin'	=> lang('Last login'),
33
+						'account_lastpwd_change'=> lang('Last password change'),
34
+				);
35 35
 
36 36
 		// Custom fields - not really used in admin...
37 37
 		unset($this->export_fields['customfields']);
Please login to merge, or discard this patch.
admin/inc/class.admin_cmd.inc.php 1 patch
Indentation   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -239,11 +239,11 @@
 block discarded – undo
239 239
 			unset($postdata[$name]);
240 240
 		}
241 241
 		$opts = array('http' =>
242
-		    array(
243
-		        'method'  => 'POST',
244
-		        'header'  => 'Content-type: application/x-www-form-urlencoded',
245
-		        'content' => http_build_query($postdata),
246
-		    )
242
+			array(
243
+				'method'  => 'POST',
244
+				'header'  => 'Content-type: application/x-www-form-urlencoded',
245
+				'content' => http_build_query($postdata),
246
+			)
247 247
 		);
248 248
 		$url = $remote['remote_url'].'/admin/remote.php?domain='.urlencode($remote['remote_domain']).'&secret='.urlencode($secret);
249 249
 		//echo "sending command to $url\n"; _debug_array($opts);
Please login to merge, or discard this patch.
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_jpopup.inc.php 1 patch
Indentation   +50 added lines, -50 removed lines patch added patch discarded remove patch
@@ -15,63 +15,63 @@  discard block
 block discarded – undo
15 15
 {
16 16
 
17 17
 	/**
18
-	* Appname
19
-	*/
18
+	 * Appname
19
+	 */
20 20
 	const _appname = 'notifications';
21 21
 
22 22
 	/**
23
-	* Notification table in SQL database
24
-	*/
23
+	 * Notification table in SQL database
24
+	 */
25 25
 	const _notification_table = 'egw_notificationpopup';
26 26
 
27 27
 	/**
28
-	* Notification type
29
-	*/
28
+	 * Notification type
29
+	 */
30 30
 	const _type = 'jpopup';
31 31
 
32 32
 	/**
33
-	* holds account object for user who sends the message
34
-	*
35
-	* @var object
36
-	*/
33
+	 * holds account object for user who sends the message
34
+	 *
35
+	 * @var object
36
+	 */
37 37
 	private $sender;
38 38
 
39 39
 	/**
40
-	* holds account object for user to notify
41
-	*
42
-	* @var object
43
-	*/
40
+	 * holds account object for user to notify
41
+	 *
42
+	 * @var object
43
+	 */
44 44
 	private $recipient;
45 45
 
46 46
 	/**
47
-	* holds config object (sitewide application config)
48
-	*
49
-	* @var object
50
-	*/
47
+	 * holds config object (sitewide application config)
48
+	 *
49
+	 * @var object
50
+	 */
51 51
 	private $config;
52 52
 
53 53
 	/**
54
-	* holds preferences object of user to notify
55
-	*
56
-	* @var object
57
-	*/
54
+	 * holds preferences object of user to notify
55
+	 *
56
+	 * @var object
57
+	 */
58 58
 	private $preferences;
59 59
 
60 60
 	/**
61
-	* holds db object of SQL database
62
-	*
63
-	* @var Api\Db
64
-	*/
61
+	 * holds db object of SQL database
62
+	 *
63
+	 * @var Api\Db
64
+	 */
65 65
 	private $db;
66 66
 
67 67
 	/**
68
-	* constructor of notifications_egwpopup
69
-	*
70
-	* @param object $_sender
71
-	* @param object $_recipient
72
-	* @param object $_config
73
-	* @param object $_preferences
74
-	*/
68
+	 * constructor of notifications_egwpopup
69
+	 *
70
+	 * @param object $_sender
71
+	 * @param object $_recipient
72
+	 * @param object $_config
73
+	 * @param object $_preferences
74
+	 */
75 75
 	public function __construct($_sender, $_recipient, $_config = null, $_preferences = null)
76 76
 	{
77 77
 		if( !is_object($_sender) ) { throw new Exception("no sender given."); }
@@ -85,13 +85,13 @@  discard block
 block discarded – undo
85 85
 	}
86 86
 
87 87
 	/**
88
-	* sends notification if user is online
89
-	*
90
-	* @param array $_messages
91
-	* @param string $_subject
92
-	* @param array $_links
93
-	* @param array $_attachments
94
-	*/
88
+	 * sends notification if user is online
89
+	 *
90
+	 * @param array $_messages
91
+	 * @param string $_subject
92
+	 * @param array $_links
93
+	 * @param array $_attachments
94
+	 */
95 95
 	public function send(array $_messages, $_subject=false, $_links=false, $_attachments=false)
96 96
 	{
97 97
 		unset($_attachments);	// not used
@@ -133,11 +133,11 @@  discard block
 block discarded – undo
133 133
 	}
134 134
 
135 135
 	/**
136
-	* renders additional infos from sender and subject
137
-	*
138
-	* @param string $_subject
139
-	* @return string html rendered info as complete string
140
-	*/
136
+	 * renders additional infos from sender and subject
137
+	 *
138
+	 * @param string $_subject
139
+	 * @return string html rendered info as complete string
140
+	 */
141 141
 	private function render_infos($_subject = false) {
142 142
 		$infos = array();
143 143
 		$newline = "<br />";
@@ -149,11 +149,11 @@  discard block
 block discarded – undo
149 149
 	}
150 150
 
151 151
 	/**
152
-	* saves notification into database so that the client can fetch it from there
153
-	*
154
-	* @param string $_message
155
-	* @param array $_user_sessions
156
-	*/
152
+	 * saves notification into database so that the client can fetch it from there
153
+	 *
154
+	 * @param string $_message
155
+	 * @param array $_user_sessions
156
+	 */
157 157
 	private function save( $_message ) {
158 158
 		$result = $this->db->insert( self::_notification_table, array(
159 159
 			'account_id'     => $this->recipient->account_id,
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.