gctools-outilsgc / gcconnex

mod/wet4/views/default/page/elements/profile_card.php

Indentation +3 added lines, -3 removed lines

@@ -24,9 +24,9 @@
 
         <div class="mrgn-tp-sm">
             <?php 
-                //EW - change to display new badge
-            echo elgg_view_entity_icon(elgg_get_logged_in_user_entity(), 'medium', array('use_hover' => false, 'class' => 'pro-avatar', 'force_size' => true,)); 
-                ?>
+				//EW - change to display new badge
+			echo elgg_view_entity_icon(elgg_get_logged_in_user_entity(), 'medium', array('use_hover' => false, 'class' => 'pro-avatar', 'force_size' => true,)); 
+				?>
            </div>
     </div>
 

mod/wet4/views/default/page/elements/messages.php

Indentation +18 added lines, -18 removed lines

@@ -21,31 +21,31 @@
 echo '<li class="hidden wb-invisible"></li>';
 
 if (isset($vars['object']) && is_array($vars['object']) && sizeof($vars['object']) > 0) {
-    $num=0;
-    foreach ($vars['object'] as $type => $list ) {
-        if($num==0){
+	$num=0;
+	foreach ($vars['object'] as $type => $list ) {
+		if($num==0){
 
-            if($type=='error')
-            {
-                echo '<li data-dismiss="alert" class="fade in alert alert-'.$type.' clearfix" >'; //elgg-system-messages custom-message
-            }else
-            {
-                echo '<li data-dismiss="alert" class="fade in elgg-system-messages clearfix custom-message alert alert-'.$type.' ">';
-            }
-            echo '<ul class="list-unstyled" >';
-            echo '<a href="#" class="close" tabindex="0" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></a>';
-        }
+			if($type=='error')
+			{
+				echo '<li data-dismiss="alert" class="fade in alert alert-'.$type.' clearfix" >'; //elgg-system-messages custom-message
+			}else
+			{
+				echo '<li data-dismiss="alert" class="fade in elgg-system-messages clearfix custom-message alert alert-'.$type.' ">';
+			}
+			echo '<ul class="list-unstyled" >';
+			echo '<a href="#" class="close" tabindex="0" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></a>';
+		}
 		foreach ($list as $message) {
-            $num=$num+1;
+			$num=$num+1;
 			echo '<li class="col-sm-11">';
 			echo '<span role="alert">'.elgg_autop($message) .'</span>';
 			echo '</li>';
 		}
 	}
-    if($num>0){
-        echo '</ul>';
-        echo '</li>';
-    }
+	if($num>0){
+		echo '</ul>';
+		echo '</li>';
+	}
 }
 
 echo '</ul>';

Spacing +10 added lines, -10 removed lines

@@ -21,28 +21,28 @@
 echo '<li class="hidden wb-invisible"></li>';
 
 if (isset($vars['object']) && is_array($vars['object']) && sizeof($vars['object']) > 0) {
-    $num=0;
-    foreach ($vars['object'] as $type => $list ) {
-        if($num==0){
+    $num = 0;
+    foreach ($vars['object'] as $type => $list) {
+        if ($num == 0) {
 
-            if($type=='error')
+            if ($type == 'error')
             {
-                echo '<li data-dismiss="alert" class="fade in alert alert-'.$type.' clearfix" >'; //elgg-system-messages custom-message
-            }else
+                echo '<li data-dismiss="alert" class="fade in alert alert-' . $type . ' clearfix" >'; //elgg-system-messages custom-message
+            } else
             {
-                echo '<li data-dismiss="alert" class="fade in elgg-system-messages clearfix custom-message alert alert-'.$type.' ">';
+                echo '<li data-dismiss="alert" class="fade in elgg-system-messages clearfix custom-message alert alert-' . $type . ' ">';
             }
             echo '<ul class="list-unstyled" >';
             echo '<a href="#" class="close" tabindex="0" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></a>';
         }
 		foreach ($list as $message) {
-            $num=$num+1;
+            $num = $num + 1;
 			echo '<li class="col-sm-11">';
-			echo '<span role="alert">'.elgg_autop($message) .'</span>';
+			echo '<span role="alert">' . elgg_autop($message) . '</span>';
 			echo '</li>';
 		}
 	}
-    if($num>0){
+    if ($num > 0) {
         echo '</ul>';
         echo '</li>';
     }

Braces +1 added lines, -1 removed lines

@@ -28,7 +28,7 @@
             if($type=='error')
             {
                 echo '<li data-dismiss="alert" class="fade in alert alert-'.$type.' clearfix" >'; //elgg-system-messages custom-message
-            }else
+            } else
             {
                 echo '<li data-dismiss="alert" class="fade in elgg-system-messages clearfix custom-message alert alert-'.$type.' ">';
             }

mod/wet4/views/default/page/elements/head.php

Indentation +25 added lines, -25 removed lines

@@ -47,25 +47,25 @@ 
   // check if this is a (user or group) profile
   if ($elgg_entity instanceof ElggUser || $elgg_entity instanceof ElggGroup) {
 
-    // check if this is a user or a group (TODO: displays the title twice if either language is not present)
-    $page_title = ($elgg_entity instanceof ElggUser) ? $elgg_entity->name : gc_explode_translation($elgg_entity->name, 'en').' / '.gc_explode_translation($elgg_entity->name, 'fr');
+	// check if this is a user or a group (TODO: displays the title twice if either language is not present)
+	$page_title = ($elgg_entity instanceof ElggUser) ? $elgg_entity->name : gc_explode_translation($elgg_entity->name, 'en').' / '.gc_explode_translation($elgg_entity->name, 'fr');
 
   } else { 
 
-    $page_title = gc_explode_translation($elgg_entity->title, 'en').' / '.gc_explode_translation($elgg_entity->title, 'fr');
-    // if there is no title (meaning only a slash is present) because there is no way to retrieve the entity
-    if (trim($page_title) === '/') {
-      $current_url = explode('/', $_SERVER['REQUEST_URI']);
-      $page_entity = get_entity($current_url[count($current_url) - 1]);
+	$page_title = gc_explode_translation($elgg_entity->title, 'en').' / '.gc_explode_translation($elgg_entity->title, 'fr');
+	// if there is no title (meaning only a slash is present) because there is no way to retrieve the entity
+	if (trim($page_title) === '/') {
+	  $current_url = explode('/', $_SERVER['REQUEST_URI']);
+	  $page_entity = get_entity($current_url[count($current_url) - 1]);
     
-      // if the entity is still not found
-      if (!($page_entity instanceof ElggEntity))
-        $page_entity = get_entity($current_url[count($current_url) - 2]);
+	  // if the entity is still not found
+	  if (!($page_entity instanceof ElggEntity))
+		$page_entity = get_entity($current_url[count($current_url) - 2]);
 
-      $page_title = (gc_explode_translation($page_entity->title, 'en') !== gc_explode_translation($page_entity->title, 'fr')) 
-        ? gc_explode_translation($page_entity->title, 'en').' / '.gc_explode_translation($page_entity->title, 'fr') 
-        : gc_explode_translation($page_entity->title, 'en');
-    }
+	  $page_title = (gc_explode_translation($page_entity->title, 'en') !== gc_explode_translation($page_entity->title, 'fr')) 
+		? gc_explode_translation($page_entity->title, 'en').' / '.gc_explode_translation($page_entity->title, 'fr') 
+		: gc_explode_translation($page_entity->title, 'en');
+	}
 
   }
 
@@ -75,13 +75,13 @@ 
   $page_entity = get_entity($current_url[count($current_url) - 1]);
 
   if ($elgg_entity instanceof ElggUser || $elgg_entity instanceof ElggGroup) {
-    $page_title = ($elgg_entity instanceof ElggUser) ? $vars['title'] : gc_explode_translation($elgg_entity->name, $gc_language) . " : {$vars['title']}";
+	$page_title = ($elgg_entity instanceof ElggUser) ? $vars['title'] : gc_explode_translation($elgg_entity->name, $gc_language) . " : {$vars['title']}";
   } else {
 
-      if (!($page_entity instanceof ElggEntity))
-        $page_entity = get_entity($current_url[count($current_url) - 2]);
-      // wire post does not have any title!
-      $page_title = gc_explode_translation($page_entity->title, $gc_language);
+	  if (!($page_entity instanceof ElggEntity))
+		$page_entity = get_entity($current_url[count($current_url) - 2]);
+	  // wire post does not have any title!
+	  $page_title = gc_explode_translation($page_entity->title, $gc_language);
   }
 
 }
@@ -153,14 +153,14 @@ 
 if ($my_page_entity) {
 
   if (elgg_instanceof($my_page_entity, 'group')) {
-      $desc = elgg_strip_tags(elgg_get_excerpt(gc_explode_translation($my_page_entity->description,get_current_language())));
-      $briefdesc = gc_explode_translation($my_page_entity->briefdescription,get_current_language());
+	  $desc = elgg_strip_tags(elgg_get_excerpt(gc_explode_translation($my_page_entity->description,get_current_language())));
+	  $briefdesc = gc_explode_translation($my_page_entity->briefdescription,get_current_language());
   } else if (elgg_instanceof($my_page_entity, 'user')) {
-      $desc = elgg_echo('profile:title', array(gc_explode_translation($my_page_entity->name,get_current_language())));
-      $briefdesc = elgg_echo('profile:title', array(gc_explode_translation($my_page_entity->name,get_current_language())));
+	  $desc = elgg_echo('profile:title', array(gc_explode_translation($my_page_entity->name,get_current_language())));
+	  $briefdesc = elgg_echo('profile:title', array(gc_explode_translation($my_page_entity->name,get_current_language())));
   } else {
-      $desc = gc_explode_translation($my_page_entity->title,get_current_language());
-      $briefdesc = gc_explode_translation($my_page_entity->title,get_current_language());
+	  $desc = gc_explode_translation($my_page_entity->title,get_current_language());
+	  $briefdesc = gc_explode_translation($my_page_entity->title,get_current_language());
   }
 
   $pubDate = date ("Y-m-d", elgg_get_excerpt($my_page_entity->time_created));

Spacing +22 added lines, -22 removed lines

@@ -48,11 +48,11 @@ 
   if ($elgg_entity instanceof ElggUser || $elgg_entity instanceof ElggGroup) {
 
     // check if this is a user or a group (TODO: displays the title twice if either language is not present)
-    $page_title = ($elgg_entity instanceof ElggUser) ? $elgg_entity->name : gc_explode_translation($elgg_entity->name, 'en').' / '.gc_explode_translation($elgg_entity->name, 'fr');
+    $page_title = ($elgg_entity instanceof ElggUser) ? $elgg_entity->name : gc_explode_translation($elgg_entity->name, 'en') . ' / ' . gc_explode_translation($elgg_entity->name, 'fr');
 
   } else { 
 
-    $page_title = gc_explode_translation($elgg_entity->title, 'en').' / '.gc_explode_translation($elgg_entity->title, 'fr');
+    $page_title = gc_explode_translation($elgg_entity->title, 'en') . ' / ' . gc_explode_translation($elgg_entity->title, 'fr');
     // if there is no title (meaning only a slash is present) because there is no way to retrieve the entity
     if (trim($page_title) === '/') {
       $current_url = explode('/', $_SERVER['REQUEST_URI']);
@@ -63,7 +63,7 @@ 
         $page_entity = get_entity($current_url[count($current_url) - 2]);
 
       $page_title = (gc_explode_translation($page_entity->title, 'en') !== gc_explode_translation($page_entity->title, 'fr')) 
-        ? gc_explode_translation($page_entity->title, 'en').' / '.gc_explode_translation($page_entity->title, 'fr') 
+        ? gc_explode_translation($page_entity->title, 'en') . ' / ' . gc_explode_translation($page_entity->title, 'fr') 
         : gc_explode_translation($page_entity->title, 'en');
     }
 
@@ -153,18 +153,18 @@ 
 if ($my_page_entity) {
 
   if (elgg_instanceof($my_page_entity, 'group')) {
-      $desc = elgg_strip_tags(elgg_get_excerpt(gc_explode_translation($my_page_entity->description,get_current_language())));
-      $briefdesc = gc_explode_translation($my_page_entity->briefdescription,get_current_language());
+      $desc = elgg_strip_tags(elgg_get_excerpt(gc_explode_translation($my_page_entity->description, get_current_language())));
+      $briefdesc = gc_explode_translation($my_page_entity->briefdescription, get_current_language());
   } else if (elgg_instanceof($my_page_entity, 'user')) {
-      $desc = elgg_echo('profile:title', array(gc_explode_translation($my_page_entity->name,get_current_language())));
-      $briefdesc = elgg_echo('profile:title', array(gc_explode_translation($my_page_entity->name,get_current_language())));
+      $desc = elgg_echo('profile:title', array(gc_explode_translation($my_page_entity->name, get_current_language())));
+      $briefdesc = elgg_echo('profile:title', array(gc_explode_translation($my_page_entity->name, get_current_language())));
   } else {
-      $desc = gc_explode_translation($my_page_entity->title,get_current_language());
-      $briefdesc = gc_explode_translation($my_page_entity->title,get_current_language());
+      $desc = gc_explode_translation($my_page_entity->title, get_current_language());
+      $briefdesc = gc_explode_translation($my_page_entity->title, get_current_language());
   }
 
-  $pubDate = date ("Y-m-d", elgg_get_excerpt($my_page_entity->time_created));
-  $lastModDate = date ("Y-m-d", elgg_get_excerpt($my_page_entity->time_updated));
+  $pubDate = date("Y-m-d", elgg_get_excerpt($my_page_entity->time_created));
+  $lastModDate = date("Y-m-d", elgg_get_excerpt($my_page_entity->time_updated));
 
   $datemeta = '<meta name="dcterms.issued" title="W3CDTF" content="' . $pubDate . '"/>';
   $datemeta .= '<meta name="dcterms.modified" title="W3CDTF" content="' . $lastModDate . '" />';
@@ -182,23 +182,23 @@ 
 
 // cyu - prevent crawler to index unsaved draft
 if ($my_page_entity instanceof ElggObject) {
-  if ($my_page_entity->getSubtype() === 'blog' && strcmp($my_page_entity->status,'unsaved_draft') == 0)
+  if ($my_page_entity->getSubtype() === 'blog' && strcmp($my_page_entity->status, 'unsaved_draft') == 0)
   	echo '<meta name="robots" content="noindex, follow">';
 }
 
 // determine whether to index page depending on the url
 $no_index_array = array(
-  'activity/','activity/all','activity/owner','activity/friends','activity_tabs/mydept','activity_tabs/otherdept',
-  'blog/all','blog/owner/','blog/group','blog/friends',
-  'bookmarks/all','bookmarks/owner','bookmarks/friends','bookmarks/group',
+  'activity/', 'activity/all', 'activity/owner', 'activity/friends', 'activity_tabs/mydept', 'activity_tabs/otherdept',
+  'blog/all', 'blog/owner/', 'blog/group', 'blog/friends',
+  'bookmarks/all', 'bookmarks/owner', 'bookmarks/friends', 'bookmarks/group',
   'event_calendar/list',
-  'file/all','file/owner','file/friends', 'file/group',
-  'photos/all','photos/owner','photos/friends',
-  'members','members/popular','/members/online','members/department',
-  'polls/all','polls/owner','polls/friends/',
-  'groups/all','groups/owner','groups/invitation',
+  'file/all', 'file/owner', 'file/friends', 'file/group',
+  'photos/all', 'photos/owner', 'photos/friends',
+  'members', 'members/popular', '/members/online', 'members/department',
+  'polls/all', 'polls/owner', 'polls/friends/',
+  'groups/all', 'groups/owner', 'groups/invitation',
   'photos/siteimagesowner', 'photos/siteimagesall',
-  'thewire/all','thewire/owner','thewire/friends',
+  'thewire/all', 'thewire/owner', 'thewire/friends',
   'file_tools/list', 'newsfeed/', 'groups/', 'discussion/owner', 'ideas/group', 'photos/group', 'pages/all', 'missions/main',
   'pages/history', 'splash/', '/mod', 'login/', 'file/all'
 );
@@ -235,7 +235,7 @@ 
 
 // the wire posts do not have any title, we'll have the page title as the wire post
 if ($page_entity instanceof ElggEntity && $page_entity->getSubtype() === 'thewire') {
-  $page_title = elgg_echo('thewire:head:title', 'en').' / '.elgg_echo('thewire:head:title', 'fr');
+  $page_title = elgg_echo('thewire:head:title', 'en') . ' / ' . elgg_echo('thewire:head:title', 'fr');
 }
 
 // Meta tags for the page

Braces +17 added lines, -10 removed lines

@@ -59,8 +59,9 @@ 
       $page_entity = get_entity($current_url[count($current_url) - 1]);
     
       // if the entity is still not found
-      if (!($page_entity instanceof ElggEntity))
-        $page_entity = get_entity($current_url[count($current_url) - 2]);
+      if (!($page_entity instanceof ElggEntity)) {
+              $page_entity = get_entity($current_url[count($current_url) - 2]);
+      }
 
       $page_title = (gc_explode_translation($page_entity->title, 'en') !== gc_explode_translation($page_entity->title, 'fr')) 
         ? gc_explode_translation($page_entity->title, 'en').' / '.gc_explode_translation($page_entity->title, 'fr') 
@@ -78,8 +79,9 @@ 
     $page_title = ($elgg_entity instanceof ElggUser) ? $vars['title'] : gc_explode_translation($elgg_entity->name, $gc_language) . " : {$vars['title']}";
   } else {
 
-      if (!($page_entity instanceof ElggEntity))
-        $page_entity = get_entity($current_url[count($current_url) - 2]);
+      if (!($page_entity instanceof ElggEntity)) {
+              $page_entity = get_entity($current_url[count($current_url) - 2]);
+      }
       // wire post does not have any title!
       $page_title = gc_explode_translation($page_entity->title, $gc_language);
   }
@@ -177,14 +179,17 @@ 
 }
 
 $creator = gc_explode_translation(elgg_get_page_owner_entity()->name, get_current_language());
-if (!$creator) $creator = 'GCconnex';
+if (!$creator) {
+	$creator = 'GCconnex';
+}
 
 
 // cyu - prevent crawler to index unsaved draft
 if ($my_page_entity instanceof ElggObject) {
-  if ($my_page_entity->getSubtype() === 'blog' && strcmp($my_page_entity->status,'unsaved_draft') == 0)
-  	echo '<meta name="robots" content="noindex, follow">';
-}
+  if ($my_page_entity->getSubtype() === 'blog' && strcmp($my_page_entity->status,'unsaved_draft') == 0) {
+    	echo '<meta name="robots" content="noindex, follow">';
+  }
+  }
 
 // determine whether to index page depending on the url
 $no_index_array = array(
@@ -224,14 +229,16 @@ 
 
 // group profile url with the group name - noindex
 preg_match("/groups\/profile\/[\d]*\/.*\/?/", $_SERVER['REQUEST_URI'], $output_array);
-if (sizeof($output_array) > 0)
+if (sizeof($output_array) > 0) {
    echo '<meta name="robots" content="noindex, follow">';
+}
 
 
 // if user profile url has a slash at the end, do not index
 preg_match("/\/profile\/.*\//", $_SERVER['REQUEST_URI'], $output_array);
-if (sizeof($output_array) > 0)
+if (sizeof($output_array) > 0) {
   echo '<meta name="robots" content="noindex, follow">';
+}
 
 // the wire posts do not have any title, we'll have the page title as the wire post
 if ($page_entity instanceof ElggEntity && $page_entity->getSubtype() === 'thewire') {

mod/wet4/views/default/page/elements/navbar.php

Spacing +1 added lines, -1 removed lines

@@ -14,7 +14,7 @@
 
 <nav role="navigation" id="wb-sm"  data-trgt="mb-pnl" class="wb-menu visible-md visible-lg" typeof="SiteNavigationElement">
 		<div class="container nvbar"> <!-- container for screen reader text and list -->
-            <h2><?php echo elgg_echo('wet:topicmenu');?></h2>
+            <h2><?php echo elgg_echo('wet:topicmenu'); ?></h2>
             <div class="row">
                 
                     <?php echo elgg_view_menu('site'); ?>

mod/wet4/views/default/page/elements/wavyblue.php

Indentation +4 added lines, -4 removed lines

@@ -12,14 +12,14 @@
 $site_url = elgg_get_site_url();
 //check lang of current user and change Canada graphic based on language
 if( _elgg_services()->session->get('language') == 'en'){
-    $graphic_lang = 'en';
+	$graphic_lang = 'en';
 }else{
-    $graphic_lang = 'fr';
+	$graphic_lang = 'fr';
 }
 //If GCconnex theme is not active, display the site name as a link in the top left
 $site_name = elgg_view('output/url', array(
-    'href'=>elgg_get_site_url(),
-    'text'=>elgg_get_config('sitename'),
+	'href'=>elgg_get_site_url(),
+	'text'=>elgg_get_config('sitename'),
 
 ));
 

Spacing +4 added lines, -4 removed lines

@@ -11,9 +11,9 @@ 
 
 $site_url = elgg_get_site_url();
 //check lang of current user and change Canada graphic based on language
-if( _elgg_services()->session->get('language') == 'en'){
+if (_elgg_services()->session->get('language') == 'en') {
     $graphic_lang = 'en';
-}else{
+} else {
     $graphic_lang = 'fr';
 }
 //If GCconnex theme is not active, display the site name as a link in the top left
@@ -33,11 +33,11 @@ 
 
             <section class="wb-mb-links col-xs-4 col-sm-3 visible-sm visible-xs" id="wb-glb-mn">
                 <ul class="list-inline text-right chvrn">
-                <li><a href="#mb-pnl" title="<?php echo elgg_echo('wet:search');?>" aria-controls="mb-pnl" class="overlay-lnk" role="button">
+                <li><a href="#mb-pnl" title="<?php echo elgg_echo('wet:search'); ?>" aria-controls="mb-pnl" class="overlay-lnk" role="button">
                         <span class="glyphicon glyphicon-search">
                             <span class="glyphicon glyphicon-th-list">
                             <span class="wb-inv">
-                                <?php echo elgg_echo('wet:search');?>
+                                <?php echo elgg_echo('wet:search'); ?>
                             </span>
                             </span>
                         </span>

Braces +1 added lines, -1 removed lines

@@ -13,7 +13,7 @@
 //check lang of current user and change Canada graphic based on language
 if( _elgg_services()->session->get('language') == 'en'){
     $graphic_lang = 'en';
-}else{
+} else{
     $graphic_lang = 'fr';
 }
 //If GCconnex theme is not active, display the site name as a link in the top left

mod/wet4/views/default/page/elements/comments.php

Indentation +17 added lines, -17 removed lines

@@ -36,26 +36,26 @@
 unset($vars['internalid']);
 
 //check how many comments topic has
-    $num_replies = elgg_get_entities(array(
-        'type' => 'object',
-        'subtype' => 'comment',
-        'container_guid' => $vars['entity']->guid,
-        'count' => true,
-        'distinct' => false,
-    ));
+	$num_replies = elgg_get_entities(array(
+		'type' => 'object',
+		'subtype' => 'comment',
+		'container_guid' => $vars['entity']->guid,
+		'count' => true,
+		'distinct' => false,
+	));
     
-        //Nick - keep the heading so users know comments are supposed to be here!
-        //Nick Update - if this is in a group the comments will be an h3
-        if($page_owner instanceof ElggGroup){
-            echo '<h3 class="panel-title mrgn-bttm-md mrgn-tp-md h2">' . elgg_echo('comments') . '</h3>';
-        }else{
-            echo '<h2 class="panel-title mrgn-bttm-md mrgn-tp-md">' . elgg_echo('comments') . '</h2>';
-        }
+		//Nick - keep the heading so users know comments are supposed to be here!
+		//Nick Update - if this is in a group the comments will be an h3
+		if($page_owner instanceof ElggGroup){
+			echo '<h3 class="panel-title mrgn-bttm-md mrgn-tp-md h2">' . elgg_echo('comments') . '</h3>';
+		}else{
+			echo '<h2 class="panel-title mrgn-bttm-md mrgn-tp-md">' . elgg_echo('comments') . '</h2>';
+		}
         
     
-        if($num_replies == 0){
-            echo '<div>'.elgg_echo('generic_comment:none').'</div>';
-        }
+		if($num_replies == 0){
+			echo '<div>'.elgg_echo('generic_comment:none').'</div>';
+		}
 
 $content = elgg_list_entities(array(
 	'type' => 'object',

Spacing +4 added lines, -4 removed lines

@@ -46,15 +46,15 @@
     
         //Nick - keep the heading so users know comments are supposed to be here!
         //Nick Update - if this is in a group the comments will be an h3
-        if($page_owner instanceof ElggGroup){
+        if ($page_owner instanceof ElggGroup) {
             echo '<h3 class="panel-title mrgn-bttm-md mrgn-tp-md h2">' . elgg_echo('comments') . '</h3>';
-        }else{
+        } else {
             echo '<h2 class="panel-title mrgn-bttm-md mrgn-tp-md">' . elgg_echo('comments') . '</h2>';
         }
         
     
-        if($num_replies == 0){
-            echo '<div>'.elgg_echo('generic_comment:none').'</div>';
+        if ($num_replies == 0) {
+            echo '<div>' . elgg_echo('generic_comment:none') . '</div>';
         }
 
 $content = elgg_list_entities(array(

Braces +3 added lines, -2 removed lines

@@ -48,7 +48,7 @@ 
         //Nick Update - if this is in a group the comments will be an h3
         if($page_owner instanceof ElggGroup){
             echo '<h3 class="panel-title mrgn-bttm-md mrgn-tp-md h2">' . elgg_echo('comments') . '</h3>';
-        }else{
+        } else{
             echo '<h2 class="panel-title mrgn-bttm-md mrgn-tp-md">' . elgg_echo('comments') . '</h2>';
         }
         
@@ -69,8 +69,9 @@ 
 	'url_fragment' => $attr['id'],
 ));
 
-if ($show_add_form)
+if ($show_add_form) {
 	$content .= elgg_view_form('comment/save', array(), $vars);
+}
 
 
 echo elgg_format_element('div', $attr, $content);

mod/wet4/views/default/page/elements/user_menu.php

Indentation +84 added lines, -84 removed lines

@@ -23,8 +23,8 @@ 
 
 
 elgg_register_menu_item('user_menu_subMenu', array(
-    'name' => 'profile_card',
-    'text' => elgg_view('page/elements/profile_card'),
+	'name' => 'profile_card',
+	'text' => elgg_view('page/elements/profile_card'),
 ));
 
 $dropdown = elgg_view_menu('user_menu_subMenu', array('class' => 'dropdown-menu user-menu pull-right subMenu'));
@@ -38,15 +38,15 @@ 
 //admin link
 //check to see if user is an admin
 if(elgg_is_admin_logged_in()) {
-    elgg_register_menu_item('user_menu', array(
-        'name' => 'Admin',
-        'href' => $site_url . 'admin',
-        'text' => '<i class="fa fa-wrench fa-lg mrgn-rght-sm"></i>' . '<span class="hidden-xs">Admin</span>',
-        'title' => 'Admin',
-        'item_class' => 'brdr-rght',
-        'class' => '',
-        'priority' => '0',
-    ));
+	elgg_register_menu_item('user_menu', array(
+		'name' => 'Admin',
+		'href' => $site_url . 'admin',
+		'text' => '<i class="fa fa-wrench fa-lg mrgn-rght-sm"></i>' . '<span class="hidden-xs">Admin</span>',
+		'title' => 'Admin',
+		'item_class' => 'brdr-rght',
+		'class' => '',
+		'priority' => '0',
+	));
 }
 
 
@@ -55,122 +55,122 @@ 
 $breakup = explode('.', $email);
 $initials = substr($breakup[0], 0, 1) . substr($breakup[1], 0, 1);
 if ($user_avatar) { //show avatar if they have one
-    $dropdown_avatar = '<span><img class="img-circle mrgn-rght-sm" src="'.$user_avatar.'"></span>';
+	$dropdown_avatar = '<span><img class="img-circle mrgn-rght-sm" src="'.$user_avatar.'"></span>';
 
-    //EW - render to display badge instead
-    $dropdown_avatar = elgg_view_entity_icon(elgg_get_logged_in_user_entity(), 'small', array('use_hover' => false, 'use_link' => false, 'class' => 'userMenuAvatar'));
+	//EW - render to display badge instead
+	$dropdown_avatar = elgg_view_entity_icon(elgg_get_logged_in_user_entity(), 'small', array('use_hover' => false, 'use_link' => false, 'class' => 'userMenuAvatar'));
 } else { // show initials if the don't
-    $dropdown_avatar = '<span class="init-badge">' . strtoupper($initials) . '</span>';
+	$dropdown_avatar = '<span class="init-badge">' . strtoupper($initials) . '</span>';
 }
 
 
 //create user menu
 elgg_register_menu_item('user_menu', array(
-    'name' => 'Profile',
-    'text' => $dropdown_avatar. '<span class="hidden-xs">' . $displayName . '</span><i class="fa fa-caret-down fa-lg mrgn-lft-sm"></i>' . $dropdown,
-    'title' => elgg_echo('userMenu:usermenuTitle'),
-    'item_class' => 'brdr-lft dropdown',
-    'data-toggle' => 'dropdown',
-    'class' => 'dropdown-toggle  dropdownToggle dd-close',
-    'priority' => '3',
-    'aria-hidden' => 'true',
-    'tab-index'=>'0', //If the tab index is gone perhaps the screen reader will skip it? What about sighted people with out mouse, need to test, just an idea :3
-    //Google has some kind of tab loop when the the card is open, so when the user tabs they only tab through the options in the card
-    ));
+	'name' => 'Profile',
+	'text' => $dropdown_avatar. '<span class="hidden-xs">' . $displayName . '</span><i class="fa fa-caret-down fa-lg mrgn-lft-sm"></i>' . $dropdown,
+	'title' => elgg_echo('userMenu:usermenuTitle'),
+	'item_class' => 'brdr-lft dropdown',
+	'data-toggle' => 'dropdown',
+	'class' => 'dropdown-toggle  dropdownToggle dd-close',
+	'priority' => '3',
+	'aria-hidden' => 'true',
+	'tab-index'=>'0', //If the tab index is gone perhaps the screen reader will skip it? What about sighted people with out mouse, need to test, just an idea :3
+	//Google has some kind of tab loop when the the card is open, so when the user tabs they only tab through the options in the card
+	));
 
 
 //screen reader links
 elgg_register_menu_item('user_menu', array(
-    'name' => 'sr_profile',
-    'text' => elgg_echo('userMenu:profile'),
-    'href' => 'profile/'.elgg_get_logged_in_user_entity()->username,
-    'item_class' => 'wb-invisible sr_menu_item',
-    'tabindex' => '-1',
+	'name' => 'sr_profile',
+	'text' => elgg_echo('userMenu:profile'),
+	'href' => 'profile/'.elgg_get_logged_in_user_entity()->username,
+	'item_class' => 'wb-invisible sr_menu_item',
+	'tabindex' => '-1',
 ));
 
 elgg_register_menu_item('user_menu', array(
-    'name' => 'sr_account',
-    'text' => elgg_echo('userMenu:account'),
-    'href' => 'settings/user/'.elgg_get_logged_in_user_entity()->username,
-    'item_class' => 'wb-invisible sr_menu_item',
-    'tabindex' => '-1',
+	'name' => 'sr_account',
+	'text' => elgg_echo('userMenu:account'),
+	'href' => 'settings/user/'.elgg_get_logged_in_user_entity()->username,
+	'item_class' => 'wb-invisible sr_menu_item',
+	'tabindex' => '-1',
 ));
 
 elgg_register_menu_item('user_menu', array(
-    'name' => 'sr_logout',
-    'text' => elgg_echo('logout'),
-    'href' => 'action/logout',
-    'item_class' => 'wb-invisible sr_menu_item',
-    'tabindex' => '-1',
+	'name' => 'sr_logout',
+	'text' => elgg_echo('logout'),
+	'href' => 'action/logout',
+	'item_class' => 'wb-invisible sr_menu_item',
+	'tabindex' => '-1',
 ));
 
 
 //display new message badge on messages
 if (elgg_is_active_plugin('messages')) {
-    $unread = messages_count_unread_inbox();
+	$unread = messages_count_unread_inbox();
 
-    $title = ' - ' . $unread . ' ' . elgg_echo('messages:unreadmessages');
+	$title = ' - ' . $unread . ' ' . elgg_echo('messages:unreadmessages');
 
-    //display 9+ insted of huge numbers in notif badge
-    if ($unread >= 10) {
-        //$unread = '9+';
-    }
+	//display 9+ insted of huge numbers in notif badge
+	if ($unread >= 10) {
+		//$unread = '9+';
+	}
 
-    $msgbadge = "<span aria-hidden='true' class='notif-badge'>" . $unread . "</span>";
+	$msgbadge = "<span aria-hidden='true' class='notif-badge'>" . $unread . "</span>";
 
-    if ($unread == 0) {
-        $msgbadge = '';
-        $title = '';
-    }
+	if ($unread == 0) {
+		$msgbadge = '';
+		$title = '';
+	}
 }
 
 // messages inbox menu item
 //Nick - Removed the href and created my own in the text to hold hidden messages dropdown
 elgg_register_menu_item('user_menu', array(
-    'name' => 'messages',
-    'text' => '<i class="fa fa-envelope mrgn-rght-sm mrgn-tp-sm fa-lg"></i><span class="hidden-xs" aria-hidden="true">' . elgg_echo('messages') . '</span>' . $msgbadge .'<span class="wb-inv">'.elgg_echo('userMenu:messages') . $title.' </span></a>'.$focus_dd .$ajax_dd_messages,
-    'title' => elgg_echo('userMenu:messages') . $title,
-    'item_class' => 'brdr-lft messagesLabel close-msg-dd',
-    'data-toggle' => '',
-    'id'=>'messagesLabel',
-    'class' => '',
-    'data-dd-type'=>'msg_dd',
-    'priority' => '2',
-    'href' => elgg_get_site_url().'messages/inbox/' . $user,
+	'name' => 'messages',
+	'text' => '<i class="fa fa-envelope mrgn-rght-sm mrgn-tp-sm fa-lg"></i><span class="hidden-xs" aria-hidden="true">' . elgg_echo('messages') . '</span>' . $msgbadge .'<span class="wb-inv">'.elgg_echo('userMenu:messages') . $title.' </span></a>'.$focus_dd .$ajax_dd_messages,
+	'title' => elgg_echo('userMenu:messages') . $title,
+	'item_class' => 'brdr-lft messagesLabel close-msg-dd',
+	'data-toggle' => '',
+	'id'=>'messagesLabel',
+	'class' => '',
+	'data-dd-type'=>'msg_dd',
+	'priority' => '2',
+	'href' => elgg_get_site_url().'messages/inbox/' . $user,
 
-    ));
+	));
 
 
 //display new message badge on messages
 if (elgg_is_active_plugin('messages')) {
-    $unread = messages_count_unread_notifications();
+	$unread = messages_count_unread_notifications();
 
-    $title = ' - ' . $unread . ' ' . elgg_echo('messages:unreadmessages');
+	$title = ' - ' . $unread . ' ' . elgg_echo('messages:unreadmessages');
 
-    //display 9+ insted of huge numbers in notif badge
-    if ($unread >= 10) {
-        //$unread = '9+';
-    }
+	//display 9+ insted of huge numbers in notif badge
+	if ($unread >= 10) {
+		//$unread = '9+';
+	}
 
-    $msgbadge = "<span aria-hidden='true' class='notif-badge'>" . $unread . "</span>";
+	$msgbadge = "<span aria-hidden='true' class='notif-badge'>" . $unread . "</span>";
 
-    if ($unread == 0) {
-        $msgbadge = '';
-        $title = '';
-    }
+	if ($unread == 0) {
+		$msgbadge = '';
+		$title = '';
+	}
 }
 
 // notifications inbox menu item
 elgg_register_menu_item('user_menu', array(
-    'name' => 'notifications',
-    'text' =>'<i class="fa fa-bell mrgn-rght-sm mrgn-tp-sm fa-lg"></i><span class="hidden-xs" aria-hidden="true">' . elgg_echo('notifications:subscriptions:changesettings') . '</span>' . $msgbadge .'<span class="wb-inv">'.elgg_echo('userMenu:notifications') . $title.' </span></a>'.$focus_dd.'<div>'.$ajax_dd_notification.'</div>',
-    'title' => elgg_echo('userMenu:notifications') . $title,
-    'item_class' => 'brdr-lft messagesLabel close-notif-dd',
-    'class' => '',
-    'priority' => '2',
-    'data-dd-type'=>'notif_dd',
-    'href' => elgg_get_site_url()."messages/notifications/" . $user,
-    ));
+	'name' => 'notifications',
+	'text' =>'<i class="fa fa-bell mrgn-rght-sm mrgn-tp-sm fa-lg"></i><span class="hidden-xs" aria-hidden="true">' . elgg_echo('notifications:subscriptions:changesettings') . '</span>' . $msgbadge .'<span class="wb-inv">'.elgg_echo('userMenu:notifications') . $title.' </span></a>'.$focus_dd.'<div>'.$ajax_dd_notification.'</div>',
+	'title' => elgg_echo('userMenu:notifications') . $title,
+	'item_class' => 'brdr-lft messagesLabel close-notif-dd',
+	'class' => '',
+	'priority' => '2',
+	'data-dd-type'=>'notif_dd',
+	'href' => elgg_get_site_url()."messages/notifications/" . $user,
+	));
 
 
 /*
@@ -182,7 +182,7 @@ 
 // cyu - remove the user menu when the gsa hits the page
 if (elgg_is_active_plugin('gc_fedsearch_gsa') && ((!$gsa_usertest) && strcmp($gsa_agentstring,strtolower($_SERVER['HTTP_USER_AGENT'])) == 0) || strstr(strtolower($_SERVER['HTTP_USER_AGENT']), 'gsa-crawler') !== false )
 {
-    // do nothing
+	// do nothing
 } else {
 	echo elgg_view_menu('user_menu', array('sort_by' => 'priority', 'id' => 'userMenu', 'class' => 'list-inline visited-link'));
 }

Spacing +13 added lines, -13 removed lines

@@ -29,15 +29,15 @@ 
 
 $dropdown = elgg_view_menu('user_menu_subMenu', array('class' => 'dropdown-menu user-menu pull-right subMenu'));
 
-$ajax_dd_messages = '<div aria-hidden="true" id="msg_dd" class="dropdown-menu user-menu-message-dd message-dd-position subMenu">'. elgg_view('page/elements/messages_dd') . '</div>';
+$ajax_dd_messages = '<div aria-hidden="true" id="msg_dd" class="dropdown-menu user-menu-message-dd message-dd-position subMenu">' . elgg_view('page/elements/messages_dd') . '</div>';
 
-$ajax_dd_notification = '<div aria-hidden="true" id="notif_dd"  class="dropdown-menu user-menu-message-dd notif-dd-position subMenu">'. elgg_view('page/elements/notifications_dd') . '</div>';
+$ajax_dd_notification = '<div aria-hidden="true" id="notif_dd"  class="dropdown-menu user-menu-message-dd notif-dd-position subMenu">' . elgg_view('page/elements/notifications_dd') . '</div>';
 
-$focus_dd = '<a href="#" class="focus_dd_link" style="display:none;"><i class="fa fa-caret-down" aria-hidden="true"></i><span class="wb-inv">'.elgg_echo('wet:dd:expand').'</span></a>';
+$focus_dd = '<a href="#" class="focus_dd_link" style="display:none;"><i class="fa fa-caret-down" aria-hidden="true"></i><span class="wb-inv">' . elgg_echo('wet:dd:expand') . '</span></a>';
 
 //admin link
 //check to see if user is an admin
-if(elgg_is_admin_logged_in()) {
+if (elgg_is_admin_logged_in()) {
     elgg_register_menu_item('user_menu', array(
         'name' => 'Admin',
         'href' => $site_url . 'admin',
@@ -55,7 +55,7 @@ 
 $breakup = explode('.', $email);
 $initials = substr($breakup[0], 0, 1) . substr($breakup[1], 0, 1);
 if ($user_avatar) { //show avatar if they have one
-    $dropdown_avatar = '<span><img class="img-circle mrgn-rght-sm" src="'.$user_avatar.'"></span>';
+    $dropdown_avatar = '<span><img class="img-circle mrgn-rght-sm" src="' . $user_avatar . '"></span>';
 
     //EW - render to display badge instead
     $dropdown_avatar = elgg_view_entity_icon(elgg_get_logged_in_user_entity(), 'small', array('use_hover' => false, 'use_link' => false, 'class' => 'userMenuAvatar'));
@@ -67,7 +67,7 @@ 
 //create user menu
 elgg_register_menu_item('user_menu', array(
     'name' => 'Profile',
-    'text' => $dropdown_avatar. '<span class="hidden-xs">' . $displayName . '</span><i class="fa fa-caret-down fa-lg mrgn-lft-sm"></i>' . $dropdown,
+    'text' => $dropdown_avatar . '<span class="hidden-xs">' . $displayName . '</span><i class="fa fa-caret-down fa-lg mrgn-lft-sm"></i>' . $dropdown,
     'title' => elgg_echo('userMenu:usermenuTitle'),
     'item_class' => 'brdr-lft dropdown',
     'data-toggle' => 'dropdown',
@@ -83,7 +83,7 @@ 
 elgg_register_menu_item('user_menu', array(
     'name' => 'sr_profile',
     'text' => elgg_echo('userMenu:profile'),
-    'href' => 'profile/'.elgg_get_logged_in_user_entity()->username,
+    'href' => 'profile/' . elgg_get_logged_in_user_entity()->username,
     'item_class' => 'wb-invisible sr_menu_item',
     'tabindex' => '-1',
 ));
@@ -91,7 +91,7 @@ 
 elgg_register_menu_item('user_menu', array(
     'name' => 'sr_account',
     'text' => elgg_echo('userMenu:account'),
-    'href' => 'settings/user/'.elgg_get_logged_in_user_entity()->username,
+    'href' => 'settings/user/' . elgg_get_logged_in_user_entity()->username,
     'item_class' => 'wb-invisible sr_menu_item',
     'tabindex' => '-1',
 ));
@@ -128,7 +128,7 @@ 
 //Nick - Removed the href and created my own in the text to hold hidden messages dropdown
 elgg_register_menu_item('user_menu', array(
     'name' => 'messages',
-    'text' => '<i class="fa fa-envelope mrgn-rght-sm mrgn-tp-sm fa-lg"></i><span class="hidden-xs" aria-hidden="true">' . elgg_echo('messages') . '</span>' . $msgbadge .'<span class="wb-inv">'.elgg_echo('userMenu:messages') . $title.' </span></a>'.$focus_dd .$ajax_dd_messages,
+    'text' => '<i class="fa fa-envelope mrgn-rght-sm mrgn-tp-sm fa-lg"></i><span class="hidden-xs" aria-hidden="true">' . elgg_echo('messages') . '</span>' . $msgbadge . '<span class="wb-inv">' . elgg_echo('userMenu:messages') . $title . ' </span></a>' . $focus_dd . $ajax_dd_messages,
     'title' => elgg_echo('userMenu:messages') . $title,
     'item_class' => 'brdr-lft messagesLabel close-msg-dd',
     'data-toggle' => '',
@@ -136,7 +136,7 @@ 
     'class' => '',
     'data-dd-type'=>'msg_dd',
     'priority' => '2',
-    'href' => elgg_get_site_url().'messages/inbox/' . $user,
+    'href' => elgg_get_site_url() . 'messages/inbox/' . $user,
 
     ));
 
@@ -163,13 +163,13 @@ 
 // notifications inbox menu item
 elgg_register_menu_item('user_menu', array(
     'name' => 'notifications',
-    'text' =>'<i class="fa fa-bell mrgn-rght-sm mrgn-tp-sm fa-lg"></i><span class="hidden-xs" aria-hidden="true">' . elgg_echo('notifications:subscriptions:changesettings') . '</span>' . $msgbadge .'<span class="wb-inv">'.elgg_echo('userMenu:notifications') . $title.' </span></a>'.$focus_dd.'<div>'.$ajax_dd_notification.'</div>',
+    'text' =>'<i class="fa fa-bell mrgn-rght-sm mrgn-tp-sm fa-lg"></i><span class="hidden-xs" aria-hidden="true">' . elgg_echo('notifications:subscriptions:changesettings') . '</span>' . $msgbadge . '<span class="wb-inv">' . elgg_echo('userMenu:notifications') . $title . ' </span></a>' . $focus_dd . '<div>' . $ajax_dd_notification . '</div>',
     'title' => elgg_echo('userMenu:notifications') . $title,
     'item_class' => 'brdr-lft messagesLabel close-notif-dd',
     'class' => '',
     'priority' => '2',
     'data-dd-type'=>'notif_dd',
-    'href' => elgg_get_site_url()."messages/notifications/" . $user,
+    'href' => elgg_get_site_url() . "messages/notifications/" . $user,
     ));
 
 
@@ -180,7 +180,7 @@ 
 */
 
 // cyu - remove the user menu when the gsa hits the page
-if (elgg_is_active_plugin('gc_fedsearch_gsa') && ((!$gsa_usertest) && strcmp($gsa_agentstring,strtolower($_SERVER['HTTP_USER_AGENT'])) == 0) || strstr(strtolower($_SERVER['HTTP_USER_AGENT']), 'gsa-crawler') !== false )
+if (elgg_is_active_plugin('gc_fedsearch_gsa') && ((!$gsa_usertest) && strcmp($gsa_agentstring, strtolower($_SERVER['HTTP_USER_AGENT'])) == 0) || strstr(strtolower($_SERVER['HTTP_USER_AGENT']), 'gsa-crawler') !== false)
 {
     // do nothing
 } else {

mod/wet4/views/default/core/friends/collection.php

Indentation +11 added lines, -11 removed lines

@@ -27,27 +27,27 @@ 
 if ($coll->owner_guid == elgg_get_logged_in_user_guid()) {
 	echo "<div class=\"friends_collections_controls\">";
 
-    echo elgg_view('output/url', array(
-        'href' => 'collections/edit/' . elgg_get_logged_in_user_entity()->guid . '?collection=' . $coll->id,
-        'text' => '<i class="fa fa-edit fa-2x icon-unsel"><span class="wb-inv">' . elgg_echo('friends:collections:edit') . ' ' . $coll->name . '</span></i>',
-        'title' => elgg_echo('friends:collections:edit') . ': ' . $coll->name,
-        'class' => 'mrgn-rght-sm mrgn-tp-sm'
-        ));
+	echo elgg_view('output/url', array(
+		'href' => 'collections/edit/' . elgg_get_logged_in_user_entity()->guid . '?collection=' . $coll->id,
+		'text' => '<i class="fa fa-edit fa-2x icon-unsel"><span class="wb-inv">' . elgg_echo('friends:collections:edit') . ' ' . $coll->name . '</span></i>',
+		'title' => elgg_echo('friends:collections:edit') . ': ' . $coll->name,
+		'class' => 'mrgn-rght-sm mrgn-tp-sm'
+		));
 
-    echo elgg_view('output/url', array(
+	echo elgg_view('output/url', array(
 			'href' => 'action/friends/collections/delete?collection=' . $coll->id,
 			'class' => 'delete_collection mrgn-rght-sm mrgn-tp-sm',
 			'text' => '<span class="wb-invisible">' . elgg_echo("delete"). ' ' . $coll->name . '</span><i class="fa fa-trash-o fa-2x icon-unsel"></i>',
-            'title' => elgg_echo('delete') . ' ' . $coll->name,
+			'title' => elgg_echo('delete') . ' ' . $coll->name,
 			'encode_text' => false,
 			'confirm' => true,
 		));
 
-    echo elgg_view('output/url', array(
+	echo elgg_view('output/url', array(
 			'href' => elgg_get_site_url() . 'messages/compose?collection=' . $coll->id,
 			'class' => 'delete_collection',
 			'text' => '<span class="wb-invisible">' . elgg_echo('collections_circle_send') . ' ' . $coll->name . '</span><i class="fa fa-envelope-o fa-2x icon-unsel"></i>',
-            'title' => elgg_echo('collections_circle_send') . ' ' . $coll->name,
+			'title' => elgg_echo('collections_circle_send') . ' ' . $coll->name,
 			'encode_text' => false,
 			'confirm' => true,
 		));
@@ -59,7 +59,7 @@ 
 // individual collection panels
 $friends = $vars['collection']->entities;
 if ($friends) {
-    /*
+	/*
 	$content = elgg_view('core/friends/collectiontabs', array(
 		'owner' => elgg_get_logged_in_user_entity(),
 		'collection' => $vars['collection'],

Spacing +1 added lines, -1 removed lines

@@ -37,7 +37,7 @@
     echo elgg_view('output/url', array(
 			'href' => 'action/friends/collections/delete?collection=' . $coll->id,
 			'class' => 'delete_collection mrgn-rght-sm mrgn-tp-sm',
-			'text' => '<span class="wb-invisible">' . elgg_echo("delete"). ' ' . $coll->name . '</span><i class="fa fa-trash-o fa-2x icon-unsel"></i>',
+			'text' => '<span class="wb-invisible">' . elgg_echo("delete") . ' ' . $coll->name . '</span><i class="fa fa-trash-o fa-2x icon-unsel"></i>',
             'title' => elgg_echo('delete') . ' ' . $coll->name,
 			'encode_text' => false,
 			'confirm' => true,

mod/wet4/views/default/widgets/suggested_friends/content.php

Indentation +54 added lines, -54 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-    /***********************************************************************
+	/***********************************************************************
  * MODIFICATION LOG
  * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
  *
@@ -11,70 +11,70 @@ 
 
 
 try{
-    $user_guid = elgg_get_logged_in_user_guid();
-    $site_url = elgg_get_site_url();
-        mysqli_report(MYSQLI_REPORT_ERROR | MYSQLI_REPORT_STRICT);
+	$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}, 4);");
+		//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}, 4);");
 
-        /*
+		/*
          * echo '<div class="panel panel-custom elgg-module-aside"><div class="panel-heading"><h2 class="">'.elgg_echo('ps:profilestrength').'</h2></div><div class="panel-body clearfix">'.elgg_view('widgets/profile_completness/content').'</div></div>';
          * 
          * */
         
-        if(intval($result->num_rows)>0){
-            $count=0;
-            $htmloutput='<div class="panel clearfix panel-custom elgg-module-aside">';
+		if(intval($result->num_rows)>0){
+			$count=0;
+			$htmloutput='<div class="panel clearfix panel-custom elgg-module-aside">';
             
-            $htmloutput=$htmloutput.'<div class="panel-heading">';
-            $htmloutput=$htmloutput.'<h3 class="panel-title">'.elgg_echo('sf:suggcolleagues').'</h3>';
-            $htmloutput=$htmloutput.'</div><div class="panel-body clearfix">';
-            while ($row = $result->fetch_assoc()) {
-                if($count==0 || $count==2)
-                {
-                    $htmloutput=$htmloutput.'<div class="row mrgn-tp-sm">';
-                }
-                $userGUID=$row['guid_two'];
+			$htmloutput=$htmloutput.'<div class="panel-heading">';
+			$htmloutput=$htmloutput.'<h3 class="panel-title">'.elgg_echo('sf:suggcolleagues').'</h3>';
+			$htmloutput=$htmloutput.'</div><div class="panel-body clearfix">';
+			while ($row = $result->fetch_assoc()) {
+				if($count==0 || $count==2)
+				{
+					$htmloutput=$htmloutput.'<div class="row mrgn-tp-sm">';
+				}
+				$userGUID=$row['guid_two'];
 		if (elgg_get_user_validation_status($userGUID)){
-                	$job=get_user($userGUID)->job;
-                	$htmloutput=$htmloutput.'<div class="col-xs-6 text-center">';
-                	$htmloutput .= '<a href="'.  $site_url. 'profile/'. get_user($row['guid_two'])->username.'" class="">';
-                	$htmloutput=$htmloutput.'<img src="'.get_user($row['guid_two'])->getIcon('small') . '" class="avatar-profile-page img-responsive center-block img-circle " alt="'.elgg_echo('sf:alttext').' '.get_user($row['guid_two'])->getDisplayName().'">';
-                	$htmloutput=$htmloutput.'<h4 class="h4 mrgn-tp-sm mrgn-bttm-0"><span class="text-primary">'.get_user($row['guid_two'])->getDisplayName().'</span></h4></a>';
-                	$htmloutput=$htmloutput.'<p class="small mrgn-tp-0">'.$job.'</p>';
-                	$htmloutput=$htmloutput.'<a href="'.elgg_add_action_tokens_to_url("action/friends/add?friend={$userGUID}"). '" class="btn btn-primary btn-sm mrgn-tp-sm">'.elgg_echo('friend:add').'</a>';
-                	$htmloutput=$htmloutput.'</div>';
-                	if($count==1 || $count==3)
-                	{
-                	    $htmloutput=$htmloutput.'</div>';
-                	}
-                	$count++;
-               		// $htmloutput=$htmloutput. $row['guid_two'].'-';
-            	}
-	    }
-            $htmloutput=$htmloutput.'</div></div>';
-            $htmloutput=$htmloutput.'<div class="clearfix"></div>';
-            //$htmloutput=$htmloutput.'</div>';
-            echo $htmloutput;
-        }
-        $connection->close();
+					$job=get_user($userGUID)->job;
+					$htmloutput=$htmloutput.'<div class="col-xs-6 text-center">';
+					$htmloutput .= '<a href="'.  $site_url. 'profile/'. get_user($row['guid_two'])->username.'" class="">';
+					$htmloutput=$htmloutput.'<img src="'.get_user($row['guid_two'])->getIcon('small') . '" class="avatar-profile-page img-responsive center-block img-circle " alt="'.elgg_echo('sf:alttext').' '.get_user($row['guid_two'])->getDisplayName().'">';
+					$htmloutput=$htmloutput.'<h4 class="h4 mrgn-tp-sm mrgn-bttm-0"><span class="text-primary">'.get_user($row['guid_two'])->getDisplayName().'</span></h4></a>';
+					$htmloutput=$htmloutput.'<p class="small mrgn-tp-0">'.$job.'</p>';
+					$htmloutput=$htmloutput.'<a href="'.elgg_add_action_tokens_to_url("action/friends/add?friend={$userGUID}"). '" class="btn btn-primary btn-sm mrgn-tp-sm">'.elgg_echo('friend:add').'</a>';
+					$htmloutput=$htmloutput.'</div>';
+					if($count==1 || $count==3)
+					{
+						$htmloutput=$htmloutput.'</div>';
+					}
+					$count++;
+			   		// $htmloutput=$htmloutput. $row['guid_two'].'-';
+				}
+		}
+			$htmloutput=$htmloutput.'</div></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 Widget',$errType);
+	$errMess=$e->getMessage();
+	$errStack=$e->getTraceAsString();
+	$errType=$e->getCode();
+	gc_err_logging($errMess,$errStack,'Suggested Friends Widget',$errType);
 
-    $connection->close();
-    echo "<div class='alert alert-danger'><h3>Oops!</h3>".elgg_echo('ps:psErr')."</div>";
+	$connection->close();
+	echo "<div class='alert alert-danger'><h3>Oops!</h3>".elgg_echo('ps:psErr')."</div>";
 }
 ?>

Spacing +28 added lines, -28 removed lines

@@ -10,7 +10,7 @@ 
  ***********************************************************************/
 
 
-try{
+try {
     $user_guid = elgg_get_logged_in_user_guid();
     $site_url = elgg_get_site_url();
         mysqli_report(MYSQLI_REPORT_ERROR | MYSQLI_REPORT_STRICT);
@@ -30,38 +30,38 @@ 
          * 
          * */
         
-        if(intval($result->num_rows)>0){
-            $count=0;
-            $htmloutput='<div class="panel clearfix panel-custom elgg-module-aside">';
+        if (intval($result->num_rows) > 0) {
+            $count = 0;
+            $htmloutput = '<div class="panel clearfix panel-custom elgg-module-aside">';
             
-            $htmloutput=$htmloutput.'<div class="panel-heading">';
-            $htmloutput=$htmloutput.'<h3 class="panel-title">'.elgg_echo('sf:suggcolleagues').'</h3>';
-            $htmloutput=$htmloutput.'</div><div class="panel-body clearfix">';
+            $htmloutput = $htmloutput . '<div class="panel-heading">';
+            $htmloutput = $htmloutput . '<h3 class="panel-title">' . elgg_echo('sf:suggcolleagues') . '</h3>';
+            $htmloutput = $htmloutput . '</div><div class="panel-body clearfix">';
             while ($row = $result->fetch_assoc()) {
-                if($count==0 || $count==2)
+                if ($count == 0 || $count == 2)
                 {
-                    $htmloutput=$htmloutput.'<div class="row mrgn-tp-sm">';
+                    $htmloutput = $htmloutput . '<div class="row mrgn-tp-sm">';
                 }
-                $userGUID=$row['guid_two'];
-		if (elgg_get_user_validation_status($userGUID)){
-                	$job=get_user($userGUID)->job;
-                	$htmloutput=$htmloutput.'<div class="col-xs-6 text-center">';
-                	$htmloutput .= '<a href="'.  $site_url. 'profile/'. get_user($row['guid_two'])->username.'" class="">';
-                	$htmloutput=$htmloutput.'<img src="'.get_user($row['guid_two'])->getIcon('small') . '" class="avatar-profile-page img-responsive center-block img-circle " alt="'.elgg_echo('sf:alttext').' '.get_user($row['guid_two'])->getDisplayName().'">';
-                	$htmloutput=$htmloutput.'<h4 class="h4 mrgn-tp-sm mrgn-bttm-0"><span class="text-primary">'.get_user($row['guid_two'])->getDisplayName().'</span></h4></a>';
-                	$htmloutput=$htmloutput.'<p class="small mrgn-tp-0">'.$job.'</p>';
-                	$htmloutput=$htmloutput.'<a href="'.elgg_add_action_tokens_to_url("action/friends/add?friend={$userGUID}"). '" class="btn btn-primary btn-sm mrgn-tp-sm">'.elgg_echo('friend:add').'</a>';
-                	$htmloutput=$htmloutput.'</div>';
-                	if($count==1 || $count==3)
+                $userGUID = $row['guid_two'];
+		if (elgg_get_user_validation_status($userGUID)) {
+                	$job = get_user($userGUID)->job;
+                	$htmloutput = $htmloutput . '<div class="col-xs-6 text-center">';
+                	$htmloutput .= '<a href="' . $site_url . 'profile/' . get_user($row['guid_two'])->username . '" class="">';
+                	$htmloutput = $htmloutput . '<img src="' . get_user($row['guid_two'])->getIcon('small') . '" class="avatar-profile-page img-responsive center-block img-circle " alt="' . elgg_echo('sf:alttext') . ' ' . get_user($row['guid_two'])->getDisplayName() . '">';
+                	$htmloutput = $htmloutput . '<h4 class="h4 mrgn-tp-sm mrgn-bttm-0"><span class="text-primary">' . get_user($row['guid_two'])->getDisplayName() . '</span></h4></a>';
+                	$htmloutput = $htmloutput . '<p class="small mrgn-tp-0">' . $job . '</p>';
+                	$htmloutput = $htmloutput . '<a href="' . elgg_add_action_tokens_to_url("action/friends/add?friend={$userGUID}") . '" class="btn btn-primary btn-sm mrgn-tp-sm">' . elgg_echo('friend:add') . '</a>';
+                	$htmloutput = $htmloutput . '</div>';
+                	if ($count == 1 || $count == 3)
                 	{
-                	    $htmloutput=$htmloutput.'</div>';
+                	    $htmloutput = $htmloutput . '</div>';
                 	}
                 	$count++;
                		// $htmloutput=$htmloutput. $row['guid_two'].'-';
             	}
 	    }
-            $htmloutput=$htmloutput.'</div></div>';
-            $htmloutput=$htmloutput.'<div class="clearfix"></div>';
+            $htmloutput = $htmloutput . '</div></div>';
+            $htmloutput = $htmloutput . '<div class="clearfix"></div>';
             //$htmloutput=$htmloutput.'</div>';
             echo $htmloutput;
         }
@@ -69,12 +69,12 @@ 
 }
 catch (Exception $e)
 {
-    $errMess=$e->getMessage();
-    $errStack=$e->getTraceAsString();
-    $errType=$e->getCode();
-    gc_err_logging($errMess,$errStack,'Suggested Friends Widget',$errType);
+    $errMess = $e->getMessage();
+    $errStack = $e->getTraceAsString();
+    $errType = $e->getCode();
+    gc_err_logging($errMess, $errStack, 'Suggested Friends Widget', $errType);
 
     $connection->close();
-    echo "<div class='alert alert-danger'><h3>Oops!</h3>".elgg_echo('ps:psErr')."</div>";
+    echo "<div class='alert alert-danger'><h3>Oops!</h3>" . elgg_echo('ps:psErr') . "</div>";
 }
 ?>

Braces +1 added lines, -2 removed lines

@@ -66,8 +66,7 @@
             echo $htmloutput;
         }
         $connection->close();
-}
-catch (Exception $e)
+} catch (Exception $e)
 {
     $errMess=$e->getMessage();
     $errStack=$e->getTraceAsString();