gctools-outilsgc / gcconnex

mod/missions/views/default/page/elements/unfinished-feedback.php

Spacing +8 added lines, -8 removed lines

@@ -12,15 +12,15 @@ 
  */
 
 $mission_list = $vars['entity_list'];
-foreach($mission_list as $key => $mission) {
-	if($mission->state != 'completed') {
+foreach ($mission_list as $key => $mission) {
+	if ($mission->state != 'completed') {
 		unset($mission_list[$key]);
 	}
 }
 
 $feedback_required = '';
 $count = 0;
-foreach($mission_list as $mission) {
+foreach ($mission_list as $mission) {
 	$feedback_search = elgg_get_entities_from_metadata(array(
 			'type' => 'object',
 			'subtype' => 'mission-feedback',
@@ -33,13 +33,13 @@ 
 	$feedback_search = array_filter($feedback_search);
 	
 	$participants = get_entity_relationships($mission->guid);
-	foreach($participants as $key => $relation) {
-		if($relation->relationship != 'mission_accepted') {
+	foreach ($participants as $key => $relation) {
+		if ($relation->relationship != 'mission_accepted') {
 			unset($participants[$key]);
 		}
 	}
 
-	if((elgg_get_logged_in_user_guid() == $mission->owner_guid || elgg_get_logged_in_user_guid() == $mission->account) && count($feedback_search) < count($participants)) {
+	if ((elgg_get_logged_in_user_guid() == $mission->owner_guid || elgg_get_logged_in_user_guid() == $mission->account) && count($feedback_search) < count($participants)) {
 		$feedback_required .= '<div name="mission-unfinished-feedback-' . $mission->guid . '">';
 		
 		$feedback_required .= elgg_view('output/url', array(
@@ -51,7 +51,7 @@ 
 		$feedback_required .= '</div>';
 		$count++;
 	}
-	elseif(check_entity_relationship($mission->guid, 'mission_accepted', elgg_get_logged_in_user_guid()) 
+	elseif (check_entity_relationship($mission->guid, 'mission_accepted', elgg_get_logged_in_user_guid()) 
 			&& !count($feedback_search) && elgg_get_logged_in_user_guid() != $mission->owner_guid && elgg_get_logged_in_user_guid() != $mission->account) {
 		$feedback_required .= '<div name="mission-unfinished-feedback-' . $mission->guid . '">';
 		
@@ -66,7 +66,7 @@ 
 	}
 }
 
-if($count > 0) {
+if ($count > 0) {
 	echo '<h4>' . elgg_echo('missions:require_feedback') . ':</h4>';
 	echo '<div>' . $feedback_required . '</div>';
 }

Braces +1 added lines, -2 removed lines

@@ -50,8 +50,7 @@
 		
 		$feedback_required .= '</div>';
 		$count++;
-	}
-	elseif(check_entity_relationship($mission->guid, 'mission_accepted', elgg_get_logged_in_user_guid()) 
+	} elseif(check_entity_relationship($mission->guid, 'mission_accepted', elgg_get_logged_in_user_guid()) 
 			&& !count($feedback_search) && elgg_get_logged_in_user_guid() != $mission->owner_guid && elgg_get_logged_in_user_guid() != $mission->account) {
 		$feedback_required .= '<div name="mission-unfinished-feedback-' . $mission->guid . '">';
 		

mod/missions/views/default/page/elements/histogram-inputs.php

Spacing +4 added lines, -4 removed lines

@@ -10,14 +10,14 @@ 
 /*
  * The set of inputs necessary to create a Histogram.
  */
-if($bin_number == '') {
+if ($bin_number == '') {
 	$bin_number = 9;
 }
 
 $input_bin_number = elgg_view('input/dropdown', array(
 		'name' => 'bin_number',
 		'value' => $bin_number,
-		'options' => array(5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21),
+		'options' => array(5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21),
 		'id' => 'data-analytics-bin-number-input',
 		'onchange' => 'wipe_away_graph()'
 ));
@@ -42,7 +42,7 @@ 
 
 <div class="col-sm-12" style="margin:4px;">
 	<label for='data-analytics-bin-number-input' class="col-sm-3" style="text-align:right;">
-		<?php echo elgg_echo('missions:number_of_intervals') . ':';?>
+		<?php echo elgg_echo('missions:number_of_intervals') . ':'; ?>
 	</label>
 	<div class="col-sm-3">
 		<?php echo $input_bin_number; ?>
@@ -50,7 +50,7 @@ 
 </div>
 <div class="col-sm-12" style="margin:4px;">
 	<label for='data-analytics-target-value-dropdown-input' class="col-sm-3" style="text-align:right;"">
-		<?php echo elgg_echo('missions:target_value') . ':';?>
+		<?php echo elgg_echo('missions:target_value') . ':'; ?>
 	</label>
 	<div class="col-sm-4">
 		<?php echo $input_target_value; ?>

mod/missions/views/default/page/elements/main-find.php

Indentation +18 added lines, -18 removed lines

@@ -74,8 +74,8 @@ 
 		'limit' => $max,
 		'pagination' => true,
 		'list_type' => 'gallery',
-        'gallery_class'=>'wb-eqht clearfix',
-        'item_class'=>'col-sm-6 col-md-4 hght-inhrt',
+		'gallery_class'=>'wb-eqht clearfix',
+		'item_class'=>'col-sm-6 col-md-4 hght-inhrt',
 		
 		'mission_full_view' => false
 ), $offset, $max);
@@ -96,24 +96,24 @@ 
 $role_type_field = $_SESSION['missions_role_field_value'];
 
 if ($opp_type_field || $role_type_field) {
-    $clear_link = elgg_view('output/url', array(
-        'text' => elgg_echo('missions:clear_filter'),
-        'href' => 'action/missions/sort-missions-form?opp_filter=&role_filter=',
-        'class' => 'mrgn-lft-sm',
-        'is_action' => true,
-        'is_trusted' => true,
-    ));
+	$clear_link = elgg_view('output/url', array(
+		'text' => elgg_echo('missions:clear_filter'),
+		'href' => 'action/missions/sort-missions-form?opp_filter=&role_filter=',
+		'class' => 'mrgn-lft-sm',
+		'is_action' => true,
+		'is_trusted' => true,
+	));
 }
 
 // Links to the post opportunity pages.
 //if($last_segment != 'members' && $last_segment != 'archive' && $last_segment != 'analytics') {
 $create_button .= elgg_view('output/url', array(
-        'href' => elgg_get_site_url() . 'action/missions/pre-create-opportunity',
-        'text' => elgg_echo('missions:create_opportunity'),
-        'is_action' => true,
-        'class' => 'elgg-button btn btn-primary',
-        'style' => 'float:right;',
-        'id' => 'mission-create-opportunity-button'
+		'href' => elgg_get_site_url() . 'action/missions/pre-create-opportunity',
+		'text' => elgg_echo('missions:create_opportunity'),
+		'is_action' => true,
+		'class' => 'elgg-button btn btn-primary',
+		'style' => 'float:right;',
+		'id' => 'mission-create-opportunity-button'
 )) . '</br>';
 	//}
 
@@ -123,17 +123,17 @@ 
 
 <div class="col-sm-12">
     <?php
-    /* Nick - just testing what the job type actually outputs
+	/* Nick - just testing what the job type actually outputs
 foreach($entity_list as $entity){
     echo $entity->job_type . ' - ';  
 }*/
-    ?>
+	?>
     <div class="col-sm-8">
 	<h2 class="h4 mrgn-tp-md mrgn-bttm-0"><?php echo elgg_echo('missions:search_for_opportunities') . ':'; ?></h2>
 	<?php 
 		//echo $simple_search_form;
 		echo $advanced_field;
-    ?>
+	?>
     </div>
 
     <div class="col-sm-4">

Spacing +6 added lines, -6 removed lines

@@ -10,13 +10,13 @@ 
 /*
  * Page content for finding missions and a link to create them.
  */ 
-if($_SESSION['mission_entities_per_page']) {
+if ($_SESSION['mission_entities_per_page']) {
 	$entities_per_page = $_SESSION['mission_entities_per_page'];
 }
 
 $_SESSION['mission_search_switch_subtype'] = 'open';
 
-if($_GET['clear'] == true){
+if ($_GET['clear'] == true) {
 elgg_clear_sticky_form('searchsimplefill');
 elgg_clear_sticky_form('advancedfill');
 }
@@ -50,7 +50,7 @@ 
 $entity_list = elgg_get_entities_from_metadata($options);
 
 $offset = (int) get_input('offset', 0);
-if($entities_per_page) {
+if ($entities_per_page) {
 	$max = $entities_per_page;
 }
 else {
@@ -58,12 +58,12 @@ 
 }
 
 $entity_list = mm_sort_mission_decider($_SESSION['missions_sort_field_value'], $_SESSION['missions_order_field_value'], $entity_list, $_SESSION['missions_type_field_value'], $_SESSION['missions_role_field_value']);
-$count = count($entity_list);		// count the filtered list
-if ( $offset >= $count )			// reset offset if it no longer makes sense after filtering
+$count = count($entity_list); // count the filtered list
+if ($offset >= $count)			// reset offset if it no longer makes sense after filtering
 	$offset = 0;
 
 $max_reached = '';
-if(($offset + $max) >= elgg_get_plugin_setting('search_limit', 'missions') && $count >= elgg_get_plugin_setting('search_limit', 'missions')) {
+if (($offset + $max) >= elgg_get_plugin_setting('search_limit', 'missions') && $count >= elgg_get_plugin_setting('search_limit', 'missions')) {
 	$max_reached = '<div class="col-sm-12" style="font-style:italic;">' . elgg_echo('missions:reached_maximum_entities') . '</div>';
 }
 

Braces +4 added lines, -3 removed lines

@@ -52,15 +52,16 @@
 $offset = (int) get_input('offset', 0);
 if($entities_per_page) {
 	$max = $entities_per_page;
-}
-else {
+} else {
 	$max = elgg_get_plugin_setting('search_result_per_page', 'missions');
 }
 
 $entity_list = mm_sort_mission_decider($_SESSION['missions_sort_field_value'], $_SESSION['missions_order_field_value'], $entity_list, $_SESSION['missions_type_field_value'], $_SESSION['missions_role_field_value']);
 $count = count($entity_list);		// count the filtered list
-if ( $offset >= $count )			// reset offset if it no longer makes sense after filtering
+if ( $offset >= $count ) {
+	// reset offset if it no longer makes sense after filtering
 	$offset = 0;
+}
 
 $max_reached = '';
 if(($offset + $max) >= elgg_get_plugin_setting('search_limit', 'missions') && $count >= elgg_get_plugin_setting('search_limit', 'missions')) {

mod/missions/views/default/page/elements/mission-graph-bar.php

Spacing +14 added lines, -14 removed lines

@@ -17,16 +17,16 @@ 
 $subtitle_count = count($department_results) - 1;
 
 // For when the graph has no data passed to it.
-if($vars['dummy_graph']) {
+if ($vars['dummy_graph']) {
 	$dummy_array = array();
-	for($i=0;$i<$interval_number;$i++) {
-		for($k=0;$k<$state_count;$k++) {
+	for ($i = 0; $i < $interval_number; $i++) {
+		for ($k = 0; $k < $state_count; $k++) {
 			$dummy_array[$i][$k] = 0;
 		}
 	}
 	
-	for($k=0;$k<$state_count;$k++) {
-		$names[$k+1] = '';
+	for ($k = 0; $k < $state_count; $k++) {
+		$names[$k + 1] = '';
 	}
 	
 	$department_results[1] = $dummy_array;
@@ -39,17 +39,17 @@ 
 $formatted_result_array = array();
 $max_value = 0;
 $it_count = 0;
-for($i=0;$i<$interval_number;$i++) {
+for ($i = 0; $i < $interval_number; $i++) {
 	$temp_format_array = array();
 	$temp_format_array[0] = $department_results[0][$i];
-	for($j=0;$j<$department_count;$j++) {
+	for ($j = 0; $j < $department_count; $j++) {
 		$temp_max = 0;
-		for($k=0;$k<$state_count;$k++) {
-			$temp_format_array[$state_count*$j+$k+1] = $department_results[$j+1][$i][$k];
-			$temp_max += $department_results[$j+1][$i][$k];
+		for ($k = 0; $k < $state_count; $k++) {
+			$temp_format_array[$state_count * $j + $k + 1] = $department_results[$j + 1][$i][$k];
+			$temp_max += $department_results[$j + 1][$i][$k];
 			$it_count++;
 		}
-		if($temp_max > $max_value) {
+		if ($temp_max > $max_value) {
 			$max_value = $temp_max;
 		}
 	}
@@ -57,7 +57,7 @@ 
 }
 
 // If the max value in the y-axis is 0 then it defaults to 1.
-if($max_value == 0) {
+if ($max_value == 0) {
 	$max_value = 1;
 }
 
@@ -65,10 +65,10 @@ 
 
 $subtitle = $subtitle_count . ' ' . strtolower(elgg_echo('missions:department'));
 $legend_display = 'right';
-if($subtitle_count != 1) {
+if ($subtitle_count != 1) {
 	$subtitle = $subtitle . 's';
 }
-if($subtitle_count == 0) {
+if ($subtitle_count == 0) {
 	$legend_display = 'none';
 }
 

mod/missions/views/default/page/elements/invitable-missions.php

Spacing +4 added lines, -4 removed lines

@@ -20,7 +20,7 @@ 
 ));
 
 $count = 0;
-foreach($entity_list as $entity) {
+foreach ($entity_list as $entity) {
 	$candidates = elgg_get_entities_from_relationship(array(
 			'relationship' => 'mission_accepted',
 			'relationship_guid' => $entity->guid
@@ -28,14 +28,14 @@ 
 	$number_of_candidates = count($candidates);
 	
 	$not_invited_already = true;
-	foreach($candidates as $candidate) {
-		if($candidate->guid == $user_guid) {
+	foreach ($candidates as $candidate) {
+		if ($candidate->guid == $user_guid) {
 			$not_invited_already = false;
 		}
 	}
 
 	// Does not display missions which have filled all the available spots.
-	if($number_of_candidates < $entity->number && $not_invited_already) {
+	if ($number_of_candidates < $entity->number && $not_invited_already) {
 		echo '<div class="col-sm-12">';
 		echo '<div class="col-sm-5">' . elgg_view('output/url', array(
 				'href' => $entity->getURL(),

mod/missions/views/default/page/elements/skill-match-interlude.php

Spacing +1 added lines, -1 removed lines

@@ -20,7 +20,7 @@
 <script>
 	$('document').ready(function() {
 		$(document.body).css({ 'cursor': 'wait' });
-		$('#<?php echo $vars['submit_button_id'];?>').prop('disabled', true);
+		$('#<?php echo $vars['submit_button_id']; ?>').prop('disabled', true);
 		elgg.action('missions/post-mission-skill-match', {
 			success: function(returner) {
 				elgg.forward(returner.forward_url);

mod/missions/views/default/page/elements/mission-manager-info.php

Indentation +2 added lines, -2 removed lines

@@ -78,8 +78,8 @@
 		<div>
 			<span name="mission-manager-department">
             <?php //echo ucwords(strtolower($department));
-            echo $job_title;
-            ?></span>
+			echo $job_title;
+			?></span>
 		</div>
 	</div>
 </div>

Spacing +11 added lines, -11 removed lines

@@ -18,27 +18,27 @@ 
 $accounts = get_user_by_email($email);
 //Compare email and username for user with more than one account
 foreach ($accounts as $key) {
-	if($key->name == $mission->name){
+	if ($key->name == $mission->name) {
 		$guid_account = $key->guid;
 	}
 }
 
-if($guid_account){
+if ($guid_account) {
 	$manager_account = get_user($guid_account);
-}else{
+} else {
 	$manager_account = get_user($mission->account); //Nick changed to owner_guid then back to account
 }
 
-if(!$manager_account) {
+if (!$manager_account) {
 	$manager_account_by_email = get_user_by_email($mission->email);
 	$manager_account = array_pop($manager_account_by_email);
 }
 
 $manager_name = $mission->name;
 $manager_icon = elgg_view_entity_icon(get_entity(1), 'small');
-if($manager_account) {
+if ($manager_account) {
 	$manager_name = elgg_view('output/url', array(
-			'href' => elgg_get_site_url().'profile/'.$manager_account->username,
+			'href' => elgg_get_site_url() . 'profile/' . $manager_account->username,
 			'text' => $manager_name,
 			'class' => 'mission-user-link-' . $mission->owner_guid
 	));
@@ -47,18 +47,18 @@ 
 }
 
 $department_node = get_entity(mo_extract_node_guid($mission->department));
-if($department_node == '') {
+if ($department_node == '') {
 	$department = $mission->department;
 }
 else {
 	$department = $department_node->name;
-	if(get_current_language() == 'fr') {
+	if (get_current_language() == 'fr') {
 		$department = $department_node->name_french;
 	}
 }
 
 $department_other = mo_extract_other_input($mission->department);
-if($department_other) {
+if ($department_other) {
 	$department = $department_other;
 }
 
@@ -69,11 +69,11 @@ 
 
 
 	<div class="col-xs-<?php echo $grid_number; ?>">
-		<?php echo $manager_icon;?>
+		<?php echo $manager_icon; ?>
 	</div>
 	<div class="col-xs-<?php echo (12 - $grid_number); ?>" name="mission-manager" style="text-align:left;">
 		<div>
-			<span name="mission-manager-name"><?php echo $manager_name;?></span>
+			<span name="mission-manager-name"><?php echo $manager_name; ?></span>
 		</div>
 		<div>
 			<span name="mission-manager-department">

Braces +2 added lines, -3 removed lines

@@ -25,7 +25,7 @@ 
 
 if($guid_account){
 	$manager_account = get_user($guid_account);
-}else{
+} else{
 	$manager_account = get_user($mission->account); //Nick changed to owner_guid then back to account
 }
 
@@ -49,8 +49,7 @@ 
 $department_node = get_entity(mo_extract_node_guid($mission->department));
 if($department_node == '') {
 	$department = $mission->department;
-}
-else {
+} else {
 	$department = $department_node->name;
 	if(get_current_language() == 'fr') {
 		$department = $department_node->name_french;

mod/missions/views/default/missions/analytics-generator.php

Spacing +30 added lines, -30 removed lines

@@ -25,29 +25,29 @@ 
 $time_format = false;
 
 // Graph type needs to be set or nothing gets generated.
-if($graph_type == '') {
+if ($graph_type == '') {
 	$error_returner = elgg_echo('missions:error:analytics:select_graph_type');
 }
 else {
 	// Formats the department guid so it can be searched for in the database.
-	if(elgg_entity_exists($department_guid)) {
+	if (elgg_entity_exists($department_guid)) {
 		$department_identifier = 'MOrg:' . $department_guid;
 	}
 
 	$target = '';
-	if($graph_type == 'missions:stacked_graph') {
+	if ($graph_type == 'missions:stacked_graph') {
 		$target = $target_date;
 		$time_interval = $interval;
 
-		if($separator == 'missions:average_number_of_applicants' || $separator == 'missions:reason_to_decline') {
+		if ($separator == 'missions:average_number_of_applicants' || $separator == 'missions:reason_to_decline') {
 			$target = 'missions:date_posted';
 		}
 
 		// Sets start and end date to default if the user did not enter any dates.
-		if($start_date == '') {
+		if ($start_date == '') {
 			$start_date = '2016-06-19';
 		}
-		if($end_date == '') {
+		if ($end_date == '') {
 			$end_date = date('Y-m-d', time());
 		}
 
@@ -55,10 +55,10 @@ 
 		$timescale_array = mm_analytics_generate_time_scale_timestamps($start_date, $end_date, $interval);
 
 		// Gets the set of missions between the start date and end date. The search checks against the user given target date.
-		if($separator == 'missions:reason_to_decline') {
+		if ($separator == 'missions:reason_to_decline') {
 			$mission_set = mm_analytics_get_declinations_by_dates($timescale_array[0], $timescale_array[count($timescale_array) - 1]);
 		}
-		else if($separator == 'missions:average_number_of_applicants') {
+		else if ($separator == 'missions:average_number_of_applicants') {
 			$mission_set = mm_analytics_get_missions_by_posting_and_closure($timescale_array[0], $timescale_array[count($timescale_array) - 1]);
 		}
 		else {
@@ -66,7 +66,7 @@ 
 		}
 
 		// Removes the missions that are not within the department or that department's children.
-		if($department_identifier != '' && $separator != 'missions:reason_to_decline') {
+		if ($department_identifier != '' && $separator != 'missions:reason_to_decline') {
 			$mission_set = mm_analytics_cull_missions_by_department($mission_set, $department_identifier);
 		}
 
@@ -122,7 +122,7 @@ 
 		}
 		$alignment = 'center';
 	}
-	else if($graph_type == 'missions:histogram') {
+	else if ($graph_type == 'missions:histogram') {
 		$target = $target_value;
 		$time_interval = $target;
 
@@ -130,7 +130,7 @@ 
 		$mission_set = mm_analytics_get_missions_by_value($target);
 
 		// Removes the missions that are not within the department or that department's children.
-		if($department_identifier != '') {
+		if ($department_identifier != '') {
 			$mission_set = mm_analytics_cull_missions_by_department($mission_set, $department_identifier);
 		}
 
@@ -164,12 +164,12 @@ 
 	$target_lower = $target;
 	$target_upper = $target;
 
-	if($separator == 'missions:average_number_of_applicants') {
+	if ($separator == 'missions:average_number_of_applicants') {
 		$relation_set = array(array());
-		foreach($mission_set[0] as $mission) {
+		foreach ($mission_set[0] as $mission) {
 			$relations_from_missions = get_entity_relationships($mission->guid);
-			foreach($relations_from_missions as $relation) {
-				if($relation->relationship == 'mission_accepted' ||
+			foreach ($relations_from_missions as $relation) {
+				if ($relation->relationship == 'mission_accepted' ||
 						$relation->relationship == 'mission_offered' ||
 						$relation->relationship == 'mission_applied') {
 					array_push($relation_set[0], $relation);
@@ -187,14 +187,14 @@ 
 	// Transforms the separated set of missions into a format readable by flot.
 	$mission_set_final = array();
 	$is_set_empty = true;
-	foreach($mission_set as $y => $bar) {
+	foreach ($mission_set as $y => $bar) {
 		$mission_set_final[$y] = array('label' => elgg_echo($bar_labels[$y]), 'data' => array());
-		foreach($bar as $x => $time) {
-			if($separator == 'missions:average_number_of_applicants') {
+		foreach ($bar as $x => $time) {
+			if ($separator == 'missions:average_number_of_applicants') {
 				$applicant_count = count($relation_set[$y][$x]);
 				$mission_count = count($mission_set[$y][$x]);
 
-				if($mission_count == 0) {
+				if ($mission_count == 0) {
 					$value = 0;
 				}
 				else {
@@ -211,7 +211,7 @@ 
 			}
 
 			$mission_set_final[$y]['data'][] = array($x_label, $value);
-			if($value > 0 && $is_set_empty) {
+			if ($value > 0 && $is_set_empty) {
 				$is_set_empty = false;
 			}
 		}
@@ -221,7 +221,7 @@ 
 	$ticks_array = array();
 	$percentages = array();
 	$error_message = '';
-	foreach($bin_labels as $x => $label) {
+	foreach ($bin_labels as $x => $label) {
 		$current_bin_label = $label;
 		if ($graph_type == 'missions:stacked_graph') {
 			$current_bin_label = $label[0];
@@ -229,17 +229,17 @@ 
 		$ticks_array[$x] = array($x, $current_bin_label);
 
 		$total_x = 0;
-		foreach($mission_set as $y => $bar) {
+		foreach ($mission_set as $y => $bar) {
 			$total_x += count($bar[$x]);
 		}
 
-		foreach($mission_set as $y => $bar) {
+		foreach ($mission_set as $y => $bar) {
 			$x_label = $label;
 			if ($graph_type == 'missions:stacked_graph') {
 				$x_label = $x_label[1];
 			}
 
-			if($total_x > 0) {
+			if ($total_x > 0) {
 				$percentages[elgg_echo($bar_labels[$y])][$x_label] = array($total_x, 100 * round((count($bar[$x]) / $total_x), 4));
 			}
 			else {
@@ -248,11 +248,11 @@ 
 		}
 	}
 
-	if($is_set_empty) {
+	if ($is_set_empty) {
 		$error_returner = elgg_echo('missions:error:analytics:no_opportunities_in_data');
 	}
 	else {
-		if(empty($ticks_array)) {
+		if (empty($ticks_array)) {
 			$error_returner = elgg_echo('missions:error:analytics:no_intervals_in_x_axis');
 		}
 	}
@@ -301,18 +301,18 @@ 
 			);
 			unset($json_returner['options']['xaxis']['ticks']);
 
-			$json_returner['options']['zoom'] = array( 'interactive' => true );
-			$json_returner['options']['pan'] = array( 'interactive' => true );
+			$json_returner['options']['zoom'] = array('interactive' => true);
+			$json_returner['options']['pan'] = array('interactive' => true);
 			$json_returner['options']['yaxis']['zoomRange'] = false;
 			$json_returner['options']['yaxis']['panRange'] = false;
 
 			$json_returner['options']['xaxis']['panRange'] = array(
 				($timescale_array[0] * 1000) - $bar_width,
-				($timescale_array[count($timescale_array)-1] * 1000) + $bar_width
+				($timescale_array[count($timescale_array) - 1] * 1000) + $bar_width
 			);
 
 			$json_returner['options']['xaxis']['zoomRange'] = array(
-				$bar_width * 4 , null
+				$bar_width * 4, null
 			);
 
 			// $json_returner['options']['selection'] = array(

Braces +8 added lines, -16 removed lines

@@ -27,8 +27,7 @@ 
 // Graph type needs to be set or nothing gets generated.
 if($graph_type == '') {
 	$error_returner = elgg_echo('missions:error:analytics:select_graph_type');
-}
-else {
+} else {
 	// Formats the department guid so it can be searched for in the database.
 	if(elgg_entity_exists($department_guid)) {
 		$department_identifier = 'MOrg:' . $department_guid;
@@ -57,11 +56,9 @@ 
 		// Gets the set of missions between the start date and end date. The search checks against the user given target date.
 		if($separator == 'missions:reason_to_decline') {
 			$mission_set = mm_analytics_get_declinations_by_dates($timescale_array[0], $timescale_array[count($timescale_array) - 1]);
-		}
-		else if($separator == 'missions:average_number_of_applicants') {
+		} else if($separator == 'missions:average_number_of_applicants') {
 			$mission_set = mm_analytics_get_missions_by_posting_and_closure($timescale_array[0], $timescale_array[count($timescale_array) - 1]);
-		}
-		else {
+		} else {
 			$mission_set = mm_analytics_get_missions_by_dates($timescale_array[0], $timescale_array[count($timescale_array) - 1], $target);
 		}
 
@@ -121,8 +118,7 @@ 
 				$bar_width = 1;
 		}
 		$alignment = 'center';
-	}
-	else if($graph_type == 'missions:histogram') {
+	} else if($graph_type == 'missions:histogram') {
 		$target = $target_value;
 		$time_interval = $target;
 
@@ -196,12 +192,10 @@ 
 
 				if($mission_count == 0) {
 					$value = 0;
-				}
-				else {
+				} else {
 					$value = round(($applicant_count / $mission_count), 2);
 				}
-			}
-			else {
+			} else {
 				$value = count($mission_set[$y][$x]);
 			}
 
@@ -241,8 +235,7 @@ 
 
 			if($total_x > 0) {
 				$percentages[elgg_echo($bar_labels[$y])][$x_label] = array($total_x, 100 * round((count($bar[$x]) / $total_x), 4));
-			}
-			else {
+			} else {
 				$percentages[elgg_echo($bar_labels[$y])][$x_label] = 0;
 			}
 		}
@@ -250,8 +243,7 @@ 
 
 	if($is_set_empty) {
 		$error_returner = elgg_echo('missions:error:analytics:no_opportunities_in_data');
-	}
-	else {
+	} else {
 		if(empty($ticks_array)) {
 			$error_returner = elgg_echo('missions:error:analytics:no_intervals_in_x_axis');
 		}

mod/missions/views/default/missions/element-select.php

Indentation +164 added lines, -164 removed lines

@@ -35,200 +35,200 @@
 // This handles input fields for mission and candidate searching.
 if($second == 'true') {
 	// This section handles second javascript type selection.
-    switch ($dropdown_value) {
-        case elgg_echo('missions:publication_date'):
-        case elgg_echo('missions:end_year'):
-            $content .= '<div>' . elgg_view('input/dropdown', array(
-                'name' => $dropdown_name . '_operand',
-                'value' => '=',
-                'options' => array('=', '>=', '<=')
-            )) . '</div>';
+	switch ($dropdown_value) {
+		case elgg_echo('missions:publication_date'):
+		case elgg_echo('missions:end_year'):
+			$content .= '<div>' . elgg_view('input/dropdown', array(
+				'name' => $dropdown_name . '_operand',
+				'value' => '=',
+				'options' => array('=', '>=', '<=')
+			)) . '</div>';
             
-            $content .= '<div>' . elgg_view('input/date', array(
-            		'name' => $dropdown_name . '_value',
-            		'value' => ''
-            )) . '</div>';
-            break;
+			$content .= '<div>' . elgg_view('input/date', array(
+					'name' => $dropdown_name . '_value',
+					'value' => ''
+			)) . '</div>';
+			break;
             
-        default:
-            $content .= elgg_view('input/text', array(
-                'name' => $dropdown_name . '_value',
-                'value' => ''
-            ));
-            break;
-    }
+		default:
+			$content .= elgg_view('input/text', array(
+				'name' => $dropdown_name . '_value',
+				'value' => ''
+			));
+			break;
+	}
 }
 else {
 	// This section handles first javascript type selection.
-    switch ($dropdown_value) {
-        case '':
-            break;
+	switch ($dropdown_value) {
+		case '':
+			break;
         
-        /*case 'missions:user_department':
+		/*case 'missions:user_department':
         	
         	break;*/
             
-        case elgg_echo('missions:portfolio'):
-            $content .= elgg_view('input/dropdown', array(
-                'name' => $dropdown_name . '_element',
-                'value' => '',
-                'options' => array('', elgg_echo('missions:title'), /*elgg_echo('missions:publication_date')*/),
-                'onchange' => 'element_switch(this)'
-            ));
-            break;
+		case elgg_echo('missions:portfolio'):
+			$content .= elgg_view('input/dropdown', array(
+				'name' => $dropdown_name . '_element',
+				'value' => '',
+				'options' => array('', elgg_echo('missions:title'), /*elgg_echo('missions:publication_date')*/),
+				'onchange' => 'element_switch(this)'
+			));
+			break;
             
-        case elgg_echo('missions:education'):
-            $content .= elgg_view('input/dropdown', array(
-                'name' => $dropdown_name . '_element',
-                'value' => '',
-                'options' => array('', elgg_echo('missions:title'), elgg_echo('missions:degree'), elgg_echo('missions:field'), elgg_echo('missions:end_year')),
-                'onchange' => 'element_switch(this)'
-            ));
-            break;
+		case elgg_echo('missions:education'):
+			$content .= elgg_view('input/dropdown', array(
+				'name' => $dropdown_name . '_element',
+				'value' => '',
+				'options' => array('', elgg_echo('missions:title'), elgg_echo('missions:degree'), elgg_echo('missions:field'), elgg_echo('missions:end_year')),
+				'onchange' => 'element_switch(this)'
+			));
+			break;
             
-        case elgg_echo('missions:experience'):
-            $content .= elgg_view('input/dropdown', array(
-                'name' => $dropdown_name . '_element',
-                'value' => '',
-                'options' => array('', elgg_echo('missions:title'), elgg_echo('missions:organization'), elgg_echo('missions:end_year')),
-                'onchange' => 'element_switch(this)'
-            ));
-            break;
+		case elgg_echo('missions:experience'):
+			$content .= elgg_view('input/dropdown', array(
+				'name' => $dropdown_name . '_element',
+				'value' => '',
+				'options' => array('', elgg_echo('missions:title'), elgg_echo('missions:organization'), elgg_echo('missions:end_year')),
+				'onchange' => 'element_switch(this)'
+			));
+			break;
         
-        case elgg_echo('missions:duration'):
-        case elgg_echo('missions:start_time'):
-        	$content .= elgg_view('input/dropdown', array(
-        			'name' => $dropdown_name . '_operand',
-        			'value' => htmlspecialchars_decode($all_values['operand']),
-        			'options' => array('=', '>=', '<='),
-        			'style' => 'display:inline-block'
-        	));
+		case elgg_echo('missions:duration'):
+		case elgg_echo('missions:start_time'):
+			$content .= elgg_view('input/dropdown', array(
+					'name' => $dropdown_name . '_operand',
+					'value' => htmlspecialchars_decode($all_values['operand']),
+					'options' => array('=', '>=', '<='),
+					'style' => 'display:inline-block'
+			));
         	
-            $content .= elgg_view('input/text', array(
-                	'name' => $dropdown_name . '_element',
-                	'value' => $all_values['value_answer'],
-                	'placeholder' => 'HH:mm',
-        			'style' => 'display:inline-block'
-            ));
+			$content .= elgg_view('input/text', array(
+					'name' => $dropdown_name . '_element',
+					'value' => $all_values['value_answer'],
+					'placeholder' => 'HH:mm',
+					'style' => 'display:inline-block'
+			));
             
-            $content .= elgg_view('input/dropdown', array(
-            		'name' => $dropdown_name . '_element_day',
-            		'value' => $all_values['day'],
-            		'options' => $array_day
-            ));
-            break;
+			$content .= elgg_view('input/dropdown', array(
+					'name' => $dropdown_name . '_element_day',
+					'value' => $all_values['day'],
+					'options' => $array_day
+			));
+			break;
             
-        case elgg_echo('missions:time'):
-        	$content .= elgg_view('input/dropdown', array(
-        			'name' => $dropdown_name . '_operand',
-        			'value' => htmlspecialchars_decode($all_values['operand']),
-        			'options' => array('=', '>=', '<='),
-        			'style' => 'display:inline-block'
-        	));
+		case elgg_echo('missions:time'):
+			$content .= elgg_view('input/dropdown', array(
+					'name' => $dropdown_name . '_operand',
+					'value' => htmlspecialchars_decode($all_values['operand']),
+					'options' => array('=', '>=', '<='),
+					'style' => 'display:inline-block'
+			));
         	 
-        	$content .= elgg_view('input/text', array(
-        			'name' => $dropdown_name . '_element',
-        			'value' => $all_values['value_answer'],
-        			'style' => 'display:inline-block'
-        	));
-        	break;
+			$content .= elgg_view('input/text', array(
+					'name' => $dropdown_name . '_element',
+					'value' => $all_values['value_answer'],
+					'style' => 'display:inline-block'
+			));
+			break;
         	
-        case elgg_echo('missions:period'):
-        	$content .= elgg_view('input/dropdown', array(
-        			'name' => $dropdown_name . '_element',
-        			'value' => $all_values['value_answer'],
-        			'options_values' => mm_echo_explode_setting_string(elgg_get_plugin_setting('time_rate_string', 'missions'))
-        	));
-        	break;
+		case elgg_echo('missions:period'):
+			$content .= elgg_view('input/dropdown', array(
+					'name' => $dropdown_name . '_element',
+					'value' => $all_values['value_answer'],
+					'options_values' => mm_echo_explode_setting_string(elgg_get_plugin_setting('time_rate_string', 'missions'))
+			));
+			break;
         
-        case elgg_echo('missions:language'):
-            $content .= elgg_view('input/dropdown', array(
-                'name' => $dropdown_name . '_element',
-                'value' => $all_values['value_answer'],
-                'options' => array( elgg_echo('missions:english'),elgg_echo('missions:french'))
-            ));
-            $content .= '<br>';
+		case elgg_echo('missions:language'):
+			$content .= elgg_view('input/dropdown', array(
+				'name' => $dropdown_name . '_element',
+				'value' => $all_values['value_answer'],
+				'options' => array( elgg_echo('missions:english'),elgg_echo('missions:french'))
+			));
+			$content .= '<br>';
             
-            $content .= '<div class="col-sm-6">' . elgg_echo('missions:reading') . ':</div>';
-            $content .= '<div class="col-sm-6">' . elgg_view('input/dropdown', array(
-                'name' => $dropdown_name . '_element_lwc',
-                'value' => $all_values['reading'],
-                'options_values' => $array_lang
-            )) . '</div>';
+			$content .= '<div class="col-sm-6">' . elgg_echo('missions:reading') . ':</div>';
+			$content .= '<div class="col-sm-6">' . elgg_view('input/dropdown', array(
+				'name' => $dropdown_name . '_element_lwc',
+				'value' => $all_values['reading'],
+				'options_values' => $array_lang
+			)) . '</div>';
             
-            $content .= '<div class="col-sm-6">' . elgg_echo('missions:writing') . ':</div>';
-            $content .= '<div class="col-sm-6">' . elgg_view('input/dropdown', array(
-                'name' => $dropdown_name . '_element_lwe',
-                'value' => $all_values['writing'],
-                'options_values' => $array_lang
-            )) . '</div>';
+			$content .= '<div class="col-sm-6">' . elgg_echo('missions:writing') . ':</div>';
+			$content .= '<div class="col-sm-6">' . elgg_view('input/dropdown', array(
+				'name' => $dropdown_name . '_element_lwe',
+				'value' => $all_values['writing'],
+				'options_values' => $array_lang
+			)) . '</div>';
             
-            $content .= '<div class="col-sm-6">' . elgg_echo('missions:oral') . ':</div>';
-            $content .= '<div class="col-sm-6">' . elgg_view('input/dropdown', array(
-                'name' => $dropdown_name . '_element_lop',
-                'value' => $all_values['oral'],
-                'options_values' => $array_lang
-            )) . '</div>';
-            break;
+			$content .= '<div class="col-sm-6">' . elgg_echo('missions:oral') . ':</div>';
+			$content .= '<div class="col-sm-6">' . elgg_view('input/dropdown', array(
+				'name' => $dropdown_name . '_element_lop',
+				'value' => $all_values['oral'],
+				'options_values' => $array_lang
+			)) . '</div>';
+			break;
         
-        case elgg_echo('missions:security_clearance'):
-            $content .= elgg_view('input/dropdown', array(
-                'name' => $dropdown_name . '_element',
-                'value' => $all_values['value_answer'],
-                'options_values' => $array_sec
-            ));
-            break;
+		case elgg_echo('missions:security_clearance'):
+			$content .= elgg_view('input/dropdown', array(
+				'name' => $dropdown_name . '_element',
+				'value' => $all_values['value_answer'],
+				'options_values' => $array_sec
+			));
+			break;
             
-        case elgg_echo('missions:type'):
-        	$content .= elgg_view('input/dropdown', array(
-        			'name' => $dropdown_name . '_element',
-        			'value' => '',
-        			'options_values' => mm_echo_explode_setting_string(elgg_get_plugin_setting('opportunity_type_string', 'missions'))
-        	));
-        	break;
+		case elgg_echo('missions:type'):
+			$content .= elgg_view('input/dropdown', array(
+					'name' => $dropdown_name . '_element',
+					'value' => '',
+					'options_values' => mm_echo_explode_setting_string(elgg_get_plugin_setting('opportunity_type_string', 'missions'))
+			));
+			break;
             
-        case elgg_echo('missions:program_area'):
-        	$content .= elgg_view('input/dropdown', array(
-        			'name' => $dropdown_name . '_element',
-        			'value' => $all_values['value_answer'],
-        			'options_values' => mm_echo_explode_setting_string(elgg_get_plugin_setting('program_area_string', 'missions'))
-        	));
-        	break;
+		case elgg_echo('missions:program_area'):
+			$content .= elgg_view('input/dropdown', array(
+					'name' => $dropdown_name . '_element',
+					'value' => $all_values['value_answer'],
+					'options_values' => mm_echo_explode_setting_string(elgg_get_plugin_setting('program_area_string', 'missions'))
+			));
+			break;
             
-        case elgg_echo('missions:work_remotely'):
-        if ($all_values['value_answer'] == 'on')
-            $checked = 'checked';
+		case elgg_echo('missions:work_remotely'):
+		if ($all_values['value_answer'] == 'on')
+			$checked = 'checked';
         
-        	$content .= elgg_view('input/checkbox', array(
-        			'name' => $dropdown_name . '_element',
-                    'checked' => $checked
-        	));
-        	break;
+			$content .= elgg_view('input/checkbox', array(
+					'name' => $dropdown_name . '_element',
+					'checked' => $checked
+			));
+			break;
             
-        case elgg_echo('missions:location'):
-        	$content .= elgg_view('input/dropdown', array(
-        			'name' => $dropdown_name . '_element',
-				    'value' => $all_values['value_answer'],
-				    'options_values' => mm_echo_explode_setting_string(elgg_get_plugin_setting('province_string', 'missions')),
-        	));
-        	break;
+		case elgg_echo('missions:location'):
+			$content .= elgg_view('input/dropdown', array(
+					'name' => $dropdown_name . '_element',
+					'value' => $all_values['value_answer'],
+					'options_values' => mm_echo_explode_setting_string(elgg_get_plugin_setting('province_string', 'missions')),
+			));
+			break;
             
-        case elgg_echo('missions:skill'):
-        case elgg_echo('missions:key_skills'):
-        	$content .= elgg_view('missions/add-skill', array(
-        			'name_override' => $dropdown_name . '_element',
-        			'no_delete' => true,
-                    'value' => $all_values['value_answer'],
-        	));
-        	break;
+		case elgg_echo('missions:skill'):
+		case elgg_echo('missions:key_skills'):
+			$content .= elgg_view('missions/add-skill', array(
+					'name_override' => $dropdown_name . '_element',
+					'no_delete' => true,
+					'value' => $all_values['value_answer'],
+			));
+			break;
         
-        default:
+		default:
 
-            $content .= elgg_view('input/text', array(
-                'name' => $dropdown_name . '_element',
-                'value' => $all_values['value_answer'],
-            ));
-    }
+			$content .= elgg_view('input/text', array(
+				'name' => $dropdown_name . '_element',
+				'value' => $all_values['value_answer'],
+			));
+	}
 }
 
 echo $content;
\ No newline at end of file

Spacing +2 added lines, -2 removed lines

@@ -33,7 +33,7 @@ 
 
 // Builds input field content depending on what type the user selected.
 // This handles input fields for mission and candidate searching.
-if($second == 'true') {
+if ($second == 'true') {
 	// This section handles second javascript type selection.
     switch ($dropdown_value) {
         case elgg_echo('missions:publication_date'):
@@ -145,7 +145,7 @@ 
             $content .= elgg_view('input/dropdown', array(
                 'name' => $dropdown_name . '_element',
                 'value' => $all_values['value_answer'],
-                'options' => array( elgg_echo('missions:english'),elgg_echo('missions:french'))
+                'options' => array(elgg_echo('missions:english'), elgg_echo('missions:french'))
             ));
             $content .= '<br>';
             

Braces +4 added lines, -4 removed lines

@@ -57,8 +57,7 @@ 
             ));
             break;
     }
-}
-else {
+} else {
 	// This section handles first javascript type selection.
     switch ($dropdown_value) {
         case '':
@@ -196,8 +195,9 @@ 
         	break;
             
         case elgg_echo('missions:work_remotely'):
-        if ($all_values['value_answer'] == 'on')
-            $checked = 'checked';
+        if ($all_values['value_answer'] == 'on') {
+                    $checked = 'checked';
+        }
         
         	$content .= elgg_view('input/checkbox', array(
         			'name' => $dropdown_name . '_element',