gctools-outilsgc / gcconnex

mod/wet4/views/default/river/object/groupforumtopic/create.php

Indentation +7 added lines, -7 removed lines

@@ -17,15 +17,15 @@ 
 
 //check to see if video is embeded
 if($test){
-    $excerpt = str_replace($test, '', $object->description);
-    $excerpt = strip_tags($excerpt);
-    $excerpt = elgg_get_excerpt($excerpt);
+	$excerpt = str_replace($test, '', $object->description);
+	$excerpt = strip_tags($excerpt);
+	$excerpt = elgg_get_excerpt($excerpt);
 } else {
 
-        $description = gc_explode_translation($object->description, $lang);
+		$description = gc_explode_translation($object->description, $lang);
 
-    $excerpt = strip_tags($description);
-    $excerpt = elgg_get_excerpt($excerpt);
+	$excerpt = strip_tags($description);
+	$excerpt = elgg_get_excerpt($excerpt);
 }
 
 
@@ -39,5 +39,5 @@ 
 	'item' => $item,
 	'message' => $excerpt,
 	'responses' => $responses,
-    'attachments' => elgg_view('output/url', array('href' => $test[0])),
+	'attachments' => elgg_view('output/url', array('href' => $test[0])),
 ));

Spacing +1 added lines, -1 removed lines

@@ -16,7 +16,7 @@
 $test = embed_discussion_river($object->description);
 
 //check to see if video is embeded
-if($test){
+if ($test) {
     $excerpt = str_replace($test, '', $object->description);
     $excerpt = strip_tags($excerpt);
     $excerpt = elgg_get_excerpt($excerpt);

mod/wet4/views/default/river/object/comment/create.php

Spacing +1 added lines, -1 removed lines

@@ -21,7 +21,7 @@
 
 $target_link = elgg_view('output/url', array(
 	'href' => $comment->getURL(),
-	'text' => gc_explode_translation($title_comment,$lang),
+	'text' => gc_explode_translation($title_comment, $lang),
 	'class' => 'elgg-river-target',
 	'is_trusted' => true,
 ));

mod/wet4/views/default/river/elements/summary.php

Spacing +2 added lines, -2 removed lines

@@ -18,14 +18,14 @@
 	'is_trusted' => true,
 ));
 
-if($object->title1){
+if ($object->title1) {
 	$object->title = $object->title;
 }
 
 $object_text = $object->title ? $object->title : $object->name;
 
 
-if($item->action_type != 'friend'){
+if ($item->action_type != 'friend') {
 $object_text = gc_explode_translation($object->title, $lang);
 }
 

mod/wet4/views/default/river/elements/layout.php

Indentation +55 added lines, -55 removed lines

@@ -17,68 +17,68 @@
 
 if(intval($_SESSION['Suggested_friends'])==5 && elgg_is_logged_in())
 {
-    try{
-        $user_guid = elgg_get_logged_in_user_guid();
-        $site_url = elgg_get_site_url();
-        mysqli_report(MYSQLI_REPORT_ERROR | MYSQLI_REPORT_STRICT);
+	try{
+		$user_guid = elgg_get_logged_in_user_guid();
+		$site_url = elgg_get_site_url();
+		mysqli_report(MYSQLI_REPORT_ERROR | MYSQLI_REPORT_STRICT);
 
-        //connect to database  , "3306"
-        $db_config = new \Elgg\Database\Config($CONFIG);
-        if ($db_config->isDatabaseSplit()) {
-            $read_settings = $db_config->getConnectionConfig(\Elgg\Database\Config::READ);
-        } else {    
-            $read_settings = $db_config->getConnectionConfig(\Elgg\Database\Config::READ_WRITE);
-        }
-        $connection = mysqli_connect($read_settings["host"], $read_settings["user"], $read_settings["password"], $read_settings["database"]);
-        $result = mysqli_query($connection, "call GET_suggestedFriends({$user_guid}, 3);");
+		//connect to database  , "3306"
+		$db_config = new \Elgg\Database\Config($CONFIG);
+		if ($db_config->isDatabaseSplit()) {
+			$read_settings = $db_config->getConnectionConfig(\Elgg\Database\Config::READ);
+		} else {    
+			$read_settings = $db_config->getConnectionConfig(\Elgg\Database\Config::READ_WRITE);
+		}
+		$connection = mysqli_connect($read_settings["host"], $read_settings["user"], $read_settings["password"], $read_settings["database"]);
+		$result = mysqli_query($connection, "call GET_suggestedFriends({$user_guid}, 3);");
 
-        if(intval($result->num_rows)>0){
-            $htmloutput='<div class="col-xs-12 mrgn-tp-sm  col-xs-12 panel panel-river clearfix mrgn-bttm-xs">';
+		if(intval($result->num_rows)>0){
+			$htmloutput='<div class="col-xs-12 mrgn-tp-sm  col-xs-12 panel panel-river clearfix mrgn-bttm-xs">';
 
-            $htmloutput=$htmloutput.'<div class="elgg-body clearfix edit-comment wb-eqht">';
-            $htmloutput=$htmloutput.'<h4 class="h4 mrgn-tp-0 text-primary">'.elgg_echo('sf:title').'</h3>';
-            while ($row = $result->fetch_assoc()) {
-                 $userGUID=$row['guid_two'];
+			$htmloutput=$htmloutput.'<div class="elgg-body clearfix edit-comment wb-eqht">';
+			$htmloutput=$htmloutput.'<h4 class="h4 mrgn-tp-0 text-primary">'.elgg_echo('sf:title').'</h3>';
+			while ($row = $result->fetch_assoc()) {
+				 $userGUID=$row['guid_two'];
 		if (elgg_get_user_validation_status($userGUID)){
-                	$job=get_user($userGUID)->job;
-                	$user_department=get_user($userGUID)->department;
-                	$htmloutput=$htmloutput.'<div class="col-xs-4 text-center hght-inhrt">'; // suggested friend link to profile
-                	$htmloutput .= '<a href="'.  $site_url. 'profile/'. get_user($row['guid_two'])->username.'" class="">';
+					$job=get_user($userGUID)->job;
+					$user_department=get_user($userGUID)->department;
+					$htmloutput=$htmloutput.'<div class="col-xs-4 text-center hght-inhrt">'; // suggested friend link to profile
+					$htmloutput .= '<a href="'.  $site_url. 'profile/'. get_user($row['guid_two'])->username.'" class="">';
 
-                	//EW - change to render icon so new ambassador badges can be shown
-                	$htmloutput.= elgg_view_entity_icon(get_entity($userGUID), 'medium', array('use_hover' => false, 'use_link' => false, 'class' => 'elgg-avatar-wet4-sf'));
-                	//$htmloutput=$htmloutput.'<img src="'.get_user($row['guid_two'])->getIcon('medium') . '" class="avatar-profile-page img-responsive center-block img-circle elgg-avatar-wet4-sf" alt="'.elgg_echo('sf:alttext').' '.get_user($row['guid_two'])->getDisplayName().'">';
-                	$htmloutput=$htmloutput.'<h4 class="h4 mrgn-tp-sm"><span class="text-primary">'.get_user($row['guid_two'])->getDisplayName().'</span></h4></a>';
-                	if($job){ // Nick - Adding department if no job, if none add a space
-                	    $htmloutput=$htmloutput.'<p class="small mrgn-tp-0">'.$job.'</p>';
-                	}elseif(!$job && $user_department){
-                	    $htmloutput=$htmloutput.'<p class="small mrgn-tp-0">'.$user_department.'</p>';
-                	}else{
-                	    $htmloutput=$htmloutput.'<p class="small mrgn-tp-0 min-height-cs"></p>';
-                	}
+					//EW - change to render icon so new ambassador badges can be shown
+					$htmloutput.= elgg_view_entity_icon(get_entity($userGUID), 'medium', array('use_hover' => false, 'use_link' => false, 'class' => 'elgg-avatar-wet4-sf'));
+					//$htmloutput=$htmloutput.'<img src="'.get_user($row['guid_two'])->getIcon('medium') . '" class="avatar-profile-page img-responsive center-block img-circle elgg-avatar-wet4-sf" alt="'.elgg_echo('sf:alttext').' '.get_user($row['guid_two'])->getDisplayName().'">';
+					$htmloutput=$htmloutput.'<h4 class="h4 mrgn-tp-sm"><span class="text-primary">'.get_user($row['guid_two'])->getDisplayName().'</span></h4></a>';
+					if($job){ // Nick - Adding department if no job, if none add a space
+						$htmloutput=$htmloutput.'<p class="small mrgn-tp-0">'.$job.'</p>';
+					}elseif(!$job && $user_department){
+						$htmloutput=$htmloutput.'<p class="small mrgn-tp-0">'.$user_department.'</p>';
+					}else{
+						$htmloutput=$htmloutput.'<p class="small mrgn-tp-0 min-height-cs"></p>';
+					}
                
-                	//changed connect button to send a friend request we should change the wording
-                	$htmloutput=$htmloutput.'<a href="'.elgg_add_action_tokens_to_url("action/friends/add?friend={$userGUID}"). '" class="btn btn-primary mrgn-tp-sm">'.elgg_echo('friend:add').'</a>';
-                	$htmloutput=$htmloutput.'</div>';
-               		// $htmloutput=$htmloutput. $row['guid_two'].'-';
-	       }
-            }
-            $htmloutput=$htmloutput.'</div>';
-            $htmloutput=$htmloutput.'<div class="clearfix"></div>';
-            $htmloutput=$htmloutput.'</div>';
-            echo $htmloutput;
-        }
-        $connection->close();
-    }
-    catch (Exception $e)
-    {
-        $errMess=$e->getMessage();
-        $errStack=$e->getTraceAsString();
-        $errType=$e->getCode();
-        gc_err_logging($errMess,$errStack,'Suggested Friends',$errType);
+					//changed connect button to send a friend request we should change the wording
+					$htmloutput=$htmloutput.'<a href="'.elgg_add_action_tokens_to_url("action/friends/add?friend={$userGUID}"). '" class="btn btn-primary mrgn-tp-sm">'.elgg_echo('friend:add').'</a>';
+					$htmloutput=$htmloutput.'</div>';
+			   		// $htmloutput=$htmloutput. $row['guid_two'].'-';
+		   }
+			}
+			$htmloutput=$htmloutput.'</div>';
+			$htmloutput=$htmloutput.'<div class="clearfix"></div>';
+			$htmloutput=$htmloutput.'</div>';
+			echo $htmloutput;
+		}
+		$connection->close();
+	}
+	catch (Exception $e)
+	{
+		$errMess=$e->getMessage();
+		$errStack=$e->getTraceAsString();
+		$errType=$e->getCode();
+		gc_err_logging($errMess,$errStack,'Suggested Friends',$errType);
 
-        $connection->close();
-    }
+		$connection->close();
+	}
 }
 
 echo elgg_view('page/components/image_block', array(

Spacing +30 added lines, -30 removed lines

@@ -13,11 +13,11 @@ 
 
 /*If this is the 3rd item in the River, lets call for suggestions*/
 
-$_SESSION['Suggested_friends']=intval($_SESSION['Suggested_friends'])+1;
+$_SESSION['Suggested_friends'] = intval($_SESSION['Suggested_friends']) + 1;
 
-if(intval($_SESSION['Suggested_friends'])==5 && elgg_is_logged_in())
+if (intval($_SESSION['Suggested_friends']) == 5 && elgg_is_logged_in())
 {
-    try{
+    try {
         $user_guid = elgg_get_logged_in_user_guid();
         $site_url = elgg_get_site_url();
         mysqli_report(MYSQLI_REPORT_ERROR | MYSQLI_REPORT_STRICT);
@@ -32,50 +32,50 @@ 
         $connection = mysqli_connect($read_settings["host"], $read_settings["user"], $read_settings["password"], $read_settings["database"]);
         $result = mysqli_query($connection, "call GET_suggestedFriends({$user_guid}, 3);");
 
-        if(intval($result->num_rows)>0){
-            $htmloutput='<div class="col-xs-12 mrgn-tp-sm  col-xs-12 panel panel-river clearfix mrgn-bttm-xs">';
+        if (intval($result->num_rows) > 0) {
+            $htmloutput = '<div class="col-xs-12 mrgn-tp-sm  col-xs-12 panel panel-river clearfix mrgn-bttm-xs">';
 
-            $htmloutput=$htmloutput.'<div class="elgg-body clearfix edit-comment wb-eqht">';
-            $htmloutput=$htmloutput.'<h4 class="h4 mrgn-tp-0 text-primary">'.elgg_echo('sf:title').'</h3>';
+            $htmloutput = $htmloutput . '<div class="elgg-body clearfix edit-comment wb-eqht">';
+            $htmloutput = $htmloutput . '<h4 class="h4 mrgn-tp-0 text-primary">' . elgg_echo('sf:title') . '</h3>';
             while ($row = $result->fetch_assoc()) {
-                 $userGUID=$row['guid_two'];
-		if (elgg_get_user_validation_status($userGUID)){
-                	$job=get_user($userGUID)->job;
-                	$user_department=get_user($userGUID)->department;
-                	$htmloutput=$htmloutput.'<div class="col-xs-4 text-center hght-inhrt">'; // suggested friend link to profile
-                	$htmloutput .= '<a href="'.  $site_url. 'profile/'. get_user($row['guid_two'])->username.'" class="">';
+                 $userGUID = $row['guid_two'];
+		if (elgg_get_user_validation_status($userGUID)) {
+                	$job = get_user($userGUID)->job;
+                	$user_department = get_user($userGUID)->department;
+                	$htmloutput = $htmloutput . '<div class="col-xs-4 text-center hght-inhrt">'; // suggested friend link to profile
+                	$htmloutput .= '<a href="' . $site_url . 'profile/' . get_user($row['guid_two'])->username . '" class="">';
 
                 	//EW - change to render icon so new ambassador badges can be shown
-                	$htmloutput.= elgg_view_entity_icon(get_entity($userGUID), 'medium', array('use_hover' => false, 'use_link' => false, 'class' => 'elgg-avatar-wet4-sf'));
+                	$htmloutput .= elgg_view_entity_icon(get_entity($userGUID), 'medium', array('use_hover' => false, 'use_link' => false, 'class' => 'elgg-avatar-wet4-sf'));
                 	//$htmloutput=$htmloutput.'<img src="'.get_user($row['guid_two'])->getIcon('medium') . '" class="avatar-profile-page img-responsive center-block img-circle elgg-avatar-wet4-sf" alt="'.elgg_echo('sf:alttext').' '.get_user($row['guid_two'])->getDisplayName().'">';
-                	$htmloutput=$htmloutput.'<h4 class="h4 mrgn-tp-sm"><span class="text-primary">'.get_user($row['guid_two'])->getDisplayName().'</span></h4></a>';
-                	if($job){ // Nick - Adding department if no job, if none add a space
-                	    $htmloutput=$htmloutput.'<p class="small mrgn-tp-0">'.$job.'</p>';
-                	}elseif(!$job && $user_department){
-                	    $htmloutput=$htmloutput.'<p class="small mrgn-tp-0">'.$user_department.'</p>';
-                	}else{
-                	    $htmloutput=$htmloutput.'<p class="small mrgn-tp-0 min-height-cs"></p>';
+                	$htmloutput = $htmloutput . '<h4 class="h4 mrgn-tp-sm"><span class="text-primary">' . get_user($row['guid_two'])->getDisplayName() . '</span></h4></a>';
+                	if ($job) { // Nick - Adding department if no job, if none add a space
+                	    $htmloutput = $htmloutput . '<p class="small mrgn-tp-0">' . $job . '</p>';
+                	}elseif (!$job && $user_department) {
+                	    $htmloutput = $htmloutput . '<p class="small mrgn-tp-0">' . $user_department . '</p>';
+                	} else {
+                	    $htmloutput = $htmloutput . '<p class="small mrgn-tp-0 min-height-cs"></p>';
                 	}
                
                 	//changed connect button to send a friend request we should change the wording
-                	$htmloutput=$htmloutput.'<a href="'.elgg_add_action_tokens_to_url("action/friends/add?friend={$userGUID}"). '" class="btn btn-primary mrgn-tp-sm">'.elgg_echo('friend:add').'</a>';
-                	$htmloutput=$htmloutput.'</div>';
+                	$htmloutput = $htmloutput . '<a href="' . elgg_add_action_tokens_to_url("action/friends/add?friend={$userGUID}") . '" class="btn btn-primary mrgn-tp-sm">' . elgg_echo('friend:add') . '</a>';
+                	$htmloutput = $htmloutput . '</div>';
                		// $htmloutput=$htmloutput. $row['guid_two'].'-';
 	       }
             }
-            $htmloutput=$htmloutput.'</div>';
-            $htmloutput=$htmloutput.'<div class="clearfix"></div>';
-            $htmloutput=$htmloutput.'</div>';
+            $htmloutput = $htmloutput . '</div>';
+            $htmloutput = $htmloutput . '<div class="clearfix"></div>';
+            $htmloutput = $htmloutput . '</div>';
             echo $htmloutput;
         }
         $connection->close();
     }
     catch (Exception $e)
     {
-        $errMess=$e->getMessage();
-        $errStack=$e->getTraceAsString();
-        $errType=$e->getCode();
-        gc_err_logging($errMess,$errStack,'Suggested Friends',$errType);
+        $errMess = $e->getMessage();
+        $errStack = $e->getTraceAsString();
+        $errType = $e->getCode();
+        gc_err_logging($errMess, $errStack, 'Suggested Friends', $errType);
 
         $connection->close();
     }

Braces +3 added lines, -4 removed lines

@@ -51,9 +51,9 @@ 
                 	$htmloutput=$htmloutput.'<h4 class="h4 mrgn-tp-sm"><span class="text-primary">'.get_user($row['guid_two'])->getDisplayName().'</span></h4></a>';
                 	if($job){ // Nick - Adding department if no job, if none add a space
                 	    $htmloutput=$htmloutput.'<p class="small mrgn-tp-0">'.$job.'</p>';
-                	}elseif(!$job && $user_department){
+                	} elseif(!$job && $user_department){
                 	    $htmloutput=$htmloutput.'<p class="small mrgn-tp-0">'.$user_department.'</p>';
-                	}else{
+                	} else{
                 	    $htmloutput=$htmloutput.'<p class="small mrgn-tp-0 min-height-cs"></p>';
                 	}
                
@@ -69,8 +69,7 @@ 
             echo $htmloutput;
         }
         $connection->close();
-    }
-    catch (Exception $e)
+    } catch (Exception $e)
     {
         $errMess=$e->getMessage();
         $errStack=$e->getTraceAsString();

mod/wet4/views/default/river/elements/body.php

Indentation +15 added lines, -15 removed lines

@@ -68,16 +68,16 @@ 
 if($subtype_test == 'comment' || $subtype_test =='discussion_reply'){
 
 
-    //$test = $subtype_test->getContainerEntity();
-    //get the container of the container if it's a comment or reply
-    $container = $container->getContainerEntity();
-    $test = 'You need to find the group I am in.';
-    $commentordiscuss = true;
+	//$test = $subtype_test->getContainerEntity();
+	//get the container of the container if it's a comment or reply
+	$container = $container->getContainerEntity();
+	$test = 'You need to find the group I am in.';
+	$commentordiscuss = true;
     
-    //$subtype_test2 = $subtype_test->getContainerEntity();
+	//$subtype_test2 = $subtype_test->getContainerEntity();
 }else{
-    $test = '';
-    $commentordiscuss = false;
+	$test = '';
+	$commentordiscuss = false;
 }
 
 
@@ -90,10 +90,10 @@ 
 		'text' => $name,
 		'is_trusted' => true,
 	));
-    //Nick - Changed "in the group" to just the group link in order to show this is group content. May need some looking at
+	//Nick - Changed "in the group" to just the group link in order to show this is group content. May need some looking at
 	$group_string = $group_link;
-    $group_image = elgg_view_entity_icon($container, 'medium');
-    $in_the_group = elgg_echo('river:ingroup', array($group_string));
+	$group_image = elgg_view_entity_icon($container, 'medium');
+	$in_the_group = elgg_echo('river:ingroup', array($group_string));
    // $group_testing = elgg_view_image_block($group_image, $group_link);
 
     
@@ -107,8 +107,8 @@ 
 //Nick - commented out comment or discuss var for instances of comments on blogs not within a group.
 //Nick - checking for group activity context so it will use the other layout 
 if($group_string /*|| $commentordiscuss*/ && !elgg_in_context('group_activity_tab')){
-    $identify_activity = elgg_echo('group');
-    echo <<<RIVER
+	$identify_activity = elgg_echo('group');
+	echo <<<RIVER
 <div class="">
 
 
@@ -129,8 +129,8 @@ 
 RIVER;
 
 }else{
-    $identify_activity = elgg_echo('friend:river');
-    echo <<<RIVER
+	$identify_activity = elgg_echo('friend:river');
+	echo <<<RIVER
 
 <h3 class="elgg-river-summary  mrgn-bttm-sm river-user-heading"> $summary  </h3>
 

Spacing +5 added lines, -5 removed lines

@@ -65,7 +65,7 @@ 
 
 $subtype_test = $object->getSubtype();
 
-if($subtype_test == 'comment' || $subtype_test =='discussion_reply'){
+if ($subtype_test == 'comment' || $subtype_test == 'discussion_reply') {
 
 
     //$test = $subtype_test->getContainerEntity();
@@ -75,13 +75,13 @@ 
     $commentordiscuss = true;
     
     //$subtype_test2 = $subtype_test->getContainerEntity();
-}else{
+} else {
     $test = '';
     $commentordiscuss = false;
 }
 
 
-	$name = gc_explode_translation($container->name,$lang);
+	$name = gc_explode_translation($container->name, $lang);
 
 
 if ($container instanceof ElggGroup && $container->guid != elgg_get_page_owner_guid()) {
@@ -106,7 +106,7 @@ 
 //removed $responses
 //Nick - commented out comment or discuss var for instances of comments on blogs not within a group.
 //Nick - checking for group activity context so it will use the other layout 
-if($group_string /*|| $commentordiscuss*/ && !elgg_in_context('group_activity_tab')){
+if ($group_string /*|| $commentordiscuss*/ && !elgg_in_context('group_activity_tab')) {
     $identify_activity = elgg_echo('group');
     echo <<<RIVER
 <div class="">
@@ -128,7 +128,7 @@ 
 
 RIVER;
 
-}else{
+} else {
     $identify_activity = elgg_echo('friend:river');
     echo <<<RIVER
 

Braces +2 added lines, -2 removed lines

@@ -75,7 +75,7 @@ 
     $commentordiscuss = true;
     
     //$subtype_test2 = $subtype_test->getContainerEntity();
-}else{
+} else{
     $test = '';
     $commentordiscuss = false;
 }
@@ -128,7 +128,7 @@ 
 
 RIVER;
 
-}else{
+} else{
     $identify_activity = elgg_echo('friend:river');
     echo <<<RIVER
 

mod/wet4/views/default/river/elements/image.php

Indentation +30 added lines, -30 removed lines

@@ -24,52 +24,52 @@
 $subtype_test = $object->getSubtype();
 if($subtype_test == 'comment' || $subtype_test =='discussion_reply' || $subtype_test == 'image'){
 
-    //get the container of the container if it's a comment or reply
-    $container = $container->getContainerEntity();
-    $commentordiscuss = true;
+	//get the container of the container if it's a comment or reply
+	$container = $container->getContainerEntity();
+	$commentordiscuss = true;
 
-    //$subtype_test2 = $subtype_test->getContainerEntity();
+	//$subtype_test2 = $subtype_test->getContainerEntity();
 }else{
 
-    $commentordiscuss = false;
+	$commentordiscuss = false;
 }
 
 //makes the widget icons small and the main river icons big :)
 if(elgg_get_context() !== 'widgets'){
-    if(elgg_in_context('group_activity_tab')){ //Nick - Show creator of the content when viewing the group activity tab
-        echo elgg_view_entity_icon($subject, 'medium');
-    }
+	if(elgg_in_context('group_activity_tab')){ //Nick - Show creator of the content when viewing the group activity tab
+		echo elgg_view_entity_icon($subject, 'medium');
+	}
   if (elgg_in_context('widgets')) {
-      if($container || $commentordiscuss){
-          echo elgg_view_entity_icon($container, 'medium');
+	  if($container || $commentordiscuss){
+		  echo elgg_view_entity_icon($container, 'medium');
 
-      }else{
-          echo elgg_view_entity_icon($subject, 'medium');
-      }
+	  }else{
+		  echo elgg_view_entity_icon($subject, 'medium');
+	  }
 
 
 } else {
 
-    //dont show group avatar when looking at group's activity feed
-    if($container && $subtype_test && !elgg_in_context('group_activity_tab') && $container->guid != elgg_get_page_owner_guid()){//happens in group
-        //if in group show the groups icon
-        if(elgg_instanceof($container, 'group')){
-            echo elgg_view_entity_icon($container, 'medium');
-        } else {
-            //if not just show user's icon
-            echo elgg_view_entity_icon($object->getOwnerEntity(), 'medium');
-        }
-        //echo $subtype_test;
-    }else if($container && !elgg_in_context('group_activity_tab')){
-        //if user joins group show their photo, not group owner's image
-        echo elgg_view_entity_icon($subject, 'medium');
-    }else if(!elgg_in_context('group_activity_tab')){ // Nick - do not show additional avatars on group activity tab
-        echo elgg_view_entity_icon($subject, 'medium');
-    }
+	//dont show group avatar when looking at group's activity feed
+	if($container && $subtype_test && !elgg_in_context('group_activity_tab') && $container->guid != elgg_get_page_owner_guid()){//happens in group
+		//if in group show the groups icon
+		if(elgg_instanceof($container, 'group')){
+			echo elgg_view_entity_icon($container, 'medium');
+		} else {
+			//if not just show user's icon
+			echo elgg_view_entity_icon($object->getOwnerEntity(), 'medium');
+		}
+		//echo $subtype_test;
+	}else if($container && !elgg_in_context('group_activity_tab')){
+		//if user joins group show their photo, not group owner's image
+		echo elgg_view_entity_icon($subject, 'medium');
+	}else if(!elgg_in_context('group_activity_tab')){ // Nick - do not show additional avatars on group activity tab
+		echo elgg_view_entity_icon($subject, 'medium');
+	}
 }
 } else{
  if (elgg_in_context('widgets')) {
-     echo elgg_view_entity_icon($subject, 'medium');
+	 echo elgg_view_entity_icon($subject, 'medium');
 } else if(elgg_in_context('group_activity_tab')){
 
  }else {

Spacing +13 added lines, -13 removed lines

@@ -22,28 +22,28 @@ 
 //trying to get the container of a container for comments on content in a group
 
 $subtype_test = $object->getSubtype();
-if($subtype_test == 'comment' || $subtype_test =='discussion_reply' || $subtype_test == 'image'){
+if ($subtype_test == 'comment' || $subtype_test == 'discussion_reply' || $subtype_test == 'image') {
 
     //get the container of the container if it's a comment or reply
     $container = $container->getContainerEntity();
     $commentordiscuss = true;
 
     //$subtype_test2 = $subtype_test->getContainerEntity();
-}else{
+} else {
 
     $commentordiscuss = false;
 }
 
 //makes the widget icons small and the main river icons big :)
-if(elgg_get_context() !== 'widgets'){
-    if(elgg_in_context('group_activity_tab')){ //Nick - Show creator of the content when viewing the group activity tab
+if (elgg_get_context() !== 'widgets') {
+    if (elgg_in_context('group_activity_tab')) { //Nick - Show creator of the content when viewing the group activity tab
         echo elgg_view_entity_icon($subject, 'medium');
     }
   if (elgg_in_context('widgets')) {
-      if($container || $commentordiscuss){
+      if ($container || $commentordiscuss) {
           echo elgg_view_entity_icon($container, 'medium');
 
-      }else{
+      } else {
           echo elgg_view_entity_icon($subject, 'medium');
       }
 
@@ -51,28 +51,28 @@ 
 } else {
 
     //dont show group avatar when looking at group's activity feed
-    if($container && $subtype_test && !elgg_in_context('group_activity_tab') && $container->guid != elgg_get_page_owner_guid()){//happens in group
+    if ($container && $subtype_test && !elgg_in_context('group_activity_tab') && $container->guid != elgg_get_page_owner_guid()) {//happens in group
         //if in group show the groups icon
-        if(elgg_instanceof($container, 'group')){
+        if (elgg_instanceof($container, 'group')) {
             echo elgg_view_entity_icon($container, 'medium');
         } else {
             //if not just show user's icon
             echo elgg_view_entity_icon($object->getOwnerEntity(), 'medium');
         }
         //echo $subtype_test;
-    }else if($container && !elgg_in_context('group_activity_tab')){
+    } else if ($container && !elgg_in_context('group_activity_tab')) {
         //if user joins group show their photo, not group owner's image
         echo elgg_view_entity_icon($subject, 'medium');
-    }else if(!elgg_in_context('group_activity_tab')){ // Nick - do not show additional avatars on group activity tab
+    } else if (!elgg_in_context('group_activity_tab')) { // Nick - do not show additional avatars on group activity tab
         echo elgg_view_entity_icon($subject, 'medium');
     }
 }
-} else{
+} else {
  if (elgg_in_context('widgets')) {
      echo elgg_view_entity_icon($subject, 'medium');
-} else if(elgg_in_context('group_activity_tab')){
+} else if (elgg_in_context('group_activity_tab')) {
 
- }else {
+ } else {
 	echo elgg_view_entity_icon($subject, 'medium');
 }
 }

Braces +5 added lines, -5 removed lines

@@ -29,7 +29,7 @@ 
     $commentordiscuss = true;
 
     //$subtype_test2 = $subtype_test->getContainerEntity();
-}else{
+} else{
 
     $commentordiscuss = false;
 }
@@ -43,7 +43,7 @@ 
       if($container || $commentordiscuss){
           echo elgg_view_entity_icon($container, 'medium');
 
-      }else{
+      } else{
           echo elgg_view_entity_icon($subject, 'medium');
       }
 
@@ -60,10 +60,10 @@ 
             echo elgg_view_entity_icon($object->getOwnerEntity(), 'medium');
         }
         //echo $subtype_test;
-    }else if($container && !elgg_in_context('group_activity_tab')){
+    } else if($container && !elgg_in_context('group_activity_tab')){
         //if user joins group show their photo, not group owner's image
         echo elgg_view_entity_icon($subject, 'medium');
-    }else if(!elgg_in_context('group_activity_tab')){ // Nick - do not show additional avatars on group activity tab
+    } else if(!elgg_in_context('group_activity_tab')){ // Nick - do not show additional avatars on group activity tab
         echo elgg_view_entity_icon($subject, 'medium');
     }
 }
@@ -72,7 +72,7 @@ 
      echo elgg_view_entity_icon($subject, 'medium');
 } else if(elgg_in_context('group_activity_tab')){
 
- }else {
+ } else {
 	echo elgg_view_entity_icon($subject, 'medium');
 }
 }

mod/wet4/views/default/plugins/wet4/settings.php

Spacing +11 added lines, -11 removed lines

@@ -10,11 +10,11 @@ 
 
 $page_mode = get_input('script', 'default');
 
-if ( $page_mode == 'bilingual_upgrade' ) {
+if ($page_mode == 'bilingual_upgrade') {
 	echo "<br /><h3>upgrade en/fr content storage</h3>";
 	echo elgg_view("output/url",
 		array(
-			'href' => elgg_get_site_url().'admin/plugin_settings/wet4',
+			'href' => elgg_get_site_url() . 'admin/plugin_settings/wet4',
 			'text' => '<< back to settings page',
 		)
 	);
@@ -22,22 +22,22 @@ 
 	$access_status = access_get_show_hidden_status();
 	access_show_hidden_entities(true);
 
-	$title2_id = elgg_get_metastring_id('title2', true);	// get the metastring id, create the metastring if it does not exist
+	$title2_id = elgg_get_metastring_id('title2', true); // get the metastring id, create the metastring if it does not exist
 	$title3_id = elgg_get_metastring_id('title3', true);
 
-	$name2_id = elgg_get_metastring_id('name2', true);	// get the metastring id, create the metastring if it does not exist
+	$name2_id = elgg_get_metastring_id('name2', true); // get the metastring id, create the metastring if it does not exist
 	$name3_id = elgg_get_metastring_id('name3', true);
 
-	$description2_id = elgg_get_metastring_id('description2', true);	// get the metastring id, create the metastring if it does not exist
+	$description2_id = elgg_get_metastring_id('description2', true); // get the metastring id, create the metastring if it does not exist
 	$description3_id = elgg_get_metastring_id('description3', true);
 
-	$briefdescription2_id = elgg_get_metastring_id('briefdescription2', true);	// get the metastring id, create the metastring if it does not exist
+	$briefdescription2_id = elgg_get_metastring_id('briefdescription2', true); // get the metastring id, create the metastring if it does not exist
 	$briefdescription3_id = elgg_get_metastring_id('briefdescription3', true);
 
-	$excerpt2_id = elgg_get_metastring_id('excerpt2', true);	// get the metastring id, create the metastring if it does not exist
+	$excerpt2_id = elgg_get_metastring_id('excerpt2', true); // get the metastring id, create the metastring if it does not exist
 	$excerpt3_id = elgg_get_metastring_id('excerpt3', true);
 
-	$poll_choice2_id = elgg_get_metastring_id('poll_choice2', true);	// get the metastring id, create the metastring if it does not exist
+	$poll_choice2_id = elgg_get_metastring_id('poll_choice2', true); // get the metastring id, create the metastring if it does not exist
 	$poll_choice3_id = elgg_get_metastring_id('poll_choice3', true);
 
 	$db_prefix = elgg_get_config('dbprefix');
@@ -61,8 +61,8 @@ 
 	}
 	echo "<div class='checkbox'>";
 	echo elgg_echo('wet4:ExtTheme');
-	echo "<label>".elgg_view('input/checkbox',$options);
-	echo elgg_echo('wet4:ExtThemeYes')."</label>";
+	echo "<label>" . elgg_view('input/checkbox', $options);
+	echo elgg_echo('wet4:ExtThemeYes') . "</label>";
 	echo "</div>";
 
 	echo "<div>";
@@ -83,6 +83,6 @@ 
 	if (elgg_get_plugin_setting('deptActivity', 'wet4')) {
 		$options['checked'] = 'checked';
 	}
-	echo "<label>".elgg_view('input/checkbox',$options)." Add Newsfeed-like page for user's department</label>";
+	echo "<label>" . elgg_view('input/checkbox', $options) . " Add Newsfeed-like page for user's department</label>";
 }
 ?>

Braces +1 added lines, -2 removed lines

@@ -50,8 +50,7 @@
 	));
 
 	access_show_hidden_entities($access_status);
-}
-else {
+} else {
 	$options = array(
 		'name' => 'params[ExtTheme]',
 		'value' => 1

mod/wet4/views/default/activity/entity.php

Spacing +1 added lines, -1 removed lines

@@ -17,7 +17,7 @@
 $user_icon = elgg_view_entity_icon($user, 'small');
 $user_link = "<a href=\"{$user->getURL()}\">$user->name</a>";
 
-$title = gc_explode_translation($entity->getDisplayName(),$lang);
+$title = gc_explode_translation($entity->getDisplayName(), $lang);
 if (!$title) {
 	if ($entity->description) {
 		$title = elgg_get_excerpt($entity->description, 30);

mod/wet4/views/default/icon/object/image.php

Spacing +4 added lines, -4 removed lines

@@ -29,9 +29,9 @@ 
 }
 
 if (!isset($vars['title'])) {
-	if($entity->title3){
+	if ($entity->title3) {
 		$title = gc_explode_translation($entity->title3, $lang);
-	}else{
+	} else {
 		$title = $entity->getTitle();
 	}
 
@@ -50,11 +50,11 @@ 
 }
 $class = " $class center-block img-responsive";
 
-$time = time();// add time to fix cache problem with image rotation
+$time = time(); // add time to fix cache problem with image rotation
 $img_src = $entity->getIconURL($vars['size']);
 $img_src = elgg_format_url($img_src);
 $img = elgg_view('output/img', array(
-	'src' => $img_src.''.$time,
+	'src' => $img_src . '' . $time,
 	'class' => $class,
 	'title' => $title,
 	'alt' => $title,

Braces +1 added lines, -1 removed lines

@@ -31,7 +31,7 @@
 if (!isset($vars['title'])) {
 	if($entity->title3){
 		$title = gc_explode_translation($entity->title3, $lang);
-	}else{
+	} else{
 		$title = $entity->getTitle();
 	}