Completed
Push — master ( 476d4b...19a789 )
by Ralf
39:41 queued 19:06
created
admin/inc/class.admin_db_backup.inc.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -28,7 +28,7 @@  discard block
 block discarded – undo
28 28
  		if (($f = $this->db_backup->fopen_backup()))
29 29
  		{
30 30
 			$this->db_backup->backup($f);
31
-			if(is_resource($f))
31
+			if (is_resource($f))
32 32
 				fclose($f);
33 33
 			/* Remove old backups. */
34 34
 			$this->db_backup->housekeeping();
@@ -41,7 +41,7 @@  discard block
 block discarded – undo
41 41
 	function index()
42 42
 	{
43 43
 		$tpl_root = EGW_SERVER_ROOT.'/setup/templates/default';
44
-		$self = $GLOBALS['egw']->link('/index.php',array('menuaction'=>'admin.admin_db_backup.index'));
44
+		$self = $GLOBALS['egw']->link('/index.php', array('menuaction'=>'admin.admin_db_backup.index'));
45 45
 		Api\Translation::add_app('setup');
46 46
 		Api\Header\ContentSecurityPolicy::add('script-src', 'unsafe-inline');
47 47
 
Please login to merge, or discard this patch.
admin/inc/class.admin_egw_user_record.inc.php 1 patch
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -35,8 +35,8 @@  discard block
 block discarded – undo
35 35
 	 *
36 36
 	 * @param string $_identifier
37 37
 	 */
38
-	public function __construct( $_identifier='' ) {
39
-		if(is_array($_identifier)) {
38
+	public function __construct($_identifier = '') {
39
+		if (is_array($_identifier)) {
40 40
 			$this->identifier = $_identifier['account_id'];
41 41
 		} else {
42 42
 			$this->identifier = $_identifier;
@@ -90,7 +90,7 @@  discard block
 block discarded – undo
90 90
 	 * @todo add some checks
91 91
 	 * @return void
92 92
 	 */
93
-	public function set_record(array $_record){
93
+	public function set_record(array $_record) {
94 94
 		$this->user = $_record;
95 95
 		$this->account_groups = $GLOBALS['egw']->accounts->memberships($this->identifier, true);
96 96
 	}
@@ -119,8 +119,8 @@  discard block
 block discarded – undo
119 119
 	 *
120 120
 	 * @return string identifier
121 121
 	 */
122
-	public function save ( $_dst_identifier ) {
123
-		unset($_dst_identifier);	// not used, but require by function signature
122
+	public function save($_dst_identifier) {
123
+		unset($_dst_identifier); // not used, but require by function signature
124 124
 	}
125 125
 
126 126
 	/**
@@ -129,8 +129,8 @@  discard block
 block discarded – undo
129 129
 	 * @param string $_dst_identifier
130 130
 	 * @return string dst_identifier
131 131
 	 */
132
-	public function copy ( $_dst_identifier ) {
133
-		unset($_dst_identifier);	// not used, but require by function signature
132
+	public function copy($_dst_identifier) {
133
+		unset($_dst_identifier); // not used, but require by function signature
134 134
 	}
135 135
 
136 136
 	/**
@@ -140,15 +140,15 @@  discard block
 block discarded – undo
140 140
 	 * @param string $_dst_identifier
141 141
 	 * @return string dst_identifier
142 142
 	 */
143
-	public function move ( $_dst_identifier ) {
144
-		unset($_dst_identifier);	// not used, but require by function signature
143
+	public function move($_dst_identifier) {
144
+		unset($_dst_identifier); // not used, but require by function signature
145 145
 	}
146 146
 
147 147
 	/**
148 148
 	 * delets current record from backend
149 149
 	 *
150 150
 	 */
151
-	public function delete () {
151
+	public function delete() {
152 152
 
153 153
 	}
154 154
 
Please login to merge, or discard this patch.
admin/inc/class.admin_egw_group_record.inc.php 1 patch
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -34,8 +34,8 @@  discard block
 block discarded – undo
34 34
 	 *
35 35
 	 * @param string $_identifier
36 36
 	 */
37
-	public function __construct( $_identifier='' ) {
38
-		if(is_array($_identifier)) {
37
+	public function __construct($_identifier = '') {
38
+		if (is_array($_identifier)) {
39 39
 			$this->identifier = $_identifier['account_id'];
40 40
 		} else {
41 41
 			$this->identifier = $_identifier;
@@ -89,9 +89,9 @@  discard block
 block discarded – undo
89 89
 	 * @todo add some checks
90 90
 	 * @return void
91 91
 	 */
92
-	public function set_record(array $_record){
92
+	public function set_record(array $_record) {
93 93
 		$this->group = $_record;
94
-		$this->group['account_members'] = $GLOBALS['egw']->accounts->members($this->group['account_id'],true);
94
+		$this->group['account_members'] = $GLOBALS['egw']->accounts->members($this->group['account_id'], true);
95 95
 	}
96 96
 
97 97
 	/**
@@ -118,8 +118,8 @@  discard block
 block discarded – undo
118 118
 	 *
119 119
 	 * @return string identifier
120 120
 	 */
121
-	public function save ( $_dst_identifier ) {
122
-		unset($_dst_identifier);	// not used, but require by function signature
121
+	public function save($_dst_identifier) {
122
+		unset($_dst_identifier); // not used, but require by function signature
123 123
 	}
124 124
 
125 125
 	/**
@@ -128,8 +128,8 @@  discard block
 block discarded – undo
128 128
 	 * @param string $_dst_identifier
129 129
 	 * @return string dst_identifier
130 130
 	 */
131
-	public function copy ( $_dst_identifier ) {
132
-		unset($_dst_identifier);	// not used, but require by function signature
131
+	public function copy($_dst_identifier) {
132
+		unset($_dst_identifier); // not used, but require by function signature
133 133
 	}
134 134
 
135 135
 	/**
@@ -139,15 +139,15 @@  discard block
 block discarded – undo
139 139
 	 * @param string $_dst_identifier
140 140
 	 * @return string dst_identifier
141 141
 	 */
142
-	public function move ( $_dst_identifier ) {
143
-		unset($_dst_identifier);	// not used, but require by function signature
142
+	public function move($_dst_identifier) {
143
+		unset($_dst_identifier); // not used, but require by function signature
144 144
 	}
145 145
 
146 146
 	/**
147 147
 	 * delets current record from backend
148 148
 	 *
149 149
 	 */
150
-	public function delete () {
150
+	public function delete() {
151 151
 
152 152
 	}
153 153
 
Please login to merge, or discard this patch.
admin/phpinfo.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -15,7 +15,7 @@
 block discarded – undo
15 15
 );
16 16
 include('../header.inc.php');
17 17
 
18
-if ($GLOBALS['egw']->acl->check('info_access',1,'admin'))
18
+if ($GLOBALS['egw']->acl->check('info_access', 1, 'admin'))
19 19
 {
20 20
 	$GLOBALS['egw']->redirect_link('/index.php');
21 21
 }
Please login to merge, or discard this patch.
files/webdav.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('|/webdav.php/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'],'/webdav.php/clientsync') !== false &&
78
-	($fstab=Vfs::mount()) && !isset($fstab['/clientsync']))
77
+if (strpos($_SERVER['REQUEST_URI'], '/webdav.php/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.
timesheet/setup/default_records.inc.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -9,7 +9,7 @@  discard block
 block discarded – undo
9 9
  * @version $Id$
10 10
  */
11 11
 
12
-foreach(array(
12
+foreach (array(
13 13
 	'history'     => 'history',
14 14
 ) as $name => $value)
15 15
 {
@@ -19,10 +19,10 @@  discard block
 block discarded – undo
19 19
 			'config_app' => 'timesheet',
20 20
 			'config_name' => $name,
21 21
 			'config_value' => $value,
22
-		),array(
22
+		), array(
23 23
 			'config_app' => 'timesheet',
24 24
 			'config_name' => $name,
25
-		),__LINE__,__FILE__
25
+		), __LINE__, __FILE__
26 26
 	);
27 27
 }
28 28
 
Please login to merge, or discard this patch.
timesheet/inc/class.timesheet_wizard_export_csv.inc.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -24,7 +24,7 @@
 block discarded – undo
24 24
 		// Custom fields
25 25
 		unset($this->export_fields['customfields']);
26 26
 		$custom = Api\Storage\Customfields::get('timesheet', true);
27
-		foreach($custom as $name => $data) {
27
+		foreach ($custom as $name => $data) {
28 28
 			$this->export_fields['#'.$name] = $data['label'];
29 29
 		}
30 30
 	}
Please login to merge, or discard this patch.
timesheet/inc/class.timesheet_tracking.inc.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -73,8 +73,8 @@  discard block
 block discarded – undo
73 73
 
74 74
 		//set fields for tracking
75 75
 		$this->field2history = array_keys($this->bo->db_cols);
76
-		$this->field2history = array_diff(array_combine($this->field2history,$this->field2history),array('ts_modified'));
77
-		$this->field2history += array('customfields'   => '#c');	// to display old customfield data in history
76
+		$this->field2history = array_diff(array_combine($this->field2history, $this->field2history), array('ts_modified'));
77
+		$this->field2history += array('customfields'   => '#c'); // to display old customfield data in history
78 78
 
79 79
 		// custom fields are now handled by parent::__construct('tracker')
80 80
 		parent::__construct('timesheet');
@@ -91,7 +91,7 @@  discard block
 block discarded – undo
91 91
 	 * @param array $old =null old/last state of the entry or null for a new entry
92 92
 	 * @return mixed
93 93
 	 */
94
-	function get_config($name,$data,$old=null)
94
+	function get_config($name, $data, $old = null)
95 95
 	{
96 96
 		$timesheet = $data['ts_id'];
97 97
 
@@ -109,7 +109,7 @@  discard block
 block discarded – undo
109 109
 	 * @param array $old
110 110
 	 * @return string
111 111
 	 */
112
-	function get_subject($data,$old)
112
+	function get_subject($data, $old)
113 113
 	{
114 114
 		return '#'.$data['ts_id'].' - '.$data['ts_title'];
115 115
 	}
@@ -121,7 +121,7 @@  discard block
 block discarded – undo
121 121
 	 * @param array $old
122 122
 	 * @return string
123 123
 	 */
124
-	function get_message($data,$old)
124
+	function get_message($data, $old)
125 125
 	{
126 126
 		if (!$data['ts_modified'] || !$old)
127 127
 		{
Please login to merge, or discard this patch.
timesheet/index.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -28,9 +28,9 @@
 block discarded – undo
28 28
 {
29 29
 	Framework::render('<p style="text-align: center; color:red; font-weight: bold;">'.
30 30
 		lang('Your database is NOT up to date (%1 vs. %2), please run %3setup%4 to update your database.',
31
-		$ts_version,$GLOBALS['egw_info']['apps'][TIMESHEET_APP]['version'],
32
-		'<a href="../setup/">','</a>')."</p>\n", null, true);
31
+		$ts_version, $GLOBALS['egw_info']['apps'][TIMESHEET_APP]['version'],
32
+		'<a href="../setup/">', '</a>')."</p>\n", null, true);
33 33
 	exit();
34 34
 }
35 35
 
36
-Framework::redirect_link('/index.php',array('menuaction'=>TIMESHEET_APP.'.timesheet_ui.index'));
36
+Framework::redirect_link('/index.php', array('menuaction'=>TIMESHEET_APP.'.timesheet_ui.index'));
Please login to merge, or discard this patch.