gctools-outilsgc / gcconnex

mod/missions/pages/missions/display-search-set.php

Indentation +35 added lines, -35 removed lines

@@ -28,7 +28,7 @@ 
 $role_type_field = $_SESSION['missions_role_field_value'];
 
 if ($opp_type_field || $role_type_field) {
-    $clear_link = elgg_view('output/url', array(
+	$clear_link = elgg_view('output/url', array(
 		'text' => elgg_echo('missions:clear_filter'),
 		'href' => 'action/missions/sort-missions-form?opp_filter=&role_filter=',
 		'class' => 'mrgn-lft-sm',
@@ -71,9 +71,9 @@ 
 $list_class = '';
 $item_class = '';
 if($search_typing == 'mission') {
-    $list_typing = 'gallery';
-    $list_class = 'mission-gallery wb-eqht clearfix';
-    $item_class = 'col-sm-4';
+	$list_typing = 'gallery';
+	$list_class = 'mission-gallery wb-eqht clearfix';
+	$item_class = 'col-sm-4';
 }
 
 // Function which sorts the search set according to a given value in ascending or descending order.
@@ -102,36 +102,36 @@ 
 }
 
  $search_fields = array(
-	        //'' => 'Choose',
-	        '',
-	        elgg_echo('missions:title'),
-	        elgg_echo('missions:type'),
-	        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')
-    );
+			//'' => 'Choose',
+			'',
+			elgg_echo('missions:title'),
+			elgg_echo('missions:type'),
+			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')
+	);
 
 if ($advanced_form){
     
-    $content .='<div class="mrgn-bttm-sm"><strong>'.elgg_echo('missions:search_value').':</strong> ';
+	$content .='<div class="mrgn-bttm-sm"><strong>'.elgg_echo('missions:search_value').':</strong> ';
 	for ($s = 0; $s < $number_of_rows; $s ++) {
-        if ($advanced_form['selection_'.$s]){
+		if ($advanced_form['selection_'.$s]){
 
-           $content .= '<span class="mrgn-rght-md"><strong>'.elgg_echo($advanced_form['selection_'.$s]).':</strong> '.elgg_echo($advanced_form['selection_'.$s.'_element']).' </span> ';
+		   $content .= '<span class="mrgn-rght-md"><strong>'.elgg_echo($advanced_form['selection_'.$s]).':</strong> '.elgg_echo($advanced_form['selection_'.$s.'_element']).' </span> ';
             
-        }
-    }
+		}
+	}
     
-    $content .= "</div>";
-        $content .= elgg_view('output/url', array(
+	$content .= "</div>";
+		$content .= elgg_view('output/url', array(
 		'text' => elgg_echo('missions:clear_search'),
 		'href' => 'missions/main?clear=true&search='.$advanced_form,
 		'class' => 'mrgn-lft-sm',
@@ -139,7 +139,7 @@ 
 		'is_trusted' => true,
 	));
     
-    // Advanced search form which gets hidden.
+	// Advanced search form which gets hidden.
 $advanced_search_form = elgg_view_form('missions/advanced-search-form', array(
 		'class' => 'form-horizontal'
 ));
@@ -162,13 +162,13 @@ 
 
 // Displays the missions as a list with custom class mission-gallery
 $content .= '<div class="col-sm-12 clearfix">' . elgg_view_entity_list(array_slice($search_set, $offset, $max), array(
-	    'count' => $count,
-	    'offset' => $offset,
-	    'limit' => $max,
-	    'pagination' => true,
-	    'list_type' => $list_typing,
-	    'gallery_class' => $list_class,
-        'item_class'=>$item_class,
+		'count' => $count,
+		'offset' => $offset,
+		'limit' => $max,
+		'pagination' => true,
+		'list_type' => $list_typing,
+		'gallery_class' => $list_class,
+		'item_class'=>$item_class,
 		'missions_full_view' => false
 ), $offset, $max) . '</div>';
 

Spacing +19 added lines, -19 removed lines

@@ -16,7 +16,7 @@ 
 $advanced_form = elgg_get_sticky_values('advancedfill');
 $number_of_rows = elgg_get_plugin_setting('advanced_element_limit', 'missions');
 
-if($_SESSION[$search_typing . '_entities_per_page']) {
+if ($_SESSION[$search_typing . '_entities_per_page']) {
 	$entities_per_page = $_SESSION[$search_typing . '_entities_per_page'];
 }
 
@@ -38,7 +38,7 @@ 
 }
 
 $title = elgg_echo('missions:display_search_results');
-if($search_typing == 'candidate') {
+if ($search_typing == 'candidate') {
 	$title = elgg_echo('missions:display_find_results');
 }
 
@@ -48,7 +48,7 @@ 
 // Variables to help set up pagination
 $count = $_SESSION[$search_typing . '_count'];
 $offset = (int) get_input('offset', 0);
-if($entities_per_page) {
+if ($entities_per_page) {
 	$max = $entities_per_page;
 }
 else {
@@ -57,7 +57,7 @@ 
 
 // Calls a limited amount of missions for display
 $search_set = array();
-if(time() > ($_SESSION[$search_typing . '_search_set_timestamp'] + elgg_get_plugin_setting('mission_session_variable_timeout', 'missions')) 
+if (time() > ($_SESSION[$search_typing . '_search_set_timestamp'] + elgg_get_plugin_setting('mission_session_variable_timeout', 'missions')) 
 		&& $_SESSION[$search_typing . '_search_set_timestamp'] != '') {
 	system_message(elgg_echo('missions:last_results_have_expired'));
 	unset($_SESSION[$search_typing . '_search_set']);
@@ -70,7 +70,7 @@ 
 $list_typing = 'list';
 $list_class = '';
 $item_class = '';
-if($search_typing == 'mission') {
+if ($search_typing == 'mission') {
     $list_typing = 'gallery';
     $list_class = 'mission-gallery wb-eqht clearfix';
     $item_class = 'col-sm-4';
@@ -78,27 +78,27 @@ 
 
 // Function which sorts the search set according to a given value in ascending or descending order.
 $search_set = mm_sort_mission_decider($_SESSION['missions_sort_field_value'], $_SESSION['missions_order_field_value'], $search_set, $_SESSION['missions_type_field_value'], $_SESSION['missions_role_field_value']);
-$count = count($search_set);		// count the filtered list
-if ( $offset >= $count )			// reset offset if it no longer makes sense after filtering
+$count = count($search_set); // count the filtered list
+if ($offset >= $count)			// reset offset if it no longer makes sense after filtering
 	$offset = 0;
 
 $max_reached = '';
-if(($offset + $max) >= elgg_get_plugin_setting('search_limit', 'missions') && $count >= elgg_get_plugin_setting('search_limit', 'missions')) {
+if (($offset + $max) >= elgg_get_plugin_setting('search_limit', 'missions') && $count >= elgg_get_plugin_setting('search_limit', 'missions')) {
 	$max_reached = '<div class="col-sm-12" style="font-style:italic;">' . elgg_echo('missions:reached_maximum_entities') . '</div>';
 }
 
 $content = elgg_view_title($title);
 
-if($_SESSION['missions_from_skill_match']) {
+if ($_SESSION['missions_from_skill_match']) {
 	unset($_SESSION['missions_from_skill_match']);
 	$content .= '<div>' . elgg_echo('missions:placeholder_e') . '</div>';
 }
 
 $content .= elgg_view('page/elements/mission-tabs') . $max_reached;
 
-if ($search_form ) {
+if ($search_form) {
     
-	$content .= '<div style="clear:both">'.elgg_view_form('missions/search-simple').'</div>';
+	$content .= '<div style="clear:both">' . elgg_view_form('missions/search-simple') . '</div>';
 }
 
  $search_fields = array(
@@ -119,13 +119,13 @@ 
 	        elgg_echo('missions:program_area')
     );
 
-if ($advanced_form){
+if ($advanced_form) {
     
-    $content .='<div class="mrgn-bttm-sm"><strong>'.elgg_echo('missions:search_value').':</strong> ';
-	for ($s = 0; $s < $number_of_rows; $s ++) {
-        if ($advanced_form['selection_'.$s]){
+    $content .= '<div class="mrgn-bttm-sm"><strong>' . elgg_echo('missions:search_value') . ':</strong> ';
+	for ($s = 0; $s < $number_of_rows; $s++) {
+        if ($advanced_form['selection_' . $s]) {
 
-           $content .= '<span class="mrgn-rght-md"><strong>'.elgg_echo($advanced_form['selection_'.$s]).':</strong> '.elgg_echo($advanced_form['selection_'.$s.'_element']).' </span> ';
+           $content .= '<span class="mrgn-rght-md"><strong>' . elgg_echo($advanced_form['selection_' . $s]) . ':</strong> ' . elgg_echo($advanced_form['selection_' . $s . '_element']) . ' </span> ';
             
         }
     }
@@ -133,7 +133,7 @@ 
     $content .= "</div>";
         $content .= 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,
@@ -143,7 +143,7 @@ 
 $advanced_search_form = elgg_view_form('missions/advanced-search-form', array(
 		'class' => 'form-horizontal'
 ));
-$content .= '<br>'.elgg_view('page/elements/hidden-field', array(
+$content .= '<br>' . elgg_view('page/elements/hidden-field', array(
 		'toggle_text' => elgg_echo('missions:search:Refine'),
 		'toggle_text_hidden' => elgg_echo('close'),
 		'toggle_id' => 'advanced-search',
@@ -154,7 +154,7 @@ 
 }
 
 // Only displays sort form if the search set is missions.
-if($search_typing == 'mission') {
+if ($search_typing == 'mission') {
 	$content .= '<div class="col-sm-12 mrgn-tp-lg">' . $sort_missions_form . $clear_link . '</div>';
 }
 

Braces +5 added lines, -5 removed lines

@@ -50,8 +50,7 @@ 
 $offset = (int) get_input('offset', 0);
 if($entities_per_page) {
 	$max = $entities_per_page;
-}
-else {
+} else {
 	$max = elgg_get_plugin_setting('search_result_per_page', 'missions');
 }
 
@@ -62,8 +61,7 @@ 
 	system_message(elgg_echo('missions:last_results_have_expired'));
 	unset($_SESSION[$search_typing . '_search_set']);
 	unset($_SESSION[$search_typing . '_search_set_timestamp']);
-}
-else {
+} else {
 	$search_set = $_SESSION[$search_typing . '_search_set'];
 }
 
@@ -79,8 +77,10 @@ 
 // Function which sorts the search set according to a given value in ascending or descending order.
 $search_set = mm_sort_mission_decider($_SESSION['missions_sort_field_value'], $_SESSION['missions_order_field_value'], $search_set, $_SESSION['missions_type_field_value'], $_SESSION['missions_role_field_value']);
 $count = count($search_set);		// count the filtered list
-if ( $offset >= $count )			// reset offset if it no longer makes sense after filtering
+if ( $offset >= $count ) {
+	// reset offset if it no longer makes sense after filtering
 	$offset = 0;
+}
 
 $max_reached = '';
 if(($offset + $max) >= elgg_get_plugin_setting('search_limit', 'missions') && $count >= elgg_get_plugin_setting('search_limit', 'missions')) {

mod/missions/start.php

Indentation +166 added lines, -166 removed lines

@@ -24,108 +24,108 @@ 
 	elgg_register_js('missions_flot_navigation', 'mod/missions/vendors/flot_extra/jquery.flot.navigation.nrc.js');
 	elgg_register_js('missions_flot_time', 'mod/missions/vendors/flot_extra/jquery.flot.time.min.js');
 
-    // Register the custom library of methods for use in the plugin
-    elgg_register_library('elgg:missions', elgg_get_plugins_path() . 'missions/lib/missions.php');
-    elgg_register_library('elgg:missions-searching', elgg_get_plugins_path() . 'missions/lib/missions-searching.php');
-    elgg_register_library('elgg:missions-errors', elgg_get_plugins_path() . 'missions/lib/missions-errors.php');
-    elgg_register_library('elgg:missions-analytics', elgg_get_plugins_path() . 'missions/lib/missions-analytics.php');
-    elgg_load_library('elgg:missions');
-    elgg_load_library('elgg:missions-searching');
-    elgg_load_library('elgg:missions-errors');
-    elgg_load_library('elgg:missions-analytics');
+	// Register the custom library of methods for use in the plugin
+	elgg_register_library('elgg:missions', elgg_get_plugins_path() . 'missions/lib/missions.php');
+	elgg_register_library('elgg:missions-searching', elgg_get_plugins_path() . 'missions/lib/missions-searching.php');
+	elgg_register_library('elgg:missions-errors', elgg_get_plugins_path() . 'missions/lib/missions-errors.php');
+	elgg_register_library('elgg:missions-analytics', elgg_get_plugins_path() . 'missions/lib/missions-analytics.php');
+	elgg_load_library('elgg:missions');
+	elgg_load_library('elgg:missions-searching');
+	elgg_load_library('elgg:missions-errors');
+	elgg_load_library('elgg:missions-analytics');
 
    	elgg_load_library('elgg:missions-organization');
 
-    //Register to run unit tests
+	//Register to run unit tests
 	elgg_register_plugin_hook_handler('unit_test', 'system', 'missions_unit_tests');
 
-    // Register a handler for page navigation.
-    elgg_register_page_handler('missions', 'missions_main_page_handler');
+	// Register a handler for page navigation.
+	elgg_register_page_handler('missions', 'missions_main_page_handler');
 
-    // Extends the original ELGG CSS with our own
-    elgg_extend_view('css/elgg', 'css/all-mission-css');
+	// Extends the original ELGG CSS with our own
+	elgg_extend_view('css/elgg', 'css/all-mission-css');
 
-    // Register our action files found in missions/action/
-    elgg_register_action("missions/post-mission-first-form", elgg_get_plugins_path() . "missions/actions/missions/post-mission-first-form.php");
-    elgg_register_action("missions/post-mission-second-form", elgg_get_plugins_path() . "missions/actions/missions/post-mission-second-form.php");
-    elgg_register_action("missions/post-mission-third-form", elgg_get_plugins_path() . "missions/actions/missions/post-mission-third-form.php");
-    elgg_register_action("missions/delete-mission", elgg_get_plugins_path() . "missions/actions/missions/delete-mission.php");
-    elgg_register_action("missions/search-simple", elgg_get_plugins_path() . "missions/actions/missions/search-simple.php");
-    elgg_register_action("missions/advanced-search-form", elgg_get_plugins_path() . "missions/actions/missions/advanced-search-form.php");
-    elgg_register_action("missions/application-form", elgg_get_plugins_path() . "missions/actions/missions/application-form.php");
-    elgg_register_action("missions/remove-applicant", elgg_get_plugins_path() . "missions/actions/missions/remove-applicant.php");
-    elgg_register_action("missions/accept-invite", elgg_get_plugins_path() . "missions/actions/missions/accept-invite.php");
-    elgg_register_action("missions/decline-invite", elgg_get_plugins_path() . "missions/actions/missions/decline-invite.php");
-    elgg_register_action("missions/invite-user", elgg_get_plugins_path() . "missions/actions/missions/invite-user.php");
-    elgg_register_action("missions/change-mission-form", elgg_get_plugins_path() . "missions/actions/missions/change-mission-form.php");
-    elgg_register_action("missions/feedback-form", elgg_get_plugins_path() . "missions/actions/missions/feedback-form.php");
-    elgg_register_action("missions/complete-mission", elgg_get_plugins_path() . "missions/actions/missions/complete-mission.php");
-    elgg_register_action("missions/cancel-mission", elgg_get_plugins_path() . "missions/actions/missions/cancel-mission.php");
-    elgg_register_action("missions/reopen-mission", elgg_get_plugins_path() . "missions/actions/missions/reopen-mission.php");
-    elgg_register_action("missions/refine-my-missions-form", elgg_get_plugins_path() . "missions/actions/missions/refine-my-missions-form.php");
-    elgg_register_action("missions/wire-post", elgg_get_plugins_path() . "missions/actions/missions/wire-post.php");
-    elgg_register_action("missions/mission-offer", elgg_get_plugins_path() . "missions/actions/missions/mission-offer.php");
-    elgg_register_action("missions/duplicate-mission", elgg_get_plugins_path() . "missions/actions/missions/duplicate-mission.php");
-    elgg_register_action("missions/mission-invite-selector", elgg_get_plugins_path() . "missions/actions/missions/mission-invite-selector.php");
-    elgg_register_action("missions/change-entities-per-page", elgg_get_plugins_path() . "missions/actions/missions/change-entities-per-page.php");
-    elgg_register_action("missions/admin-form", elgg_get_plugins_path() . "missions/actions/missions/admin-form.php");
-    elgg_register_action("missions/endorse-user", elgg_get_plugins_path() . "missions/actions/missions/endorse-user.php");
-    elgg_register_action("missions/post-mission-skill-match", elgg_get_plugins_path() . "missions/actions/missions/post-mission-skill-match.php");
-    elgg_register_action("missions/pre-create-opportunity", elgg_get_plugins_path() . "missions/actions/missions/pre-create-opportunity.php");
-    elgg_register_action("missions/finalize-offer", elgg_get_plugins_path() . "missions/actions/missions/finalize-offer.php");
-    elgg_register_action("missions/message-user-form", elgg_get_plugins_path() . "missions/actions/missions/message-user-form.php");
-    elgg_register_action("missions/sort-missions-form", elgg_get_plugins_path() . "missions/actions/missions/sort-missions-form.php");
-    elgg_register_action("missions/opt-in-splash", elgg_get_plugins_path() . "missions/actions/missions/opt-in-splash.php");
+	// Register our action files found in missions/action/
+	elgg_register_action("missions/post-mission-first-form", elgg_get_plugins_path() . "missions/actions/missions/post-mission-first-form.php");
+	elgg_register_action("missions/post-mission-second-form", elgg_get_plugins_path() . "missions/actions/missions/post-mission-second-form.php");
+	elgg_register_action("missions/post-mission-third-form", elgg_get_plugins_path() . "missions/actions/missions/post-mission-third-form.php");
+	elgg_register_action("missions/delete-mission", elgg_get_plugins_path() . "missions/actions/missions/delete-mission.php");
+	elgg_register_action("missions/search-simple", elgg_get_plugins_path() . "missions/actions/missions/search-simple.php");
+	elgg_register_action("missions/advanced-search-form", elgg_get_plugins_path() . "missions/actions/missions/advanced-search-form.php");
+	elgg_register_action("missions/application-form", elgg_get_plugins_path() . "missions/actions/missions/application-form.php");
+	elgg_register_action("missions/remove-applicant", elgg_get_plugins_path() . "missions/actions/missions/remove-applicant.php");
+	elgg_register_action("missions/accept-invite", elgg_get_plugins_path() . "missions/actions/missions/accept-invite.php");
+	elgg_register_action("missions/decline-invite", elgg_get_plugins_path() . "missions/actions/missions/decline-invite.php");
+	elgg_register_action("missions/invite-user", elgg_get_plugins_path() . "missions/actions/missions/invite-user.php");
+	elgg_register_action("missions/change-mission-form", elgg_get_plugins_path() . "missions/actions/missions/change-mission-form.php");
+	elgg_register_action("missions/feedback-form", elgg_get_plugins_path() . "missions/actions/missions/feedback-form.php");
+	elgg_register_action("missions/complete-mission", elgg_get_plugins_path() . "missions/actions/missions/complete-mission.php");
+	elgg_register_action("missions/cancel-mission", elgg_get_plugins_path() . "missions/actions/missions/cancel-mission.php");
+	elgg_register_action("missions/reopen-mission", elgg_get_plugins_path() . "missions/actions/missions/reopen-mission.php");
+	elgg_register_action("missions/refine-my-missions-form", elgg_get_plugins_path() . "missions/actions/missions/refine-my-missions-form.php");
+	elgg_register_action("missions/wire-post", elgg_get_plugins_path() . "missions/actions/missions/wire-post.php");
+	elgg_register_action("missions/mission-offer", elgg_get_plugins_path() . "missions/actions/missions/mission-offer.php");
+	elgg_register_action("missions/duplicate-mission", elgg_get_plugins_path() . "missions/actions/missions/duplicate-mission.php");
+	elgg_register_action("missions/mission-invite-selector", elgg_get_plugins_path() . "missions/actions/missions/mission-invite-selector.php");
+	elgg_register_action("missions/change-entities-per-page", elgg_get_plugins_path() . "missions/actions/missions/change-entities-per-page.php");
+	elgg_register_action("missions/admin-form", elgg_get_plugins_path() . "missions/actions/missions/admin-form.php");
+	elgg_register_action("missions/endorse-user", elgg_get_plugins_path() . "missions/actions/missions/endorse-user.php");
+	elgg_register_action("missions/post-mission-skill-match", elgg_get_plugins_path() . "missions/actions/missions/post-mission-skill-match.php");
+	elgg_register_action("missions/pre-create-opportunity", elgg_get_plugins_path() . "missions/actions/missions/pre-create-opportunity.php");
+	elgg_register_action("missions/finalize-offer", elgg_get_plugins_path() . "missions/actions/missions/finalize-offer.php");
+	elgg_register_action("missions/message-user-form", elgg_get_plugins_path() . "missions/actions/missions/message-user-form.php");
+	elgg_register_action("missions/sort-missions-form", elgg_get_plugins_path() . "missions/actions/missions/sort-missions-form.php");
+	elgg_register_action("missions/opt-in-splash", elgg_get_plugins_path() . "missions/actions/missions/opt-in-splash.php");
 
-    // Register a new subtype of object for categorizing our mission object.
-    elgg_register_entity_type('object', 'mission');
-    elgg_register_entity_type('object', 'mission-feedback');
-    elgg_register_entity_type('object', 'mission-declination');
-    elgg_register_entity_type('object', 'mission-wasoffered');
-    elgg_register_entity_type('object', 'mission-inprogress');
-    elgg_register_entity_type('object', 'mission-posted');
-    elgg_register_entity_type('object', 'mission-cancelled');
-    elgg_register_entity_type('object', 'mission-completed');
+	// Register a new subtype of object for categorizing our mission object.
+	elgg_register_entity_type('object', 'mission');
+	elgg_register_entity_type('object', 'mission-feedback');
+	elgg_register_entity_type('object', 'mission-declination');
+	elgg_register_entity_type('object', 'mission-wasoffered');
+	elgg_register_entity_type('object', 'mission-inprogress');
+	elgg_register_entity_type('object', 'mission-posted');
+	elgg_register_entity_type('object', 'mission-cancelled');
+	elgg_register_entity_type('object', 'mission-completed');
 
-    // Register an ajax view for the advanced search page.
-    elgg_register_ajax_view('missions/element-select');
+	// Register an ajax view for the advanced search page.
+	elgg_register_ajax_view('missions/element-select');
     
-    // Register an ajax view for adding a skill input field.
-    elgg_register_ajax_view('missions/add-skill');
+	// Register an ajax view for adding a skill input field.
+	elgg_register_ajax_view('missions/add-skill');
 
-    // 
-    elgg_register_ajax_view('missions/analytics-inputs');
+	// 
+	elgg_register_ajax_view('missions/analytics-inputs');
     
-    // Register an ajax view for generating an analytics graph.
-    elgg_register_ajax_view('missions/analytics-generator');
+	// Register an ajax view for generating an analytics graph.
+	elgg_register_ajax_view('missions/analytics-generator');
     
-    // Register an ajax view for the opt in on splash
-    elgg_register_ajax_view('missions/opt_in_splash');
+	// Register an ajax view for the opt in on splash
+	elgg_register_ajax_view('missions/opt_in_splash');
     
-    //Hook which sets the url for object entities upon creation.
-    elgg_register_plugin_hook_handler('entity:url', 'object', 'mission_set_url');
+	//Hook which sets the url for object entities upon creation.
+	elgg_register_plugin_hook_handler('entity:url', 'object', 'mission_set_url');
     
-    // Hook which changes how user entities are displayed.
-    elgg_register_plugin_hook_handler('view', 'user/default', 'alter_mission_user_view');
+	// Hook which changes how user entities are displayed.
+	elgg_register_plugin_hook_handler('view', 'user/default', 'alter_mission_user_view');
     
-    // Changes the manager's owner block in the mission view.
-    elgg_register_plugin_hook_handler('view', 'page/elements/owner_block', 'alter_mission_owner_block');
+	// Changes the manager's owner block in the mission view.
+	elgg_register_plugin_hook_handler('view', 'page/elements/owner_block', 'alter_mission_owner_block');
 
-    // Adds a menu item to the site menu (top bar).
-    elgg_register_menu_item('site', array(
-    		'name' => 'mission_main',
-    		'href' => elgg_get_site_url() . 'missions/main',
-    		'text' => elgg_echo('missions:micromissions_menu')
-    ));
+	// Adds a menu item to the site menu (top bar).
+	elgg_register_menu_item('site', array(
+			'name' => 'mission_main',
+			'href' => elgg_get_site_url() . 'missions/main',
+			'text' => elgg_echo('missions:micromissions_menu')
+	));
     
-    // Adds a menu item to the admin page under the administer section in the right hand bar.
-    elgg_register_menu_item('page', array(
-    		'name' => 'mission_admin_tool',
-    		'href' => elgg_get_site_url() . 'admin/missions/main',
-    		'text' => elgg_echo('missions:admin_tool'),
-    		'section' => 'administer',
-    		'contexts' => array('admin')
-    ));
+	// Adds a menu item to the admin page under the administer section in the right hand bar.
+	elgg_register_menu_item('page', array(
+			'name' => 'mission_admin_tool',
+			'href' => elgg_get_site_url() . 'admin/missions/main',
+			'text' => elgg_echo('missions:admin_tool'),
+			'section' => 'administer',
+			'contexts' => array('admin')
+	));
 }
 
 /*
@@ -133,58 +133,58 @@ 
  */
 function missions_main_page_handler($segments)
 {
-    switch ($segments[0]) {
-        case 'main':
-            include elgg_get_plugins_path() . 'missions/pages/missions/main.php';
-            break;
-        case 'display-search-set':
-            include elgg_get_plugins_path() . 'missions/pages/missions/display-search-set.php';
-            break;
-        case 'mission-application':
-            include elgg_get_plugins_path() . 'missions/pages/missions/mission-application.php';
-            break;
-        case 'mission-edit':
-            include elgg_get_plugins_path() . 'missions/pages/missions/mission-edit.php';
-            break;
-        case 'view':
-        	include elgg_get_plugins_path() . 'missions/pages/missions/mission-view.php';
-            break;
-        case 'mission-feedback':
-            include elgg_get_plugins_path() . 'missions/pages/missions/mission-feedback.php';
-            break;
-        case 'message-share':
-            include elgg_get_plugins_path() . 'missions/pages/missions/message-share.php';
-            break;
-        case 'mission-post':
-          	include elgg_get_plugins_path() . 'missions/pages/missions/mission-post.php';
-            break;
-        case 'mission-candidate-search':
-            include elgg_get_plugins_path() . 'missions/pages/missions/mission-candidate-search.php';
-            break;
-        case 'mission-offer':
-        	include elgg_get_plugins_path() . 'missions/pages/missions/mission-offer.php';
-        	break;
-        case 'reason-to-decline':
-        	include elgg_get_plugins_path() . 'missions/pages/missions/reason-to-decline.php';
-        	break;
+	switch ($segments[0]) {
+		case 'main':
+			include elgg_get_plugins_path() . 'missions/pages/missions/main.php';
+			break;
+		case 'display-search-set':
+			include elgg_get_plugins_path() . 'missions/pages/missions/display-search-set.php';
+			break;
+		case 'mission-application':
+			include elgg_get_plugins_path() . 'missions/pages/missions/mission-application.php';
+			break;
+		case 'mission-edit':
+			include elgg_get_plugins_path() . 'missions/pages/missions/mission-edit.php';
+			break;
+		case 'view':
+			include elgg_get_plugins_path() . 'missions/pages/missions/mission-view.php';
+			break;
+		case 'mission-feedback':
+			include elgg_get_plugins_path() . 'missions/pages/missions/mission-feedback.php';
+			break;
+		case 'message-share':
+			include elgg_get_plugins_path() . 'missions/pages/missions/message-share.php';
+			break;
+		case 'mission-post':
+		  	include elgg_get_plugins_path() . 'missions/pages/missions/mission-post.php';
+			break;
+		case 'mission-candidate-search':
+			include elgg_get_plugins_path() . 'missions/pages/missions/mission-candidate-search.php';
+			break;
+		case 'mission-offer':
+			include elgg_get_plugins_path() . 'missions/pages/missions/mission-offer.php';
+			break;
+		case 'reason-to-decline':
+			include elgg_get_plugins_path() . 'missions/pages/missions/reason-to-decline.php';
+			break;
 
-        case 'api':
-            if (count($segments) >= 3) {
-                if ($segments[1] == 'v0') {
-                  include elgg_get_plugins_path() . 'missions/api/v0/export.php';
-                  $object_type = strtolower($segments[2]);
-                  if ($object_type == 'subtypes') {
-                    $export = new NRC\subtypeExport();
-                    $export->getJSON();
-                  } else {
-                    $subtype = ($object_type == 'user') ? false : $segments[3];
-                    $guid = ($object_type == 'user') ? $segments[3] : $segments[4];
-                    $export = new NRC\export($object_type, $subtype, $guid);
-                    $export->getJSON();
-                  }
-                }
-            }
-    }
+		case 'api':
+			if (count($segments) >= 3) {
+				if ($segments[1] == 'v0') {
+				  include elgg_get_plugins_path() . 'missions/api/v0/export.php';
+				  $object_type = strtolower($segments[2]);
+				  if ($object_type == 'subtypes') {
+					$export = new NRC\subtypeExport();
+					$export->getJSON();
+				  } else {
+					$subtype = ($object_type == 'user') ? false : $segments[3];
+					$guid = ($object_type == 'user') ? $segments[3] : $segments[4];
+					$export = new NRC\export($object_type, $subtype, $guid);
+					$export->getJSON();
+				  }
+				}
+			}
+	}
 }
 
 
@@ -215,42 +215,42 @@ 
 
 // Changes the view of the user entity if the context is 'mission'.
 function alter_mission_user_view($hook, $type, $returnvalue, $params) {
-    $current_uri = $_SERVER['REQUEST_URI'];
+	$current_uri = $_SERVER['REQUEST_URI'];
     
-    if(strpos($current_uri, 'missions') === false) {
-        return $returnvalue;
-    }
-    else {
-    	if(strpos($current_uri, 'missions/view') === false && 
-    			strpos($current_uri, 'missions/mission-invitation') === false && 
-    			strpos($current_uri, 'missions/mission-edit') === false && 
-    			strpos($current_uri, 'missions/mission-offer') === false) {
-        	return elgg_view('user/mission-candidate', array('user' => $params['vars']['entity']));
-    	}
-    	else {
-    		return $returnvalue;
-    	}
-    }
+	if(strpos($current_uri, 'missions') === false) {
+		return $returnvalue;
+	}
+	else {
+		if(strpos($current_uri, 'missions/view') === false && 
+				strpos($current_uri, 'missions/mission-invitation') === false && 
+				strpos($current_uri, 'missions/mission-edit') === false && 
+				strpos($current_uri, 'missions/mission-offer') === false) {
+			return elgg_view('user/mission-candidate', array('user' => $params['vars']['entity']));
+		}
+		else {
+			return $returnvalue;
+		}
+	}
 }
 
 // Changes the owner block for the mission entity view.
 function alter_mission_owner_block($hook, $type, $returnvalue, $params) {
-    $is_mission = $params['vars']['is_mission'];
-    if(!$is_mission) {
-        return $returnvalue;
-    }
-    else {
-        $owner = elgg_get_page_owner_entity();
+	$is_mission = $params['vars']['is_mission'];
+	if(!$is_mission) {
+		return $returnvalue;
+	}
+	else {
+		$owner = elgg_get_page_owner_entity();
         
-        if ($owner instanceof ElggGroup || ($owner instanceof ElggUser && $owner->getGUID() != elgg_get_logged_in_user_guid())) {
-            $header = '<h3>' . elgg_echo('missions:managed_by') . ':</h3>';
-            $header .= elgg_view_entity($owner, array('full_view' => false));
+		if ($owner instanceof ElggGroup || ($owner instanceof ElggUser && $owner->getGUID() != elgg_get_logged_in_user_guid())) {
+			$header = '<h3>' . elgg_echo('missions:managed_by') . ':</h3>';
+			$header .= elgg_view_entity($owner, array('full_view' => false));
             
-            return elgg_view('page/components/module', array(
-                'header' => $header,
-                'body' => '',
-                'class' => 'elgg-owner-block'
-            ));
-        }
-    }
+			return elgg_view('page/components/module', array(
+				'header' => $header,
+				'body' => '',
+				'class' => 'elgg-owner-block'
+			));
+		}
+	}
 }

Spacing +4 added lines, -4 removed lines

@@ -208,7 +208,7 @@ 
 
 function mission_set_url($hook, $type, $returnvalue, $params) {
 	$entity = $params['entity'];
-	if(elgg_instanceof($entity, 'object', 'mission')) {
+	if (elgg_instanceof($entity, 'object', 'mission')) {
 		return 'missions/view/' . $entity->guid;
 	}
 }
@@ -217,11 +217,11 @@ 
 function alter_mission_user_view($hook, $type, $returnvalue, $params) {
     $current_uri = $_SERVER['REQUEST_URI'];
     
-    if(strpos($current_uri, 'missions') === false) {
+    if (strpos($current_uri, 'missions') === false) {
         return $returnvalue;
     }
     else {
-    	if(strpos($current_uri, 'missions/view') === false && 
+    	if (strpos($current_uri, 'missions/view') === false && 
     			strpos($current_uri, 'missions/mission-invitation') === false && 
     			strpos($current_uri, 'missions/mission-edit') === false && 
     			strpos($current_uri, 'missions/mission-offer') === false) {
@@ -236,7 +236,7 @@ 
 // Changes the owner block for the mission entity view.
 function alter_mission_owner_block($hook, $type, $returnvalue, $params) {
     $is_mission = $params['vars']['is_mission'];
-    if(!$is_mission) {
+    if (!$is_mission) {
         return $returnvalue;
     }
     else {

Braces +3 added lines, -6 removed lines

@@ -219,15 +219,13 @@ 
     
     if(strpos($current_uri, 'missions') === false) {
         return $returnvalue;
-    }
-    else {
+    } else {
     	if(strpos($current_uri, 'missions/view') === false && 
     			strpos($current_uri, 'missions/mission-invitation') === false && 
     			strpos($current_uri, 'missions/mission-edit') === false && 
     			strpos($current_uri, 'missions/mission-offer') === false) {
         	return elgg_view('user/mission-candidate', array('user' => $params['vars']['entity']));
-    	}
-    	else {
+    	} else {
     		return $returnvalue;
     	}
     }
@@ -238,8 +236,7 @@ 
     $is_mission = $params['vars']['is_mission'];
     if(!$is_mission) {
         return $returnvalue;
-    }
-    else {
+    } else {
         $owner = elgg_get_page_owner_entity();
         
         if ($owner instanceof ElggGroup || ($owner instanceof ElggUser && $owner->getGUID() != elgg_get_logged_in_user_guid())) {

mod/missions/activate.php

Spacing +6 added lines, -6 removed lines

@@ -47,16 +47,16 @@ 
 $time_rate_string = 'missions:total' . ',' . 'missions:per_day' . ',' . 'missions:per_week' . ',' . 'missions:per_month';
 elgg_set_plugin_setting('time_rate_string', $time_rate_string, 'missions');
 
-$opportunity_role_string = 'missions:offering' . ',' .'missions:seeking';
+$opportunity_role_string = 'missions:offering' . ',' . 'missions:seeking';
 elgg_set_plugin_setting('opportunity_role_string', $opportunity_role_string, 'missions');
 
 /*$opportunity_type_string = 'missions:micro_mission' . ',' . 'missions:job_swap' . ',' . 'missions:mentoring' . ','
 		. 'missions:shadowing' . ',' . 'missions:peer_coaching' . ',' . 'missions:skill_sharing' . ','
 				. 'missions:job_sharing';*/
-$opportunity_type_string = 'missions:micro_mission' . ',' . 'missions:mentoring' . ',' . 'missions:job_swap' . ',' . 'missions:job_shadowing' .','. 'missions:assignment' .','. 'missions:deployment' .','. 'missions:job_rotation' .','. 'missions:skill_share' .','. 'missions:peer_coaching' .','. 'missions:job_share';
+$opportunity_type_string = 'missions:micro_mission' . ',' . 'missions:mentoring' . ',' . 'missions:job_swap' . ',' . 'missions:job_shadowing' . ',' . 'missions:assignment' . ',' . 'missions:deployment' . ',' . 'missions:job_rotation' . ',' . 'missions:skill_share' . ',' . 'missions:peer_coaching' . ',' . 'missions:job_share';
 elgg_set_plugin_setting('opportunity_type_string', $opportunity_type_string, 'missions');
 
-$opportunity_status_string = 'missions:posted' . ',' .'missions:completed' . ',' . 'missions:cancelled';
+$opportunity_status_string = 'missions:posted' . ',' . 'missions:completed' . ',' . 'missions:cancelled';
 elgg_set_plugin_setting('opportunity_status_string', $opportunity_status_string, 'missions');
 
 $province_string = ',' . 'missions:alberta' . ',' . 'missions:british_columbia' . ',' . 'missions:manitoba' . ','
@@ -72,10 +72,10 @@ 
 						. 'missions:client_service';
 elgg_set_plugin_setting('program_area_string', $program_area_string, 'missions');
 
-$decline_reason_string = ',' . 'missions:decline:workload' . ',' . 'missions:decline:interest' . ',' . 'missions:decline:engagement'  . ','
-		. 'missions:decline:approval'  . ',' . 'missions:other';
+$decline_reason_string = ',' . 'missions:decline:workload' . ',' . 'missions:decline:interest' . ',' . 'missions:decline:engagement' . ','
+		. 'missions:decline:approval' . ',' . 'missions:other';
 elgg_set_plugin_setting('decline_reason_string', $decline_reason_string, 'missions');
 
 //Nick - adding string for group classification
-$gl_group_string = ',' .'AC,AG,AI,AO,AR,AS,AU,BI,CH,CM,CO,CR,CS,CX,DA,DD,DE,DS,EC,ED,EG,EL,EN,EU,EX,FB,FI,FO,FR,FS,GL,GS,GT,HP,HR,HS,IS,LC,LI,LP,LS,MA,MD,MT,ND,NU,OE,OM,OP,PC,PE,PG,PH,PI,PM,PO,PR(NON-S),PR(S),PS,PY,RO,SC,SE,SG,SO,SR(C),SR(E),SR(W),ST,SW,TI,TR,UT,VM,WP,';
+$gl_group_string = ',' . 'AC,AG,AI,AO,AR,AS,AU,BI,CH,CM,CO,CR,CS,CX,DA,DD,DE,DS,EC,ED,EG,EL,EN,EU,EX,FB,FI,FO,FR,FS,GL,GS,GT,HP,HR,HS,IS,LC,LI,LP,LS,MA,MD,MT,ND,NU,OE,OM,OP,PC,PE,PG,PH,PI,PM,PO,PR(NON-S),PR(S),PS,PY,RO,SC,SE,SG,SO,SR(C),SR(E),SR(W),ST,SW,TI,TR,UT,VM,WP,';
 elgg_set_plugin_setting('gl_group_string', $gl_group_string, 'missions');

mod/missions/views/default/page/elements/language-dropdown-single.php

Indentation +17 added lines, -17 removed lines

@@ -18,30 +18,30 @@
 $language_oral_proficiency = get_input('ilop');
 
 if (elgg_is_sticky_form('lsdropfill')) {
-    extract(elgg_get_sticky_values('lsdropfill'));
-    // elgg_clear_sticky_form('thirdfill');
+	extract(elgg_get_sticky_values('lsdropfill'));
+	// elgg_clear_sticky_form('thirdfill');
 }
 
 $input_written_comprehension = elgg_view('input/dropdown', array(
-    'name' => 'lwc',
-    'value' => $language_written_comprehension,
-    'options' => $array,
-    'class' => 'language-dropdown',
-    'id' => 'single-language-written-comprehension-dropdown-input'
+	'name' => 'lwc',
+	'value' => $language_written_comprehension,
+	'options' => $array,
+	'class' => 'language-dropdown',
+	'id' => 'single-language-written-comprehension-dropdown-input'
 ));
 $input_written_expression = elgg_view('input/dropdown', array(
-    'name' => 'lwe',
-    'value' => $language_written_expression,
-    'options' => $array,
-    'class' => 'language-dropdown',
-    'id' => 'single-language-written-expression-dropdown-input'
+	'name' => 'lwe',
+	'value' => $language_written_expression,
+	'options' => $array,
+	'class' => 'language-dropdown',
+	'id' => 'single-language-written-expression-dropdown-input'
 ));
 $input_oral_proficiency = elgg_view('input/dropdown', array(
-    'name' => 'lop',
-    'value' => $language_oral_proficiency,
-    'options' => $array,
-    'class' => 'language-dropdown',
-    'id' => 'single-language-oral-proficiency-dropdown-input'
+	'name' => 'lop',
+	'value' => $language_oral_proficiency,
+	'options' => $array,
+	'class' => 'language-dropdown',
+	'id' => 'single-language-oral-proficiency-dropdown-input'
 ));
 ?>
 

Spacing +3 added lines, -3 removed lines

@@ -47,7 +47,7 @@ 
 
 <table class="mission-post-table-two">
 	<tr>
-		<td class="mission-post-table-lefty"><label for='single-language-written-comprehension-dropdown-input'><?php echo elgg_echo('missions:written_comprehension') . ':';?></label><br />
+		<td class="mission-post-table-lefty"><label for='single-language-written-comprehension-dropdown-input'><?php echo elgg_echo('missions:written_comprehension') . ':'; ?></label><br />
 		</td>
 		<td class="mission-post-table-center">
 			<div>
@@ -56,7 +56,7 @@ 
 		</td>
 	</tr>
 	<tr>
-		<td class="mission-post-table-lefty"><label for='single-language-written-expression-dropdown-input'><?php echo elgg_echo('missions:written_expression') . ':';?></label><br />
+		<td class="mission-post-table-lefty"><label for='single-language-written-expression-dropdown-input'><?php echo elgg_echo('missions:written_expression') . ':'; ?></label><br />
 		</td>
 		<td class="mission-post-table-center">
 			<div>
@@ -65,7 +65,7 @@ 
 		</td>
 	</tr>
 	<tr>
-		<td class="mission-post-table-lefty"><label for='single-language-oral-proficiency-dropdown-input'><?php echo elgg_echo('missions:oral_proficiency') . ':';?></label><br />
+		<td class="mission-post-table-lefty"><label for='single-language-oral-proficiency-dropdown-input'><?php echo elgg_echo('missions:oral_proficiency') . ':'; ?></label><br />
 		</td>
 		<td class="mission-post-table-center">
 			<div>

mod/missions/views/default/page/elements/related-candidates.php

Spacing +13 added lines, -13 removed lines

@@ -32,8 +32,8 @@ 
 	if ($applicant_relation->relationship == 'mission_accepted') {
 		$accepted .= '<div class="col-sm-12" style="display:inline-block;" name="mission-participant" id="mission-participant-' . $applicant_relation->guid_two . '">' . elgg_view_entity(get_user($applicant_relation->guid_two)) . '</div>';
 
-		if($mission->state == 'posted') {
-			if(elgg_get_logged_in_user_guid() == $mission->owner_guid || elgg_get_logged_in_user_guid() == $mission->account) {
+		if ($mission->state == 'posted') {
+			if (elgg_get_logged_in_user_guid() == $mission->owner_guid || elgg_get_logged_in_user_guid() == $mission->account) {
 				// Removal button for the candidate.
 				$accepted .= '<div class="col-sm-12">' . elgg_view('output/url', array(
 						'href' => elgg_get_site_url() . 'action/missions/remove-applicant?aid=' . $applicant_relation->guid_two . '&mid=' . $mission->guid,
@@ -49,11 +49,11 @@ 
 		else {
 			$accepted .= '<div class="col-sm-4">';
 			
-			if(elgg_get_logged_in_user_guid() == $mission->owner_guid || elgg_get_logged_in_user_guid() == $mission->account) {
+			if (elgg_get_logged_in_user_guid() == $mission->owner_guid || elgg_get_logged_in_user_guid() == $mission->account) {
 				$owner = $mission->owner_guid;
 				$target = $applicant_relation->guid_two;
 			}
-			else if(elgg_get_logged_in_user_guid() == $applicant_relation->guid_two) {
+			else if (elgg_get_logged_in_user_guid() == $applicant_relation->guid_two) {
 				$owner = $applicant_relation->guid_two;
 				$target = $mission->owner_guid;
 			}
@@ -69,10 +69,10 @@ 
 					)
 			));
 			
-			if(elgg_get_logged_in_user_guid() == $mission->owner_guid || elgg_get_logged_in_user_guid() == $mission->account 
+			if (elgg_get_logged_in_user_guid() == $mission->owner_guid || elgg_get_logged_in_user_guid() == $mission->account 
 					|| elgg_get_logged_in_user_guid() == $applicant_relation->guid_two) {
-				if(count($feedback_search)) {
-					if($feedback_search[0]->endorsement != 'on') {
+				if (count($feedback_search)) {
+					if ($feedback_search[0]->endorsement != 'on') {
 						$accepted .= elgg_view('output/url', array(
 								'href' => elgg_get_site_url() . 'action/missions/endorse-user?fid=' . $feedback_search[0]->guid,
 								'text' => elgg_echo('missions:endorse'),
@@ -102,12 +102,12 @@ 
 	}
 	// Candidates which have been sent an invitation to the mission.
 	if ($applicant_relation->relationship == 'mission_applied' || $applicant_relation->relationship == 'mission_offered') {
-		if($mission->state == 'posted') {
-			if(elgg_get_logged_in_user_guid() == $mission->owner_guid || elgg_get_logged_in_user_guid() == $mission->account 
+		if ($mission->state == 'posted') {
+			if (elgg_get_logged_in_user_guid() == $mission->owner_guid || elgg_get_logged_in_user_guid() == $mission->account 
 					|| elgg_get_logged_in_user_guid() == $applicant_relation->guid_two || elgg_is_admin_logged_in()) {
 				$tentative .= '<div class="col-sm-12" style="display:inline-block;" name="mission-applicant" id="mission-applicant-' . $applicant_relation->guid_two . '">' . elgg_view_entity(get_user($applicant_relation->guid_two)) . '</div>';
 			
-				if(elgg_get_logged_in_user_guid() == $mission->owner_guid || elgg_get_logged_in_user_guid() == $mission->account || elgg_is_admin_logged_in()) {
+				if (elgg_get_logged_in_user_guid() == $mission->owner_guid || elgg_get_logged_in_user_guid() == $mission->account || elgg_is_admin_logged_in()) {
 					$tentative .= '<div class="col-sm-12">';
 					$tentative .= mm_offer_button($mission, get_user($applicant_relation->guid_two));
 					
@@ -132,15 +132,15 @@ 
 	}
 }
 // Display something if there are no applicants.
-if($applicants_none_accepted) {
+if ($applicants_none_accepted) {
 	$accepted .= '<div name="no-accepted-candidate" class="col-sm-12">' . elgg_echo('missions:nobody') . '</div>';
 }
-if($applicants_none_tentative && $applicant_count == 0) {
+if ($applicants_none_tentative && $applicant_count == 0) {
 	$tentative .= '<div name="no-tentative-candidate" class="col-sm-12">' . elgg_echo('missions:nobody') . '</div>';
 }
 else {
 	$s_or_not = '';
-	if($applicant_count > 1) {
+	if ($applicant_count > 1) {
 		$s_or_not = 's';
 	}
 	

Braces +4 added lines, -8 removed lines

@@ -45,15 +45,13 @@ 
 						'confirm' => elgg_echo('missions:placeholder_i')
 				)) . '</div>';
 			}
-		}
-		else {
+		} else {
 			$accepted .= '<div class="col-sm-4">';
 			
 			if(elgg_get_logged_in_user_guid() == $mission->owner_guid || elgg_get_logged_in_user_guid() == $mission->account) {
 				$owner = $mission->owner_guid;
 				$target = $applicant_relation->guid_two;
-			}
-			else if(elgg_get_logged_in_user_guid() == $applicant_relation->guid_two) {
+			} else if(elgg_get_logged_in_user_guid() == $applicant_relation->guid_two) {
 				$owner = $applicant_relation->guid_two;
 				$target = $mission->owner_guid;
 			}
@@ -82,8 +80,7 @@ 
 								'id' => 'fill-mission-applicant-' . $applicant_relation->guid_two . '-endorse-button'
 						));
 					}
-				}
-				else {
+				} else {
 					$accepted .= elgg_view('output/url', array(
 							'href' => elgg_get_site_url() . 'missions/mission-feedback/' . $mission->guid,
 							'text' => elgg_echo('missions:feedback'),
@@ -137,8 +134,7 @@ 
 }
 if($applicants_none_tentative && $applicant_count == 0) {
 	$tentative .= '<div name="no-tentative-candidate" class="col-sm-12">' . elgg_echo('missions:nobody') . '</div>';
-}
-else {
+} else {
 	$s_or_not = '';
 	if($applicant_count > 1) {
 		$s_or_not = 's';

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

Indentation +2 added lines, -2 removed lines

@@ -56,8 +56,8 @@
 		'limit' => $max,
 		'pagination' => true,
 		'list_type' => 'gallery',
-        'gallery_class'=>'wb-eqht',
-        'item_class'=>'col-sm-6 col-md-4 ',
+		'gallery_class'=>'wb-eqht',
+		'item_class'=>'col-sm-6 col-md-4 ',
 
 		'mission_full_view' => false
 ), $offset, $max) . '</div>';

Spacing +5 added lines, -5 removed lines

@@ -11,7 +11,7 @@ 
  * Page content related to the user's missions. 
  */
 $user = elgg_get_logged_in_user_entity();
-if($_SESSION['mission_entities_per_page']) {
+if ($_SESSION['mission_entities_per_page']) {
 	$entities_per_page = $_SESSION['mission_entities_per_page'];
 }
 
@@ -30,9 +30,9 @@ 
 $entity_list = array_merge($temp_array_one, $temp_array_two);
 $entity_list_original = $entity_list;
 
-if(!$user->show_closed_missions) {
-	foreach($entity_list as $key => $entity) {
-		if($entity->state == 'completed' || $entity->state == 'cancelled') {
+if (!$user->show_closed_missions) {
+	foreach ($entity_list as $key => $entity) {
+		if ($entity->state == 'completed' || $entity->state == 'cancelled') {
 			unset($entity_list[$key]);
 		}
 	}
@@ -42,7 +42,7 @@ 
 
 $count = count($entity_list);
 $offset = (int) get_input('offset', 0);
-if($entities_per_page) {
+if ($entities_per_page) {
 	$max = $entities_per_page;
 }
 else {

Braces +1 added lines, -2 removed lines

@@ -44,8 +44,7 @@
 $offset = (int) get_input('offset', 0);
 if($entities_per_page) {
 	$max = $entities_per_page;
-}
-else {
+} else {
 	$max = elgg_get_plugin_setting('search_result_per_page', 'missions');
 }
 

mod/missions/views/default/page/elements/edit_opt-in.php

Indentation +137 added lines, -137 removed lines

@@ -23,7 +23,7 @@ 
 			'class' => 'gcconnex-opt-in-access' 
 	);
 	//echo elgg_view ( 'input/access', $params );
-    echo elgg_view('input/hidden', $params);
+	echo elgg_view('input/hidden', $params);
 	
 	// Decides whether or not the checkbox should start checked.
 	
@@ -42,27 +42,27 @@ 
                 <ul class="brdr-lft clearfix mrgn-lft-md list-unstyled">
                 <li class="clearfix pull-left mrgn-lft-md">
                 <?php
-                	echo elgg_view ( "input/checkbox", array (
-			         'name' => 'mission_check',
-			         'checked' => true,
-			         'id' => 'gcconnex-opt-in-mission-check',
-                        'class'=>'pull-left',
-                        'label'=>elgg_echo ( 'gcconnex_profile:opt:participants' ),
-	               ));
+					echo elgg_view ( "input/checkbox", array (
+					 'name' => 'mission_check',
+					 'checked' => true,
+					 'id' => 'gcconnex-opt-in-mission-check',
+						'class'=>'pull-left',
+						'label'=>elgg_echo ( 'gcconnex_profile:opt:participants' ),
+				   ));
                     
-                ?>
+				?>
                 </li>
                     <li class="clearfix pull-left mrgn-lft-md">
                 <?php
-                	echo elgg_view ( "input/checkbox", array (
-			         'name' => 'missioncreate_check',
-			         'checked' => true,
-			         'id' => 'gcconnex-opt-in-mentoringcreater-check',
-                        'class'=>'pull-left',
-                        'label'=>elgg_echo ( 'gcconnex_profile:opt:host' ),
-	               ));
+					echo elgg_view ( "input/checkbox", array (
+					 'name' => 'missioncreate_check',
+					 'checked' => true,
+					 'id' => 'gcconnex-opt-in-mentoringcreater-check',
+						'class'=>'pull-left',
+						'label'=>elgg_echo ( 'gcconnex_profile:opt:host' ),
+				   ));
                     
-                ?>
+				?>
                 </li>
                 </ul>
             </li>
@@ -73,27 +73,27 @@ 
                 <ul class="clearfix brdr-lft mrgn-lft-md list-unstyled">
                    <li class="clearfix pull-left mrgn-lft-md">
                 <?php
-                	echo elgg_view ( "input/checkbox", array (
-			         'name' => 'assignseek_check',
-			         'checked' => true,
-			         'id' => 'gcconnex-opt-in-swap-check',
-                        'class'=>'pull-left',
-                        'label'=>elgg_echo ( 'gcconnex_profile:opt:participants' ),
-	               ));
+					echo elgg_view ( "input/checkbox", array (
+					 'name' => 'assignseek_check',
+					 'checked' => true,
+					 'id' => 'gcconnex-opt-in-swap-check',
+						'class'=>'pull-left',
+						'label'=>elgg_echo ( 'gcconnex_profile:opt:participants' ),
+				   ));
                     
-                ?>
+				?>
                     </li> 
                     <li class="clearfix pull-left mrgn-lft-md">
                 <?php
-                	echo elgg_view ( "input/checkbox", array (
-			         'name' => 'assigncreate_check',
-			         'checked' => true,
-			         'id' => 'gcconnex-opt-in-swap-check',
-                        'class'=>'pull-left',
-                        'label'=>elgg_echo ( 'gcconnex_profile:opt:host' ),
-	               ));
+					echo elgg_view ( "input/checkbox", array (
+					 'name' => 'assigncreate_check',
+					 'checked' => true,
+					 'id' => 'gcconnex-opt-in-swap-check',
+						'class'=>'pull-left',
+						'label'=>elgg_echo ( 'gcconnex_profile:opt:host' ),
+				   ));
                     
-                ?>
+				?>
                     </li> 
                 </ul>
             </li>
@@ -104,55 +104,55 @@ 
                 <ul class="clearfix brdr-lft mrgn-lft-md list-unstyled">
                    <li class="clearfix pull-left mrgn-lft-md">
                 <?php
-                	echo elgg_view ( "input/checkbox", array (
-			         'name' => 'deploymentseek_check',
-			         'checked' => true,
-			         'id' => 'gcconnex-opt-in-swap-check',
-                        'class'=>'pull-left',
-                        'label'=>elgg_echo ( 'gcconnex_profile:opt:participants' ),
-	               ));
+					echo elgg_view ( "input/checkbox", array (
+					 'name' => 'deploymentseek_check',
+					 'checked' => true,
+					 'id' => 'gcconnex-opt-in-swap-check',
+						'class'=>'pull-left',
+						'label'=>elgg_echo ( 'gcconnex_profile:opt:participants' ),
+				   ));
                     
-                ?>
+				?>
                     </li> 
                     <li class="clearfix pull-left mrgn-lft-md">
                 <?php
-                	echo elgg_view ( "input/checkbox", array (
-			         'name' => 'deploymentcreate_check',
-			         'checked' => true,
-			         'id' => 'gcconnex-opt-in-swap-check',
-                        'class'=>'pull-left',
-                        'label'=>elgg_echo ( 'gcconnex_profile:opt:host' ),
-	               ));
+					echo elgg_view ( "input/checkbox", array (
+					 'name' => 'deploymentcreate_check',
+					 'checked' => true,
+					 'id' => 'gcconnex-opt-in-swap-check',
+						'class'=>'pull-left',
+						'label'=>elgg_echo ( 'gcconnex_profile:opt:host' ),
+				   ));
                     
-                ?>
+				?>
                     </li> 
                 </ul>
             </li>
             
             <li class="clearfix">
                 <?php
-                	echo elgg_view ( "input/checkbox", array (
-			         'name' => 'swap_check',
-			         'checked' => true,
-			         'id' => 'gcconnex-opt-in-swap-check',
-                        'class'=>'pull-left',
-                        'label'=>elgg_echo ( 'gcconnex_profile:opt:job_swap' ),
-	               ));
+					echo elgg_view ( "input/checkbox", array (
+					 'name' => 'swap_check',
+					 'checked' => true,
+					 'id' => 'gcconnex-opt-in-swap-check',
+						'class'=>'pull-left',
+						'label'=>elgg_echo ( 'gcconnex_profile:opt:job_swap' ),
+				   ));
                     
-                ?>
+				?>
             </li>
             
             <li class="clearfix">
                 <?php
-                	echo elgg_view ( "input/checkbox", array (
-			         'name' => 'rotation_check',
-			         'checked' => true,
-			         'id' => 'gcconnex-opt-in-swap-check',
-                        'class'=>'pull-left',
-                        'label'=>elgg_echo ( 'missions:job_rotation' ),
-	               ));
+					echo elgg_view ( "input/checkbox", array (
+					 'name' => 'rotation_check',
+					 'checked' => true,
+					 'id' => 'gcconnex-opt-in-swap-check',
+						'class'=>'pull-left',
+						'label'=>elgg_echo ( 'missions:job_rotation' ),
+				   ));
                     
-                ?>
+				?>
             </li>
             
             
@@ -170,28 +170,28 @@ 
                 <ul class="clearfix brdr-lft mrgn-lft-md list-unstyled">
                 <li class="clearfix pull-left mrgn-lft-md">
                 <?php
-                	echo elgg_view ( "input/checkbox", array (
-			         'name' => 'mentored_check',
-			         'checked' => true,
-			         'id' => 'gcconnex-opt-in-mentoring-check',
-                        'class'=>'pull-left',
-                        'label'=>elgg_echo ( 'gcconnex_profile:opt:mentored' ),
-	               ));
+					echo elgg_view ( "input/checkbox", array (
+					 'name' => 'mentored_check',
+					 'checked' => true,
+					 'id' => 'gcconnex-opt-in-mentoring-check',
+						'class'=>'pull-left',
+						'label'=>elgg_echo ( 'gcconnex_profile:opt:mentored' ),
+				   ));
                     
-                ?>
+				?>
             </li>
             
             <li class="clearfix pull-left mrgn-lft-md">
                 <?php
-                	echo elgg_view ( "input/checkbox", array (
-                        'name' => 'mentoring_check',
-			         'checked' => true,
-			         'id' => 'gcconnex-opt-in-mentored-check',
-                        'class'=>'pull-left',
-                        'label'=>elgg_echo ( 'gcconnex_profile:opt:mentoring' ),
-	               ));
+					echo elgg_view ( "input/checkbox", array (
+						'name' => 'mentoring_check',
+					 'checked' => true,
+					 'id' => 'gcconnex-opt-in-mentored-check',
+						'class'=>'pull-left',
+						'label'=>elgg_echo ( 'gcconnex_profile:opt:mentoring' ),
+				   ));
                     
-                ?>
+				?>
             </li>
                 </ul>
             </li>
@@ -202,28 +202,28 @@ 
                 <ul class="clearfix brdr-lft mrgn-lft-md list-unstyled">
                 <li class="clearfix pull-left mrgn-lft-md">
                 <?php
-                	echo elgg_view ( "input/checkbox", array (
-			         'name' => 'shadowing_check',
-			         'checked' => true,
-			         'id' => 'gcconnex-opt-in-shadowing-check',
-                        'class'=>'pull-left',
-                        'label'=>elgg_echo ( 'gcconnex_profile:opt:participants' ),
-	               ));
+					echo elgg_view ( "input/checkbox", array (
+					 'name' => 'shadowing_check',
+					 'checked' => true,
+					 'id' => 'gcconnex-opt-in-shadowing-check',
+						'class'=>'pull-left',
+						'label'=>elgg_echo ( 'gcconnex_profile:opt:participants' ),
+				   ));
                     
-                ?>
+				?>
                 </li>
             
                 <li class="clearfix pull-left mrgn-lft-md">
                 <?php
-                	echo elgg_view ( "input/checkbox", array (
-			         'name' => 'shadowed_check',
-			         'checked' => true,
-			         'id' => 'gcconnex-opt-in-shadowed-check',
-                        'class'=>'pull-left',
-                        'label'=>elgg_echo ( 'gcconnex_profile:opt:host' ),
-	               ));
+					echo elgg_view ( "input/checkbox", array (
+					 'name' => 'shadowed_check',
+					 'checked' => true,
+					 'id' => 'gcconnex-opt-in-shadowed-check',
+						'class'=>'pull-left',
+						'label'=>elgg_echo ( 'gcconnex_profile:opt:host' ),
+				   ));
                     
-                ?>
+				?>
                 </li>
                 </ul>
             </li>
@@ -235,28 +235,28 @@ 
                 <ul class="brdr-lft clearfix mrgn-lft-md list-unstyled">
                 <li class="clearfix pull-left mrgn-lft-md">
                 <?php
-                	echo elgg_view ( "input/checkbox", array (
-			         'name' => 'skillseeker_check',
-			         'checked' => true,
-			         'id' => 'gcconnex-opt-in-shadowing-check',
-                        'class'=>'pull-left',
-                        'label'=>elgg_echo ( 'gcconnex_profile:opt:participants' ),
-	               ));
+					echo elgg_view ( "input/checkbox", array (
+					 'name' => 'skillseeker_check',
+					 'checked' => true,
+					 'id' => 'gcconnex-opt-in-shadowing-check',
+						'class'=>'pull-left',
+						'label'=>elgg_echo ( 'gcconnex_profile:opt:participants' ),
+				   ));
                     
-                ?>
+				?>
                 </li>
             
             <li class="clearfix pull-left mrgn-lft-md">
                 <?php
-                	echo elgg_view ( "input/checkbox", array (
-			         'name' => 'skillcreator_check',
-			         'checked' => true,
-			         'id' => 'gcconnex-opt-in-shadowing-check',
-                        'class'=>'pull-left',
-                        'label'=>elgg_echo ( 'gcconnex_profile:opt:host' ),
-	               ));
+					echo elgg_view ( "input/checkbox", array (
+					 'name' => 'skillcreator_check',
+					 'checked' => true,
+					 'id' => 'gcconnex-opt-in-shadowing-check',
+						'class'=>'pull-left',
+						'label'=>elgg_echo ( 'gcconnex_profile:opt:host' ),
+				   ));
                     
-                ?>
+				?>
             </li>
                 </ul>
             </li>
@@ -268,42 +268,42 @@ 
                 <ul class="clearfix brdr-lft mrgn-lft-md list-unstyled">
                     <li class="clearfix pull-left mrgn-lft-md">
                 <?php
-                	echo elgg_view ( "input/checkbox", array (
-			         'name' => 'coachseek_check',
-			         'checked' => true,
-			         'id' => 'gcconnex-opt-in-seekCoach-check',
-                        'class'=>'pull-left',
-                        'label'=>elgg_echo ( 'gcconnex_profile:opt:participants' ),
-	               ));
+					echo elgg_view ( "input/checkbox", array (
+					 'name' => 'coachseek_check',
+					 'checked' => true,
+					 'id' => 'gcconnex-opt-in-seekCoach-check',
+						'class'=>'pull-left',
+						'label'=>elgg_echo ( 'gcconnex_profile:opt:participants' ),
+				   ));
                     
-                ?>
+				?>
                     </li>
                     <li class="clearfix pull-left mrgn-lft-md">
                         <?php
-                	       echo elgg_view ( "input/checkbox", array (
-			             'name' => 'coachcreate_check',
-			         'checked' => true,
-			         'id' => 'gcconnex-opt-in-becomeCoach-check',
-                        'class'=>'pull-left',
-                        'label'=>elgg_echo ( 'gcconnex_profile:opt:host' ),
-	                   ));
+						   echo elgg_view ( "input/checkbox", array (
+						 'name' => 'coachcreate_check',
+					 'checked' => true,
+					 'id' => 'gcconnex-opt-in-becomeCoach-check',
+						'class'=>'pull-left',
+						'label'=>elgg_echo ( 'gcconnex_profile:opt:host' ),
+					   ));
                     
-                        ?>
+						?>
                     </li>
                 </ul>
             </li>
             
             <li class="clearfix">
                 <?php
-                	echo elgg_view ( "input/checkbox", array (
-			         'name' => 'jobshare_check',
-			         'checked' => true,
-			         'id' => 'gcconnex-opt-in-shadowing-check',
-                        'class'=>'pull-left',
-                        'label'=>elgg_echo ( 'missions:job_share' ),
-	               ));
+					echo elgg_view ( "input/checkbox", array (
+					 'name' => 'jobshare_check',
+					 'checked' => true,
+					 'id' => 'gcconnex-opt-in-shadowing-check',
+						'class'=>'pull-left',
+						'label'=>elgg_echo ( 'missions:job_share' ),
+				   ));
                     
-                ?>
+				?>
             </li>
             
         </ul>

Spacing +43 added lines, -43 removed lines

@@ -14,10 +14,10 @@ 
 if (elgg_is_xhr) {
 	
 	$user_guid = elgg_get_logged_in_user_guid();
-	$user = get_user ( $user_guid );
+	$user = get_user($user_guid);
 	
 	$access_id = $user->optaccess;
-	$params = array (
+	$params = array(
 			'name' => "accesslevel['optaccess']",
 			'value' => '-2',
 			'class' => 'gcconnex-opt-in-access' 
@@ -38,28 +38,28 @@ 
         <h4 class="mrgn-tp-0"><?php echo elgg_echo('gcconnex_profile:opt:atlevel'); ?></h4>
         <ul class="list-unstyled">
             <li class="clearfix">
-                <?php echo elgg_echo ( 'missions:micro_mission' );?>
+                <?php echo elgg_echo('missions:micro_mission'); ?>
                 <ul class="brdr-lft clearfix mrgn-lft-md list-unstyled">
                 <li class="clearfix pull-left mrgn-lft-md">
                 <?php
-                	echo elgg_view ( "input/checkbox", array (
+                	echo elgg_view("input/checkbox", array(
 			         'name' => 'mission_check',
 			         'checked' => true,
 			         'id' => 'gcconnex-opt-in-mission-check',
                         'class'=>'pull-left',
-                        'label'=>elgg_echo ( 'gcconnex_profile:opt:participants' ),
+                        'label'=>elgg_echo('gcconnex_profile:opt:participants'),
 	               ));
                     
                 ?>
                 </li>
                     <li class="clearfix pull-left mrgn-lft-md">
                 <?php
-                	echo elgg_view ( "input/checkbox", array (
+                	echo elgg_view("input/checkbox", array(
 			         'name' => 'missioncreate_check',
 			         'checked' => true,
 			         'id' => 'gcconnex-opt-in-mentoringcreater-check',
                         'class'=>'pull-left',
-                        'label'=>elgg_echo ( 'gcconnex_profile:opt:host' ),
+                        'label'=>elgg_echo('gcconnex_profile:opt:host'),
 	               ));
                     
                 ?>
@@ -68,29 +68,29 @@ 
             </li>
             
             <li class="clearfix">
-                <?php echo elgg_echo('missions:assignment');?>
+                <?php echo elgg_echo('missions:assignment'); ?>
                 
                 <ul class="clearfix brdr-lft mrgn-lft-md list-unstyled">
                    <li class="clearfix pull-left mrgn-lft-md">
                 <?php
-                	echo elgg_view ( "input/checkbox", array (
+                	echo elgg_view("input/checkbox", array(
 			         'name' => 'assignseek_check',
 			         'checked' => true,
 			         'id' => 'gcconnex-opt-in-swap-check',
                         'class'=>'pull-left',
-                        'label'=>elgg_echo ( 'gcconnex_profile:opt:participants' ),
+                        'label'=>elgg_echo('gcconnex_profile:opt:participants'),
 	               ));
                     
                 ?>
                     </li> 
                     <li class="clearfix pull-left mrgn-lft-md">
                 <?php
-                	echo elgg_view ( "input/checkbox", array (
+                	echo elgg_view("input/checkbox", array(
 			         'name' => 'assigncreate_check',
 			         'checked' => true,
 			         'id' => 'gcconnex-opt-in-swap-check',
                         'class'=>'pull-left',
-                        'label'=>elgg_echo ( 'gcconnex_profile:opt:host' ),
+                        'label'=>elgg_echo('gcconnex_profile:opt:host'),
 	               ));
                     
                 ?>
@@ -99,29 +99,29 @@ 
             </li>
             
             <li class="clearfix">
-                <?php echo elgg_echo('missions:deployment');?>
+                <?php echo elgg_echo('missions:deployment'); ?>
                 
                 <ul class="clearfix brdr-lft mrgn-lft-md list-unstyled">
                    <li class="clearfix pull-left mrgn-lft-md">
                 <?php
-                	echo elgg_view ( "input/checkbox", array (
+                	echo elgg_view("input/checkbox", array(
 			         'name' => 'deploymentseek_check',
 			         'checked' => true,
 			         'id' => 'gcconnex-opt-in-swap-check',
                         'class'=>'pull-left',
-                        'label'=>elgg_echo ( 'gcconnex_profile:opt:participants' ),
+                        'label'=>elgg_echo('gcconnex_profile:opt:participants'),
 	               ));
                     
                 ?>
                     </li> 
                     <li class="clearfix pull-left mrgn-lft-md">
                 <?php
-                	echo elgg_view ( "input/checkbox", array (
+                	echo elgg_view("input/checkbox", array(
 			         'name' => 'deploymentcreate_check',
 			         'checked' => true,
 			         'id' => 'gcconnex-opt-in-swap-check',
                         'class'=>'pull-left',
-                        'label'=>elgg_echo ( 'gcconnex_profile:opt:host' ),
+                        'label'=>elgg_echo('gcconnex_profile:opt:host'),
 	               ));
                     
                 ?>
@@ -131,12 +131,12 @@ 
             
             <li class="clearfix">
                 <?php
-                	echo elgg_view ( "input/checkbox", array (
+                	echo elgg_view("input/checkbox", array(
 			         'name' => 'swap_check',
 			         'checked' => true,
 			         'id' => 'gcconnex-opt-in-swap-check',
                         'class'=>'pull-left',
-                        'label'=>elgg_echo ( 'gcconnex_profile:opt:job_swap' ),
+                        'label'=>elgg_echo('gcconnex_profile:opt:job_swap'),
 	               ));
                     
                 ?>
@@ -144,12 +144,12 @@ 
             
             <li class="clearfix">
                 <?php
-                	echo elgg_view ( "input/checkbox", array (
+                	echo elgg_view("input/checkbox", array(
 			         'name' => 'rotation_check',
 			         'checked' => true,
 			         'id' => 'gcconnex-opt-in-swap-check',
                         'class'=>'pull-left',
-                        'label'=>elgg_echo ( 'missions:job_rotation' ),
+                        'label'=>elgg_echo('missions:job_rotation'),
 	               ));
                     
                 ?>
@@ -165,17 +165,17 @@ 
             
             
             <li class="clearfix">
-                <?php echo elgg_echo('missions:mentoring');?>
+                <?php echo elgg_echo('missions:mentoring'); ?>
                 
                 <ul class="clearfix brdr-lft mrgn-lft-md list-unstyled">
                 <li class="clearfix pull-left mrgn-lft-md">
                 <?php
-                	echo elgg_view ( "input/checkbox", array (
+                	echo elgg_view("input/checkbox", array(
 			         'name' => 'mentored_check',
 			         'checked' => true,
 			         'id' => 'gcconnex-opt-in-mentoring-check',
                         'class'=>'pull-left',
-                        'label'=>elgg_echo ( 'gcconnex_profile:opt:mentored' ),
+                        'label'=>elgg_echo('gcconnex_profile:opt:mentored'),
 	               ));
                     
                 ?>
@@ -183,12 +183,12 @@ 
             
             <li class="clearfix pull-left mrgn-lft-md">
                 <?php
-                	echo elgg_view ( "input/checkbox", array (
+                	echo elgg_view("input/checkbox", array(
                         'name' => 'mentoring_check',
 			         'checked' => true,
 			         'id' => 'gcconnex-opt-in-mentored-check',
                         'class'=>'pull-left',
-                        'label'=>elgg_echo ( 'gcconnex_profile:opt:mentoring' ),
+                        'label'=>elgg_echo('gcconnex_profile:opt:mentoring'),
 	               ));
                     
                 ?>
@@ -197,17 +197,17 @@ 
             </li>
             
             <li class="clearfix">
-                <?php echo elgg_echo ( 'missions:job_shadowing' ); ?>
+                <?php echo elgg_echo('missions:job_shadowing'); ?>
                 
                 <ul class="clearfix brdr-lft mrgn-lft-md list-unstyled">
                 <li class="clearfix pull-left mrgn-lft-md">
                 <?php
-                	echo elgg_view ( "input/checkbox", array (
+                	echo elgg_view("input/checkbox", array(
 			         'name' => 'shadowing_check',
 			         'checked' => true,
 			         'id' => 'gcconnex-opt-in-shadowing-check',
                         'class'=>'pull-left',
-                        'label'=>elgg_echo ( 'gcconnex_profile:opt:participants' ),
+                        'label'=>elgg_echo('gcconnex_profile:opt:participants'),
 	               ));
                     
                 ?>
@@ -215,12 +215,12 @@ 
             
                 <li class="clearfix pull-left mrgn-lft-md">
                 <?php
-                	echo elgg_view ( "input/checkbox", array (
+                	echo elgg_view("input/checkbox", array(
 			         'name' => 'shadowed_check',
 			         'checked' => true,
 			         'id' => 'gcconnex-opt-in-shadowed-check',
                         'class'=>'pull-left',
-                        'label'=>elgg_echo ( 'gcconnex_profile:opt:host' ),
+                        'label'=>elgg_echo('gcconnex_profile:opt:host'),
 	               ));
                     
                 ?>
@@ -230,17 +230,17 @@ 
             
             
             <li class="clearfix">
-                <?php echo elgg_echo( 'missions:skill_share' ); ?>
+                <?php echo elgg_echo('missions:skill_share'); ?>
                 
                 <ul class="brdr-lft clearfix mrgn-lft-md list-unstyled">
                 <li class="clearfix pull-left mrgn-lft-md">
                 <?php
-                	echo elgg_view ( "input/checkbox", array (
+                	echo elgg_view("input/checkbox", array(
 			         'name' => 'skillseeker_check',
 			         'checked' => true,
 			         'id' => 'gcconnex-opt-in-shadowing-check',
                         'class'=>'pull-left',
-                        'label'=>elgg_echo ( 'gcconnex_profile:opt:participants' ),
+                        'label'=>elgg_echo('gcconnex_profile:opt:participants'),
 	               ));
                     
                 ?>
@@ -248,12 +248,12 @@ 
             
             <li class="clearfix pull-left mrgn-lft-md">
                 <?php
-                	echo elgg_view ( "input/checkbox", array (
+                	echo elgg_view("input/checkbox", array(
 			         'name' => 'skillcreator_check',
 			         'checked' => true,
 			         'id' => 'gcconnex-opt-in-shadowing-check',
                         'class'=>'pull-left',
-                        'label'=>elgg_echo ( 'gcconnex_profile:opt:host' ),
+                        'label'=>elgg_echo('gcconnex_profile:opt:host'),
 	               ));
                     
                 ?>
@@ -263,29 +263,29 @@ 
             
             
             <li class="clearfix">
-                <?php echo elgg_echo( 'missions:peer_coaching' ); ?>
+                <?php echo elgg_echo('missions:peer_coaching'); ?>
                 
                 <ul class="clearfix brdr-lft mrgn-lft-md list-unstyled">
                     <li class="clearfix pull-left mrgn-lft-md">
                 <?php
-                	echo elgg_view ( "input/checkbox", array (
+                	echo elgg_view("input/checkbox", array(
 			         'name' => 'coachseek_check',
 			         'checked' => true,
 			         'id' => 'gcconnex-opt-in-seekCoach-check',
                         'class'=>'pull-left',
-                        'label'=>elgg_echo ( 'gcconnex_profile:opt:participants' ),
+                        'label'=>elgg_echo('gcconnex_profile:opt:participants'),
 	               ));
                     
                 ?>
                     </li>
                     <li class="clearfix pull-left mrgn-lft-md">
                         <?php
-                	       echo elgg_view ( "input/checkbox", array (
+                	       echo elgg_view("input/checkbox", array(
 			             'name' => 'coachcreate_check',
 			         'checked' => true,
 			         'id' => 'gcconnex-opt-in-becomeCoach-check',
                         'class'=>'pull-left',
-                        'label'=>elgg_echo ( 'gcconnex_profile:opt:host' ),
+                        'label'=>elgg_echo('gcconnex_profile:opt:host'),
 	                   ));
                     
                         ?>
@@ -295,12 +295,12 @@ 
             
             <li class="clearfix">
                 <?php
-                	echo elgg_view ( "input/checkbox", array (
+                	echo elgg_view("input/checkbox", array(
 			         'name' => 'jobshare_check',
 			         'checked' => true,
 			         'id' => 'gcconnex-opt-in-shadowing-check',
                         'class'=>'pull-left',
-                        'label'=>elgg_echo ( 'missions:job_share' ),
+                        'label'=>elgg_echo('missions:job_share'),
 	               ));
                     
                 ?>

mod/missions/views/default/page/elements/stacked-graph-inputs.php

Spacing +5 added lines, -5 removed lines

@@ -78,7 +78,7 @@ 
 
 <div class="col-sm-12" style="margin:4px;">
 	<label for='data-analytics-separator-dropdown-input' class="col-sm-3" style="text-align:right;">
-		<?php echo elgg_echo('missions:separate_missions_by') . ':';?>
+		<?php echo elgg_echo('missions:separate_missions_by') . ':'; ?>
 	</label>
 	<div class="col-sm-3">
 		<?php echo $input_separator; ?>
@@ -86,7 +86,7 @@ 
 </div>
 <div class="col-sm-12" style="margin:4px;">
 	<label for='data-analytics-start-date-input' class="col-sm-3" style="text-align:right;"">
-		<?php echo elgg_echo('missions:start_date') . ':';?>
+		<?php echo elgg_echo('missions:start_date') . ':'; ?>
 	</label>
 	<div class="col-sm-3">
 		<?php echo $input_start_date; ?>
@@ -95,7 +95,7 @@ 
 </div>
 <div class="col-sm-12" style="margin:4px;">
 	<label for='data-analytics-end-date-input' class="col-sm-3" style="text-align:right;">
-		<?php echo elgg_echo('missions:end_date') . ':';?>
+		<?php echo elgg_echo('missions:end_date') . ':'; ?>
 	</label>
 	<div class="col-sm-3">
 		<?php echo $input_end_date; ?>
@@ -104,7 +104,7 @@ 
 </div>
 <div class="col-sm-12" style="margin:4px;">
 	<label for='data-analytics-interval-dropdown-input' class="col-sm-3" style="text-align:right;">
-		<?php echo elgg_echo('missions:time_interval') . ':';?>
+		<?php echo elgg_echo('missions:time_interval') . ':'; ?>
 	</label>
 	<div class="col-sm-3">
 		<?php echo $input_interval; ?>
@@ -112,7 +112,7 @@ 
 </div>
 <div class="col-sm-12" style="margin:4px;">
 	<label for='data-analytics-target-mission-date-dropdown-input' class="col-sm-3" style="text-align:right;">
-		<?php echo elgg_echo('missions:target_date') . ':';?>
+		<?php echo elgg_echo('missions:target_date') . ':'; ?>
 	</label>
 	<div class="col-sm-3">
 		<?php echo $input_target_mission_date; ?>

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

Indentation +4 added lines, -4 removed lines

@@ -34,8 +34,8 @@ 
 		'limit' => $max,
 		'pagination' => true,
 		'list_type' => 'gallery',
-        'gallery_class'=>'wb-eqht',
-        'item_class'=>'col-sm-6 col-md-4 ',
+		'gallery_class'=>'wb-eqht',
+		'item_class'=>'col-sm-6 col-md-4 ',
 
 		'mission_full_view' => false
 ), $offset, $max);
@@ -122,10 +122,10 @@ 
                
                 <div>
                     <?php
-                        echo elgg_view_form('missions/opt-in-splash');
+						echo elgg_view_form('missions/opt-in-splash');
                         
                         
-                    ?>
+					?>
                 </div>
 
 

Spacing +2 added lines, -2 removed lines

@@ -108,7 +108,7 @@ 
                 <div class="clearfix">
                      <div class="pull-right clearfix">
 
-                    <a href ="#" type="button" class="" data-dismiss="modal"><i class="fa fa-times fa-lg" aria-hidden="true"></i><span class="wb-inv"><?php echo elgg_echo('close');?></span></a>
+                    <a href ="#" type="button" class="" data-dismiss="modal"><i class="fa fa-times fa-lg" aria-hidden="true"></i><span class="wb-inv"><?php echo elgg_echo('close'); ?></span></a>
 
                     </div>
                     <div>
@@ -140,7 +140,7 @@ 
 
 
 <div class="brdr-tp mrgn-tp-md clearfix col-sm-12">
-	<h2 class='h4'><?php echo elgg_echo('missions:splash:missions_right_now') ; ?></h2>
+	<h2 class='h4'><?php echo elgg_echo('missions:splash:missions_right_now'); ?></h2>
 	<?php 
 		//echo $simple_search_form;
 //Nick - Removing search from splash page as user still needs to opt in