Test Setup Failed
Push — master ( 12c298...4a14e0 )
by Ralf
22:03
created
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_reserve.inc.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -58,7 +58,7 @@
 block discarded – undo
58 58
 			} else {
59 59
 				$data['msg']= '<div class="confirm">'.lang('Unable to process confirmation.').'</div>';
60 60
 			}
61
-                }
61
+				}
62 62
 
63 63
 		$this->tmpl->read('resources.sitemgr_book');
64 64
 
Please login to merge, or discard this patch.
resources/inc/class.resources_import_csv.inc.php 1 patch
Indentation   +17 added lines, -17 removed lines patch added patch discarded remove patch
@@ -45,15 +45,15 @@  discard block
 block discarded – undo
45 45
 	}
46 46
 
47 47
 	/**
48
-	* Import a single record
49
-	*
50
-	* You don't need to worry about mappings or translations, they've been done already.
51
-	* You do need to handle the conditions and the actions taken.
52
-	*
53
-	* Updates the count of actions taken
54
-	*
55
-	* @return boolean success
56
-	*/
48
+	 * Import a single record
49
+	 *
50
+	 * You don't need to worry about mappings or translations, they've been done already.
51
+	 * You do need to handle the conditions and the actions taken.
52
+	 *
53
+	 * Updates the count of actions taken
54
+	 *
55
+	 * @return boolean success
56
+	 */
57 57
 	protected function import_record(importexport_iface_egw_record &$record, &$import_csv)
58 58
 	{
59 59
 		// Check for an un-matched accessory of, try again on just name
@@ -250,14 +250,14 @@  discard block
 block discarded – undo
250 250
 	}
251 251
 
252 252
 	/**
253
-        * Returns warnings that were encountered during importing
254
-        * Maximum of one warning message per record, but you can append if you need to
255
-        *
256
-        * @return Array (
257
-        *       record_# => warning message
258
-        *       )
259
-        */
260
-        public function get_warnings() {
253
+	 * Returns warnings that were encountered during importing
254
+	 * Maximum of one warning message per record, but you can append if you need to
255
+	 *
256
+	 * @return Array (
257
+	 *       record_# => warning message
258
+	 *       )
259
+	 */
260
+		public function get_warnings() {
261 261
 		return $this->warnings;
262 262
 	}
263 263
 }
Please login to merge, or discard this patch.
resources/inc/class.resources_tracking.inc.php 1 patch
Indentation   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -26,20 +26,20 @@
 block discarded – undo
26 26
 		$this->id_field = 'res_id';
27 27
 
28 28
 		$this->field2history = array(
29
-                        'res_id'        => 'res_id',
30
-                        'name'          => 'name',
31
-                        'short_description'     => 'short_description',
32
-                        'cat_id'        => 'cat_id',
33
-                        'quantity'      => 'quantity',
34
-                        'useable'       => 'useable',
35
-                        'location'      => 'location',
36
-                        'storage_info'  => 'storage_info',
37
-                        'bookable'      => 'bookable',
38
-                        'buyable'       => 'buyable',
39
-                        'prize'         => 'prize',
40
-                        'long_description'      => 'long_description',
41
-                        'inventory_number'      => 'inventory_number',
42
-                        'accessory_of'  => 'accessory_of'
29
+						'res_id'        => 'res_id',
30
+						'name'          => 'name',
31
+						'short_description'     => 'short_description',
32
+						'cat_id'        => 'cat_id',
33
+						'quantity'      => 'quantity',
34
+						'useable'       => 'useable',
35
+						'location'      => 'location',
36
+						'storage_info'  => 'storage_info',
37
+						'bookable'      => 'bookable',
38
+						'buyable'       => 'buyable',
39
+						'prize'         => 'prize',
40
+						'long_description'      => 'long_description',
41
+						'inventory_number'      => 'inventory_number',
42
+						'accessory_of'  => 'accessory_of'
43 43
 		);
44 44
 		parent::__construct($this->appname);
45 45
 	}
Please login to merge, or discard this patch.
addressbook/inc/class.addressbook_wizard_export_vcard.inc.php 1 patch
Indentation   +43 added lines, -43 removed lines patch added patch discarded remove patch
@@ -27,54 +27,54 @@
 block discarded – undo
27 27
 	}
28 28
 
29 29
 	/**
30
-         * choose charset
31
-         *
32
-         * @param array $content
33
-         * @param array $sel_options
34
-         * @param array $readonlys
35
-         * @param array $preserv
36
-         * @return string template name
37
-         */
38
-        function wizard_step40(&$content, &$sel_options, &$readonlys, &$preserv)
39
-        {
40
-                if($this->debug) error_log(get_class($this) . '::wizard_step40->$content '.print_r($content,true));
41
-                // return from step40
42
-                if ($content['step'] == 'wizard_step40') {
43
-                        switch (array_search('pressed', $content['button']))
44
-                        {
45
-                                case 'next':
46
-                                        return $GLOBALS['egw']->importexport_definitions_ui->get_step($content['step'],1);
47
-                                case 'previous' :
48
-                                        return $GLOBALS['egw']->importexport_definitions_ui->get_step($content['step'],-1);
49
-                                case 'finish':
50
-                                        return 'wizard_finish';
51
-                                default :
52
-                                        return $this->wizard_step40($content,$sel_options,$readonlys,$preserv);
53
-                        }
54
-                }
55
-                // init step40
56
-                else
57
-                {
58
-                        $content['msg'] = $this->steps['wizard_step40'];
59
-                        $content['step'] = 'wizard_step40';
30
+	 * choose charset
31
+	 *
32
+	 * @param array $content
33
+	 * @param array $sel_options
34
+	 * @param array $readonlys
35
+	 * @param array $preserv
36
+	 * @return string template name
37
+	 */
38
+		function wizard_step40(&$content, &$sel_options, &$readonlys, &$preserv)
39
+		{
40
+				if($this->debug) error_log(get_class($this) . '::wizard_step40->$content '.print_r($content,true));
41
+				// return from step40
42
+				if ($content['step'] == 'wizard_step40') {
43
+						switch (array_search('pressed', $content['button']))
44
+						{
45
+								case 'next':
46
+										return $GLOBALS['egw']->importexport_definitions_ui->get_step($content['step'],1);
47
+								case 'previous' :
48
+										return $GLOBALS['egw']->importexport_definitions_ui->get_step($content['step'],-1);
49
+								case 'finish':
50
+										return 'wizard_finish';
51
+								default :
52
+										return $this->wizard_step40($content,$sel_options,$readonlys,$preserv);
53
+						}
54
+				}
55
+				// init step40
56
+				else
57
+				{
58
+						$content['msg'] = $this->steps['wizard_step40'];
59
+						$content['step'] = 'wizard_step40';
60 60
 			if(!$content['charset'] && $content['plugin_options']['charset']) {
61
-                                $content['charset'] = $content['plugin_options']['charset'] ? $content['plugin_options']['charset'] : 'user';
62
-                        }
61
+								$content['charset'] = $content['plugin_options']['charset'] ? $content['plugin_options']['charset'] : 'user';
62
+						}
63 63
 			$sel_options['charset'] = Api\Translation::get_installed_charsets()+
64
-                        array(
65
-                                'user'  => lang('User preference'),
66
-                        );
64
+						array(
65
+								'user'  => lang('User preference'),
66
+						);
67 67
 			$preserv = $content;
68 68
 
69
-                        // Add in extra allowed charsets
70
-                        $config = Api\Config::read('importexport');
71
-                        $extra_charsets = array_intersect(explode(',',$config['import_charsets']), mb_list_encodings());
72
-                        if($extra_charsets)
73
-                        {
74
-                                $sel_options['charset'] += array(lang('Extra encodings') => array_combine($extra_charsets,$extra_charsets));
75
-                        }
69
+						// Add in extra allowed charsets
70
+						$config = Api\Config::read('importexport');
71
+						$extra_charsets = array_intersect(explode(',',$config['import_charsets']), mb_list_encodings());
72
+						if($extra_charsets)
73
+						{
74
+								$sel_options['charset'] += array(lang('Extra encodings') => array_combine($extra_charsets,$extra_charsets));
75
+						}
76 76
 			unset ($preserv['button']);
77
-                        return $this->step_templates[$content['step']];
77
+						return $this->step_templates[$content['step']];
78 78
 		}
79 79
 	}
80 80
 
Please login to merge, or discard this patch.
addressbook/inc/class.addressbook_export_contacts_csv.inc.php 1 patch
Indentation   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -365,10 +365,10 @@  discard block
 block discarded – undo
365 365
 	}
366 366
 
367 367
 	/**
368
-	* Convert some internal data to something with more meaning
369
-	*
370
-	* Dates, times, user IDs, category IDs
371
-	*/
368
+	 * Convert some internal data to something with more meaning
369
+	 *
370
+	 * Dates, times, user IDs, category IDs
371
+	 */
372 372
 	public static function convert(addressbook_egw_record &$record, $options) {
373 373
 
374 374
 		if ($record->tel_prefer) {
@@ -436,7 +436,7 @@  discard block
 block discarded – undo
436 436
 	 * Adjust automatically generated filter fields
437 437
 	 */
438 438
 	public function get_filter_fields(Array &$filters)
439
-    {
439
+	{
440 440
 		unset($filters['last_event']);
441 441
 		unset($filters['next_event']);
442 442
 		foreach($filters as $field_name => &$settings)
Please login to merge, or discard this patch.
addressbook/inc/class.addressbook_import_contacts_csv.inc.php 1 patch
Indentation   +26 added lines, -26 removed lines patch added patch discarded remove patch
@@ -381,38 +381,38 @@
 block discarded – undo
381 381
 	}
382 382
 
383 383
 	/**
384
-        * Returns warnings that were encountered during importing
385
-        * Maximum of one warning message per record, but you can append if you need to
386
-        *
387
-        * @return Array (
388
-        *       record_# => warning message
389
-        *       )
390
-        */
391
-        public function get_warnings() {
384
+	 * Returns warnings that were encountered during importing
385
+	 * Maximum of one warning message per record, but you can append if you need to
386
+	 *
387
+	 * @return Array (
388
+	 *       record_# => warning message
389
+	 *       )
390
+	 */
391
+		public function get_warnings() {
392 392
 		return $this->warnings;
393 393
 	}
394 394
 
395 395
 	/**
396
-        * Returns errors that were encountered during importing
397
-        * Maximum of one error message per record, but you can append if you need to
398
-        *
399
-        * @return Array (
400
-        *       record_# => error message
401
-        *       )
402
-        */
403
-        public function get_errors() {
396
+	 * Returns errors that were encountered during importing
397
+	 * Maximum of one error message per record, but you can append if you need to
398
+	 *
399
+	 * @return Array (
400
+	 *       record_# => error message
401
+	 *       )
402
+	 */
403
+		public function get_errors() {
404 404
 		return $this->errors;
405 405
 	}
406 406
 
407 407
 	/**
408
-        * Returns a list of actions taken, and the number of records for that action.
409
-        * Actions are things like 'insert', 'update', 'delete', and may be different for each plugin.
410
-        *
411
-        * @return Array (
412
-        *       action => record count
413
-        * )
414
-        */
415
-        public function get_results() {
416
-                return $this->results;
417
-        }
408
+	 * Returns a list of actions taken, and the number of records for that action.
409
+	 * Actions are things like 'insert', 'update', 'delete', and may be different for each plugin.
410
+	 *
411
+	 * @return Array (
412
+	 *       action => record count
413
+	 * )
414
+	 */
415
+		public function get_results() {
416
+				return $this->results;
417
+		}
418 418
 }
Please login to merge, or discard this patch.
addressbook/inc/class.addressbook_zpush.inc.php 1 patch
Indentation   +25 added lines, -25 removed lines patch added patch discarded remove patch
@@ -277,7 +277,7 @@  discard block
 block discarded – undo
277 277
 	 * @param string $id folder id
278 278
 	 * @param int $cutoffdate =null
279 279
 	 * @return array
280
-  	 */
280
+	 */
281 281
 	function GetMessageList($id, $cutoffdate=NULL)
282 282
 	{
283 283
 		unset($cutoffdate);	// not used, but required by function signature
@@ -378,10 +378,10 @@  discard block
 block discarded – undo
378 378
 				case 'bday':	// zpush seems to use a timestamp in utc (at least vcard backend does)
379 379
 					if (!empty($contact[$attr]))
380 380
 					{
381
-            			$tz = date_default_timezone_get();
382
-            			date_default_timezone_set('UTC');
383
-            			$message->birthday = strtotime($contact[$attr]);
384
-            			date_default_timezone_set($tz);
381
+						$tz = date_default_timezone_get();
382
+						date_default_timezone_set('UTC');
383
+						$message->birthday = strtotime($contact[$attr]);
384
+						date_default_timezone_set($tz);
385 385
 					}
386 386
 					break;
387 387
 
@@ -634,7 +634,7 @@  discard block
 block discarded – undo
634 634
 	 * @param $folderid of the current folder
635 635
 	 * @param $id of the message
636 636
 	 * @param $newfolderid
637
-     * @param ContentParameters   $contentParameters
637
+	 * @param ContentParameters   $contentParameters
638 638
 	 *
639 639
 	 * @return $newid as a string | boolean false on error
640 640
 	 *
@@ -662,7 +662,7 @@  discard block
 block discarded – undo
662 662
 	 *
663 663
 	 * @param $folderid
664 664
 	 * @param $id
665
-     * @param ContentParameters   $contentParameters
665
+	 * @param ContentParameters   $contentParameters
666 666
 	 *
667 667
 	 * @return boolean true on success, false on error, diffbackend does NOT use the returnvalue
668 668
 	 *
@@ -681,23 +681,23 @@  discard block
 block discarded – undo
681 681
 		return $ret;
682 682
 	}
683 683
 
684
-    /**
685
-     * Changes the 'read' flag of a message on disk. The $flags
686
-     * parameter can only be '1' (read) or '0' (unread). After a call to
687
-     * SetReadFlag(), GetMessageList() should return the message with the
688
-     * new 'flags' but should not modify the 'mod' parameter. If you do
689
-     * change 'mod', simply setting the message to 'read' on the mobile will trigger
690
-     * a full resync of the item from the server.
691
-     *
692
-     * @param string              $folderid            id of the folder
693
-     * @param string              $id                  id of the message
694
-     * @param int                 $flags               read flag of the message
695
-     * @param ContentParameters   $contentParameters
696
-     *
697
-     * @access public
698
-     * @return boolean                      status of the operation
699
-     * @throws StatusException              could throw specific SYNC_STATUS_* exceptions
700
-     */
684
+	/**
685
+	 * Changes the 'read' flag of a message on disk. The $flags
686
+	 * parameter can only be '1' (read) or '0' (unread). After a call to
687
+	 * SetReadFlag(), GetMessageList() should return the message with the
688
+	 * new 'flags' but should not modify the 'mod' parameter. If you do
689
+	 * change 'mod', simply setting the message to 'read' on the mobile will trigger
690
+	 * a full resync of the item from the server.
691
+	 *
692
+	 * @param string              $folderid            id of the folder
693
+	 * @param string              $id                  id of the message
694
+	 * @param int                 $flags               read flag of the message
695
+	 * @param ContentParameters   $contentParameters
696
+	 *
697
+	 * @access public
698
+	 * @return boolean                      status of the operation
699
+	 * @throws StatusException              could throw specific SYNC_STATUS_* exceptions
700
+	 */
701 701
 	function SetReadFlag($folderid, $id, $flags, $contentParameters)
702 702
 	{
703 703
 		unset($folderid, $id, $flags, $contentParameters);
@@ -713,7 +713,7 @@  discard block
 block discarded – undo
713 713
 	 *
714 714
 	 *
715 715
 	 * @DESC The $flags parameter must contains the poommailflag Object
716
- 	 */
716
+	 */
717 717
 	function ChangeMessageFlag($folderid, $id, $flags)
718 718
 	{
719 719
 		unset($folderid, $id, $flags);
Please login to merge, or discard this patch.
addressbook/inc/class.addressbook_ui.inc.php 1 patch
Indentation   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -1885,12 +1885,12 @@  discard block
 block discarded – undo
1885 1885
 	}
1886 1886
 
1887 1887
 	/**
1888
-	* Edit a contact
1889
-	*
1890
-	* @param array $content=null submitted content
1891
-	* @param int $_GET['contact_id'] contact_id mainly for popup use
1892
-	* @param bool $_GET['makecp'] true if you want to copy the contact given by $_GET['contact_id']
1893
-	*/
1888
+	 * Edit a contact
1889
+	 *
1890
+	 * @param array $content=null submitted content
1891
+	 * @param int $_GET['contact_id'] contact_id mainly for popup use
1892
+	 * @param bool $_GET['makecp'] true if you want to copy the contact given by $_GET['contact_id']
1893
+	 */
1894 1894
 	function edit($content=null)
1895 1895
 	{
1896 1896
 		if (is_array($content))
@@ -3069,8 +3069,8 @@  discard block
 block discarded – undo
3069 3069
 	}
3070 3070
 
3071 3071
 	/**
3072
-	* Set up history log widget
3073
-	*/
3072
+	 * Set up history log widget
3073
+	 */
3074 3074
 	protected function setup_history(&$content, &$sel_options)
3075 3075
 	{
3076 3076
 		if ($this->contact_repository == 'ldap' || !$content['id'] ||
Please login to merge, or discard this patch.