Completed
Push — master ( 476d4b...19a789 )
by Ralf
39:41 queued 19:06
created
notifications/inc/class.notifications_jdesk_ajax.inc.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -133,11 +133,11 @@  discard block
 block discarded – undo
133 133
 	{
134 134
 		if ($notify_id)
135 135
 		{
136
-			$this->db->delete(self::_notification_table,array(
136
+			$this->db->delete(self::_notification_table, array(
137 137
 				'notify_id' => $notify_id,
138 138
 				'account_id' => $this->recipient->account_id,
139 139
 				'notify_type' => self::_type
140
-			),__LINE__,__FILE__,self::_appname);
140
+			), __LINE__, __FILE__, self::_appname);
141 141
 		}
142 142
 	}
143 143
 
@@ -148,7 +148,7 @@  discard block
 block discarded – undo
148 148
 	 */
149 149
 	private function get_egwpopup($browserNotify = false)
150 150
 	{
151
-		unset($browserNotify);	// not used
151
+		unset($browserNotify); // not used
152 152
 
153 153
 		$message = '';
154 154
 
@@ -156,9 +156,9 @@  discard block
 block discarded – undo
156 156
 				'account_id' => $this->recipient->account_id,
157 157
 				'notify_type' => self::_type
158 158
 			),
159
-			__LINE__,__FILE__,false,'',self::_appname);
159
+			__LINE__, __FILE__, false, '', self::_appname);
160 160
 
161
-		if( $rs->NumRows() > 0 )
161
+		if ($rs->NumRows() > 0)
162 162
 		{
163 163
 			foreach ($rs as $notification)
164 164
 			{
@@ -170,7 +170,7 @@  discard block
 block discarded – undo
170 170
 				$this->response->data($jmessage);
171 171
 			}
172 172
 
173
-			switch( $this->preferences[self::_appname]['egwpopup_verbosity'] )
173
+			switch ($this->preferences[self::_appname]['egwpopup_verbosity'])
174 174
 			{
175 175
 				case 'low':
176 176
 
Please login to merge, or discard this patch.
notifications/inc/hook_admin.inc.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -11,9 +11,9 @@
 block discarded – undo
11 11
 
12 12
 use EGroupware\Api\Egw;
13 13
 
14
-$file = Array(	'Site Configuration' => Egw::link('/index.php', array(
14
+$file = Array('Site Configuration' => Egw::link('/index.php', array(
15 15
 	'menuaction'	=> 'admin.admin_config.index',
16 16
 	'appname'		=> $appname,
17 17
 	'ajax'          => 'true',
18 18
 )));
19
-display_section($appname,$file);
19
+display_section($appname, $file);
Please login to merge, or discard this patch.
status.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -14,7 +14,7 @@
 block discarded – undo
14 14
  * @version $Id$
15 15
  */
16 16
 // forward for not existing or empty header to setup
17
-if(!file_exists('header.inc.php') || !filesize('header.inc.php'))
17
+if (!file_exists('header.inc.php') || !filesize('header.inc.php'))
18 18
 {
19 19
 	Header('Location: setup/index.php');
20 20
 	exit;
Please login to merge, or discard this patch.
webdav.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -37,7 +37,7 @@  discard block
 block discarded – undo
37 37
 {
38 38
 	if (isset($_GET['auth']))
39 39
 	{
40
-		list($_SERVER['PHP_AUTH_USER'],$_SERVER['PHP_AUTH_PW']) = explode(':',base64_decode($_GET['auth']),2);
40
+		list($_SERVER['PHP_AUTH_USER'], $_SERVER['PHP_AUTH_PW']) = explode(':', base64_decode($_GET['auth']), 2);
41 41
 	}
42 42
 	return Api\Header\Authenticate::autocreate_session_callback($account);
43 43
 }
@@ -48,8 +48,8 @@  discard block
 block discarded – undo
48 48
 		'noheader'  => True,
49 49
 		'currentapp' => preg_match('|/webdav.php/apps/([A-Za-z0-9_-]+)/|', $_SERVER['REQUEST_URI'], $matches) ? $matches[1] : 'filemanager',
50 50
 		'autocreate_session_callback' => 'check_access',
51
-		'no_exception_handler' => 'basic_auth',	// we use a basic auth exception handler (sends exception message as basic auth realm)
52
-		'auth_realm' => 'EGroupware WebDAV server',	// cant use Vfs\WebDAV::REALM as autoloading and include path not yet setup!
51
+		'no_exception_handler' => 'basic_auth', // we use a basic auth exception handler (sends exception message as basic auth realm)
52
+		'auth_realm' => 'EGroupware WebDAV server', // cant use Vfs\WebDAV::REALM as autoloading and include path not yet setup!
53 53
 	)
54 54
 );
55 55
 
Please login to merge, or discard this patch.
mail/inc/class.mail_wizard.inc.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -32,7 +32,7 @@
 block discarded – undo
32 32
 		parent::__construct();
33 33
 
34 34
 		// need emailadmin's app.css file
35
-		Framework::includeCSS('admin','app');
35
+		Framework::includeCSS('admin', 'app');
36 36
 
37 37
 		// and translations
38 38
 		Api\Translation::add_app('admin');
Please login to merge, or discard this patch.
pixelegg/stylesheet2svg.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -32,11 +32,11 @@  discard block
 block discarded – undo
32 32
 }
33 33
 if ($args[0] == '-c')
34 34
 {
35
-	$color = explode(',',$args[1]);
35
+	$color = explode(',', $args[1]);
36 36
 	array_shift($args);
37 37
 	array_shift($args);
38 38
 }
39
-foreach($args as $path)
39
+foreach ($args as $path)
40 40
 {
41 41
 	if (!preg_match('|^([^/]+)/.*/(.*).svg$|', $path, $matches) || !($svg = file_get_contents($path)))
42 42
 	{
@@ -53,11 +53,11 @@  discard block
 block discarded – undo
53 53
 	$svg = preg_replace('/(<svg.*) id="[^"]+"/', '\\1 id="'.$id.'"', $svg);
54 54
 	
55 55
 	// Replace fill color with color[0]
56
-	$svg = preg_replace('/(<.*) fill="[^"]*"/','\\1 fill="'.$color[0] .'"', $svg);
56
+	$svg = preg_replace('/(<.*) fill="[^"]*"/', '\\1 fill="'.$color[0].'"', $svg);
57 57
 	// Replace stroke color with color[1]
58
-	$svg = preg_replace('/(<.*) stroke="[^"]*"/', '\\1 stroke="'.$color[1] .'"', $svg);
58
+	$svg = preg_replace('/(<.*) stroke="[^"]*"/', '\\1 stroke="'.$color[1].'"', $svg);
59 59
 	
60
-	error_log(__METHOD__."svg: ". var_dump($svg));
60
+	error_log(__METHOD__."svg: ".var_dump($svg));
61 61
 	// store image again
62 62
 	file_put_contents($path, $svg);
63 63
 	echo "$path: added $style_url and id=\"$id\"\n";
@@ -69,7 +69,7 @@  discard block
 block discarded – undo
69 69
 	array_pop($i_parts);
70 70
 	$rel_parts = $s_parts = explode('/', $stylesheet);
71 71
 
72
-	foreach($i_parts as $n => $i_part)
72
+	foreach ($i_parts as $n => $i_part)
73 73
 	{
74 74
 		if (isset($s_parts[$n]) && $s_parts[$n] === $i_part)
75 75
 		{
Please login to merge, or discard this patch.
resources/sitemgr/class.module_resources_reservation.inc.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -26,7 +26,7 @@  discard block
 block discarded – undo
26 26
 		$categories = new Api\Categories('', 'resources');
27 27
 		$cat_list = $categories->return_sorted_array();
28 28
 		$cat_options = array();
29
-		foreach($cat_list as $category)
29
+		foreach ($cat_list as $category)
30 30
 		{
31 31
 			$cat_options[$category['id']] = $category['name'];
32 32
 		}
@@ -54,7 +54,7 @@  discard block
 block discarded – undo
54 54
 			'email_message' => array(
55 55
 				'type' => 'textarea',
56 56
 				'large' => true,
57
-				'label' => lang('Confirmation email text').'<br />%1 = ' . lang('Event start').'<br/>%2 = link<br />%3 = '.lang('expiry'),
57
+				'label' => lang('Confirmation email text').'<br />%1 = '.lang('Event start').'<br/>%2 = link<br />%3 = '.lang('expiry'),
58 58
 				'params' => array(
59 59
 					'rows'	=> 8,
60 60
 					'cols'	=> 110
@@ -65,7 +65,7 @@  discard block
 block discarded – undo
65 65
 				'label' => lang('Confirmed addressbook.').' ('.lang('The anonymous user needs add rights for it!').')',
66 66
 				'options' => array(
67 67
 					'' => lang('None'),
68
-				)+registration_bo::get_allowed_addressbooks(registration_bo::CONFIRMED)
68
+				) + registration_bo::get_allowed_addressbooks(registration_bo::CONFIRMED)
69 69
 			),
70 70
 			'include_group' => array(
71 71
 				'type' => 'select',
@@ -90,7 +90,7 @@  discard block
 block discarded – undo
90 90
 		// Add resources from selected category
91 91
 		$bo = new resources_bo();
92 92
 		$bo->get_rows($query, $list, $readonlys);
93
-		foreach($list as $resource)
93
+		foreach ($list as $resource)
94 94
 		{
95 95
 			$this->arguments['resource']['options'][$resource['res_id']] = $resource['name'];
96 96
 		}
@@ -105,9 +105,9 @@  discard block
 block discarded – undo
105 105
 	* @param array $properties
106 106
 	* @return string the Api\Html content
107 107
 	*/
108
-	function get_content(&$arguments,$properties)
108
+	function get_content(&$arguments, $properties)
109 109
 	{
110
-		list($app) = explode('.',$this->etemplate_method);
110
+		list($app) = explode('.', $this->etemplate_method);
111 111
 		Api\Translation::add_app($app);
112 112
 
113 113
 		$extra = "<style type=\"text/css\">\n<!--\n@import url(".$GLOBALS['egw_info']['server']['webserver_url'].
@@ -122,14 +122,14 @@  discard block
 block discarded – undo
122 122
 		$extra .= "-->\n</style>\n";
123 123
 		$extra .= '<script src="'.$GLOBALS['egw_info']['server']['webserver_url'].'/etemplate/js/etemplate.js" type="text/javascript"></script>'."\n";
124 124
 		$ret = false;
125
-		if($_POST['etemplate_exec_id'])
125
+		if ($_POST['etemplate_exec_id'])
126 126
 		{
127 127
 				$ret = ExecMethod('etemplate.etemplate.process_exec');
128 128
 		}
129
-		if($_GET['date']) $arguments['date'] = strtotime($_GET['date']);
129
+		if ($_GET['date']) $arguments['date'] = strtotime($_GET['date']);
130 130
 		$arguments['link'] = $this->link();
131 131
 		$arguments['sitemgr_version'] = $this->block->version;
132
-		return $extra.($ret ? $ret : ExecMethod2($this->etemplate_method,null,$arguments));
132
+		return $extra.($ret ? $ret : ExecMethod2($this->etemplate_method, null, $arguments));
133 133
 	}
134 134
 
135 135
 }
Please login to merge, or discard this patch.
resources/setup/default_records.inc.php 1 patch
Spacing   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -14,26 +14,26 @@  discard block
 block discarded – undo
14 14
 $resources_table_prefix = 'egw_resources';
15 15
 
16 16
 // Add a general category for resources
17
-$GLOBALS['egw_setup']->db->insert($GLOBALS['egw_setup']->cats_table,array('cat_parent' => 0, 'cat_owner' => Api\Categories::GLOBAL_ACCOUNT,'cat_access' => 'public','cat_appname' => 'resources','cat_name' => 'General resources','cat_description' => 'This category has been added by setup','last_mod' => time()),false,__LINE__,__FILE__);
18
-$cat_id = $GLOBALS['egw_setup']->db->get_last_insert_id($GLOBALS['egw_setup']->cats_table,'cat_id');
19
-$GLOBALS['egw_setup']->db->insert($GLOBALS['egw_setup']->cats_table,array('cat_parent' => 0, 'cat_owner' => Api\Categories::GLOBAL_ACCOUNT,'cat_access' => 'public','cat_appname' => 'resources','cat_name' => 'Locations','cat_description' => 'This category has been added by setup','last_mod' => time()),false,__LINE__,__FILE__);
20
-$locations_cat_id = $GLOBALS['egw_setup']->db->get_last_insert_id($GLOBALS['egw_setup']->cats_table,'cat_id');
17
+$GLOBALS['egw_setup']->db->insert($GLOBALS['egw_setup']->cats_table, array('cat_parent' => 0, 'cat_owner' => Api\Categories::GLOBAL_ACCOUNT, 'cat_access' => 'public', 'cat_appname' => 'resources', 'cat_name' => 'General resources', 'cat_description' => 'This category has been added by setup', 'last_mod' => time()), false, __LINE__, __FILE__);
18
+$cat_id = $GLOBALS['egw_setup']->db->get_last_insert_id($GLOBALS['egw_setup']->cats_table, 'cat_id');
19
+$GLOBALS['egw_setup']->db->insert($GLOBALS['egw_setup']->cats_table, array('cat_parent' => 0, 'cat_owner' => Api\Categories::GLOBAL_ACCOUNT, 'cat_access' => 'public', 'cat_appname' => 'resources', 'cat_name' => 'Locations', 'cat_description' => 'This category has been added by setup', 'last_mod' => time()), false, __LINE__, __FILE__);
20
+$locations_cat_id = $GLOBALS['egw_setup']->db->get_last_insert_id($GLOBALS['egw_setup']->cats_table, 'cat_id');
21 21
 Api\Config::save_value('location_cats', $locations_cat_id, 'resources');
22 22
 
23 23
 // Give default group all rights to this general cat
24
-$defaultgroup = $GLOBALS['egw_setup']->add_account('Default','Default','Group',False,False);
25
-$GLOBALS['egw_setup']->add_acl('resources','run',$defaultgroup);
26
-$GLOBALS['egw_setup']->add_acl('resources',"L$cat_id",$defaultgroup,399);
27
-$GLOBALS['egw_setup']->add_acl('resources',"L$locations_cat_id",$defaultgroup,399);
24
+$defaultgroup = $GLOBALS['egw_setup']->add_account('Default', 'Default', 'Group', False, False);
25
+$GLOBALS['egw_setup']->add_acl('resources', 'run', $defaultgroup);
26
+$GLOBALS['egw_setup']->add_acl('resources', "L$cat_id", $defaultgroup, 399);
27
+$GLOBALS['egw_setup']->add_acl('resources', "L$locations_cat_id", $defaultgroup, 399);
28 28
 
29 29
 // Add two rooms to give user an idea of what resources is...
30 30
 $oProc->query("INSERT INTO {$resources_table_prefix} (name,cat_id,bookable,picture_src,accessory_of) VALUES ( 'Meeting room 1',$locations_cat_id,1,'cat_src',-1)");
31 31
 $oProc->query("INSERT INTO {$resources_table_prefix} (name,cat_id,bookable,picture_src,accessory_of) VALUES ( 'Meeting room 2',$locations_cat_id,1,'cat_src',-1)");
32
-$res_id = $oProc->m_odb->get_last_insert_id($resources_table_prefix,'res_id');
32
+$res_id = $oProc->m_odb->get_last_insert_id($resources_table_prefix, 'res_id');
33 33
 $oProc->query("INSERT INTO {$resources_table_prefix} (name,cat_id,bookable,picture_src,accessory_of) VALUES ( 'Fixed Beamer',$cat_id,0,'cat_src',$res_id)");
34 34
 
35 35
 // Turn on history by default
36
-foreach(array(
36
+foreach (array(
37 37
 	'history'     => 'history',
38 38
 ) as $name => $value)
39 39
 {
@@ -43,10 +43,10 @@  discard block
 block discarded – undo
43 43
 			'config_app' => 'resources',
44 44
 			'config_name' => $name,
45 45
 			'config_value' => $value,
46
-		),array(
46
+		), array(
47 47
 			'config_app' => 'resources',
48 48
 			'config_name' => $name,
49
-		),__LINE__,__FILE__
49
+		), __LINE__, __FILE__
50 50
 	);
51 51
 }
52 52
 
Please login to merge, or discard this patch.
resources/inc/class.resources_wizard_import_csv.inc.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -47,7 +47,7 @@
 block discarded – undo
47 47
                 );
48 48
 
49 49
 		$custom = Api\Storage\Customfields::get('resources', true);
50
-		foreach($custom as $name => $data) {
50
+		foreach ($custom as $name => $data) {
51 51
 			$this->mapping_fields['#'.$name] = $data['label'];
52 52
 		}
53 53
 
Please login to merge, or discard this patch.