gctools-outilsgc / gcconnex

mod/group_tools/actions/groups/edit.php

Indentation +9 added lines, -9 removed lines

@@ -214,23 +214,23 @@ 
 $c_photo = $_FILES['c_photo'];
 
 foreach($c_photo as $c){
-    $printing_files .= $c .' , ';
+	$printing_files .= $c .' , ';
 }
 if(reset($c_photo) ){
-    $prefix = "groups_c_photo/" . $group->guid;
+	$prefix = "groups_c_photo/" . $group->guid;
 
-    $filehandler2 = new ElggFile();
+	$filehandler2 = new ElggFile();
 	$filehandler2->owner_guid = $group->owner_guid;
-    $filehandler2->container_guid = $group->guid;
-    $filehandler2->subtype = 'c_photo';
+	$filehandler2->container_guid = $group->guid;
+	$filehandler2->subtype = 'c_photo';
 	$filehandler2->setFilename($prefix . ".jpg");
 	$filehandler2->open("write");
 	$filehandler2->write(get_uploaded_file('c_photo'));
 	$filehandler2->close();
-    $filehandler2->save();
+	$filehandler2->save();
     
-    $c_photo_guid = $filehandler2->getGUID();
-    $subtype_testing = $filehandler2->getSubtype();
+	$c_photo_guid = $filehandler2->getGUID();
+	$subtype_testing = $filehandler2->getSubtype();
    $group->cover_photo =$c_photo_guid; //Nick - Set Cover photo metadata
 }else if(isset($group->cover_photo) && $group->cover_photo !='nope'){
 
@@ -240,7 +240,7 @@ 
 
 $remove_c_photo = get_input('remove_photo'); //Nick - Checkbox will set cover photo metadata to 'nope'
 if($remove_c_photo){
-    $group->cover_photo = 'nope';
+	$group->cover_photo = 'nope';
 }
 
 // owner transfer

Spacing +12 added lines, -12 removed lines

@@ -43,7 +43,7 @@ 
 
 $user = elgg_get_logged_in_user_entity();
 
-$group_guid = (int)get_input('group_guid');
+$group_guid = (int) get_input('group_guid');
 $is_new_group = $group_guid == 0;
 
 if ($is_new_group
@@ -54,7 +54,7 @@ 
 }
 
 $group = $group_guid ? get_entity($group_guid) : new ElggGroup();
-if (elgg_instanceof($group, "group") &&  !$group->canEdit()) {
+if (elgg_instanceof($group, "group") && !$group->canEdit()) {
 	register_error(elgg_echo("groups:cantedit"));
 	forward(REFERER);
 }
@@ -78,13 +78,13 @@ 
 
 		$group->$shortname = $value;
 	}
-	if(!$group->name){
+	if (!$group->name) {
 		$group->name = $group->name2;
 	}
 }
 
 // Validate create
-if ((!$group->name)&& (!$group->name2)){
+if ((!$group->name) && (!$group->name2)) {
 	register_error(elgg_echo("groups:notitle"));
 	forward(REFERER);
 }
@@ -124,7 +124,7 @@ 
 // is an odd requirement and should be removed. Either the acl creation happens
 // in the action or the visibility moves to a plugin hook
 if (elgg_get_plugin_setting('hidden_groups', 'groups') == 'yes') {
-	$visibility = (int)get_input('vis');
+	$visibility = (int) get_input('vis');
 
 	if ($visibility == ACCESS_PRIVATE) {
 		// Make this group visible only to group members. We need to use
@@ -213,10 +213,10 @@ 
 
 $c_photo = $_FILES['c_photo'];
 
-foreach($c_photo as $c){
-    $printing_files .= $c .' , ';
+foreach ($c_photo as $c) {
+    $printing_files .= $c . ' , ';
 }
-if(reset($c_photo) ){
+if (reset($c_photo)) {
     $prefix = "groups_c_photo/" . $group->guid;
 
     $filehandler2 = new ElggFile();
@@ -231,15 +231,15 @@ 
     
     $c_photo_guid = $filehandler2->getGUID();
     $subtype_testing = $filehandler2->getSubtype();
-   $group->cover_photo =$c_photo_guid; //Nick - Set Cover photo metadata
-}else if(isset($group->cover_photo) && $group->cover_photo !='nope'){
+   $group->cover_photo = $c_photo_guid; //Nick - Set Cover photo metadata
+} else if (isset($group->cover_photo) && $group->cover_photo != 'nope') {
 
-}else{ 
+} else { 
 $group->cover_photo = 'nope';
 }
 
 $remove_c_photo = get_input('remove_photo'); //Nick - Checkbox will set cover photo metadata to 'nope'
-if($remove_c_photo){
+if ($remove_c_photo) {
     $group->cover_photo = 'nope';
 }
 

Braces +2 added lines, -2 removed lines

@@ -232,9 +232,9 @@
     $c_photo_guid = $filehandler2->getGUID();
     $subtype_testing = $filehandler2->getSubtype();
    $group->cover_photo =$c_photo_guid; //Nick - Set Cover photo metadata
-}else if(isset($group->cover_photo) && $group->cover_photo !='nope'){
+} else if(isset($group->cover_photo) && $group->cover_photo !='nope'){
 
-}else{ 
+} else{ 
 $group->cover_photo = 'nope';
 }
 

mod/group_tools/pages/groups/river.php

Spacing +1 added lines, -1 removed lines

@@ -56,7 +56,7 @@
 $title = elgg_echo('groups:activity');
 
 
-	elgg_push_breadcrumb(gc_explode_translation($group->title,$lang), $group->getURL());
+	elgg_push_breadcrumb(gc_explode_translation($group->title, $lang), $group->getURL());
 
 
 

mod/group_tools/views/default/group_tools/group_stats.php

Spacing +1 added lines, -1 removed lines

@@ -24,7 +24,7 @@
 	
 	?>
 	<script type="text/javascript">
-		$('div.groups-stats').append("<p id='<?php echo $id; ?>'><?php echo $status;?></p>");
+		$('div.groups-stats').append("<p id='<?php echo $id; ?>'><?php echo $status; ?></p>");
 	</script>
 	<?php
 }

mod/group_tools/views/default/group_tools/owner_block.php

Spacing +1 added lines, -1 removed lines

@@ -23,7 +23,7 @@
 	
 	?>
 	<script type="text/javascript">
-		$('div.elgg-owner-block div.elgg-image-block').append("<div id='<?php echo $id; ?>'><?php echo $status;?></div>");
+		$('div.elgg-owner-block div.elgg-image-block').append("<div id='<?php echo $id; ?>'><?php echo $status; ?></div>");
 	</script>
 	<?php
 }

mod/group_tools/lib/functions.php

Indentation +3 added lines, -3 removed lines

@@ -116,7 +116,7 @@ 
 					'cp_msg_type' => 'cp_group_invite'
 					);
 				elgg_trigger_plugin_hook('cp_overwrite_notification', 'all', $message);
-                $result = true;
+				$result = true;
 
 			} else {
 
@@ -185,7 +185,7 @@ 
 					'cp_msg_type' => 'cp_group_add'
 					);
 				elgg_trigger_plugin_hook('cp_overwrite_notification', 'all', $message);
-                $result = true;
+				$result = true;
 			} else {
 
 				$msg = elgg_trigger_plugin_hook("invite_notification", "group_tools", $params, $msg);
@@ -294,7 +294,7 @@ 
 						'cp_msg_type' => 'cp_group_invite_email'
 						);
 					elgg_trigger_plugin_hook('cp_overwrite_notification', 'all', $message);
-                    $result = true;
+					$result = true;
 
 				} else {
 

Spacing +10 added lines, -10 removed lines

@@ -101,7 +101,7 @@ 
 				$url
 			));
 			
-	if(!$group->name){
+	if (!$group->name) {
 				$group->name = $group->name2;
 			}
 
@@ -171,7 +171,7 @@ 
 				"inviter" => $loggedin_user,
 				"invitee" => $user
 			);
-			if(!$group->name){
+			if (!$group->name) {
 				$group->name = $group->name2;
 			}
 
@@ -267,7 +267,7 @@ 
 					"invitee" => $email
 				);
 
-								if(!$group->name){
+								if (!$group->name) {
 				$group->name = $group->name2;
 			}
 				$body = elgg_trigger_plugin_hook("invite_notification", "group_tools", $params, $body);
@@ -285,12 +285,12 @@ 
 						'cp_invitee' => $email,
 						'cp_inviter' => $loggedin_user,
 						'cp_group_invite' => $group,
-						'group_link' => elgg_get_site_url().'groups/profile/'.$group->guid.'/'.$group->name,
-						'cp_invitation_nonuser_url' => elgg_get_site_url()."register?group_invitecode={$invite_code}",
-						'cp_invitation_url' => elgg_get_site_url()."groups/invitations/?invitecode={$invite_code}",
+						'group_link' => elgg_get_site_url() . 'groups/profile/' . $group->guid . '/' . $group->name,
+						'cp_invitation_nonuser_url' => elgg_get_site_url() . "register?group_invitecode={$invite_code}",
+						'cp_invitation_url' => elgg_get_site_url() . "groups/invitations/?invitecode={$invite_code}",
 						'cp_invitation_code' => $invite_code,
 						'cp_invitation_msg' => $text,
-						'cp_user_profile'=> elgg_get_site_url().'profile/'.$loggedin_user->name,
+						'cp_user_profile'=> elgg_get_site_url() . 'profile/' . $loggedin_user->name,
 						'cp_msg_type' => 'cp_group_invite_email'
 						);
 					elgg_trigger_plugin_hook('cp_overwrite_notification', 'all', $message);
@@ -688,7 +688,7 @@ 
 		$dbprefix = elgg_get_config("dbprefix");
 		$group_membership_where = "e.guid NOT IN (SELECT er.guid_two FROM {$dbprefix}entity_relationships er where er.guid_one = {$user->getGUID()} and er.relationship IN ('member', 'membership_request'))";
 
-		if (elgg_get_plugin_setting("auto_suggest_groups","group_tools") !== "no") {
+		if (elgg_get_plugin_setting("auto_suggest_groups", "group_tools") !== "no") {
 			$tag_names = elgg_get_registered_tag_metadata_names();
 			if (!empty($tag_names)) {
 				$user_metadata_options = array(
@@ -727,7 +727,7 @@ 
 		}
 		
 		// get admin defined suggested groups
-		$group_guids = string_to_tag_array(elgg_get_plugin_setting("suggested_groups","group_tools"));
+		$group_guids = string_to_tag_array(elgg_get_plugin_setting("suggested_groups", "group_tools"));
 		if (!empty($group_guids) && ($limit > 0)) {
 			$group_options = array(
 				"guids" => $group_guids,
@@ -1015,7 +1015,7 @@ 
 					'cp_appointer' => $loggedin_user->name,
 					'cp_new_owner_user' => $new_owner,
 				);
-				$result = elgg_trigger_plugin_hook('cp_overwrite_notification','all',$message);
+				$result = elgg_trigger_plugin_hook('cp_overwrite_notification', 'all', $message);
 			} else {
 				notify_user($new_owner->getGUID(), $group->getGUID(), $subject, $message);
 			}

mod/gcRegistration_collab/languages/en.php

Indentation +1 added lines, -1 removed lines

@@ -30,7 +30,7 @@
 	'gcRegister:ministry' => 'Ministry',
 
 	// labels
-    'gcRegister:form' => 'Registration form',
+	'gcRegister:form' => 'Registration form',
 	'gcRegister:email' => 'Enter your e-mail',
 	'gcRegister:email_secondary' => 'Confirm your e-mail',
 	'gcRegister:username' => 'Your username (auto-generated)',

mod/gcRegistration_collab/actions/register.php

Indentation +1 added lines, -1 removed lines

@@ -279,7 +279,7 @@
 			foreach($meta_fields as $field){
 				$new_user->set($field, $$field);
 			}
-	        $new_user->last_department_verify = time();
+			$new_user->last_department_verify = time();
 			
 			// Forward on success, assume everything else is an error...
 			forward();

Spacing +58 added lines, -58 removed lines

@@ -19,23 +19,23 @@ 
  * MWooff 		Jan 18 2017		Re-built for GCcollab-specific functions	
  ***********************************************************************/
 
-function replaceAccents2( $str ){
+function replaceAccents2($str) {
 	$a = array('À', 'Á', 'Â', 'Ã', 'Ä', 'Å', 'Æ', 'Ç', 'È', 'É', 'Ê', 'Ë', 'Ì', 'Í', 'Î', 'Ï', 'Ð', 'Ñ', 'Ò', 'Ó', 'Ô', 'Õ', 'Ö', 'Ø', 'Ù', 'Ú', 'Û', 'Ü', 'Ý', 'ß', 'à', 'á', 'â', 'ã', 'ä', 'å', 'æ', 'ç', 'è', 'é', 'ê', 'ë', 'ì', 'í', 'î', 'ï', 'ñ', 'ò', 'ó', 'ô', 'õ', 'ö', 'ø', 'ù', 'ú', 'û', 'ü', 'ý', 'ÿ', 'Ā', 'ā', 'Ă', 'ă', 'Ą', 'ą', 'Ć', 'ć', 'Ĉ', 'ĉ', 'Ċ', 'ċ', 'Č', 'č', 'Ď', 'ď', 'Đ', 'đ', 'Ē', 'ē', 'Ĕ', 'ĕ', 'Ė', 'ė', 'Ę', 'ę', 'Ě', 'ě', 'Ĝ', 'ĝ', 'Ğ', 'ğ', 'Ġ', 'ġ', 'Ģ', 'ģ', 'Ĥ', 'ĥ', 'Ħ', 'ħ', 'Ĩ', 'ĩ', 'Ī', 'ī', 'Ĭ', 'ĭ', 'Į', 'į', 'İ', 'ı', 'IJ', 'ij', 'Ĵ', 'ĵ', 'Ķ', 'ķ', 'Ĺ', 'ĺ', 'Ļ', 'ļ', 'Ľ', 'ľ', 'Ŀ', 'ŀ', 'Ł', 'ł', 'Ń', 'ń', 'Ņ', 'ņ', 'Ň', 'ň', 'ʼn', 'Ō', 'ō', 'Ŏ', 'ŏ', 'Ő', 'ő', 'Œ', 'œ', 'Ŕ', 'ŕ', 'Ŗ', 'ŗ', 'Ř', 'ř', 'Ś', 'ś', 'Ŝ', 'ŝ', 'Ş', 'ş', 'Š', 'š', 'Ţ', 'ţ', 'Ť', 'ť', 'Ŧ', 'ŧ', 'Ũ', 'ũ', 'Ū', 'ū', 'Ŭ', 'ŭ', 'Ů', 'ů', 'Ű', 'ű', 'Ų', 'ų', 'Ŵ', 'ŵ', 'Ŷ', 'ŷ', 'Ÿ', 'Ź', 'ź', 'Ż', 'ż', 'Ž', 'ž', 'ſ', 'ƒ', 'Ơ', 'ơ', 'Ư', 'ư', 'Ǎ', 'ǎ', 'Ǐ', 'ǐ', 'Ǒ', 'ǒ', 'Ǔ', 'ǔ', 'Ǖ', 'ǖ', 'Ǘ', 'ǘ', 'Ǚ', 'ǚ', 'Ǜ', 'ǜ', 'Ǻ', 'ǻ', 'Ǽ', 'ǽ', 'Ǿ', 'ǿ');
 	$b = array('A', 'A', 'A', 'A', 'A', 'A', 'AE', 'C', 'E', 'E', 'E', 'E', 'I', 'I', 'I', 'I', 'D', 'N', 'O', 'O', 'O', 'O', 'O', 'O', 'U', 'U', 'U', 'U', 'Y', 's', 'a', 'a', 'a', 'a', 'a', 'a', 'ae', 'c', 'e', 'e', 'e', 'e', 'i', 'i', 'i', 'i', 'n', 'o', 'o', 'o', 'o', 'o', 'o', 'u', 'u', 'u', 'u', 'y', 'y', 'A', 'a', 'A', 'a', 'A', 'a', 'C', 'c', 'C', 'c', 'C', 'c', 'C', 'c', 'D', 'd', 'D', 'd', 'E', 'e', 'E', 'e', 'E', 'e', 'E', 'e', 'E', 'e', 'G', 'g', 'G', 'g', 'G', 'g', 'G', 'g', 'H', 'h', 'H', 'h', 'I', 'i', 'I', 'i', 'I', 'i', 'I', 'i', 'I', 'i', 'IJ', 'ij', 'J', 'j', 'K', 'k', 'L', 'l', 'L', 'l', 'L', 'l', 'L', 'l', 'l', 'l', 'N', 'n', 'N', 'n', 'N', 'n', 'n', 'O', 'o', 'O', 'o', 'O', 'o', 'OE', 'oe', 'R', 'r', 'R', 'r', 'R', 'r', 'S', 's', 'S', 's', 'S', 's', 'S', 's', 'T', 't', 'T', 't', 'T', 't', 'U', 'u', 'U', 'u', 'U', 'u', 'U', 'u', 'U', 'u', 'U', 'u', 'W', 'w', 'Y', 'y', 'Y', 'Z', 'z', 'Z', 'z', 'Z', 'z', 's', 'f', 'O', 'o', 'U', 'u', 'A', 'a', 'I', 'i', 'O', 'o', 'U', 'u', 'U', 'u', 'U', 'u', 'U', 'u', 'U', 'u', 'A', 'a', 'AE', 'ae', 'O', 'o');
 	return str_replace($a, $b, $str);
 }
 
-function usernameize2( $str, $a_char = array("'", "-", ".") ){
-	$string = replaceAccents2(mb_strtolower(strtok( $str, '@' )));
-	foreach ($a_char as $temp){
-		$pos = strpos($string,$temp);
-		if ($pos){
+function usernameize2($str, $a_char = array("'", "-", ".")) {
+	$string = replaceAccents2(mb_strtolower(strtok($str, '@')));
+	foreach ($a_char as $temp) {
+		$pos = strpos($string, $temp);
+		if ($pos) {
 			$mend = '';
-			$a_split = explode($temp,$string);
-			foreach ($a_split as $temp2){
-				$mend .= ucfirst($temp2).$temp;
+			$a_split = explode($temp, $string);
+			foreach ($a_split as $temp2) {
+				$mend .= ucfirst($temp2) . $temp;
 			}
-			$string = substr($mend,0,-1);
+			$string = substr($mend, 0, -1);
 		}
 	}
 	return ucfirst($string);
@@ -56,36 +56,36 @@ 
 $invitecode = get_input('invitecode');
 
 $meta_fields = array('user_type', 'institution', 'university', 'college', 'highschool', 'federal', 'provincial', 'ministry', 'municipal', 'international', 'ngo', 'community', 'business', 'media', 'retired', 'other');
-foreach($meta_fields as $field){
+foreach ($meta_fields as $field) {
 	$$field = get_input($field);
 }
 
 // check form (incompleteness & validity)
 if (elgg_get_config('allow_registration')) {
 	try {
-		$emaildomain = explode('@',$email);
-		$emailgc = explode('.',$emaildomain[1]);
-		$gcca = $emailgc[count($emailgc) - 2] .".".$emailgc[count($emailgc) - 1];
+		$emaildomain = explode('@', $email);
+		$emailgc = explode('.', $emaildomain[1]);
+		$gcca = $emailgc[count($emailgc) - 2] . "." . $emailgc[count($emailgc) - 1];
 		
 		$resulting_error = "";
 		$validemail = false;
 
 		// if domain doesn't exist in database, check if it's a gc.ca domain
-		if (strcmp($gcca, 'gc.ca') == 0){
+		if (strcmp($gcca, 'gc.ca') == 0) {
 			$validemail = true;
 		}
 
-		if( elgg_is_active_plugin('c_email_extensions') ){
+		if (elgg_is_active_plugin('c_email_extensions')) {
 			// Checks against the domain manager list...
 			$wildcard_query = "SELECT ext FROM email_extensions WHERE ext LIKE '%*%'";
 			$wildcard_emails = get_data($wildcard_query);
 			
-			if( $wildcard_emails ){
-				foreach($wildcard_emails as $wildcard){
+			if ($wildcard_emails) {
+				foreach ($wildcard_emails as $wildcard) {
 					$regex = str_replace(".", "\.", $wildcard->ext);
 					$regex = str_replace("*", "[\w-.]+", $regex);
 					$regex = "/^@" . $regex . "$/";
-					if(preg_match($regex, "@".$emaildomain[1]) || strtolower(str_replace("*.", "", $wildcard->ext)) == strtolower($emaildomain[1])){
+					if (preg_match($regex, "@" . $emaildomain[1]) || strtolower(str_replace("*.", "", $wildcard->ext)) == strtolower($emaildomain[1])) {
 						$validemail = true;
 						break;
 					}
@@ -93,96 +93,96 @@ 
 			}
 		}
 
-		if( elgg_is_active_plugin('gcRegistration_invitation') ){
+		if (elgg_is_active_plugin('gcRegistration_invitation')) {
 			// Checks against the email invitation list...
 			$invitation_query = "SELECT email FROM email_invitations WHERE email = '{$email}'";
 			$result = get_data($invitation_query);
 
-			if( count($result) > 0 ) 
+			if (count($result) > 0) 
 				$validemail = true;
 		}
 
 		// check if the college/university is filled
 		if ($user_type === 'student' || $user_type === 'academic') {
-			if($institution === 'default_invalid_value')
-				$resulting_error .= elgg_echo('gcRegister:InstitutionNotSelected').'<br/>';
+			if ($institution === 'default_invalid_value')
+				$resulting_error .= elgg_echo('gcRegister:InstitutionNotSelected') . '<br/>';
 
-			if($institution === 'university' && $university === 'default_invalid_value')
-				$resulting_error .= elgg_echo('gcRegister:UniversityNotSelected').'<br/>';
+			if ($institution === 'university' && $university === 'default_invalid_value')
+				$resulting_error .= elgg_echo('gcRegister:UniversityNotSelected') . '<br/>';
 
-			if($institution === 'college' && $college === 'default_invalid_value')
-				$resulting_error .= elgg_echo('gcRegister:CollegeNotSelected').'<br/>';
+			if ($institution === 'college' && $college === 'default_invalid_value')
+				$resulting_error .= elgg_echo('gcRegister:CollegeNotSelected') . '<br/>';
 
-			if($institution === 'highschool' && $highschool === '')
-				$resulting_error .= elgg_echo('gcRegister:HighschoolNotSelected').'<br/>';
+			if ($institution === 'highschool' && $highschool === '')
+				$resulting_error .= elgg_echo('gcRegister:HighschoolNotSelected') . '<br/>';
 		}
 
 		// check if the federal department is filled
 		if ($user_type === 'federal' && $federal === 'default_invalid_value')
-			$resulting_error .= elgg_echo('gcRegister:FederalNotSelected').'<br/>';
+			$resulting_error .= elgg_echo('gcRegister:FederalNotSelected') . '<br/>';
 
 		// check if the provincial department is filled
 		if ($user_type === 'provincial') {
-			if($provincial === 'default_invalid_value')
-				$resulting_error .= elgg_echo('gcRegister:ProvincialNotSelected').'<br/>';
+			if ($provincial === 'default_invalid_value')
+				$resulting_error .= elgg_echo('gcRegister:ProvincialNotSelected') . '<br/>';
 
-			if($ministry === 'default_invalid_value')
-				$resulting_error .= elgg_echo('gcRegister:MinistryNotSelected').'<br/>';
+			if ($ministry === 'default_invalid_value')
+				$resulting_error .= elgg_echo('gcRegister:MinistryNotSelected') . '<br/>';
 		}
 
 		// check if the municipal department is filled
 		if ($user_type === 'municipal' && $municipal === '')
-			$resulting_error .= elgg_echo('gcRegister:MunicipalNotSelected').'<br/>';
+			$resulting_error .= elgg_echo('gcRegister:MunicipalNotSelected') . '<br/>';
 
 		// check if the international department is filled
 		if ($user_type === 'international' && $international === '')
-			$resulting_error .= elgg_echo('gcRegister:InternationalNotSelected').'<br/>';
+			$resulting_error .= elgg_echo('gcRegister:InternationalNotSelected') . '<br/>';
 
 		// check if the NGO department is filled
 		if ($user_type === 'ngo' && $ngo === '')
-			$resulting_error .= elgg_echo('gcRegister:NGONotSelected').'<br/>';
+			$resulting_error .= elgg_echo('gcRegister:NGONotSelected') . '<br/>';
 
 		// check if the community department is filled
 		if ($user_type === 'community' && $community === '')
-			$resulting_error .= elgg_echo('gcRegister:CommunityNotSelected').'<br/>';
+			$resulting_error .= elgg_echo('gcRegister:CommunityNotSelected') . '<br/>';
 
 		// check if the business department is filled
 		if ($user_type === 'business' && $business === '')
-			$resulting_error .= elgg_echo('gcRegister:BusinessNotSelected').'<br/>';
+			$resulting_error .= elgg_echo('gcRegister:BusinessNotSelected') . '<br/>';
 
 		// check if the media department is filled
 		if ($user_type === 'media' && $media === '')
-			$resulting_error .= elgg_echo('gcRegister:MediaNotSelected').'<br/>';
+			$resulting_error .= elgg_echo('gcRegister:MediaNotSelected') . '<br/>';
 
 		// check if the retired department is filled
 		if ($user_type === 'retired' && $retired === '')
-			$resulting_error .= elgg_echo('gcRegister:RetiredNotSelected').'<br/>';
+			$resulting_error .= elgg_echo('gcRegister:RetiredNotSelected') . '<br/>';
 
 		// check if the other department is filled
 		if ($user_type === 'other' && $other === '')
-			$resulting_error .= elgg_echo('gcRegister:OtherNotSelected').'<br/>';
+			$resulting_error .= elgg_echo('gcRegister:OtherNotSelected') . '<br/>';
 
-		if( empty(trim($name)) )
-			$resulting_error .= elgg_echo('gcRegister:display_name_is_empty').'<br/>';
+		if (empty(trim($name)))
+			$resulting_error .= elgg_echo('gcRegister:display_name_is_empty') . '<br/>';
 
-		if( !$validemail )
-			$resulting_error .= elgg_echo('gcRegister:invalid_email_link').'<br/>';
+		if (!$validemail)
+			$resulting_error .= elgg_echo('gcRegister:invalid_email_link') . '<br/>';
 
 		// check if two emails match
 		if (strcmp($email, $email2) != 0)
-			$resulting_error .= elgg_echo('gcRegister:email_mismatch').'<br/>';
+			$resulting_error .= elgg_echo('gcRegister:email_mismatch') . '<br/>';
 
 		// check if two passwords are not empty
 		if (empty(trim($password)) || empty(trim($password2)))
-			$resulting_error .= elgg_echo('gcRegister:EmptyPassword').'<br/>';
+			$resulting_error .= elgg_echo('gcRegister:EmptyPassword') . '<br/>';
 
 		// check if two passwords match
 		if (strcmp($password, $password2) != 0)
-			$resulting_error .= elgg_echo('gcRegister:PasswordMismatch').'<br/>';
+			$resulting_error .= elgg_echo('gcRegister:PasswordMismatch') . '<br/>';
 
 		// check if toc is checked, user agrees to TOC
 		if ($toc[0] != 1)
-			$resulting_error .= elgg_echo('gcRegister:toc_error').'<br/>';
+			$resulting_error .= elgg_echo('gcRegister:toc_error') . '<br/>';
 
 		// if there are any registration error, throw an exception
 		if (!empty($resulting_error))
@@ -194,20 +194,20 @@ 
 		$usrname = str_replace("'", "", usernameize2($temp_name));
 
 		// Troy - fix for usernames generated with "-" in them; better solution may present itself.
-		while( strpos($usrname,'-')!==false ){
-			$usrname = substr_replace($usrname, ".", strpos($usrname,'-'),1);
+		while (strpos($usrname, '-') !== false) {
+			$usrname = substr_replace($usrname, ".", strpos($usrname, '-'), 1);
 		}
 
-		if( rtrim($usrname, "0..9") != "" ){
+		if (rtrim($usrname, "0..9") != "") {
 			$usrname = rtrim($usrname, "0..9");
 		}
 
 		// select matching usernames
-		$query1 = "SELECT count(*) as num FROM elggusers_entity WHERE username = '". $usrname ."'";
+		$query1 = "SELECT count(*) as num FROM elggusers_entity WHERE username = '" . $usrname . "'";
 		$result1 = get_data($query1);
 
 		// check if username exists and increment it
-		if ( $result1[0]->num > 0 ){
+		if ($result1[0]->num > 0) {
 			$unamePostfix = 0;
 			$usrnameQuery = $usrname;
 			
@@ -215,11 +215,11 @@ 
 				$unamePostfix++;
 				$tmpUsrnameQuery = $usrnameQuery . $unamePostfix;
 				
-				$query = "SELECT count(*) as num FROM elggusers_entity WHERE username = '". $tmpUsrnameQuery ."'";
+				$query = "SELECT count(*) as num FROM elggusers_entity WHERE username = '" . $tmpUsrnameQuery . "'";
 				$tmpResult = get_data($query);
 				
 				$uname = $tmpUsrnameQuery;
-			} while ( $tmpResult[0]->num > 0);
+			} while ($tmpResult[0]->num > 0);
 		} else {
 			// username is available
 			$uname = $usrname;
@@ -276,7 +276,7 @@ 
 			}
 
 			// Save user metadata
-			foreach($meta_fields as $field){
+			foreach ($meta_fields as $field) {
 				$new_user->set($field, $$field);
 			}
 	        $new_user->last_department_verify = time();

Braces +69 added lines, -46 removed lines

@@ -98,95 +98,118 @@
 			$invitation_query = "SELECT email FROM email_invitations WHERE email = '{$email}'";
 			$result = get_data($invitation_query);
 
-			if( count($result) > 0 ) 
-				$validemail = true;
+			if( count($result) > 0 ) {
+							$validemail = true;
+			}
 		}
 
 		// check if the college/university is filled
 		if ($user_type === 'student' || $user_type === 'academic') {
-			if($institution === 'default_invalid_value')
-				$resulting_error .= elgg_echo('gcRegister:InstitutionNotSelected').'<br/>';
+			if($institution === 'default_invalid_value') {
+							$resulting_error .= elgg_echo('gcRegister:InstitutionNotSelected').'<br/>';
+			}
 
-			if($institution === 'university' && $university === 'default_invalid_value')
-				$resulting_error .= elgg_echo('gcRegister:UniversityNotSelected').'<br/>';
+			if($institution === 'university' && $university === 'default_invalid_value') {
+							$resulting_error .= elgg_echo('gcRegister:UniversityNotSelected').'<br/>';
+			}
 
-			if($institution === 'college' && $college === 'default_invalid_value')
-				$resulting_error .= elgg_echo('gcRegister:CollegeNotSelected').'<br/>';
+			if($institution === 'college' && $college === 'default_invalid_value') {
+							$resulting_error .= elgg_echo('gcRegister:CollegeNotSelected').'<br/>';
+			}
 
-			if($institution === 'highschool' && $highschool === '')
-				$resulting_error .= elgg_echo('gcRegister:HighschoolNotSelected').'<br/>';
+			if($institution === 'highschool' && $highschool === '') {
+							$resulting_error .= elgg_echo('gcRegister:HighschoolNotSelected').'<br/>';
+			}
 		}
 
 		// check if the federal department is filled
-		if ($user_type === 'federal' && $federal === 'default_invalid_value')
-			$resulting_error .= elgg_echo('gcRegister:FederalNotSelected').'<br/>';
+		if ($user_type === 'federal' && $federal === 'default_invalid_value') {
+					$resulting_error .= elgg_echo('gcRegister:FederalNotSelected').'<br/>';
+		}
 
 		// check if the provincial department is filled
 		if ($user_type === 'provincial') {
-			if($provincial === 'default_invalid_value')
-				$resulting_error .= elgg_echo('gcRegister:ProvincialNotSelected').'<br/>';
+			if($provincial === 'default_invalid_value') {
+							$resulting_error .= elgg_echo('gcRegister:ProvincialNotSelected').'<br/>';
+			}
 
-			if($ministry === 'default_invalid_value')
-				$resulting_error .= elgg_echo('gcRegister:MinistryNotSelected').'<br/>';
+			if($ministry === 'default_invalid_value') {
+							$resulting_error .= elgg_echo('gcRegister:MinistryNotSelected').'<br/>';
+			}
 		}
 
 		// check if the municipal department is filled
-		if ($user_type === 'municipal' && $municipal === '')
-			$resulting_error .= elgg_echo('gcRegister:MunicipalNotSelected').'<br/>';
+		if ($user_type === 'municipal' && $municipal === '') {
+					$resulting_error .= elgg_echo('gcRegister:MunicipalNotSelected').'<br/>';
+		}
 
 		// check if the international department is filled
-		if ($user_type === 'international' && $international === '')
-			$resulting_error .= elgg_echo('gcRegister:InternationalNotSelected').'<br/>';
+		if ($user_type === 'international' && $international === '') {
+					$resulting_error .= elgg_echo('gcRegister:InternationalNotSelected').'<br/>';
+		}
 
 		// check if the NGO department is filled
-		if ($user_type === 'ngo' && $ngo === '')
-			$resulting_error .= elgg_echo('gcRegister:NGONotSelected').'<br/>';
+		if ($user_type === 'ngo' && $ngo === '') {
+					$resulting_error .= elgg_echo('gcRegister:NGONotSelected').'<br/>';
+		}
 
 		// check if the community department is filled
-		if ($user_type === 'community' && $community === '')
-			$resulting_error .= elgg_echo('gcRegister:CommunityNotSelected').'<br/>';
+		if ($user_type === 'community' && $community === '') {
+					$resulting_error .= elgg_echo('gcRegister:CommunityNotSelected').'<br/>';
+		}
 
 		// check if the business department is filled
-		if ($user_type === 'business' && $business === '')
-			$resulting_error .= elgg_echo('gcRegister:BusinessNotSelected').'<br/>';
+		if ($user_type === 'business' && $business === '') {
+					$resulting_error .= elgg_echo('gcRegister:BusinessNotSelected').'<br/>';
+		}
 
 		// check if the media department is filled
-		if ($user_type === 'media' && $media === '')
-			$resulting_error .= elgg_echo('gcRegister:MediaNotSelected').'<br/>';
+		if ($user_type === 'media' && $media === '') {
+					$resulting_error .= elgg_echo('gcRegister:MediaNotSelected').'<br/>';
+		}
 
 		// check if the retired department is filled
-		if ($user_type === 'retired' && $retired === '')
-			$resulting_error .= elgg_echo('gcRegister:RetiredNotSelected').'<br/>';
+		if ($user_type === 'retired' && $retired === '') {
+					$resulting_error .= elgg_echo('gcRegister:RetiredNotSelected').'<br/>';
+		}
 
 		// check if the other department is filled
-		if ($user_type === 'other' && $other === '')
-			$resulting_error .= elgg_echo('gcRegister:OtherNotSelected').'<br/>';
+		if ($user_type === 'other' && $other === '') {
+					$resulting_error .= elgg_echo('gcRegister:OtherNotSelected').'<br/>';
+		}
 
-		if( empty(trim($name)) )
-			$resulting_error .= elgg_echo('gcRegister:display_name_is_empty').'<br/>';
+		if( empty(trim($name)) ) {
+					$resulting_error .= elgg_echo('gcRegister:display_name_is_empty').'<br/>';
+		}
 
-		if( !$validemail )
-			$resulting_error .= elgg_echo('gcRegister:invalid_email_link').'<br/>';
+		if( !$validemail ) {
+					$resulting_error .= elgg_echo('gcRegister:invalid_email_link').'<br/>';
+		}
 
 		// check if two emails match
-		if (strcmp($email, $email2) != 0)
-			$resulting_error .= elgg_echo('gcRegister:email_mismatch').'<br/>';
+		if (strcmp($email, $email2) != 0) {
+					$resulting_error .= elgg_echo('gcRegister:email_mismatch').'<br/>';
+		}
 
 		// check if two passwords are not empty
-		if (empty(trim($password)) || empty(trim($password2)))
-			$resulting_error .= elgg_echo('gcRegister:EmptyPassword').'<br/>';
+		if (empty(trim($password)) || empty(trim($password2))) {
+					$resulting_error .= elgg_echo('gcRegister:EmptyPassword').'<br/>';
+		}
 
 		// check if two passwords match
-		if (strcmp($password, $password2) != 0)
-			$resulting_error .= elgg_echo('gcRegister:PasswordMismatch').'<br/>';
+		if (strcmp($password, $password2) != 0) {
+					$resulting_error .= elgg_echo('gcRegister:PasswordMismatch').'<br/>';
+		}
 
 		// check if toc is checked, user agrees to TOC
-		if ($toc[0] != 1)
-			$resulting_error .= elgg_echo('gcRegister:toc_error').'<br/>';
+		if ($toc[0] != 1) {
+					$resulting_error .= elgg_echo('gcRegister:toc_error').'<br/>';
+		}
 
 		// if there are any registration error, throw an exception
-		if (!empty($resulting_error))
-			throw new RegistrationException($resulting_error);
+		if (!empty($resulting_error)) {
+					throw new RegistrationException($resulting_error);
+		}
 
 
 		/*** Username Generation ***/

mod/gcRegistration_collab/views/default/forms/register.php

Indentation +90 added lines, -90 removed lines

@@ -109,72 +109,72 @@ 
 
 	<section class="col-md-6"><div class="plm">
 	<?php
-	    $InviteGUID = get_input('friend_guid');
+		$InviteGUID = get_input('friend_guid');
 	    
-	    if( $InviteGUID ):
+		if( $InviteGUID ):
 
 			$userObj = get_user($InviteGUID);
 
 			if( $userObj ):
 	              
-			    $userType = $userObj->user_type;
-			    // if user is public servant
-			    if( $userType == 'federal' ){
-			        $deptObj = elgg_get_entities(array(
-			            'type' => 'object',
-			            'subtype' => 'federal_departments',
-			        ));
-			        $depts = get_entity($deptObj[0]->guid);
-
-			        $federal_departments = array();
-			        if (get_current_language() == 'en'){
-			            $federal_departments = json_decode($depts->federal_departments_en, true);
-			        } else {
-			            $federal_departments = json_decode($depts->federal_departments_fr, true);
-			        }
-
-			        $department = $federal_departments[$userObj->federal];
-
-			    // otherwise if user is student or academic
-			    } else if( $userType == 'student' || $userType == 'academic' ){
-			        $institution = $userObj->institution;
-			        $department = ($institution == 'university') ? $userObj->university : $userObj->college;
-
-			    // otherwise if user is provincial employee
-			    } else if( $userType == 'provincial' ){
-			        $provObj = elgg_get_entities(array(
-			            'type' => 'object',
-			            'subtype' => 'provinces',
-			        ));
-			        $provs = get_entity($provObj[0]->guid);
-
-			        $provinces = array();
-			        if (get_current_language() == 'en'){
-			            $provinces = json_decode($provs->provinces_en, true);
-			        } else {
-			            $provinces = json_decode($provs->provinces_fr, true);
-			        }
-
-			        $minObj = elgg_get_entities(array(
-			            'type' => 'object',
-			            'subtype' => 'ministries',
-			        ));
-			        $mins = get_entity($minObj[0]->guid);
-
-			        $ministries = array();
-			        if (get_current_language() == 'en'){
-			            $ministries = json_decode($mins->ministries_en, true);
-			        } else {
-			            $ministries = json_decode($mins->ministries_fr, true);
-			        }
-
-			        $department = $provinces[$userObj->provincial];
-			        if($userObj->ministry && $userObj->ministry !== "default_invalid_value"){ $department .= ' / ' . $ministries[$userObj->provincial][$userObj->ministry]; }
-
-			    // otherwise show basic info
-			    } else {
-			        $department = $userObj->$userType;
-			    }
+				$userType = $userObj->user_type;
+				// if user is public servant
+				if( $userType == 'federal' ){
+					$deptObj = elgg_get_entities(array(
+						'type' => 'object',
+						'subtype' => 'federal_departments',
+					));
+					$depts = get_entity($deptObj[0]->guid);
+
+					$federal_departments = array();
+					if (get_current_language() == 'en'){
+						$federal_departments = json_decode($depts->federal_departments_en, true);
+					} else {
+						$federal_departments = json_decode($depts->federal_departments_fr, true);
+					}
+
+					$department = $federal_departments[$userObj->federal];
+
+				// otherwise if user is student or academic
+				} else if( $userType == 'student' || $userType == 'academic' ){
+					$institution = $userObj->institution;
+					$department = ($institution == 'university') ? $userObj->university : $userObj->college;
+
+				// otherwise if user is provincial employee
+				} else if( $userType == 'provincial' ){
+					$provObj = elgg_get_entities(array(
+						'type' => 'object',
+						'subtype' => 'provinces',
+					));
+					$provs = get_entity($provObj[0]->guid);
+
+					$provinces = array();
+					if (get_current_language() == 'en'){
+						$provinces = json_decode($provs->provinces_en, true);
+					} else {
+						$provinces = json_decode($provs->provinces_fr, true);
+					}
+
+					$minObj = elgg_get_entities(array(
+						'type' => 'object',
+						'subtype' => 'ministries',
+					));
+					$mins = get_entity($minObj[0]->guid);
+
+					$ministries = array();
+					if (get_current_language() == 'en'){
+						$ministries = json_decode($mins->ministries_en, true);
+					} else {
+						$ministries = json_decode($mins->ministries_fr, true);
+					}
+
+					$department = $provinces[$userObj->provincial];
+					if($userObj->ministry && $userObj->ministry !== "default_invalid_value"){ $department .= ' / ' . $ministries[$userObj->provincial][$userObj->ministry]; }
+
+				// otherwise show basic info
+				} else {
+					$department = $userObj->$userType;
+				}
 	?>
 				<p><strong><?php echo $userObj->name . elgg_echo('gcRegister:has_invited'); ?></strong></p>
 			    <hr class="mtm mbm">
@@ -195,8 +195,8 @@ 
 			    </div>
 			    <hr class="mtm mbl">
 	<?php
-	    	endif;
-	    endif;
+			endif;
+		endif;
 		
 		echo elgg_echo('gcRegister:welcome_message');
 	?>
@@ -230,7 +230,7 @@ 
 						echo elgg_view('input/select', array(
 							'name' => 'user_type',
 							'id' => 'user_type',
-			        		'class' => 'form-control',
+							'class' => 'form-control',
 							'aria-required' => 'true',
 							'required' => true,
 							'options_values' => $departments
@@ -254,8 +254,8 @@ 
 						echo elgg_view('input/select', array(
 							'name' => 'institution',
 							'id' => 'institution',
-			        		'class' => 'form-control',
-			        		'value' => 'default_invalid_value',
+							'class' => 'form-control',
+							'value' => 'default_invalid_value',
 							'options_values' => $institutions
 						));
 					?>
@@ -282,7 +282,7 @@ 
 					$university_choices = elgg_view('input/select', array(
 						'name' => 'university',
 						'id' => 'university',
-				        'class' => 'form-control',
+						'class' => 'form-control',
 						'options_values' => array_merge(array('default_invalid_value' => elgg_echo('gcRegister:make_selection')), $universities),
 					));
 				?>
@@ -313,7 +313,7 @@ 
 					$college_choices = elgg_view('input/select', array(
 						'name' => 'college',
 						'id' => 'college',
-				        'class' => 'form-control',
+						'class' => 'form-control',
 						'options_values' => array_merge(array('default_invalid_value' => elgg_echo('gcRegister:make_selection')), $colleges),
 					));
 				?>
@@ -329,7 +329,7 @@ 
 					$highschool_choices = elgg_view('input/text', array(
 						'name' => 'highschool',
 						'id' => 'highschool',
-				        'class' => 'form-control',
+						'class' => 'form-control',
 					));
 				?>
 
@@ -360,7 +360,7 @@ 
 					$federal_choices = elgg_view('input/select', array(
 						'name' => 'federal',
 						'id' => 'federal',
-				        'class' => 'form-control',
+						'class' => 'form-control',
 						'options_values' => array_merge(array('default_invalid_value' => elgg_echo('gcRegister:make_selection')), $federal_departments),
 					));
 				?>
@@ -391,7 +391,7 @@ 
 					$provincial_choices = elgg_view('input/select', array(
 						'name' => 'provincial',
 						'id' => 'provincial',
-				        'class' => 'form-control',
+						'class' => 'form-control',
 						'options_values' => array_merge(array('default_invalid_value' => elgg_echo('gcRegister:make_selection')), $provincial_departments),
 					));
 				?>
@@ -425,7 +425,7 @@ 
 							echo elgg_view('input/select', array(
 								'name' => 'ministry',
 								'id' => $prov_id,
-						        'class' => 'form-control',
+								'class' => 'form-control',
 								'options_values' => array_merge(array('default_invalid_value' => elgg_echo('gcRegister:make_selection')), $ministries[$province]),
 							));
 							echo '</div>';
@@ -452,8 +452,8 @@ 
 					$municipal_choices = elgg_view('input/text', array(
 						'name' => 'municipal',
 						'id' => 'municipal',
-				        'class' => 'form-control',
-				        'list' => 'municipal-list'
+						'class' => 'form-control',
+						'list' => 'municipal-list'
 					));
 				?>
 
@@ -479,7 +479,7 @@ 
 					$international_choices = elgg_view('input/text', array(
 						'name' => 'international',
 						'id' => 'international',
-				        'class' => 'form-control',
+						'class' => 'form-control',
 					));
 				?>
 
@@ -495,7 +495,7 @@ 
 					$ngo_choices = elgg_view('input/text', array(
 						'name' => 'ngo',
 						'id' => 'ngo',
-				        'class' => 'form-control',
+						'class' => 'form-control',
 					));
 				?>
 
@@ -511,7 +511,7 @@ 
 					$community_choices = elgg_view('input/text', array(
 						'name' => 'community',
 						'id' => 'community',
-				        'class' => 'form-control',
+						'class' => 'form-control',
 					));
 				?>
 
@@ -526,7 +526,7 @@ 
 					$business_choices = elgg_view('input/text', array(
 						'name' => 'business',
 						'id' => 'business',
-				        'class' => 'form-control',
+						'class' => 'form-control',
 					));
 				?>
 
@@ -541,7 +541,7 @@ 
 					$media_choices = elgg_view('input/text', array(
 						'name' => 'media',
 						'id' => 'media',
-				        'class' => 'form-control',
+						'class' => 'form-control',
 					));
 				?>
 
@@ -556,8 +556,8 @@ 
 					$retired_choices = elgg_view('input/text', array(
 						'name' => 'retired',
 						'id' => 'retired',
-				        'class' => 'form-control',
-				        'list' => 'retired-list'
+						'class' => 'form-control',
+						'list' => 'retired-list'
 					));
 				?>
 
@@ -595,8 +595,8 @@ 
 					$other_choices = elgg_view('input/text', array(
 						'name' => 'other',
 						'id' => 'other',
-				        'class' => 'form-control',
-				        'list' => 'other-list'
+						'class' => 'form-control',
+						'list' => 'other-list'
 					));
 				?>
 
@@ -625,7 +625,7 @@ 
 						echo elgg_view('input/text', array(
 							'name' => 'name',
 							'id' => 'name',
-					        'class' => 'form-control display_name',
+							'class' => 'form-control display_name',
 							'value' => $name,
 							'aria-describedby' => 'display_name_notice',
 							'aria-required' => 'true',
@@ -644,7 +644,7 @@ 
 						echo elgg_view('input/text', array(
 							'name' => 'email',
 							'id' => 'email',
-					        'class' => 'form-control',
+							'class' => 'form-control',
 							'aria-required' => 'true',
 							'required' => true
 						));
@@ -678,7 +678,7 @@ 
 						echo elgg_view('input/text', array(
 							'name' => 'email2',
 							'id' => 'email2',
-					        'class' => 'form-control',
+							'class' => 'form-control',
 							'aria-required' => 'true',
 							'required' => true
 						));
@@ -694,7 +694,7 @@ 
 						echo elgg_view('input/password', array(
 							'name' => 'password',
 							'id' => 'password1',
-					        'class' => 'password_test form-control',
+							'class' => 'password_test form-control',
 							'value' => $password,
 							'aria-required' => 'true',
 							'required' => true
@@ -711,7 +711,7 @@ 
 						echo elgg_view('input/password', array(
 							'name' => 'password2',
 							'id' => 'password2',
-					        'class' => 'password2_test form-control',
+							'class' => 'password2_test form-control',
 							'value' => $password2,
 							'aria-required' => 'true',
 							'required' => true
@@ -724,7 +724,7 @@ 
 			    <div class="checkbox">
 			    	<label for="toc2">
 			    	<?php
-			    		echo elgg_view('input/checkbox', array(
+						echo elgg_view('input/checkbox', array(
 							'name' => 'toc2',
 							'id' => 'toc2',
 							'value' => '1',
@@ -749,8 +749,8 @@ 
 
 					// note: disable
 					echo elgg_view('input/submit', array(
-					    'value' => elgg_echo('gcRegister:register'),
-					    'class' => 'btn-primary'
+						'value' => elgg_echo('gcRegister:register'),
+						'class' => 'btn-primary'
 					));
 					echo '</div>';
 				?>

Spacing +24 added lines, -24 removed lines

@@ -111,15 +111,15 @@ 
 	<?php
 	    $InviteGUID = get_input('friend_guid');
 	    
-	    if( $InviteGUID ):
+	    if ($InviteGUID):
 
 			$userObj = get_user($InviteGUID);
 
-			if( $userObj ):
+			if ($userObj):
 	              
 			    $userType = $userObj->user_type;
 			    // if user is public servant
-			    if( $userType == 'federal' ){
+			    if ($userType == 'federal') {
 			        $deptObj = elgg_get_entities(array(
 			            'type' => 'object',
 			            'subtype' => 'federal_departments',
@@ -127,7 +127,7 @@ 
 			        $depts = get_entity($deptObj[0]->guid);
 
 			        $federal_departments = array();
-			        if (get_current_language() == 'en'){
+			        if (get_current_language() == 'en') {
 			            $federal_departments = json_decode($depts->federal_departments_en, true);
 			        } else {
 			            $federal_departments = json_decode($depts->federal_departments_fr, true);
@@ -136,12 +136,12 @@ 
 			        $department = $federal_departments[$userObj->federal];
 
 			    // otherwise if user is student or academic
-			    } else if( $userType == 'student' || $userType == 'academic' ){
+			    } else if ($userType == 'student' || $userType == 'academic') {
 			        $institution = $userObj->institution;
 			        $department = ($institution == 'university') ? $userObj->university : $userObj->college;
 
 			    // otherwise if user is provincial employee
-			    } else if( $userType == 'provincial' ){
+			    } else if ($userType == 'provincial') {
 			        $provObj = elgg_get_entities(array(
 			            'type' => 'object',
 			            'subtype' => 'provinces',
@@ -149,7 +149,7 @@ 
 			        $provs = get_entity($provObj[0]->guid);
 
 			        $provinces = array();
-			        if (get_current_language() == 'en'){
+			        if (get_current_language() == 'en') {
 			            $provinces = json_decode($provs->provinces_en, true);
 			        } else {
 			            $provinces = json_decode($provs->provinces_fr, true);
@@ -162,14 +162,14 @@ 
 			        $mins = get_entity($minObj[0]->guid);
 
 			        $ministries = array();
-			        if (get_current_language() == 'en'){
+			        if (get_current_language() == 'en') {
 			            $ministries = json_decode($mins->ministries_en, true);
 			        } else {
 			            $ministries = json_decode($mins->ministries_fr, true);
 			        }
 
 			        $department = $provinces[$userObj->provincial];
-			        if($userObj->ministry && $userObj->ministry !== "default_invalid_value"){ $department .= ' / ' . $ministries[$userObj->provincial][$userObj->ministry]; }
+			        if ($userObj->ministry && $userObj->ministry !== "default_invalid_value") { $department .= ' / ' . $ministries[$userObj->provincial][$userObj->ministry]; }
 
 			    // otherwise show basic info
 			    } else {
@@ -271,7 +271,7 @@ 
 					$unis = get_entity($uniObj[0]->guid);
 
 					$universities = array();
-					if (get_current_language() == 'en'){
+					if (get_current_language() == 'en') {
 						$universities = json_decode($unis->universities_en, true);
 					} else {
 						$universities = json_decode($unis->universities_fr, true);
@@ -302,7 +302,7 @@ 
 					$cols = get_entity($colObj[0]->guid);
 
 					$colleges = array();
-					if (get_current_language() == 'en'){
+					if (get_current_language() == 'en') {
 						$colleges = json_decode($cols->colleges_en, true);
 					} else {
 						$colleges = json_decode($cols->colleges_fr, true);
@@ -349,7 +349,7 @@ 
 					$depts = get_entity($deptObj[0]->guid);
 
 					$federal_departments = array();
-					if (get_current_language() == 'en'){
+					if (get_current_language() == 'en') {
 						$federal_departments = json_decode($depts->federal_departments_en, true);
 					} else {
 						$federal_departments = json_decode($depts->federal_departments_fr, true);
@@ -380,7 +380,7 @@ 
 					$provs = get_entity($provObj[0]->guid);
 
 					$provincial_departments = array();
-					if (get_current_language() == 'en'){
+					if (get_current_language() == 'en') {
 						$provincial_departments = json_decode($provs->provinces_en, true);
 					} else {
 						$provincial_departments = json_decode($provs->provinces_fr, true);
@@ -409,15 +409,15 @@ 
 					$mins = get_entity($minObj[0]->guid);
 
 					$ministries = array();
-					if (get_current_language() == 'en'){
+					if (get_current_language() == 'en') {
 						$ministries = json_decode($mins->ministries_en, true);
 					} else {
 						$ministries = json_decode($mins->ministries_fr, true);
 					}
 					asort($ministries);
 
-					if( !empty($provincial_departments) ){
-						foreach($provincial_departments as $province => $province_name){
+					if (!empty($provincial_departments)) {
+						foreach ($provincial_departments as $province => $province_name) {
 							asort($ministries[$province]);
 
 							$prov_id = str_replace(" ", "-", strtolower($province));
@@ -443,7 +443,7 @@ 
 					$municipals = get_entity($munObj[0]->guid);
 
 					$municipal = array();
-					if (get_current_language() == 'en'){
+					if (get_current_language() == 'en') {
 						$municipal = json_decode($municipals->municipal_en, true);
 					} else {
 						$municipal = json_decode($municipals->municipal_fr, true);
@@ -462,10 +462,10 @@ 
 					<?php echo $municipal_choices; ?>
 					<datalist id="municipal-list">
 						<?php
-							if( !empty($municipal) ){
+							if (!empty($municipal)) {
 								asort($municipal);
 								
-								foreach($municipal as $municipal_name => $value){
+								foreach ($municipal as $municipal_name => $value) {
 									echo '<option value="' . $municipal_name . '">' . $value . '</option>';
 								}
 							}
@@ -566,8 +566,8 @@ 
 					<?php echo $retired_choices; ?>
 					<datalist id="retired-list">
 						<?php
-							if( !empty($federal_departments) ){
-								foreach($federal_departments as $federal_name => $value){
+							if (!empty($federal_departments)) {
+								foreach ($federal_departments as $federal_name => $value) {
 									echo '<option value="' . $value . '"></option>';
 								}
 							}
@@ -585,7 +585,7 @@ 
 					$others = get_entity($otherObj[0]->guid);
 
 					$other = array();
-					if (get_current_language() == 'en'){
+					if (get_current_language() == 'en') {
 						$other = json_decode($others->other_en, true);
 					} else {
 						$other = json_decode($others->other_fr, true);
@@ -605,8 +605,8 @@ 
 					<?php echo $other_choices; ?>
 					<datalist id="other-list">
 						<?php
-							if( !empty($other) ){
-								foreach($other as $other_name => $value){
+							if (!empty($other)) {
+								foreach ($other as $other_name => $value) {
 									echo '<option value="' . $other_name . '">' . $value . '</option>';
 								}
 							}

mod/web_services/lib/tokens.php

Spacing +4 added lines, -4 removed lines

@@ -52,8 +52,8 @@ 
 		$site_guid = $CONFIG->site_id;
 	}
 
-	$site_guid = (int)$site_guid;
-	$user_guid = (int)$user_guid;
+	$site_guid = (int) $site_guid;
+	$user_guid = (int) $user_guid;
 
 	$tokens = get_data("SELECT * from {$CONFIG->dbprefix}users_apisessions
 		where user_guid=$user_guid and site_guid=$site_guid");
@@ -79,7 +79,7 @@ 
 		$site_guid = $CONFIG->site_id;
 	}
 
-	$site_guid = (int)$site_guid;
+	$site_guid = (int) $site_guid;
 	$token = sanitise_string($token);
 
 	$time = time();
@@ -110,7 +110,7 @@ 
 		$site_guid = $CONFIG->site_id;
 	}
 
-	$site_guid = (int)$site_guid;
+	$site_guid = (int) $site_guid;
 	$token = sanitise_string($token);
 
 	return delete_data("DELETE from {$CONFIG->dbprefix}users_apisessions