gctools-outilsgc / gcconnex

mod/b_extended_profile/actions/b_extended_profile/userfind.php

Indentation +3 added lines, -3 removed lines

@@ -9,9 +9,9 @@
 $query = htmlspecialchars($_GET['query']);
 $result = array();
 foreach ($skills as $s) {
-    if (strpos(strtolower($s), strtolower($query)) !== FALSE) {
-        $result[] = array('value' => $s);
-    }
+	if (strpos(strtolower($s), strtolower($query)) !== FALSE) {
+		$result[] = array('value' => $s);
+	}
 }
 
 $vars["output"] = $result;

mod/b_extended_profile/actions/b_extended_profile/add_endorsement.php

Indentation +13 added lines, -13 removed lines

@@ -7,19 +7,19 @@
 
 //This is an Ajax call
 if (elgg_is_xhr()) {  
-    $user_guid = get_input('guid');
-    $skill_guid = get_input('skill');
-    $skill = get_entity($skill_guid);
+	$user_guid = get_input('guid');
+	$skill_guid = get_input('skill');
+	$skill = get_entity($skill_guid);
 
-    if ($skill->endorsements == NULL) {
-        $skill->endorsements = $user_guid;
-    }
-    else {
-        $stack = $skill->endorsements;
-        if (!(is_array($stack))) { $stack = array($stack); }
+	if ($skill->endorsements == NULL) {
+		$skill->endorsements = $user_guid;
+	}
+	else {
+		$stack = $skill->endorsements;
+		if (!(is_array($stack))) { $stack = array($stack); }
 
-        $stack[] = $user_guid;
-        $skill->endorsements = $stack;
-    }
-    $skill->save();
+		$stack[] = $user_guid;
+		$skill->endorsements = $stack;
+	}
+	$skill->save();
 }
\ No newline at end of file

Braces +1 added lines, -2 removed lines

@@ -13,8 +13,7 @@
 
     if ($skill->endorsements == NULL) {
         $skill->endorsements = $user_guid;
-    }
-    else {
+    } else {
         $stack = $skill->endorsements;
         if (!(is_array($stack))) { $stack = array($stack); }
 

mod/b_extended_profile/actions/b_extended_profile/autoskill.php

Indentation +49 added lines, -49 removed lines

@@ -11,44 +11,44 @@ 
 
 foreach ($skills as $s) {
 
-    // full word at start of skill title
-    if (strpos(strtolower(' ' . $s) . ' ', ' ' . strtolower($query) . ' ') === 0 ) {
-        $result[] = array(
-            'value' => $s,
-            'pos' => 0
-        );
-    }
+	// full word at start of skill title
+	if (strpos(strtolower(' ' . $s) . ' ', ' ' . strtolower($query) . ' ') === 0 ) {
+		$result[] = array(
+			'value' => $s,
+			'pos' => 0
+		);
+	}
 
-    // full word somewhere in skill title
-    elseif (strpos(strtolower(' ' . $s) . ' ', ' ' . strtolower($query) . ' ') !== FALSE) {
-        $result[] = array(
-            'value' => $s,
-            'pos' => 1
-        );
-    }
+	// full word somewhere in skill title
+	elseif (strpos(strtolower(' ' . $s) . ' ', ' ' . strtolower($query) . ' ') !== FALSE) {
+		$result[] = array(
+			'value' => $s,
+			'pos' => 1
+		);
+	}
 
-    // partial word at start of skill title
-    elseif (strpos(strtolower(' ' . $s), ' ' . strtolower($query)) === 0 ) {
-        $result[] = array(
-            'value' => $s,
-            'pos' => 2
-        );
-    }
+	// partial word at start of skill title
+	elseif (strpos(strtolower(' ' . $s), ' ' . strtolower($query)) === 0 ) {
+		$result[] = array(
+			'value' => $s,
+			'pos' => 2
+		);
+	}
 
-    //partial word somewhere in skill title
-    elseif (strpos(strtolower(' ' . $s), ' ' . strtolower($query)) !== FALSE) {
-        $result[] = array(
-            'value' => $s,
-            'pos' => 3
-        );
-    }
+	//partial word somewhere in skill title
+	elseif (strpos(strtolower(' ' . $s), ' ' . strtolower($query)) !== FALSE) {
+		$result[] = array(
+			'value' => $s,
+			'pos' => 3
+		);
+	}
 
-    elseif (strpos(strtolower($s), strtolower($query)) !== FALSE) {
-        $result[] = array(
-            'value' => $s,
-            'pos' => 4
-        );
-    }
+	elseif (strpos(strtolower($s), strtolower($query)) !== FALSE) {
+		$result[] = array(
+			'value' => $s,
+			'pos' => 4
+		);
+	}
 }
 
 $highest_relevance = array();
@@ -58,21 +58,21 @@ 
 $lowest_relevance = array();
 
 foreach ( $result as $r ) {
-    if ( $r['pos'] == 0 ) {
-        $highest_relevance[] = $r;
-    }
-    elseif ( $r['pos'] == 1 ) {
-        $high_relevance[] = $r;
-    }
-    elseif ( $r['pos'] == 2 ) {
-        $med_relevance[] = $r;
-    }
-    elseif ( $r['pos'] == 3 ) {
-        $low_relevance[] = $r;
-    }
-    elseif ( $r['pos'] == 4 ) {
-        $lowest_relevance[] = $r;
-    }
+	if ( $r['pos'] == 0 ) {
+		$highest_relevance[] = $r;
+	}
+	elseif ( $r['pos'] == 1 ) {
+		$high_relevance[] = $r;
+	}
+	elseif ( $r['pos'] == 2 ) {
+		$med_relevance[] = $r;
+	}
+	elseif ( $r['pos'] == 3 ) {
+		$low_relevance[] = $r;
+	}
+	elseif ( $r['pos'] == 4 ) {
+		$lowest_relevance[] = $r;
+	}
 }
 
 $result = array_merge($highest_relevance, $high_relevance, $med_relevance, $low_relevance, $lowest_relevance);

Spacing +8 added lines, -8 removed lines

@@ -12,7 +12,7 @@ 
 foreach ($skills as $s) {
 
     // full word at start of skill title
-    if (strpos(strtolower(' ' . $s) . ' ', ' ' . strtolower($query) . ' ') === 0 ) {
+    if (strpos(strtolower(' ' . $s) . ' ', ' ' . strtolower($query) . ' ') === 0) {
         $result[] = array(
             'value' => $s,
             'pos' => 0
@@ -28,7 +28,7 @@ 
     }
 
     // partial word at start of skill title
-    elseif (strpos(strtolower(' ' . $s), ' ' . strtolower($query)) === 0 ) {
+    elseif (strpos(strtolower(' ' . $s), ' ' . strtolower($query)) === 0) {
         $result[] = array(
             'value' => $s,
             'pos' => 2
@@ -57,20 +57,20 @@ 
 $low_relevance = array();
 $lowest_relevance = array();
 
-foreach ( $result as $r ) {
-    if ( $r['pos'] == 0 ) {
+foreach ($result as $r) {
+    if ($r['pos'] == 0) {
         $highest_relevance[] = $r;
     }
-    elseif ( $r['pos'] == 1 ) {
+    elseif ($r['pos'] == 1) {
         $high_relevance[] = $r;
     }
-    elseif ( $r['pos'] == 2 ) {
+    elseif ($r['pos'] == 2) {
         $med_relevance[] = $r;
     }
-    elseif ( $r['pos'] == 3 ) {
+    elseif ($r['pos'] == 3) {
         $low_relevance[] = $r;
     }
-    elseif ( $r['pos'] == 4 ) {
+    elseif ($r['pos'] == 4) {
         $lowest_relevance[] = $r;
     }
 }

Braces +5 added lines, -11 removed lines

@@ -41,9 +41,7 @@ 
             'value' => $s,
             'pos' => 3
         );
-    }
-
-    elseif (strpos(strtolower($s), strtolower($query)) !== FALSE) {
+    } elseif (strpos(strtolower($s), strtolower($query)) !== FALSE) {
         $result[] = array(
             'value' => $s,
             'pos' => 4
@@ -60,17 +58,13 @@ 
 foreach ( $result as $r ) {
     if ( $r['pos'] == 0 ) {
         $highest_relevance[] = $r;
-    }
-    elseif ( $r['pos'] == 1 ) {
+    } elseif ( $r['pos'] == 1 ) {
         $high_relevance[] = $r;
-    }
-    elseif ( $r['pos'] == 2 ) {
+    } elseif ( $r['pos'] == 2 ) {
         $med_relevance[] = $r;
-    }
-    elseif ( $r['pos'] == 3 ) {
+    } elseif ( $r['pos'] == 3 ) {
         $low_relevance[] = $r;
-    }
-    elseif ( $r['pos'] == 4 ) {
+    } elseif ( $r['pos'] == 4 ) {
         $lowest_relevance[] = $r;
     }
 }

mod/b_extended_profile/actions/b_extended_profile/show-completed-mission.php

Spacing +1 added lines, -1 removed lines

@@ -12,7 +12,7 @@
 
 $hide_list_explode = explode(',', $manager->missions_hide_list);
 $key = array_search($mission->guid, $hide_list_explode);
-if(!($key === false)) {
+if (!($key === false)) {
 	unset($hide_list_explode[$key]);
 }
 

mod/b_extended_profile/actions/b_extended_profile/edit_profile.php

Indentation +496 added lines, -496 removed lines

@@ -1,553 +1,553 @@
 <?php
 if (elgg_is_xhr()) {  //This is an Ajax call!
-    $user_guid = get_input('guid');
-    $user = get_user($user_guid);
-    $section = get_input('section');
-    $error = false;
-    switch ($section) {
-        case "profile":
-            $profile_fields = get_input('profile');
-            $social_media = get_input('social_media');
-            $error_message = '';
-            foreach ( $profile_fields as $f => $v ) {
-                // cyu - check if email field is empty
-                if ($f === "email") {
-                    trim($v);   // remove white spaces from both sides of string
-                    if (!$v) {
-                        register_error(elgg_echo('gcc_profile:error').elgg_echo('gcc_profile:missingemail'));
-                        return true;
-                    }
+	$user_guid = get_input('guid');
+	$user = get_user($user_guid);
+	$section = get_input('section');
+	$error = false;
+	switch ($section) {
+		case "profile":
+			$profile_fields = get_input('profile');
+			$social_media = get_input('social_media');
+			$error_message = '';
+			foreach ( $profile_fields as $f => $v ) {
+				// cyu - check if email field is empty
+				if ($f === "email") {
+					trim($v);   // remove white spaces from both sides of string
+					if (!$v) {
+						register_error(elgg_echo('gcc_profile:error').elgg_echo('gcc_profile:missingemail'));
+						return true;
+					}
 
-                    elgg_load_library('c_ext_lib');
-                    $isValid = false;
+					elgg_load_library('c_ext_lib');
+					$isValid = false;
 
-                    if ($v) {
-                        // cyu - check if the email is in the list of exceptions
-                        $user_email = explode('@',$v);
-                        $list_of_domains = getExtension();
-                        if (count($list_of_domains) > 0) {
-                            while ($row = mysqli_fetch_array($list_of_domains)) {
-                                if (strtolower($row['ext']) === strtolower($user_email[1])) {
-                                    $isValid = true;
-                                    break;
-                                }
-                            }
-                            $error_message = elgg_echo('gcc_profile:error').elgg_echo('gcc_profile:notaccepted');
-                        }
-                        // cyu - check if domain is gc.ca
-                        if (!$isValid) {
-                            $govt_domain = explode('.',$user_email[1]);
-                            $govt_domain_len = count($govt_domain) - 1;
-                            if ($govt_domain[$govt_domain_len - 1].'.'.$govt_domain[$govt_domain_len] === 'gc.ca') {
-                                $isValid = true;
-                            } else {
-                                $isValid = false;
-                                $error_message = elgg_echo('gcc_profile:error').elgg_echo('gcc_profile:notaccepted');
-                            }
-                        }
-                    }
-                    if (!$isValid) {
-                        register_error($error_message);
-                        return true;
-                    }
-                    $user->set($f, $v);
-                }
-                else {
-                    if($f=='department'){
-                        $obj = elgg_get_entities(array(
-                                    'type' => 'object',
-                                    'subtype' => 'dept_list',
-                                    'owner_guid' => 0
-                                ));
-                                $departmentsEn = json_decode($obj[0]->deptsEn, true);
-                                $provinces['pov-alb'] = 'Government of Alberta';
-                                $provinces['pov-bc'] = 'Government of British Columbia';
-                                $provinces['pov-man'] = 'Government of Manitoba';
-                                $provinces['pov-nb'] = 'Government of New Brunswick';
-                                $provinces['pov-nfl'] = 'Government of Newfoundland and Labrador';
-                                $provinces['pov-ns'] = 'Government of Nova Scotia';
-                                $provinces['pov-nwt'] = 'Government of Northwest Territories';
-                                $provinces['pov-nun'] = 'Government of Nunavut';
-                                $provinces['pov-ont'] = 'Government of Ontario';
-                                $provinces['pov-pei'] = 'Government of Prince Edward Island';
-                                $provinces['pov-que'] = 'Government of Quebec';
-                                $provinces['pov-sask'] = 'Government of Saskatchewan';
-                                $provinces['pov-yuk'] = 'Government of Yukon';
-                                $departmentsEn = array_merge($departmentsEn,$provinces);
+					if ($v) {
+						// cyu - check if the email is in the list of exceptions
+						$user_email = explode('@',$v);
+						$list_of_domains = getExtension();
+						if (count($list_of_domains) > 0) {
+							while ($row = mysqli_fetch_array($list_of_domains)) {
+								if (strtolower($row['ext']) === strtolower($user_email[1])) {
+									$isValid = true;
+									break;
+								}
+							}
+							$error_message = elgg_echo('gcc_profile:error').elgg_echo('gcc_profile:notaccepted');
+						}
+						// cyu - check if domain is gc.ca
+						if (!$isValid) {
+							$govt_domain = explode('.',$user_email[1]);
+							$govt_domain_len = count($govt_domain) - 1;
+							if ($govt_domain[$govt_domain_len - 1].'.'.$govt_domain[$govt_domain_len] === 'gc.ca') {
+								$isValid = true;
+							} else {
+								$isValid = false;
+								$error_message = elgg_echo('gcc_profile:error').elgg_echo('gcc_profile:notaccepted');
+							}
+						}
+					}
+					if (!$isValid) {
+						register_error($error_message);
+						return true;
+					}
+					$user->set($f, $v);
+				}
+				else {
+					if($f=='department'){
+						$obj = elgg_get_entities(array(
+									'type' => 'object',
+									'subtype' => 'dept_list',
+									'owner_guid' => 0
+								));
+								$departmentsEn = json_decode($obj[0]->deptsEn, true);
+								$provinces['pov-alb'] = 'Government of Alberta';
+								$provinces['pov-bc'] = 'Government of British Columbia';
+								$provinces['pov-man'] = 'Government of Manitoba';
+								$provinces['pov-nb'] = 'Government of New Brunswick';
+								$provinces['pov-nfl'] = 'Government of Newfoundland and Labrador';
+								$provinces['pov-ns'] = 'Government of Nova Scotia';
+								$provinces['pov-nwt'] = 'Government of Northwest Territories';
+								$provinces['pov-nun'] = 'Government of Nunavut';
+								$provinces['pov-ont'] = 'Government of Ontario';
+								$provinces['pov-pei'] = 'Government of Prince Edward Island';
+								$provinces['pov-que'] = 'Government of Quebec';
+								$provinces['pov-sask'] = 'Government of Saskatchewan';
+								$provinces['pov-yuk'] = 'Government of Yukon';
+								$departmentsEn = array_merge($departmentsEn,$provinces);
 
-                                $departmentsFr = json_decode($obj[0]->deptsFr, true);
-                                $provincesFr['pov-alb'] = "Gouvernement de l'Alberta";
-                                $provincesFr['pov-bc'] = 'Gouvernement de la Colombie-Britannique';
-                                $provincesFr['pov-man'] = 'Gouvernement du Manitoba';
-                                $provincesFr['pov-nb'] = 'Gouvernement du Nouveau-Brunswick';
-                                $provincesFr['pov-nfl'] = 'Gouvernement de Terre-Neuve-et-Labrador';
-                                $provincesFr['pov-ns'] = 'Gouvernement de la Nouvelle-�cosse';
-                                $provincesFr['pov-nwt'] = 'Gouvernement du Territoires du Nord-Ouest';
-                                $provincesFr['pov-nun'] = 'Gouvernement du Nunavut';
-                                $provincesFr['pov-ont'] = "Gouvernement de l'Ontario";
-                                $provincesFr['pov-pei'] = "Gouvernement de l'�le-du-Prince-�douard";
-                                $provincesFr['pov-que'] = 'Gouvernement du Qu�bec';
-                                $provincesFr['pov-sask'] = 'Gouvernement de Saskatchewan';
-                                $provincesFr['pov-yuk'] = 'Gouvernement du Yukon';
-                                $departmentsFr = array_merge($departmentsFr,$provincesFr);
+								$departmentsFr = json_decode($obj[0]->deptsFr, true);
+								$provincesFr['pov-alb'] = "Gouvernement de l'Alberta";
+								$provincesFr['pov-bc'] = 'Gouvernement de la Colombie-Britannique';
+								$provincesFr['pov-man'] = 'Gouvernement du Manitoba';
+								$provincesFr['pov-nb'] = 'Gouvernement du Nouveau-Brunswick';
+								$provincesFr['pov-nfl'] = 'Gouvernement de Terre-Neuve-et-Labrador';
+								$provincesFr['pov-ns'] = 'Gouvernement de la Nouvelle-�cosse';
+								$provincesFr['pov-nwt'] = 'Gouvernement du Territoires du Nord-Ouest';
+								$provincesFr['pov-nun'] = 'Gouvernement du Nunavut';
+								$provincesFr['pov-ont'] = "Gouvernement de l'Ontario";
+								$provincesFr['pov-pei'] = "Gouvernement de l'�le-du-Prince-�douard";
+								$provincesFr['pov-que'] = 'Gouvernement du Qu�bec';
+								$provincesFr['pov-sask'] = 'Gouvernement de Saskatchewan';
+								$provincesFr['pov-yuk'] = 'Gouvernement du Yukon';
+								$departmentsFr = array_merge($departmentsFr,$provincesFr);
 
-                                if (get_current_language()=='en'){
-                                    $deptString = $departmentsEn[$v]." / ".$departmentsFr[$v];
-                                }else{
-                                    $deptString = $departmentsFr[$v]." / ".$departmentsEn[$v];
-                                }
+								if (get_current_language()=='en'){
+									$deptString = $departmentsEn[$v]." / ".$departmentsFr[$v];
+								}else{
+									$deptString = $departmentsFr[$v]." / ".$departmentsEn[$v];
+								}
 
-                                $user->set('department',$deptString);
+								$user->set('department',$deptString);
 
-                    }else if($f == 'location' && $v) {
+					}else if($f == 'location' && $v) {
 
-                      //check to see if addressString exists
-                      if($user->addressString && $user->addressStringFr){
+					  //check to see if addressString exists
+					  if($user->addressString && $user->addressStringFr){
 
-                        //split up location field value
-                        $address = explode(',', $v);
+						//split up location field value
+						$address = explode(',', $v);
 
-                        //Add cut up location field to address string
-                        //if user enters a proper address the address wil display nicely. If not the map will not display right
-                        //sadly we cannot extract all the same information from the location field properly to complete the json string
-                        $user->addressString = '{"street":"'.$address[0].'","city":"'.$address[1].'","province":"'.$address[2].'","country":"Canada","pc":""}';
-                        $user->addressStringFr = '{"street":"'.$address[0].'","city":"'.$address[1].'","province":"'.$address[2].'","country":"Canada","pc":""}';
+						//Add cut up location field to address string
+						//if user enters a proper address the address wil display nicely. If not the map will not display right
+						//sadly we cannot extract all the same information from the location field properly to complete the json string
+						$user->addressString = '{"street":"'.$address[0].'","city":"'.$address[1].'","province":"'.$address[2].'","country":"Canada","pc":""}';
+						$user->addressStringFr = '{"street":"'.$address[0].'","city":"'.$address[1].'","province":"'.$address[2].'","country":"Canada","pc":""}';
 
-                      }
+					  }
 
-                      //set value like normal
-                      $user->set($f, $v);
+					  //set value like normal
+					  $user->set($f, $v);
 
-                    } else {
-                        $user->set($f, $v);
-                    }
-                    //register_error($f);
+					} else {
+						$user->set($f, $v);
+					}
+					//register_error($f);
 
-                }
-            }
-            foreach ( $social_media as $f => $v ) {
-                $link = $v;
-                if (filter_var($link, FILTER_VALIDATE_URL) == false) {
-                    $user->set($f, $link);
-                }
-            }
-            //$user->micro = get_input('micro');
-            $user->save();
-            //forward($user->getURL());
-            break;
-        case 'about-me':
-            //$user->description = get_input('description', 'ERROR: Ask your admin to grep: 5FH13GAHHHS0001.');
-            //error_log(print_r("access: " . get_input('access')));
-            create_metadata($user_guid, 'description', get_input('description', 'ERROR: Ask your admin to grep: 5FH13GAHHHS0001.'), 'text', 0, get_input('access'));
-            $user->save();
-            break;
-        case 'education':
-            $eguid = get_input('eguid', '');
-            $delete = get_input('delete', '');
-            $school = get_input('school', 'ERROR: Ask your admin to grep: 5FH13GAHHHS0002.');
-            $startdate = get_input('startdate', 'ERROR: Ask your admin to grep: 5FH13GAHHHS0003.');
-            $startyear = get_input('startyear');
-            $enddate = get_input('enddate', 'ERROR: Ask your admin to grep: 5FH13GAHHHS0004.');
-            $endyear = get_input('endyear');
-            $ongoing = get_input('ongoing');
-            //$program = get_input('program', 'ERROR: Ask your admin to grep: 5FH13GAHHHS0005.');
-            $degree = get_input('degree');
-            $field = get_input('field', 'ERROR: Ask your admin to grep: 5FH13GAHHHS0006.');
-            $access = get_input('access', 'ERROR: Ask your admin to grep: 5321GDS1111661353BB.');
-            // create education object
-            $education_guids = array();
-            $education_list = $user->education;
-            if ($delete != null && !is_array($delete)) {
-                $delete = array( $delete );
-            }
-            if ( is_array($delete) ) {
-                foreach ($delete as $delete_guid) {
-                    if ($delete_guid != NULL) {
-                        if ($delete = get_entity($delete_guid)) {
-                            $delete->delete();
-                        }
-                        if (is_array($education_list)) {
-                            if (($key = array_search($delete_guid, $education_list)) !== false) {
-                                unset($education_list[$key]);
-                            }
-                        } elseif ($education_list == $delete_guid) {
-                            $education_list = null;
-                        }
-                    }
-                }
-            }
-            $user->education = $education_list;
-            if ($eguid != null && !is_array($eguid)) {
-                $eguid = array( $eguid );
-            }
-            //create new education entries
-            if (is_array($eguid)) {
-                foreach ($eguid as $k => $v) {
-                    $validInput = true;
-                    /*
+				}
+			}
+			foreach ( $social_media as $f => $v ) {
+				$link = $v;
+				if (filter_var($link, FILTER_VALIDATE_URL) == false) {
+					$user->set($f, $link);
+				}
+			}
+			//$user->micro = get_input('micro');
+			$user->save();
+			//forward($user->getURL());
+			break;
+		case 'about-me':
+			//$user->description = get_input('description', 'ERROR: Ask your admin to grep: 5FH13GAHHHS0001.');
+			//error_log(print_r("access: " . get_input('access')));
+			create_metadata($user_guid, 'description', get_input('description', 'ERROR: Ask your admin to grep: 5FH13GAHHHS0001.'), 'text', 0, get_input('access'));
+			$user->save();
+			break;
+		case 'education':
+			$eguid = get_input('eguid', '');
+			$delete = get_input('delete', '');
+			$school = get_input('school', 'ERROR: Ask your admin to grep: 5FH13GAHHHS0002.');
+			$startdate = get_input('startdate', 'ERROR: Ask your admin to grep: 5FH13GAHHHS0003.');
+			$startyear = get_input('startyear');
+			$enddate = get_input('enddate', 'ERROR: Ask your admin to grep: 5FH13GAHHHS0004.');
+			$endyear = get_input('endyear');
+			$ongoing = get_input('ongoing');
+			//$program = get_input('program', 'ERROR: Ask your admin to grep: 5FH13GAHHHS0005.');
+			$degree = get_input('degree');
+			$field = get_input('field', 'ERROR: Ask your admin to grep: 5FH13GAHHHS0006.');
+			$access = get_input('access', 'ERROR: Ask your admin to grep: 5321GDS1111661353BB.');
+			// create education object
+			$education_guids = array();
+			$education_list = $user->education;
+			if ($delete != null && !is_array($delete)) {
+				$delete = array( $delete );
+			}
+			if ( is_array($delete) ) {
+				foreach ($delete as $delete_guid) {
+					if ($delete_guid != NULL) {
+						if ($delete = get_entity($delete_guid)) {
+							$delete->delete();
+						}
+						if (is_array($education_list)) {
+							if (($key = array_search($delete_guid, $education_list)) !== false) {
+								unset($education_list[$key]);
+							}
+						} elseif ($education_list == $delete_guid) {
+							$education_list = null;
+						}
+					}
+				}
+			}
+			$user->education = $education_list;
+			if ($eguid != null && !is_array($eguid)) {
+				$eguid = array( $eguid );
+			}
+			//create new education entries
+			if (is_array($eguid)) {
+				foreach ($eguid as $k => $v) {
+					$validInput = true;
+					/*
                     if($ongoing[$k] == true){
                         $endyear[$k] = $startyear[$k];
                     }*/
-                    if(trim( htmlentities($school[$k])) == '' || trim( htmlentities($degree[$k])) == '' || trim( htmlentities($field[$k])) == ''){
-                        $validInput = false;
-                        $error == true;
-                    }
-                    /*
+					if(trim( htmlentities($school[$k])) == '' || trim( htmlentities($degree[$k])) == '' || trim( htmlentities($field[$k])) == ''){
+						$validInput = false;
+						$error == true;
+					}
+					/*
                     if(trim( $endyear[$k]) < trim($startyear[$k])){
                         $validInput = false;
                         $error == true;
                     }
                     */
-                    if($validInput == true){
-                        if ($v == "new") {
-                            $education = new ElggObject();
-                            $education->subtype = "education";
-                            $education->owner_guid = $user_guid;
-                        } else {
-                            $education = get_entity($v);
-                        }
-                        $education->title = htmlentities($school[$k]);
-                        $education->description = htmlentities($degree[$k]);
-                        $education->school = htmlentities($school[$k]);
-                        $education->startdate = $startdate[$k];
-                        $education->startyear = $startyear[$k];
-                        $education->enddate = $enddate[$k];
-                        $education->endyear = $endyear[$k];
-                        $education->ongoing = $ongoing[$k];
-                        //$education->program = htmlentities($program[$k]);
-                        $education->degree = htmlentities($degree[$k]);
-                        $education->field = htmlentities($field[$k]);
-                        $education->access_id = $access;
-                        if ($v == "new") {
-                            $education_guids[] = $education->save();
-                        } else {
-                            $education->save();
-                        }
-                    }
-                }
-            }
-            if ($user->education == NULL) {
-                $user->education = $education_guids;
-            }
-            else {
-                $stack = $user->education;
-                if (!(is_array($stack))) { $stack = array($stack); }
-                if ($education_guids != NULL) {
-                    $user->education = array_merge($stack, $education_guids);
-                }
-            }
-            $user->education_access = $access;
-            $user->save();
-            break;
-        case 'work-experience':
-            $work_experience = get_input('work');
-            $edit = $work_experience['edit'];
-            $delete = $work_experience['delete_guids'];
-            $access = get_input('access');
-            $experience_list = $user->work;
-            if (!(is_array($delete))) { $delete = array($delete); }
-            foreach ($delete as $delete_guid) {
-                if ($delete_guid != NULL) {
-                    if ($delete = get_entity($delete_guid)) {
-                        $delete->delete();
-                    }
-                    if (is_array($experience_list)) {
-                        if (($key = array_search($delete_guid, $experience_list)) !== false) {
-                            unset($experience_list[$key]);
-                        }
-                    }
-                    elseif ($experience_list == $delete_guid) {
-                        $experience_list = null;
-                    }
-                }
-            }
-            $user->work = $experience_list;
-            $work_experience_guids = array();
-            if ($edit != null && !is_array($edit)) {
-                $edit = array( $edit );
-            }
+					if($validInput == true){
+						if ($v == "new") {
+							$education = new ElggObject();
+							$education->subtype = "education";
+							$education->owner_guid = $user_guid;
+						} else {
+							$education = get_entity($v);
+						}
+						$education->title = htmlentities($school[$k]);
+						$education->description = htmlentities($degree[$k]);
+						$education->school = htmlentities($school[$k]);
+						$education->startdate = $startdate[$k];
+						$education->startyear = $startyear[$k];
+						$education->enddate = $enddate[$k];
+						$education->endyear = $endyear[$k];
+						$education->ongoing = $ongoing[$k];
+						//$education->program = htmlentities($program[$k]);
+						$education->degree = htmlentities($degree[$k]);
+						$education->field = htmlentities($field[$k]);
+						$education->access_id = $access;
+						if ($v == "new") {
+							$education_guids[] = $education->save();
+						} else {
+							$education->save();
+						}
+					}
+				}
+			}
+			if ($user->education == NULL) {
+				$user->education = $education_guids;
+			}
+			else {
+				$stack = $user->education;
+				if (!(is_array($stack))) { $stack = array($stack); }
+				if ($education_guids != NULL) {
+					$user->education = array_merge($stack, $education_guids);
+				}
+			}
+			$user->education_access = $access;
+			$user->save();
+			break;
+		case 'work-experience':
+			$work_experience = get_input('work');
+			$edit = $work_experience['edit'];
+			$delete = $work_experience['delete_guids'];
+			$access = get_input('access');
+			$experience_list = $user->work;
+			if (!(is_array($delete))) { $delete = array($delete); }
+			foreach ($delete as $delete_guid) {
+				if ($delete_guid != NULL) {
+					if ($delete = get_entity($delete_guid)) {
+						$delete->delete();
+					}
+					if (is_array($experience_list)) {
+						if (($key = array_search($delete_guid, $experience_list)) !== false) {
+							unset($experience_list[$key]);
+						}
+					}
+					elseif ($experience_list == $delete_guid) {
+						$experience_list = null;
+					}
+				}
+			}
+			$user->work = $experience_list;
+			$work_experience_guids = array();
+			if ($edit != null && !is_array($edit)) {
+				$edit = array( $edit );
+			}
 
-            //create new work experience entries
-            if ( is_array($edit) ) {
-                foreach ($edit as $work) {
-                    $validInput = true;
-                    /*
+			//create new work experience entries
+			if ( is_array($edit) ) {
+				foreach ($edit as $work) {
+					$validInput = true;
+					/*
                     if($work['ongoing'] == true){
                         $work['endyear'] = $work['startyear'];
                     }
                     */
-                    //validation of work experience entry
-                    if(trim($work['title']) == '' || trim($work['organization']) == ''){
-                        $validInput = false;
-                        $error = true;
-                    }
-                    /*
+					//validation of work experience entry
+					if(trim($work['title']) == '' || trim($work['organization']) == ''){
+						$validInput = false;
+						$error = true;
+					}
+					/*
                     if(trim($work['endyear']) < trim($work['startyear'])){
                         $validInput = false;
                         $error = true;
                     }
                     */
-                    if($validInput == true) {
-                        if ($work['eguid'] == "new") {
-                            $experience = new ElggObject();
-                            $experience->subtype = "experience";
-                            $experience->owner_guid = $user_guid;
-                        } else {
-                            $experience = get_entity($work['eguid']);
-                        }
-                        $experience->title = htmlentities($work['title']);
-                        $experience->description = htmlentities($work['responsibilities']);
-                        $experience->organization = htmlentities($work['organization']);
-                        $experience->startdate = $work['startdate'];
-                        $experience->startyear = $work['startyear'];
-                        $experience->enddate = $work['enddate'];
-                        $experience->endyear = $work['endyear'];
-                        $experience->ongoing = $work['ongoing'];
-                        $experience->responsibilities = trim($work['responsibilities']);
-                        $experience->colleagues = $work['colleagues'];
-                        $experience->access_id = $access;
-                        if ($work['eguid'] == "new") {
-                            $work_experience_guids[] = $experience->save();
-                        } else {
-                            $experience->save();
-                        }
-                    }
-                }
-            }
-            if ($user->work == NULL) {
-                $user->work = $work_experience_guids;
-            }
-            else {
-                $stack = $user->work;
-                if (!(is_array($stack))) { $stack = array($stack); }
-                if ($work_experience_guids != NULL) {
-                    $user->work = array_merge($stack, $work_experience_guids);
-                }
-            }
-            $user->work_access = $access;
-            $user->save();
-            break;
-        case 'skills':
-            $skillsToAdd = get_input('skillsadded', 'ERROR: Ask your admin to grep: 5FH13GAHHHS0021.');
-            $skillsToRemove = get_input('skillsremoved', 'ERROR: Ask your admin to grep: 5FH13GAHHHS0022.');
-            //$access = ACCESS_LOGGED_IN;
-            $access = get_input('access');
-            //error_log('test - '.$access);
-            $skill_guids = array();
-            foreach ($skillsToAdd as $new_skill) {
-                $skill = new ElggObject();
-                $skill->subtype = "MySkill";
-                $skill->title = htmlentities($new_skill);
-                $skill->owner_guid = $user_guid;
-                $skill->access_id = $access;
-                $skill->endorsements = NULL;
-                $skill_guids[] = $skill->save();
-            }
-            $skill_list = $user->gc_skills;
-            if (!(is_array($skill_list))) { $skill_list = array($skill_list); }
-            if (!(is_array($skillsToRemove))) { $skillsToRemove = array($skillsToRemove); }
-            foreach ($skillsToRemove as $remove_guid) {
-                if ($remove_guid != NULL) {
-                    if ($remove = get_entity($remove_guid)) {
-                        $remove->delete();
-                    }
-                    if (($key = array_search($remove_guid, $skill_list)) !== false) {
-                        unset($skill_list[$key]);
-                    }
-                }
-            }
-            $user->gc_skills = $skill_list;
-            if ($user->gc_skills == NULL) {
-                $user->gc_skills = $skill_guids;
-            }
-            else {
-                $stack = $user->gc_skills;
-                if (!(is_array($stack))) { $stack = array($stack); }
-                if ($skill_guids != NULL) {
-                    $user->gc_skills = array_merge($stack, $skill_guids);
-                }
-            }
-            //$user->gc_skills = null; // dev stuff... delete me
-            //$user->skillsupgraded = NULL; // dev stuff.. delete me
-            $user->skill_access = $access;
-            $user->save();
+					if($validInput == true) {
+						if ($work['eguid'] == "new") {
+							$experience = new ElggObject();
+							$experience->subtype = "experience";
+							$experience->owner_guid = $user_guid;
+						} else {
+							$experience = get_entity($work['eguid']);
+						}
+						$experience->title = htmlentities($work['title']);
+						$experience->description = htmlentities($work['responsibilities']);
+						$experience->organization = htmlentities($work['organization']);
+						$experience->startdate = $work['startdate'];
+						$experience->startyear = $work['startyear'];
+						$experience->enddate = $work['enddate'];
+						$experience->endyear = $work['endyear'];
+						$experience->ongoing = $work['ongoing'];
+						$experience->responsibilities = trim($work['responsibilities']);
+						$experience->colleagues = $work['colleagues'];
+						$experience->access_id = $access;
+						if ($work['eguid'] == "new") {
+							$work_experience_guids[] = $experience->save();
+						} else {
+							$experience->save();
+						}
+					}
+				}
+			}
+			if ($user->work == NULL) {
+				$user->work = $work_experience_guids;
+			}
+			else {
+				$stack = $user->work;
+				if (!(is_array($stack))) { $stack = array($stack); }
+				if ($work_experience_guids != NULL) {
+					$user->work = array_merge($stack, $work_experience_guids);
+				}
+			}
+			$user->work_access = $access;
+			$user->save();
+			break;
+		case 'skills':
+			$skillsToAdd = get_input('skillsadded', 'ERROR: Ask your admin to grep: 5FH13GAHHHS0021.');
+			$skillsToRemove = get_input('skillsremoved', 'ERROR: Ask your admin to grep: 5FH13GAHHHS0022.');
+			//$access = ACCESS_LOGGED_IN;
+			$access = get_input('access');
+			//error_log('test - '.$access);
+			$skill_guids = array();
+			foreach ($skillsToAdd as $new_skill) {
+				$skill = new ElggObject();
+				$skill->subtype = "MySkill";
+				$skill->title = htmlentities($new_skill);
+				$skill->owner_guid = $user_guid;
+				$skill->access_id = $access;
+				$skill->endorsements = NULL;
+				$skill_guids[] = $skill->save();
+			}
+			$skill_list = $user->gc_skills;
+			if (!(is_array($skill_list))) { $skill_list = array($skill_list); }
+			if (!(is_array($skillsToRemove))) { $skillsToRemove = array($skillsToRemove); }
+			foreach ($skillsToRemove as $remove_guid) {
+				if ($remove_guid != NULL) {
+					if ($remove = get_entity($remove_guid)) {
+						$remove->delete();
+					}
+					if (($key = array_search($remove_guid, $skill_list)) !== false) {
+						unset($skill_list[$key]);
+					}
+				}
+			}
+			$user->gc_skills = $skill_list;
+			if ($user->gc_skills == NULL) {
+				$user->gc_skills = $skill_guids;
+			}
+			else {
+				$stack = $user->gc_skills;
+				if (!(is_array($stack))) { $stack = array($stack); }
+				if ($skill_guids != NULL) {
+					$user->gc_skills = array_merge($stack, $skill_guids);
+				}
+			}
+			//$user->gc_skills = null; // dev stuff... delete me
+			//$user->skillsupgraded = NULL; // dev stuff.. delete me
+			$user->skill_access = $access;
+			$user->save();
 
-            break;
-        case 'old-skills':
-            $user->skillsupgraded = TRUE;
-            break;
-        case 'languages':
-            $firstlang = get_input('firstlang', '');
-            $french = get_input('french', 'ERROR: Ask your admin to grep: ASFDJKGJKG333616.');
-            $english = get_input('english', 'ERROR: Ask your admin to grep: SDFANLVNVNVNVNVNAA31566.');
-            $languagesToAdd = get_input('langadded', 'ERROR: Ask your admin to grep: 5FH13FFSSGAHHHS0021.');
-            $languagesToRemove = get_input('langremoved', 'ERROR: Ask your admin to grep: 5AAAAGGFH13GAH0022.');
-            //$access = get_input('access');    // not used
-            $access = get_input('access_id');
-            $user->english = $english;
-            $user->french = $french;
-            $user->officialLanguage = $firstlang;
-            $user->save();
+			break;
+		case 'old-skills':
+			$user->skillsupgraded = TRUE;
+			break;
+		case 'languages':
+			$firstlang = get_input('firstlang', '');
+			$french = get_input('french', 'ERROR: Ask your admin to grep: ASFDJKGJKG333616.');
+			$english = get_input('english', 'ERROR: Ask your admin to grep: SDFANLVNVNVNVNVNAA31566.');
+			$languagesToAdd = get_input('langadded', 'ERROR: Ask your admin to grep: 5FH13FFSSGAHHHS0021.');
+			$languagesToRemove = get_input('langremoved', 'ERROR: Ask your admin to grep: 5AAAAGGFH13GAH0022.');
+			//$access = get_input('access');    // not used
+			$access = get_input('access_id');
+			$user->english = $english;
+			$user->french = $french;
+			$user->officialLanguage = $firstlang;
+			$user->save();
 
-            $metadata = elgg_get_metadata(array(
-                'metadata_names' => array('english'),
-                'metadata_owner_guids' => array(elgg_get_logged_in_user_guid()),
-            ));
-            if ($metadata){
-                foreach ($metadata as $data){
+			$metadata = elgg_get_metadata(array(
+				'metadata_names' => array('english'),
+				'metadata_owner_guids' => array(elgg_get_logged_in_user_guid()),
+			));
+			if ($metadata){
+				foreach ($metadata as $data){
 
-                    update_metadata($data->id, $data->name, $data->value, $data->value_type, $data->owner_guid, $access);
-                    //error_log('id '.$data->id .' name '. $data->name.' value '. $data->value.' value type '. $data->value_type.' owner_guid '.$data->owner_guid.' $access '. $access);
-                }
-                //$metadata[0]->save();
-            }
-            $metadata = elgg_get_metadata(array(
-                'metadata_names' => array('french'),
-                'metadata_owner_guids' => array(elgg_get_logged_in_user_guid()),
-            ));
-            if ($metadata){
-                foreach ($metadata as $data){
+					update_metadata($data->id, $data->name, $data->value, $data->value_type, $data->owner_guid, $access);
+					//error_log('id '.$data->id .' name '. $data->name.' value '. $data->value.' value type '. $data->value_type.' owner_guid '.$data->owner_guid.' $access '. $access);
+				}
+				//$metadata[0]->save();
+			}
+			$metadata = elgg_get_metadata(array(
+				'metadata_names' => array('french'),
+				'metadata_owner_guids' => array(elgg_get_logged_in_user_guid()),
+			));
+			if ($metadata){
+				foreach ($metadata as $data){
 
-                    update_metadata($data->id, $data->name, $data->value, $data->value_type, $data->owner_guid, $access);
-                }
-                //$metadata[0]->save();
-            }
-            $metadata = elgg_get_metadata(array(
-                'metadata_names' => array('officialLanguage'),
-                'metadata_owner_guids' => array(elgg_get_logged_in_user_guid()),
-            ));
-            if ($metadata){
-                foreach ($metadata as $data){
+					update_metadata($data->id, $data->name, $data->value, $data->value_type, $data->owner_guid, $access);
+				}
+				//$metadata[0]->save();
+			}
+			$metadata = elgg_get_metadata(array(
+				'metadata_names' => array('officialLanguage'),
+				'metadata_owner_guids' => array(elgg_get_logged_in_user_guid()),
+			));
+			if ($metadata){
+				foreach ($metadata as $data){
 
-                    update_metadata($data->id, $data->name, $data->value, $data->value_type, $data->owner_guid, $access);
-                }
-                //$metadata[0]->save();
-            }
+					update_metadata($data->id, $data->name, $data->value, $data->value_type, $data->owner_guid, $access);
+				}
+				//$metadata[0]->save();
+			}
 
-            break;
-        case 'portfolio':
-            $portfolio = get_input('portfolio');
-            $edit = $portfolio['edit'];
-            $delete = $portfolio['delete_guids'];
-            $access = get_input('access');
-            $portfolio_list = $user->portfolio;
-            if (!(is_array($delete))) { $delete = array($delete); }
-            foreach ($delete as $delete_guid) {
-                if ($delete_guid != NULL) {
-                    if ($delete = get_entity($delete_guid)) {
-                        $delete->delete();
-                    }
-                    if (is_array($portfolio_list)) {
-                        if (($key = array_search($delete_guid, $portfolio_list)) !== false) {
-                            unset($portfolio_list[$key]);
-                        }
-                    }
-                    elseif ($portfolio_list == $delete_guid) {
-                        $portfolio_list = null;
-                    }
-                }
-            }
-            $user->portfolio = $portfolio_list;
-            $portfolio_list_guids = array();
-            //create new work experience entries
-            foreach ($edit as $portfolio_edit) {
-                $validInput = true;
-                if(trim($portfolio_edit['title']) == '' || trim($portfolio_edit['description']) == '' || trim($portfolio_edit['link']) == ''){
-                    $validInput = false;
-                    $error = true;
-                }
-                if($portfolio_edit['datestamped'] == false && trim( $portfolio_edit['pubdate']) == ''){
-                    $validInput = false;
-                    $error = true;
-                }
-                if($validInput == true){
-                    if ($portfolio_edit['eguid'] == "new") {
-                        $entry = new ElggObject();
-                        $entry->subtype = "portfolio";
-                        $entry->owner_guid = $user_guid;
-                    }
-                    else {
-                        $entry = get_entity($portfolio_edit['eguid']);
-                    }
-                    $entry->title = htmlentities($portfolio_edit['title']);
-                    $entry->description = htmlentities($portfolio_edit['description']);
-                    $entry->link = $portfolio_edit['link'];
-                    $entry->pubdate = $portfolio_edit['pubdate'];
-                    $entry->datestamped = $portfolio_edit['datestamped'];
-                    $entry->access_id = $access;
-                    if($portfolio_edit['eguid'] == "new") {
-                        $portfolio_list_guids[] = $entry->save();
-                    }
-                    else {
-                        $entry->save();
-                    }
-                }
-            }
-            if ($user->portfolio == NULL) {
-                $user->portfolio = $portfolio_list_guids;
-            }
-            else {
-                $stack = $user->portfolio;
-                if (!(is_array($stack))) { $stack = array($stack); }
-                if ($portfolio_list_guids != NULL) {
-                    $user->portfolio = array_merge($stack, $portfolio_list_guids);
-                }
-            }
-            //$user->portfolio = null;
-            $user->portfolio_access = $access;
-            $user->save();
-            break;
+			break;
+		case 'portfolio':
+			$portfolio = get_input('portfolio');
+			$edit = $portfolio['edit'];
+			$delete = $portfolio['delete_guids'];
+			$access = get_input('access');
+			$portfolio_list = $user->portfolio;
+			if (!(is_array($delete))) { $delete = array($delete); }
+			foreach ($delete as $delete_guid) {
+				if ($delete_guid != NULL) {
+					if ($delete = get_entity($delete_guid)) {
+						$delete->delete();
+					}
+					if (is_array($portfolio_list)) {
+						if (($key = array_search($delete_guid, $portfolio_list)) !== false) {
+							unset($portfolio_list[$key]);
+						}
+					}
+					elseif ($portfolio_list == $delete_guid) {
+						$portfolio_list = null;
+					}
+				}
+			}
+			$user->portfolio = $portfolio_list;
+			$portfolio_list_guids = array();
+			//create new work experience entries
+			foreach ($edit as $portfolio_edit) {
+				$validInput = true;
+				if(trim($portfolio_edit['title']) == '' || trim($portfolio_edit['description']) == '' || trim($portfolio_edit['link']) == ''){
+					$validInput = false;
+					$error = true;
+				}
+				if($portfolio_edit['datestamped'] == false && trim( $portfolio_edit['pubdate']) == ''){
+					$validInput = false;
+					$error = true;
+				}
+				if($validInput == true){
+					if ($portfolio_edit['eguid'] == "new") {
+						$entry = new ElggObject();
+						$entry->subtype = "portfolio";
+						$entry->owner_guid = $user_guid;
+					}
+					else {
+						$entry = get_entity($portfolio_edit['eguid']);
+					}
+					$entry->title = htmlentities($portfolio_edit['title']);
+					$entry->description = htmlentities($portfolio_edit['description']);
+					$entry->link = $portfolio_edit['link'];
+					$entry->pubdate = $portfolio_edit['pubdate'];
+					$entry->datestamped = $portfolio_edit['datestamped'];
+					$entry->access_id = $access;
+					if($portfolio_edit['eguid'] == "new") {
+						$portfolio_list_guids[] = $entry->save();
+					}
+					else {
+						$entry->save();
+					}
+				}
+			}
+			if ($user->portfolio == NULL) {
+				$user->portfolio = $portfolio_list_guids;
+			}
+			else {
+				$stack = $user->portfolio;
+				if (!(is_array($stack))) { $stack = array($stack); }
+				if ($portfolio_list_guids != NULL) {
+					$user->portfolio = array_merge($stack, $portfolio_list_guids);
+				}
+			}
+			//$user->portfolio = null;
+			$user->portfolio_access = $access;
+			$user->save();
+			break;
 
-        /*
+		/*
          * MODIFIED CODE!
          * optset is the array of opt-in choices and gets directly saved as a metadata array (cannot be associative).
          * access is not currently being used for anything.
          */
-        case 'opt-in':
-            $opt_in_set = get_input('opt_in_set');
-            $access = get_input('access');
+		case 'opt-in':
+			$opt_in_set = get_input('opt_in_set');
+			$access = get_input('access');
 
-            $user->opt_in_missions = $opt_in_set[0];
-            $user->opt_in_swap = $opt_in_set[1];
-            $user->opt_in_mentored = $opt_in_set[2];
-            $user->opt_in_mentoring = $opt_in_set[3];
-            $user->opt_in_shadowed = $opt_in_set[4];
-            $user->opt_in_shadowing = $opt_in_set[5];
-            $user->opt_in_jobshare = $opt_in_set[6];
-            $user->opt_in_pcSeek = $opt_in_set[7];
-            $user->opt_in_pcCreate = $opt_in_set[8];
-            $user->opt_in_ssSeek = $opt_in_set[9];
-            $user->opt_in_ssCreate = $opt_in_set[10];
-            $user->opt_in_rotation = $opt_in_set[11];
-            $user->opt_in_assignSeek = $opt_in_set[12];
-            $user->opt_in_assignCreate = $opt_in_set[13];
-            $user->opt_in_deploySeek = $opt_in_set[14];
-            $user->opt_in_deployCreate = $opt_in_set[15];
-            $user->opt_in_missionCreate = $opt_in_set[16];
-            /*$user->opt_in_peer_coached = $opt_in_set[6];
+			$user->opt_in_missions = $opt_in_set[0];
+			$user->opt_in_swap = $opt_in_set[1];
+			$user->opt_in_mentored = $opt_in_set[2];
+			$user->opt_in_mentoring = $opt_in_set[3];
+			$user->opt_in_shadowed = $opt_in_set[4];
+			$user->opt_in_shadowing = $opt_in_set[5];
+			$user->opt_in_jobshare = $opt_in_set[6];
+			$user->opt_in_pcSeek = $opt_in_set[7];
+			$user->opt_in_pcCreate = $opt_in_set[8];
+			$user->opt_in_ssSeek = $opt_in_set[9];
+			$user->opt_in_ssCreate = $opt_in_set[10];
+			$user->opt_in_rotation = $opt_in_set[11];
+			$user->opt_in_assignSeek = $opt_in_set[12];
+			$user->opt_in_assignCreate = $opt_in_set[13];
+			$user->opt_in_deploySeek = $opt_in_set[14];
+			$user->opt_in_deployCreate = $opt_in_set[15];
+			$user->opt_in_missionCreate = $opt_in_set[16];
+			/*$user->opt_in_peer_coached = $opt_in_set[6];
               $user->opt_in_peer_coaching = $opt_in_set[7];
               $user->opt_in_skill_sharing = $opt_in_set[8];
               $user->opt_in_job_sharing = $opt_in_set[9];*/
 
-            // Not saving this at the moment because it is not in use.
-            //$user->optaccess = $access;
+			// Not saving this at the moment because it is not in use.
+			//$user->optaccess = $access;
 
-            $user->save();
+			$user->save();
 
-            break;
-        /*
+			break;
+		/*
          * END MODIFIED CODE
          */
 
-        default:
-            system_message(elgg_echo("profile:saved"));
-    }
-    //system_message(elgg_echo("profile:saved"));
-    if($error == true){
-       register_error(elgg_echo('Not all information could be saved, empty fields are not allowed'));
-    } else {
-        system_message(elgg_echo("profile:saved"));
-    }
+		default:
+			system_message(elgg_echo("profile:saved"));
+	}
+	//system_message(elgg_echo("profile:saved"));
+	if($error == true){
+	   register_error(elgg_echo('Not all information could be saved, empty fields are not allowed'));
+	} else {
+		system_message(elgg_echo("profile:saved"));
+	}
 }
 else {  // In case this view will be called via the elgg_view_form() action, then we know it's the basic profile only
 }

Spacing +41 added lines, -41 removed lines

@@ -9,12 +9,12 @@ 
             $profile_fields = get_input('profile');
             $social_media = get_input('social_media');
             $error_message = '';
-            foreach ( $profile_fields as $f => $v ) {
+            foreach ($profile_fields as $f => $v) {
                 // cyu - check if email field is empty
                 if ($f === "email") {
-                    trim($v);   // remove white spaces from both sides of string
+                    trim($v); // remove white spaces from both sides of string
                     if (!$v) {
-                        register_error(elgg_echo('gcc_profile:error').elgg_echo('gcc_profile:missingemail'));
+                        register_error(elgg_echo('gcc_profile:error') . elgg_echo('gcc_profile:missingemail'));
                         return true;
                     }
 
@@ -23,7 +23,7 @@ 
 
                     if ($v) {
                         // cyu - check if the email is in the list of exceptions
-                        $user_email = explode('@',$v);
+                        $user_email = explode('@', $v);
                         $list_of_domains = getExtension();
                         if (count($list_of_domains) > 0) {
                             while ($row = mysqli_fetch_array($list_of_domains)) {
@@ -32,17 +32,17 @@ 
                                     break;
                                 }
                             }
-                            $error_message = elgg_echo('gcc_profile:error').elgg_echo('gcc_profile:notaccepted');
+                            $error_message = elgg_echo('gcc_profile:error') . elgg_echo('gcc_profile:notaccepted');
                         }
                         // cyu - check if domain is gc.ca
                         if (!$isValid) {
-                            $govt_domain = explode('.',$user_email[1]);
+                            $govt_domain = explode('.', $user_email[1]);
                             $govt_domain_len = count($govt_domain) - 1;
-                            if ($govt_domain[$govt_domain_len - 1].'.'.$govt_domain[$govt_domain_len] === 'gc.ca') {
+                            if ($govt_domain[$govt_domain_len - 1] . '.' . $govt_domain[$govt_domain_len] === 'gc.ca') {
                                 $isValid = true;
                             } else {
                                 $isValid = false;
-                                $error_message = elgg_echo('gcc_profile:error').elgg_echo('gcc_profile:notaccepted');
+                                $error_message = elgg_echo('gcc_profile:error') . elgg_echo('gcc_profile:notaccepted');
                             }
                         }
                     }
@@ -53,7 +53,7 @@ 
                     $user->set($f, $v);
                 }
                 else {
-                    if($f=='department'){
+                    if ($f == 'department') {
                         $obj = elgg_get_entities(array(
                                     'type' => 'object',
                                     'subtype' => 'dept_list',
@@ -73,7 +73,7 @@ 
                                 $provinces['pov-que'] = 'Government of Quebec';
                                 $provinces['pov-sask'] = 'Government of Saskatchewan';
                                 $provinces['pov-yuk'] = 'Government of Yukon';
-                                $departmentsEn = array_merge($departmentsEn,$provinces);
+                                $departmentsEn = array_merge($departmentsEn, $provinces);
 
                                 $departmentsFr = json_decode($obj[0]->deptsFr, true);
                                 $provincesFr['pov-alb'] = "Gouvernement de l'Alberta";
@@ -89,20 +89,20 @@ 
                                 $provincesFr['pov-que'] = 'Gouvernement du Qu�bec';
                                 $provincesFr['pov-sask'] = 'Gouvernement de Saskatchewan';
                                 $provincesFr['pov-yuk'] = 'Gouvernement du Yukon';
-                                $departmentsFr = array_merge($departmentsFr,$provincesFr);
+                                $departmentsFr = array_merge($departmentsFr, $provincesFr);
 
-                                if (get_current_language()=='en'){
-                                    $deptString = $departmentsEn[$v]." / ".$departmentsFr[$v];
-                                }else{
-                                    $deptString = $departmentsFr[$v]." / ".$departmentsEn[$v];
+                                if (get_current_language() == 'en') {
+                                    $deptString = $departmentsEn[$v] . " / " . $departmentsFr[$v];
+                                } else {
+                                    $deptString = $departmentsFr[$v] . " / " . $departmentsEn[$v];
                                 }
 
-                                $user->set('department',$deptString);
+                                $user->set('department', $deptString);
 
-                    }else if($f == 'location' && $v) {
+                    } else if ($f == 'location' && $v) {
 
                       //check to see if addressString exists
-                      if($user->addressString && $user->addressStringFr){
+                      if ($user->addressString && $user->addressStringFr) {
 
                         //split up location field value
                         $address = explode(',', $v);
@@ -110,8 +110,8 @@ 
                         //Add cut up location field to address string
                         //if user enters a proper address the address wil display nicely. If not the map will not display right
                         //sadly we cannot extract all the same information from the location field properly to complete the json string
-                        $user->addressString = '{"street":"'.$address[0].'","city":"'.$address[1].'","province":"'.$address[2].'","country":"Canada","pc":""}';
-                        $user->addressStringFr = '{"street":"'.$address[0].'","city":"'.$address[1].'","province":"'.$address[2].'","country":"Canada","pc":""}';
+                        $user->addressString = '{"street":"' . $address[0] . '","city":"' . $address[1] . '","province":"' . $address[2] . '","country":"Canada","pc":""}';
+                        $user->addressStringFr = '{"street":"' . $address[0] . '","city":"' . $address[1] . '","province":"' . $address[2] . '","country":"Canada","pc":""}';
 
                       }
 
@@ -125,7 +125,7 @@ 
 
                 }
             }
-            foreach ( $social_media as $f => $v ) {
+            foreach ($social_media as $f => $v) {
                 $link = $v;
                 if (filter_var($link, FILTER_VALIDATE_URL) == false) {
                     $user->set($f, $link);
@@ -158,9 +158,9 @@ 
             $education_guids = array();
             $education_list = $user->education;
             if ($delete != null && !is_array($delete)) {
-                $delete = array( $delete );
+                $delete = array($delete);
             }
-            if ( is_array($delete) ) {
+            if (is_array($delete)) {
                 foreach ($delete as $delete_guid) {
                     if ($delete_guid != NULL) {
                         if ($delete = get_entity($delete_guid)) {
@@ -178,7 +178,7 @@ 
             }
             $user->education = $education_list;
             if ($eguid != null && !is_array($eguid)) {
-                $eguid = array( $eguid );
+                $eguid = array($eguid);
             }
             //create new education entries
             if (is_array($eguid)) {
@@ -188,7 +188,7 @@ 
                     if($ongoing[$k] == true){
                         $endyear[$k] = $startyear[$k];
                     }*/
-                    if(trim( htmlentities($school[$k])) == '' || trim( htmlentities($degree[$k])) == '' || trim( htmlentities($field[$k])) == ''){
+                    if (trim(htmlentities($school[$k])) == '' || trim(htmlentities($degree[$k])) == '' || trim(htmlentities($field[$k])) == '') {
                         $validInput = false;
                         $error == true;
                     }
@@ -198,7 +198,7 @@ 
                         $error == true;
                     }
                     */
-                    if($validInput == true){
+                    if ($validInput == true) {
                         if ($v == "new") {
                             $education = new ElggObject();
                             $education->subtype = "education";
@@ -264,11 +264,11 @@ 
             $user->work = $experience_list;
             $work_experience_guids = array();
             if ($edit != null && !is_array($edit)) {
-                $edit = array( $edit );
+                $edit = array($edit);
             }
 
             //create new work experience entries
-            if ( is_array($edit) ) {
+            if (is_array($edit)) {
                 foreach ($edit as $work) {
                     $validInput = true;
                     /*
@@ -277,7 +277,7 @@ 
                     }
                     */
                     //validation of work experience entry
-                    if(trim($work['title']) == '' || trim($work['organization']) == ''){
+                    if (trim($work['title']) == '' || trim($work['organization']) == '') {
                         $validInput = false;
                         $error = true;
                     }
@@ -287,7 +287,7 @@ 
                         $error = true;
                     }
                     */
-                    if($validInput == true) {
+                    if ($validInput == true) {
                         if ($work['eguid'] == "new") {
                             $experience = new ElggObject();
                             $experience->subtype = "experience";
@@ -393,8 +393,8 @@ 
                 'metadata_names' => array('english'),
                 'metadata_owner_guids' => array(elgg_get_logged_in_user_guid()),
             ));
-            if ($metadata){
-                foreach ($metadata as $data){
+            if ($metadata) {
+                foreach ($metadata as $data) {
 
                     update_metadata($data->id, $data->name, $data->value, $data->value_type, $data->owner_guid, $access);
                     //error_log('id '.$data->id .' name '. $data->name.' value '. $data->value.' value type '. $data->value_type.' owner_guid '.$data->owner_guid.' $access '. $access);
@@ -405,8 +405,8 @@ 
                 'metadata_names' => array('french'),
                 'metadata_owner_guids' => array(elgg_get_logged_in_user_guid()),
             ));
-            if ($metadata){
-                foreach ($metadata as $data){
+            if ($metadata) {
+                foreach ($metadata as $data) {
 
                     update_metadata($data->id, $data->name, $data->value, $data->value_type, $data->owner_guid, $access);
                 }
@@ -416,8 +416,8 @@ 
                 'metadata_names' => array('officialLanguage'),
                 'metadata_owner_guids' => array(elgg_get_logged_in_user_guid()),
             ));
-            if ($metadata){
-                foreach ($metadata as $data){
+            if ($metadata) {
+                foreach ($metadata as $data) {
 
                     update_metadata($data->id, $data->name, $data->value, $data->value_type, $data->owner_guid, $access);
                 }
@@ -452,15 +452,15 @@ 
             //create new work experience entries
             foreach ($edit as $portfolio_edit) {
                 $validInput = true;
-                if(trim($portfolio_edit['title']) == '' || trim($portfolio_edit['description']) == '' || trim($portfolio_edit['link']) == ''){
+                if (trim($portfolio_edit['title']) == '' || trim($portfolio_edit['description']) == '' || trim($portfolio_edit['link']) == '') {
                     $validInput = false;
                     $error = true;
                 }
-                if($portfolio_edit['datestamped'] == false && trim( $portfolio_edit['pubdate']) == ''){
+                if ($portfolio_edit['datestamped'] == false && trim($portfolio_edit['pubdate']) == '') {
                     $validInput = false;
                     $error = true;
                 }
-                if($validInput == true){
+                if ($validInput == true) {
                     if ($portfolio_edit['eguid'] == "new") {
                         $entry = new ElggObject();
                         $entry->subtype = "portfolio";
@@ -475,7 +475,7 @@ 
                     $entry->pubdate = $portfolio_edit['pubdate'];
                     $entry->datestamped = $portfolio_edit['datestamped'];
                     $entry->access_id = $access;
-                    if($portfolio_edit['eguid'] == "new") {
+                    if ($portfolio_edit['eguid'] == "new") {
                         $portfolio_list_guids[] = $entry->save();
                     }
                     else {
@@ -543,7 +543,7 @@ 
             system_message(elgg_echo("profile:saved"));
     }
     //system_message(elgg_echo("profile:saved"));
-    if($error == true){
+    if ($error == true) {
        register_error(elgg_echo('Not all information could be saved, empty fields are not allowed'));
     } else {
         system_message(elgg_echo("profile:saved"));

Braces +12 added lines, -22 removed lines

@@ -51,8 +51,7 @@ 
                         return true;
                     }
                     $user->set($f, $v);
-                }
-                else {
+                } else {
                     if($f=='department'){
                         $obj = elgg_get_entities(array(
                                     'type' => 'object',
@@ -93,13 +92,13 @@ 
 
                                 if (get_current_language()=='en'){
                                     $deptString = $departmentsEn[$v]." / ".$departmentsFr[$v];
-                                }else{
+                                } else{
                                     $deptString = $departmentsFr[$v]." / ".$departmentsEn[$v];
                                 }
 
                                 $user->set('department',$deptString);
 
-                    }else if($f == 'location' && $v) {
+                    } else if($f == 'location' && $v) {
 
                       //check to see if addressString exists
                       if($user->addressString && $user->addressStringFr){
@@ -228,8 +227,7 @@ 
             }
             if ($user->education == NULL) {
                 $user->education = $education_guids;
-            }
-            else {
+            } else {
                 $stack = $user->education;
                 if (!(is_array($stack))) { $stack = array($stack); }
                 if ($education_guids != NULL) {
@@ -255,8 +253,7 @@ 
                         if (($key = array_search($delete_guid, $experience_list)) !== false) {
                             unset($experience_list[$key]);
                         }
-                    }
-                    elseif ($experience_list == $delete_guid) {
+                    } elseif ($experience_list == $delete_guid) {
                         $experience_list = null;
                     }
                 }
@@ -316,8 +313,7 @@ 
             }
             if ($user->work == NULL) {
                 $user->work = $work_experience_guids;
-            }
-            else {
+            } else {
                 $stack = $user->work;
                 if (!(is_array($stack))) { $stack = array($stack); }
                 if ($work_experience_guids != NULL) {
@@ -359,8 +355,7 @@ 
             $user->gc_skills = $skill_list;
             if ($user->gc_skills == NULL) {
                 $user->gc_skills = $skill_guids;
-            }
-            else {
+            } else {
                 $stack = $user->gc_skills;
                 if (!(is_array($stack))) { $stack = array($stack); }
                 if ($skill_guids != NULL) {
@@ -441,8 +436,7 @@ 
                         if (($key = array_search($delete_guid, $portfolio_list)) !== false) {
                             unset($portfolio_list[$key]);
                         }
-                    }
-                    elseif ($portfolio_list == $delete_guid) {
+                    } elseif ($portfolio_list == $delete_guid) {
                         $portfolio_list = null;
                     }
                 }
@@ -465,8 +459,7 @@ 
                         $entry = new ElggObject();
                         $entry->subtype = "portfolio";
                         $entry->owner_guid = $user_guid;
-                    }
-                    else {
+                    } else {
                         $entry = get_entity($portfolio_edit['eguid']);
                     }
                     $entry->title = htmlentities($portfolio_edit['title']);
@@ -477,16 +470,14 @@ 
                     $entry->access_id = $access;
                     if($portfolio_edit['eguid'] == "new") {
                         $portfolio_list_guids[] = $entry->save();
-                    }
-                    else {
+                    } else {
                         $entry->save();
                     }
                 }
             }
             if ($user->portfolio == NULL) {
                 $user->portfolio = $portfolio_list_guids;
-            }
-            else {
+            } else {
                 $stack = $user->portfolio;
                 if (!(is_array($stack))) { $stack = array($stack); }
                 if ($portfolio_list_guids != NULL) {
@@ -548,6 +539,5 @@ 
     } else {
         system_message(elgg_echo("profile:saved"));
     }
-}
-else {  // In case this view will be called via the elgg_view_form() action, then we know it's the basic profile only
+} else {  // In case this view will be called via the elgg_view_form() action, then we know it's the basic profile only
 }

mod/b_extended_profile/actions/b_extended_profile/autodept.php

Indentation +54 added lines, -54 removed lines

@@ -12,49 +12,49 @@ 
 
 foreach ($departments as $d) {
 error_log(print_r('$d[title_en] = ' . $d['title_en'], true));
-    // full word at start of skill title
-    if (strpos(strtolower(' ' . $d['title_en']) . ' ', ' ' . strtolower($query) . ' ') === 0 ||
-        strpos(strtolower(' ' . $d['title_fr']) . ' ', ' ' . strtolower($query) . ' ') === 0 ) {
-        $result[] = array(
-            'value' => $d['title_en'] . ' / ' . $d['title_fr'],
-            'pos' => 0
-        );
-    }
+	// full word at start of skill title
+	if (strpos(strtolower(' ' . $d['title_en']) . ' ', ' ' . strtolower($query) . ' ') === 0 ||
+		strpos(strtolower(' ' . $d['title_fr']) . ' ', ' ' . strtolower($query) . ' ') === 0 ) {
+		$result[] = array(
+			'value' => $d['title_en'] . ' / ' . $d['title_fr'],
+			'pos' => 0
+		);
+	}
 
-    // full word somewhere in skill title
-    elseif (strpos(strtolower(' ' . $d['title_en']) . ' ', ' ' . strtolower($query) . ' ') !== FALSE ||
-        strpos(strtolower(' ' . $d['title_fr']) . ' ', ' ' . strtolower($query) . ' ') !== FALSE ) {
-        $result[] = array(
-            'value' => $d['title_en'] . ' / ' . $d['title_fr'],
-            'pos' => 1
-        );
-    }
+	// full word somewhere in skill title
+	elseif (strpos(strtolower(' ' . $d['title_en']) . ' ', ' ' . strtolower($query) . ' ') !== FALSE ||
+		strpos(strtolower(' ' . $d['title_fr']) . ' ', ' ' . strtolower($query) . ' ') !== FALSE ) {
+		$result[] = array(
+			'value' => $d['title_en'] . ' / ' . $d['title_fr'],
+			'pos' => 1
+		);
+	}
 
-    // partial word at start of skill title
-    elseif (strpos(strtolower(' ' . $d['title_en']), ' ' . strtolower($query)) === 0 ||
-        strpos(strtolower(' ' . $d['title_fr']), ' ' . strtolower($query)) === 0 ) {
-        $result[] = array(
-            'value' => $d['title_en'] . ' / ' . $d['title_fr'],
-            'pos' => 2
-        );
-    }
+	// partial word at start of skill title
+	elseif (strpos(strtolower(' ' . $d['title_en']), ' ' . strtolower($query)) === 0 ||
+		strpos(strtolower(' ' . $d['title_fr']), ' ' . strtolower($query)) === 0 ) {
+		$result[] = array(
+			'value' => $d['title_en'] . ' / ' . $d['title_fr'],
+			'pos' => 2
+		);
+	}
 
-    //partial word somewhere in skill title
-    elseif (strpos(strtolower(' ' . $d['title_en']), ' ' . strtolower($query)) !== FALSE ||
-        strpos(strtolower(' ' . $d['title_fr']), ' ' . strtolower($query)) !== FALSE ) {
-        $result[] = array(
-            'value' => $d['title_en'] . ' / ' . $d['title_fr'],
-            'pos' => 3
-        );
-    }
+	//partial word somewhere in skill title
+	elseif (strpos(strtolower(' ' . $d['title_en']), ' ' . strtolower($query)) !== FALSE ||
+		strpos(strtolower(' ' . $d['title_fr']), ' ' . strtolower($query)) !== FALSE ) {
+		$result[] = array(
+			'value' => $d['title_en'] . ' / ' . $d['title_fr'],
+			'pos' => 3
+		);
+	}
 
-    elseif (strpos(strtolower($d['title_en']), strtolower($query)) !== FALSE ||
-        strpos(strtolower($d['title_fr']), strtolower($query)) !== FALSE ) {
-        $result[] = array(
-            'value' => $d['title_en'] . ' / ' . $d['title_fr'],
-            'pos' => 4
-        );
-    }
+	elseif (strpos(strtolower($d['title_en']), strtolower($query)) !== FALSE ||
+		strpos(strtolower($d['title_fr']), strtolower($query)) !== FALSE ) {
+		$result[] = array(
+			'value' => $d['title_en'] . ' / ' . $d['title_fr'],
+			'pos' => 4
+		);
+	}
 }
 
 $highest_relevance = array();
@@ -64,21 +64,21 @@ 
 $lowest_relevance = array();
 
 foreach ( $result as $r ) {
-    if ( $r['pos'] == 0 ) {
-        $highest_relevance[] = $r;
-    }
-    elseif ( $r['pos'] == 1 ) {
-        $high_relevance[] = $r;
-    }
-    elseif ( $r['pos'] == 2 ) {
-        $med_relevance[] = $r;
-    }
-    elseif ( $r['pos'] == 3 ) {
-        $low_relevance[] = $r;
-    }
-    elseif ( $r['pos'] == 4 ) {
-        $lowest_relevance[] = $r;
-    }
+	if ( $r['pos'] == 0 ) {
+		$highest_relevance[] = $r;
+	}
+	elseif ( $r['pos'] == 1 ) {
+		$high_relevance[] = $r;
+	}
+	elseif ( $r['pos'] == 2 ) {
+		$med_relevance[] = $r;
+	}
+	elseif ( $r['pos'] == 3 ) {
+		$low_relevance[] = $r;
+	}
+	elseif ( $r['pos'] == 4 ) {
+		$lowest_relevance[] = $r;
+	}
 }
 
 $result = array_merge($highest_relevance, $high_relevance, $med_relevance, $low_relevance, $lowest_relevance);

Spacing +11 added lines, -11 removed lines

@@ -14,7 +14,7 @@ 
 error_log(print_r('$d[title_en] = ' . $d['title_en'], true));
     // full word at start of skill title
     if (strpos(strtolower(' ' . $d['title_en']) . ' ', ' ' . strtolower($query) . ' ') === 0 ||
-        strpos(strtolower(' ' . $d['title_fr']) . ' ', ' ' . strtolower($query) . ' ') === 0 ) {
+        strpos(strtolower(' ' . $d['title_fr']) . ' ', ' ' . strtolower($query) . ' ') === 0) {
         $result[] = array(
             'value' => $d['title_en'] . ' / ' . $d['title_fr'],
             'pos' => 0
@@ -23,7 +23,7 @@ 
 
     // full word somewhere in skill title
     elseif (strpos(strtolower(' ' . $d['title_en']) . ' ', ' ' . strtolower($query) . ' ') !== FALSE ||
-        strpos(strtolower(' ' . $d['title_fr']) . ' ', ' ' . strtolower($query) . ' ') !== FALSE ) {
+        strpos(strtolower(' ' . $d['title_fr']) . ' ', ' ' . strtolower($query) . ' ') !== FALSE) {
         $result[] = array(
             'value' => $d['title_en'] . ' / ' . $d['title_fr'],
             'pos' => 1
@@ -32,7 +32,7 @@ 
 
     // partial word at start of skill title
     elseif (strpos(strtolower(' ' . $d['title_en']), ' ' . strtolower($query)) === 0 ||
-        strpos(strtolower(' ' . $d['title_fr']), ' ' . strtolower($query)) === 0 ) {
+        strpos(strtolower(' ' . $d['title_fr']), ' ' . strtolower($query)) === 0) {
         $result[] = array(
             'value' => $d['title_en'] . ' / ' . $d['title_fr'],
             'pos' => 2
@@ -41,7 +41,7 @@ 
 
     //partial word somewhere in skill title
     elseif (strpos(strtolower(' ' . $d['title_en']), ' ' . strtolower($query)) !== FALSE ||
-        strpos(strtolower(' ' . $d['title_fr']), ' ' . strtolower($query)) !== FALSE ) {
+        strpos(strtolower(' ' . $d['title_fr']), ' ' . strtolower($query)) !== FALSE) {
         $result[] = array(
             'value' => $d['title_en'] . ' / ' . $d['title_fr'],
             'pos' => 3
@@ -49,7 +49,7 @@ 
     }
 
     elseif (strpos(strtolower($d['title_en']), strtolower($query)) !== FALSE ||
-        strpos(strtolower($d['title_fr']), strtolower($query)) !== FALSE ) {
+        strpos(strtolower($d['title_fr']), strtolower($query)) !== FALSE) {
         $result[] = array(
             'value' => $d['title_en'] . ' / ' . $d['title_fr'],
             'pos' => 4
@@ -63,20 +63,20 @@ 
 $low_relevance = array();
 $lowest_relevance = array();
 
-foreach ( $result as $r ) {
-    if ( $r['pos'] == 0 ) {
+foreach ($result as $r) {
+    if ($r['pos'] == 0) {
         $highest_relevance[] = $r;
     }
-    elseif ( $r['pos'] == 1 ) {
+    elseif ($r['pos'] == 1) {
         $high_relevance[] = $r;
     }
-    elseif ( $r['pos'] == 2 ) {
+    elseif ($r['pos'] == 2) {
         $med_relevance[] = $r;
     }
-    elseif ( $r['pos'] == 3 ) {
+    elseif ($r['pos'] == 3) {
         $low_relevance[] = $r;
     }
-    elseif ( $r['pos'] == 4 ) {
+    elseif ($r['pos'] == 4) {
         $lowest_relevance[] = $r;
     }
 }

Braces +5 added lines, -11 removed lines

@@ -46,9 +46,7 @@ 
             'value' => $d['title_en'] . ' / ' . $d['title_fr'],
             'pos' => 3
         );
-    }
-
-    elseif (strpos(strtolower($d['title_en']), strtolower($query)) !== FALSE ||
+    } elseif (strpos(strtolower($d['title_en']), strtolower($query)) !== FALSE ||
         strpos(strtolower($d['title_fr']), strtolower($query)) !== FALSE ) {
         $result[] = array(
             'value' => $d['title_en'] . ' / ' . $d['title_fr'],
@@ -66,17 +64,13 @@ 
 foreach ( $result as $r ) {
     if ( $r['pos'] == 0 ) {
         $highest_relevance[] = $r;
-    }
-    elseif ( $r['pos'] == 1 ) {
+    } elseif ( $r['pos'] == 1 ) {
         $high_relevance[] = $r;
-    }
-    elseif ( $r['pos'] == 2 ) {
+    } elseif ( $r['pos'] == 2 ) {
         $med_relevance[] = $r;
-    }
-    elseif ( $r['pos'] == 3 ) {
+    } elseif ( $r['pos'] == 3 ) {
         $low_relevance[] = $r;
-    }
-    elseif ( $r['pos'] == 4 ) {
+    } elseif ( $r['pos'] == 4 ) {
         $lowest_relevance[] = $r;
     }
 }

mod/b_extended_profile/actions/b_extended_profile/hide-completed-mission.php

Spacing +1 added lines, -1 removed lines

@@ -10,7 +10,7 @@
 $mission = get_entity(get_input('mid'));
 $manager = get_user(get_input('aid'));
 
-if($manager->missions_hide_list == '') {
+if ($manager->missions_hide_list == '') {
 	$manager->missions_hide_list = $mission->guid;
 }
 else {

Braces +1 added lines, -2 removed lines

@@ -12,8 +12,7 @@
 
 if($manager->missions_hide_list == '') {
 	$manager->missions_hide_list = $mission->guid;
-}
-else {
+} else {
 	$manager->missions_hide_list = $manager->missions_hide_list . ',' . $mission->guid;
 }
 $manager->save();

mod/b_extended_profile/start.php

Indentation +388 added lines, -388 removed lines

@@ -10,76 +10,76 @@ 
 elgg_register_event_handler('init', 'system', 'b_extended_profile_init');
 
 function b_extended_profile_init() {
-    // Register the endorsements js library
-    $url = 'mod/b_extended_profile/js/endorsements/';
-    // js file containing code for edit, save, cancel toggles and the events that they trigger, plus more
-    elgg_register_js('gcconnex-profile', $url . "gcconnex-profile.js");
-    // Register vendor js libraries
-    $url = 'mod/b_extended_profile/vendors/';
-    // elgg_register_js('typeahead', $url . 'typeahead/dist/typeahead.bundle.js'); // developer version typeahead js file !!! COMMENT THIS OuT AND ENABLE MINIFIED VERSIoN IN PRODcd
-    elgg_register_js('fancybox', 'vendors/jquery/fancybox/jquery.fancybox-1.3.4.pack.js');
-    elgg_register_js('typeahead', $url . 'typeahead/dist/typeahead.bundle.min.js'); // minified typeahead js file
-
-    // Overriding the original javascript file with the modified version.
-    // The modified version adds code to the ready, editProfile and saveProfile functions.
-    elgg_register_js('gcconnex-profile', 'mod/b_extended_profile/js/endorsements/gcconnex-profile.js');
-
-    // Register the gcconnex profile css libraries
-    $css_url = 'mod/b_extended_profile/css/gcconnex-profile.css';
-    elgg_register_css('gcconnex-css', $css_url);
-
-    /* register views
+	// Register the endorsements js library
+	$url = 'mod/b_extended_profile/js/endorsements/';
+	// js file containing code for edit, save, cancel toggles and the events that they trigger, plus more
+	elgg_register_js('gcconnex-profile', $url . "gcconnex-profile.js");
+	// Register vendor js libraries
+	$url = 'mod/b_extended_profile/vendors/';
+	// elgg_register_js('typeahead', $url . 'typeahead/dist/typeahead.bundle.js'); // developer version typeahead js file !!! COMMENT THIS OuT AND ENABLE MINIFIED VERSIoN IN PRODcd
+	elgg_register_js('fancybox', 'vendors/jquery/fancybox/jquery.fancybox-1.3.4.pack.js');
+	elgg_register_js('typeahead', $url . 'typeahead/dist/typeahead.bundle.min.js'); // minified typeahead js file
+
+	// Overriding the original javascript file with the modified version.
+	// The modified version adds code to the ready, editProfile and saveProfile functions.
+	elgg_register_js('gcconnex-profile', 'mod/b_extended_profile/js/endorsements/gcconnex-profile.js');
+
+	// Register the gcconnex profile css libraries
+	$css_url = 'mod/b_extended_profile/css/gcconnex-profile.css';
+	elgg_register_css('gcconnex-css', $css_url);
+
+	/* register views
        register ajax views for all profile sections that are allowed to be edited and displayed via ajax
        display views
        see views/default/profile/wrapper.php for information on adding a new section to the user profile */
-    elgg_register_ajax_view('b_extended_profile/about-me');
-    elgg_register_ajax_view('b_extended_profile/education');
-    elgg_register_ajax_view('b_extended_profile/work-experience');
-    elgg_register_ajax_view('b_extended_profile/endorsements');
-    elgg_register_ajax_view('b_extended_profile/languages');
-    elgg_register_ajax_view('b_extended_profile/portfolio');
-    //Troy T. Lawson
-    elgg_register_ajax_view('b_extended_profile/skills-access');
-
-
-    // edit views
-    elgg_register_ajax_view('b_extended_profile/edit_about-me');
-    elgg_register_ajax_view('b_extended_profile/edit_education');
-    elgg_register_ajax_view('b_extended_profile/edit_work-experience');
-    elgg_register_ajax_view('b_extended_profile/edit_languages');
-    elgg_register_ajax_view('b_extended_profile/edit_portfolio');
-
-    // endorsement lightbox
-    elgg_register_ajax_view('endorse/endorsement');
-
-    // input views
-    elgg_register_ajax_view('input/education');
-    elgg_register_ajax_view('input/work-experience');
-    elgg_register_ajax_view('input/languages');
-    elgg_register_ajax_view('input/portfolio');
-
-    // auto-complete
-    elgg_register_ajax_view('b_extended_profile/edit_basic'); // ajax view for editing the basic profile fields like name, title, department, email, etc.
-
-    // The new views used for the Opt-In section.
-    elgg_register_ajax_view('b_extended_profile/opt-in');
-    elgg_register_ajax_view('b_extended_profile/edit_opt-in');
-
-    // register the action for saving profile fields
-    $action_path = elgg_get_plugins_path() . 'b_extended_profile/actions/b_extended_profile/';
-    elgg_register_action('b_extended_profile/edit_profile', $action_path . 'edit_profile.php');
-    elgg_register_action('b_extended_profile/add_endorsement', $action_path . 'add_endorsement.php');
-    elgg_register_action('b_extended_profile/retract_endorsement', $action_path . 'retract_endorsement.php');
-    elgg_register_action('b_extended_profile/user_find', $action_path . 'userfind.php', "public");
+	elgg_register_ajax_view('b_extended_profile/about-me');
+	elgg_register_ajax_view('b_extended_profile/education');
+	elgg_register_ajax_view('b_extended_profile/work-experience');
+	elgg_register_ajax_view('b_extended_profile/endorsements');
+	elgg_register_ajax_view('b_extended_profile/languages');
+	elgg_register_ajax_view('b_extended_profile/portfolio');
+	//Troy T. Lawson
+	elgg_register_ajax_view('b_extended_profile/skills-access');
+
+
+	// edit views
+	elgg_register_ajax_view('b_extended_profile/edit_about-me');
+	elgg_register_ajax_view('b_extended_profile/edit_education');
+	elgg_register_ajax_view('b_extended_profile/edit_work-experience');
+	elgg_register_ajax_view('b_extended_profile/edit_languages');
+	elgg_register_ajax_view('b_extended_profile/edit_portfolio');
+
+	// endorsement lightbox
+	elgg_register_ajax_view('endorse/endorsement');
+
+	// input views
+	elgg_register_ajax_view('input/education');
+	elgg_register_ajax_view('input/work-experience');
+	elgg_register_ajax_view('input/languages');
+	elgg_register_ajax_view('input/portfolio');
+
+	// auto-complete
+	elgg_register_ajax_view('b_extended_profile/edit_basic'); // ajax view for editing the basic profile fields like name, title, department, email, etc.
+
+	// The new views used for the Opt-In section.
+	elgg_register_ajax_view('b_extended_profile/opt-in');
+	elgg_register_ajax_view('b_extended_profile/edit_opt-in');
+
+	// register the action for saving profile fields
+	$action_path = elgg_get_plugins_path() . 'b_extended_profile/actions/b_extended_profile/';
+	elgg_register_action('b_extended_profile/edit_profile', $action_path . 'edit_profile.php');
+	elgg_register_action('b_extended_profile/add_endorsement', $action_path . 'add_endorsement.php');
+	elgg_register_action('b_extended_profile/retract_endorsement', $action_path . 'retract_endorsement.php');
+	elgg_register_action('b_extended_profile/user_find', $action_path . 'userfind.php', "public");
     
-    // The new action saves the data gathered from the new views.
-    elgg_register_action('b_extended_profile/hide-completed-mission', elgg_get_plugins_path() . 'b_extended_profile/actions/b_extended_profile/hide-completed-mission.php');
-    elgg_register_action('b_extended_profile/missions-access-form', elgg_get_plugins_path() . 'b_extended_profile/actions/b_extended_profile/missions-access-form.php');
-    elgg_register_action('b_extended_profile/show-completed-mission', elgg_get_plugins_path() . 'b_extended_profile/actions/b_extended_profile/show-completed-mission.php');
+	// The new action saves the data gathered from the new views.
+	elgg_register_action('b_extended_profile/hide-completed-mission', elgg_get_plugins_path() . 'b_extended_profile/actions/b_extended_profile/hide-completed-mission.php');
+	elgg_register_action('b_extended_profile/missions-access-form', elgg_get_plugins_path() . 'b_extended_profile/actions/b_extended_profile/missions-access-form.php');
+	elgg_register_action('b_extended_profile/show-completed-mission', elgg_get_plugins_path() . 'b_extended_profile/actions/b_extended_profile/show-completed-mission.php');
 
 
-    elgg_register_page_handler('userfind', 'userfind_page_handler');
-    elgg_register_page_handler('profile', 'extended_profile_page_handler');
+	elgg_register_page_handler('userfind', 'userfind_page_handler');
+	elgg_register_page_handler('profile', 'extended_profile_page_handler');
 }
 
 /*
@@ -88,43 +88,43 @@ 
 
 function extended_profile_page_handler($page) {
 
-    if (isset($page[0])) {
-        $username = $page[0];
-        $user = get_user_by_username($username);
-        elgg_set_page_owner_guid($user->guid);
-    } elseif (elgg_is_logged_in()) {
-        forward(elgg_get_logged_in_user_entity()->getURL());
-    }
-
-    // short circuit if invalid or banned username
-    if (!$user || ($user->isBanned() && !elgg_is_admin_logged_in())) {
-        register_error(elgg_echo('profile:notfound'));
-        forward();
-    }
-
-    $action = NULL;
-    if (isset($page[1])) {
-        $action = $page[1];
-    }
-
-    if ($action == 'edit') {
-        // use the core profile edit page
-        $base_dir = elgg_get_root_path();
-        require "{$base_dir}pages/profile/edit.php";
-        return true;
-    }
-
-    // main profile page
-    $params = array(
-        'content' => elgg_view('profile/wrapper'),
-        'num_columns' => 3,
-    );
-    $content = elgg_view_layout('profile_widgets', $params);
-    $sidebar = elgg_view('profile/sidebar', array('entity' => $user));
-
-    $body = elgg_view_layout('one_sidebar', array('content' => $content, 'sidebar' => $sidebar,));
-    echo elgg_view_page(elgg_echo('profile:title', array($user->name)), $body);
-    return true;
+	if (isset($page[0])) {
+		$username = $page[0];
+		$user = get_user_by_username($username);
+		elgg_set_page_owner_guid($user->guid);
+	} elseif (elgg_is_logged_in()) {
+		forward(elgg_get_logged_in_user_entity()->getURL());
+	}
+
+	// short circuit if invalid or banned username
+	if (!$user || ($user->isBanned() && !elgg_is_admin_logged_in())) {
+		register_error(elgg_echo('profile:notfound'));
+		forward();
+	}
+
+	$action = NULL;
+	if (isset($page[1])) {
+		$action = $page[1];
+	}
+
+	if ($action == 'edit') {
+		// use the core profile edit page
+		$base_dir = elgg_get_root_path();
+		require "{$base_dir}pages/profile/edit.php";
+		return true;
+	}
+
+	// main profile page
+	$params = array(
+		'content' => elgg_view('profile/wrapper'),
+		'num_columns' => 3,
+	);
+	$content = elgg_view_layout('profile_widgets', $params);
+	$sidebar = elgg_view('profile/sidebar', array('entity' => $user));
+
+	$body = elgg_view_layout('one_sidebar', array('content' => $content, 'sidebar' => $sidebar,));
+	echo elgg_view_page(elgg_echo('profile:title', array($user->name)), $body);
+	return true;
 }
 
 /*
@@ -132,70 +132,70 @@ 
  */
 function init_ajax_block($title, $section, $user) {
 
-    switch($section){
-        case 'about-me':
-            $field = elgg_echo('gcconnex_profile:about_me');
-            break;
-        case 'education':
-            $field = elgg_echo('gcconnex_profile:education');
-            break;
-        case 'work-experience':
-            $field = elgg_echo('gcconnex_profile:experience');
-            break;
-        case 'skills':
-            $field = elgg_echo('gcconnex_profile:gc_skills');
-            break;
-        case 'languages':
-            $field = elgg_echo('gcconnex_profile:langs');
-            break;
-        case 'portfolio':
-            $field = elgg_echo('gcconnex_profile:portfolio');
-            break;
-    }
-
-    echo '<div class="panel panel-custom">';
-        echo '<div class="panel-heading profile-heading clearfix"><h2 class="profile-info-head panel-title pull-left clearfix">' . $title . '</h2>'; // create the profile section title
-
-    if ($user->canEdit()) {
-        // create the edit/save/cancel toggles for this section
-        echo '<span class="gcconnex-profile-edit-controls">';
-        echo '<button title="Edit ' . $section . '" class="btn btn-default edit-' . $section . '">' . elgg_echo('gcconnex_profile:edit') . ' <span class="wb-inv">' . $field . '</span></button>';
-
-        echo '</span>';
-    }
-    echo '</div>';
-     // create the profile section wrapper div for css styling
-    echo '<div id="edit-' . $section . '" tabindex="-1" class="gcconnex-profile-section-wrapper panel-body gcconnex-' . $section . '">';
+	switch($section){
+		case 'about-me':
+			$field = elgg_echo('gcconnex_profile:about_me');
+			break;
+		case 'education':
+			$field = elgg_echo('gcconnex_profile:education');
+			break;
+		case 'work-experience':
+			$field = elgg_echo('gcconnex_profile:experience');
+			break;
+		case 'skills':
+			$field = elgg_echo('gcconnex_profile:gc_skills');
+			break;
+		case 'languages':
+			$field = elgg_echo('gcconnex_profile:langs');
+			break;
+		case 'portfolio':
+			$field = elgg_echo('gcconnex_profile:portfolio');
+			break;
+	}
+
+	echo '<div class="panel panel-custom">';
+		echo '<div class="panel-heading profile-heading clearfix"><h2 class="profile-info-head panel-title pull-left clearfix">' . $title . '</h2>'; // create the profile section title
+
+	if ($user->canEdit()) {
+		// create the edit/save/cancel toggles for this section
+		echo '<span class="gcconnex-profile-edit-controls">';
+		echo '<button title="Edit ' . $section . '" class="btn btn-default edit-' . $section . '">' . elgg_echo('gcconnex_profile:edit') . ' <span class="wb-inv">' . $field . '</span></button>';
+
+		echo '</span>';
+	}
+	echo '</div>';
+	 // create the profile section wrapper div for css styling
+	echo '<div id="edit-' . $section . '" tabindex="-1" class="gcconnex-profile-section-wrapper panel-body gcconnex-' . $section . '">';
 }
 
 function finit_ajax_block($section) {
 
-    switch($section){
-        case 'about-me':
-            $field = elgg_echo('gcconnex_profile:about_me');
-            break;
-        case 'education':
-            $field = elgg_echo('gcconnex_profile:education');
-            break;
-        case 'work-experience':
-            $field = elgg_echo('gcconnex_profile:experience');
-            break;
-        case 'skills':
-            $field = elgg_echo('gcconnex_profile:gc_skills');
-            break;
-        case 'languages':
-            $field = elgg_echo('gcconnex_profile:langs');
-            break;
-        case 'portfolio':
-            $field = elgg_echo('gcconnex_profile:portfolio');
-            break;
-    }
-
-    echo '</div>';
-    echo '<div class="panel-footer text-right clearfix save-' . $section . ' hidden wb-invisible">';
-    echo '<button title="Save ' . $section . '" class="btn btn-primary mrgn-rght-sm save-control save-' . $section . ' hidden wb-invisible">' . elgg_echo('gcconnex_profile:save') . ' <span class="wb-inv">' . $field . '</span></button>';
-    echo '<button title="Cancel ' . $section . '"  class="btn btn-default cancel-control cancel-' . $section . ' hidden wb-invisible">' . elgg_echo('gcconnex_profile:cancel') . ' <span class="wb-inv">' . $field . '</span></button>';
-    echo '</div></div>';
+	switch($section){
+		case 'about-me':
+			$field = elgg_echo('gcconnex_profile:about_me');
+			break;
+		case 'education':
+			$field = elgg_echo('gcconnex_profile:education');
+			break;
+		case 'work-experience':
+			$field = elgg_echo('gcconnex_profile:experience');
+			break;
+		case 'skills':
+			$field = elgg_echo('gcconnex_profile:gc_skills');
+			break;
+		case 'languages':
+			$field = elgg_echo('gcconnex_profile:langs');
+			break;
+		case 'portfolio':
+			$field = elgg_echo('gcconnex_profile:portfolio');
+			break;
+	}
+
+	echo '</div>';
+	echo '<div class="panel-footer text-right clearfix save-' . $section . ' hidden wb-invisible">';
+	echo '<button title="Save ' . $section . '" class="btn btn-primary mrgn-rght-sm save-control save-' . $section . ' hidden wb-invisible">' . elgg_echo('gcconnex_profile:save') . ' <span class="wb-inv">' . $field . '</span></button>';
+	echo '<button title="Cancel ' . $section . '"  class="btn btn-default cancel-control cancel-' . $section . ' hidden wb-invisible">' . elgg_echo('gcconnex_profile:cancel') . ' <span class="wb-inv">' . $field . '</span></button>';
+	echo '</div></div>';
 }
 
 /*
@@ -203,133 +203,133 @@ 
  */
 function userfind_page_handler() {
 
-    $user_friends = get_user_friends(elgg_get_logged_in_user_guid(), null, 0);
-    $query = htmlspecialchars($_GET['query']);
-    $result = array();
-
-    foreach ($user_friends as $u) {
-
-        // Complete match for first name
-        if (strpos(strtolower(' ' . $u['name']) . ' ', ' ' . strtolower($query) . ' ') === 0 ) {
-            $result[] = array(
-                'value' => $u->get('name'),
-                'guid' => $u->get('guid'),
-                'pic' => elgg_view_entity_icon($u, 'tiny', array(
-                    'use_hover' => false,
-                    'href' => false)),
-                'avatar' => elgg_view_entity_icon($u, 'small', array(
-                    'use_hover' => false,
-                    'href' => false)),
-                'pos' => 0
-            );
-        }
-
-        // Complete match for name (first, middle or last)
-        elseif (strpos(strtolower(' ' . $u['name']) . ' ', ' ' . strtolower($query) . ' ') !== FALSE) {
-            $result[] = array(
-                'value' => $u->get('name'),
-                'guid' => $u->get('guid'),
-                'pic' => elgg_view_entity_icon($u, 'tiny', array(
-                    'use_hover' => false,
-                    'href' => false)),
-                'avatar' => elgg_view_entity_icon($u, 'small', array(
-                    'use_hover' => false,
-                    'href' => false)),
-                'pos' => 1
-            );
-        }
-
-        // Partial match beginning at start of first name
-        elseif (strpos(strtolower(' ' . $u['name']), ' ' . strtolower($query)) === 0 ) {
-            $result[] = array(
-                'value' => $u->get('name'),
-                'guid' => $u->get('guid'),
-                'pic' => elgg_view_entity_icon($u, 'tiny', array(
-                    'use_hover' => false,
-                    'href' => false)),
-                'avatar' => elgg_view_entity_icon($u, 'small', array(
-                    'use_hover' => false,
-                    'href' => false)),
-                'pos' => 2
-            );
-        }
-
-        // Partial match beginning at start of some name (middle, last)
-        elseif (strpos(strtolower(' ' . $u['name']), ' ' . strtolower($query)) !== FALSE) {
-            $result[] = array(
-                'value' => $u->get('name'),
-                'guid' => $u->get('guid'),
-                'pic' => elgg_view_entity_icon($u, 'tiny', array(
-                    'use_hover' => false,
-                    'href' => false)),
-                'avatar' => elgg_view_entity_icon($u, 'small', array(
-                    'use_hover' => false,
-                    'href' => false)),
-                'pos' => 3
-            );
-        }
-
-        // Partial match somewhere within some name
-        elseif (strpos(strtolower($u['name']), strtolower($query)) !== FALSE) {
-            $result[] = array(
-                'value' => $u->get('name'),
-                'guid' => $u->get('guid'),
-                'pic' => elgg_view_entity_icon($u, 'tiny', array(
-                    'use_hover' => false,
-                    'href' => false)),
-                'avatar' => elgg_view_entity_icon($u, 'small', array(
-                    'use_hover' => false,
-                    'href' => false)),
-                'pos' => 4
-            );
-        }
-    }
-
-    $highest_relevance = array();
-    $high_relevance = array();
-    $med_relevance = array();
-    $low_relevance = array();
-    $lowest_relevance = array();
-
-    foreach ( $result as $r ) {
-        if ( $r['pos'] == 0 ) {
-            $highest_relevance[] = $r;
-        }
-        elseif ( $r['pos'] == 1 ) {
-            $high_relevance[] = $r;
-        }
-        elseif ( $r['pos'] == 2 ) {
-            $med_relevance[] = $r;
-        }
-        elseif ( $r['pos'] == 3 ) {
-            $low_relevance[] = $r;
-        }
-        elseif ( $r['pos'] == 4 ) {
-            $lowest_relevance[] = $r;
-        }
-    }
-
-    $result = array_merge($highest_relevance, $high_relevance, $med_relevance, $low_relevance, $lowest_relevance);
-
-    echo json_encode($result);
-    return json_encode($result);
+	$user_friends = get_user_friends(elgg_get_logged_in_user_guid(), null, 0);
+	$query = htmlspecialchars($_GET['query']);
+	$result = array();
+
+	foreach ($user_friends as $u) {
+
+		// Complete match for first name
+		if (strpos(strtolower(' ' . $u['name']) . ' ', ' ' . strtolower($query) . ' ') === 0 ) {
+			$result[] = array(
+				'value' => $u->get('name'),
+				'guid' => $u->get('guid'),
+				'pic' => elgg_view_entity_icon($u, 'tiny', array(
+					'use_hover' => false,
+					'href' => false)),
+				'avatar' => elgg_view_entity_icon($u, 'small', array(
+					'use_hover' => false,
+					'href' => false)),
+				'pos' => 0
+			);
+		}
+
+		// Complete match for name (first, middle or last)
+		elseif (strpos(strtolower(' ' . $u['name']) . ' ', ' ' . strtolower($query) . ' ') !== FALSE) {
+			$result[] = array(
+				'value' => $u->get('name'),
+				'guid' => $u->get('guid'),
+				'pic' => elgg_view_entity_icon($u, 'tiny', array(
+					'use_hover' => false,
+					'href' => false)),
+				'avatar' => elgg_view_entity_icon($u, 'small', array(
+					'use_hover' => false,
+					'href' => false)),
+				'pos' => 1
+			);
+		}
+
+		// Partial match beginning at start of first name
+		elseif (strpos(strtolower(' ' . $u['name']), ' ' . strtolower($query)) === 0 ) {
+			$result[] = array(
+				'value' => $u->get('name'),
+				'guid' => $u->get('guid'),
+				'pic' => elgg_view_entity_icon($u, 'tiny', array(
+					'use_hover' => false,
+					'href' => false)),
+				'avatar' => elgg_view_entity_icon($u, 'small', array(
+					'use_hover' => false,
+					'href' => false)),
+				'pos' => 2
+			);
+		}
+
+		// Partial match beginning at start of some name (middle, last)
+		elseif (strpos(strtolower(' ' . $u['name']), ' ' . strtolower($query)) !== FALSE) {
+			$result[] = array(
+				'value' => $u->get('name'),
+				'guid' => $u->get('guid'),
+				'pic' => elgg_view_entity_icon($u, 'tiny', array(
+					'use_hover' => false,
+					'href' => false)),
+				'avatar' => elgg_view_entity_icon($u, 'small', array(
+					'use_hover' => false,
+					'href' => false)),
+				'pos' => 3
+			);
+		}
+
+		// Partial match somewhere within some name
+		elseif (strpos(strtolower($u['name']), strtolower($query)) !== FALSE) {
+			$result[] = array(
+				'value' => $u->get('name'),
+				'guid' => $u->get('guid'),
+				'pic' => elgg_view_entity_icon($u, 'tiny', array(
+					'use_hover' => false,
+					'href' => false)),
+				'avatar' => elgg_view_entity_icon($u, 'small', array(
+					'use_hover' => false,
+					'href' => false)),
+				'pos' => 4
+			);
+		}
+	}
+
+	$highest_relevance = array();
+	$high_relevance = array();
+	$med_relevance = array();
+	$low_relevance = array();
+	$lowest_relevance = array();
+
+	foreach ( $result as $r ) {
+		if ( $r['pos'] == 0 ) {
+			$highest_relevance[] = $r;
+		}
+		elseif ( $r['pos'] == 1 ) {
+			$high_relevance[] = $r;
+		}
+		elseif ( $r['pos'] == 2 ) {
+			$med_relevance[] = $r;
+		}
+		elseif ( $r['pos'] == 3 ) {
+			$low_relevance[] = $r;
+		}
+		elseif ( $r['pos'] == 4 ) {
+			$lowest_relevance[] = $r;
+		}
+	}
+
+	$result = array_merge($highest_relevance, $high_relevance, $med_relevance, $low_relevance, $lowest_relevance);
+
+	echo json_encode($result);
+	return json_encode($result);
 }
 
 /*
  * Purpose: check if a profile section has content, so that we know whether or not we should prepare ajax for display
  */
 function has_content($user, $section) {
-    if ( $user->$section != null ) {
-        return true;
-    }
-    else {
-        if ( $user->canEdit() ) {
-            return true;
-        }
-        else {
-            return false;
-        }
-    }
+	if ( $user->$section != null ) {
+		return true;
+	}
+	else {
+		if ( $user->canEdit() ) {
+			return true;
+		}
+		else {
+			return false;
+		}
+	}
 }
 
 /*
@@ -343,70 +343,70 @@ 
 
 function list_avatars($options) {
 
-    $list = "";
-    $list .= '<ul class="list-avatars list-unstyled clearfix' . $options['class'] . '">';
-
-    if ( $options['limit'] == 0 ) {
-        $options['limit'] = 999;
-    }
-    else {
-
-        $link = elgg_view('output/url', array(
-            'href' => 'ajax/view/b_extended_profile/edit_basic',
-            'class' => 'elgg-lightbox gcconnex-basic-profile-edit elgg-button',
-            'text' => elgg_echo('gcconnex_profile:edit_profile')
-        ));
-    }
-
-
-    if ( $options['use_hover'] === null ) {
-        $options['use_hover'] = true;
-    }
-
-    if ( $options['guids'] == null ) {
-        return false;
-    }
-    else {
-        if (!is_array($options['guids'])) {
-            $options['guids'] = array($options['guids']);
-        }
-
-        $guids = $options['guids'];
-
-        // display each avatar, up until the limit is reached
-        for ( $i=0; $i<$options['limit']; $i++) {
-            if( ($user = get_user($guids[$i])) == true ) {
-                if ( $options['edit_mode'] == true ) {
-                    $list .= '<li class="gcconnex-avatar-in-list" data-guid="' . $guids[$i] . '" onclick="removeColleague(this)">';
-                    $list .= '<div class="remove-colleague-from-list">X';
-                    $list .= '</div>'; // close div class="remove-colleague-from-list"
-
-                    $list .= elgg_view_entity_icon($user, $options['size'], array(
-                        'use_hover' => $options['use_hover'],
-                        'href' => false
-                    ));
-                    $list .= '</li>'; // close div class="gcconnex-avatar-in-list"
-                }
-                else {
-                    $list .= '<li class="gcconnex-avatar-in-list" data-guid="' . $guids[$i] . '">';
-                    $list .= elgg_view_entity_icon($user, $options['size'], array(
-                        'use_hover' => $options['use_hover'],
-                    ));
-                    $list .= '</li>'; // close div class="gcconnex-avatar-in-list"
-
-                }
-            }
-            else {
-                break;
-            }
-        }
-    }
-    //$list .= count($guids);
-    if($options['id'] && $options['skill_guid'] && count($guids) > 4){
-        $list .= '<a class="btn gcconnex-avatars-expand elgg-lightbox" title="'.elgg_echo('gcconnex_profile:gc_skill:allendorse').'" href="' . elgg_get_site_url() . 'ajax/view/endorse/endorsement?guid=' . $options['skill_guid'] .'" ><i class="fa fa-flip-vertical mrgn-tp-sm fa-ellipsis-h" aria-hidden="true"><span class="wb-invisible">'.elgg_echo('gcconnex_profile:gc_skill:allendorse').'</span></i></a>';
-    }
-    $list .= '</ul>'; // close div class="list-avatars"
-    return $list;
+	$list = "";
+	$list .= '<ul class="list-avatars list-unstyled clearfix' . $options['class'] . '">';
+
+	if ( $options['limit'] == 0 ) {
+		$options['limit'] = 999;
+	}
+	else {
+
+		$link = elgg_view('output/url', array(
+			'href' => 'ajax/view/b_extended_profile/edit_basic',
+			'class' => 'elgg-lightbox gcconnex-basic-profile-edit elgg-button',
+			'text' => elgg_echo('gcconnex_profile:edit_profile')
+		));
+	}
+
+
+	if ( $options['use_hover'] === null ) {
+		$options['use_hover'] = true;
+	}
+
+	if ( $options['guids'] == null ) {
+		return false;
+	}
+	else {
+		if (!is_array($options['guids'])) {
+			$options['guids'] = array($options['guids']);
+		}
+
+		$guids = $options['guids'];
+
+		// display each avatar, up until the limit is reached
+		for ( $i=0; $i<$options['limit']; $i++) {
+			if( ($user = get_user($guids[$i])) == true ) {
+				if ( $options['edit_mode'] == true ) {
+					$list .= '<li class="gcconnex-avatar-in-list" data-guid="' . $guids[$i] . '" onclick="removeColleague(this)">';
+					$list .= '<div class="remove-colleague-from-list">X';
+					$list .= '</div>'; // close div class="remove-colleague-from-list"
+
+					$list .= elgg_view_entity_icon($user, $options['size'], array(
+						'use_hover' => $options['use_hover'],
+						'href' => false
+					));
+					$list .= '</li>'; // close div class="gcconnex-avatar-in-list"
+				}
+				else {
+					$list .= '<li class="gcconnex-avatar-in-list" data-guid="' . $guids[$i] . '">';
+					$list .= elgg_view_entity_icon($user, $options['size'], array(
+						'use_hover' => $options['use_hover'],
+					));
+					$list .= '</li>'; // close div class="gcconnex-avatar-in-list"
+
+				}
+			}
+			else {
+				break;
+			}
+		}
+	}
+	//$list .= count($guids);
+	if($options['id'] && $options['skill_guid'] && count($guids) > 4){
+		$list .= '<a class="btn gcconnex-avatars-expand elgg-lightbox" title="'.elgg_echo('gcconnex_profile:gc_skill:allendorse').'" href="' . elgg_get_site_url() . 'ajax/view/endorse/endorsement?guid=' . $options['skill_guid'] .'" ><i class="fa fa-flip-vertical mrgn-tp-sm fa-ellipsis-h" aria-hidden="true"><span class="wb-invisible">'.elgg_echo('gcconnex_profile:gc_skill:allendorse').'</span></i></a>';
+	}
+	$list .= '</ul>'; // close div class="list-avatars"
+	return $list;
 }
 
 /*
@@ -414,20 +414,20 @@ 
  */
 function cmpStartDate($foo, $bar)
 {
-    $a = get_entity($foo);
-    $b = get_entity($bar);
-
-    if (($a instanceof ElggEntity) && ($b instanceof ElggEntity)) {
-        if ($a->startyear == $b->startyear) {
-            return (0);
-        }
-        else if ($a->startyear > $b->startyear) {
-            return (-1);
-        }
-        else if ($a->startyear < $b->startyear) {
-            return (1);
-        }
-    }
+	$a = get_entity($foo);
+	$b = get_entity($bar);
+
+	if (($a instanceof ElggEntity) && ($b instanceof ElggEntity)) {
+		if ($a->startyear == $b->startyear) {
+			return (0);
+		}
+		else if ($a->startyear > $b->startyear) {
+			return (-1);
+		}
+		else if ($a->startyear < $b->startyear) {
+			return (1);
+		}
+	}
 }
 
 /*
@@ -436,32 +436,32 @@ 
 function sortDate($foo, $bar)
 {
 
-    $a = get_entity($foo);
-    $b = get_entity($bar);
-
-    // check if $a and $b are both entities object (this will fill up the error log if not checked)
-    if (($a instanceof ElggEntity) && ($b instanceof ElggEntity)) {
-
-        if ($a->ongoing == "true" && $b->ongoing == "true") {
-            return (0);
-        }
-        else if ($a->ongoing == "true" && $b->ongoing != "true") {
-            return (-1);
-        }
-        else if ($a->ongoing != "true" && $b->ongoing == "true") {
-            return (1);
-        }
-        else {
-            if ($a->endyear == $b->endyear) {
-                // @todo: sort by enddate entry (months, saved as strings..)
-                return (cmpStartDate($a, $b));
-            }
-            else if ($a->endyear > $b->endyear) {
-                return (-1);
-            }
-            else if ($a->endyear < $b->endyear) {
-                return (1);
-            }
-        }
-    }
+	$a = get_entity($foo);
+	$b = get_entity($bar);
+
+	// check if $a and $b are both entities object (this will fill up the error log if not checked)
+	if (($a instanceof ElggEntity) && ($b instanceof ElggEntity)) {
+
+		if ($a->ongoing == "true" && $b->ongoing == "true") {
+			return (0);
+		}
+		else if ($a->ongoing == "true" && $b->ongoing != "true") {
+			return (-1);
+		}
+		else if ($a->ongoing != "true" && $b->ongoing == "true") {
+			return (1);
+		}
+		else {
+			if ($a->endyear == $b->endyear) {
+				// @todo: sort by enddate entry (months, saved as strings..)
+				return (cmpStartDate($a, $b));
+			}
+			else if ($a->endyear > $b->endyear) {
+				return (-1);
+			}
+			else if ($a->endyear < $b->endyear) {
+				return (1);
+			}
+		}
+	}
 }

Spacing +20 added lines, -20 removed lines

@@ -132,7 +132,7 @@ 
  */
 function init_ajax_block($title, $section, $user) {
 
-    switch($section){
+    switch ($section) {
         case 'about-me':
             $field = elgg_echo('gcconnex_profile:about_me');
             break;
@@ -170,7 +170,7 @@ 
 
 function finit_ajax_block($section) {
 
-    switch($section){
+    switch ($section) {
         case 'about-me':
             $field = elgg_echo('gcconnex_profile:about_me');
             break;
@@ -210,7 +210,7 @@ 
     foreach ($user_friends as $u) {
 
         // Complete match for first name
-        if (strpos(strtolower(' ' . $u['name']) . ' ', ' ' . strtolower($query) . ' ') === 0 ) {
+        if (strpos(strtolower(' ' . $u['name']) . ' ', ' ' . strtolower($query) . ' ') === 0) {
             $result[] = array(
                 'value' => $u->get('name'),
                 'guid' => $u->get('guid'),
@@ -240,7 +240,7 @@ 
         }
 
         // Partial match beginning at start of first name
-        elseif (strpos(strtolower(' ' . $u['name']), ' ' . strtolower($query)) === 0 ) {
+        elseif (strpos(strtolower(' ' . $u['name']), ' ' . strtolower($query)) === 0) {
             $result[] = array(
                 'value' => $u->get('name'),
                 'guid' => $u->get('guid'),
@@ -291,20 +291,20 @@ 
     $low_relevance = array();
     $lowest_relevance = array();
 
-    foreach ( $result as $r ) {
-        if ( $r['pos'] == 0 ) {
+    foreach ($result as $r) {
+        if ($r['pos'] == 0) {
             $highest_relevance[] = $r;
         }
-        elseif ( $r['pos'] == 1 ) {
+        elseif ($r['pos'] == 1) {
             $high_relevance[] = $r;
         }
-        elseif ( $r['pos'] == 2 ) {
+        elseif ($r['pos'] == 2) {
             $med_relevance[] = $r;
         }
-        elseif ( $r['pos'] == 3 ) {
+        elseif ($r['pos'] == 3) {
             $low_relevance[] = $r;
         }
-        elseif ( $r['pos'] == 4 ) {
+        elseif ($r['pos'] == 4) {
             $lowest_relevance[] = $r;
         }
     }
@@ -319,11 +319,11 @@ 
  * Purpose: check if a profile section has content, so that we know whether or not we should prepare ajax for display
  */
 function has_content($user, $section) {
-    if ( $user->$section != null ) {
+    if ($user->$section != null) {
         return true;
     }
     else {
-        if ( $user->canEdit() ) {
+        if ($user->canEdit()) {
             return true;
         }
         else {
@@ -346,7 +346,7 @@ 
     $list = "";
     $list .= '<ul class="list-avatars list-unstyled clearfix' . $options['class'] . '">';
 
-    if ( $options['limit'] == 0 ) {
+    if ($options['limit'] == 0) {
         $options['limit'] = 999;
     }
     else {
@@ -359,11 +359,11 @@ 
     }
 
 
-    if ( $options['use_hover'] === null ) {
+    if ($options['use_hover'] === null) {
         $options['use_hover'] = true;
     }
 
-    if ( $options['guids'] == null ) {
+    if ($options['guids'] == null) {
         return false;
     }
     else {
@@ -374,9 +374,9 @@ 
         $guids = $options['guids'];
 
         // display each avatar, up until the limit is reached
-        for ( $i=0; $i<$options['limit']; $i++) {
-            if( ($user = get_user($guids[$i])) == true ) {
-                if ( $options['edit_mode'] == true ) {
+        for ($i = 0; $i < $options['limit']; $i++) {
+            if (($user = get_user($guids[$i])) == true) {
+                if ($options['edit_mode'] == true) {
                     $list .= '<li class="gcconnex-avatar-in-list" data-guid="' . $guids[$i] . '" onclick="removeColleague(this)">';
                     $list .= '<div class="remove-colleague-from-list">X';
                     $list .= '</div>'; // close div class="remove-colleague-from-list"
@@ -402,8 +402,8 @@ 
         }
     }
     //$list .= count($guids);
-    if($options['id'] && $options['skill_guid'] && count($guids) > 4){
-        $list .= '<a class="btn gcconnex-avatars-expand elgg-lightbox" title="'.elgg_echo('gcconnex_profile:gc_skill:allendorse').'" href="' . elgg_get_site_url() . 'ajax/view/endorse/endorsement?guid=' . $options['skill_guid'] .'" ><i class="fa fa-flip-vertical mrgn-tp-sm fa-ellipsis-h" aria-hidden="true"><span class="wb-invisible">'.elgg_echo('gcconnex_profile:gc_skill:allendorse').'</span></i></a>';
+    if ($options['id'] && $options['skill_guid'] && count($guids) > 4) {
+        $list .= '<a class="btn gcconnex-avatars-expand elgg-lightbox" title="' . elgg_echo('gcconnex_profile:gc_skill:allendorse') . '" href="' . elgg_get_site_url() . 'ajax/view/endorse/endorsement?guid=' . $options['skill_guid'] . '" ><i class="fa fa-flip-vertical mrgn-tp-sm fa-ellipsis-h" aria-hidden="true"><span class="wb-invisible">' . elgg_echo('gcconnex_profile:gc_skill:allendorse') . '</span></i></a>';
     }
     $list .= '</ul>'; // close div class="list-avatars"
     return $list;

Braces +17 added lines, -34 removed lines

@@ -294,17 +294,13 @@ 
     foreach ( $result as $r ) {
         if ( $r['pos'] == 0 ) {
             $highest_relevance[] = $r;
-        }
-        elseif ( $r['pos'] == 1 ) {
+        } elseif ( $r['pos'] == 1 ) {
             $high_relevance[] = $r;
-        }
-        elseif ( $r['pos'] == 2 ) {
+        } elseif ( $r['pos'] == 2 ) {
             $med_relevance[] = $r;
-        }
-        elseif ( $r['pos'] == 3 ) {
+        } elseif ( $r['pos'] == 3 ) {
             $low_relevance[] = $r;
-        }
-        elseif ( $r['pos'] == 4 ) {
+        } elseif ( $r['pos'] == 4 ) {
             $lowest_relevance[] = $r;
         }
     }
@@ -321,12 +317,10 @@ 
 function has_content($user, $section) {
     if ( $user->$section != null ) {
         return true;
-    }
-    else {
+    } else {
         if ( $user->canEdit() ) {
             return true;
-        }
-        else {
+        } else {
             return false;
         }
     }
@@ -348,8 +342,7 @@ 
 
     if ( $options['limit'] == 0 ) {
         $options['limit'] = 999;
-    }
-    else {
+    } else {
 
         $link = elgg_view('output/url', array(
             'href' => 'ajax/view/b_extended_profile/edit_basic',
@@ -365,8 +358,7 @@ 
 
     if ( $options['guids'] == null ) {
         return false;
-    }
-    else {
+    } else {
         if (!is_array($options['guids'])) {
             $options['guids'] = array($options['guids']);
         }
@@ -386,8 +378,7 @@ 
                         'href' => false
                     ));
                     $list .= '</li>'; // close div class="gcconnex-avatar-in-list"
-                }
-                else {
+                } else {
                     $list .= '<li class="gcconnex-avatar-in-list" data-guid="' . $guids[$i] . '">';
                     $list .= elgg_view_entity_icon($user, $options['size'], array(
                         'use_hover' => $options['use_hover'],
@@ -395,8 +386,7 @@ 
                     $list .= '</li>'; // close div class="gcconnex-avatar-in-list"
 
                 }
-            }
-            else {
+            } else {
                 break;
             }
         }
@@ -420,11 +410,9 @@ 
     if (($a instanceof ElggEntity) && ($b instanceof ElggEntity)) {
         if ($a->startyear == $b->startyear) {
             return (0);
-        }
-        else if ($a->startyear > $b->startyear) {
+        } else if ($a->startyear > $b->startyear) {
             return (-1);
-        }
-        else if ($a->startyear < $b->startyear) {
+        } else if ($a->startyear < $b->startyear) {
             return (1);
         }
     }
@@ -444,22 +432,17 @@ 
 
         if ($a->ongoing == "true" && $b->ongoing == "true") {
             return (0);
-        }
-        else if ($a->ongoing == "true" && $b->ongoing != "true") {
+        } else if ($a->ongoing == "true" && $b->ongoing != "true") {
             return (-1);
-        }
-        else if ($a->ongoing != "true" && $b->ongoing == "true") {
+        } else if ($a->ongoing != "true" && $b->ongoing == "true") {
             return (1);
-        }
-        else {
+        } else {
             if ($a->endyear == $b->endyear) {
                 // @todo: sort by enddate entry (months, saved as strings..)
                 return (cmpStartDate($a, $b));
-            }
-            else if ($a->endyear > $b->endyear) {
+            } else if ($a->endyear > $b->endyear) {
                 return (-1);
-            }
-            else if ($a->endyear < $b->endyear) {
+            } else if ($a->endyear < $b->endyear) {
                 return (1);
             }
         }

mod/b_extended_profile/views/default/profile/details.php

Indentation +141 added lines, -141 removed lines

@@ -19,39 +19,39 @@ 
 echo '<div class="gcconnex-profile-name">';
 //edit button
 if ($user->canEdit()) {
-    echo '<a role="button" class="btn btn-primary gcconnex-edit-profile overlay-lnk" href="#editProfile">' . elgg_echo('gcconnex_profile:edit_profile') . ' <span class="wb-inv">' . elgg_echo('profile:contactinfo') . '</span></a><script>$(".gcconnex-edit-profile").on("click", function(){ $("#editProfile").focus(); });</script>';
-    echo '<!-- Modal -->
+	echo '<a role="button" class="btn btn-primary gcconnex-edit-profile overlay-lnk" href="#editProfile">' . elgg_echo('gcconnex_profile:edit_profile') . ' <span class="wb-inv">' . elgg_echo('profile:contactinfo') . '</span></a><script>$(".gcconnex-edit-profile").on("click", function(){ $("#editProfile").focus(); });</script>';
+	echo '<!-- Modal -->
 <div id="editProfile" class="wb-overlay modal-content overlay-def wb-popup-mid" tabindex="-1">
     <div class="">
         <div class="">
             <header class="modal-header profile-edit-header">';
-    echo '<h2 class="modal-title">' . elgg_echo('gcconnex_profile:basic:header') . '</h2>';
-    echo '</header>';
-    echo '<div class="panel-body overflow-body">';
-    $editAvatar = elgg_get_site_url(). 'avatar/edit/' . $user->username;
-    echo '<div><a href='.$editAvatar.' class="btn btn-primary">'. elgg_echo('gcconnex_profile:profile:edit_avatar') .'</a></div>';
-    echo '<div class="basic-profile-standard-field-wrapper col-md-6 col-xs-12">'; // container for css styling, used to group profile content and display them seperately from other fields
-
-    $fields = array('Name', 'Job', 'Department', 'Location', 'Phone', 'Mobile', 'Email', 'Website');
-
-    foreach ($fields as $field) { // create a label and input box for each field on the basic profile (see $fields above)
-        echo '<div class="basic-profile-field-wrapper col-xs-12">'; // field wrapper for css styling
-
-        $field = strtolower($field);
-        echo '<label for="' . $field . '" class="basic-profile-label ' . $field . '-label">' . elgg_echo('gcconnex_profile:basic:' . $field) . '</label>'; // field label
-
-        $value = $user->get($field);
-        // setup the input for this field
-        $params = array(
-            'name' => $field,
-            'id' => $field,
-            'class' => 'gcconnex-basic-' . $field,
-            'value' => $value,
-        );
+	echo '<h2 class="modal-title">' . elgg_echo('gcconnex_profile:basic:header') . '</h2>';
+	echo '</header>';
+	echo '<div class="panel-body overflow-body">';
+	$editAvatar = elgg_get_site_url(). 'avatar/edit/' . $user->username;
+	echo '<div><a href='.$editAvatar.' class="btn btn-primary">'. elgg_echo('gcconnex_profile:profile:edit_avatar') .'</a></div>';
+	echo '<div class="basic-profile-standard-field-wrapper col-md-6 col-xs-12">'; // container for css styling, used to group profile content and display them seperately from other fields
+
+	$fields = array('Name', 'Job', 'Department', 'Location', 'Phone', 'Mobile', 'Email', 'Website');
+
+	foreach ($fields as $field) { // create a label and input box for each field on the basic profile (see $fields above)
+		echo '<div class="basic-profile-field-wrapper col-xs-12">'; // field wrapper for css styling
+
+		$field = strtolower($field);
+		echo '<label for="' . $field . '" class="basic-profile-label ' . $field . '-label">' . elgg_echo('gcconnex_profile:basic:' . $field) . '</label>'; // field label
+
+		$value = $user->get($field);
+		// setup the input for this field
+		$params = array(
+			'name' => $field,
+			'id' => $field,
+			'class' => 'gcconnex-basic-' . $field,
+			'value' => $value,
+		);
 		/////////////Troy
-        if ($field == 'department') {
-            /////////////Troy
-            echo '<div class="basic-profile-field department-test">';
+		if ($field == 'department') {
+			/////////////Troy
+			echo '<div class="basic-profile-field department-test">';
 			$obj = elgg_get_entities(array(
    				'type' => 'object',
    				'subtype' => 'dept_list',
@@ -99,83 +99,83 @@ 
 			if ($key === false){
 				$key = array_search($value[1], $departments);
 			}
-            echo elgg_view('input/select', array(
+			echo elgg_view('input/select', array(
 				'name' => $field,
 				'id' => $field,
-        		'class' => ' gcconnex-basic-' . $field,
-        		'value' => $key,
+				'class' => ' gcconnex-basic-' . $field,
+				'value' => $key,
 				'options_values' => $departments,
 
 			));
-        }
-        else {
-            echo '<div class="basic-profile-field">'; // field wrapper for css styling
+		}
+		else {
+			echo '<div class="basic-profile-field">'; // field wrapper for css styling
 
 			echo elgg_view("input/text", $params);
 		}// input field
-        echo '</div>'; //close div class = basic-profile-field
+		echo '</div>'; //close div class = basic-profile-field
 
-        echo '</div>'; //close div class = basic-profile-field-wrapper
-    }
+		echo '</div>'; //close div class = basic-profile-field-wrapper
+	}
 
-    echo '</div>'; // close div class="basic-profile-standard-field-wrapper"
-    echo '<div class="basic-profile-social-media-wrapper col-md-6 col-xs-12">'; // container for css styling, used to group profile content and display them seperately from other fields
+	echo '</div>'; // close div class="basic-profile-standard-field-wrapper"
+	echo '<div class="basic-profile-social-media-wrapper col-md-6 col-xs-12">'; // container for css styling, used to group profile content and display them seperately from other fields
 
 	// pre-populate the social media fields and their prepended link for user profiles
 
-    $fields = array('Facebook' => "http://www.facebook.com/",
-    'Google Plus' => "http://www.google.com/",
-    'GitHub' => "https://github.com/",
-    'Twitter' => "https://twitter.com/",
-    'Linkedin' => "http://ca.linkedin.com/in/",
-    'Pinterest' => "http://www.pinterest.com/",
-    'Tumblr' => "https://www.tumblr.com/blog/",
-    'Instagram' => "http://instagram.com/",
-    'Flickr' => "http://flickr.com/",
-    'Youtube' => "http://www.youtube.com/");
-
-    foreach ($fields as $field => $field_link) { // create a label and input box for each social media field on the basic profile
-
-        echo '<div class="basic-profile-field-wrapper social-media-field-wrapper">'; //field wrapper for css styling
-
-        $field = str_replace(' ', '-', $field); // create a css friendly version of the section name
-        $field = strtolower($field);
-
-        if ($field == "google-plus") { $field = "google"; }
-        $value = $user->get($field);
-
-        echo '<div class="input-group">'; // input wrapper for prepended link and input box, excludes the input label
-        echo '<label for="' . $field . 'Input" class="input-group-addon clearfix">' . $field_link . "</label>"; // prepended link
-
-        // setup the input for this field
-        $placeholder = "test";
-        if ($field == "facebook") { $placeholder = "User.Name"; }
-        if ($field == "google") { $placeholder = "############"; }
-        if ($field == "github") { $placeholder = "User"; }
-        if ($field == "twitter") { $placeholder = "@user"; }
-        if ($field == "linkedin") { $placeholder = "CustomURL"; }
-        if ($field == "pinterest") { $placeholder = "Username"; }
-        if ($field == "tumblr") { $placeholder = "Username"; }
-        if ($field == "instagram") { $placeholder = "@user"; }
-        if ($field == "flickr") { $placeholder = "Username"; }
-        if ($field == "youtube") { $placeholder = "Username"; }
-
-        $params = array(
-            'name' => $field,
-            'id' => $field . 'Input',
-            'class' => 'editProfileFields gcconnex-basic-field gcconnex-social-media gcconnex-basic-' . $field,
-            'placeholder' => $placeholder,
-            'value' => $value
-        );
-
-        echo elgg_view("input/text", $params); // input field
-
-        echo '</div>'; // close div class="input-group"
-        echo '</div>'; // close div class = basic-profile-field-wrapper
-    }
-
-    echo '</div>'; // close div class="basic-profile-social-media-wrapper"
-    echo '
+	$fields = array('Facebook' => "http://www.facebook.com/",
+	'Google Plus' => "http://www.google.com/",
+	'GitHub' => "https://github.com/",
+	'Twitter' => "https://twitter.com/",
+	'Linkedin' => "http://ca.linkedin.com/in/",
+	'Pinterest' => "http://www.pinterest.com/",
+	'Tumblr' => "https://www.tumblr.com/blog/",
+	'Instagram' => "http://instagram.com/",
+	'Flickr' => "http://flickr.com/",
+	'Youtube' => "http://www.youtube.com/");
+
+	foreach ($fields as $field => $field_link) { // create a label and input box for each social media field on the basic profile
+
+		echo '<div class="basic-profile-field-wrapper social-media-field-wrapper">'; //field wrapper for css styling
+
+		$field = str_replace(' ', '-', $field); // create a css friendly version of the section name
+		$field = strtolower($field);
+
+		if ($field == "google-plus") { $field = "google"; }
+		$value = $user->get($field);
+
+		echo '<div class="input-group">'; // input wrapper for prepended link and input box, excludes the input label
+		echo '<label for="' . $field . 'Input" class="input-group-addon clearfix">' . $field_link . "</label>"; // prepended link
+
+		// setup the input for this field
+		$placeholder = "test";
+		if ($field == "facebook") { $placeholder = "User.Name"; }
+		if ($field == "google") { $placeholder = "############"; }
+		if ($field == "github") { $placeholder = "User"; }
+		if ($field == "twitter") { $placeholder = "@user"; }
+		if ($field == "linkedin") { $placeholder = "CustomURL"; }
+		if ($field == "pinterest") { $placeholder = "Username"; }
+		if ($field == "tumblr") { $placeholder = "Username"; }
+		if ($field == "instagram") { $placeholder = "@user"; }
+		if ($field == "flickr") { $placeholder = "Username"; }
+		if ($field == "youtube") { $placeholder = "Username"; }
+
+		$params = array(
+			'name' => $field,
+			'id' => $field . 'Input',
+			'class' => 'editProfileFields gcconnex-basic-field gcconnex-social-media gcconnex-basic-' . $field,
+			'placeholder' => $placeholder,
+			'value' => $value
+		);
+
+		echo elgg_view("input/text", $params); // input field
+
+		echo '</div>'; // close div class="input-group"
+		echo '</div>'; // close div class = basic-profile-field-wrapper
+	}
+
+	echo '</div>'; // close div class="basic-profile-social-media-wrapper"
+	echo '
 
     </div>
             <div class="panel-footer text-right profile-edit-footer">
@@ -193,17 +193,17 @@ 
 echo '</div>'; // close div class="gcconnex-profile-name"
 //actions dropdown
 if (elgg_get_page_owner_guid() != elgg_get_logged_in_user_guid()) {
-    $menu = elgg_trigger_plugin_hook('register', "menu:user_hover", array('entity' => $user), array());
-    $builder = new ElggMenuBuilder($menu);
-    $menu = $builder->getMenu();
-    $actions = elgg_extract('action', $menu, array());
-    $admin = elgg_extract('admin', $menu, array());
-    $profile_actions = '';
+	$menu = elgg_trigger_plugin_hook('register', "menu:user_hover", array('entity' => $user), array());
+	$builder = new ElggMenuBuilder($menu);
+	$menu = $builder->getMenu();
+	$actions = elgg_extract('action', $menu, array());
+	$admin = elgg_extract('admin', $menu, array());
+	$profile_actions = '';
 
 	// cyu - GCCON-151 : Add colleague in FR not there (inconsistent FR and EN menu layout) & other issues
-    if (elgg_is_logged_in() && $actions) {
+	if (elgg_is_logged_in() && $actions) {
 		$btn_friend_request = '';
-        foreach ($actions as $action) {
+		foreach ($actions as $action) {
 
 			if (strcmp($action->getName(),'add_friend') == 0 || strcmp($action->getName(),'remove_friend') == 0) {
 				if (!check_entity_relationship(elgg_get_logged_in_user_guid(),'friendrequest',$user->getGUID())) {
@@ -224,30 +224,30 @@ 
 				} else
 					$profile_actions .= '<li>' . $action->getContent(array('class' => 'gcconnex-basic-profile-actions')) . '</li>';
 			}
-        }
-    }
-    if(elgg_is_logged_in()){
+		}
+	}
+	if(elgg_is_logged_in()){
 		echo "<button type='button' class='btn btn-primary' onclick='location.href=\"{$btn_friend_request_link}\"'>{$btn_friend_request}</button>"; // cyu - added button and removed from actions toggle
 
-        echo $add . '<div class="btn-group"><button type="button" class="btn btn-custom mrgn-rght-sm dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+		echo $add . '<div class="btn-group"><button type="button" class="btn btn-custom mrgn-rght-sm dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
                     ' . elgg_echo('profile:actions') . ' <span class="caret"></span>
                     </button>
                     <ul class="dropdown-menu pull-right clearfix">';
-        echo $profile_actions;
-        echo '</ul></div>';
-    }
+		echo $profile_actions;
+		echo '</ul></div>';
+	}
 }
 
 // if admin, display admin links
 $admin_links = '';
 if (elgg_is_admin_logged_in() && elgg_get_logged_in_user_guid() != elgg_get_page_owner_guid()) {
-    $text = elgg_echo('admin:options');
+	$text = elgg_echo('admin:options');
 
-    foreach ($admin as $menu_item) {
-        $admin_links .= '<li>' . elgg_view('navigation/menu/elements/item', array('item' => $menu_item)) . '</li>';
-    }
+	foreach ($admin as $menu_item) {
+		$admin_links .= '<li>' . elgg_view('navigation/menu/elements/item', array('item' => $menu_item)) . '</li>';
+	}
 
-    echo '<div class="pull-right btn-group"><button type="button" class="btn btn-custom pull-right dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">' .
+	echo '<div class="pull-right btn-group"><button type="button" class="btn btn-custom pull-right dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">' .
 	$text .  '<span class="caret"></span>
                 </button>
                 <ul class="dropdown-menu pull-right clearfix">' . $admin_links . '</ul></div>';
@@ -266,24 +266,24 @@ 
 echo '<div class="gcconnex-profile-contact-info">';
 
 if ($user->phone != null) {
-    echo '<p class="mrgn-bttm-sm"><i class="fa fa-phone fa-lg"></i> ' . $user->phone . '</p>';
+	echo '<p class="mrgn-bttm-sm"><i class="fa fa-phone fa-lg"></i> ' . $user->phone . '</p>';
 }
 
 if ($user->mobile != null) {
-    echo '<p class="mrgn-bttm-sm"><i class="fa fa-mobile fa-lg"></i> ' . $user->mobile . '</p>';
+	echo '<p class="mrgn-bttm-sm"><i class="fa fa-mobile fa-lg"></i> ' . $user->mobile . '</p>';
 }
 
 if ($user->email != null) {
-    echo '<p class="mrgn-bttm-sm"><i class="fa fa-envelope fa-lg"></i> <a href="mailto:' . $user->email . '">' . $user->email . '</a></p>';
+	echo '<p class="mrgn-bttm-sm"><i class="fa fa-envelope fa-lg"></i> <a href="mailto:' . $user->email . '">' . $user->email . '</a></p>';
 }
 
 if ($user->website != null) {
-    echo '<p class="mrgn-bttm-sm"><i class="fa fa-globe fa-lg"></i> ';
-    echo elgg_view('output/url', array(
-        'href' => $user->website,
-        'text' => $user->website
-    ));
-    echo '</p>';
+	echo '<p class="mrgn-bttm-sm"><i class="fa fa-globe fa-lg"></i> ';
+	echo elgg_view('output/url', array(
+		'href' => $user->website,
+		'text' => $user->website
+	));
+	echo '</p>';
 }
 
 echo '</div></div>'; // close div class="gcconnex-profile-contact-info"
@@ -294,22 +294,22 @@ 
 echo '<div class="gcconnex-profile-social-media-links mrgn-bttm-sm mrgn-lft-md">';
 foreach ($social as $media) {
 
-    if ($link = $user->get($media)) {
+	if ($link = $user->get($media)) {
 
-        if ($media == 'facebook') { $link = "http://www.facebook.com/" . $link; $class = "fa-facebook";}
-        if ($media == 'google') { $link = "http://plus.google.com/" . $link; $class = "fa-google-plus";}
-        if ($media == 'github') { $link = "https://github.com/" . $link; $class = "fa-github";}
-        if ($media == 'twitter') { $link = "https://twitter.com/" . $link; $class = "fa-twitter";}
-        if ($media == 'linkedin') { $link = "http://ca.linkedin.com/in/" . $link; $class = "fa-linkedin";}
-        if ($media == 'pinterest') { $link = "http://www.pinterest.com/" . $link; $class = "fa-pinterest";}
-        if ($media == 'tumblr') { $link = "https://www.tumblr.com/blog/" . $link; $class = "fa-tumblr";}
-        if ($media == 'instagram') { $link = "http://instagram.com/" . $link; $class = "fa-instagram";}
-        if ($media == 'flickr') { $link = "http://flickr.com/" . $link; $class = "fa-flickr"; }
-        if ($media == 'youtube') { $link = "http://www.youtube.com/" . $link; $class = "fa-youtube";}
+		if ($media == 'facebook') { $link = "http://www.facebook.com/" . $link; $class = "fa-facebook";}
+		if ($media == 'google') { $link = "http://plus.google.com/" . $link; $class = "fa-google-plus";}
+		if ($media == 'github') { $link = "https://github.com/" . $link; $class = "fa-github";}
+		if ($media == 'twitter') { $link = "https://twitter.com/" . $link; $class = "fa-twitter";}
+		if ($media == 'linkedin') { $link = "http://ca.linkedin.com/in/" . $link; $class = "fa-linkedin";}
+		if ($media == 'pinterest') { $link = "http://www.pinterest.com/" . $link; $class = "fa-pinterest";}
+		if ($media == 'tumblr') { $link = "https://www.tumblr.com/blog/" . $link; $class = "fa-tumblr";}
+		if ($media == 'instagram') { $link = "http://instagram.com/" . $link; $class = "fa-instagram";}
+		if ($media == 'flickr') { $link = "http://flickr.com/" . $link; $class = "fa-flickr"; }
+		if ($media == 'youtube') { $link = "http://www.youtube.com/" . $link; $class = "fa-youtube";}
 
-        echo '<a href="' . $link . '" target="_blank"><i class="socialMediaIcons fa ' . $class . ' fa-2x"></i></a>';
+		echo '<a href="' . $link . '" target="_blank"><i class="socialMediaIcons fa ' . $class . ' fa-2x"></i></a>';
 
-    }
+	}
 }
 echo '</div>'; // close div class="gcconnex-profile-social-media-links"
 echo '</div>';
@@ -326,16 +326,16 @@ 
 
 $profile_actions = '';
 if (elgg_is_logged_in() && $actions) {
-    $profile_actions = '<ul class="elgg-menu profile-action-menu mvm">';
-    foreach ($actions as $action) {
-        $profile_actions .= '<li>' . $action->getContent(array('class' => 'elgg-button elgg-button-action')) . '</li>';
-    }
-    $profile_actions .= '</ul>';
+	$profile_actions = '<ul class="elgg-menu profile-action-menu mvm">';
+	foreach ($actions as $action) {
+		$profile_actions .= '<li>' . $action->getContent(array('class' => 'elgg-button elgg-button-action')) . '</li>';
+	}
+	$profile_actions .= '</ul>';
 }
 
 // content links
 $content_menu_title = elgg_echo('gcconnex_profile:user_content');
 $content_menu = elgg_view_menu('owner_block', array(
-    'entity' => elgg_get_page_owner_entity(),
-    'class' => 'profile-content-menu',
+	'entity' => elgg_get_page_owner_entity(),
+	'class' => 'profile-content-menu',
 ));

Spacing +23 added lines, -23 removed lines

@@ -28,8 +28,8 @@ 
     echo '<h2 class="modal-title">' . elgg_echo('gcconnex_profile:basic:header') . '</h2>';
     echo '</header>';
     echo '<div class="panel-body overflow-body">';
-    $editAvatar = elgg_get_site_url(). 'avatar/edit/' . $user->username;
-    echo '<div><a href='.$editAvatar.' class="btn btn-primary">'. elgg_echo('gcconnex_profile:profile:edit_avatar') .'</a></div>';
+    $editAvatar = elgg_get_site_url() . 'avatar/edit/' . $user->username;
+    echo '<div><a href=' . $editAvatar . ' class="btn btn-primary">' . elgg_echo('gcconnex_profile:profile:edit_avatar') . '</a></div>';
     echo '<div class="basic-profile-standard-field-wrapper col-md-6 col-xs-12">'; // container for css styling, used to group profile content and display them seperately from other fields
 
     $fields = array('Name', 'Job', 'Department', 'Location', 'Phone', 'Mobile', 'Email', 'Website');
@@ -57,7 +57,7 @@ 
    				'subtype' => 'dept_list',
    				'owner_guid' => 0
 			));
-			if (get_current_language()=='en'){
+			if (get_current_language() == 'en') {
 				$departments = $obj[0]->deptsEn;
 				$departments = json_decode($departments, true);
 				$provinces['pov-alb'] = 'Government of Alberta';
@@ -73,8 +73,8 @@ 
 				$provinces['pov-que'] = 'Government of Quebec';
 				$provinces['pov-sask'] = 'Government of Saskatchewan';
 				$provinces['pov-yuk'] = 'Government of Yukon';
-				$departments = array_merge($departments,$provinces);
-			}else{
+				$departments = array_merge($departments, $provinces);
+			} else {
 				$departments = $obj[0]->deptsFr;
 				$departments = json_decode($departments, true);
 				$provinces['pov-alb'] = "Gouvernement de l'Alberta";
@@ -90,13 +90,13 @@ 
 				$provinces['pov-que'] = 'Gouvernement du Québec';
 				$provinces['pov-sask'] = 'Gouvernement de Saskatchewan';
 				$provinces['pov-yuk'] = 'Gouvernement du Yukon';
-				$departments = array_merge($departments,$provinces);
+				$departments = array_merge($departments, $provinces);
 			}
 
 			$value = explode(" / ", $value);
 			$key = array_search($value[0], $departments);
 
-			if ($key === false){
+			if ($key === false) {
 				$key = array_search($value[1], $departments);
 			}
             echo elgg_view('input/select', array(
@@ -205,20 +205,20 @@ 
 		$btn_friend_request = '';
         foreach ($actions as $action) {
 
-			if (strcmp($action->getName(),'add_friend') == 0 || strcmp($action->getName(),'remove_friend') == 0) {
-				if (!check_entity_relationship(elgg_get_logged_in_user_guid(),'friendrequest',$user->getGUID())) {
-					if ($user->isFriend() && strcmp($action->getName(),'remove_friend') == 0) {
+			if (strcmp($action->getName(), 'add_friend') == 0 || strcmp($action->getName(), 'remove_friend') == 0) {
+				if (!check_entity_relationship(elgg_get_logged_in_user_guid(), 'friendrequest', $user->getGUID())) {
+					if ($user->isFriend() && strcmp($action->getName(), 'remove_friend') == 0) {
 						$btn_friend_request = $action->getContent();
 						$btn_friend_request_link = $action->getHref();
 					}
-					if (!$user->isFriend() && strcmp($action->getName(),'add_friend') == 0) {
+					if (!$user->isFriend() && strcmp($action->getName(), 'add_friend') == 0) {
 						$btn_friend_request = $action->getContent(array('class' => 'asdfasdasfad'));
 						$btn_friend_request_link = $action->getHref();
 					}
 				}
 			} else {
 
-				if (check_entity_relationship(elgg_get_logged_in_user_guid(),'friendrequest',$user->getGUID()) && strcmp($action->getName(),'friend_request') == 0) {
+				if (check_entity_relationship(elgg_get_logged_in_user_guid(), 'friendrequest', $user->getGUID()) && strcmp($action->getName(), 'friend_request') == 0) {
 					$btn_friend_request_link = $action->getHref();
 					$btn_friend_request = $action->getContent();
 				} else
@@ -226,7 +226,7 @@ 
 			}
         }
     }
-    if(elgg_is_logged_in()){
+    if (elgg_is_logged_in()) {
 		echo "<button type='button' class='btn btn-primary' onclick='location.href=\"{$btn_friend_request_link}\"'>{$btn_friend_request}</button>"; // cyu - added button and removed from actions toggle
 
         echo $add . '<div class="btn-group"><button type="button" class="btn btn-custom mrgn-rght-sm dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
@@ -248,7 +248,7 @@ 
     }
 
     echo '<div class="pull-right btn-group"><button type="button" class="btn btn-custom pull-right dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">' .
-	$text .  '<span class="caret"></span>
+	$text . '<span class="caret"></span>
                 </button>
                 <ul class="dropdown-menu pull-right clearfix">' . $admin_links . '</ul></div>';
 }
@@ -296,16 +296,16 @@ 
 
     if ($link = $user->get($media)) {
 
-        if ($media == 'facebook') { $link = "http://www.facebook.com/" . $link; $class = "fa-facebook";}
-        if ($media == 'google') { $link = "http://plus.google.com/" . $link; $class = "fa-google-plus";}
-        if ($media == 'github') { $link = "https://github.com/" . $link; $class = "fa-github";}
-        if ($media == 'twitter') { $link = "https://twitter.com/" . $link; $class = "fa-twitter";}
-        if ($media == 'linkedin') { $link = "http://ca.linkedin.com/in/" . $link; $class = "fa-linkedin";}
-        if ($media == 'pinterest') { $link = "http://www.pinterest.com/" . $link; $class = "fa-pinterest";}
-        if ($media == 'tumblr') { $link = "https://www.tumblr.com/blog/" . $link; $class = "fa-tumblr";}
-        if ($media == 'instagram') { $link = "http://instagram.com/" . $link; $class = "fa-instagram";}
+        if ($media == 'facebook') { $link = "http://www.facebook.com/" . $link; $class = "fa-facebook"; }
+        if ($media == 'google') { $link = "http://plus.google.com/" . $link; $class = "fa-google-plus"; }
+        if ($media == 'github') { $link = "https://github.com/" . $link; $class = "fa-github"; }
+        if ($media == 'twitter') { $link = "https://twitter.com/" . $link; $class = "fa-twitter"; }
+        if ($media == 'linkedin') { $link = "http://ca.linkedin.com/in/" . $link; $class = "fa-linkedin"; }
+        if ($media == 'pinterest') { $link = "http://www.pinterest.com/" . $link; $class = "fa-pinterest"; }
+        if ($media == 'tumblr') { $link = "https://www.tumblr.com/blog/" . $link; $class = "fa-tumblr"; }
+        if ($media == 'instagram') { $link = "http://instagram.com/" . $link; $class = "fa-instagram"; }
         if ($media == 'flickr') { $link = "http://flickr.com/" . $link; $class = "fa-flickr"; }
-        if ($media == 'youtube') { $link = "http://www.youtube.com/" . $link; $class = "fa-youtube";}
+        if ($media == 'youtube') { $link = "http://www.youtube.com/" . $link; $class = "fa-youtube"; }
 
         echo '<a href="' . $link . '" target="_blank"><i class="socialMediaIcons fa ' . $class . ' fa-2x"></i></a>';
 

Braces +5 added lines, -5 removed lines

@@ -74,7 +74,7 @@ 
 				$provinces['pov-sask'] = 'Government of Saskatchewan';
 				$provinces['pov-yuk'] = 'Government of Yukon';
 				$departments = array_merge($departments,$provinces);
-			}else{
+			} else{
 				$departments = $obj[0]->deptsFr;
 				$departments = json_decode($departments, true);
 				$provinces['pov-alb'] = "Gouvernement de l'Alberta";
@@ -107,8 +107,7 @@ 
 				'options_values' => $departments,
 
 			));
-        }
-        else {
+        } else {
             echo '<div class="basic-profile-field">'; // field wrapper for css styling
 
 			echo elgg_view("input/text", $params);
@@ -221,8 +220,9 @@ 
 				if (check_entity_relationship(elgg_get_logged_in_user_guid(),'friendrequest',$user->getGUID()) && strcmp($action->getName(),'friend_request') == 0) {
 					$btn_friend_request_link = $action->getHref();
 					$btn_friend_request = $action->getContent();
-				} else
-					$profile_actions .= '<li>' . $action->getContent(array('class' => 'gcconnex-basic-profile-actions')) . '</li>';
+				} else {
+									$profile_actions .= '<li>' . $action->getContent(array('class' => 'gcconnex-basic-profile-actions')) . '</li>';
+				}
 			}
         }
     }