Completed
Push — master ( 476d4b...19a789 )
by Ralf
39:41 queued 19:06
created
addressbook/index.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -25,4 +25,4 @@
 block discarded – undo
25 25
 	unset($old_state['advanced_search']);
26 26
 	Api\Cache::setSession('addressbook', 'index', $old_state);
27 27
 }
28
-Api\Egw::redirect_link('/index.php','menuaction=addressbook.addressbook_ui.index');
28
+Api\Egw::redirect_link('/index.php', 'menuaction=addressbook.addressbook_ui.index');
Please login to merge, or discard this patch.
remote.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -34,7 +34,7 @@  discard block
 block discarded – undo
34 34
 {
35 35
 	if (isset($_GET['auth']))
36 36
 	{
37
-		list($_SERVER['PHP_AUTH_USER'],$_SERVER['PHP_AUTH_PW']) = explode(':',base64_decode($_GET['auth']),2);
37
+		list($_SERVER['PHP_AUTH_USER'], $_SERVER['PHP_AUTH_PW']) = explode(':', base64_decode($_GET['auth']), 2);
38 38
 	}
39 39
 	return Api\Header\Authenticate::autocreate_session_callback($account);
40 40
 }
@@ -45,8 +45,8 @@  discard block
 block discarded – undo
45 45
 		'noheader'  => True,
46 46
 		'currentapp' => preg_match('|/remote.php/webdav/apps/([A-Za-z0-9_-]+)/|', $_SERVER['REQUEST_URI'], $matches) ? $matches[1] : 'filemanager',
47 47
 		'autocreate_session_callback' => 'check_access',
48
-		'no_exception_handler' => 'basic_auth',	// we use a basic auth exception handler (sends exception message as basic auth realm)
49
-		'auth_realm' => 'EGroupware WebDAV server',	// cant use Vfs\WebDAV::REALM as autoloading and include path not yet setup!
48
+		'no_exception_handler' => 'basic_auth', // we use a basic auth exception handler (sends exception message as basic auth realm)
49
+		'auth_realm' => 'EGroupware WebDAV server', // cant use Vfs\WebDAV::REALM as autoloading and include path not yet setup!
50 50
 	)
51 51
 );
52 52
 
@@ -74,12 +74,12 @@  discard block
 block discarded – undo
74 74
 
75 75
 // temporary mount ownCloud default /clientsync as /home/$user, if not explicitly mounted
76 76
 // so ownCloud dir contains users home-dir by default
77
-if (strpos($_SERVER['REQUEST_URI'],'/remote.php/webdav/clientsync') !== false &&
78
-	($fstab=Vfs::mount()) && !isset($fstab['/clientsync']))
77
+if (strpos($_SERVER['REQUEST_URI'], '/remote.php/webdav/clientsync') !== false &&
78
+	($fstab = Vfs::mount()) && !isset($fstab['/clientsync']))
79 79
 {
80 80
 	$is_root_backup = Vfs::$is_root;
81 81
 	Vfs::$is_root = true;
82
-	$ok = Vfs::mount($url='vfs://default/home/$user', $clientsync='/clientsync', null, false);
82
+	$ok = Vfs::mount($url = 'vfs://default/home/$user', $clientsync = '/clientsync', null, false);
83 83
 	Vfs::$is_root = $is_root_backup;
84 84
 	//error_log("mounting ownCloud default '$clientsync' as '$url' ".($ok ? 'successful' : 'failed!'));
85 85
 }
Please login to merge, or discard this patch.
index.php 1 patch
Spacing   +25 added lines, -25 removed lines patch added patch discarded remove patch
@@ -24,13 +24,13 @@  discard block
 block discarded – undo
24 24
 }
25 25
 
26 26
 // forward for not existing or empty header to setup
27
-if(!file_exists('header.inc.php') || !filesize('header.inc.php'))
27
+if (!file_exists('header.inc.php') || !filesize('header.inc.php'))
28 28
 {
29 29
 	Header('Location: setup/index.php');
30 30
 	exit;
31 31
 }
32 32
 
33
-if(isset($_GET['hasupdates']) && $_GET['hasupdates'] == 'yes')
33
+if (isset($_GET['hasupdates']) && $_GET['hasupdates'] == 'yes')
34 34
 {
35 35
 	$hasupdates = True;
36 36
 }
@@ -38,20 +38,20 @@  discard block
 block discarded – undo
38 38
 /*
39 39
 	This is the menuaction driver for the multi-layered design
40 40
 */
41
-if(isset($_GET['menuaction']) && preg_match('/^[A-Za-z0-9_]+\.[A-Za-z0-9_\\\\]+\.[A-Za-z0-9_]+$/',$_GET['menuaction']))
41
+if (isset($_GET['menuaction']) && preg_match('/^[A-Za-z0-9_]+\.[A-Za-z0-9_\\\\]+\.[A-Za-z0-9_]+$/', $_GET['menuaction']))
42 42
 {
43
-	list($app,$class,$method) = explode('.',$_GET['menuaction']);
43
+	list($app, $class, $method) = explode('.', $_GET['menuaction']);
44 44
 
45 45
 	// check if autoloadable class belongs to given app
46 46
 	if (substr($class, 0, 11) == 'EGroupware\\')
47 47
 	{
48 48
 		list(,$app_from_class) = explode('\\', strtolower($class));
49 49
 	}
50
-	elseif(strpos($class, '_') !== false)
50
+	elseif (strpos($class, '_') !== false)
51 51
 	{
52 52
 		list($app_from_class) = explode('_', $class);
53 53
 	}
54
-	if(!$app || !$class || !$method || isset($app_from_class) &&
54
+	if (!$app || !$class || !$method || isset($app_from_class) &&
55 55
 		isset($GLOBALS['egw_info']['apps'][$app_from_class]) && $app_from_class != $app)
56 56
 	{
57 57
 		$invalid_data = True;
@@ -63,7 +63,7 @@  discard block
 block discarded – undo
63 63
 	$invalid_data = True;
64 64
 }
65 65
 //error_log(__METHOD__."$app,$class,$method");
66
-if($app == 'phpgwapi')
66
+if ($app == 'phpgwapi')
67 67
 {
68 68
 	$app = 'api';
69 69
 	$api_requested = True;
@@ -81,9 +81,9 @@  discard block
 block discarded – undo
81 81
 // user changed timezone
82 82
 if (isset($_GET['tz']))
83 83
 {
84
-	Api\DateTime::setUserPrefs($_GET['tz']);	// throws exception, if tz is invalid
84
+	Api\DateTime::setUserPrefs($_GET['tz']); // throws exception, if tz is invalid
85 85
 
86
-	$GLOBALS['egw']->preferences->add('common','tz',$_GET['tz']);
86
+	$GLOBALS['egw']->preferences->add('common', 'tz', $_GET['tz']);
87 87
 	$GLOBALS['egw']->preferences->save_repository();
88 88
 
89 89
 	if (($referer = Api\Header\Referer::get()))
@@ -94,30 +94,30 @@  discard block
 block discarded – undo
94 94
 
95 95
 // 	Check if we are using windows or normal webpage
96 96
 $windowed = false;
97
-$tpl_info = EGW_SERVER_ROOT . '/phpgwapi/templates/' . basename($GLOBALS['egw_info']['user']['preferences']['common']['template_set']) . '/setup/setup.inc.php';
97
+$tpl_info = EGW_SERVER_ROOT.'/phpgwapi/templates/'.basename($GLOBALS['egw_info']['user']['preferences']['common']['template_set']).'/setup/setup.inc.php';
98 98
 if (!file_exists($tpl_info))
99 99
 {
100
-	$tpl_info = EGW_SERVER_ROOT.'/'.basename($GLOBALS['egw_info']['user']['preferences']['common']['template_set']) . '/setup/setup.inc.php';
100
+	$tpl_info = EGW_SERVER_ROOT.'/'.basename($GLOBALS['egw_info']['user']['preferences']['common']['template_set']).'/setup/setup.inc.php';
101 101
 }
102
-if(@file_exists($tpl_info))
102
+if (@file_exists($tpl_info))
103 103
 {
104 104
 	include_once($tpl_info);
105
-	if($GLOBALS['egw_info']['template'][$GLOBALS['egw_info']['user']['preferences']['common']['template_set']]['windowed'])
105
+	if ($GLOBALS['egw_info']['template'][$GLOBALS['egw_info']['user']['preferences']['common']['template_set']]['windowed'])
106 106
 	{
107 107
 		$windowed = true;
108 108
 	}
109 109
 }
110 110
 
111 111
 
112
-if($app == 'api' && !$class && !$api_requested && !($windowed && $_GET['cd'] == 'yes' && !Api\Header\UserAgent::mobile()) && $GLOBALS['egw_info']['user']['preferences']['common']['template_set'] == 'idots')
112
+if ($app == 'api' && !$class && !$api_requested && !($windowed && $_GET['cd'] == 'yes' && !Api\Header\UserAgent::mobile()) && $GLOBALS['egw_info']['user']['preferences']['common']['template_set'] == 'idots')
113 113
 {
114 114
 	if ($GLOBALS['egw_info']['server']['force_default_app'] && $GLOBALS['egw_info']['server']['force_default_app'] != 'user_choice')
115 115
 	{
116 116
 		$GLOBALS['egw_info']['user']['preferences']['common']['default_app'] = $GLOBALS['egw_info']['server']['force_default_app'];
117 117
 	}
118
-	if($GLOBALS['egw_info']['user']['preferences']['common']['default_app'] && !$hasupdates)
118
+	if ($GLOBALS['egw_info']['user']['preferences']['common']['default_app'] && !$hasupdates)
119 119
 	{
120
-		Egw::redirect(Framework::index($GLOBALS['egw_info']['user']['preferences']['common']['default_app']),$GLOBALS['egw_info']['user']['preferences']['common']['default_app']);
120
+		Egw::redirect(Framework::index($GLOBALS['egw_info']['user']['preferences']['common']['default_app']), $GLOBALS['egw_info']['user']['preferences']['common']['default_app']);
121 121
 	}
122 122
 	else
123 123
 	{
@@ -125,7 +125,7 @@  discard block
 block discarded – undo
125 125
 	}
126 126
 }
127 127
 
128
-if($windowed && $_GET['cd'] == 'yes')
128
+if ($windowed && $_GET['cd'] == 'yes')
129 129
 {
130 130
 	$GLOBALS['egw_info']['flags'] = array(
131 131
 		'noheader'   => False,
@@ -137,7 +137,7 @@  discard block
 block discarded – undo
137 137
 }
138 138
 else
139 139
 {
140
-	if($api_requested)
140
+	if ($api_requested)
141 141
 	{
142 142
 		$app = 'phpgwapi';
143 143
 	}
@@ -150,7 +150,7 @@  discard block
 block discarded – undo
150 150
 	{
151 151
 		$obj = CreateObject($app.'.'.$class);
152 152
 	}
153
-	if((is_array($obj->public_functions) && $obj->public_functions[$method]) && !$invalid_data)
153
+	if ((is_array($obj->public_functions) && $obj->public_functions[$method]) && !$invalid_data)
154 154
 	{
155 155
 		$obj->$method();
156 156
 		unset($app);
@@ -161,9 +161,9 @@  discard block
 block discarded – undo
161 161
 	}
162 162
 	else
163 163
 	{
164
-		if(!$app || !$class || !$method || $invalid_data)
164
+		if (!$app || !$class || !$method || $invalid_data)
165 165
 		{
166
-			if(@is_object($GLOBALS['egw']->log))
166
+			if (@is_object($GLOBALS['egw']->log))
167 167
 			{
168 168
 				$GLOBALS['egw']->log->message(array(
169 169
 					'text' => 'W-BadmenuactionVariable, menuaction missing or corrupt: %1',
@@ -174,9 +174,9 @@  discard block
 block discarded – undo
174 174
 			}
175 175
 		}
176 176
 
177
-		if(!is_array($GLOBALS[$class]->public_functions) || !$GLOBALS[$class]->public_functions[$method] && $method)
177
+		if (!is_array($GLOBALS[$class]->public_functions) || !$GLOBALS[$class]->public_functions[$method] && $method)
178 178
 		{
179
-			if(@is_object($GLOBALS['egw']->log))
179
+			if (@is_object($GLOBALS['egw']->log))
180 180
 			{
181 181
 				$GLOBALS['egw']->log->message(array(
182 182
 					'text' => 'W-BadmenuactionVariable, attempted to access private method: %1',
@@ -186,7 +186,7 @@  discard block
 block discarded – undo
186 186
 				));
187 187
 			}
188 188
 		}
189
-		if(@is_object($GLOBALS['egw']->log))
189
+		if (@is_object($GLOBALS['egw']->log))
190 190
 		{
191 191
 			$GLOBALS['egw']->log->commit();
192 192
 		}
@@ -194,7 +194,7 @@  discard block
 block discarded – undo
194 194
 		$GLOBALS['egw']->redirect_link('/home/index.php');
195 195
 	}
196 196
 
197
-	if(!isset($GLOBALS['egw_info']['nofooter']))
197
+	if (!isset($GLOBALS['egw_info']['nofooter']))
198 198
 	{
199 199
 		echo $GLOBALS['egw']->framework->footer();
200 200
 	}
Please login to merge, or discard this patch.
infolog/inc/class.infolog_egw_record.inc.php 1 patch
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -26,8 +26,8 @@  discard block
 block discarded – undo
26 26
 	static $types = array(
27 27
 		'select' => array('info_type', 'info_status', 'info_priority', 'pl_id'),
28 28
                 'select-cat' => array('info_cat'),
29
-                'select-account' => array('info_owner','info_responsible','info_modifier'),
30
-                'date-time' => array('info_startdate', 'info_enddate','info_datecompleted', 'info_datemodified','info_created'),
29
+                'select-account' => array('info_owner', 'info_responsible', 'info_modifier'),
30
+                'date-time' => array('info_startdate', 'info_enddate', 'info_datecompleted', 'info_datemodified', 'info_created'),
31 31
 		'links' => array('info_link_id'),
32 32
         );
33 33
 
@@ -37,10 +37,10 @@  discard block
 block discarded – undo
37 37
 	 *
38 38
 	 * @param string $_identifier
39 39
 	 */
40
-	public function __construct( $_identifier='' ){
40
+	public function __construct($_identifier = '') {
41 41
 		$this->identifier = $_identifier;
42
-		if(self::$bo == null) self::$bo = new infolog_bo();
43
-		if($_identifier) {
42
+		if (self::$bo == null) self::$bo = new infolog_bo();
43
+		if ($_identifier) {
44 44
 			$rec = self::$bo->read($this->identifier);
45 45
 			if (is_array($rec)) $this->set_record($rec);
46 46
 		}
@@ -95,7 +95,7 @@  discard block
 block discarded – undo
95 95
 	 * @todo add some checks
96 96
 	 * @return void
97 97
 	 */
98
-	public function set_record(array $_record){
98
+	public function set_record(array $_record) {
99 99
 		$this->record = $_record;
100 100
 	}
101 101
 
@@ -133,7 +133,7 @@  discard block
 block discarded – undo
133 133
 	 *
134 134
 	 * @return string identifier
135 135
 	 */
136
-	public function save ( $_dst_identifier ) {
136
+	public function save($_dst_identifier) {
137 137
 
138 138
 	}
139 139
 
@@ -143,7 +143,7 @@  discard block
 block discarded – undo
143 143
 	 * @param string $_dst_identifier
144 144
 	 * @return string dst_identifier
145 145
 	 */
146
-	public function copy ( $_dst_identifier ) {
146
+	public function copy($_dst_identifier) {
147 147
 
148 148
 	}
149 149
 
@@ -154,7 +154,7 @@  discard block
 block discarded – undo
154 154
 	 * @param string $_dst_identifier
155 155
 	 * @return string dst_identifier
156 156
 	 */
157
-	public function move ( $_dst_identifier ) {
157
+	public function move($_dst_identifier) {
158 158
 
159 159
 	}
160 160
 
@@ -162,7 +162,7 @@  discard block
 block discarded – undo
162 162
 	 * delets current record from backend
163 163
 	 *
164 164
 	 */
165
-	public function delete () {
165
+	public function delete() {
166 166
 
167 167
 	}
168 168
 
Please login to merge, or discard this patch.
infolog/inc/class.infolog_favorite_portlet.inc.php 1 patch
Spacing   +22 added lines, -22 removed lines patch added patch discarded remove patch
@@ -32,7 +32,7 @@  discard block
 block discarded – undo
32 32
 		$context['appname'] = 'infolog';
33 33
 
34 34
 		// Let parent handle the basic stuff
35
-		parent::__construct($context,$need_reload);
35
+		parent::__construct($context, $need_reload);
36 36
 
37 37
 		$ui = new infolog_ui();
38 38
 
@@ -73,7 +73,7 @@  discard block
 block discarded – undo
73 73
 			if ($tpl->read('infolog.index.rows.'.$query['col_filter']['info_type']))
74 74
 			{
75 75
 				$query['template'] = $tpl->name;
76
-				$query['custom_fields'] = true;	// read the custom fields too
76
+				$query['custom_fields'] = true; // read the custom fields too
77 77
 			}
78 78
 		}
79 79
 		$ui = new infolog_ui();
@@ -105,27 +105,27 @@  discard block
 block discarded – undo
105 105
 				// Some processing to add values in for links and cats
106 106
 				$multi_action = $values['nm']['multi_action'];
107 107
 				// Action has an additional action - add / delete, etc.  Buttons named <multi-action>_action[action_name]
108
-				if(in_array($multi_action, array('link', 'responsible')))
108
+				if (in_array($multi_action, array('link', 'responsible')))
109 109
 				{
110 110
 					// eTemplate ignores the _popup namespace, but et2 doesn't
111
-					if($values[$multi_action.'_popup'])
111
+					if ($values[$multi_action.'_popup'])
112 112
 					{
113
-						$popup =& $values[$multi_action.'_popup'];
113
+						$popup = & $values[$multi_action.'_popup'];
114 114
 					}
115 115
 					else
116 116
 					{
117
-						$popup =& $values;
117
+						$popup = & $values;
118 118
 					}
119
-					$values['nm']['multi_action'] .= '_' . key($popup[$multi_action . '_action']);
120
-					if($multi_action == 'link')
119
+					$values['nm']['multi_action'] .= '_'.key($popup[$multi_action.'_action']);
120
+					if ($multi_action == 'link')
121 121
 					{
122
-						$popup[$multi_action] = $popup['link']['app'] . ':'.$popup['link']['id'];
122
+						$popup[$multi_action] = $popup['link']['app'].':'.$popup['link']['id'];
123 123
 					}
124
-					else if(is_array($popup[$multi_action]))
124
+					else if (is_array($popup[$multi_action]))
125 125
 					{
126
-						$popup[$multi_action] = implode(',',$popup[$multi_action]);
126
+						$popup[$multi_action] = implode(',', $popup[$multi_action]);
127 127
 					}
128
-					$values['nm']['multi_action'] .= '_' . $popup[$multi_action];
128
+					$values['nm']['multi_action'] .= '_'.$popup[$multi_action];
129 129
 					unset($values[$multi_action.'_popup']);
130 130
 					unset($values[$multi_action]);
131 131
 				}
@@ -133,24 +133,24 @@  discard block
 block discarded – undo
133 133
 				if ($ui->action($values['nm']['multi_action'], $values['nm']['selected'], $values['nm']['select_all'],
134 134
 					$success, $failed, $action_msg, $values['nm'], $msg, $values['nm']['checkboxes']['no_notifications']))
135 135
 				{
136
-					$msg .= lang('%1 entries %2',$success,$action_msg);
137
-					Api\Json\Response::get()->apply('egw.message',array($msg,'success'));
138
-					foreach($values['nm']['selected'] as &$id)
136
+					$msg .= lang('%1 entries %2', $success, $action_msg);
137
+					Api\Json\Response::get()->apply('egw.message', array($msg, 'success'));
138
+					foreach ($values['nm']['selected'] as &$id)
139 139
 					{
140 140
 						$id = 'infolog::'.$id;
141 141
 					}
142 142
 					// Directly request an update - this will get infolog tab too
143
-					Api\Json\Response::get()->apply('egw.dataRefreshUIDs',array($values['nm']['selected']));
143
+					Api\Json\Response::get()->apply('egw.dataRefreshUIDs', array($values['nm']['selected']));
144 144
 				}
145
-				elseif(is_null($msg))
145
+				elseif (is_null($msg))
146 146
 				{
147
-					$msg .= lang('%1 entries %2, %3 failed because of insufficent rights !!!',$success,$action_msg,$failed);
148
-					Api\Json\Response::get()->apply('egw.message',array($msg,'error'));
147
+					$msg .= lang('%1 entries %2, %3 failed because of insufficent rights !!!', $success, $action_msg, $failed);
148
+					Api\Json\Response::get()->apply('egw.message', array($msg, 'error'));
149 149
 				}
150
-				elseif($msg)
150
+				elseif ($msg)
151 151
 				{
152
-					$msg .= "\n".lang('%1 entries %2, %3 failed.',$success,$action_msg,$failed);
153
-					Api\Json\Response::get()->apply('egw.message',array($msg,'error'));
152
+					$msg .= "\n".lang('%1 entries %2, %3 failed.', $success, $action_msg, $failed);
153
+					Api\Json\Response::get()->apply('egw.message', array($msg, 'error'));
154 154
 				}
155 155
 				unset($values['nm']['multi_action']);
156 156
 				unset($values['nm']['select_all']);
Please login to merge, or discard this patch.
infolog/inc/class.infolog_wizard_export_csv.inc.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -21,13 +21,13 @@
 block discarded – undo
21 21
 		$bo = new infolog_tracking(new infolog_bo());
22 22
 		$this->export_fields = array('info_id' => 'Infolog ID', 'pm_id' => 'Project ID', 'project' => 'Project Name') + $bo->field2label;
23 23
 		// Add in created date, in the appropriate place
24
-		$first = array_splice($this->export_fields, 0, array_search('info_datemodified',array_keys($this->export_fields)));
24
+		$first = array_splice($this->export_fields, 0, array_search('info_datemodified', array_keys($this->export_fields)));
25 25
 		$this->export_fields = array_merge($first, array('info_created'=>'creation'), $this->export_fields);
26 26
 
27 27
 		// Custom fields
28 28
 		unset($this->export_fields['custom']); // Heading, not a real field
29 29
 		$custom = Api\Storage\Customfields::get('infolog', true);
30
-		foreach($custom as $name => $data) {
30
+		foreach ($custom as $name => $data) {
31 31
 			$this->export_fields['#'.$name] = $data['label'];
32 32
 		}
33 33
 	}
Please login to merge, or discard this patch.
infolog/inc/class.infolog_export_ical.inc.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -23,7 +23,7 @@  discard block
 block discarded – undo
23 23
 	 *
24 24
 	 * @param egw_record $_definition
25 25
 	 */
26
-	public function export( $_stream, importexport_definition $_definition) {
26
+	public function export($_stream, importexport_definition $_definition) {
27 27
 		$options = $_definition->plugin_options;
28 28
 		$this->bo = new infolog_bo();
29 29
 
@@ -32,7 +32,7 @@  discard block
 block discarded – undo
32 32
 
33 33
 		$ids = array();
34 34
 		$query = array();
35
-		switch($options['selection'])
35
+		switch ($options['selection'])
36 36
 		{
37 37
 			case 'search':
38 38
 				$query = array_merge(Api\Cache::getSession('infolog', 'session_data'), $query);
@@ -44,7 +44,7 @@  discard block
 block discarded – undo
44 44
 
45 45
 				break;
46 46
 			default:
47
-				$ids = $this->selection = explode(',',$options['selection']);
47
+				$ids = $this->selection = explode(',', $options['selection']);
48 48
 				break;
49 49
 		}
50 50
 
@@ -89,7 +89,7 @@  discard block
 block discarded – undo
89 89
 	 */
90 90
 	public function get_filename()
91 91
 	{
92
-		if(is_array($this->selection) && count($this->selection) == 1)
92
+		if (is_array($this->selection) && count($this->selection) == 1)
93 93
 		{
94 94
 			return $this->bo->link_title(current($this->selection));
95 95
 		}
Please login to merge, or discard this patch.
infolog/inc/class.infolog_wizard_import_infologs_csv.inc.php 1 patch
Spacing   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -34,7 +34,7 @@  discard block
 block discarded – undo
34 34
 		// List each custom field
35 35
 		unset($this->mapping_fields['custom']);
36 36
 		$custom = Api\Storage\Customfields::get('infolog');
37
-		foreach($custom as $name => $data) {
37
+		foreach ($custom as $name => $data) {
38 38
 			$this->mapping_fields['#'.$name] = $data['label'];
39 39
 		}
40 40
 
@@ -62,20 +62,20 @@  discard block
 block discarded – undo
62 62
 	# Skipped for now (or forever)
63 63
 	function wizard_step60(&$content, &$sel_options, &$readonlys, &$preserv)
64 64
 	{
65
-		if($this->debug) error_log(__METHOD__.'->$content '.print_r($content,true));
65
+		if ($this->debug) error_log(__METHOD__.'->$content '.print_r($content, true));
66 66
 		unset($content['no_owner_map']);
67 67
 		// Check that record owner has access
68 68
 		$access = true;
69
-		if($content['record_owner'])
69
+		if ($content['record_owner'])
70 70
 		{
71 71
 			$bo = new infolog_bo();
72
-			$access = $bo->check_access(0,Acl::EDIT, $content['record_owner']);
72
+			$access = $bo->check_access(0, Acl::EDIT, $content['record_owner']);
73 73
 		}
74 74
 
75 75
 		// return from step60
76 76
 		if ($content['step'] == 'wizard_step60')
77 77
 		{
78
-			if(!$access) {
78
+			if (!$access) {
79 79
 				$step = $content['step'];
80 80
 				unset($content['step']);
81 81
 				return $step;
@@ -83,34 +83,34 @@  discard block
 block discarded – undo
83 83
 			switch (array_search('pressed', $content['button']))
84 84
 			{
85 85
 				case 'next':
86
-					return $GLOBALS['egw']->importexport_definitions_ui->get_step($content['step'],1);
86
+					return $GLOBALS['egw']->importexport_definitions_ui->get_step($content['step'], 1);
87 87
 				case 'previous' :
88
-					return $GLOBALS['egw']->importexport_definitions_ui->get_step($content['step'],-1);
88
+					return $GLOBALS['egw']->importexport_definitions_ui->get_step($content['step'], -1);
89 89
 				case 'finish':
90 90
 					return 'wizard_finish';
91 91
 				default :
92
-					return $this->wizard_step60($content,$sel_options,$readonlys,$preserv);
92
+					return $this->wizard_step60($content, $sel_options, $readonlys, $preserv);
93 93
 			}
94 94
 		}
95 95
 		// init step60
96 96
 		else
97 97
 		{
98 98
 			$content['msg'] = $this->steps['wizard_step60'];
99
-			if(!$access) {
100
-				$content['msg'] .= "\n* " . lang('Owner does not have edit rights');
99
+			if (!$access) {
100
+				$content['msg'] .= "\n* ".lang('Owner does not have edit rights');
101 101
 			}
102 102
 			$content['step'] = 'wizard_step60';
103
-			if(!array_key_exists($content['record_owner']) && $content['plugin_options']) {
103
+			if (!array_key_exists($content['record_owner']) && $content['plugin_options']) {
104 104
 				$content['record_owner'] = $content['plugin_options']['record_owner'];
105 105
 			}
106
-			if(!array_key_exists($content['owner_from_csv']) && $content['plugin_options']) {
106
+			if (!array_key_exists($content['owner_from_csv']) && $content['plugin_options']) {
107 107
 				$content['owner_from_csv'] = $content['plugin_options']['owner_from_csv'];
108 108
 			}
109
-			if(!array_key_exists($content['change_owner']) && $content['plugin_options']) {
109
+			if (!array_key_exists($content['change_owner']) && $content['plugin_options']) {
110 110
 				$content['change_owner'] = $content['plugin_options']['change_owner'];
111 111
 			}
112 112
 
113
-			if(!in_array('info_owner', $content['field_mapping'])) {
113
+			if (!in_array('info_owner', $content['field_mapping'])) {
114 114
 				$content['no_owner_map'] = true;
115 115
 			}
116 116
 
Please login to merge, or discard this patch.
infolog/index.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -23,10 +23,10 @@
 block discarded – undo
23 23
 if ($setup_info['infolog']['version'] != $GLOBALS['egw_info']['apps']['infolog']['version'])
24 24
 {
25 25
 	$GLOBALS['egw']->framework->render('<p style="text-align: center; color:red; font-weight: bold;">'.lang('Your database is NOT up to date (%1 vs. %2), please run %3setup%4 to update your database.',
26
-		$setup_info['infolog']['version'],$GLOBALS['egw_info']['apps']['infolog']['version'],
27
-		'<a href="../setup/">','</a>')."</p>\n");
26
+		$setup_info['infolog']['version'], $GLOBALS['egw_info']['apps']['infolog']['version'],
27
+		'<a href="../setup/">', '</a>')."</p>\n");
28 28
 	exit();
29 29
 }
30 30
 unset($setup_info);
31 31
 
32
-ExecMethod('infolog.infolog_ui.index','reset_action_view');
32
+ExecMethod('infolog.infolog_ui.index', 'reset_action_view');
Please login to merge, or discard this patch.