gctools-outilsgc / gcconnex

mod/missions/views/default/forms/missions/graph-data-form.php

Spacing +2 added lines, -2 removed lines

@@ -11,7 +11,7 @@ 
  * Form which allows users to add a department to the analytics graph.
  */
 $state_array = array('Open');
-if($vars['state_array']) {
+if ($vars['state_array']) {
 	$state_array = $vars['state_array'];
 }
 $state_array = implode(',', $state_array);
@@ -37,7 +37,7 @@ 
 
 <div class="form-group">
 	<label class="col-sm-3" style="text-align:right;">
-		<?php echo elgg_echo('missions:add_this_department_to_graph') . ':';?>
+		<?php echo elgg_echo('missions:add_this_department_to_graph') . ':'; ?>
 	</label>
 	<div class="col-sm-3">
 		<?php echo $input_department; ?>

mod/missions/views/default/forms/missions/users-by-opt-in-form.php

Indentation +13 added lines, -13 removed lines

@@ -16,19 +16,19 @@
 
 $input_dropdown = elgg_view('input/dropdown', array(
 		'name' => 'opt_in_option',
-        'value' => $opt_in_option,
-        'options' => array(
-        		elgg_echo('gcconnex_profile:opt:micro_mission'), 
-        		elgg_echo('gcconnex_profile:opt:job_swap'), 
-        		elgg_echo('gcconnex_profile:opt:mentored'),
-        		elgg_echo('gcconnex_profile:opt:mentoring'),
-        		elgg_echo('gcconnex_profile:opt:shadowed'),
-        		elgg_echo('gcconnex_profile:opt:shadowing'),
-        		elgg_echo('gcconnex_profile:opt:peer_coached'),
-        		elgg_echo('gcconnex_profile:opt:peer_coaching'),
-        		elgg_echo('gcconnex_profile:opt:skill_sharing'),
-        		elgg_echo('gcconnex_profile:opt:job_sharing')
-        )
+		'value' => $opt_in_option,
+		'options' => array(
+				elgg_echo('gcconnex_profile:opt:micro_mission'), 
+				elgg_echo('gcconnex_profile:opt:job_swap'), 
+				elgg_echo('gcconnex_profile:opt:mentored'),
+				elgg_echo('gcconnex_profile:opt:mentoring'),
+				elgg_echo('gcconnex_profile:opt:shadowed'),
+				elgg_echo('gcconnex_profile:opt:shadowing'),
+				elgg_echo('gcconnex_profile:opt:peer_coached'),
+				elgg_echo('gcconnex_profile:opt:peer_coaching'),
+				elgg_echo('gcconnex_profile:opt:skill_sharing'),
+				elgg_echo('gcconnex_profile:opt:job_sharing')
+		)
 ));
 ?>
 

mod/missions/views/default/forms/missions/refine-my-missions-form.php

Spacing +1 added lines, -1 removed lines

@@ -11,7 +11,7 @@
  * Form which allows or disallows completed/cancelled missions to be displayed in My Opportunities.
  */
 $check = false;
-if(elgg_get_logged_in_user_entity()->show_closed_missions) {
+if (elgg_get_logged_in_user_entity()->show_closed_missions) {
 	$checked = true;
 }
 

mod/missions/views/default/forms/missions/feedback-form.php

Indentation +5 added lines, -5 removed lines

@@ -40,15 +40,15 @@
 ));
 	
 if (elgg_is_sticky_form('applicationfill')) {
-    extract(elgg_get_sticky_values('feedbackfill'));
-    elgg_clear_sticky_form('feedbackfill');
+	extract(elgg_get_sticky_values('feedbackfill'));
+	elgg_clear_sticky_form('feedbackfill');
 }
 	
 // If a message has been sent then a second message cannot be sent.
 $feedback_body .=  elgg_view('input/plaintext', array(
-	    'name' => 'feedback_body',
-	    'value' => $feedback_body,
-	    'id' => 'mission-feedback-body-text-input-' . $feedback_target->guid
+		'name' => 'feedback_body',
+		'value' => $feedback_body,
+		'id' => 'mission-feedback-body-text-input-' . $feedback_target->guid
 ));
 	
 $input_feedback_rating = elgg_view('input/checkbox', array(

Spacing +3 added lines, -3 removed lines

@@ -26,7 +26,7 @@ 
 
 $feedback_body = $feedback->message;
 $checked = false;
-if($feedback->endorsement == 'on') {
+if ($feedback->endorsement == 'on') {
 	$checked = true;
 }
 
@@ -45,7 +45,7 @@ 
 }
 	
 // If a message has been sent then a second message cannot be sent.
-$feedback_body .=  elgg_view('input/plaintext', array(
+$feedback_body .= elgg_view('input/plaintext', array(
 	    'name' => 'feedback_body',
 	    'value' => $feedback_body,
 	    'id' => 'mission-feedback-body-text-input-' . $feedback_target->guid
@@ -55,7 +55,7 @@ 
 		'name' => 'feedback_rating',
 		'checked' => $checked,
 		'id' => 'mission-feedback-rating-checkbox-input-' . $feedback_target->guid
-));;
+)); ;
 
 echo elgg_view('input/hidden', array(
 		'name' => 'hidden_target_guid',

mod/missions/views/default/forms/missions/post-mission-third-form.php

Indentation +23 added lines, -23 removed lines

@@ -19,15 +19,15 @@ 
 
 if (elgg_is_sticky_form('thirdfill')) {
 	$temp_array = elgg_get_sticky_values('thirdfill');
-    extract($temp_array);
-    // elgg_clear_sticky_form('thirdfill');
+	extract($temp_array);
+	// elgg_clear_sticky_form('thirdfill');
     
-    foreach($temp_array as $key => $value) {
-    	if(!(strpos($key, 'key_skills') === false)) {
-    		$key_skills .= $value . ', ';
-    	}
-    }
-    $key_skills = substr($key_skills, 0, -2);
+	foreach($temp_array as $key => $value) {
+		if(!(strpos($key, 'key_skills') === false)) {
+			$key_skills .= $value . ', ';
+		}
+	}
+	$key_skills = substr($key_skills, 0, -2);
 }
 
 // Determines whether the remote work checkbox is checked or not.
@@ -59,27 +59,27 @@ 
 	$skill_set .= elgg_view('missions/add-skill', array('value' => $skill));
 }
 $input_remotely = elgg_view('input/checkbox', array(
-	    'name' => 'remotely',
-	    'checked' => $remotely,
-	    'id' => 'post-mission-remotely-checkbox-input'
+		'name' => 'remotely',
+		'checked' => $remotely,
+		'id' => 'post-mission-remotely-checkbox-input'
 ));
 $input_location = elgg_view('input/dropdown', array(
-	    'name' => 'location',
-	    'value' => $location,
-	    'options_values' => mm_echo_explode_setting_string(elgg_get_plugin_setting('province_string', 'missions')),
-	    'id' => 'post-mission-location-text-input'
+		'name' => 'location',
+		'value' => $location,
+		'options_values' => mm_echo_explode_setting_string(elgg_get_plugin_setting('province_string', 'missions')),
+		'id' => 'post-mission-location-text-input'
 ));
 $input_security = elgg_view('input/dropdown', array(
-	    'name' => 'security',
-	    'value' => $security,
-	    'options_values' => mm_echo_explode_setting_string(elgg_get_plugin_setting('security_string', 'missions')),
-	    'id' => 'post-mission-security-dropdown-input'
+		'name' => 'security',
+		'value' => $security,
+		'options_values' => mm_echo_explode_setting_string(elgg_get_plugin_setting('security_string', 'missions')),
+		'id' => 'post-mission-security-dropdown-input'
 ));
 $input_timezone = elgg_view('input/dropdown', array(
-	    'name' => 'timezone',
-	    'value' => $timezone,
-	    'options_values' => mm_echo_explode_setting_string(elgg_get_plugin_setting('timezone_string', 'missions')),
-	    'id' => 'post-mission-timezone-dropdown-input'
+		'name' => 'timezone',
+		'value' => $timezone,
+		'options_values' => mm_echo_explode_setting_string(elgg_get_plugin_setting('timezone_string', 'missions')),
+		'id' => 'post-mission-timezone-dropdown-input'
 ));
 $input_time_commit = elgg_view('input/text', array(
 		'name' => 'time_commitment',

Spacing +11 added lines, -11 removed lines

@@ -22,8 +22,8 @@ 
     extract($temp_array);
     // elgg_clear_sticky_form('thirdfill');
     
-    foreach($temp_array as $key => $value) {
-    	if(!(strpos($key, 'key_skills') === false)) {
+    foreach ($temp_array as $key => $value) {
+    	if (!(strpos($key, 'key_skills') === false)) {
     		$key_skills .= $value . ', ';
     	}
     }
@@ -31,7 +31,7 @@ 
 }
 
 // Determines whether the remote work checkbox is checked or not.
-if($remotely == 'on') {
+if ($remotely == 'on') {
 	$remotely = true;
 }
 else {
@@ -39,7 +39,7 @@ 
 }
 
 $duplicating_entity = get_entity($_SESSION['mission_duplication_id']);
-if(get_subtype_from_id($duplicating_entity->subtype) == 'mission' && !$_SESSION['mission_duplicating_override_third']) {
+if (get_subtype_from_id($duplicating_entity->subtype) == 'mission' && !$_SESSION['mission_duplicating_override_third']) {
 	$key_skills = $duplicating_entity->key_skills;
 	$time_commitment = $duplicating_entity->time_commitment;
 	$time_interval = $duplicating_entity->time_interval;
@@ -55,7 +55,7 @@ 
 
 $skill_set = '';
 $skill_array = explode(', ', $key_skills);
-foreach($skill_array as $skill) {
+foreach ($skill_array as $skill) {
 	$skill_set .= elgg_view('missions/add-skill', array('value' => $skill));
 }
 $input_remotely = elgg_view('input/checkbox', array(
@@ -127,7 +127,7 @@ 
 ));
 
 $skill_match_override = $_SESSION['mission_skill_match_is_interlude'];
-if($skill_match_override) {
+if ($skill_match_override) {
 	unset($_SESSION['mission_skill_match_is_interlude']);
 	echo elgg_view('page/elements/skill-match-interlude', array('submit_button_id' => 'mission-post-opportunity-third-form-submission-button'));
 }
@@ -141,7 +141,7 @@ 
 <h2 class='h4'><?php echo elgg_echo('missions:third_post_form_title'); ?></h2><br>
 <div class="form-group">
 	<label class="col-sm-3" style="text-align:right;">
-		<?php echo elgg_echo('missions:skills') . ':';?>
+		<?php echo elgg_echo('missions:skills') . ':'; ?>
 	</label>
 	<div class="col-sm-9">
 		<div id="mission-skill-container" style="display:inline-block;">
@@ -155,7 +155,7 @@ 
 </div>
 <div class="form-group">
 	<label for='post-mission-time-commitment-text-input' class="col-sm-3 required" style="text-align:right;" aria-required="true">
-		<?php echo elgg_echo('missions:time_in_hours');?>
+		<?php echo elgg_echo('missions:time_in_hours'); ?>
 		<strong class="required" aria-required="true">
 			<?php echo elgg_echo('missions:required'); ?>
 		</strong>
@@ -173,7 +173,7 @@ 
 </div>
 <div class="form-group">
 	<label for='post-mission-remotely-checkbox-input' class="col-sm-3" style="text-align:right;">
-		<?php echo elgg_echo('missions:work_remotely') . ':';?>
+		<?php echo elgg_echo('missions:work_remotely') . ':'; ?>
 	</label>
 	<div class="col-sm-3">
 		<?php echo $input_remotely; ?>
@@ -181,7 +181,7 @@ 
 </div>
 <div class="form-group">
 	<label for='post-mission-location-text-input' class="col-sm-3 required" style="text-align:right;" aria-required="true">
-		<?php echo elgg_echo('missions:location');?>
+		<?php echo elgg_echo('missions:location'); ?>
 		<strong class="required" aria-required="true">
 			<?php echo elgg_echo('missions:required'); ?>
 		</strong>
@@ -193,7 +193,7 @@ 
 </div>
 <div class="form-group">
 	<label for='post-mission-security-dropdown-input' class="col-sm-3" style="text-align:right;">
-		<?php echo elgg_echo('missions:security_level') . ':';?>
+		<?php echo elgg_echo('missions:security_level') . ':'; ?>
 	</label>
 	<div class="col-sm-3">
 		<?php echo $input_security; ?>

Braces +1 added lines, -2 removed lines

@@ -33,8 +33,7 @@
 // Determines whether the remote work checkbox is checked or not.
 if($remotely == 'on') {
 	$remotely = true;
-}
-else {
+} else {
 	$remotely = false;
 }
 

mod/missions/views/default/forms/missions/advanced-search-form.php

Indentation +104 added lines, -104 removed lines

@@ -15,40 +15,40 @@ 
 $advanced_form = elgg_get_sticky_values('advancedfill');
 // The arrays are different depending on whether the user is searching for missions or candidates.
 if($_SESSION['mission_search_switch'] == 'candidate') {
-    $search_fields = array(
-	        //'' => 'Choose',
-	        '',
-	        elgg_echo('missions:education'),
-	        elgg_echo('missions:experience'),
-	        elgg_echo('missions:skill'),
-	        elgg_echo('missions:portfolio'),
-    		elgg_echo('missions:user_department'),
-    		elgg_echo('missions:opt_in')
-    );
+	$search_fields = array(
+			//'' => 'Choose',
+			'',
+			elgg_echo('missions:education'),
+			elgg_echo('missions:experience'),
+			elgg_echo('missions:skill'),
+			elgg_echo('missions:portfolio'),
+			elgg_echo('missions:user_department'),
+			elgg_echo('missions:opt_in')
+	);
     
-    $subtitle = elgg_echo('missions:advanced_find_candidates');
+	$subtitle = elgg_echo('missions:advanced_find_candidates');
 	$limit_options = array(10,25,50,100);
 	$button_text = elgg_echo('missions:find');
 }
 else {
-    $search_fields = array(
-	        //'' => 'Choose',
-	        '',
-	        elgg_echo('missions:title'),
-	        elgg_echo('missions:department'),
-	        elgg_echo('missions:key_skills'),
-	        elgg_echo('missions:security_clearance'),
-	        elgg_echo('missions:location'),
-	        elgg_echo('missions:language'),
-	        elgg_echo('missions:time'),
-	        elgg_echo('missions:period'),
-	        elgg_echo('missions:start_time'),
-	        elgg_echo('missions:duration'),
-	        elgg_echo('missions:work_remotely'),
-	        elgg_echo('missions:program_area')
-    );
+	$search_fields = array(
+			//'' => 'Choose',
+			'',
+			elgg_echo('missions:title'),
+			elgg_echo('missions:department'),
+			elgg_echo('missions:key_skills'),
+			elgg_echo('missions:security_clearance'),
+			elgg_echo('missions:location'),
+			elgg_echo('missions:language'),
+			elgg_echo('missions:time'),
+			elgg_echo('missions:period'),
+			elgg_echo('missions:start_time'),
+			elgg_echo('missions:duration'),
+			elgg_echo('missions:work_remotely'),
+			elgg_echo('missions:program_area')
+	);
     
-    $subtitle = elgg_echo('missions:advanced_search_for_opportunities');
+	$subtitle = elgg_echo('missions:advanced_search_for_opportunities');
 	$limit_options = array(9,18,30,60,120);
 	$button_text = elgg_echo('missions:search');
 }
@@ -72,42 +72,42 @@ 
 		if ($advanced_form['selection_'.$s]){
 
 
-    $content .= '<div class="form-group">';
-    // Dropdown with a name that is numbered according to its row.
-    $content .= '<div class="mission-emphasis-extra col-sm-offset-1 col-sm-4">';
-	     $content .= elgg_view('input/dropdown', array(
-	        	'name' => 'selection_' . $s,
-	        	'value' => $advanced_form['selection_'.$s],
-	        	'options' => $search_fields,
+	$content .= '<div class="form-group">';
+	// Dropdown with a name that is numbered according to its row.
+	$content .= '<div class="mission-emphasis-extra col-sm-offset-1 col-sm-4">';
+		 $content .= elgg_view('input/dropdown', array(
+				'name' => 'selection_' . $s,
+				'value' => $advanced_form['selection_'.$s],
+				'options' => $search_fields,
 
-	        	'onchange' => 'element_switch(this)',
-	        	'onload' => 'element_switch(this)',
-	        	'id' => 'search-mission-advanced-selection-' . $s . '-dropdown-input',
-	        	'selected' => 'selected'
-	    ));
+				'onchange' => 'element_switch(this)',
+				'onload' => 'element_switch(this)',
+				'id' => 'search-mission-advanced-selection-' . $s . '-dropdown-input',
+				'selected' => 'selected'
+		));
 
 
 	    
-	    $content .= '</div>';
-	    $content .= '<div class="mission-emphasis-extra col-sm-6" id="selection_' . $s . '"></div>';
-	    $content .= '<div class="mission-emphasis-extra col-sm-6" id="selection_' . $s . '_element"></div>';
-	    // Backup dropdown for when Javascript is disabled.
-	    $content .= '<noscript>';
-	    $content .= elgg_view('input/text', array(
-	        'name' => 'backup_' . $s,
-	        'value' => '',
-	        'id' => 'search-mission-advanced-selection-' . $s . '-dropdown-input-backup'
-	    ));
-	    $content .= '</noscript></div>';
+		$content .= '</div>';
+		$content .= '<div class="mission-emphasis-extra col-sm-6" id="selection_' . $s . '"></div>';
+		$content .= '<div class="mission-emphasis-extra col-sm-6" id="selection_' . $s . '_element"></div>';
+		// Backup dropdown for when Javascript is disabled.
+		$content .= '<noscript>';
+		$content .= elgg_view('input/text', array(
+			'name' => 'backup_' . $s,
+			'value' => '',
+			'id' => 'search-mission-advanced-selection-' . $s . '-dropdown-input-backup'
+		));
+		$content .= '</noscript></div>';
 
 
 $all_values = array(
-    "value_answer" => $advanced_form['selection_'.$s.'_element'],
-    "reading" => $advanced_form['selection_'.$s.'_element_lwc'],
-    "writing" => $advanced_form['selection_'.$s.'_element_lwe'],
-    "oral" => $advanced_form['selection_'.$s.'_element_lop'],
-    "operand" => $advanced_form['selection_'.$s.'_operand'],
-    "day" => $advanced_form['selection_'.$s.'_element_day']
+	"value_answer" => $advanced_form['selection_'.$s.'_element'],
+	"reading" => $advanced_form['selection_'.$s.'_element_lwc'],
+	"writing" => $advanced_form['selection_'.$s.'_element_lwe'],
+	"oral" => $advanced_form['selection_'.$s.'_element_lop'],
+	"operand" => $advanced_form['selection_'.$s.'_operand'],
+	"day" => $advanced_form['selection_'.$s.'_element_day']
 );
 
 
@@ -153,67 +153,67 @@ 
 <?php
 	    
 		}else{
-				    $content .= '<div class="form-group">';
-	    // Dropdown with a name that is numbered according to its row.
-	    $content .= '<div class="mission-emphasis-extra col-sm-offset-1 col-sm-4">';
-	    $content .= elgg_view('input/dropdown', array(
-	        	'name' => 'selection_' . $i,
-	        	'value' => '',
-	        	'options' => $search_fields,
-	        	'onchange' => 'element_switch(this)',
-	        	'onload' => 'element_switch(this)',
-	        	'id' => 'search-mission-advanced-selection-' . $i . '-dropdown-input'
-	    ));
+					$content .= '<div class="form-group">';
+		// Dropdown with a name that is numbered according to its row.
+		$content .= '<div class="mission-emphasis-extra col-sm-offset-1 col-sm-4">';
+		$content .= elgg_view('input/dropdown', array(
+				'name' => 'selection_' . $i,
+				'value' => '',
+				'options' => $search_fields,
+				'onchange' => 'element_switch(this)',
+				'onload' => 'element_switch(this)',
+				'id' => 'search-mission-advanced-selection-' . $i . '-dropdown-input'
+		));
 
-	    $content .= '</div>';
-	    $content .= '<div class="mission-emphasis-extra col-sm-6" id="selection_' . $i . '"></div>';
-	    $content .= '<div class="mission-emphasis-extra col-sm-6" id="selection_' . $i . '_element"></div>';
-	    // Backup dropdown for when Javascript is disabled.
-	    $content .= '<noscript>';
-	    $content .= elgg_view('input/text', array(
-	        'name' => 'backup_' . $i,
-	        'value' => '',
-	        'id' => 'search-mission-advanced-selection-' . $i . '-dropdown-input-backup'
-	    ));
-	    $content .= '</noscript></div>';
+		$content .= '</div>';
+		$content .= '<div class="mission-emphasis-extra col-sm-6" id="selection_' . $i . '"></div>';
+		$content .= '<div class="mission-emphasis-extra col-sm-6" id="selection_' . $i . '_element"></div>';
+		// Backup dropdown for when Javascript is disabled.
+		$content .= '<noscript>';
+		$content .= elgg_view('input/text', array(
+			'name' => 'backup_' . $i,
+			'value' => '',
+			'id' => 'search-mission-advanced-selection-' . $i . '-dropdown-input-backup'
+		));
+		$content .= '</noscript></div>';
 		}
 	}
 }else{
 	for ($i = 0; $i < $number_of_rows; $i ++) {
-	    $content .= '<div class="form-group">';
-	    // Dropdown with a name that is numbered according to its row.
-	    $content .= '<div class="mission-emphasis-extra col-sm-offset-1 col-sm-4">';
-	    $content .= elgg_view('input/dropdown', array(
-	        	'name' => 'selection_' . $i,
-	        	'value' => '',
-	        	'options' => $search_fields,
-	        	'onchange' => 'element_switch(this)',
-	        	'onload' => 'element_switch(this)',
-	        	'id' => 'search-mission-advanced-selection-' . $i . '-dropdown-input'
-	    ));
+		$content .= '<div class="form-group">';
+		// Dropdown with a name that is numbered according to its row.
+		$content .= '<div class="mission-emphasis-extra col-sm-offset-1 col-sm-4">';
+		$content .= elgg_view('input/dropdown', array(
+				'name' => 'selection_' . $i,
+				'value' => '',
+				'options' => $search_fields,
+				'onchange' => 'element_switch(this)',
+				'onload' => 'element_switch(this)',
+				'id' => 'search-mission-advanced-selection-' . $i . '-dropdown-input'
+		));
 
-	    $content .= '</div>';
-	    $content .= '<div class="mission-emphasis-extra col-sm-6" id="selection_' . $i . '"></div>';
-	    $content .= '<div class="mission-emphasis-extra col-sm-6" id="selection_' . $i . '_element"></div>';
-	    // Backup dropdown for when Javascript is disabled.
-	    $content .= '<noscript>';
-	    $content .= elgg_view('input/text', array(
-	        'name' => 'backup_' . $i,
-	        'value' => '',
-	        'id' => 'search-mission-advanced-selection-' . $i . '-dropdown-input-backup'
-	    ));
-	    $content .= '</noscript></div>';
+		$content .= '</div>';
+		$content .= '<div class="mission-emphasis-extra col-sm-6" id="selection_' . $i . '"></div>';
+		$content .= '<div class="mission-emphasis-extra col-sm-6" id="selection_' . $i . '_element"></div>';
+		// Backup dropdown for when Javascript is disabled.
+		$content .= '<noscript>';
+		$content .= elgg_view('input/text', array(
+			'name' => 'backup_' . $i,
+			'value' => '',
+			'id' => 'search-mission-advanced-selection-' . $i . '-dropdown-input-backup'
+		));
+		$content .= '</noscript></div>';
 	}
 }
 
 $hidden_input = elgg_view('input/hidden', array(
-    'name' => 'hidden_return',
-    'value' => $vars['return_to_referer']
+	'name' => 'hidden_return',
+	'value' => $vars['return_to_referer']
 ));
 
 if($advanced_form){
 
-    $clear_link = elgg_view('output/url', array(
+	$clear_link = elgg_view('output/url', array(
 		'text' => elgg_echo('missions:clear_search'),
 		'href' => 'missions/main?clear=true&search='.$advanced_form,
 		'class' => 'mrgn-lft-sm',

Spacing +20 added lines, -20 removed lines

@@ -14,7 +14,7 @@ 
 elgg_load_js('typeahead');
 $advanced_form = elgg_get_sticky_values('advancedfill');
 // The arrays are different depending on whether the user is searching for missions or candidates.
-if($_SESSION['mission_search_switch'] == 'candidate') {
+if ($_SESSION['mission_search_switch'] == 'candidate') {
     $search_fields = array(
 	        //'' => 'Choose',
 	        '',
@@ -27,7 +27,7 @@ 
     );
     
     $subtitle = elgg_echo('missions:advanced_find_candidates');
-	$limit_options = array(10,25,50,100);
+	$limit_options = array(10, 25, 50, 100);
 	$button_text = elgg_echo('missions:find');
 }
 else {
@@ -49,7 +49,7 @@ 
     );
     
     $subtitle = elgg_echo('missions:advanced_search_for_opportunities');
-	$limit_options = array(9,18,30,60,120);
+	$limit_options = array(9, 18, 30, 60, 120);
 	$button_text = elgg_echo('missions:search');
 }
 
@@ -66,10 +66,10 @@ 
 $content .= '<div class="mission-emphasis-extra col-sm-4">' . elgg_echo('missions:value') . '</div></div>';
 
 // Generates the rows of the form according to the settings.
-if ($advanced_form){
+if ($advanced_form) {
 
-	for ($s = 0; $s < $number_of_rows; $s ++) {
-		if ($advanced_form['selection_'.$s]){
+	for ($s = 0; $s < $number_of_rows; $s++) {
+		if ($advanced_form['selection_' . $s]) {
 
 
     $content .= '<div class="form-group">';
@@ -77,7 +77,7 @@ 
     $content .= '<div class="mission-emphasis-extra col-sm-offset-1 col-sm-4">';
 	     $content .= elgg_view('input/dropdown', array(
 	        	'name' => 'selection_' . $s,
-	        	'value' => $advanced_form['selection_'.$s],
+	        	'value' => $advanced_form['selection_' . $s],
 	        	'options' => $search_fields,
 
 	        	'onchange' => 'element_switch(this)',
@@ -102,12 +102,12 @@ 
 
 
 $all_values = array(
-    "value_answer" => $advanced_form['selection_'.$s.'_element'],
-    "reading" => $advanced_form['selection_'.$s.'_element_lwc'],
-    "writing" => $advanced_form['selection_'.$s.'_element_lwe'],
-    "oral" => $advanced_form['selection_'.$s.'_element_lop'],
-    "operand" => $advanced_form['selection_'.$s.'_operand'],
-    "day" => $advanced_form['selection_'.$s.'_element_day']
+    "value_answer" => $advanced_form['selection_' . $s . '_element'],
+    "reading" => $advanced_form['selection_' . $s . '_element_lwc'],
+    "writing" => $advanced_form['selection_' . $s . '_element_lwe'],
+    "oral" => $advanced_form['selection_' . $s . '_element_lop'],
+    "operand" => $advanced_form['selection_' . $s . '_operand'],
+    "day" => $advanced_form['selection_' . $s . '_element_day']
 );
 
 
@@ -115,8 +115,8 @@ 
 ?> 
 <script type="text/javascript">
 var name = "<?php echo 'selection_' . $s; ?>";
-var value = "<?php echo $advanced_form['selection_'.$s]; ?>";
-var all_values= <?php echo json_encode($all_values ); ?>;
+var value = "<?php echo $advanced_form['selection_' . $s]; ?>";
+var all_values= <?php echo json_encode($all_values); ?>;
 
 
  element_switch2(name, value,all_values);
@@ -152,7 +152,7 @@ 
 </script>
 <?php
 	    
-		}else{
+		} else {
 				    $content .= '<div class="form-group">';
 	    // Dropdown with a name that is numbered according to its row.
 	    $content .= '<div class="mission-emphasis-extra col-sm-offset-1 col-sm-4">';
@@ -178,8 +178,8 @@ 
 	    $content .= '</noscript></div>';
 		}
 	}
-}else{
-	for ($i = 0; $i < $number_of_rows; $i ++) {
+} else {
+	for ($i = 0; $i < $number_of_rows; $i++) {
 	    $content .= '<div class="form-group">';
 	    // Dropdown with a name that is numbered according to its row.
 	    $content .= '<div class="mission-emphasis-extra col-sm-offset-1 col-sm-4">';
@@ -211,11 +211,11 @@ 
     'value' => $vars['return_to_referer']
 ));
 
-if($advanced_form){
+if ($advanced_form) {
 
     $clear_link = elgg_view('output/url', array(
 		'text' => elgg_echo('missions:clear_search'),
-		'href' => 'missions/main?clear=true&search='.$advanced_form,
+		'href' => 'missions/main?clear=true&search=' . $advanced_form,
 		'class' => 'mrgn-lft-sm',
 		'is_action' => true,
 		'is_trusted' => true,

Braces +3 added lines, -4 removed lines

@@ -29,8 +29,7 @@ 
     $subtitle = elgg_echo('missions:advanced_find_candidates');
 	$limit_options = array(10,25,50,100);
 	$button_text = elgg_echo('missions:find');
-}
-else {
+} else {
     $search_fields = array(
 	        //'' => 'Choose',
 	        '',
@@ -152,7 +151,7 @@ 
 </script>
 <?php
 	    
-		}else{
+		} else{
 				    $content .= '<div class="form-group">';
 	    // Dropdown with a name that is numbered according to its row.
 	    $content .= '<div class="mission-emphasis-extra col-sm-offset-1 col-sm-4">';
@@ -178,7 +177,7 @@ 
 	    $content .= '</noscript></div>';
 		}
 	}
-}else{
+} else{
 	for ($i = 0; $i < $number_of_rows; $i ++) {
 	    $content .= '<div class="form-group">';
 	    // Dropdown with a name that is numbered according to its row.

mod/missions/views/default/forms/missions/post-mission-second-form.php

Indentation +31 added lines, -31 removed lines

@@ -29,7 +29,7 @@ 
 $openess = get_input('so');
 
 if (elgg_is_sticky_form('secondfill')) {
-    extract(elgg_get_sticky_values('secondfill'));
+	extract(elgg_get_sticky_values('secondfill'));
 }
 
 if($openess == 'on') {
@@ -60,9 +60,9 @@ 
 }
 
 $input_title = elgg_view('input/text', array(
-	    'name' => 'job_title',
-	    'value' => $job_title,
-	    'id' => 'post-mission-title-text-input'
+		'name' => 'job_title',
+		'value' => $job_title,
+		'id' => 'post-mission-title-text-input'
 ));
 
 $input_role = elgg_view('input/radio', array(
@@ -72,15 +72,15 @@ 
 	'options' => array(
 		'<span style="font-weight:normal;"> '.elgg_echo('missions:opportunity_role:offering').'</span>' => 'missions:offering',
 		'<span style="font-weight:normal;"> '.elgg_echo('missions:opportunity_role:seeking').'</span>' => 'missions:seeking'
-    	)
+		)
  	)
 );
 
 $input_type = elgg_view('input/dropdown', array(
-	    'name' => 'job_type',
-	    'value' => $job_type,
+		'name' => 'job_type',
+		'value' => $job_type,
 		'options_values' => mm_echo_explode_setting_string(elgg_get_plugin_setting('opportunity_type_string', 'missions')),
-	    'id' => 'post-mission-type-dropdown-input'
+		'id' => 'post-mission-type-dropdown-input'
 ));
 
 $sort_areas = mm_echo_explode_setting_string(elgg_get_plugin_setting('program_area_string', 'missions'));
@@ -95,10 +95,10 @@ 
 	$other_value = $other_text;
 }
 $input_area = elgg_view('input/dropdown', array(
-	    'name' => 'job_area',
-	    'value' => $initial_value,
+		'name' => 'job_area',
+		'value' => $initial_value,
 		'options_values' => $sort_areas,
-	    'id' => 'post-mission-area-dropdown-input'
+		'id' => 'post-mission-area-dropdown-input'
 ));
 $input_other_area = elgg_view('page/elements/other-text-input', array(
 		'parent_id' => 'post-mission-area-dropdown-input',
@@ -106,43 +106,43 @@ 
 ));
 
 $input_number_of = elgg_view('input/dropdown', array(
-	    'name' => 'number',
-	    'value' => $number,
-	    'options' => $max_array,
-	    'id' => 'post-mission-number-dropdown-input'
+		'name' => 'number',
+		'value' => $number,
+		'options' => $max_array,
+		'id' => 'post-mission-number-dropdown-input'
 ));
 
 $input_start_date = elgg_view('input/date', array(
-	    'name' => 'start_date',
-	    'value' => $start_date,
-	    'id' => 'post-mission-start-date-input',
+		'name' => 'start_date',
+		'value' => $start_date,
+		'id' => 'post-mission-start-date-input',
 		'placeholder' => 'yyyy-mm-dd'
 ));
 
 $input_completion_date = elgg_view('input/date', array(
-	    'name' => 'completion_date',
-	    'value' => $completion_date,
-	    'id' => 'post-mission-completion-date-input',
+		'name' => 'completion_date',
+		'value' => $completion_date,
+		'id' => 'post-mission-completion-date-input',
 		'placeholder' => 'yyyy-mm-dd'
 ));
 
 $input_deadline = elgg_view('input/date', array(
-	    'name' => 'deadline',
-	    'value' => $deadline,
-	    'id' => 'post-mission-deadline-date-input',
+		'name' => 'deadline',
+		'value' => $deadline,
+		'id' => 'post-mission-deadline-date-input',
 		'placeholder' => 'yyyy-mm-dd'
 ));
 
 $input_description = elgg_view('input/longtext', array(
-	    'name' => 'description',
-	    'value' => $description,
-	    'id' => 'post-mission-description-plaintext-input'
+		'name' => 'description',
+		'value' => $description,
+		'id' => 'post-mission-description-plaintext-input'
 ));
 
 $input_openess = elgg_view('input/checkbox', array(
-	    'name' => 'openess',
-	    'checked' => $openess,
-	    'id' => 'post-mission-openess-checkbox-input'
+		'name' => 'openess',
+		'checked' => $openess,
+		'id' => 'post-mission-openess-checkbox-input'
 ));
 
 if($department_abbr) {
@@ -161,7 +161,7 @@ 
 	'options'=> mm_echo_explode_setting_string(elgg_get_plugin_setting('gl_group_string', 'missions')),
 	'id'=>'post-mission-gl-group',
 	'class'=>'',
-    'disabled'=>true,
+	'disabled'=>true,
 
 ));
 

Spacing +20 added lines, -20 removed lines

@@ -12,7 +12,7 @@ 
 $progenitor = get_entity($ancestor_array[0]);
 
 $department_abbr = $progenitor->abbr;
-if(get_current_language() == 'fr') {
+if (get_current_language() == 'fr') {
 	$department_abbr = $progenitor->abbr_french;
 }
 
@@ -32,7 +32,7 @@ 
     extract(elgg_get_sticky_values('secondfill'));
 }
 
-if($openess == 'on') {
+if ($openess == 'on') {
 	$openess = true;
 }
 else {
@@ -41,12 +41,12 @@ 
 
 $max_applicants = elgg_get_plugin_setting('mission_max_applicants', 'missions');
 $max_array = array();
-for($i=1;$i<=$max_applicants;$i++) {
-	$max_array[$i-1] = $i;
+for ($i = 1; $i <= $max_applicants; $i++) {
+	$max_array[$i - 1] = $i;
 }
 
 $duplicating_entity = get_entity($_SESSION['mission_duplication_id']);
-if(get_subtype_from_id($duplicating_entity->subtype) == 'mission' && !$_SESSION['mission_duplicating_override_second']) {
+if (get_subtype_from_id($duplicating_entity->subtype) == 'mission' && !$_SESSION['mission_duplicating_override_second']) {
 	$job_title = $duplicating_entity->job_title;
 	$job_type = $duplicating_entity->job_type;
 	$job_area = $duplicating_entity->program_area;
@@ -70,8 +70,8 @@ 
 	'id' => 'post-mission-role-radio-input',
 	'value' => $role_type,
 	'options' => array(
-		'<span style="font-weight:normal;"> '.elgg_echo('missions:opportunity_role:offering').'</span>' => 'missions:offering',
-		'<span style="font-weight:normal;"> '.elgg_echo('missions:opportunity_role:seeking').'</span>' => 'missions:seeking'
+		'<span style="font-weight:normal;"> ' . elgg_echo('missions:opportunity_role:offering') . '</span>' => 'missions:offering',
+		'<span style="font-weight:normal;"> ' . elgg_echo('missions:opportunity_role:seeking') . '</span>' => 'missions:seeking'
     	)
  	)
 );
@@ -86,7 +86,7 @@ 
 $sort_areas = mm_echo_explode_setting_string(elgg_get_plugin_setting('program_area_string', 'missions'));
 asort($sort_areas);
 $sort_areas['missions:other'] = elgg_echo('missions:other');
-if(array_key_exists($job_area, $sort_areas)) {
+if (array_key_exists($job_area, $sort_areas)) {
 	$initial_value = $job_area;
 	$other_value = '';
 }
@@ -145,7 +145,7 @@ 
 	    'id' => 'post-mission-openess-checkbox-input'
 ));
 
-if($department_abbr) {
+if ($department_abbr) {
 	$openess_string = elgg_echo('missions:openess_sentence', array(strtoupper($department_abbr)));
 }
 else {
@@ -170,7 +170,7 @@ 
 <h2 class='h4'><?php echo elgg_echo('missions:second_post_form_title'); ?></h2><br>
 <div class="form-group">
 	<label for='post-mission-title-text-input' class="col-sm-3 required text-right" aria-required="true">
-		<?php echo elgg_echo('missions:opportunity_title');?>
+		<?php echo elgg_echo('missions:opportunity_title'); ?>
 		<strong class="required" aria-required="true">
 			<?php echo elgg_echo('missions:required'); ?>
 		</strong>
@@ -182,7 +182,7 @@ 
 </div>
 <div class="form-group">
 	<label for='post-mission-role-radio-input' class="col-sm-3 required text-right" aria-required="true">
-		<?php echo elgg_echo('missions:opportunity_role') . ':';?>
+		<?php echo elgg_echo('missions:opportunity_role') . ':'; ?>
 		<strong class="required" aria-required="true">
 			<?php echo elgg_echo('missions:required'); ?>
 		</strong>
@@ -193,7 +193,7 @@ 
 </div>
 <div class="form-group">
 	<label for='post-mission-type-dropdown-input' class="col-sm-3 text-right">
-		<?php echo elgg_echo('missions:opportunity_type') . ':';?>
+		<?php echo elgg_echo('missions:opportunity_type') . ':'; ?>
 	</label>
 	<div class="col-sm-3">
 		<?php echo $input_type; ?>
@@ -202,7 +202,7 @@ 
 </div>
 <div class="form-group">
 	<label for='post-mission-area-dropdown-input' class="col-sm-3 text-right">
-		<?php echo elgg_echo('missions:program_area') . ':';?>
+		<?php echo elgg_echo('missions:program_area') . ':'; ?>
 	</label>
 	<div class="col-sm-3">
 		<?php echo $input_area; ?>
@@ -212,7 +212,7 @@ 
 
 <div class="form-group">
 	<label for='post-mission-gl-group' class="col-sm-3 text-right">
-		<?php echo elgg_echo('missions:groupandlevel') . ':';?>
+		<?php echo elgg_echo('missions:groupandlevel') . ':'; ?>
 	</label>
 	<div class="col-sm-3">
 		<div class="col-sm-6">
@@ -250,7 +250,7 @@ 
 
 <div class="form-group">
 	<label for='post-mission-number-dropdown-input' class="col-sm-3 text-right">
-		<?php echo elgg_echo('missions:opportunity_number') . ': ';?>
+		<?php echo elgg_echo('missions:opportunity_number') . ': '; ?>
 	</label>
 	<div class="col-sm-1">
 		<?php echo $input_number_of; ?>
@@ -258,7 +258,7 @@ 
 </div>
 <div class="form-group">
 	<label for='post-mission-start-date-input' class="col-sm-3 required text-right" aria-required="true">
-		<?php echo elgg_echo('missions:ideal_start_date');?>
+		<?php echo elgg_echo('missions:ideal_start_date'); ?>
 		<strong class="required" aria-required="true">
 			<?php echo elgg_echo('missions:required'); ?>
 		</strong>
@@ -271,7 +271,7 @@ 
 </div>
 <div class="form-group">
 	<label for='post-mission-completion-date-input' class="col-sm-3 text-right">
-		<?php echo elgg_echo('missions:ideal_completion_date') . ':';?>
+		<?php echo elgg_echo('missions:ideal_completion_date') . ':'; ?>
 	</label>
 	<div class="col-sm-3">
 		<?php echo $input_completion_date; ?>
@@ -280,7 +280,7 @@ 
 </div>
 <div class="form-group">
 	<label for='post-mission-deadline-date-input' class="col-sm-3 required text-right" aria-required="true">
-		<?php echo elgg_echo('missions:deadline');?>
+		<?php echo elgg_echo('missions:deadline'); ?>
 		<strong class="required" aria-required="true">
 			<?php echo elgg_echo('missions:required'); ?>
 		</strong>
@@ -293,7 +293,7 @@ 
 </div>
 <div class="form-group">
 	<label for='post-mission-description-plaintext-input' class="col-sm-3 text-right">
-		<?php echo elgg_echo('missions:opportunity_description') . ':';?>
+		<?php echo elgg_echo('missions:opportunity_description') . ':'; ?>
 	</label>
 	<div class="col-sm-7">
 		<?php echo $input_description; ?>
@@ -301,7 +301,7 @@ 
 </div>
 <div class="form-group">
 	<label for='post-mission-openess-checkbox-input' class="col-sm-3 text-right">
-		<?php echo $openess_string;?>
+		<?php echo $openess_string; ?>
 	</label>
 	<div class="col-sm-7">
 		<?php echo $input_openess; ?>

Braces +3 added lines, -6 removed lines

@@ -34,8 +34,7 @@ 
 
 if($openess == 'on') {
 	$openess = true;
-}
-else {
+} else {
 	$openess = false;
 }
 
@@ -89,8 +88,7 @@ 
 if(array_key_exists($job_area, $sort_areas)) {
 	$initial_value = $job_area;
 	$other_value = '';
-}
-else {
+} else {
 	$initial_value = 'missions:other';
 	$other_value = $other_text;
 }
@@ -147,8 +145,7 @@ 
 
 if($department_abbr) {
 	$openess_string = elgg_echo('missions:openess_sentence', array(strtoupper($department_abbr)));
-}
-else {
+} else {
 	$openess_string = elgg_echo('missions:openess_sentence_generic');
 }
 

mod/missions/lib/missions.php

Indentation +142 added lines, -142 removed lines

@@ -12,30 +12,30 @@ 
  */
 function mm_pack_language($lwc, $lwe, $lop, $lang)
 {
-    $returner = '';
-
-    $value = strtolower($lang);
-    $returner .= $value;
-
-    if (! empty($lwc) || $lwc == '-') {
-        $returner .= $lwc;
-    } else {
-        $returner .= '-';
-    }
-
-    if (! empty($lwe) || $lwe == '-') {
-        $returner .= $lwe;
-    } else {
-        $returner .= '-';
-    }
-
-    if (! empty($lop) || $lop == '-') {
-        $returner .= $lop;
-    } else {
-        $returner .= '-';
-    }
-
-    return $returner;
+	$returner = '';
+
+	$value = strtolower($lang);
+	$returner .= $value;
+
+	if (! empty($lwc) || $lwc == '-') {
+		$returner .= $lwc;
+	} else {
+		$returner .= '-';
+	}
+
+	if (! empty($lwe) || $lwe == '-') {
+		$returner .= $lwe;
+	} else {
+		$returner .= '-';
+	}
+
+	if (! empty($lop) || $lop == '-') {
+		$returner .= $lop;
+	} else {
+		$returner .= '-';
+	}
+
+	return $returner;
 }
 
 /*
@@ -43,29 +43,29 @@ 
  */
 function mm_unpack_language($data_string, $lang)
 {
-    $returner = array();
+	$returner = array();
 
-    $value = strtolower($lang);
-    $index = stripos($data_string, $value) + strlen($value);
+	$value = strtolower($lang);
+	$index = stripos($data_string, $value) + strlen($value);
 
-    $returner['lwc_' . $value] = substr($data_string, $index, 1);
-    if ($returner['lwc_' . $value] == '-') {
-        $returner['lwc_' . $value] = '';
-    }
-    $index ++;
+	$returner['lwc_' . $value] = substr($data_string, $index, 1);
+	if ($returner['lwc_' . $value] == '-') {
+		$returner['lwc_' . $value] = '';
+	}
+	$index ++;
 
-    $returner['lwe_' . $value] = substr($data_string, $index, 1);
-    if ($returner['lwe_' . $value] == '-') {
-        $returner['lwe_' . $value] = '';
-    }
-    $index ++;
+	$returner['lwe_' . $value] = substr($data_string, $index, 1);
+	if ($returner['lwe_' . $value] == '-') {
+		$returner['lwe_' . $value] = '';
+	}
+	$index ++;
 
-    $returner['lop_' . $value] = substr($data_string, $index, 1);
-    if ($returner['lop_' . $value] == '-') {
-        $returner['lop_' . $value] = '';
-    }
+	$returner['lop_' . $value] = substr($data_string, $index, 1);
+	if ($returner['lop_' . $value] == '-') {
+		$returner['lop_' . $value] = '';
+	}
 
-    return $returner;
+	return $returner;
 }
 
 /*
@@ -73,23 +73,23 @@ 
  */
 function mm_pack_time($hour, $min, $day)
 {
-    $returner = '';
+	$returner = '';
 
-    $value = strtolower($day);
-    $returner .= $day;
+	$value = strtolower($day);
+	$returner .= $day;
 
-    if (! empty($hour)) {
-        if($min == '') {
-            $min = '00';
-        }
-        $returner .= $hour . $min;
-    }
+	if (! empty($hour)) {
+		if($min == '') {
+			$min = '00';
+		}
+		$returner .= $hour . $min;
+	}
 
-    if (empty($hour) && (strpos($day, 'duration') !== false)) {
-        $returner .= '0' . $min;
-    }
+	if (empty($hour) && (strpos($day, 'duration') !== false)) {
+		$returner .= '0' . $min;
+	}
 
-    return $returner;
+	return $returner;
 }
 
 /*
@@ -97,22 +97,22 @@ 
  */
 function mm_unpack_time($data_string, $day)
 {
-    $returner = array();
+	$returner = array();
 
-    $value = strtolower($day);
-    $index = stripos($data_string, $value) + strlen($value);
+	$value = strtolower($day);
+	$index = stripos($data_string, $value) + strlen($value);
 
-    $dividing_time = 2;
-    if (strpos($data_string, 'duration') !== false) {
-        $dividing_time = 1;
-    }
+	$dividing_time = 2;
+	if (strpos($data_string, 'duration') !== false) {
+		$dividing_time = 1;
+	}
 
-    if (! empty($data_string)) {
-        $returner[$day . '_hour'] = substr($data_string, $index, $dividing_time);
-        $returner[$day . '_min'] = substr($data_string, $index + $dividing_time, 2);
-    }
+	if (! empty($data_string)) {
+		$returner[$day . '_hour'] = substr($data_string, $index, $dividing_time);
+		$returner[$day . '_min'] = substr($data_string, $index + $dividing_time, 2);
+	}
 
-    return $returner;
+	return $returner;
 }
 
 /*
@@ -120,26 +120,26 @@ 
  */
 function mm_unpack_mission($entity)
 {
-    $returner = array();
-
-    $returner = array_merge($returner, mm_unpack_language($entity->english, 'english'));
-    $returner = array_merge($returner, mm_unpack_language($entity->french, 'french'));
-    $returner = array_merge($returner, mm_unpack_time($entity->mon_start, 'mon_start'));
-    $returner = array_merge($returner, mm_unpack_time($entity->mon_duration, 'mon_duration'));
-    $returner = array_merge($returner, mm_unpack_time($entity->tue_start, 'tue_start'));
-    $returner = array_merge($returner, mm_unpack_time($entity->tue_duration, 'tue_duration'));
-    $returner = array_merge($returner, mm_unpack_time($entity->wed_start, 'wed_start'));
-    $returner = array_merge($returner, mm_unpack_time($entity->wed_duration, 'wed_duration'));
-    $returner = array_merge($returner, mm_unpack_time($entity->thu_start, 'thu_start'));
-    $returner = array_merge($returner, mm_unpack_time($entity->thu_duration, 'thu_duration'));
-    $returner = array_merge($returner, mm_unpack_time($entity->fri_start, 'fri_start'));
-    $returner = array_merge($returner, mm_unpack_time($entity->fri_duration, 'fri_duration'));
-    $returner = array_merge($returner, mm_unpack_time($entity->sat_start, 'sat_start'));
-    $returner = array_merge($returner, mm_unpack_time($entity->sat_duration, 'sat_duration'));
-    $returner = array_merge($returner, mm_unpack_time($entity->sun_start, 'sun_start'));
-    $returner = array_merge($returner, mm_unpack_time($entity->sun_duration, 'sun_duration'));
-
-    return $returner;
+	$returner = array();
+
+	$returner = array_merge($returner, mm_unpack_language($entity->english, 'english'));
+	$returner = array_merge($returner, mm_unpack_language($entity->french, 'french'));
+	$returner = array_merge($returner, mm_unpack_time($entity->mon_start, 'mon_start'));
+	$returner = array_merge($returner, mm_unpack_time($entity->mon_duration, 'mon_duration'));
+	$returner = array_merge($returner, mm_unpack_time($entity->tue_start, 'tue_start'));
+	$returner = array_merge($returner, mm_unpack_time($entity->tue_duration, 'tue_duration'));
+	$returner = array_merge($returner, mm_unpack_time($entity->wed_start, 'wed_start'));
+	$returner = array_merge($returner, mm_unpack_time($entity->wed_duration, 'wed_duration'));
+	$returner = array_merge($returner, mm_unpack_time($entity->thu_start, 'thu_start'));
+	$returner = array_merge($returner, mm_unpack_time($entity->thu_duration, 'thu_duration'));
+	$returner = array_merge($returner, mm_unpack_time($entity->fri_start, 'fri_start'));
+	$returner = array_merge($returner, mm_unpack_time($entity->fri_duration, 'fri_duration'));
+	$returner = array_merge($returner, mm_unpack_time($entity->sat_start, 'sat_start'));
+	$returner = array_merge($returner, mm_unpack_time($entity->sat_duration, 'sat_duration'));
+	$returner = array_merge($returner, mm_unpack_time($entity->sun_start, 'sun_start'));
+	$returner = array_merge($returner, mm_unpack_time($entity->sun_duration, 'sun_duration'));
+
+	return $returner;
 }
 
 /*
@@ -163,7 +163,7 @@ 
 
 		// Handles the case where an edit button is needed.
 		// This overwrites the read more button.
-        //Nick - letting site admins have access to edit/ deactivate missions
+		//Nick - letting site admins have access to edit/ deactivate missions
 		if(($mission->owner_guid == elgg_get_logged_in_user_guid() || $mission->account == elgg_get_logged_in_user_guid() || elgg_is_admin_logged_in())
 				&& $mission->state != 'completed' && $mission->state != 'cancelled') {
 			$button_one = '<div id="edit-button-mission-' . $mission->guid . '" name="edit-button" style="display:inline-block;">' . elgg_view('output/url', array(
@@ -205,7 +205,7 @@ 
 				$button_three = '<div id="complete-button-mission-' . $mission->guid . '" name="complete-button" style="display:inline-block;">' . elgg_view('output/url', array(
 						'href' => elgg_get_site_url() . 'action/missions/complete-mission?mission_guid=' . $mission->guid,
 						'text' => elgg_echo('missions:complete').elgg_echo("mission:button:oppurtunity", array($mission->title)),
-		            	'is_action' => true,
+						'is_action' => true,
 						'class' => 'elgg-button btn btn-success',
 						'confirm' => elgg_echo('missions:confirm:complete_mission'),
  						'style' => 'margin:2px;'
@@ -281,23 +281,23 @@ 
 			)) . '</div>';
 		}
 
-        //Nick - Adding the option for admins to delete and edit archived missions
-        if(elgg_is_admin_logged_in()){
-            $returner['edit_button'] = '<div id="edit-button-mission-' . $mission->guid . '" name="edit-button" style="display:inline-block;">' . elgg_view('output/url', array(
+		//Nick - Adding the option for admins to delete and edit archived missions
+		if(elgg_is_admin_logged_in()){
+			$returner['edit_button'] = '<div id="edit-button-mission-' . $mission->guid . '" name="edit-button" style="display:inline-block;">' . elgg_view('output/url', array(
 					'href' => elgg_get_site_url() . 'missions/mission-edit/' . $mission->guid,
 					'text' => elgg_echo('missions:edit').elgg_echo("mission:button:oppurtunity", array($mission->title)),
 					'class' => 'elgg-button btn btn-primary',
  					'style' => 'margin:2px;'
 			)) . '</div>';
 
-            $button_four = '<div id="delete-button-mission-' . $mission->guid . '" name="delete-button" style="display:inline-block;">' . elgg_view('output/url', array(
-                        'href' => elgg_get_site_url() . 'action/missions/delete-mission?mission_guid=' . $mission->guid,
-                        'text' => elgg_echo('missions:delete').elgg_echo("mission:button:oppurtunity", array($mission->title)),
-                        'is_action' => true,
-                        'class' => 'elgg-button btn btn-danger',
-                        'style' => 'margin:2px;'
-                )) . '</div>';
-        }
+			$button_four = '<div id="delete-button-mission-' . $mission->guid . '" name="delete-button" style="display:inline-block;">' . elgg_view('output/url', array(
+						'href' => elgg_get_site_url() . 'action/missions/delete-mission?mission_guid=' . $mission->guid,
+						'text' => elgg_echo('missions:delete').elgg_echo("mission:button:oppurtunity", array($mission->title)),
+						'is_action' => true,
+						'class' => 'elgg-button btn btn-danger',
+						'style' => 'margin:2px;'
+				)) . '</div>';
+		}
 
 	}
 
@@ -344,7 +344,7 @@ 
  		$returner['complete_button'] = '<div id="complete-button-mission-' . $mission->guid . '" name="complete-button" style="display:inline-block;">' . elgg_view('output/url', array(
 				'href' => elgg_get_site_url() . 'action/missions/complete-mission?mission_guid=' . $mission->guid,
 				'text' => elgg_echo('missions:complete'),
-		        'is_action' => true,
+				'is_action' => true,
 				'class' => 'elgg-button btn btn-success',
  				'disabled' => $disabled,
  				'confirm' => elgg_echo('missions:confirm:complete_mission'),
@@ -361,7 +361,7 @@ 
  		)) . '</div>';
 
 
-        $returner['edit_button'] = '<div id="edit-button-mission-' . $mission->guid . '" name="edit-button" style="display:inline-block;">' . elgg_view('output/url', array(
+		$returner['edit_button'] = '<div id="edit-button-mission-' . $mission->guid . '" name="edit-button" style="display:inline-block;">' . elgg_view('output/url', array(
 					'href' => elgg_get_site_url() . 'missions/mission-edit/' . $mission->guid,
 					'text' => elgg_echo('missions:edit'),
 					'class' => 'elgg-button btn btn-primary',
@@ -379,18 +379,18 @@ 
  				'style' => 'margin:2px;'
  		)) . '</div>';
  	}
-     //Nick - adding the ability for site admins to delete missions from the edit page
-     //They don't want deleting to be an option for users for the sake of analytics
-     //Only admins can delete missions if need be (ex inapropriate content)
-     if(elgg_is_admin_logged_in()){
-         $returner['delete_button'] = '<div id="delete-button-mission-' . $mission->guid . '" name="delete-button" style="display:inline-block;">' . elgg_view('output/url', array(
-                     'href' => elgg_get_site_url() . 'action/missions/delete-mission?mission_guid=' . $mission->guid,
-                     'text' => elgg_echo('missions:delete'),
-                     'is_action' => true,
-                     'class' => 'elgg-button btn btn-danger',
-                     'style' => 'margin:2px;'
-             )) . '</div>';
-     }
+	 //Nick - adding the ability for site admins to delete missions from the edit page
+	 //They don't want deleting to be an option for users for the sake of analytics
+	 //Only admins can delete missions if need be (ex inapropriate content)
+	 if(elgg_is_admin_logged_in()){
+		 $returner['delete_button'] = '<div id="delete-button-mission-' . $mission->guid . '" name="delete-button" style="display:inline-block;">' . elgg_view('output/url', array(
+					 'href' => elgg_get_site_url() . 'action/missions/delete-mission?mission_guid=' . $mission->guid,
+					 'text' => elgg_echo('missions:delete'),
+					 'is_action' => true,
+					 'class' => 'elgg-button btn btn-danger',
+					 'style' => 'margin:2px;'
+			 )) . '</div>';
+	 }
 
  	return $returner;
  }
@@ -447,7 +447,7 @@ 
 		else {
 			$recipient_set = get_user_by_email($recipient_entity->email);
 			foreach($recipient_set as $recipient_temp) {
-	    		messages_send($subject, $body, $recipient_temp->guid, $sender, 0, false);
+				messages_send($subject, $body, $recipient_temp->guid, $sender, 0, false);
 			}
 		}
 	}
@@ -458,7 +458,7 @@ 
 		else {
 			$sender_set = get_user_by_email($sender_entity->email);
 			$sender_latest = array_pop($sender_set)->guid;
-	    	messages_send($subject, $body, $recipient, $sender_latest, 0, false);
+			messages_send($subject, $body, $recipient, $sender_latest, 0, false);
 		}
 	}
 	else {
@@ -632,23 +632,23 @@ 
 	}
 
    if ($role_type != '') { // apply filtering if some types are passed for filtering
-        $entity_set1 = array();
-        foreach ($entity_set as $type) {
-            if (in_array($type->role_type, $role_type)) {
-                $entity_set1[] = $type;
-            }
-        }
-    } else { // if nothing is selected for filtering, do not filter
-        $entity_set1 = $entity_set;
-    }
+		$entity_set1 = array();
+		foreach ($entity_set as $type) {
+			if (in_array($type->role_type, $role_type)) {
+				$entity_set1[] = $type;
+			}
+		}
+	} else { // if nothing is selected for filtering, do not filter
+		$entity_set1 = $entity_set;
+	}
 
    if ($opp_type != '') { // apply filtering if some types are passed for filtering
-	    $entity_set2 = array();
-	    foreach ($entity_set1 as $type) {
-	        if (in_array($type->job_type, $opp_type)) {
-	            $entity_set2[] = $type;
-	        }
-	    }
+		$entity_set2 = array();
+		foreach ($entity_set1 as $type) {
+			if (in_array($type->job_type, $opp_type)) {
+				$entity_set2[] = $type;
+			}
+		}
 	} else { // if nothing is selected for filtering, do not filter
 		$entity_set2 = $entity_set1;
 	}
@@ -724,7 +724,7 @@ 
  * Check if the user is opted in to any of the opt-in options.
  */
 function check_if_opted_in($current_user) {
-    //Nick - adding additional checks for other opportunity types
+	//Nick - adding additional checks for other opportunity types
 	if($current_user->opt_in_missions == 'gcconnex_profile:opt:yes') {
 		return true;
 	}
@@ -743,35 +743,35 @@ 
 	if($current_user->opt_in_shadowing == 'gcconnex_profile:opt:yes') {
 		return true;
 	}
-    if($current_user->opt_in_jobshare == 'gcconnex_profile:opt:yes') {
+	if($current_user->opt_in_jobshare == 'gcconnex_profile:opt:yes') {
 		return true;
 	}
-    if($current_user->opt_in_pcSeek == 'gcconnex_profile:opt:yes') {
+	if($current_user->opt_in_pcSeek == 'gcconnex_profile:opt:yes') {
 		return true;
 	}
-    if($current_user->opt_in_pcCreate == 'gcconnex_profile:opt:yes') {
+	if($current_user->opt_in_pcCreate == 'gcconnex_profile:opt:yes') {
 		return true;
 	}
-    if($current_user->opt_in_rotation== 'gcconnex_profile:opt:yes') {
+	if($current_user->opt_in_rotation== 'gcconnex_profile:opt:yes') {
 		return true;
 	}
 
-    if($current_user->opt_in_ssSeek == 'gcconnex_profile:opt:yes') {
+	if($current_user->opt_in_ssSeek == 'gcconnex_profile:opt:yes') {
 		return true;
 	}
-    if($current_user->opt_in_ssCreate == 'gcconnex_profile:opt:yes') {
+	if($current_user->opt_in_ssCreate == 'gcconnex_profile:opt:yes') {
 		return true;
 	}
-    if($current_user->opt_in_assignSeek == 'gcconnex_profile:opt:yes') {
+	if($current_user->opt_in_assignSeek == 'gcconnex_profile:opt:yes') {
 		return true;
 	}
-    if($current_user->opt_in_assignCreate == 'gcconnex_profile:opt:yes') {
+	if($current_user->opt_in_assignCreate == 'gcconnex_profile:opt:yes') {
 		return true;
 	}
-    if($current_user->opt_in_deploySeek == 'gcconnex_profile:opt:yes') {
+	if($current_user->opt_in_deploySeek == 'gcconnex_profile:opt:yes') {
 		return true;
 	}
-    if($current_user->opt_in_deployCreate == 'gcconnex_profile:opt:yes') {
+	if($current_user->opt_in_deployCreate == 'gcconnex_profile:opt:yes') {
 		return true;
 	}
 

Spacing +83 added lines, -83 removed lines

@@ -17,19 +17,19 @@ 
     $value = strtolower($lang);
     $returner .= $value;
 
-    if (! empty($lwc) || $lwc == '-') {
+    if (!empty($lwc) || $lwc == '-') {
         $returner .= $lwc;
     } else {
         $returner .= '-';
     }
 
-    if (! empty($lwe) || $lwe == '-') {
+    if (!empty($lwe) || $lwe == '-') {
         $returner .= $lwe;
     } else {
         $returner .= '-';
     }
 
-    if (! empty($lop) || $lop == '-') {
+    if (!empty($lop) || $lop == '-') {
         $returner .= $lop;
     } else {
         $returner .= '-';
@@ -52,13 +52,13 @@ 
     if ($returner['lwc_' . $value] == '-') {
         $returner['lwc_' . $value] = '';
     }
-    $index ++;
+    $index++;
 
     $returner['lwe_' . $value] = substr($data_string, $index, 1);
     if ($returner['lwe_' . $value] == '-') {
         $returner['lwe_' . $value] = '';
     }
-    $index ++;
+    $index++;
 
     $returner['lop_' . $value] = substr($data_string, $index, 1);
     if ($returner['lop_' . $value] == '-') {
@@ -78,8 +78,8 @@ 
     $value = strtolower($day);
     $returner .= $day;
 
-    if (! empty($hour)) {
-        if($min == '') {
+    if (!empty($hour)) {
+        if ($min == '') {
             $min = '00';
         }
         $returner .= $hour . $min;
@@ -107,7 +107,7 @@ 
         $dividing_time = 1;
     }
 
-    if (! empty($data_string)) {
+    if (!empty($data_string)) {
         $returner[$day . '_hour'] = substr($data_string, $index, $dividing_time);
         $returner[$day . '_min'] = substr($data_string, $index + $dividing_time, 2);
     }
@@ -145,18 +145,18 @@ 
 /*
  * Creates the base button set found in both greater and lesser views of the mission.
  */
-function mm_create_button_set_base($mission, $full_view=false) {
+function mm_create_button_set_base($mission, $full_view = false) {
 	$returner = array();
 	$button_one = null;
 	$button_two = null;
 	$button_three = null;
 	$button_four = null;
 
-	if(!$full_view) {
+	if (!$full_view) {
 		// Handles the case where a read more button is needed.
 		$button_zero = '<div id="read-more-button-mission-' . $mission->guid . '" name="read-more-button" style="display:inline-block;">' . elgg_view('output/url', array(
 				'href' => $mission->getURL(),
-				'text' => elgg_echo('missions:view').elgg_echo("mission:button:oppurtunity", array($mission->title)),
+				'text' => elgg_echo('missions:view') . elgg_echo("mission:button:oppurtunity", array($mission->title)),
 				'class' => 'elgg-button btn btn-default',
  				'style' => 'margin:2px;'
 		)) . '</div>';
@@ -164,11 +164,11 @@ 
 		// Handles the case where an edit button is needed.
 		// This overwrites the read more button.
         //Nick - letting site admins have access to edit/ deactivate missions
-		if(($mission->owner_guid == elgg_get_logged_in_user_guid() || $mission->account == elgg_get_logged_in_user_guid() || elgg_is_admin_logged_in())
+		if (($mission->owner_guid == elgg_get_logged_in_user_guid() || $mission->account == elgg_get_logged_in_user_guid() || elgg_is_admin_logged_in())
 				&& $mission->state != 'completed' && $mission->state != 'cancelled') {
 			$button_one = '<div id="edit-button-mission-' . $mission->guid . '" name="edit-button" style="display:inline-block;">' . elgg_view('output/url', array(
 					'href' => elgg_get_site_url() . 'missions/mission-edit/' . $mission->guid,
-					'text' => elgg_echo('missions:edit').elgg_echo("mission:button:oppurtunity", array($mission->title)),
+					'text' => elgg_echo('missions:edit') . elgg_echo("mission:button:oppurtunity", array($mission->title)),
 					'class' => 'elgg-button btn btn-primary',
  					'style' => 'margin:2px;'
 			)) . '</div>';
@@ -179,32 +179,32 @@ 
 		// Creates the share button which is always present.
 		$button_two = '<div id="share-button-mission-' . $mission->guid . '" name="share-button" style="display:inline-block;">' . elgg_view('output/url', array(
 				'href' => elgg_get_site_url() . 'missions/message-share/' . $mission->guid,
-				'text' => elgg_echo('missions:share').elgg_echo("mission:button:oppurtunity", array($mission->title)),
+				'text' => elgg_echo('missions:share') . elgg_echo("mission:button:oppurtunity", array($mission->title)),
 				'class' => 'elgg-button btn btn-default',
  				'style' => 'margin:2px;'
 		)) . '</div>';
 	//}
 
 	// Logic to handle the third button.
-	if($mission->state != 'completed' && $mission->state != 'cancelled') {
+	if ($mission->state != 'completed' && $mission->state != 'cancelled') {
 		if ($mission->owner_guid == elgg_get_logged_in_user_guid() || $mission->account == elgg_get_logged_in_user_guid()) {
 			$candidate_total = count(elgg_get_entities_from_relationship(array(
 					'relationship' => 'mission_accepted',
 					'relationship_guid' => $mission->guid
 			)));
 
-			$button_three ='<div id="invite-button-mission-' . $mission->guid . '" name="invite-button" style="display:inline-block;">' .  elgg_view('output/url', array(
+			$button_three = '<div id="invite-button-mission-' . $mission->guid . '" name="invite-button" style="display:inline-block;">' . elgg_view('output/url', array(
 					'href' => elgg_get_site_url() . 'missions/mission-candidate-search/' . $mission->guid,
-					'text' => elgg_echo('missions:find').elgg_echo("mission:button:find", array($mission->title)),
+					'text' => elgg_echo('missions:find') . elgg_echo("mission:button:find", array($mission->title)),
 					'class' => 'elgg-button btn btn-success',
  					'style' => 'margin:2px;'
 			)) . '</div>';
 
 			// Handles the case where a complete button is needed.
-			if(!$full_view && $candidate_total == $mission->number) {
+			if (!$full_view && $candidate_total == $mission->number) {
 				$button_three = '<div id="complete-button-mission-' . $mission->guid . '" name="complete-button" style="display:inline-block;">' . elgg_view('output/url', array(
 						'href' => elgg_get_site_url() . 'action/missions/complete-mission?mission_guid=' . $mission->guid,
-						'text' => elgg_echo('missions:complete').elgg_echo("mission:button:oppurtunity", array($mission->title)),
+						'text' => elgg_echo('missions:complete') . elgg_echo("mission:button:oppurtunity", array($mission->title)),
 		            	'is_action' => true,
 						'class' => 'elgg-button btn btn-success',
 						'confirm' => elgg_echo('missions:confirm:complete_mission'),
@@ -219,51 +219,51 @@ 
 					'count' => true
 			));
 
-			if($relationship_count < $mission->number) {
+			if ($relationship_count < $mission->number) {
 				$user = elgg_get_logged_in_user_entity();
-				$mmdep = trim( explode('/', $mission->department_path_english)[0] );
-				if ( !$mission->openess || stripos( $user->department, $mmdep ) !== false )
+				$mmdep = trim(explode('/', $mission->department_path_english)[0]);
+				if (!$mission->openess || stripos($user->department, $mmdep) !== false)
 					$button_three = '<div id="apply-button-mission-' . $mission->guid . '" name="apply-button" style="display:inline-block;">' . $apply_button = elgg_view('output/url', array(
 			 				'href' => elgg_get_site_url() . 'missions/mission-application/' . $mission->guid,
-			 				'text' => elgg_echo('missions:apply').elgg_echo("mission:button:apply", array($mission->title)),
+			 				'text' => elgg_echo('missions:apply') . elgg_echo("mission:button:apply", array($mission->title)),
 			 				'class' => 'elgg-button btn btn-primary',
 		 					'style' => 'margin:2px;'
 			 		)) . '</div>';
 			}
 
-			if(check_entity_relationship($mission->guid, 'mission_tentative', elgg_get_logged_in_user_guid())) {
+			if (check_entity_relationship($mission->guid, 'mission_tentative', elgg_get_logged_in_user_guid())) {
 				$button_three = '<div id="accept-button-mission-' . $mission->guid . '" name="accept-button" style="display:inline-block;">' . elgg_view('output/url', array(
 					'href' => elgg_get_site_url() . 'action/missions/accept-invite?applicant=' . elgg_get_logged_in_user_guid() . '&mission=' . $mission->guid,
-					'text' => elgg_echo('missions:accept').elgg_echo("mission:button:oppurtunity", array($mission->title)),
+					'text' => elgg_echo('missions:accept') . elgg_echo("mission:button:oppurtunity", array($mission->title)),
 					'is_action' => true,
 					'class' => 'elgg-button btn btn-success',
  					'style' => 'margin:2px;'
 				)) . '</div>';
 				$button_four = '<div id="decline-button-mission-' . $mission->guid . '" name="decline-button" style="display:inline-block;">' . elgg_view('output/url', array(
 					'href' => elgg_get_site_url() . 'missions/reason-to-decline/' . $mission->guid,
-					'text' => elgg_echo('missions:decline').elgg_echo("mission:button:oppurtunity", array($mission->title)),
+					'text' => elgg_echo('missions:decline') . elgg_echo("mission:button:oppurtunity", array($mission->title)),
 					'class' => 'elgg-button btn btn-danger',
  					'style' => 'margin:2px;'
 				)) . '</div>';
 				$button_two = null;
 			}
 
-			if(check_entity_relationship($mission->guid, 'mission_offered', elgg_get_logged_in_user_guid())) {
+			if (check_entity_relationship($mission->guid, 'mission_offered', elgg_get_logged_in_user_guid())) {
 				$button_three = '<div id="final-accept-button-mission-' . $mission->guid . '" name="final-accept-button" style="display:inline-block;">' . mm_finalize_button($mission, elgg_get_logged_in_user_entity()) . '</div>';
 				$button_four = '<div id="decline-button-mission-' . $mission->guid . '" name="decline-button" style="display:inline-block;">' . elgg_view('output/url', array(
 					'href' => elgg_get_site_url() . 'missions/reason-to-decline/' . $mission->guid,
-					'text' => elgg_echo('missions:decline').elgg_echo("mission:button:oppurtunity", array($mission->title)),
+					'text' => elgg_echo('missions:decline') . elgg_echo("mission:button:oppurtunity", array($mission->title)),
 					'class' => 'elgg-button btn btn-danger',
  					'style' => 'margin:2px;'
 				)) . '</div>';
 				$button_two = null;
 			}
 
-			if(check_entity_relationship($mission->guid, 'mission_accepted', elgg_get_logged_in_user_guid()) ||
+			if (check_entity_relationship($mission->guid, 'mission_accepted', elgg_get_logged_in_user_guid()) ||
 					check_entity_relationship($mission->guid, 'mission_applied', elgg_get_logged_in_user_guid())) {
 				$button_three = '<div id="withdraw-button-mission-' . $mission->guid . '" name="withdraw-button" style="display:inline-block;">' . elgg_view('output/url', array(
 						'href' => elgg_get_site_url() . 'missions/reason-to-decline/' . $mission->guid,
-						'text' => elgg_echo('missions:withdraw').elgg_echo("mission:button:withdraw", array($mission->title)),
+						'text' => elgg_echo('missions:withdraw') . elgg_echo("mission:button:withdraw", array($mission->title)),
 						'class' => 'elgg-button btn btn-danger',
  						'style' => 'margin:2px;'
 				)) . '</div>';
@@ -271,10 +271,10 @@ 
 		}
 	}
 	else {
-		if(check_if_opted_in(elgg_get_logged_in_user_entity())) {
+		if (check_if_opted_in(elgg_get_logged_in_user_entity())) {
 			$button_three = '<div id="duplicate-button-mission-' . $mission->guid . '" name="duplicate-button" style="display:inline-block;">' . elgg_view('output/url', array(
 					'href' => elgg_get_site_url() . 'action/missions/duplicate-mission?mid=' . $mission->guid,
-					'text' => elgg_echo('missions:duplicate').elgg_echo("mission:button:oppurtunity", array($mission->title)),
+					'text' => elgg_echo('missions:duplicate') . elgg_echo("mission:button:oppurtunity", array($mission->title)),
 					'is_action' => true,
 					'class' => 'elgg-button btn btn-success',
 	 				'style' => 'margin:2px;'
@@ -282,17 +282,17 @@ 
 		}
 
         //Nick - Adding the option for admins to delete and edit archived missions
-        if(elgg_is_admin_logged_in()){
+        if (elgg_is_admin_logged_in()) {
             $returner['edit_button'] = '<div id="edit-button-mission-' . $mission->guid . '" name="edit-button" style="display:inline-block;">' . elgg_view('output/url', array(
 					'href' => elgg_get_site_url() . 'missions/mission-edit/' . $mission->guid,
-					'text' => elgg_echo('missions:edit').elgg_echo("mission:button:oppurtunity", array($mission->title)),
+					'text' => elgg_echo('missions:edit') . elgg_echo("mission:button:oppurtunity", array($mission->title)),
 					'class' => 'elgg-button btn btn-primary',
  					'style' => 'margin:2px;'
 			)) . '</div>';
 
             $button_four = '<div id="delete-button-mission-' . $mission->guid . '" name="delete-button" style="display:inline-block;">' . elgg_view('output/url', array(
                         'href' => elgg_get_site_url() . 'action/missions/delete-mission?mission_guid=' . $mission->guid,
-                        'text' => elgg_echo('missions:delete').elgg_echo("mission:button:oppurtunity", array($mission->title)),
+                        'text' => elgg_echo('missions:delete') . elgg_echo("mission:button:oppurtunity", array($mission->title)),
                         'is_action' => true,
                         'class' => 'elgg-button btn btn-danger',
                         'style' => 'margin:2px;'
@@ -329,7 +329,7 @@ 
  	}
 
  	// Button to advance the mission state to cancelled from posted.
- 	if (($mission->owner_guid == elgg_get_logged_in_user_guid() || $mission->account == elgg_get_logged_in_user_guid() ||elgg_is_admin_logged_in())
+ 	if (($mission->owner_guid == elgg_get_logged_in_user_guid() || $mission->account == elgg_get_logged_in_user_guid() || elgg_is_admin_logged_in())
  			&& $mission->state != 'cancelled' && $mission->state != 'completed') {
  		$candidate_total = count(elgg_get_entities_from_relationship(array(
  				'relationship' => 'mission_accepted',
@@ -337,7 +337,7 @@ 
  		)));
 
  		$disabled = true;
- 		if($candidate_total > 0) {
+ 		if ($candidate_total > 0) {
  			$disabled = false;
  		}
 
@@ -369,7 +369,7 @@ 
 			)) . '</div>';
  	}
 
- 	if(($mission->owner_guid == elgg_get_logged_in_user_guid() || $mission->account == elgg_get_logged_in_user_guid())
+ 	if (($mission->owner_guid == elgg_get_logged_in_user_guid() || $mission->account == elgg_get_logged_in_user_guid())
  			&& elgg_get_plugin_setting('mission_developer_tools_on', 'missions') == 'YES') {
  		$returner['delete_button'] = '<div id="delete-button-mission-' . $mission->guid . '" name="delete-button" style="display:inline-block;">' . elgg_view('output/url', array(
  				'href' => elgg_get_site_url() . 'action/missions/delete-mission?mission_guid=' . $mission->guid,
@@ -382,7 +382,7 @@ 
      //Nick - adding the ability for site admins to delete missions from the edit page
      //They don't want deleting to be an option for users for the sake of analytics
      //Only admins can delete missions if need be (ex inapropriate content)
-     if(elgg_is_admin_logged_in()){
+     if (elgg_is_admin_logged_in()) {
          $returner['delete_button'] = '<div id="delete-button-mission-' . $mission->guid . '" name="delete-button" style="display:inline-block;">' . elgg_view('output/url', array(
                      'href' => elgg_get_site_url() . 'action/missions/delete-mission?mission_guid=' . $mission->guid,
                      'text' => elgg_echo('missions:delete'),
@@ -400,7 +400,7 @@ 
  */
 function mm_clean_url_segment($segment) {
 	$clean_segment = $segment;
-	if(strpos($segment, '?') === false) {
+	if (strpos($segment, '?') === false) {
 
 	}
 	else {
@@ -418,7 +418,7 @@ 
 	$raw_array = explode(',', $string);
 
 	$echoed_array = array();
-	for($i=0;$i<count($raw_array);$i++) {
+	for ($i = 0; $i < count($raw_array); $i++) {
 		$echoed_array[$raw_array[$i]] = elgg_echo($raw_array[$i], array(), $language_override);
 	}
 
@@ -440,19 +440,19 @@ 
 	$headers .= 'From: ' . $sender_entity->email . "\r\n";
 	mail($recipient_entity->email, $subject, $body, $headers);
 
-	if(get_subtype_from_id($recipient_entity->subtype) == 'mission') {
-		if($recipient_entity->account) {
+	if (get_subtype_from_id($recipient_entity->subtype) == 'mission') {
+		if ($recipient_entity->account) {
 			messages_send($subject, $body, $recipient_entity->account, $sender, 0, false);
 		}
 		else {
 			$recipient_set = get_user_by_email($recipient_entity->email);
-			foreach($recipient_set as $recipient_temp) {
+			foreach ($recipient_set as $recipient_temp) {
 	    		messages_send($subject, $body, $recipient_temp->guid, $sender, 0, false);
 			}
 		}
 	}
-	else if(get_subtype_from_id($sender_entity->subtype) == 'mission') {
-		if($sender_entity->account) {
+	else if (get_subtype_from_id($sender_entity->subtype) == 'mission') {
+		if ($sender_entity->account) {
 			messages_send($subject, $body, $recipient, $sender_entity->account, 0, false);
 		}
 		else {
@@ -469,8 +469,8 @@ 
 /*
  * Compare two entities by their time_updated values.
  */
-function mm_cmp_by_updated($a, $b)  {
-	if($a->time_updated == $b->time_updated) {
+function mm_cmp_by_updated($a, $b) {
+	if ($a->time_updated == $b->time_updated) {
 		return 0;
 	}
 	return ($a->time_updated > $b->time_updated) ? -1 : 1;
@@ -488,9 +488,9 @@ 
 	));
 
 	$count = 0;
-	foreach($entity_list as $entity) {
+	foreach ($entity_list as $entity) {
 		$invited_already = false;
-		if(check_entity_relationship($entity->guid, 'mission_accepted', $user_guid) ||
+		if (check_entity_relationship($entity->guid, 'mission_accepted', $user_guid) ||
 				check_entity_relationship($entity->guid, 'mission_applied', $user_guid) ||
 				check_entity_relationship($entity->guid, 'mission_tentative', $user_guid) ||
 				check_entity_relationship($entity->guid, 'mission_offered', $user_guid)) {
@@ -498,7 +498,7 @@ 
 		}
 
 		// Does not display missions which have filled all the available spots.
-		if($number_of_candidates < $entity->number && !$invited_already) {
+		if ($number_of_candidates < $entity->number && !$invited_already) {
 			$returner[$entity->guid] = elgg_get_excerpt($entity->job_title, 30);
 			$count++;
 		}
@@ -522,7 +522,7 @@ 
 			'count' => true
 	));
 
-	if(check_entity_relationship($mission->guid, 'mission_offered', $applicant->guid)) {
+	if (check_entity_relationship($mission->guid, 'mission_offered', $applicant->guid)) {
 		return elgg_view('output/url', array(
 				'href' => '',
 				'text' => elgg_echo('missions:offered'),
@@ -532,7 +532,7 @@ 
 		));
 	}
 	else {
-		if($relationship_count >= $mission->number) {
+		if ($relationship_count >= $mission->number) {
 			// Disabled button for when the mission is full.
 			return elgg_view('output/url', array(
 					'href' => '',
@@ -565,7 +565,7 @@ 
 			'count' => true
 	));
 
-	if($relationship_count >= $mission->number) {
+	if ($relationship_count >= $mission->number) {
 		// Disabled button for when the mission is full.
 		return elgg_view('output/url', array(
 				'href' => '',
@@ -592,19 +592,19 @@ 
  */
 function mm_get_translation_key_from_setting_string($input, $setting_string) {
 	$english_array = mm_echo_explode_setting_string($setting_string, 'en');
-	foreach($english_array as $key => $value) {
+	foreach ($english_array as $key => $value) {
 		$english_array[$key] = strtolower($value);
 	}
 	$english_key = array_search(strtolower($input), $english_array);
 
 	$french_array = mm_echo_explode_setting_string($setting_string, 'fr');
-	foreach($french_array as $key => $value) {
+	foreach ($french_array as $key => $value) {
 		$french_array[$key] = strtolower($value);
 	}
 	$french_key = array_search(strtolower($input), $french_array);
 
-	if(strcmp($french_key, $english_key) === 0) {
-		if($english_key == '') {
+	if (strcmp($french_key, $english_key) === 0) {
+		if ($english_key == '') {
 			return false;
 		}
 		else {
@@ -612,11 +612,11 @@ 
 		}
 	}
 
-	if($english_key) {
+	if ($english_key) {
 		return $english_key;
 	}
 
-	if($french_key) {
+	if ($french_key) {
 		return $french_key;
 	}
 }
@@ -654,7 +654,7 @@ 
 	}
 
 	$comparison = '';
-	switch($sort) {
+	switch ($sort) {
 		case 'missions:date_posted':
 			$comparison = 'mm_cmp_mission_by_posted_date';
 			break;
@@ -670,11 +670,11 @@ 
 	}
 
 	$result = usort($entity_set2, $comparison);
-	if(!$result) {
+	if (!$result) {
 		return $backup_array;
 	}
 	else {
-		if($order == 'missions:ascending') {
+		if ($order == 'missions:ascending') {
 			return array_reverse($entity_set2);
 		}
 		return $entity_set2;
@@ -685,7 +685,7 @@ 
  * Compares missions by job type.
  */
 function mm_cmp_mission_by_type($a, $b) {
-	if(elgg_echo($a->job_type) == elgg_echo($b->job_type)) {
+	if (elgg_echo($a->job_type) == elgg_echo($b->job_type)) {
 		return 0;
 	}
 	return (elgg_echo($a->job_type) < elgg_echo($b->job_type)) ? 1 : -1;
@@ -695,7 +695,7 @@ 
  * Compares missions by their creation timestamp.
  */
 function mm_cmp_mission_by_posted_date($a, $b) {
-	if($a->time_created == $b->time_created) {
+	if ($a->time_created == $b->time_created) {
 		return 0;
 	}
 	return ($a->time_created < $b->time_created) ? 1 : -1;
@@ -704,7 +704,7 @@ 
  * Compares missions by the closing timestamp.
  */
 function mm_cmp_mission_by_closed_date($a, $b) {
-	if($a->time_closed == $b->time_closed) {
+	if ($a->time_closed == $b->time_closed) {
 		return 0;
 	}
 	return ($a->time_closed < $b->time_closed) ? 1 : -1;
@@ -714,7 +714,7 @@ 
  * Compares missions by their deadline date.
  */
 function mm_cmp_mission_by_deadline($a, $b) {
-	if($a->deadline == $b->deadline) {
+	if ($a->deadline == $b->deadline) {
 		return 0;
 	}
 	return ($a->deadline < $b->deadline) ? 1 : -1;
@@ -725,53 +725,53 @@ 
  */
 function check_if_opted_in($current_user) {
     //Nick - adding additional checks for other opportunity types
-	if($current_user->opt_in_missions == 'gcconnex_profile:opt:yes') {
+	if ($current_user->opt_in_missions == 'gcconnex_profile:opt:yes') {
 		return true;
 	}
-	if($current_user->opt_in_swap == 'gcconnex_profile:opt:yes') {
+	if ($current_user->opt_in_swap == 'gcconnex_profile:opt:yes') {
 		return true;
 	}
-	if($current_user->opt_in_mentored == 'gcconnex_profile:opt:yes') {
+	if ($current_user->opt_in_mentored == 'gcconnex_profile:opt:yes') {
 		return true;
 	}
-	if($current_user->opt_in_mentoring == 'gcconnex_profile:opt:yes') {
+	if ($current_user->opt_in_mentoring == 'gcconnex_profile:opt:yes') {
 		return true;
 	}
-	if($current_user->opt_in_shadowed == 'gcconnex_profile:opt:yes') {
+	if ($current_user->opt_in_shadowed == 'gcconnex_profile:opt:yes') {
 		return true;
 	}
-	if($current_user->opt_in_shadowing == 'gcconnex_profile:opt:yes') {
+	if ($current_user->opt_in_shadowing == 'gcconnex_profile:opt:yes') {
 		return true;
 	}
-    if($current_user->opt_in_jobshare == 'gcconnex_profile:opt:yes') {
+    if ($current_user->opt_in_jobshare == 'gcconnex_profile:opt:yes') {
 		return true;
 	}
-    if($current_user->opt_in_pcSeek == 'gcconnex_profile:opt:yes') {
+    if ($current_user->opt_in_pcSeek == 'gcconnex_profile:opt:yes') {
 		return true;
 	}
-    if($current_user->opt_in_pcCreate == 'gcconnex_profile:opt:yes') {
+    if ($current_user->opt_in_pcCreate == 'gcconnex_profile:opt:yes') {
 		return true;
 	}
-    if($current_user->opt_in_rotation== 'gcconnex_profile:opt:yes') {
+    if ($current_user->opt_in_rotation == 'gcconnex_profile:opt:yes') {
 		return true;
 	}
 
-    if($current_user->opt_in_ssSeek == 'gcconnex_profile:opt:yes') {
+    if ($current_user->opt_in_ssSeek == 'gcconnex_profile:opt:yes') {
 		return true;
 	}
-    if($current_user->opt_in_ssCreate == 'gcconnex_profile:opt:yes') {
+    if ($current_user->opt_in_ssCreate == 'gcconnex_profile:opt:yes') {
 		return true;
 	}
-    if($current_user->opt_in_assignSeek == 'gcconnex_profile:opt:yes') {
+    if ($current_user->opt_in_assignSeek == 'gcconnex_profile:opt:yes') {
 		return true;
 	}
-    if($current_user->opt_in_assignCreate == 'gcconnex_profile:opt:yes') {
+    if ($current_user->opt_in_assignCreate == 'gcconnex_profile:opt:yes') {
 		return true;
 	}
-    if($current_user->opt_in_deploySeek == 'gcconnex_profile:opt:yes') {
+    if ($current_user->opt_in_deploySeek == 'gcconnex_profile:opt:yes') {
 		return true;
 	}
-    if($current_user->opt_in_deployCreate == 'gcconnex_profile:opt:yes') {
+    if ($current_user->opt_in_deployCreate == 'gcconnex_profile:opt:yes') {
 		return true;
 	}
 

Braces +15 added lines, -26 removed lines

@@ -211,8 +211,7 @@ 
  						'style' => 'margin:2px;'
 				)) . '</div>';
 			}
-		}
-		else {
+		} else {
 			$relationship_count = elgg_get_entities_from_relationship(array(
 					'relationship' => 'mission_accepted',
 					'relationship_guid' => $mission->guid,
@@ -222,13 +221,14 @@ 
 			if($relationship_count < $mission->number) {
 				$user = elgg_get_logged_in_user_entity();
 				$mmdep = trim( explode('/', $mission->department_path_english)[0] );
-				if ( !$mission->openess || stripos( $user->department, $mmdep ) !== false )
-					$button_three = '<div id="apply-button-mission-' . $mission->guid . '" name="apply-button" style="display:inline-block;">' . $apply_button = elgg_view('output/url', array(
+				if ( !$mission->openess || stripos( $user->department, $mmdep ) !== false ) {
+									$button_three = '<div id="apply-button-mission-' . $mission->guid . '" name="apply-button" style="display:inline-block;">' . $apply_button = elgg_view('output/url', array(
 			 				'href' => elgg_get_site_url() . 'missions/mission-application/' . $mission->guid,
 			 				'text' => elgg_echo('missions:apply').elgg_echo("mission:button:apply", array($mission->title)),
 			 				'class' => 'elgg-button btn btn-primary',
 		 					'style' => 'margin:2px;'
 			 		)) . '</div>';
+				}
 			}
 
 			if(check_entity_relationship($mission->guid, 'mission_tentative', elgg_get_logged_in_user_guid())) {
@@ -269,8 +269,7 @@ 
 				)) . '</div>';
 			}
 		}
-	}
-	else {
+	} else {
 		if(check_if_opted_in(elgg_get_logged_in_user_entity())) {
 			$button_three = '<div id="duplicate-button-mission-' . $mission->guid . '" name="duplicate-button" style="display:inline-block;">' . elgg_view('output/url', array(
 					'href' => elgg_get_site_url() . 'action/missions/duplicate-mission?mid=' . $mission->guid,
@@ -402,8 +401,7 @@ 
 	$clean_segment = $segment;
 	if(strpos($segment, '?') === false) {
 
-	}
-	else {
+	} else {
 		$cutoff = strpos($segment, '?');
 		$clean_segment = substr($segment, 0, $cutoff);
 	}
@@ -443,25 +441,21 @@ 
 	if(get_subtype_from_id($recipient_entity->subtype) == 'mission') {
 		if($recipient_entity->account) {
 			messages_send($subject, $body, $recipient_entity->account, $sender, 0, false);
-		}
-		else {
+		} else {
 			$recipient_set = get_user_by_email($recipient_entity->email);
 			foreach($recipient_set as $recipient_temp) {
 	    		messages_send($subject, $body, $recipient_temp->guid, $sender, 0, false);
 			}
 		}
-	}
-	else if(get_subtype_from_id($sender_entity->subtype) == 'mission') {
+	} else if(get_subtype_from_id($sender_entity->subtype) == 'mission') {
 		if($sender_entity->account) {
 			messages_send($subject, $body, $recipient, $sender_entity->account, 0, false);
-		}
-		else {
+		} else {
 			$sender_set = get_user_by_email($sender_entity->email);
 			$sender_latest = array_pop($sender_set)->guid;
 	    	messages_send($subject, $body, $recipient, $sender_latest, 0, false);
 		}
-	}
-	else {
+	} else {
 		messages_send($subject, $body, $recipient, $sender, 0, false);
 	}
 }
@@ -530,8 +524,7 @@ 
 				'style' => 'margin:2px;width:120px;',
 				'disabled' => true
 		));
-	}
-	else {
+	} else {
 		if($relationship_count >= $mission->number) {
 			// Disabled button for when the mission is full.
 			return elgg_view('output/url', array(
@@ -541,8 +534,7 @@ 
 					'style' => 'margin:2px;width:120px;',
 					'disabled' => true
 			));
-		}
-		else {
+		} else {
 			// Button which turns the applicant into a participant.
 			return elgg_view('output/url', array(
 					'href' => elgg_get_site_url() . 'action/missions/mission-offer?aid=' . $applicant->guid . '&mid=' . $mission->guid,
@@ -574,8 +566,7 @@ 
 				'style' => 'margin:2px;',
 				'disabled' => true
 		));
-	}
-	else {
+	} else {
 		// Button which turns the applicant into a participant.
 		return elgg_view('output/url', array(
 				'href' => elgg_get_site_url() . 'action/missions/finalize-offer?aid=' . $applicant->guid . '&mid=' . $mission->guid,
@@ -606,8 +597,7 @@ 
 	if(strcmp($french_key, $english_key) === 0) {
 		if($english_key == '') {
 			return false;
-		}
-		else {
+		} else {
 			return $english_key;
 		}
 	}
@@ -672,8 +662,7 @@ 
 	$result = usort($entity_set2, $comparison);
 	if(!$result) {
 		return $backup_array;
-	}
-	else {
+	} else {
 		if($order == 'missions:ascending') {
 			return array_reverse($entity_set2);
 		}

mod/missions/lib/missions-analytics.php

Indentation +19 added lines, -19 removed lines

@@ -284,12 +284,12 @@ 
 * Add the appropriate reports to the supplied mission_set
 */
 function mm_analytics_add_reports_by_dates($start_date, $end_date, $separator, &$mission_set) {
-    //array('posted', 'cancelled', 'completed', 'offered', 'declined', 'inprogress');
+	//array('posted', 'cancelled', 'completed', 'offered', 'declined', 'inprogress');
 		if ($separator == 'missions:state') {
 				$subtypes = array(
-            'mission-posted',
-            'mission-cancelled',
-            'mission-completed',
+			'mission-posted',
+			'mission-cancelled',
+			'mission-completed',
 						'mission-wasoffered',
 						'mission-declination'
 				);
@@ -298,17 +298,17 @@ 
 					$subtypes_ids[] = get_subtype_id('object', $st);
 				};
 
-        // In order to have somewhat useful results prior to this merge, we
-        // keep the old single instance tracking, but make sure to not
-        // duplicate results with the new report style tracking.
-        $originals = array();
-        foreach ($mission_set as $set) {
-          $guids = array();
-          foreach ($set as $object) {
-            $guids[] = $object->guid;
-          }
-          $originals[] = $guids;
-        }
+		// In order to have somewhat useful results prior to this merge, we
+		// keep the old single instance tracking, but make sure to not
+		// duplicate results with the new report style tracking.
+		$originals = array();
+		foreach ($mission_set as $set) {
+		  $guids = array();
+		  foreach ($set as $object) {
+			$guids[] = $object->guid;
+		  }
+		  $originals[] = $guids;
+		}
 
 				$q_options = array();
 				$q_options['type'] = 'object';
@@ -317,10 +317,10 @@ 
 				$q_options['type_subtype_pairs'] = array('object' => $subtypes);
 				$reports = elgg_get_entities($q_options);
 				foreach ($reports as $report) {
-          if (!in_array($report->mission_guid, $originals[array_search($report->subtype, $subtypes_ids)])) {
-            $mission_set[array_search($report->subtype, $subtypes_ids)][] =
-              $report;
-          }
+		  if (!in_array($report->mission_guid, $originals[array_search($report->subtype, $subtypes_ids)])) {
+			$mission_set[array_search($report->subtype, $subtypes_ids)][] =
+			  $report;
+		  }
 				}
 
 				// 'mission-acceptance'  (Requires different query, to find missions "in progress".

Spacing +83 added lines, -83 removed lines

@@ -27,7 +27,7 @@ 
  */
 function mm_analytics_generate_time_scale_timestamps($beginning_date, $end_date, $interval) {
 	// Validates the dates using the regex found in mm_analytics_validate_date_for_time_scale.
-	if(!mm_analytics_validate_date_for_time_scale($beginning_date) || !mm_analytics_validate_date_for_time_scale($end_date)) {
+	if (!mm_analytics_validate_date_for_time_scale($beginning_date) || !mm_analytics_validate_date_for_time_scale($end_date)) {
 		return false;
 	}
 
@@ -57,7 +57,7 @@ 
 	}*/
 
 	// Decides on the beginning date for the time range .
-	switch($interval) {
+	switch ($interval) {
 		// Years always start on 01-01.
 		case 'missions:year':
 			$step = '+1 year';
@@ -67,8 +67,8 @@ 
 		case 'missions:fiscal_year':
 			$step = '+1 year';
 			$beginning = strtotime($beginning_array[0] . '-04-01');
-			if($beginning_array[1] != '') {
-				if(intval($beginning_array[1]) <  4) {
+			if ($beginning_array[1] != '') {
+				if (intval($beginning_array[1]) < 4) {
 					$beginning = strtotime('-1 year', $beginning);
 				}
 			}
@@ -77,18 +77,18 @@ 
 		case 'missions:quarter':
 			$step = '+3 months';
 			$beginning = strtotime($beginning_array[0] . '-04-01');
-			if($beginning_array[1] != '') {
+			if ($beginning_array[1] != '') {
 				$month_int = intval($beginning_array[1]);
-				if($month_int >= 1 && $month_int <= 3) {
+				if ($month_int >= 1 && $month_int <= 3) {
 					$beginning = strtotime($beginning_array[0] . '-01-01');
 				}
-				else if($month_int >= 4 && $month_int <= 6) {
+				else if ($month_int >= 4 && $month_int <= 6) {
 					$beginning = strtotime($beginning_array[0] . '-04-01');
 				}
-				else if($month_int >= 7 && $month_int <= 9) {
+				else if ($month_int >= 7 && $month_int <= 9) {
 					$beginning = strtotime($beginning_array[0] . '-07-01');
 				}
-				else if($month_int >= 10 && $month_int <= 12) {
+				else if ($month_int >= 10 && $month_int <= 12) {
 					$beginning = strtotime($beginning_array[0] . '-10-01');
 				}
 			}
@@ -97,7 +97,7 @@ 
 		case 'missions:month':
 			$step = '+1 month';
 			$beginning = strtotime($beginning_array[0] . '-01-01');
-			if($beginning_array[1] != '') {
+			if ($beginning_array[1] != '') {
 				$beginning = strtotime($beginning_array[0] . '-' . $beginning_array[1] . '-01');
 			}
 			break;
@@ -105,9 +105,9 @@ 
 		case 'missions:week':
 			$step = '+1 week';
 			$beginning = strtotime('this week', strtotime($beginning_array[0] . '-01-01'));
-			if($beginning_array[1] != '') {
-				$beginning = strtotime('this week', strtotime($beginning_array[0] . '-' .  $beginning_array[1] . '-01'));
-				if($beginning_array[2] != '') {
+			if ($beginning_array[1] != '') {
+				$beginning = strtotime('this week', strtotime($beginning_array[0] . '-' . $beginning_array[1] . '-01'));
+				if ($beginning_array[2] != '') {
 					$beginning = strtotime('this week', strtotime(implode('-', $beginning_array)));
 				}
 			}
@@ -116,9 +116,9 @@ 
 		case 'missions:day':
 			$step = '+1 day';
 			$beginning = strtotime($beginning_array[0] . '-01-01');
-			if($beginning_array[1] != '') {
+			if ($beginning_array[1] != '') {
 				$beginning = strtotime($beginning_array[0] . '-' . $beginning_array[1] . '-01');
-				if($beginning_array[2] != '') {
+				if ($beginning_array[2] != '') {
 					$beginning = strtotime(implode('-', $beginning_array));
 				}
 			}
@@ -130,24 +130,24 @@ 
 	// Sets the end date to end of year.
 	$end = strtotime($end_array[0] . '-12-31');
 	// If the end date has a month set then the end date is set to the end of that month.
-	if($end_array[1] != '') {
+	if ($end_array[1] != '') {
 		$end = strtotime(date('Y-m-t', strtotime($end_array[0] . '-' . $end_array[1])));
 		// If the end date has a day set then the end date is set to that day.
-		if($end_array[2] != '') {
+		if ($end_array[2] != '') {
 			$end = strtotime(implode('-', $end_array));
 		}
 	}
 
 	// Creates steps in the interval until a step exceeds the end date and the end date replaces that last step.
 	$returner_array = array($beginning);
-	while(true) {
+	while (true) {
 		$new_index = count($returner_array);
 		$latest_time = strtotime($step, $returner_array[$new_index - 1]);
 		$returner_array[$new_index] = $latest_time;
-		if($latest_time > $end) {
+		if ($latest_time > $end) {
 			$end_array = explode('-', date('m-d-Y', $end));
 			// Sets the end date to the end of that day.
-			$returner_array[$new_index] = mktime(23,59,59,$end_array[0],$end_array[1],$end_array[2]);
+			$returner_array[$new_index] = mktime(23, 59, 59, $end_array[0], $end_array[1], $end_array[2]);
 			break;
 		}
 	}
@@ -163,30 +163,30 @@ 
  */
 function mm_analytics_string_together_time_segments($days, $hours, $minutes, $seconds) {
 	$returner = '';
-	if($days != 0) {
+	if ($days != 0) {
 		$plural = 's';
-		if($days == 1) {
+		if ($days == 1) {
 			$plural = '';
 		}
 		$returner .= elgg_echo('missions:day(s)', array($days, $plural)) . ' ';
 	}
-	if($hours != 0) {
+	if ($hours != 0) {
 		$plural = 's';
-		if($hours == 1) {
+		if ($hours == 1) {
 			$plural = '';
 		}
 		$returner .= elgg_echo('missions:hour(s)', array($hours, $plural)) . ' ';
 	}
-	if($minutes != 0) {
+	if ($minutes != 0) {
 		$plural = 's';
-		if($minutes == 1) {
+		if ($minutes == 1) {
 			$plural = '';
 		}
 		$returner .= elgg_echo('missions:minute(s)', array($minutes, $plural)) . ' ';
 	}
-	if($seconds != 0) {
+	if ($seconds != 0) {
 		$plural = 's';
-		if($seconds == 1) {
+		if ($seconds == 1) {
 			$plural = '';
 		}
 		$returner .= elgg_echo('missions:second(s)', array($seconds, $plural)) . ' ';
@@ -200,12 +200,12 @@ 
 function mm_analytics_generate_bin_labels($timescale_array, $case_value, $graph_type) {
 	$timescale_labels = $timescale_array;
 
-	if($graph_type == 'missions:stacked_graph') {
+	if ($graph_type == 'missions:stacked_graph') {
 		array_pop($timescale_labels);
 	}
 
-	foreach($timescale_labels as $key => $time) {
-		switch($case_value) {
+	foreach ($timescale_labels as $key => $time) {
+		switch ($case_value) {
 			case 'missions:year':
 				$timescale_labels[$key] = [date('Y', $time), $time * 1000];
 				break;
@@ -216,7 +216,7 @@ 
 				$use_time = strtotime('-3 months', $time);
 				$q_num = ceil(intval(date('m', $time)) / 3) - 1;
 				$year = date('Y', $time);
-				if($q_num == 0) {
+				if ($q_num == 0) {
 					$q_num = 4;
 					$year = date('Y', strtotime('-1 year', $time));
 				}
@@ -242,11 +242,11 @@ 
 			case 'missions:time_to_complete_mission':
 			case 'missions:time_to_cancel_mission':
 				$plural = 's';
-				if($time == 1) {
+				if ($time == 1) {
 					$plural = '';
 				}
 
-				switch($_SESSION['missions_analytics_histogram_time_unit_for_axis']) {
+				switch ($_SESSION['missions_analytics_histogram_time_unit_for_axis']) {
 					case 'DAY':
 						$timescale_labels[$key] = elgg_echo('missions:day(s)', array(($time / 86400), $plural));
 						break;
@@ -273,7 +273,7 @@ 
  */
 function mm_analytics_transform_to_date_format($start, $end, $type) {
 	$returner = array($start, $end);
-	if($type == 'missions:start_date') {
+	if ($type == 'missions:start_date') {
 		$returner[0] = date('Y-m-d', $start);
 		$returner[1] = date('Y-m-d', $end);
 	}
@@ -365,7 +365,7 @@ 
 	$end = $modified_input[1];
 	$metadata = mm_analytics_get_metadata_name_from_target_value($date_type);
 
-	if($metadata == '') {
+	if ($metadata == '') {
 		return false;
 	}
 
@@ -374,7 +374,7 @@ 
 	$options['limit'] = 0;
 
 	// Time created is an attribute of the entity table in the database and not metadata.
-	if($metadata == 'time_created') {
+	if ($metadata == 'time_created') {
 		$options['created_time_lower'] = $start;
 		$options['created_time_upper'] = $end;
 
@@ -423,8 +423,8 @@ 
 function mm_analytics_cull_missions_by_department($mission_set, $department) {
 	$department_and_children = mo_array_node_and_all_children($department);
 	$mission_set_copy = $mission_set;
-	foreach($mission_set_copy as $key => $mission) {
-		if(!in_array($mission->department, $department_and_children)) {
+	foreach ($mission_set_copy as $key => $mission) {
+		if (!in_array($mission->department, $department_and_children)) {
 			unset($mission_set_copy[$key]);
 		}
 	}
@@ -437,8 +437,8 @@ 
  */
 function mm_analytics_cull_missions_by_role_type($mission_set, $role_type) {
 	$mission_set_copy = $mission_set;
-	foreach($mission_set_copy as $key => $mission) {		
-		if($mission->role_type != $role_type) {
+	foreach ($mission_set_copy as $key => $mission) {		
+		if ($mission->role_type != $role_type) {
 			unset($mission_set_copy[$key]);
 		}
 	}
@@ -451,8 +451,8 @@ 
  */
 function mm_analytics_cull_missions_by_job_type($mission_set, $job_type) {
 	$mission_set_copy = $mission_set;
-	foreach($mission_set_copy as $key => $mission) {		
-		if($mission->job_type != $job_type) {
+	foreach ($mission_set_copy as $key => $mission) {		
+		if ($mission->job_type != $job_type) {
 			unset($mission_set_copy[$key]);
 		}
 	}
@@ -466,8 +466,8 @@ 
 function mm_analytics_cull_missions_by_status($mission_set, $status) {
 
 	$mission_set_copy = $mission_set;
-	foreach($mission_set_copy as $key => $mission) {		
-		if($mission->state != strtolower(elgg_echo($status, [], 'en'))) {
+	foreach ($mission_set_copy as $key => $mission) {		
+		if ($mission->state != strtolower(elgg_echo($status, [], 'en'))) {
 			unset($mission_set_copy[$key]);
 		}
 	}
@@ -480,12 +480,12 @@ 
  */
 function mm_analytics_separate_missions_by_values($mission_set, $separator) {
 	$returner_array = array();
-	if($separator == '' || $separator == 'missions:average_number_of_applicants') {
+	if ($separator == '' || $separator == 'missions:average_number_of_applicants') {
 		$returner_array[0] = $mission_set;
 	}
 	else {
 		// Creates the array of values which determine which bin a mission will occupy and the metadata where these values are stored..
-		switch($separator) {
+		switch ($separator) {
 			case 'missions:state':
 				$meta_tag = 'state';
 				$comparison_array = array('posted', 'cancelled', 'completed', 'offered', 'declined', 'inprogress');
@@ -522,16 +522,16 @@ 
 
 		// Creates the bins which the missions will be divided into.
 		$count = 0;
-		foreach($comparison_array as $comparator) {
+		foreach ($comparison_array as $comparator) {
 			$returner_array[$count] = array();
 			$count++;
 		}
 
 		// Divides the missions into the bins according to what value their metadata matches.
-		foreach($mission_set as $mission) {
+		foreach ($mission_set as $mission) {
 			$count = 0;
-			foreach($comparison_array as $comparator) {
-				if($mission->$meta_tag == $comparison_array[$count]) {
+			foreach ($comparison_array as $comparator) {
+				if ($mission->$meta_tag == $comparison_array[$count]) {
 					$returner_array[$count][] = $mission;
 				}
 				$count++;
@@ -547,7 +547,7 @@ 
  */
 function mm_analytics_generate_separation_labels($separator) {
 	$returner = array();
-	switch($separator) {
+	switch ($separator) {
 		case 'missions:state':
 			$returner = array('missions:posted', 'missions:cancelled', 'missions:completed', 'missions:offered', 'missions:declined', 'missions:inprogress');
 			break;
@@ -593,28 +593,28 @@ 
 	// Creates a set of bins corresponding to the intervals.
 	$returner = array();
 	$temp_x_array = array();
-	for($i=0;$i<(count($timescale_array)-1);$i++) {
+	for ($i = 0; $i < (count($timescale_array) - 1); $i++) {
 		$temp_x_array[] = array();
 	}
 
 	// Adds an interval bin to each of the series bins.
-	foreach($mission_set as $value) {
+	foreach ($mission_set as $value) {
 		$returner[] = $temp_x_array;
 	}
 
-	foreach($mission_set as $y => $set) {
-		foreach($set as $mission) {
-			for($i=0;$i<(count($timescale_array)-1);$i++) {
+	foreach ($mission_set as $y => $set) {
+		foreach ($set as $mission) {
+			for ($i = 0; $i < (count($timescale_array) - 1); $i++) {
 				$lower_bound = $timescale_array[$i];
-				$upper_bound = $timescale_array[$i+1];
+				$upper_bound = $timescale_array[$i + 1];
 
-				if($graph_type == 'missions:stacked_graph') {
-					$modified_data_by_type = mm_analytics_transform_to_date_format($timescale_array[$i], $timescale_array[$i+1], $target);
+				if ($graph_type == 'missions:stacked_graph') {
+					$modified_data_by_type = mm_analytics_transform_to_date_format($timescale_array[$i], $timescale_array[$i + 1], $target);
 					$lower_bound = $modified_data_by_type[0];
 					$upper_bound = $modified_data_by_type[1];
 				}
 
-				if(($mission->$metadata_lower >= $lower_bound || $mission->$metadata_lower == null) && $mission->$metadata_upper < $upper_bound) {
+				if (($mission->$metadata_lower >= $lower_bound || $mission->$metadata_lower == null) && $mission->$metadata_upper < $upper_bound) {
 					$returner[$y][$i][] = $mission;
 				}
 			}
@@ -635,7 +635,7 @@ 
 	$options['limit'] = 0;
 	$options['metadata_name_value_pairs_operator'] = 'AND';
 
-	switch($target_value) {
+	switch ($target_value) {
 		// The first four cases deal with timestamps describing an elapsed period of time.
 		case 'missions:time_to_post_mission':
 			$options['metadata_name_value_pairs'] = array(array('name' => 'time_to_post', 'value' => 0, 'operand' => '>'));
@@ -680,7 +680,7 @@ 
 			$options['metadata_name_value_pairs'] = 'INVALID_TARGET';
 	}
 
-	if($options['metadata_name_value_pairs'] != 'INVALID_TARGET') {
+	if ($options['metadata_name_value_pairs'] != 'INVALID_TARGET') {
 		$mission_set = elgg_get_entities_from_metadata($options);
 	}
 	return $mission_set;
@@ -692,7 +692,7 @@ 
 function mm_analytics_get_metadata_name_from_target_value($target_value) {
 	$metadata = '';
 
-	switch($target_value) {
+	switch ($target_value) {
 		case 'missions:date_posted':
 			$metadata = 'time_created';
 			break;
@@ -738,35 +738,35 @@ 
 	$max_value = -1;
 	$min_value = -1;
 	// Find the maximum and minimum values of the mission set metadata which define the range.
-	foreach($mission_set as $mission) {
-		if($max_value == -1 || $mission->$metadata > $max_value) {
+	foreach ($mission_set as $mission) {
+		if ($max_value == -1 || $mission->$metadata > $max_value) {
 			$max_value = $mission->$metadata;
 		}
-		if($min_value == -1 || $mission->$metadata < $min_value) {
+		if ($min_value == -1 || $mission->$metadata < $min_value) {
 			$min_value = $mission->$metadata;
 		}
 	}
-	if($max_value == $min_value) {
+	if ($max_value == $min_value) {
 		$min_value = 0;
 	}
 	$max_value = $max_value + 1;
 
-	if($max_value > 0 && $min_value >= 0) {
+	if ($max_value > 0 && $min_value >= 0) {
 		$max_time = ceil($max_value / 86400);
 		$min_time = floor($min_value / 86400);
 		$return_to_timestamp = 86400;
 		$_SESSION['missions_analytics_histogram_time_unit_for_axis'] = 'DAY';
-		if(($max_time - $min_time) < $number_of_bins) {
+		if (($max_time - $min_time) < $number_of_bins) {
 			$max_time = ceil($max_value / 3600);
 			$min_time = floor($min_value / 3600);
 			$return_to_timestamp = 3600;
 			$_SESSION['missions_analytics_histogram_time_unit_for_axis'] = 'HOUR';
-			if(($max_time - $min_time) < $number_of_bins) {
+			if (($max_time - $min_time) < $number_of_bins) {
 				$max_time = ceil($max_value / 60);
 				$min_time = floor($min_value / 60);
 				$return_to_timestamp = 60;
 				$_SESSION['missions_analytics_histogram_time_unit_for_axis'] = 'MINUTE';
-				if(($max_time - $min_time) < $number_of_bins) {
+				if (($max_time - $min_time) < $number_of_bins) {
 					$max_time = ceil($max_value);
 					$min_time = floor($min_value);
 					$return_to_timestamp = 1;
@@ -779,12 +779,12 @@ 
 		$bin_step = ceil(($max_time - $min_time) / $number_of_bins);
 		$i = 0;
 		$timescale_bins[$i] = $min_time;
-		while($timescale_bins[$i] < $max_time) {
+		while ($timescale_bins[$i] < $max_time) {
 			$i++;
 			$timescale_bins[$i] = (($i * $bin_step) + $min_time);
 		}
 
-		foreach($timescale_bins as $index => $time) {
+		foreach ($timescale_bins as $index => $time) {
 			$timescale_bins[$index] = $time * $return_to_timestamp;
 		}
 	}
@@ -800,10 +800,10 @@ 
  * @param int $n the number of skills to return, default: top 10 skills
  * @return array the top $n most requested skills
  */
-function getTopSkills( $n = 10 ){
+function getTopSkills($n = 10) {
 
-	$top_skills = array();		// the array which will be will be returned
-	$all_skills = array();		// will contain all skills as keys with the ammount of time they occur as the value
+	$top_skills = array(); // the array which will be will be returned
+	$all_skills = array(); // will contain all skills as keys with the ammount of time they occur as the value
 	$dbprefix = elgg_get_config('dbprefix');
 
 	// Prepare query - we're looking for all skills from currently posted micromissions for now.
@@ -828,23 +828,23 @@ 
 	$result = get_data($query_string);
 
 	// Get an array of distinct skills with along with their occurance frequency
-	foreach ( $result as $row ) {
+	foreach ($result as $row) {
 		// allows handling of the cases where there are multiple skills
-		$skill_array = explode( ',', $row->skill );
-		foreach ( $skill_array as $skill ) {
+		$skill_array = explode(',', $row->skill);
+		foreach ($skill_array as $skill) {
 			// clean up the string
 			$skill_string = trim($skill);
-			$all_skills[$skill_string] = $all_skills[$skill_string] + $row->num;		// add to occurance of this skill the number of opportunities that had this set of skills
+			$all_skills[$skill_string] = $all_skills[$skill_string] + $row->num; // add to occurance of this skill the number of opportunities that had this set of skills
 		}
 	}
 
-	arsort($all_skills);		// sort by occurance frequency (stored in the array values)
+	arsort($all_skills); // sort by occurance frequency (stored in the array values)
 
 	// Get top $n skills
 	$i = 0;
 	foreach ($all_skills as $key => $value) {
 		$top_skills[$key] = $value;
-		$i+=1;
+		$i += 1;
 		if ($i >= $n)
 			break;
 	}

Braces +8 added lines, -12 removed lines

@@ -81,14 +81,11 @@ 
 				$month_int = intval($beginning_array[1]);
 				if($month_int >= 1 && $month_int <= 3) {
 					$beginning = strtotime($beginning_array[0] . '-01-01');
-				}
-				else if($month_int >= 4 && $month_int <= 6) {
+				} else if($month_int >= 4 && $month_int <= 6) {
 					$beginning = strtotime($beginning_array[0] . '-04-01');
-				}
-				else if($month_int >= 7 && $month_int <= 9) {
+				} else if($month_int >= 7 && $month_int <= 9) {
 					$beginning = strtotime($beginning_array[0] . '-07-01');
-				}
-				else if($month_int >= 10 && $month_int <= 12) {
+				} else if($month_int >= 10 && $month_int <= 12) {
 					$beginning = strtotime($beginning_array[0] . '-10-01');
 				}
 			}
@@ -379,8 +376,7 @@ 
 		$options['created_time_upper'] = $end;
 
 		$missions = elgg_get_entities($options);
-	}
-	else {
+	} else {
 		$options['metadata_name_value_pairs'] = array(
 				array('name' => $metadata, 'value' => $start, 'operand' => '>='),
 				array('name' => $metadata, 'value' => $end, 'operand' => '<=')
@@ -482,8 +478,7 @@ 
 	$returner_array = array();
 	if($separator == '' || $separator == 'missions:average_number_of_applicants') {
 		$returner_array[0] = $mission_set;
-	}
-	else {
+	} else {
 		// Creates the array of values which determine which bin a mission will occupy and the metadata where these values are stored..
 		switch($separator) {
 			case 'missions:state':
@@ -845,8 +840,9 @@ 
 	foreach ($all_skills as $key => $value) {
 		$top_skills[$key] = $value;
 		$i+=1;
-		if ($i >= $n)
-			break;
+		if ($i >= $n) {
+					break;
+		}
 	}
 
 	return $top_skills;