gctools-outilsgc / gcconnex

mod/gccollab_theme/views/default/page/elements/site-brand.php

Indentation +2 added lines, -2 removed lines

@@ -10,9 +10,9 @@
 $user = elgg_get_logged_in_user_entity();
 //check lang of current user and change Canada graphic based on language
 if( _elgg_services()->session->get('language') == 'fr'){
-    $graphic_lang = 'fr';
+	$graphic_lang = 'fr';
 } else {
-    $graphic_lang = 'en';
+	$graphic_lang = 'en';
 }
 
 // cyu - strip off the "GCconnex" branding bar for the gsa

Spacing +15 added lines, -15 removed lines

@@ -9,14 +9,14 @@ 
 $site_url = elgg_get_site_url();
 $user = elgg_get_logged_in_user_entity();
 //check lang of current user and change Canada graphic based on language
-if( _elgg_services()->session->get('language') == 'fr'){
+if (_elgg_services()->session->get('language') == 'fr') {
     $graphic_lang = 'fr';
 } else {
     $graphic_lang = 'en';
 }
 
 // cyu - strip off the "GCconnex" branding bar for the gsa
-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) {
 
 } else {
 ?>
@@ -26,28 +26,28 @@ 
             <div class="row">
                 <div class="brand col-xs-8 col-sm-5 col-md-4 col-lg-4">
                    <object type="image/svg+xml" tabindex="-1" data="<?php echo $site_url ?>/mod/wet4_collab/graphics/sig-blk-<?php echo $graphic_lang; ?>.svg"></object>
-                    <span class="wb-inv"><?php echo elgg_echo('wet:gc');?></span>
+                    <span class="wb-inv"><?php echo elgg_echo('wet:gc'); ?></span>
                 </div>
                 <section class="hidden-xs col-sm-7 col-md-6 col-lg-6">
-                    <?php if( $user->user_type === 'federal' ): ?>
+                    <?php if ($user->user_type === 'federal'): ?>
                         <ul id="" class="pull-left list-unstyled mrgn-bttm-0">
                             <li class="pull-left tool-link">
-                            <a href="<?php echo elgg_echo('wet:gcpediaLink');?>">
-                                <span class="bold-gc">GC</span><?php echo elgg_echo('wet:barGCpedia');?>
+                            <a href="<?php echo elgg_echo('wet:gcpediaLink'); ?>">
+                                <span class="bold-gc">GC</span><?php echo elgg_echo('wet:barGCpedia'); ?>
                             </a>
                             </li>
                             <li class="pull-left tool-link">
-                            <a href="<?php echo elgg_echo('wet:gcintranetLink-toolsHead');?>">
+                            <a href="<?php echo elgg_echo('wet:gcintranetLink-toolsHead'); ?>">
                                <span class="bold-gc">GC</span>intranet
                             </a>
                             </li>
                             <li class="pull-left tool-link">
-                            <a href="<?php echo elgg_echo('wet:gcdirectoryLink');?>">
-                               <span class="bold-gc">GC</span><?php echo elgg_echo('wet:barDirectory');?>
+                            <a href="<?php echo elgg_echo('wet:gcdirectoryLink'); ?>">
+                               <span class="bold-gc">GC</span><?php echo elgg_echo('wet:barDirectory'); ?>
                             </a>
                             </li>
                             <li class="pull-left tool-link">
-                            <a href="<?php echo elgg_echo('wet:gcconnexLink');?>">
+                            <a href="<?php echo elgg_echo('wet:gcconnexLink'); ?>">
                                <span class="bold-gc">GC</span>connex
                             </a>
                             </li>
@@ -55,15 +55,15 @@ 
                     <?php endif; ?>
                 </section>
                 <section class="wb-mb-links visible-xs col-xs-4 col-sm-3" id="wb-glb-mn">
-                    <h2><?php echo elgg_echo('wet:search');?></h2>
+                    <h2><?php echo elgg_echo('wet:search'); ?></h2>
                     <div class="container row purple-bg mbm">
                         <div class="col-xs-6 app-name">
                             <a href="<?php echo $site_url; ?>"><span><span class="bold-gc">GC</span>collab</span></a>
                         </div>
                         <div class="col-xs-6 icons text-right">
-                            <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 mrl"><span class="wb-inv"><?php echo elgg_echo('wet:search');?></span></span>
-                                <span class="glyphicon glyphicon-th-list"><span class="wb-inv"><?php echo elgg_echo('wet:menu');?></span></span>
+                            <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 mrl"><span class="wb-inv"><?php echo elgg_echo('wet:search'); ?></span></span>
+                                <span class="glyphicon glyphicon-th-list"><span class="wb-inv"><?php echo elgg_echo('wet:menu'); ?></span></span>
                             </a>
                         </div>
                     </div>
@@ -85,7 +85,7 @@ 
                     <?php echo elgg_view('search/search_box', $vars); ?>
                 </div>
                 <div class="col-md-4 col-sm-5 col-xs-12">
-                    <?php echo elgg_view('page/elements/topbar_wrapper', $vars);?>
+                    <?php echo elgg_view('page/elements/topbar_wrapper', $vars); ?>
                 </div>
             </div>
         </div>

mod/gccollab_theme/views/default/page/elements/footer.php

Indentation +14 added lines, -14 removed lines

@@ -10,20 +10,20 @@ 
 
 $stats = "{$site_url}stats";
 if ( strcmp(_elgg_services()->session->get('language'),'en') == 0 ) {
-    // english links (under about)
-    $about = "{$site_url}about";
-    $terms = "{$site_url}terms";
-    $priv = "{$site_url}privacy";
+	// english links (under about)
+	$about = "{$site_url}about";
+	$terms = "{$site_url}terms";
+	$priv = "{$site_url}privacy";
 
-    $faq = "{$site_url}faq";
+	$faq = "{$site_url}faq";
 
 } else {
-    // french links (under about)
-    $about = "{$site_url}a_propos";
-    $terms = "{$site_url}termes";
-    $priv = "{$site_url}confidentialite";
+	// french links (under about)
+	$about = "{$site_url}a_propos";
+	$terms = "{$site_url}termes";
+	$priv = "{$site_url}confidentialite";
 
-    $faq = "{$site_url}qfp";
+	$faq = "{$site_url}qfp";
 }
 
 $feedbackText= elgg_echo('wet:feedbackText');
@@ -36,10 +36,10 @@ 
         <h2>About this site</h2>
 
         <?php
-        //Test is the user is logged in and give them links to register in the footer
-        if (!elgg_is_logged_in())
-            echo elgg_view('page/elements/footer_register', $vars);
-        ?>
+		//Test is the user is logged in and give them links to register in the footer
+		if (!elgg_is_logged_in())
+			echo elgg_view('page/elements/footer_register', $vars);
+		?>
 
         <div class="row">
 

Spacing +18 added lines, -18 removed lines

@@ -9,7 +9,7 @@ 
 $user = elgg_get_logged_in_user_entity();
 
 $stats = "{$site_url}stats";
-if ( strcmp(_elgg_services()->session->get('language'),'en') == 0 ) {
+if (strcmp(_elgg_services()->session->get('language'), 'en') == 0) {
     // english links (under about)
     $about = "{$site_url}about";
     $terms = "{$site_url}terms";
@@ -26,7 +26,7 @@ 
     $faq = "{$site_url}qfp";
 }
 
-$feedbackText= elgg_echo('wet:feedbackText');
+$feedbackText = elgg_echo('wet:feedbackText');
 
 ?>
 
@@ -45,23 +45,23 @@ 
 
             <!-- About -->
             <section class="col-sm-3">
-                <h3><?php echo elgg_echo('wet:footTitleAbout');?></h3>
+                <h3><?php echo elgg_echo('wet:footTitleAbout'); ?></h3>
                 <ul class="list-unstyled">
-                    <li><a href="<?php echo $about;?>"><?php echo elgg_echo('wet:footAbout');?></a></li>
-                    <li><a href="<?php echo $priv;?>"><?php echo elgg_echo('wet:footPrivacy');?></a></li>
-                    <li><a href="<?php echo $terms;?>"><?php echo elgg_echo('wet:footTerms');?></a></li>
-                    <li><a href="<?php echo $stats;?>"><?php echo elgg_echo('wet:stats');?></a></li>
+                    <li><a href="<?php echo $about; ?>"><?php echo elgg_echo('wet:footAbout'); ?></a></li>
+                    <li><a href="<?php echo $priv; ?>"><?php echo elgg_echo('wet:footPrivacy'); ?></a></li>
+                    <li><a href="<?php echo $terms; ?>"><?php echo elgg_echo('wet:footTerms'); ?></a></li>
+                    <li><a href="<?php echo $stats; ?>"><?php echo elgg_echo('wet:stats'); ?></a></li>
                 </ul>
             </section>
 
             <!-- Help -->
             <section class="col-sm-3">
-                <h3><?php echo elgg_echo('help');?></h3>
+                <h3><?php echo elgg_echo('help'); ?></h3>
                 <ul class="list-unstyled">
                   <li>
-                    <a href="<?php echo $faq;?>"><?php echo elgg_echo('wet:footFAQ');?></a>
+                    <a href="<?php echo $faq; ?>"><?php echo elgg_echo('wet:footFAQ'); ?></a>
                   </li>
-                  <?php if(elgg_is_active_plugin('gc_onboard')){ echo '<li><a href="'.elgg_get_site_url().'tutorials">'.elgg_echo('onboard:footTutorials').'</a></li>'; }?>
+                  <?php if (elgg_is_active_plugin('gc_onboard')) { echo '<li><a href="' . elgg_get_site_url() . 'tutorials">' . elgg_echo('onboard:footTutorials') . '</a></li>'; }?>
                   <li><a href="<?php echo elgg_get_site_url() . 'help/knowledgebase/'; ?>"> <?php echo elgg_echo('contactform:help_menu_item'); ?> </a></li>
                    
                 </ul>
@@ -69,9 +69,9 @@ 
 
             <!-- Stay Connected -->
             <section class="col-sm-3">
-                <h3><?php echo elgg_echo('wet:footTitleSocial');?></h3>
+                <h3><?php echo elgg_echo('wet:footTitleSocial'); ?></h3>
                 <ul class="list-unstyled">
-                <?php if( get_current_language() == "fr" ): ?>
+                <?php if (get_current_language() == "fr"): ?>
                     <li><a href="https://twitter.com/SCT_Canada">Twitter</a></li>
                 <?php else: ?>
                     <li><a href="https://twitter.com/TBS_Canada">Twitter</a></li>
@@ -82,13 +82,13 @@ 
             </section>
 
             <section class="col-sm-3">
-                <?php if( $user->user_type === 'federal' ): ?>
-                    <h3><?php echo elgg_echo('wet:footGCtools');?></h3>
+                <?php if ($user->user_type === 'federal'): ?>
+                    <h3><?php echo elgg_echo('wet:footGCtools'); ?></h3>
                     <ul class="list-unstyled">
-                        <li><a href="<?php echo elgg_echo('wet:gcpediaLink');?>">GC<?php echo elgg_echo('wet:barGCpedia');?></a></li>
-                        <li><a href="<?php echo elgg_echo('wet:gcintranetLink-toolsFoot');?>">GCintranet</a></li>
-                        <li><a href="<?php echo elgg_echo('wet:gcdirectoryLink');?>">GC<?php echo elgg_echo('wet:barDirectory');?></a></li>
-                        <li><a href="<?php echo elgg_echo('wet:gcconnexLink');?>">GCconnex</a></li>
+                        <li><a href="<?php echo elgg_echo('wet:gcpediaLink'); ?>">GC<?php echo elgg_echo('wet:barGCpedia'); ?></a></li>
+                        <li><a href="<?php echo elgg_echo('wet:gcintranetLink-toolsFoot'); ?>">GCintranet</a></li>
+                        <li><a href="<?php echo elgg_echo('wet:gcdirectoryLink'); ?>">GC<?php echo elgg_echo('wet:barDirectory'); ?></a></li>
+                        <li><a href="<?php echo elgg_echo('wet:gcconnexLink'); ?>">GCconnex</a></li>
                     </ul>
                 <?php endif; ?>
             </section>

Braces +8 added lines, -4 removed lines

@@ -37,8 +37,9 @@ 
 
         <?php
         //Test is the user is logged in and give them links to register in the footer
-        if (!elgg_is_logged_in())
-            echo elgg_view('page/elements/footer_register', $vars);
+        if (!elgg_is_logged_in()) {
+                    echo elgg_view('page/elements/footer_register', $vars);
+        }
         ?>
 
         <div class="row">
@@ -73,9 +74,12 @@ 
                 <ul class="list-unstyled">
                 <?php if( get_current_language() == "fr" ): ?>
                     <li><a href="https://twitter.com/SCT_Canada">Twitter</a></li>
-                <?php else: ?>
+                <?php else {
+	: ?>
                     <li><a href="https://twitter.com/TBS_Canada">Twitter</a></li>
-                <?php endif; ?>
+                <?php endif;
+}
+?>
                     <!-- <li><a href="https://twitter.com/GCcollab">Twitter</a></li> -->
                     <li><a href="https://github.com/gctools-outilsgc/GCcollab">GitHub</a></li>
                 </ul>

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

Indentation +91 added lines, -91 removed lines

@@ -22,19 +22,19 @@ 
 $email = elgg_get_logged_in_user_entity()->email;
 
 elgg_register_menu_item('user_menu', array(
-    'name' => 'Invite',
-    'text' => elgg_echo('invite'),
-    'title' => elgg_echo('invite'),
-    'item_class' => 'btn btn-primary mrs',
-    'class' => '',
-    'style' => "color: #fff;",
-    'priority' => '-1',
-    'href' => elgg_get_site_url() . "invite/" . $user,
+	'name' => 'Invite',
+	'text' => elgg_echo('invite'),
+	'title' => elgg_echo('invite'),
+	'item_class' => 'btn btn-primary mrs',
+	'class' => '',
+	'style' => "color: #fff;",
+	'priority' => '-1',
+	'href' => elgg_get_site_url() . "invite/" . $user,
 ));
 
 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'));
@@ -48,15 +48,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>',
-        '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>',
+		'title' => 'Admin',
+		'item_class' => 'brdr-rght',
+		'class' => '',
+		'priority' => '0',
+	));
 }
 
 
@@ -65,119 +65,119 @@ 
 $breakup = explode('.', $email);
 $initials = substr($breakup[0], 0, 1) . substr($breakup[1], 0, 1);
 if ($user_avatar) { //show avatar if they have one
-    //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 . $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 . $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" aria-hidden="true">' . elgg_echo('messages') . '</span>' . $msgbadge .'<span class="wb-inv">'.elgg_echo('userMenu:messages') . $title.' </span>'.$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" aria-hidden="true">' . elgg_echo('messages') . '</span>' . $msgbadge .'<span class="wb-inv">'.elgg_echo('userMenu:messages') . $title.' </span>'.$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" aria-hidden="true">' . elgg_echo('notifications:subscriptions:changesettings') . '</span>' . $msgbadge .'<span class="wb-inv">'.elgg_echo('userMenu:notifications') . $title.' </span>'.$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" aria-hidden="true">' . elgg_echo('notifications:subscriptions:changesettings') . '</span>' . $msgbadge .'<span class="wb-inv">'.elgg_echo('userMenu:notifications') . $title.' </span>'.$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,
+	));
 
 
 /*
@@ -189,7 +189,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 +11 added lines, -11 removed lines

@@ -39,15 +39,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',
@@ -90,7 +90,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',
 ));
@@ -98,7 +98,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',
 ));
@@ -135,7 +135,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" aria-hidden="true">' . elgg_echo('messages') . '</span>' . $msgbadge .'<span class="wb-inv">'.elgg_echo('userMenu:messages') . $title.' </span>'.$focus_dd .$ajax_dd_messages,
+    'text' => '<i class="fa fa-envelope mrgn-rght-sm mrgn-tp-sm fa-lg"></i><span class="hidden" aria-hidden="true">' . elgg_echo('messages') . '</span>' . $msgbadge . '<span class="wb-inv">' . elgg_echo('userMenu:messages') . $title . ' </span>' . $focus_dd . $ajax_dd_messages,
     'title' => elgg_echo('userMenu:messages') . $title,
     'item_class' => 'brdr-lft messagesLabel close-msg-dd',
     'data-toggle' => '',
@@ -143,7 +143,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,
 
     ));
 
@@ -170,13 +170,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" aria-hidden="true">' . elgg_echo('notifications:subscriptions:changesettings') . '</span>' . $msgbadge .'<span class="wb-inv">'.elgg_echo('userMenu:notifications') . $title.' </span>'.$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" aria-hidden="true">' . elgg_echo('notifications:subscriptions:changesettings') . '</span>' . $msgbadge . '<span class="wb-inv">' . elgg_echo('userMenu:notifications') . $title . ' </span>' . $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,
     ));
 
 
@@ -187,7 +187,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/gccollab_theme/views/default/contactform/form.php

Indentation +54 added lines, -54 removed lines

@@ -24,27 +24,27 @@ 
     
 
 <?php 
-    $disable_feedback = elgg_get_plugin_setting('disable_feedback','contactform');
-    $english_notice = elgg_get_plugin_setting('disable_feedback_message_en','contactform');
-    $french_notice = elgg_get_plugin_setting('disable_feedback_message_fr','contactform');
-    if (strcmp($disable_feedback,'yes') == 0) {
-
-        if (strcmp($_COOKIE['connex_lang'], 'fr') == 0 )
-            echo "<div align='center' style='padding:5px 5px 5px 5px;'> {$french_notice} </div>";
-        else
-            echo "<div align='center' style='padding:5px 5px 5px 5px;'> {$english_notice} </div>";
+	$disable_feedback = elgg_get_plugin_setting('disable_feedback','contactform');
+	$english_notice = elgg_get_plugin_setting('disable_feedback_message_en','contactform');
+	$french_notice = elgg_get_plugin_setting('disable_feedback_message_fr','contactform');
+	if (strcmp($disable_feedback,'yes') == 0) {
+
+		if (strcmp($_COOKIE['connex_lang'], 'fr') == 0 )
+			echo "<div align='center' style='padding:5px 5px 5px 5px;'> {$french_notice} </div>";
+		else
+			echo "<div align='center' style='padding:5px 5px 5px 5px;'> {$english_notice} </div>";
     
-    } else {
+	} else {
 ?>
     <div class="panel-body mrgn-lft-md">
         <?php echo elgg_echo('contactform:content:form'); ?>
         
         <?php 
-            $site = elgg_get_site_entity();
-            // security, all forms need tokens when action is called
-            $__elgg_ts = time();
-            $__elgg_token = generate_action_token($__elgg_ts);
-        ?>
+			$site = elgg_get_site_entity();
+			// security, all forms need tokens when action is called
+			$__elgg_ts = time();
+			$__elgg_token = generate_action_token($__elgg_ts);
+		?>
         <form action="<?php echo "{$site->url}action/contactform/send_feedback"; ?>">        
             <input type="hidden" name="__elgg_ts" value="<?php echo $__elgg_ts; ?>" />
             <input type="hidden" name="__elgg_token" value="<?php echo $__elgg_token; ?>" />
@@ -54,26 +54,26 @@ 
             <div class='form-group'>
                 <label for='name' class="required"><span class="field-name"><?php echo elgg_echo('contactform:fullname'); ?></span></label>
             <?php
-                echo elgg_view('input/text', array(
-                    'name' => 'name',
-                    'id' => 'name',
-                    'value' => $user_fullname,
-                    'required' => true 
-                ));
-            ?>
+				echo elgg_view('input/text', array(
+					'name' => 'name',
+					'id' => 'name',
+					'value' => $user_fullname,
+					'required' => true 
+				));
+			?>
              </div>
 
             <!-- email address -->
             <div class='form-group'>
                 <label for='email' class="required"><span class="field-name"><?php echo elgg_echo('contactform:email'); ?></span></label>
             <?php
-                echo elgg_view('input/text', array(
-                    'name' => 'email',
-                    'id' => 'email',
-                    'value' => $user_email,
-                    'required' => true
-                ));
-            ?>
+				echo elgg_view('input/text', array(
+					'name' => 'email',
+					'id' => 'email',
+					'value' => $user_email,
+					'required' => true
+				));
+			?>
             </div>
 
             <!-- category -->
@@ -81,40 +81,40 @@ 
                 <label for='reason' class="required"><span class="field-name"><?php echo elgg_echo('contactform:select'); ?></span></label>
             <?php
 
-                // get the selected language
-                if (strcmp($SESSION['language'], 'fr') == 0 )
-                    $language_selected = 'francais';
-                else
-                    $language_selected = 'english';
+				// get the selected language
+				if (strcmp($SESSION['language'], 'fr') == 0 )
+					$language_selected = 'francais';
+				else
+					$language_selected = 'english';
 
-                // run a query to get all the categories for the feedback type
-                $query = "SELECT id, {$language_selected} FROM contact_list";
-                $feedback_types = get_data($query);
+				// run a query to get all the categories for the feedback type
+				$query = "SELECT id, {$language_selected} FROM contact_list";
+				$feedback_types = get_data($query);
 
-                // create the options
-                $options['na'] = elgg_echo('contactform:reason');
-                foreach ($feedback_types as $feedback_type)
-                    $options[$feedback_type->$language_selected] = $feedback_type->$language_selected;
+				// create the options
+				$options['na'] = elgg_echo('contactform:reason');
+				foreach ($feedback_types as $feedback_type)
+					$options[$feedback_type->$language_selected] = $feedback_type->$language_selected;
    
-                echo elgg_view('input/select', array(
-                    'name' => 'reason',
-                    'id' => 'reason',
-                    'options' => $options,
-                    'required' => true
-                ));
-            ?>
+				echo elgg_view('input/select', array(
+					'name' => 'reason',
+					'id' => 'reason',
+					'options' => $options,
+					'required' => true
+				));
+			?>
             </div>
 
             <!-- message -->
             <div class='form-group'>
                 <label for='message' class="required"><span class="field-name"><?php echo elgg_echo('contactform:message');?></span></label>
            <?php
-                echo elgg_view('input/longtext', array(
-                    'name' => 'message',
-                    'id' => 'message',
-                    'required' => true
-                ));
-            ?>
+				echo elgg_view('input/longtext', array(
+					'name' => 'message',
+					'id' => 'message',
+					'required' => true
+				));
+			?>
             </div>
 
             <div class='container pull-right'>

Spacing +9 added lines, -9 removed lines

@@ -11,7 +11,7 @@ 
 $user_email = $current_user->email;
 $user_department = $current_user->department;
 
-$email = elgg_get_plugin_setting('email','contactform');
+$email = elgg_get_plugin_setting('email', 'contactform');
 
 ?>
 
@@ -24,12 +24,12 @@ 
     
 
 <?php 
-    $disable_feedback = elgg_get_plugin_setting('disable_feedback','contactform');
-    $english_notice = elgg_get_plugin_setting('disable_feedback_message_en','contactform');
-    $french_notice = elgg_get_plugin_setting('disable_feedback_message_fr','contactform');
-    if (strcmp($disable_feedback,'yes') == 0) {
+    $disable_feedback = elgg_get_plugin_setting('disable_feedback', 'contactform');
+    $english_notice = elgg_get_plugin_setting('disable_feedback_message_en', 'contactform');
+    $french_notice = elgg_get_plugin_setting('disable_feedback_message_fr', 'contactform');
+    if (strcmp($disable_feedback, 'yes') == 0) {
 
-        if (strcmp($_COOKIE['connex_lang'], 'fr') == 0 )
+        if (strcmp($_COOKIE['connex_lang'], 'fr') == 0)
             echo "<div align='center' style='padding:5px 5px 5px 5px;'> {$french_notice} </div>";
         else
             echo "<div align='center' style='padding:5px 5px 5px 5px;'> {$english_notice} </div>";
@@ -82,7 +82,7 @@ 
             <?php
 
                 // get the selected language
-                if (strcmp($SESSION['language'], 'fr') == 0 )
+                if (strcmp($SESSION['language'], 'fr') == 0)
                     $language_selected = 'francais';
                 else
                     $language_selected = 'english';
@@ -107,7 +107,7 @@ 
 
             <!-- message -->
             <div class='form-group'>
-                <label for='message' class="required"><span class="field-name"><?php echo elgg_echo('contactform:message');?></span></label>
+                <label for='message' class="required"><span class="field-name"><?php echo elgg_echo('contactform:message'); ?></span></label>
            <?php
                 echo elgg_view('input/longtext', array(
                     'name' => 'message',
@@ -118,7 +118,7 @@ 
             </div>
 
             <div class='container pull-right'>
-                <input type='submit' class="btn btn-primary pull-right" name='Submit' value='<?php echo elgg_echo('send');?>' />
+                <input type='submit' class="btn btn-primary pull-right" name='Submit' value='<?php echo elgg_echo('send'); ?>' />
             </div>
         </form>
     </div>

Braces +13 added lines, -10 removed lines

@@ -29,10 +29,11 @@ 
     $french_notice = elgg_get_plugin_setting('disable_feedback_message_fr','contactform');
     if (strcmp($disable_feedback,'yes') == 0) {
 
-        if (strcmp($_COOKIE['connex_lang'], 'fr') == 0 )
-            echo "<div align='center' style='padding:5px 5px 5px 5px;'> {$french_notice} </div>";
-        else
-            echo "<div align='center' style='padding:5px 5px 5px 5px;'> {$english_notice} </div>";
+        if (strcmp($_COOKIE['connex_lang'], 'fr') == 0 ) {
+                    echo "<div align='center' style='padding:5px 5px 5px 5px;'> {$french_notice} </div>";
+        } else {
+                    echo "<div align='center' style='padding:5px 5px 5px 5px;'> {$english_notice} </div>";
+        }
     
     } else {
 ?>
@@ -82,10 +83,11 @@ 
             <?php
 
                 // get the selected language
-                if (strcmp($SESSION['language'], 'fr') == 0 )
-                    $language_selected = 'francais';
-                else
-                    $language_selected = 'english';
+                if (strcmp($SESSION['language'], 'fr') == 0 ) {
+                                    $language_selected = 'francais';
+                } else {
+                                    $language_selected = 'english';
+                }
 
                 // run a query to get all the categories for the feedback type
                 $query = "SELECT id, {$language_selected} FROM contact_list";
@@ -93,8 +95,9 @@ 
 
                 // create the options
                 $options['na'] = elgg_echo('contactform:reason');
-                foreach ($feedback_types as $feedback_type)
-                    $options[$feedback_type->$language_selected] = $feedback_type->$language_selected;
+                foreach ($feedback_types as $feedback_type) {
+                                    $options[$feedback_type->$language_selected] = $feedback_type->$language_selected;
+                }
    
                 echo elgg_view('input/select', array(
                     'name' => 'reason',

mod/ideas/actions/ideas/editidea.php

Indentation +2 added lines, -2 removed lines

@@ -14,9 +14,9 @@
 	forward(REFERER);
 } else {
 	$idea = get_entity($guid);
-    $container_guid = (int)get_input('container_guid', elgg_get_page_owner_guid());
+	$container_guid = (int)get_input('container_guid', elgg_get_page_owner_guid());
 
-    $owner = get_entity($container_guid);
+	$owner = get_entity($container_guid);
 }
 
 $title = strip_tags(get_input('title'));

Spacing +6 added lines, -6 removed lines

@@ -9,12 +9,12 @@ 
 
 elgg_make_sticky_form('idea');
 
-if (is_null( $guid = get_input('guid') )) {
+if (is_null($guid = get_input('guid'))) {
 	system_message(elgg_echo('ideas:idea:save:failed'));
 	forward(REFERER);
 } else {
 	$idea = get_entity($guid);
-    $container_guid = (int)get_input('container_guid', elgg_get_page_owner_guid());
+    $container_guid = (int) get_input('container_guid', elgg_get_page_owner_guid());
 
     $owner = get_entity($container_guid);
 }
@@ -36,15 +36,15 @@ 
 	forward(REFERER);
 }
 
-if($description && $description2){
-	$description = $description .'->'. $description2;
-}else if (!$description && $description2){
+if ($description && $description2) {
+	$description = $description . '->' . $description2;
+} else if (!$description && $description2) {
 	$description = $description2;
 }
 
 $idea->title = $title;
 $idea->description = gc_implode_translation($description1, $description2);
-$idea->access_id =$owner->access_id;
+$idea->access_id = $owner->access_id;
 $idea->tags = string_to_tag_array($tags);
 
 if ($idea->save()) {

Braces +7 added lines, -3 removed lines

@@ -22,8 +22,12 @@ 
 $title = strip_tags(get_input('title'));
 $title2 = strip_tags(get_input('title2'));
 
-if (!$title) $title = $idea->title;
-if (!$title2) $title2 = $idea->title2;
+if (!$title) {
+	$title = $idea->title;
+}
+if (!$title2) {
+	$title2 = $idea->title2;
+}
 
 $description = $description1 = get_input('description');
 $description2 = get_input('description2');
@@ -38,7 +42,7 @@ 
 
 if($description && $description2){
 	$description = $description .'->'. $description2;
-}else if (!$description && $description2){
+} else if (!$description && $description2){
 	$description = $description2;
 }
 

mod/ideas/actions/ideas/saveidea.php

Spacing +11 added lines, -11 removed lines

@@ -18,8 +18,8 @@ 
 $description = $description1 = get_input('description');
 $description2 = get_input('description2');
 $tags = get_input('tags');
-$guid = (int)get_input('guid');
-$container_guid = (int)get_input('container_guid', elgg_get_page_owner_guid());
+$guid = (int) get_input('guid');
+$container_guid = (int) get_input('container_guid', elgg_get_page_owner_guid());
 
 $owner = get_entity($container_guid);
 
@@ -53,15 +53,15 @@ 
 }
 
 	
-if($title && $title2){
-	$title = $title .'->'. $title2;
-}else if (!$title && $title2){
+if ($title && $title2) {
+	$title = $title . '->' . $title2;
+} else if (!$title && $title2) {
 	$title = $title2;
 }
 
-if($description && $description2){
-	$description = $description .'->'. $description2;
-}else if (!$description && $description2){
+if ($description && $description2) {
+	$description = $description . '->' . $description2;
+} else if (!$description && $description2) {
 	$description = $description2;
 }
 
@@ -84,16 +84,16 @@ 
 	system_message(elgg_echo('ideas:idea:save:success'));
 
 	// if this is a New idea, automatically "like" by current user and add to river
-	if ($new ) {
+	if ($new) {
 				
 		$annotation = new ElggObject($idea->getGUID());
-		if ( create_annotation($annotation->getGUID(), 'point', 1, 'integer', $user_guid, $annotation->getAccessID()) ) {
+		if (create_annotation($annotation->getGUID(), 'point', 1, 'integer', $user_guid, $annotation->getAccessID())) {
 		} else {
 			register_error(elgg_echo('ideas:idea:rate:error'));
 		}
         
 		// what is the river?
-		add_to_river('river/object/ideas/create','create', $user_guid, $idea->getGUID());
+		add_to_river('river/object/ideas/create', 'create', $user_guid, $idea->getGUID());
 	}
 
 	forward($idea->getURL());

Braces +2 added lines, -2 removed lines

@@ -55,13 +55,13 @@
 	
 if($title && $title2){
 	$title = $title .'->'. $title2;
-}else if (!$title && $title2){
+} else if (!$title && $title2){
 	$title = $title2;
 }
 
 if($description && $description2){
 	$description = $description .'->'. $description2;
-}else if (!$description && $description2){
+} else if (!$description && $description2){
 	$description = $description2;
 }
 

mod/ideas/pages/ideas/editidea.php

Spacing +1 added lines, -1 removed lines

@@ -14,7 +14,7 @@
 }
 
 
-	elgg_push_breadcrumb(gc_explode_translation($idea->title,$lang), $idea->getURL());
+	elgg_push_breadcrumb(gc_explode_translation($idea->title, $lang), $idea->getURL());
 
 elgg_push_breadcrumb(elgg_echo('ideas:edit'));
 

mod/ideas/pages/ideas/new.php

Spacing +2 added lines, -2 removed lines

@@ -11,7 +11,7 @@ 
 	$title_breadcrumbs = gc_explode_translation($page_owner->title, $lang);
 
 
-elgg_push_breadcrumb($title_breadcrumbs);;
+elgg_push_breadcrumb($title_breadcrumbs); ;
 elgg_push_breadcrumb(elgg_echo('ideas:filter:new'));
 
 if ($page_owner->canEdit() || elgg_is_admin_logged_in()) {
@@ -23,7 +23,7 @@ 
 	));
 }
 
-$offset = (int)get_input('offset', 0);
+$offset = (int) get_input('offset', 0);
 $order_by = get_input('order', 'desc');
 
 $content = elgg_list_entities(array(

mod/ideas/pages/ideas/view.php

Spacing +1 added lines, -1 removed lines

@@ -10,7 +10,7 @@
 $page_owner = elgg_get_page_owner_entity();
 
 
-	$crumbs_title = gc_explode_translation($page_owner->title,$lang);
+	$crumbs_title = gc_explode_translation($page_owner->title, $lang);
 
 
 if (elgg_instanceof($page_owner, 'group')) {