Completed
Push — 14.2 ( e07840...cec2da )
by Ralf
83:18 queued 52:04
created
infolog/inc/class.infolog_export_csv.inc.php 1 patch
Indentation   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -259,10 +259,10 @@
 block discarded – undo
259 259
 	}
260 260
 
261 261
 	/**
262
-	* Convert some internal data to something with more meaning
263
-	*
264
-	* This is for something specific to Infolog, in addition to the normal conversions.
265
-	*/
262
+	 * Convert some internal data to something with more meaning
263
+	 *
264
+	 * This is for something specific to Infolog, in addition to the normal conversions.
265
+	 */
266 266
 	public static function convert(infolog_egw_record &$record) {
267 267
 		// Stub, for now
268 268
 	}
Please login to merge, or discard this patch.
infolog/inc/class.infolog_so.inc.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -248,7 +248,7 @@
 block discarded – undo
248 248
 				$filtermethod .= " OR (".$this->responsible_filter($this->user).
249 249
 					($filter == 'own' && count($public_user_list) ?	// offer's should show up in own, eg. startpage, but need read-access
250 250
 						" OR info_status = 'offer' AND $public_access" : '').")".
251
-				                 " AND (info_access='public'".($has_private_access?" OR $has_private_access":'').')';
251
+								 " AND (info_access='public'".($has_private_access?" OR $has_private_access":'').')';
252 252
 			}
253 253
 			elseif ($filter != 'my' && $filter != 'responsible')	// none --> all entrys user has rights to see
254 254
 			{
Please login to merge, or discard this patch.
infolog/inc/class.infolog_export_ical.inc.php 1 patch
Indentation   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -109,8 +109,8 @@
 block discarded – undo
109 109
 	 */
110 110
 	public function get_selectors_etpl() {
111 111
 		return array(
112
-                        'name'  => 'infolog.export_csv_selectors',
113
-                        'content'       => 'search'
114
-                );
112
+						'name'  => 'infolog.export_csv_selectors',
113
+						'content'       => 'search'
114
+				);
115 115
 	}
116 116
 }
Please login to merge, or discard this patch.
infolog/inc/class.infolog_ui.inc.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -225,7 +225,7 @@
 block discarded – undo
225 225
 
226 226
 				if ($show_links != 'none' && $show_links != 'no_describtion' &&
227 227
 					$link['link_id'] != $info['info_link_id'] &&
228
-				    ($link['app'] != $action || $link['id'] != $action_id) &&
228
+					($link['app'] != $action || $link['id'] != $action_id) &&
229 229
 					($show_links == 'all' || ($show_links == 'links') === ($link['app'] != Link::VFS_APPNAME)))
230 230
 				{
231 231
 					$info['filelinks'][] = $link;
Please login to merge, or discard this patch.
infolog/inc/class.infolog_ical.inc.php 1 patch
Indentation   +16 added lines, -16 removed lines patch added patch discarded remove patch
@@ -67,10 +67,10 @@  discard block
 block discarded – undo
67 67
 	var $productName = '';
68 68
 
69 69
 	/**
70
-	* Shall we use the UID extensions of the description field?
71
-	*
72
-	* @var boolean
73
-	*/
70
+	 * Shall we use the UID extensions of the description field?
71
+	 *
72
+	 * @var boolean
73
+	 */
74 74
 	var $uidExtension = false;
75 75
 
76 76
 	/**
@@ -509,10 +509,10 @@  discard block
 block discarded – undo
509 509
 	 * @param boolean $merge =false	merge data with existing entry (no longer used)
510 510
 	 * @param int $user =null delegate new task to this account_id, default null
511 511
 	 * @param string $charset =null The encoding charset for $text. Defaults to
512
-     *                         utf-8 for new format, iso-8859-1 for old format.
513
-     * @param string $caldav_name =null CalDAV URL name-part for new entries
514
-     * @param array $callback_data =null array with callback and further parameters, first param is task to save
515
-     * 	signature array callback($task, $param1, ...)
512
+	 *                         utf-8 for new format, iso-8859-1 for old format.
513
+	 * @param string $caldav_name =null CalDAV URL name-part for new entries
514
+	 * @param array $callback_data =null array with callback and further parameters, first param is task to save
515
+	 * 	signature array callback($task, $param1, ...)
516 516
 	 * @return int|boolean integer info_id or false on error
517 517
 	 */
518 518
 	function importVTODO(&$_vcalData, $_taskID=-1, $merge=false, $user=null, $charset=null, $caldav_name=null,
@@ -597,7 +597,7 @@  discard block
 block discarded – undo
597 597
 	 * @param int $contentID =null 	infolog_id (or null, if unkown)
598 598
 	 * @param boolean $relax =false 	if true, a weaker match algorithm is used
599 599
 	 * @param string $charset  The encoding charset for $text. Defaults to
600
-     *                         utf-8 for new format, iso-8859-1 for old format.
600
+	 *                         utf-8 for new format, iso-8859-1 for old format.
601 601
 	 *
602 602
 	 * @return array of infolog_ids of matching entries
603 603
 	 */
@@ -642,8 +642,8 @@  discard block
 block discarded – undo
642 642
 	 * @param string $_vcalData 	VTODO data
643 643
 	 * @param int $_taskID =-1		infolog_id of the entry
644 644
 	 * @param string $charset  The encoding charset for $text. Defaults to
645
-     *                         utf-8 for new format, iso-8859-1 for old format.
646
-     *
645
+	 *                         utf-8 for new format, iso-8859-1 for old format.
646
+	 *
647 647
 	 * @return array infolog entry or false on error
648 648
 	 */
649 649
 	function vtodotoegw($_vcalData, $_taskID=-1, $charset=null)
@@ -1010,8 +1010,8 @@  discard block
 block discarded – undo
1010 1010
 	 * @param int $_noteID =-1 info_id, default -1 = new entry
1011 1011
 	 * @param boolean $merge =false	merge data with existing entry (no longer used)
1012 1012
 	 * @param string $charset  The encoding charset for $text. Defaults to
1013
-     *                         utf-8 for new format, iso-8859-1 for old format.
1014
-     *
1013
+	 *                         utf-8 for new format, iso-8859-1 for old format.
1014
+	 *
1015 1015
 	 * @return int|boolean integer info_id or false on error
1016 1016
 	 */
1017 1017
 	function importVNOTE(&$_vcalData, $_type, $_noteID=-1, $merge=false, $charset=null)
@@ -1045,7 +1045,7 @@  discard block
 block discarded – undo
1045 1045
 	 * @param int $contentID=null 	infolog_id (or null, if unkown)
1046 1046
 	 * @param boolean $relax=false 	if true, a weaker match algorithm is used
1047 1047
 	 * @param string $charset  The encoding charset for $text. Defaults to
1048
-     *                         utf-8 for new format, iso-8859-1 for old format.
1048
+	 *                         utf-8 for new format, iso-8859-1 for old format.
1049 1049
 	 *
1050 1050
 	 * @return infolog_id of a matching entry or false, if nothing was found
1051 1051
 	 */
@@ -1067,8 +1067,8 @@  discard block
 block discarded – undo
1067 1067
 	 * @param string $_type		content type (eg.g text/plain)
1068 1068
 	 * @param int $_noteID =-1	infolog_id of the entry
1069 1069
 	 * @param string $charset  The encoding charset for $text. Defaults to
1070
-     *                         utf-8 for new format, iso-8859-1 for old format.
1071
-     *
1070
+	 *                         utf-8 for new format, iso-8859-1 for old format.
1071
+	 *
1072 1072
 	 * @return array infolog entry or false on error
1073 1073
 	 */
1074 1074
 	function vnotetoegw($_data, $_type, $_noteID=-1, $charset=null)
Please login to merge, or discard this patch.
doc/rpm-build/header.inc.php 1 patch
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -2,7 +2,7 @@
 block discarded – undo
2 2
 // dummy setup file
3 3
 if (strpos($_SERVER['PHP_SELF'],'/setup/') === false)
4 4
 {
5
-        header('Location: /egroupware/setup/');
6
-        exit;
5
+		header('Location: /egroupware/setup/');
6
+		exit;
7 7
 }
8 8
 
Please login to merge, or discard this patch.
api/src/Vfs/Filesystem/StreamWrapper.php 1 patch
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -80,10 +80,10 @@
 block discarded – undo
80 80
  	 * Important: PHP 5.0 introduced a bug that wasn't fixed until 5.1: the return value has to be the oposite!
81 81
  	 *
82 82
  	 * if(version_compare(PHP_VERSION,'5.0','>=') && version_compare(PHP_VERSION,'5.1','<'))
83
-  	 * {
83
+ 	 * {
84 84
  	 * 		$eof = !$eof;
85 85
  	 * }
86
-  	 *
86
+ 	 *
87 87
  	 * @return boolean true if the read/write position is at the end of the stream and no more data availible, false otherwise
88 88
  	 */
89 89
 	function stream_eof ( );
Please login to merge, or discard this patch.
admin/inc/class.admin_export_groups_csv.inc.php 1 patch
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -125,8 +125,8 @@
 block discarded – undo
125 125
 	}
126 126
 
127 127
 	public static function get_mimetype() {
128
-                return 'text/csv';
129
-        }
128
+				return 'text/csv';
129
+		}
130 130
 
131 131
 	/**
132 132
 	 * return html for options.
Please login to merge, or discard this patch.
admin/inc/class.admin_export_users_csv.inc.php 1 patch
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -125,8 +125,8 @@
 block discarded – undo
125 125
 	}
126 126
 
127 127
 	public static function get_mimetype() {
128
-                return 'text/csv';
129
-        }
128
+				return 'text/csv';
129
+		}
130 130
 
131 131
 	/**
132 132
 	 * return html for options.
Please login to merge, or discard this patch.