Completed
Push — gcconnex ( ee5ffc...718fe4 )
by Ilia
09:37 queued 04:29
created
mod/friend_request/actions/friends/removefriend.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -10,7 +10,7 @@  discard block
 block discarded – undo
10 10
 if (!empty($friend)) {
11 11
 	$user = elgg_get_logged_in_user_entity();
12 12
 	
13
-	try{
13
+	try {
14 14
 		$user->removeFriend($friend->getGUID());
15 15
 		
16 16
 		// remove river items
@@ -32,8 +32,8 @@  discard block
 block discarded – undo
32 32
 			));
33 33
 
34 34
 			// cyu - remove the relationship (if applicable) for the subscribed to user
35
-			remove_entity_relationship($user->guid, 'cp_subscribed_to_email',$friend_guid);
36
-			remove_entity_relationship($user->guid, 'cp_subscribe_to_site_mail',$friend_guid);
35
+			remove_entity_relationship($user->guid, 'cp_subscribed_to_email', $friend_guid);
36
+			remove_entity_relationship($user->guid, 'cp_subscribe_to_site_mail', $friend_guid);
37 37
 
38 38
 		} catch (Exception $e) {
39 39
 			// do nothing
Please login to merge, or discard this patch.
mod/friend_request/actions/approve.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -15,7 +15,7 @@  discard block
 block discarded – undo
15 15
 	if (remove_entity_relationship($friend->getGUID(), "friendrequest", $user->getGUID())) {
16 16
 		
17 17
 		$user->addFriend($friend->getGUID());
18
-		$friend->addFriend($user->getGUID());			//Friends mean reciprical...
18
+		$friend->addFriend($user->getGUID()); //Friends mean reciprical...
19 19
 		
20 20
 		// notify the user about the acceptance
21 21
 		$subject = elgg_echo("friend_request:approve:subject", array($user->name, $user->name));
@@ -35,7 +35,7 @@  discard block
 block discarded – undo
35 35
 				'cp_approver_profile' => $user->getURL(),
36 36
 				'cp_msg_type' => 'cp_friend_approve'
37 37
 			);
38
-			$result = elgg_trigger_plugin_hook('cp_overwrite_notification','all',$message);
38
+			$result = elgg_trigger_plugin_hook('cp_overwrite_notification', 'all', $message);
39 39
 		} else {
40 40
 			notify_user($friend->getGUID(), $user->getGUID(), $subject, $message, $params);
41 41
 		}
Please login to merge, or discard this patch.
mod/gc_elgg_sitemap/start.php 3 patches
Indentation   +22 added lines, -22 removed lines patch added patch discarded remove patch
@@ -8,27 +8,27 @@  discard block
 block discarded – undo
8 8
 	// display text only if user agent string is gsa-crawler (or whatever is set)
9 9
 	if (strstr(strtolower($_SERVER['HTTP_USER_AGENT']), 'gsa-crawler') !== false) {
10 10
 
11
-	    elgg_register_plugin_hook_handler('register', 'menu:site', 'elgg_site_menu_handler', array());
12
-	    elgg_register_plugin_hook_handler('register', 'menu:user_menu', 'elgg_user_menu_handler', array());
13
-	    elgg_register_plugin_hook_handler('register', 'menu:title', 'elgg_user_menu_handler', array());
14
-	    elgg_register_plugin_hook_handler('register', 'menu:filter', 'elgg_entity_menu_handler', array());
15
-	    elgg_register_plugin_hook_handler('prepare', 'breadcrumbs', 'elgg_breadcrumb_handler', array());
16
-	    elgg_register_plugin_hook_handler('register', 'menu:title2', 'elgg_site_menu_handler', array());
11
+		elgg_register_plugin_hook_handler('register', 'menu:site', 'elgg_site_menu_handler', array());
12
+		elgg_register_plugin_hook_handler('register', 'menu:user_menu', 'elgg_user_menu_handler', array());
13
+		elgg_register_plugin_hook_handler('register', 'menu:title', 'elgg_user_menu_handler', array());
14
+		elgg_register_plugin_hook_handler('register', 'menu:filter', 'elgg_entity_menu_handler', array());
15
+		elgg_register_plugin_hook_handler('prepare', 'breadcrumbs', 'elgg_breadcrumb_handler', array());
16
+		elgg_register_plugin_hook_handler('register', 'menu:title2', 'elgg_site_menu_handler', array());
17 17
 
18
-	    elgg_register_menu_item('site', array('name' => 'pages', 'text' => 'Pages', 'href' => '/pages/all'));
18
+		elgg_register_menu_item('site', array('name' => 'pages', 'text' => 'Pages', 'href' => '/pages/all'));
19 19
 
20 20
 	
21
-	    /// remove all the sidebars across the site
22
-	    elgg_register_plugin_hook_handler('view', 'bookmarks/sidebar', 'elgg_sidebar_handler');
23
-	    elgg_register_plugin_hook_handler('view', 'blog/sidebar', 'elgg_sidebar_handler');
24
-	    elgg_register_plugin_hook_handler('view', 'event_calendar/sidebar', 'elgg_sidebar_handler');
25
-	    elgg_register_plugin_hook_handler('view', 'file/sidebar', 'elgg_sidebar_handler');
26
-	    elgg_register_plugin_hook_handler('view', 'groups/sidebar', 'elgg_sidebar_handler');
27
-	    elgg_register_plugin_hook_handler('view', 'members/sidebar', 'elgg_sidebar_handler');
28
-	    elgg_register_plugin_hook_handler('view', 'missiona/sidebar', 'elgg_sidebar_handler');
29
-	    elgg_register_plugin_hook_handler('view', 'thewire/sidebar', 'elgg_sidebar_handler');
30
-	    elgg_register_plugin_hook_handler('view', 'photos/sidebar', 'elgg_sidebar_handler');
31
-	    elgg_register_plugin_hook_handler('view', 'file/sidebar', 'elgg_sidebar_handler');
21
+		/// remove all the sidebars across the site
22
+		elgg_register_plugin_hook_handler('view', 'bookmarks/sidebar', 'elgg_sidebar_handler');
23
+		elgg_register_plugin_hook_handler('view', 'blog/sidebar', 'elgg_sidebar_handler');
24
+		elgg_register_plugin_hook_handler('view', 'event_calendar/sidebar', 'elgg_sidebar_handler');
25
+		elgg_register_plugin_hook_handler('view', 'file/sidebar', 'elgg_sidebar_handler');
26
+		elgg_register_plugin_hook_handler('view', 'groups/sidebar', 'elgg_sidebar_handler');
27
+		elgg_register_plugin_hook_handler('view', 'members/sidebar', 'elgg_sidebar_handler');
28
+		elgg_register_plugin_hook_handler('view', 'missiona/sidebar', 'elgg_sidebar_handler');
29
+		elgg_register_plugin_hook_handler('view', 'thewire/sidebar', 'elgg_sidebar_handler');
30
+		elgg_register_plugin_hook_handler('view', 'photos/sidebar', 'elgg_sidebar_handler');
31
+		elgg_register_plugin_hook_handler('view', 'file/sidebar', 'elgg_sidebar_handler');
32 32
 		elgg_register_plugin_hook_handler('view', 'input/longtext', 'elgg_comment_view_handler');
33 33
 		elgg_register_plugin_hook_handler('view', 'input/submit', 'elgg_comment_view_handler');
34 34
 		elgg_register_plugin_hook_handler('view', 'ouptput/url', 'elgg_comment_view_handler');
@@ -38,7 +38,7 @@  discard block
 block discarded – undo
38 38
 		elgg_register_plugin_hook_handler('view', 'page/elements/comments', 'elgg_comment_view_handler');
39 39
 		elgg_register_plugin_hook_handler('view', 'page/elements/topbar_wrapper', 'elgg_view_topbar_handler');
40 40
 
41
-	    /// renmove these pages so that it doesn't get crawled
41
+		/// renmove these pages so that it doesn't get crawled
42 42
 		elgg_unregister_page_handler('activity');
43 43
 		elgg_unregister_page_handler('dashboard');
44 44
 		elgg_unregister_menu_item('topbar', 'dashboard');
@@ -62,7 +62,7 @@  discard block
 block discarded – undo
62 62
 		elgg_register_plugin_hook_handler('view', 'event_calendar/filter_menu', 'elgg_members_menu_handler');
63 63
 
64 64
 
65
-	    elgg_register_plugin_hook_handler('register','menu:owner_block','group_navigation_handler');
65
+		elgg_register_plugin_hook_handler('register','menu:owner_block','group_navigation_handler');
66 66
 		elgg_extend_view('groups/profile/summary', 'group_tabs', 600);
67 67
 
68 68
 		elgg_register_plugin_hook_handler('entity:url', 'group', 'redirect_group_url');
@@ -288,8 +288,8 @@  discard block
 block discarded – undo
288 288
 function elgg_event_calendar_list_handler($hook, $type, $value, $params) {
289 289
 
290 290
 	$event_list = elgg_list_entities([
291
-	    'type' => 'object',
292
-	    'subtype' => 'event_calendar',
291
+		'type' => 'object',
292
+		'subtype' => 'event_calendar',
293 293
 	]);
294 294
 
295 295
 	return $event_list;
Please login to merge, or discard this patch.
Spacing   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -1,6 +1,6 @@  discard block
 block discarded – undo
1 1
 <?php
2 2
 
3
-elgg_register_event_handler('init','system','gc_elgg_sitemap_init');
3
+elgg_register_event_handler('init', 'system', 'gc_elgg_sitemap_init');
4 4
 
5 5
 
6 6
 function gc_elgg_sitemap_init() {
@@ -62,7 +62,7 @@  discard block
 block discarded – undo
62 62
 		elgg_register_plugin_hook_handler('view', 'event_calendar/filter_menu', 'elgg_members_menu_handler');
63 63
 
64 64
 
65
-	    elgg_register_plugin_hook_handler('register','menu:owner_block','group_navigation_handler');
65
+	    elgg_register_plugin_hook_handler('register', 'menu:owner_block', 'group_navigation_handler');
66 66
 		elgg_extend_view('groups/profile/summary', 'group_tabs', 600);
67 67
 
68 68
 		elgg_register_plugin_hook_handler('entity:url', 'group', 'redirect_group_url');
@@ -96,7 +96,7 @@  discard block
 block discarded – undo
96 96
 		
97 97
 		$entry = get_entity($guid);
98 98
 		if ($entry instanceof ElggEntity) {
99
-			echo gc_explode_translation($entry->title, 'en').' / '.gc_explode_translation($entry->title, 'fr');
99
+			echo gc_explode_translation($entry->title, 'en') . ' / ' . gc_explode_translation($entry->title, 'fr');
100 100
 		}
101 101
 	}
102 102
 
@@ -107,8 +107,8 @@  discard block
 block discarded – undo
107 107
 function strip_content_hyperlinks_handler($hook, $type, $return, $params) {
108 108
 	
109 109
 	// pull the user agent string and/or user testing
110
-	$gsa_agentstring = strtolower(elgg_get_plugin_setting('gsa_agentstring','gc_fedsearch_gsa'));
111
-	$gsa_usertest = elgg_get_plugin_setting('gsa_test','gc_fedsearch_gsa');
110
+	$gsa_agentstring = strtolower(elgg_get_plugin_setting('gsa_agentstring', 'gc_fedsearch_gsa'));
111
+	$gsa_usertest = elgg_get_plugin_setting('gsa_test', 'gc_fedsearch_gsa');
112 112
 	if ($gsa_usertest) $current_user = elgg_get_logged_in_user_entity();
113 113
 
114 114
 	/*blog pages bookmarks file discussion*/
@@ -129,7 +129,7 @@  discard block
 block discarded – undo
129 129
 	else
130 130
 		$comment_text = "";
131 131
 
132
-	if (( strcmp($comment_text,'comment-text') == 0 || strcmp($comment_text, 'discussion-reply-text') == 0 ))
132
+	if ((strcmp($comment_text, 'comment-text') == 0 || strcmp($comment_text, 'discussion-reply-text') == 0))
133 133
 		return;
134 134
 
135 135
 	if (!in_array($context, $filter_entity))
@@ -164,7 +164,7 @@  discard block
 block discarded – undo
164 164
 		$newTxtNode = $description->createTextNode($lnkText);
165 165
 		$linkNode->parentNode->replaceChild($newTxtNode, $linkNode);
166 166
 	}
167
-	$return = $description->textContent."<br/><br/>";
167
+	$return = $description->textContent . "<br/><br/>";
168 168
 
169 169
 
170 170
 	// french body text
@@ -189,7 +189,7 @@  discard block
 block discarded – undo
189 189
 function redirect_group_url($hook, $type, $url, $params) {
190 190
 	// from: 192.168.xx.xx/gcconnex/groups/profile/1111/group-name
191 191
 	// to: 192.168.xx.xx/gcconnex/groups/profile/1111/
192
-	if (strpos($_SERVER['REQUEST_URI'],"/groups/profile/") !== false && sizeof(get_sanitized_url()) > 3)
192
+	if (strpos($_SERVER['REQUEST_URI'], "/groups/profile/") !== false && sizeof(get_sanitized_url()) > 3)
193 193
 	{
194 194
 		forward("groups/profile/{$params['entity']->guid}");
195 195
 	}
@@ -213,7 +213,7 @@  discard block
 block discarded – undo
213 213
  */
214 214
 function redirect_content_url($hook, $type, $url, $params) {
215 215
 
216
-	if (strpos($_SERVER['REQUEST_URI'],"/view/") !== false)
216
+	if (strpos($_SERVER['REQUEST_URI'], "/view/") !== false)
217 217
 	{
218 218
 		$subtype = $params['entity']->getSubtype();
219 219
 		if ($subtype === 'groupforumtopic') $subtype = 'discussion';
@@ -366,12 +366,12 @@  discard block
 block discarded – undo
366 366
 			echo "<a href='{$value['entity']->getURL()}'>{$value['entity']->title}</a>  <br/>";
367 367
 			break;
368 368
 		case 'groups':
369
-			$group_url = elgg_get_site_url()."groups/profile/{$value['entity']->guid}/";
369
+			$group_url = elgg_get_site_url() . "groups/profile/{$value['entity']->guid}/";
370 370
 			echo "<a href='{$group_url}'>{$value['entity']->name}</a>  <br/>";
371 371
 			break;
372 372
 
373 373
 		case 'members':
374
-			$member_url = elgg_get_site_url()."profile/{$value['entity']->username}/";
374
+			$member_url = elgg_get_site_url() . "profile/{$value['entity']->username}/";
375 375
 			echo "<a href='{$member_url}'>{$value['entity']->username}</a>  <br/>";
376 376
 			break;
377 377
 
@@ -417,7 +417,7 @@  discard block
 block discarded – undo
417 417
 			continue;
418 418
 
419 419
 		if ($item->getName() === 'groups') {
420
-			$group_url = elgg_get_site_url()."groups/";
420
+			$group_url = elgg_get_site_url() . "groups/";
421 421
 			$menu_item .= " <a style='color:white;' href='{$group_url}'> {$item->getName()}</a> ";
422 422
 		}
423 423
 		else 
Please login to merge, or discard this patch.
Braces   +46 added lines, -28 removed lines patch added patch discarded remove patch
@@ -86,11 +86,13 @@  discard block
 block discarded – undo
86 86
 	$portfolio_guid = $user->portfolio;
87 87
 
88 88
 	// when no portfolio for user exists
89
-	if (empty($portfolio_guid) || $portfolio_guid == NULL)
90
-		return;
89
+	if (empty($portfolio_guid) || $portfolio_guid == NULL) {
90
+			return;
91
+	}
91 92
 
92
-	if (!is_array($portfolio_guid))
93
-		$portfolio_guid = array($portfolio_guid);
93
+	if (!is_array($portfolio_guid)) {
94
+			$portfolio_guid = array($portfolio_guid);
95
+	}
94 96
 
95 97
 	foreach ($portfolio_guid as $guid) {
96 98
 		
@@ -109,7 +111,9 @@  discard block
 block discarded – undo
109 111
 	// pull the user agent string and/or user testing
110 112
 	$gsa_agentstring = strtolower(elgg_get_plugin_setting('gsa_agentstring','gc_fedsearch_gsa'));
111 113
 	$gsa_usertest = elgg_get_plugin_setting('gsa_test','gc_fedsearch_gsa');
112
-	if ($gsa_usertest) $current_user = elgg_get_logged_in_user_entity();
114
+	if ($gsa_usertest) {
115
+		$current_user = elgg_get_logged_in_user_entity();
116
+	}
113 117
 
114 118
 	/*blog pages bookmarks file discussion*/
115 119
 	$filter_entity = array('blog', 'pages', 'discussion', 'file', 'bookmarks');
@@ -124,16 +128,19 @@  discard block
 block discarded – undo
124 128
 		return;
125 129
 	}
126 130
 
127
-	if (!empty($comment_block) || $comment_block === null)
128
-		$comment_text = $comment_block->item(0)->getAttribute('data-role');
129
-	else
130
-		$comment_text = "";
131
+	if (!empty($comment_block) || $comment_block === null) {
132
+			$comment_text = $comment_block->item(0)->getAttribute('data-role');
133
+	} else {
134
+			$comment_text = "";
135
+	}
131 136
 
132
-	if (( strcmp($comment_text,'comment-text') == 0 || strcmp($comment_text, 'discussion-reply-text') == 0 ))
133
-		return;
137
+	if (( strcmp($comment_text,'comment-text') == 0 || strcmp($comment_text, 'discussion-reply-text') == 0 )) {
138
+			return;
139
+	}
134 140
 
135
-	if (!in_array($context, $filter_entity))
136
-		return;
141
+	if (!in_array($context, $filter_entity)) {
142
+			return;
143
+	}
137 144
 
138 145
 
139 146
 	$page_url = get_sanitized_url();
@@ -141,8 +148,9 @@  discard block
 block discarded – undo
141 148
 	$entity = get_entity($page_url[2]);
142 149
 
143 150
 	// if $entity is not valid, then just don't do anything, to avoid error
144
-	if (!($entity instanceof ElggEntity))
145
-		return;
151
+	if (!($entity instanceof ElggEntity)) {
152
+			return;
153
+	}
146 154
 
147 155
 	if (isJsonString($entity->description)) {
148 156
 		$json = json_decode($entity->description, true);
@@ -216,12 +224,19 @@  discard block
 block discarded – undo
216 224
 	if (strpos($_SERVER['REQUEST_URI'],"/view/") !== false)
217 225
 	{
218 226
 		$subtype = $params['entity']->getSubtype();
219
-		if ($subtype === 'groupforumtopic') $subtype = 'discussion';
220
-		if ($subtype === 'page_top') $subtype = 'pages';
221
-		if ($subtype === 'idea') $subtype = 'ideas';
227
+		if ($subtype === 'groupforumtopic') {
228
+			$subtype = 'discussion';
229
+		}
230
+		if ($subtype === 'page_top') {
231
+			$subtype = 'pages';
232
+		}
233
+		if ($subtype === 'idea') {
234
+			$subtype = 'ideas';
235
+		}
222 236
 
223
-		if (sizeof(get_sanitized_url()) > 3)
224
-			forward("{$subtype}/view/{$params['entity']->guid}");
237
+		if (sizeof(get_sanitized_url()) > 3) {
238
+					forward("{$subtype}/view/{$params['entity']->guid}");
239
+		}
225 240
 	}
226 241
 }
227 242
 
@@ -235,8 +250,9 @@  discard block
 block discarded – undo
235 250
 
236 251
 		foreach ($value as $key => $item) {
237 252
 
238
-			if ($item->getName() === 'activity' || $item->getName() === 'more' || $item->getName() === 'photo_albums' || $item->getName() === 'event_calendar' || $item->getName() === 'polls' || $item->getName() === 'pages') 
239
-				continue;
253
+			if ($item->getName() === 'activity' || $item->getName() === 'more' || $item->getName() === 'photo_albums' || $item->getName() === 'event_calendar' || $item->getName() === 'polls' || $item->getName() === 'pages') {
254
+							continue;
255
+			}
240 256
 
241 257
 			if ($item->getName() === 'discussion') {
242 258
 				$url = "{$base_url}{$item->getName()}/owner/{$group_id}";
@@ -384,8 +400,9 @@  discard block
 block discarded – undo
384 400
 }
385 401
 
386 402
 function elgg_sidebar_handler($hook, $type, $menu, $params) {
387
-	if (is_array($menu) && $menu['body'])
388
-		echo $menu['body'];
403
+	if (is_array($menu) && $menu['body']) {
404
+			echo $menu['body'];
405
+	}
389 406
 	return array();
390 407
 }
391 408
 
@@ -413,15 +430,16 @@  discard block
 block discarded – undo
413 430
 	$menu_item = "";
414 431
 	foreach ($menu as $key => $item) {
415 432
 
416
-		if ($item->getName() === 'translation_editor' || $item->getName() === 'new_folder' || $item->getName() === 'questions' || $item->getName() === 'polls')
417
-			continue;
433
+		if ($item->getName() === 'translation_editor' || $item->getName() === 'new_folder' || $item->getName() === 'questions' || $item->getName() === 'polls') {
434
+					continue;
435
+		}
418 436
 
419 437
 		if ($item->getName() === 'groups') {
420 438
 			$group_url = elgg_get_site_url()."groups/";
421 439
 			$menu_item .= " <a style='color:white;' href='{$group_url}'> {$item->getName()}</a> ";
440
+		} else {
441
+					$menu_item .= " <a style='color:white;' href='{$item->getHref()}'> {$item->getName()}</a> ";
422 442
 		}
423
-		else 
424
-			$menu_item .= " <a style='color:white;' href='{$item->getHref()}'> {$item->getName()}</a> ";
425 443
 	}
426 444
 	echo $menu_item;
427 445
 
Please login to merge, or discard this patch.
mod/c_module_dump/start.php 3 patches
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -46,7 +46,7 @@
 block discarded – undo
46 46
 	}
47 47
 
48 48
 	// everything below are rebels
49
-    // nick p -2016-02-18: changed priority to have friendly message at bottom of content
49
+	// nick p -2016-02-18: changed priority to have friendly message at bottom of content
50 50
 	elgg_extend_view('forms/photos/image/save', 'forms/save2', 900);
51 51
 	elgg_extend_view('forms/photos/batch/edit', 'forms/save2', 900);
52 52
 	//elgg_extend_view('forms/photos/batch/edit/image', 'forms/save2', 600);
Please login to merge, or discard this patch.
Spacing   +17 added lines, -17 removed lines patch added patch discarded remove patch
@@ -14,14 +14,14 @@  discard block
 block discarded – undo
14 14
 
15 15
 	elgg_register_widget_type('group_ideas', elgg_echo('groups:ideas'), elgg_echo('widgets:group_ideas'), 'groups', false);
16 16
 
17
-	register_notification_object('object','groupforumtopic',elgg_echo('there is a new discussion reply'));
17
+	register_notification_object('object', 'groupforumtopic', elgg_echo('there is a new discussion reply'));
18 18
 	
19 19
 	$plugin_list = elgg_get_plugins('active', 1);
20 20
 
21 21
 	// this is the famous loop within a loop
22 22
 	foreach ($plugin_list as $plugin_form)
23 23
 	{
24
-		$filepath = elgg_get_plugins_path().$plugin_form['title'].'/views/default/forms/'.$plugin_form['title'];
24
+		$filepath = elgg_get_plugins_path() . $plugin_form['title'] . '/views/default/forms/' . $plugin_form['title'];
25 25
 		if (file_exists($filepath))
26 26
 		{
27 27
 			$dir = scandir($filepath);
@@ -29,16 +29,16 @@  discard block
 block discarded – undo
29 29
 			foreach ($dir as $form_file)
30 30
 			{
31 31
 				//elgg_log('cyu - plugin:'.$plugin_form['title'], 'NOTICE');
32
-				if ( (strstr($form_file,'edit') || strstr($form_file,'save') || strstr($form_file, 'upload')) && (!strstr($form_file, '.old'))) 
32
+				if ((strstr($form_file, 'edit') || strstr($form_file, 'save') || strstr($form_file, 'upload')) && (!strstr($form_file, '.old'))) 
33 33
 				{
34 34
 					//elgg_log('cyu - form_file:'.$form_file, 'NOTICE');
35
-					$remove_php = explode('.',$form_file);
35
+					$remove_php = explode('.', $form_file);
36 36
 					//elgg_log('cyu - << replacing ...:'.'forms/'.$plugin_form['title'].'/'.$remove_php[0].' >>' , 'NOTICE');
37
-					elgg_extend_view('forms/'.$plugin_form['title'].'/'.$remove_php[0], 'forms/save2', 600);
37
+					elgg_extend_view('forms/' . $plugin_form['title'] . '/' . $remove_php[0], 'forms/save2', 600);
38 38
 
39 39
 					if ($plugin_form['title'] === 'polls')
40 40
 					{
41
-						elgg_extend_view('forms/'.$plugin_form['title'].'/'.$remove_php[0],'forms/save_poll',101);
41
+						elgg_extend_view('forms/' . $plugin_form['title'] . '/' . $remove_php[0], 'forms/save_poll', 101);
42 42
 					}
43 43
 				}
44 44
 			}
@@ -56,7 +56,7 @@  discard block
 block discarded – undo
56 56
 	elgg_extend_view('forms/file_tools/upload/zip', 'forms/save2', 900);
57 57
 
58 58
 	// cyu - 02/12/2015: fixes to the group visibility
59
-	$action_base = elgg_get_plugins_path().'c_module_dump/actions/groups';
59
+	$action_base = elgg_get_plugins_path() . 'c_module_dump/actions/groups';
60 60
 	//elgg_unregister_action("groups/edit");
61 61
 	//elgg_register_action("groups/edit","$action_base/edit.php");
62 62
 
@@ -88,8 +88,8 @@  discard block
 block discarded – undo
88 88
 
89 89
 	elgg_push_breadcrumb(elgg_echo('tasks'), 'tasks/all');
90 90
 
91
-	$base_dir = elgg_get_plugins_path().'tasks/pages/tasks';
92
-	$c_base_dir = elgg_get_plugins_path().'c_module_dump/pages/c_module_dump';
91
+	$base_dir = elgg_get_plugins_path() . 'tasks/pages/tasks';
92
+	$c_base_dir = elgg_get_plugins_path() . 'c_module_dump/pages/c_module_dump';
93 93
 
94 94
 	$task_type = $task[0];
95 95
 	switch ($task_type) {
@@ -150,7 +150,7 @@  discard block
 block discarded – undo
150 150
 	if (is_numeric($page_type))
151 151
 	{
152 152
 		set_input('page_type', $page_type);
153
-		require_once(elgg_get_plugins_path()."c_module_dump/pages/river.php");
153
+		require_once(elgg_get_plugins_path() . "c_module_dump/pages/river.php");
154 154
 		return true;
155 155
 	}
156 156
 
@@ -160,25 +160,25 @@  discard block
 block discarded – undo
160 160
 	set_input('page_type', $page_type);
161 161
 
162 162
 	// cyu - 02/24/2015: modified to let it point to the correct page, to remove avatar update and friending activity
163
-	require_once(elgg_get_plugins_path()."c_module_dump/pages/river.php");
163
+	require_once(elgg_get_plugins_path() . "c_module_dump/pages/river.php");
164 164
 	//require_once("{$CONFIG->path}pages/river.php");
165 165
 	return true;
166 166
 }
167 167
 
168 168
 
169 169
 	// cyu - 01-20-2015 modified: this is the same function from widget_manager, slighly modified though
170
-	function c_widget_manager_widgets_url($hook_name, $entity_type, $return_value, $params){
170
+	function c_widget_manager_widgets_url($hook_name, $entity_type, $return_value, $params) {
171 171
 		$result = $return_value;
172 172
 		$widget = $params["entity"];
173 173
 		
174
-		if(empty($result) && ($widget instanceof ElggWidget)){
174
+		if (empty($result) && ($widget instanceof ElggWidget)) {
175 175
 			$owner = $widget->getOwnerEntity();
176
-			switch($widget->handler){
176
+			switch ($widget->handler) {
177 177
 				case "friends":
178 178
 					$result = "/friends/" . $owner->username;
179 179
 					break;
180 180
 				case "album_view":
181
-					if($owner instanceof ElggGroup){
181
+					if ($owner instanceof ElggGroup) {
182 182
 						$result = "/photos/group/" . $owner->getGUID() . "/all";
183 183
 					} else {
184 184
 						$result = "/photos/owner/" . $owner->username;
@@ -204,13 +204,13 @@  discard block
 block discarded – undo
204 204
 					// cyu - 02/05/2015: added new snippet
205 205
 					$user = elgg_get_page_owner_entity();
206 206
 					if ($user instanceof ElggUser)
207
-						$result = "/activity/".$user->guid;
207
+						$result = "/activity/" . $user->guid;
208 208
 					else 
209 209
 						$result = "/activity";
210 210
 					
211 211
 					break;
212 212
 				case "bookmarks":
213
-					if($owner instanceof ElggGroup){
213
+					if ($owner instanceof ElggGroup) {
214 214
 						$result = "/bookmarks/group/" . $owner->getGUID() . "/all";
215 215
 					} else {
216 216
 						$result = "/bookmarks/owner/" . $owner->username;
Please login to merge, or discard this patch.
Braces   +5 added lines, -4 removed lines patch added patch discarded remove patch
@@ -203,10 +203,11 @@
 block discarded – undo
203 203
 
204 204
 					// cyu - 02/05/2015: added new snippet
205 205
 					$user = elgg_get_page_owner_entity();
206
-					if ($user instanceof ElggUser)
207
-						$result = "/activity/".$user->guid;
208
-					else 
209
-						$result = "/activity";
206
+					if ($user instanceof ElggUser) {
207
+											$result = "/activity/".$user->guid;
208
+					} else {
209
+											$result = "/activity";
210
+					}
210 211
 					
211 212
 					break;
212 213
 				case "bookmarks":
Please login to merge, or discard this patch.
mod/simplesaml/lib/events.php 3 patches
Indentation   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -65,9 +65,9 @@
 block discarded – undo
65 65
 	}
66 66
 	//forward(REFERER);
67 67
 	$obj = elgg_get_entities(array(
68
-     	'type' => 'object',
69
-     	'subtype' => 'gcpedia_account',
70
-     	'owner_guid' => elgg_get_logged_in_user_guid()
68
+	 	'type' => 'object',
69
+	 	'subtype' => 'gcpedia_account',
70
+	 	'owner_guid' => elgg_get_logged_in_user_guid()
71 71
 		));
72 72
 		$gcpuser = $obj[0]->title;
73 73
 		if ($gcpuser){
Please login to merge, or discard this patch.
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -44,15 +44,15 @@  discard block
 block discarded – undo
44 44
 		}
45 45
 	}
46 46
 	///////////////////////////////
47
-	setcookie('connex_lang', elgg_get_logged_in_user_entity()->language, time()+(1000 * 60 * 60 * 24), '/');
47
+	setcookie('connex_lang', elgg_get_logged_in_user_entity()->language, time() + (1000 * 60 * 60 * 24), '/');
48 48
 //////////////////////////////////////////////////////////////////////////////////////////////////////////
49 49
 	//auto login to GCpedia
50 50
 
51
-	$pageurl=$_SERVER['HTTP_REFERER'];
51
+	$pageurl = $_SERVER['HTTP_REFERER'];
52 52
 
53 53
 	$pageurl = strstr($pageurl, '?', true);
54 54
 	//$pageurl = substr($pageurl, 0, strlen($pageurl));
55
-	if ($pageurl != elgg_get_site_url()."saml/idp_login"){
55
+	if ($pageurl != elgg_get_site_url() . "saml/idp_login") {
56 56
 		//system_message('this thing: '.$pageurl);
57 57
 	//forward("http://www.google.com");
58 58
 	//change adds session for use with share button
@@ -60,7 +60,7 @@  discard block
 block discarded – undo
60 60
 	if ($session->has('last_forward_from')) {
61 61
 		$forward_url = $session->get('last_forward_from');
62 62
 		$forward_source = 'last_forward_from';
63
-	}else{
63
+	} else {
64 64
 		$forward_url = elgg_get_site_url();
65 65
 	}
66 66
 	//forward(REFERER);
@@ -70,15 +70,15 @@  discard block
 block discarded – undo
70 70
      	'owner_guid' => elgg_get_logged_in_user_guid()
71 71
 		));
72 72
 		$gcpuser = $obj[0]->title;
73
-		if ($gcpuser){
73
+		if ($gcpuser) {
74 74
 			//exception for login as logout to unset all session variables
75
-			if($_SESSION['login_as_logout_flag']){
75
+			if ($_SESSION['login_as_logout_flag']) {
76 76
 				unset($_SESSION['login_as_original_user_guid']);
77 77
 				unset($_SESSION['login_as_original_persistent']);
78 78
 				unset($_SESSION['login_as_logout_flag']);
79 79
 			}
80 80
 
81
-			forward("http://".$_SERVER[HTTP_HOST]."/simplesaml/saml2/idp/SSOService.php?spentityid=".elgg_get_plugin_setting('gcpedia_url','saml_link')."simplesaml/module.php/saml/sp/metadata.php/elgg-idp&RelayState=$forward_url");
81
+			forward("http://" . $_SERVER[HTTP_HOST] . "/simplesaml/saml2/idp/SSOService.php?spentityid=" . elgg_get_plugin_setting('gcpedia_url', 'saml_link') . "simplesaml/module.php/saml/sp/metadata.php/elgg-idp&RelayState=$forward_url");
82 82
 
83 83
 		}
84 84
 	//
Please login to merge, or discard this patch.
Braces   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -60,7 +60,7 @@
 block discarded – undo
60 60
 	if ($session->has('last_forward_from')) {
61 61
 		$forward_url = $session->get('last_forward_from');
62 62
 		$forward_source = 'last_forward_from';
63
-	}else{
63
+	} else{
64 64
 		$forward_url = elgg_get_site_url();
65 65
 	}
66 66
 	//forward(REFERER);
Please login to merge, or discard this patch.
mod/widget_manager/views/default/widgets/twitter_widget/content.php 2 patches
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -9,7 +9,7 @@
 block discarded – undo
9 9
 
10 10
 <div style='height:<?php echo $height; ?>px; overflow:scroll;'>
11 11
 
12
-<?php echo (!$widget->embed_url) ? elgg_echo('widgets:twitter_search:not_configured') : $widget->embed_url;	?>
12
+<?php echo (!$widget->embed_url) ? elgg_echo('widgets:twitter_search:not_configured') : $widget->embed_url; ?>
13 13
 
14 14
 </div>
15 15
 
Please login to merge, or discard this patch.
Braces   +6 added lines, -2 removed lines patch added patch discarded remove patch
@@ -3,8 +3,12 @@
 block discarded – undo
3 3
 $widget = $vars["entity"];
4 4
 $height = sanitise_int($widget->height, false);
5 5
 
6
-if (!$height) $height = 300;
7
-if (!$widget->embed_url) $height = 50;
6
+if (!$height) {
7
+	$height = 300;
8
+}
9
+if (!$widget->embed_url) {
10
+	$height = 50;
11
+}
8 12
 ?>
9 13
 
10 14
 <div style='height:<?php echo $height; ?>px; overflow:scroll;'>
Please login to merge, or discard this patch.
mod/widget_manager/views/default/widgets/rss_server/content.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -140,7 +140,7 @@
 block discarded – undo
140 140
 // proccess data
141 141
 if ($show_feed_title) {
142 142
 	$feed_title = elgg_extract("title_text", $feed_data);
143
-	$feed_url= elgg_extract("title_href", $feed_data);
143
+	$feed_url = elgg_extract("title_href", $feed_data);
144 144
 	
145 145
 	if (!empty($feed_title) && !empty($feed_url)) {
146 146
 		echo "<h3>";
Please login to merge, or discard this patch.
mod/widget_manager/views/default/widgets/rss_server/edit.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -13,14 +13,14 @@
 block discarded – undo
13 13
 
14 14
 ?>
15 15
 <div>
16
-	<?php echo elgg_echo("widgets:rss:settings:rssfeed");?><br />
16
+	<?php echo elgg_echo("widgets:rss:settings:rssfeed"); ?><br />
17 17
 	<?php echo elgg_view("input/text", array("name" => "params[rssfeed]", "value" => $widget->rssfeed)); ?>
18 18
 </div>
19 19
 
20 20
 <div>
21 21
 	<?php
22 22
 	echo elgg_echo("widgets:rss:settings:rss_count") . " ";
23
-	echo elgg_view("input/dropdown", array("name" => "params[rss_count]", "options" => range(1,10), "value" => $rss_count));
23
+	echo elgg_view("input/dropdown", array("name" => "params[rss_count]", "options" => range(1, 10), "value" => $rss_count));
24 24
 	?>
25 25
 </div>
26 26
 
Please login to merge, or discard this patch.
mod/widget_manager/views/default/widgets/content_by_tag/content.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -171,7 +171,7 @@  discard block
 block discarded – undo
171 171
 elgg_push_context("search");
172 172
 
173 173
 $display_option = $widget->display_option;
174
-if (in_array($display_option, array("slim","simple"))) {
174
+if (in_array($display_option, array("slim", "simple"))) {
175 175
 	if ($entities = elgg_get_entities($options)) {
176 176
 		$num_highlighted = (int) $widget->highlight_first;
177 177
 		$result .= "<ul class='elgg-list'>";
@@ -217,13 +217,13 @@  discard block
 block discarded – undo
217 217
 						$icon = elgg_view_entity_icon($entity->getOwnerEntity(), "small");
218 218
 					}
219 219
 
220
-					$text = elgg_view("output/url", array("href" => $entity_url, "text" => gc_explode_translation($entity->title,$lang), "target" => $target));
220
+					$text = elgg_view("output/url", array("href" => $entity_url, "text" => gc_explode_translation($entity->title, $lang), "target" => $target));
221 221
 					$text .= "<br />";
222 222
 
223
-					$description = elgg_get_excerpt(gc_explode_translation($entity->description,$lang), 170);
223
+					$description = elgg_get_excerpt(gc_explode_translation($entity->description, $lang), 170);
224 224
 					
225 225
 					if ($show_timestamp) {
226
-						$text .= "<span title='" . date("r", $entity->time_created) . "'>" . substr(date("r", $entity->time_created),0,16) . "</span>";
226
+						$text .= "<span title='" . date("r", $entity->time_created) . "'>" . substr(date("r", $entity->time_created), 0, 16) . "</span>";
227 227
 						if (!empty($description)) {
228 228
 							$text .= " - ";
229 229
 						}
@@ -240,7 +240,7 @@  discard block
 block discarded – undo
240 240
 					if ($show_timestamp) {
241 241
 						$result .= "<span title='" . strftime("%c", $entity->time_created) . "'>" . strftime("%d %b", $entity->time_created) . "</span> - ";
242 242
 					}
243
-					$result .= "<a href='" . $entity_url . "'>" . gc_explode_translation($entity->title,$lang) . "</a>";
243
+					$result .= "<a href='" . $entity_url . "'>" . gc_explode_translation($entity->title, $lang) . "</a>";
244 244
 					$result .= "</div>";
245 245
 				}
246 246
 			} else {
@@ -252,7 +252,7 @@  discard block
 block discarded – undo
252 252
 					$icon = elgg_view_entity_icon($owner, "small");
253 253
 				}
254 254
 
255
-				$text = elgg_view("output/url", array("href" => $entity_url, "text" => gc_explode_translation($entity->title,$lang)));
255
+				$text = elgg_view("output/url", array("href" => $entity_url, "text" => gc_explode_translation($entity->title, $lang)));
256 256
 				$text .= "<br />";
257 257
 				$text .= "<a href='" . $owner->getURL() . "'>" . $owner->name . "</a>";
258 258
 
Please login to merge, or discard this patch.