gctools-outilsgc / gcconnex

mod/wet4/languages/fr.php

Indentation +128 added lines, -128 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-    $site_url = elgg_get_site_url();
+	$site_url = elgg_get_site_url();
 
 return array(
 
@@ -181,54 +181,54 @@ 
   'dept:activity:groupsandcolleagues' => "Mes groupes et collègues",
 
 
-      'wet:more' => "Autres",
-    'breadcrum:home' => 'Accueil',
+	  'wet:more' => "Autres",
+	'breadcrum:home' => 'Accueil',
 
-        'wet:feedbackText' => "Rétroaction<span class='wb-inv'> sur ce site Web</span>",
-        'wet:footTerms' => 'Modalités',
-        'wet:footPrivacy'	 => 'Politique de confidentialité',
-        'wet:footTitleAbout' => 'Infos',
-        'wet:footTitleNews' =>  'Nouvelles',
-        'wet:footTitleSocial' => 'Restez branchés',
+		'wet:feedbackText' => "Rétroaction<span class='wb-inv'> sur ce site Web</span>",
+		'wet:footTerms' => 'Modalités',
+		'wet:footPrivacy'	 => 'Politique de confidentialité',
+		'wet:footTitleAbout' => 'Infos',
+		'wet:footTitleNews' =>  'Nouvelles',
+		'wet:footTitleSocial' => 'Restez branchés',
 /**
- * Profile Strength
- */
-     'ps:basicprofile' => "Profil de base",
-     'ps:access' => "Afficher : ",
-    'ps:details' => "Voir en détail",
-    'ps:education' => "Éducation",
-    'ps:work' => "Expérience de travail",
-    'ps:profilestrength' => "Profil",
-     'ps:all-star' => "Félicitations! Vous êtes une étoile.",
-     'ps:beginner' => "Débutant",
-     'ps:advanced' => "Avancé",
-     'ps:expert' => "Expert",
-     'ps:optingin' => "Avez-vous penser à adhérer aux micro-missions?",
-     'ps:optin' => "Adhérer",
-     'ps:psErr' => "Une erreur est survenue durant l'obtentions de vos informations de profil . Nous travaillons pour résoudre le problème .",
-
-         /**
-     * Department Verify
-     */
-
-    'dept:confirm' => 'Confirmez votre ministère',
-    'dept:intro' => 'Dans l’optique d’avoir de l’information à jour sur GCconnex et afin d’obtenir les meilleurs statistiques possibles, nous vous prions de confirmer votre ministère.',
-    'dept:not' => "N'est pas votre ministère présentement?",
-    'dept:select' => 'Veuillez choisir votre ministère présent',
-    'confirm' => 'Confirmer',
-    'dept:saved' => '%s saved as current department',
-
-    'dept:confirm' => 'Salut, bonjour!',
-    'dept:intro' => "Avez-vous changé de poste récemment? Avez-vous commencé une affectation? L’ASC vous a recruté pour devenir astronaute? Aidez-nous à garder GCconnex à jour en confirmant où vous travaillez.",
-    'dept:not' => "N'est pas votre ministère présentement?",
-    'dept:select' => 'Veuillez choisir votre ministère présent',
-    'confirm' => 'Confirmer',
-    'dept:saved' => '%s saved as current department',
-    'dept:notfound' => "Nous ne sommes pas capable de trouver votre ministère dans notre liste! Votre ministère a possiblement changé de nom récemment. Veuillez sélectionner le bon ministère dans la liste suivante",
-
-       /**
-    * Message Inbox
-    */
+		 * Profile Strength
+		 */
+	 'ps:basicprofile' => "Profil de base",
+	 'ps:access' => "Afficher : ",
+	'ps:details' => "Voir en détail",
+	'ps:education' => "Éducation",
+	'ps:work' => "Expérience de travail",
+	'ps:profilestrength' => "Profil",
+	 'ps:all-star' => "Félicitations! Vous êtes une étoile.",
+	 'ps:beginner' => "Débutant",
+	 'ps:advanced' => "Avancé",
+	 'ps:expert' => "Expert",
+	 'ps:optingin' => "Avez-vous penser à adhérer aux micro-missions?",
+	 'ps:optin' => "Adhérer",
+	 'ps:psErr' => "Une erreur est survenue durant l'obtentions de vos informations de profil . Nous travaillons pour résoudre le problème .",
+
+		 /**
+		  * Department Verify
+		  */
+
+	'dept:confirm' => 'Confirmez votre ministère',
+	'dept:intro' => 'Dans l’optique d’avoir de l’information à jour sur GCconnex et afin d’obtenir les meilleurs statistiques possibles, nous vous prions de confirmer votre ministère.',
+	'dept:not' => "N'est pas votre ministère présentement?",
+	'dept:select' => 'Veuillez choisir votre ministère présent',
+	'confirm' => 'Confirmer',
+	'dept:saved' => '%s saved as current department',
+
+	'dept:confirm' => 'Salut, bonjour!',
+	'dept:intro' => "Avez-vous changé de poste récemment? Avez-vous commencé une affectation? L’ASC vous a recruté pour devenir astronaute? Aidez-nous à garder GCconnex à jour en confirmant où vous travaillez.",
+	'dept:not' => "N'est pas votre ministère présentement?",
+	'dept:select' => 'Veuillez choisir votre ministère présent',
+	'confirm' => 'Confirmer',
+	'dept:saved' => '%s saved as current department',
+	'dept:notfound' => "Nous ne sommes pas capable de trouver votre ministère dans notre liste! Votre ministère a possiblement changé de nom récemment. Veuillez sélectionner le bon ministère dans la liste suivante",
+
+	   /**
+	    * Message Inbox
+	    */
 
    'msg:to' => 'À',
    'msg:from' => 'De',
@@ -237,31 +237,31 @@ 
    'msg:sent' => 'Envoyés',
 
 
-     /*
+	 /*
        * Content Creation
        */
 
-            'page:create' => 'Créer la page',
-            'cp_notify:minor_edit_header' => 'Est-ce une modification mineure? <small>(En cliquant cette boîte, aucune notification sera envoyée)</small>',
-            'page:minor_edit_label' => 'Modification mineure',
-            /*
+			'page:create' => 'Créer la page',
+			'cp_notify:minor_edit_header' => 'Est-ce une modification mineure? <small>(En cliquant cette boîte, aucune notification sera envoyée)</small>',
+			'page:minor_edit_label' => 'Modification mineure',
+			/*
         * Misc
         * */
 
-       'bookmark' => 'signet',
+	   'bookmark' => 'signet',
 
 /*
        * Suggested Friends
        */
 
-      'sf:title' =>	"Vous connaissez quelqu’un ? Ajoutez-les comme collègue",
-      'sf:connect' => "Prendre contact",
-      'sf:alttext' => "L'avatar de",
-      'sf:suggcolleagues' => "Suggestion de collègue",
+	  'sf:title' =>	"Vous connaissez quelqu’un ? Ajoutez-les comme collègue",
+	  'sf:connect' => "Prendre contact",
+	  'sf:alttext' => "L'avatar de",
+	  'sf:suggcolleagues' => "Suggestion de collègue",
 
 
-      /*Friendly Time*/
-      	'friendlytime:weeks' => "il y a environ 2 semaines",
+	  /*Friendly Time*/
+	  	'friendlytime:weeks' => "il y a environ 2 semaines",
 	'friendlytime:weeks:singular' => "la semaine dernière",
 	'friendlytime:date' => "j F Y",
 
@@ -278,19 +278,19 @@ 
 	'friendlytime:month:11' => 'Novembre',
 	'friendlytime:month:12' => 'Décembre',
 /**
- * The Wire
- */
-    'wire:post' => 'le message sur le fil',
-    'thewire:post' => "Créer un article sur le fil",
-    'thewire:share'	=> ' Partage',
-    'thewire:shares' => ' Partages',
-    'thewire:contentwarning' => 'Il est possible que les utilisateurs ne puissent pas tous voir ce contenu en raison des permissions d\'accès.',
-    'thewire:groupwarning' => 'Ce contenu peut être consulté par les membres de : ',
-    'thewire:userwarning' => 'Seuls les utilisateurs suivants peuvent consulter ce contenu : ',
-
-    /**
-   * Files
-   */
+	 * The Wire
+	 */
+	'wire:post' => 'le message sur le fil',
+	'thewire:post' => "Créer un article sur le fil",
+	'thewire:share'	=> ' Partage',
+	'thewire:shares' => ' Partages',
+	'thewire:contentwarning' => 'Il est possible que les utilisateurs ne puissent pas tous voir ce contenu en raison des permissions d\'accès.',
+	'thewire:groupwarning' => 'Ce contenu peut être consulté par les membres de : ',
+	'thewire:userwarning' => 'Seuls les utilisateurs suivants peuvent consulter ce contenu : ',
+
+	/**
+	 * Files
+	 */
 
   'file:folderstruct' => 'Structure de dossiers',
   'file:move:selected' => 'Déplacer la sélection',
@@ -299,72 +299,72 @@ 
   'file:chose' => 'Vous devez choisir un fichier ou un dossier.',
 
 /**
-  * User Menu
+ * User Menu
  */
 
-    'userMenu:profile' => "Mon profil",
-    'userMenu:account' => "Paramètres",
-    'userMenu:messages' => "Mes messages",
-    'userMenu:colleagues' => "Mes collègues",
-    'userMenu:usermenuTitle' =>'User Card - Click here for links to your profile, account settings and logout(translate me)', /*NEW*/
-    'wet:usermenu:helpertext' => "Menu Utilisateur. Liens vers Notifications, Profil et Déconnexion",
-    'wet:dd:expand'=>"Open drop down of most recent messages(fr)",
+	'userMenu:profile' => "Mon profil",
+	'userMenu:account' => "Paramètres",
+	'userMenu:messages' => "Mes messages",
+	'userMenu:colleagues' => "Mes collègues",
+	'userMenu:usermenuTitle' =>'User Card - Click here for links to your profile, account settings and logout(translate me)', /*NEW*/
+	'wet:usermenu:helpertext' => "Menu Utilisateur. Liens vers Notifications, Profil et Déconnexion",
+	'wet:dd:expand'=>"Open drop down of most recent messages(fr)",
 
 
   /**
- * Group Profile
- */
-
-    'gprofile:about' => "Infos",
-    'gprofile:discussion' => "Discussion",
-    'gprofile:files' => "Fichiers",
-    'gprofile:blogs' => "Blogue",
-    'gprofile:events' => "Événement",
-    'gprofile:calendar' => "calendrier",
-    'gprofile:pages' => "Pages",
-    'gprofile:bookmarks' => "Signets",
-    'gprofile:polls' => "Sondages",
-    'gprofile:tasks' => "Tâches",
-    'gprofile:photos' => "Photos",
-    'gprofile:photoCatch' => "Images",
-    'gprofile:albums' => "Albums",
-    'gprofile:albumsCatch' => "Albums d'image",
-    'gprofile:ideas' => "Idées",
-    'gprofile:more' => "Plus",
-    'gprofile:settings' => 'Paramètres',
-    'gprofile:create' => 	"Créer un groupe",
-    'gprofile:edit:content' => "Options pour le contenu",
-    'gprofile:edit:admin' => "Option pour l'administrateur",
-    'groups:suggestedGroups' => 'Le groupe en cours de création existe déjà, consultez ces suggestions pour trouver ce que vous chercher.',
-    'groups:creatediscussion' => 	'Créer une discussion',
-    'profile:actions' => 	'Actions',
-    'profile:viewall:coll' => 	'Voir tous mes collègues',
-    'profile:viewall:groups' => 'Voir tous mes groupes',
-    'photos:none' => 'Aucun album d\'image',
-    'gcforums:enable_group_forums' => 'Activé les forums de groupe',
-    'gprofile:contentMenu' => "Menu de contenu du groupe",
-
-    'groups:stats'  => "Statistiques de groupe",
-
-        /**
-   * Group invite
+   * Group Profile
    */
 
-     'group:invite:cannot' => '<br><br> Les utilisateurs suivants ne sont pas membres du groupe principal et ne peuvent être invités/ajoutés.',
+	'gprofile:about' => "Infos",
+	'gprofile:discussion' => "Discussion",
+	'gprofile:files' => "Fichiers",
+	'gprofile:blogs' => "Blogue",
+	'gprofile:events' => "Événement",
+	'gprofile:calendar' => "calendrier",
+	'gprofile:pages' => "Pages",
+	'gprofile:bookmarks' => "Signets",
+	'gprofile:polls' => "Sondages",
+	'gprofile:tasks' => "Tâches",
+	'gprofile:photos' => "Photos",
+	'gprofile:photoCatch' => "Images",
+	'gprofile:albums' => "Albums",
+	'gprofile:albumsCatch' => "Albums d'image",
+	'gprofile:ideas' => "Idées",
+	'gprofile:more' => "Plus",
+	'gprofile:settings' => 'Paramètres',
+	'gprofile:create' => 	"Créer un groupe",
+	'gprofile:edit:content' => "Options pour le contenu",
+	'gprofile:edit:admin' => "Option pour l'administrateur",
+	'groups:suggestedGroups' => 'Le groupe en cours de création existe déjà, consultez ces suggestions pour trouver ce que vous chercher.',
+	'groups:creatediscussion' => 	'Créer une discussion',
+	'profile:actions' => 	'Actions',
+	'profile:viewall:coll' => 	'Voir tous mes collègues',
+	'profile:viewall:groups' => 'Voir tous mes groupes',
+	'photos:none' => 'Aucun album d\'image',
+	'gcforums:enable_group_forums' => 'Activé les forums de groupe',
+	'gprofile:contentMenu' => "Menu de contenu du groupe",
+
+	'groups:stats'  => "Statistiques de groupe",
+
+		/**
+		 * Group invite
+		 */
+
+	 'group:invite:cannot' => '<br><br> Les utilisateurs suivants ne sont pas membres du groupe principal et ne peuvent être invités/ajoutés.',
 
   'group:invite:clicktoadd' => "Cliquez pour ajouter",
   	'group:invite:email' => "Saisir une adresse de courriel valide et appuyer sur « Entrée » pour l'inscrire à la liste",
  	'groups:eng' => "Anglais",
   	'groups:fra' => "Français",
 
-      'group:replyitem' => 'réponse',
+	  'group:replyitem' => 'réponse',
 /**
-  * Sites
- */
+	   * Sites
+	   */
 	'landingPage' => 'Définir la page d\'accueil',
 	'career' =>	'Carrière',
 	'item:site' => 'Sites',
-    'notifications:subscriptions:changesettings' => "Notifications",
+	'notifications:subscriptions:changesettings' => "Notifications",
 
 /**
  * Sessions
@@ -546,8 +546,8 @@ 
 'groups:own' => 'Groupes dont je suis propriétaire.',
 'groups:personal' => 'Personnel',
 'groups:feature' => 'En vedette',
-    'groups:popular' => 'Populaire',
-    'groups:suggested' => 'Suggestion',
+	'groups:popular' => 'Populaire',
+	'groups:suggested' => 'Suggestion',
 
 
 /**
@@ -656,8 +656,8 @@ 
  */
 	'feed:rss' => 'S\'abonner au fil RSS de cette page',
 /**
- * Links
- */
+	 * Links
+	 */
 	'link:view' => 'Voir le lien',
 	'link:view:all' => 'Voir tout',
 
@@ -688,8 +688,8 @@ 
 	'river:widgets:all' => 'Toute activité sur le site',
   'river:create:object:default' => '%s a téléchargé le fichier %s',
 /**
- * Notifications
- */
+   * Notifications
+   */
 'notifications:usersettings' => "Configuration des notifications",
 'notification:method:email' => 'Courriel',
 'notifications:usersettings:save:ok' => "La configuration des notifications a été sauvegardée avec succès.",
@@ -1538,7 +1538,7 @@ 
   'flag_content:info' => 'Si vous croyez qu\'un contenu ou comportement contrevient aux conditions d’utilisation, veuillez svp nous fournir une description du comportement ou contenu inacceptable, le nom de la personne visée, et les hyperliens si possible. Le contenu ou comportement sera passé en revue.',
 
 
-    /*
+	/*
   * Contact Form Validation
    *Message - Ce champ est obligatoire.
   * */

mod/wet4/languages/en.php

Indentation +310 added lines, -310 removed lines

@@ -3,217 +3,217 @@ 
 
 return array(
 
-    'thewire:head:title' => 'Wire post',
+	'thewire:head:title' => 'Wire post',
 
-    /*
+	/*
     More context links - entity/river menus
     */
 
-    'entity:like:link:page_top' => 'Like the page "%s"',
-    'entity:unlike:link:page_top' => 'Remove like from the page "%s"',
-    'entity:edit:link:page_top' => 'Edit the page "%s"',
-    'entity:delete:link:page_top' => 'Delete the page "%s"',
-    'entity:share:link:page_top' => 'Share the page "%s" on The Wire',
-    'entity:subscribe:link:page_top' => 'Subscribe to the page "%s"',
-    'entity:unsubscribe:link:page_top' => 'Unsubscribe to the page "%s"',
-    'entity:history:link:page_top' => 'View history of the page "%s"',
-
-    'entity:like:link:page' => 'Like the page "%s"',
-    'entity:unlike:link:page' => 'Remove like from the page "%s"',
-    'entity:edit:link:page' => 'Edit the page "%s"',
-    'entity:delete:link:page' => 'Delete the page "%s"',
-    'entity:share:link:page' => 'Share the page "%s" on The Wire',
-    'entity:subscribe:link:page' => 'Subscribe to the page "%s"',
-    'entity:unsubscribe:link:page' => 'Unsubscribe to the page "%s"',
-    'entity:history:link:page' => 'View history of the page "%s"',
-
-    'entity:like:link:thewire' => 'Like the wire post by %s',
-    'entity:unlike:link:thewire' => 'Remove like from the wire post by %s',
-    'entity:delete:link:thewire' => 'Delete the wire post by %s',
-    'entity:share:link:thewire' => 'Share the wire post by %s on The Wire',
-    'entity:subscribe:link:thewire' => 'Subscribe to the wire post by %s',
-    'entity:unsubscribe:link:thewire' => 'Unsubscribe to the wire post by %s',
-    'entity:reply:link:thewire' => 'Reply to the wire post by %s',
-
-    'entity:like:link:blog' => 'Like the blog "%s"',
-    'entity:unlike:link:blog' => 'Remove like from the blog "%s"',
-    'entity:edit:link:blog' => 'Edit the blog "%s"',
-    'entity:delete:link:blog' => 'Delete the blog "%s"',
-    'entity:share:link:blog' => 'Share the blog "%s" on The Wire',
-    'entity:subscribe:link:blog' => 'Subscribe to the blog "%s"',
-    'entity:unsubscribe:link:blog' => 'Unsubscribe to the blog "%s"',
-    'entity:comment:link:blog' => 'Comment on the blog "%s"',
-
-    'entity:like:link:comment' => 'Like the comment by %s',
-    'entity:unlike:link:comment' => 'Remove like from the comment by %s',
-    'entity:edit:link:comment' => 'Edit the comment by %s',
-    'entity:delete:link:comment' => 'Delete the comment by %s',
-
-    'entity:like:link:groupforumtopic' => 'Like the discussion "%s"',
-    'entity:unlike:link:groupforumtopic' => 'Remove like from the discussion "%s"',
-    'entity:edit:link:groupforumtopic' => 'Edit the discussion "%s"',
-    'entity:delete:link:groupforumtopic' => 'Delete the discussion "%s"',
-    'entity:share:link:groupforumtopic' => 'Share the discussion "%s" on The Wire',
-    'entity:subscribe:link:groupforumtopic' => 'Subscribe to the discussion "%s"',
-    'entity:unsubscribe:link:groupforumtopic' => 'Unsubscribe to the discussion "%s"',
-    'entity:lock:link:groupforumtopic' => 'Close the discussion "%s"',
-    'entity:unlock:link:groupforumtopic' => 'Open the discussion "%s"',
-
-    'entity:like:link:discussion_reply' => 'Like the discussion reply by %s',
-    'entity:unlike:link:discussion_reply' => 'Remove like from the discussion reply by %s',
-    'entity:edit:link:discussion_reply' => 'Edit the discussion reply by %s',
-    'entity:delete:link:discussion_reply' => 'Delete the discussion reply by %s',
-
-    'entity:like:link:file' => 'Like the file "%s"',
-    'entity:unlike:link:file' => 'Remove like from the file "%s"',
-    'entity:edit:link:file' => 'Edit the file "%s"',
-    'entity:delete:link:file' => 'Delete the file "%s"',
-    'entity:share:link:file' => 'Share the file "%s" on The Wire',
-    'entity:subscribe:link:file' => 'Subscribe to the file "%s"',
-    'entity:unsubscribe:link:file' => 'Unsubscribe to the file "%s"',
-    'entity:download:link:file' => 'Download the file "%s"',
-
-    'entity:like:link:folder' => 'Like the folder "%s"',
-    'entity:unlike:link:folder' => 'Remove like from the folder "%s"',
-    'entity:edit:link:folder' => 'Edit the folder "%s"',
-    'entity:delete:link:folder' => 'Delete the folder "%s"',
-    'entity:share:link:folder' => 'Share the folder "%s" on The Wire',
-    'entity:subscribe:link:folder' => 'Subscribe to the folder "%s"',
-    'entity:unssubscribe:link:folder' => 'Unsubscribe to the folder "%s"',
-
-    'entity:like:link:event_calendar' => 'Like the event "%s"',
-    'entity:unlike:link:event_calendar' => 'Remove like from the event "%s"',
-    'entity:edit:link:event_calendar' => 'Edit the event "%s"',
-    'entity:delete:link:event_calendar' => 'Delete the event "%s"',
-    'entity:share:link:event_calendar' => 'Share the event "%s" on The Wire',
-    'entity:subscribe:link:event_calendar' => 'Subscribe to the event "%s"',
-    'entity:unsubscribe:link:event_calendar' => 'Unsubscribe to the event "%s"',
-
-    'entity:like:link:bookmarks' => 'Like the bookmark "%s"',
-    'entity:unlike:link:bookmarks' => 'Remove like from the bookmark "%s"',
-    'entity:edit:link:bookmarks' => 'Edit the bookmark "%s"',
-    'entity:delete:link:bookmarks' => 'Delete the bookmark "%s"',
-    'entity:share:link:bookmarks' => 'Share the bookmark "%s" on The Wire',
-    'entity:subscribe:link:bookmarks' => 'Subscribe to the bookmark "%s"',
-    'entity:unsubscribe:link:bookmarks' => 'Unsubscribe to the bookmark "%s"',
-
-    'entity:like:link:poll' => 'Like the poll "%s"',
-    'entity:unlike:link:poll' => 'Remove like from the poll "%s"',
-    'entity:edit:link:poll' => 'Edit the poll "%s"',
-    'entity:delete:link:poll' => 'Delete the poll "%s"',
-    'entity:share:link:poll' => 'Share the poll "%s" on The Wire',
-    'entity:subscribe:link:poll' => 'Subscribe to the poll "%s"',
-    'entity:unsubscribe:link:poll' => 'Unsubscribe to the poll "%s"',
-
-    'entity:like:link:album' => 'Like the image album "%s"',
-    'entity:unlike:link:album' => 'Remove like from the image album "%s"',
-    'entity:edit:link:album' => 'Edit the image album "%s"',
-    'entity:delete:link:album' => 'Delete the image album "%s"',
-    'entity:share:link:album' => 'Share the image album "%s" on The Wire',
-    'entity:subscribe:link:album' => 'Subscribe to the image album "%s"',
-    'entity:unsubscribe:link:album' => 'Unsubscribe to the image album "%s"',
-
-    'entity:like:link:image' => 'Like the image "%s"',
-    'entity:unlike:link:image' => 'Remove like from the image "%s"',
-    'entity:edit:link:image' => 'Edit the image "%s"',
-    'entity:delete:link:image' => 'Delete the image "%s"',
-    'entity:share:link:image' => 'Share the image "%s" on The Wire',
-    'entity:subscribe:link:image' => 'Subscribe the image "%s"',
-    'entity:unsubscribe:link:image' => 'Unsubscribe the image "%s"',
-
-    'entity:like:link:idea' => 'Like the idea "%s"',
-    'entity:unlike:link:idea' => 'Remove like from the idea "%s"',
-    'entity:edit:link:idea' => 'Edit the idea "%s"',
-    'entity:delete:link:idea' => 'Delete the idea "%s"',
-    'entity:share:link:idea' => 'Share the idea "%s" on The Wire',
-    'entity:subscribe:link:idea' => 'Subscribe to the idea "%s"',
-    'entity:unsubscribe:link:idea' => 'Unsubscribe to the idea "%s"',
-    'entity:upvote:link:idea' => 'Upvote the idea "%s"',
-    'entity:downvote:link:idea' => 'Downvote the idea "%s"',
-
-    'entity:like:link:group' => 'Like the group "%s"',
-    'entity:unlike:link:group' => 'Remove like from the group "%s"',
-    'entity:edit:link:group' => 'Edit the group "%s"',
-    'entity:delete:link:group' => 'Delete the group "%s"',
-    'entity:share:link:group' => 'Share the group "%s" on The Wire',
-    'entity:subscribe:link:group' => 'Subscribe to the group "%s"',
-    'entity:unsubscribe:link:group' => 'Unsubscribe to the group "%s"',
-
-    'group:share:link' => 'Share this group on the Wire',
-
-    'friend_request:approve' => 'Accept<span class="wb-inv"> %s\'s friend request</span>',
-    'friend_request:decline' => 'Decline <span class="wb-inv"> %s\'s friend request</span>',
-    'friend_request:revoke' => 'Revoke <span class="wb-inv">sent friend request to %s </span>',
-
-    'group:accept:invitation' => 'Accept<span class="wb-inv">group invite to "%s"</span>',
-    'group:decline:invitation' => 'Decline<span class="wb-inv">group invite to "%s"</span>',
-
-
-    'entity:like:link:question' => 'Like the question %s',
-    'entity:unlike:link:question' => 'Remove like from the question %s',
-    'entity:comment:link:question' => 'Comment on the question %s',
-    'entity:edit:link:question' => 'Edit the question %s',
-    'entity:delete:link:question' => 'Delete the question %s',
-    'entity:share:link:question' => 'Share the question %s on The Wire',
-    'entity:subscribe:link:question' => 'Subscribe to the question %s',
-    'entity:unsubscribe:link:question' => 'Unsubscribe to the question %s',
-
-    'entity:like:link:answer' => 'Like this answer by %s',
-    'entity:unlike:link:answer' => 'Remove like from the answer by %s',
-    'entity:comment:link:answer' => 'Comment on this answer by %s',
-    'entity:edit:link:answer' => 'Edit this answer by %s',
-    'entity:delete:link:answer' => 'Delete this answer by %s',
-    'entity:share:link:answer' => 'Share this answer by %s to The Wire',
-
-    //questions
-    'questions:answer:checkmark:brief' => "%s marked an answer by %s correct on %s",
-    'questions:friends' => "Friends' Questions",
-    'question:answered' => "<span class='wb-inv'>Answered</span>",
-    'question:suggestion' => '<b>Similar questions already asked.</b>',
-    'question:suggestion:answered' => 'Answered question.',
-
-    //form validation
-
-    'form:invalid:extensions' => "Invalid file format. Allowed file extensions: %s",
-
-
-    ////
-
-    'new:dept:activity:title' => "My department's news feed",
-    'dept:activity:show' => "Show colleague connections",
-    'dept:activity:hide' => "Hide colleague connections",
-    'dept:activity:do' => "Colleague connections will no longer display in your department’s news feed.",
-    'dept:activity:undo' => "Colleague connections will now display in your department’s news feed.",
-    'dept:activity:filter:title' => "News Feed settings",
-    'dept:activity:groupsandcolleagues' => "My groups and colleagues",
-
-    'wet:more'=>"More",
+	'entity:like:link:page_top' => 'Like the page "%s"',
+	'entity:unlike:link:page_top' => 'Remove like from the page "%s"',
+	'entity:edit:link:page_top' => 'Edit the page "%s"',
+	'entity:delete:link:page_top' => 'Delete the page "%s"',
+	'entity:share:link:page_top' => 'Share the page "%s" on The Wire',
+	'entity:subscribe:link:page_top' => 'Subscribe to the page "%s"',
+	'entity:unsubscribe:link:page_top' => 'Unsubscribe to the page "%s"',
+	'entity:history:link:page_top' => 'View history of the page "%s"',
+
+	'entity:like:link:page' => 'Like the page "%s"',
+	'entity:unlike:link:page' => 'Remove like from the page "%s"',
+	'entity:edit:link:page' => 'Edit the page "%s"',
+	'entity:delete:link:page' => 'Delete the page "%s"',
+	'entity:share:link:page' => 'Share the page "%s" on The Wire',
+	'entity:subscribe:link:page' => 'Subscribe to the page "%s"',
+	'entity:unsubscribe:link:page' => 'Unsubscribe to the page "%s"',
+	'entity:history:link:page' => 'View history of the page "%s"',
+
+	'entity:like:link:thewire' => 'Like the wire post by %s',
+	'entity:unlike:link:thewire' => 'Remove like from the wire post by %s',
+	'entity:delete:link:thewire' => 'Delete the wire post by %s',
+	'entity:share:link:thewire' => 'Share the wire post by %s on The Wire',
+	'entity:subscribe:link:thewire' => 'Subscribe to the wire post by %s',
+	'entity:unsubscribe:link:thewire' => 'Unsubscribe to the wire post by %s',
+	'entity:reply:link:thewire' => 'Reply to the wire post by %s',
+
+	'entity:like:link:blog' => 'Like the blog "%s"',
+	'entity:unlike:link:blog' => 'Remove like from the blog "%s"',
+	'entity:edit:link:blog' => 'Edit the blog "%s"',
+	'entity:delete:link:blog' => 'Delete the blog "%s"',
+	'entity:share:link:blog' => 'Share the blog "%s" on The Wire',
+	'entity:subscribe:link:blog' => 'Subscribe to the blog "%s"',
+	'entity:unsubscribe:link:blog' => 'Unsubscribe to the blog "%s"',
+	'entity:comment:link:blog' => 'Comment on the blog "%s"',
+
+	'entity:like:link:comment' => 'Like the comment by %s',
+	'entity:unlike:link:comment' => 'Remove like from the comment by %s',
+	'entity:edit:link:comment' => 'Edit the comment by %s',
+	'entity:delete:link:comment' => 'Delete the comment by %s',
+
+	'entity:like:link:groupforumtopic' => 'Like the discussion "%s"',
+	'entity:unlike:link:groupforumtopic' => 'Remove like from the discussion "%s"',
+	'entity:edit:link:groupforumtopic' => 'Edit the discussion "%s"',
+	'entity:delete:link:groupforumtopic' => 'Delete the discussion "%s"',
+	'entity:share:link:groupforumtopic' => 'Share the discussion "%s" on The Wire',
+	'entity:subscribe:link:groupforumtopic' => 'Subscribe to the discussion "%s"',
+	'entity:unsubscribe:link:groupforumtopic' => 'Unsubscribe to the discussion "%s"',
+	'entity:lock:link:groupforumtopic' => 'Close the discussion "%s"',
+	'entity:unlock:link:groupforumtopic' => 'Open the discussion "%s"',
+
+	'entity:like:link:discussion_reply' => 'Like the discussion reply by %s',
+	'entity:unlike:link:discussion_reply' => 'Remove like from the discussion reply by %s',
+	'entity:edit:link:discussion_reply' => 'Edit the discussion reply by %s',
+	'entity:delete:link:discussion_reply' => 'Delete the discussion reply by %s',
+
+	'entity:like:link:file' => 'Like the file "%s"',
+	'entity:unlike:link:file' => 'Remove like from the file "%s"',
+	'entity:edit:link:file' => 'Edit the file "%s"',
+	'entity:delete:link:file' => 'Delete the file "%s"',
+	'entity:share:link:file' => 'Share the file "%s" on The Wire',
+	'entity:subscribe:link:file' => 'Subscribe to the file "%s"',
+	'entity:unsubscribe:link:file' => 'Unsubscribe to the file "%s"',
+	'entity:download:link:file' => 'Download the file "%s"',
+
+	'entity:like:link:folder' => 'Like the folder "%s"',
+	'entity:unlike:link:folder' => 'Remove like from the folder "%s"',
+	'entity:edit:link:folder' => 'Edit the folder "%s"',
+	'entity:delete:link:folder' => 'Delete the folder "%s"',
+	'entity:share:link:folder' => 'Share the folder "%s" on The Wire',
+	'entity:subscribe:link:folder' => 'Subscribe to the folder "%s"',
+	'entity:unssubscribe:link:folder' => 'Unsubscribe to the folder "%s"',
+
+	'entity:like:link:event_calendar' => 'Like the event "%s"',
+	'entity:unlike:link:event_calendar' => 'Remove like from the event "%s"',
+	'entity:edit:link:event_calendar' => 'Edit the event "%s"',
+	'entity:delete:link:event_calendar' => 'Delete the event "%s"',
+	'entity:share:link:event_calendar' => 'Share the event "%s" on The Wire',
+	'entity:subscribe:link:event_calendar' => 'Subscribe to the event "%s"',
+	'entity:unsubscribe:link:event_calendar' => 'Unsubscribe to the event "%s"',
+
+	'entity:like:link:bookmarks' => 'Like the bookmark "%s"',
+	'entity:unlike:link:bookmarks' => 'Remove like from the bookmark "%s"',
+	'entity:edit:link:bookmarks' => 'Edit the bookmark "%s"',
+	'entity:delete:link:bookmarks' => 'Delete the bookmark "%s"',
+	'entity:share:link:bookmarks' => 'Share the bookmark "%s" on The Wire',
+	'entity:subscribe:link:bookmarks' => 'Subscribe to the bookmark "%s"',
+	'entity:unsubscribe:link:bookmarks' => 'Unsubscribe to the bookmark "%s"',
+
+	'entity:like:link:poll' => 'Like the poll "%s"',
+	'entity:unlike:link:poll' => 'Remove like from the poll "%s"',
+	'entity:edit:link:poll' => 'Edit the poll "%s"',
+	'entity:delete:link:poll' => 'Delete the poll "%s"',
+	'entity:share:link:poll' => 'Share the poll "%s" on The Wire',
+	'entity:subscribe:link:poll' => 'Subscribe to the poll "%s"',
+	'entity:unsubscribe:link:poll' => 'Unsubscribe to the poll "%s"',
+
+	'entity:like:link:album' => 'Like the image album "%s"',
+	'entity:unlike:link:album' => 'Remove like from the image album "%s"',
+	'entity:edit:link:album' => 'Edit the image album "%s"',
+	'entity:delete:link:album' => 'Delete the image album "%s"',
+	'entity:share:link:album' => 'Share the image album "%s" on The Wire',
+	'entity:subscribe:link:album' => 'Subscribe to the image album "%s"',
+	'entity:unsubscribe:link:album' => 'Unsubscribe to the image album "%s"',
+
+	'entity:like:link:image' => 'Like the image "%s"',
+	'entity:unlike:link:image' => 'Remove like from the image "%s"',
+	'entity:edit:link:image' => 'Edit the image "%s"',
+	'entity:delete:link:image' => 'Delete the image "%s"',
+	'entity:share:link:image' => 'Share the image "%s" on The Wire',
+	'entity:subscribe:link:image' => 'Subscribe the image "%s"',
+	'entity:unsubscribe:link:image' => 'Unsubscribe the image "%s"',
+
+	'entity:like:link:idea' => 'Like the idea "%s"',
+	'entity:unlike:link:idea' => 'Remove like from the idea "%s"',
+	'entity:edit:link:idea' => 'Edit the idea "%s"',
+	'entity:delete:link:idea' => 'Delete the idea "%s"',
+	'entity:share:link:idea' => 'Share the idea "%s" on The Wire',
+	'entity:subscribe:link:idea' => 'Subscribe to the idea "%s"',
+	'entity:unsubscribe:link:idea' => 'Unsubscribe to the idea "%s"',
+	'entity:upvote:link:idea' => 'Upvote the idea "%s"',
+	'entity:downvote:link:idea' => 'Downvote the idea "%s"',
+
+	'entity:like:link:group' => 'Like the group "%s"',
+	'entity:unlike:link:group' => 'Remove like from the group "%s"',
+	'entity:edit:link:group' => 'Edit the group "%s"',
+	'entity:delete:link:group' => 'Delete the group "%s"',
+	'entity:share:link:group' => 'Share the group "%s" on The Wire',
+	'entity:subscribe:link:group' => 'Subscribe to the group "%s"',
+	'entity:unsubscribe:link:group' => 'Unsubscribe to the group "%s"',
+
+	'group:share:link' => 'Share this group on the Wire',
+
+	'friend_request:approve' => 'Accept<span class="wb-inv"> %s\'s friend request</span>',
+	'friend_request:decline' => 'Decline <span class="wb-inv"> %s\'s friend request</span>',
+	'friend_request:revoke' => 'Revoke <span class="wb-inv">sent friend request to %s </span>',
+
+	'group:accept:invitation' => 'Accept<span class="wb-inv">group invite to "%s"</span>',
+	'group:decline:invitation' => 'Decline<span class="wb-inv">group invite to "%s"</span>',
+
+
+	'entity:like:link:question' => 'Like the question %s',
+	'entity:unlike:link:question' => 'Remove like from the question %s',
+	'entity:comment:link:question' => 'Comment on the question %s',
+	'entity:edit:link:question' => 'Edit the question %s',
+	'entity:delete:link:question' => 'Delete the question %s',
+	'entity:share:link:question' => 'Share the question %s on The Wire',
+	'entity:subscribe:link:question' => 'Subscribe to the question %s',
+	'entity:unsubscribe:link:question' => 'Unsubscribe to the question %s',
+
+	'entity:like:link:answer' => 'Like this answer by %s',
+	'entity:unlike:link:answer' => 'Remove like from the answer by %s',
+	'entity:comment:link:answer' => 'Comment on this answer by %s',
+	'entity:edit:link:answer' => 'Edit this answer by %s',
+	'entity:delete:link:answer' => 'Delete this answer by %s',
+	'entity:share:link:answer' => 'Share this answer by %s to The Wire',
+
+	//questions
+	'questions:answer:checkmark:brief' => "%s marked an answer by %s correct on %s",
+	'questions:friends' => "Friends' Questions",
+	'question:answered' => "<span class='wb-inv'>Answered</span>",
+	'question:suggestion' => '<b>Similar questions already asked.</b>',
+	'question:suggestion:answered' => 'Answered question.',
+
+	//form validation
+
+	'form:invalid:extensions' => "Invalid file format. Allowed file extensions: %s",
+
+
+	////
+
+	'new:dept:activity:title' => "My department's news feed",
+	'dept:activity:show' => "Show colleague connections",
+	'dept:activity:hide' => "Hide colleague connections",
+	'dept:activity:do' => "Colleague connections will no longer display in your department’s news feed.",
+	'dept:activity:undo' => "Colleague connections will now display in your department’s news feed.",
+	'dept:activity:filter:title' => "News Feed settings",
+	'dept:activity:groupsandcolleagues' => "My groups and colleagues",
+
+	'wet:more'=>"More",
   	'breadcrum:home' => 'Home',
 
 
-        'wet:feedbackText'=>"Feedback<span class='wb-inv'> about this web site</span>",
+		'wet:feedbackText'=>"Feedback<span class='wb-inv'> about this web site</span>",
 
 
-        'wet:footTerms' => 'Terms and Conditions of Use',
-        'wet:footPrivacy' => 'Privacy Policy',
-        'wet:footTitleAbout' => 'About',
-        'wet:footTitleNews' => 'News',
-        'wet:footTitleSocial' => 'Stay Connected',
-    /**
-    * Department Verify
-    */
+		'wet:footTerms' => 'Terms and Conditions of Use',
+		'wet:footPrivacy' => 'Privacy Policy',
+		'wet:footTitleAbout' => 'About',
+		'wet:footTitleNews' => 'News',
+		'wet:footTitleSocial' => 'Stay Connected',
+	/**
+	 * Department Verify
+	 */
 
-    'dept:confirm' => 'Just Checking In!',
-    'dept:intro' => 'Have you changed jobs recently? Started a temporary assignment? Been recruited by the CSA to become an astronaut? Help us keep GCconnex up to date by confirming where you work.',
-    'dept:not' => 'Not your current department?',
-    'dept:select' => 'Please select your current department',
-    'confirm' => 'Confirm',
-    'dept:saved' => '%s saved as current department',
-    'dept:notfound' => "We can’t seem find your current department in our list! Your department name may have changed lately. Please select the accurate department from the list below.",
+	'dept:confirm' => 'Just Checking In!',
+	'dept:intro' => 'Have you changed jobs recently? Started a temporary assignment? Been recruited by the CSA to become an astronaut? Help us keep GCconnex up to date by confirming where you work.',
+	'dept:not' => 'Not your current department?',
+	'dept:select' => 'Please select your current department',
+	'confirm' => 'Confirm',
+	'dept:saved' => '%s saved as current department',
+	'dept:notfound' => "We can’t seem find your current department in our list! Your department name may have changed lately. Please select the accurate department from the list below.",
 
-     /**
-   * Message Inbox
-   */
+	 /**
+	  * Message Inbox
+	  */
 
    'msg:to' => 'To',
    'msg:from' => 'From',
@@ -222,31 +222,31 @@ 
    'msg:sent' => 'Sent',
 
 
-     /*
+	 /*
       * Content Creation
       */
 
-      'page:create' => 'Create Page',
-      'cp_notify:minor_edit_header' => 'Is this a Minor Edit? <small>(By clicking this box, a notification will not send)</small>',
-      'page:minor_edit_label' => 'Minor Edit',
+	  'page:create' => 'Create Page',
+	  'cp_notify:minor_edit_header' => 'Is this a Minor Edit? <small>(By clicking this box, a notification will not send)</small>',
+	  'page:minor_edit_label' => 'Minor Edit',
 
-      /*
+	  /*
        * Misc
        * */
 
-       'bookmark' => 'bookmark',
+	   'bookmark' => 'bookmark',
 
-     /*
+	 /*
       * Suggested Friends*/
 
-      'sf:title' => "See anyone you know? Connect with them.",
-      'sf:connect' => "Connect",
-      'sf:alttext' => "Avatar image of",
-      'sf:suggcolleagues'=> "Colleague suggestion",
+	  'sf:title' => "See anyone you know? Connect with them.",
+	  'sf:connect' => "Connect",
+	  'sf:alttext' => "Avatar image of",
+	  'sf:suggcolleagues'=> "Colleague suggestion",
 
-      /*Friendly Time*/
+	  /*Friendly Time*/
 
-      'friendlytime:weeks' => "about 2 weeks ago",
+	  'friendlytime:weeks' => "about 2 weeks ago",
 	'friendlytime:weeks:singular' => "last week",
 	'friendlytime:date' => "j F Y",
 
@@ -263,20 +263,20 @@ 
 	'friendlytime:month:11' => 'November',
 	'friendlytime:month:12' => 'December',
 /**
- * The Wire
- */
-    'wire:post' => 'wire post',
-    'thewire:post' => "Create a Wire Post",
-    'thewire:share' => ' Share',
-    'thewire:shares' => ' Shares',
-    'thewire:contentwarning' => 'This content may not be viewable to all users due to access permissions.',
-    'thewire:groupwarning' => 'This content is only viewable to members of: ',
-    'thewire:userwarning' => 'This content is only viewable to: ',
+	 * The Wire
+	 */
+	'wire:post' => 'wire post',
+	'thewire:post' => "Create a Wire Post",
+	'thewire:share' => ' Share',
+	'thewire:shares' => ' Shares',
+	'thewire:contentwarning' => 'This content may not be viewable to all users due to access permissions.',
+	'thewire:groupwarning' => 'This content is only viewable to members of: ',
+	'thewire:userwarning' => 'This content is only viewable to: ',
 
 
-    /**
-  * Files
-  */
+	/**
+	 * Files
+	 */
 
   'file:folderstruct' => 'Folder structure',
   'file:move:selected' => 'Move selected',
@@ -288,60 +288,60 @@ 
  * User Menu
  */
 
-    'userMenu:profile' => "My Profile",
-    'userMenu:account' => "Account Settings",
-    'userMenu:messages' => "My Messages",
-    'userMenu:colleagues' => "My Colleagues",
-    'userMenu:usermenuTitle' =>'User Card - Click here for links to your profile, account settings and logout',
-    'wet:usermenu:helpertext' => "User Menu. Contains Links to Notifications, Profile and Logout",
-    /*NEW*/
+	'userMenu:profile' => "My Profile",
+	'userMenu:account' => "Account Settings",
+	'userMenu:messages' => "My Messages",
+	'userMenu:colleagues' => "My Colleagues",
+	'userMenu:usermenuTitle' =>'User Card - Click here for links to your profile, account settings and logout',
+	'wet:usermenu:helpertext' => "User Menu. Contains Links to Notifications, Profile and Logout",
+	/*NEW*/
 		'wet:dd:expand'=>"Open drop down of most recent messages",
 
 
  /**
- * Group Profile
- */
-
-    'gprofile:about' => "About",
-    'gprofile:discussion' => "Discussion",
-    'gprofile:files' => "Files",
-    'gprofile:blogs' => "Blog",
-    'gprofile:events' => "Events",
-    'gprofile:calendar' => "calendar",
-    'gprofile:pages' => "Pages",
-    'gprofile:bookmarks' => "Bookmarks",
-    'gprofile:polls' => "Polls",
-    'gprofile:tasks' => "Tasks",
-    'gprofile:photos' => "Photos",
-    'gprofile:photoCatch' => "Images",
-    'gprofile:albums' => "Albums",
-    'gprofile:albumsCatch' => "Photo Albums",
-    'gprofile:ideas' => "Ideas",
-    'gprofile:more' => "More",
-    'gprofile:settings' => 'Settings',
-    'photos:none' => 'No image albums',
-
-    'gprofile:create' => "Create Group",
-
-    'gprofile:edit:content' => "Content options",
-    'gprofile:edit:admin' => "Admin options",
-
-    'groups:suggestedGroups' => 'The group you are creating may already exist, check out these suggestions to find what you are looking for.',
-
-    'groups:creatediscussion' => 'Create Discussion',
-
-    'profile:actions' => 'Actions',
-    'profile:viewall:coll' => 'View All Colleagues',
-    'profile:viewall:groups' => 'View All Groups',
-    'gcforums:enable_group_forums' => 'Enable group forums',
-    'gprofile:contentMenu' => "Group content menu",
-
-    'groups:stats'  => "Group statistics",
-
-    /**
-  * Group invite
+  * Group Profile
   */
 
+	'gprofile:about' => "About",
+	'gprofile:discussion' => "Discussion",
+	'gprofile:files' => "Files",
+	'gprofile:blogs' => "Blog",
+	'gprofile:events' => "Events",
+	'gprofile:calendar' => "calendar",
+	'gprofile:pages' => "Pages",
+	'gprofile:bookmarks' => "Bookmarks",
+	'gprofile:polls' => "Polls",
+	'gprofile:tasks' => "Tasks",
+	'gprofile:photos' => "Photos",
+	'gprofile:photoCatch' => "Images",
+	'gprofile:albums' => "Albums",
+	'gprofile:albumsCatch' => "Photo Albums",
+	'gprofile:ideas' => "Ideas",
+	'gprofile:more' => "More",
+	'gprofile:settings' => 'Settings',
+	'photos:none' => 'No image albums',
+
+	'gprofile:create' => "Create Group",
+
+	'gprofile:edit:content' => "Content options",
+	'gprofile:edit:admin' => "Admin options",
+
+	'groups:suggestedGroups' => 'The group you are creating may already exist, check out these suggestions to find what you are looking for.',
+
+	'groups:creatediscussion' => 'Create Discussion',
+
+	'profile:actions' => 'Actions',
+	'profile:viewall:coll' => 'View All Colleagues',
+	'profile:viewall:groups' => 'View All Groups',
+	'gcforums:enable_group_forums' => 'Enable group forums',
+	'gprofile:contentMenu' => "Group content menu",
+
+	'groups:stats'  => "Group statistics",
+
+	/**
+	 * Group invite
+	 */
+
   'group:invite:cannot' => '<br><br> The following users are not members of the parent group and cannot be invited/added.',
 
   'group:invite:clicktoadd' => "Click to add",
@@ -352,15 +352,15 @@ 
 
   'group:replyitem' => 'reply',
 /**
- * Sites
- */
-    'landingPage' => 'Set Landing Page',
-    'career' => 'Career',
+   * Sites
+   */
+	'landingPage' => 'Set Landing Page',
+	'career' => 'Career',
 	'item:site' => 'Sites',
-    'notifications:subscriptions:changesettings' => 'Notifications',
+	'notifications:subscriptions:changesettings' => 'Notifications',
 /**
- * Sessions
- */
+	 * Sessions
+	 */
 
 	'login' => "Log in",
 
@@ -531,7 +531,7 @@ 
 
 	'widget:delete' => 'Remove %s',
 	'widget:edit' => 'Customize this widget: %s',
-    'widget:remove' => 'Remove widget',
+	'widget:remove' => 'Remove widget',
 	'widgets' => "Widgets",
 	'widget' => "Widget",
 	'item:object:widget' => "Widgets",
@@ -549,15 +549,15 @@ 
 
 	'group' => "Group",
 	'item:group' => "Groups",
-    'group_tools:groups:sorting:alphabetical' => 'Alphabetical',
-    'groups:own' => 'Groups I own',
-    'groups:personal' => 'Personal',
-    'groups:feature' => 'Featured',
-    'groups:popular' => 'Popular',
-    'groups:suggested' => 'Suggested',
+	'group_tools:groups:sorting:alphabetical' => 'Alphabetical',
+	'groups:own' => 'Groups I own',
+	'groups:personal' => 'Personal',
+	'groups:feature' => 'Featured',
+	'groups:popular' => 'Popular',
+	'groups:suggested' => 'Suggested',
 /**
- * Users
- */
+	 * Users
+	 */
 
 	'user' => "User",
 	'item:user' => "Users",
@@ -567,7 +567,7 @@ 
  */
 
 	'friends' => "My Colleagues", //Friends
-    'friend:river' => "Colleague", //Friends
+	'friend:river' => "Colleague", //Friends
 	'friends:yours' => "Your friends",
 	'friends:owned' => "%s's friends",
 	'friend:add' => "Add friend",
@@ -672,8 +672,8 @@ 
  */
 	'feed:rss' => 'RSS feed for this page',
 /**
- * Links
- */
+	 * Links
+	 */
 	'link:view' => 'view link',
 	'link:view:all' => 'View all',
 
@@ -769,7 +769,7 @@ 
 	'registration:emailnotvalid' => 'Sorry, the email address you entered is invalid on this system',
 	'registration:passwordnotvalid' => 'Sorry, the password you entered is invalid on this system',
 	'registration:usernamenotvalid' => 'Sorry, the username you entered is invalid on this system',
-    'registration:userexists' => 'That username already exists. <a href=forgotpassword>Retrieve your password</a>',
+	'registration:userexists' => 'That username already exists. <a href=forgotpassword>Retrieve your password</a>',
 	'adduser' => "Add User",
 	'adduser:ok' => "You have successfully added a new user.",
 	'adduser:bad' => "The new user could not be created.",
@@ -1586,7 +1586,7 @@ 
 	'generic_comments:post' => "Post comment",
 	'generic_comments:text' => "Comment",
 	'generic_comments:latest' => "Latest comments",
-    'generic_comments:latest:event' => "Latest Comments on Events",
+	'generic_comments:latest:event' => "Latest Comments on Events",
 	'generic_comment:posted' => "Your comment was successfully posted.",
 	'generic_comment:updated' => "The comment was successfully updated.",
 	'generic_comment:deleted' => "The comment was successfully deleted.",
@@ -1620,23 +1620,23 @@ 
 *Blogs
 */
 
-    'blog:title:all_blogs' => 'Blogs',
+	'blog:title:all_blogs' => 'Blogs',
 
-    /**
-    *Activity module
-    */
-    'activity:module:weekly_likes' => 'Most liked of last week',
+	/**
+	 *Activity module
+	 */
+	'activity:module:weekly_likes' => 'Most liked of last week',
 	'activity:module:weekly_likes:none' => 'No likes',
 
 /**
 *Contact page / FAQ
 */
-    'contactform:help' => 'Help',
-    'contactform:upload' => 'Upload your file',
-    'contactform:faq' => "FAQ",
-    'contactform:upload' => 'Upload your file',
-    'contactform:title:form' => "Contact Us",
-    'contactform:required' => 'required',
+	'contactform:help' => 'Help',
+	'contactform:upload' => 'Upload your file',
+	'contactform:faq' => "FAQ",
+	'contactform:upload' => 'Upload your file',
+	'contactform:title:form' => "Contact Us",
+	'contactform:required' => 'required',
 
 	'contactform:box:message' => 'Show the information box',
 	'conatactform:fr:name' => 'Name of the link in french',
@@ -1711,12 +1711,12 @@ 
 	'event_calendar_contact' => "You are not the contact person?",
 	"event_calendar:email" => "E-mail address",
 	"event_calendar:phone" => "Phone number",
-    'event_calendar:lang:french'=>"French",
-    'event_calendar:lang:english'=>"English",
-    'event_calendar:lang:bilingual'=>"Bilingual",
-    'event_calendar:add_recurrence' => "Add recurrence",
+	'event_calendar:lang:french'=>"French",
+	'event_calendar:lang:english'=>"English",
+	'event_calendar:lang:bilingual'=>"Bilingual",
+	'event_calendar:add_recurrence' => "Add recurrence",
 
-    /*new for tour*/
+	/*new for tour*/
 'gcTour:next' => 'Next ',
 'gcTour:close' => 'Close',
 'gcTour:step1' => 'Your News Feed ',

mod/wet4/actions/user/requestnewpassword.php

Indentation +3 added lines, -3 removed lines

@@ -38,15 +38,15 @@
 	//if (send_new_password_request($user->guid)) {
 	if ($result) {
 		system_message(elgg_echo('user:password:changereq:success'));
-        forward('/login');
+		forward('/login');
 	} else {
 		register_error(elgg_echo('user:password:changereq:fail'));
-        forward('/forgotpassword');
+		forward('/forgotpassword');
 	}
 
 } else {
 	register_error(elgg_echo('user:username:notfound', array($username)));
-    forward('/forgotpassword');
+	forward('/forgotpassword');
 }
 
 //forward(current_page_url());

mod/wet4/actions/department/verify_department.php

Indentation +3 added lines, -3 removed lines

@@ -52,9 +52,9 @@ 
 $departmentsFr = array_merge($departmentsFr,$provincesFr);
 
 if (get_current_language()=='en'){
-    $deptString = $departmentsEn[$department]." / ".$departmentsFr[$department];
+	$deptString = $departmentsEn[$department]." / ".$departmentsFr[$department];
 }else{
-    $deptString = $departmentsFr[$department]." / ".$departmentsEn[$department];
+	$deptString = $departmentsFr[$department]." / ".$departmentsEn[$department];
 }
 
 //save dept
@@ -63,4 +63,4 @@ 
 elgg_get_logged_in_user_entity()->set('last_department_verify', time());
 
 system_message($deptString );
-    ?>
+	?>

Spacing +7 added lines, -7 removed lines

@@ -33,7 +33,7 @@ 
 $provinces['pov-que'] = 'Government of Quebec';
 $provinces['pov-sask'] = 'Government of Saskatchewan';
 $provinces['pov-yuk'] = 'Government of Yukon';
-$departmentsEn = array_merge($departmentsEn,$provinces);
+$departmentsEn = array_merge($departmentsEn, $provinces);
 
 $departmentsFr = json_decode($obj[0]->deptsFr, true);
 $provincesFr['pov-alb'] = "Gouvernement de l'Alberta";
@@ -49,12 +49,12 @@ 
 $provincesFr['pov-que'] = 'Gouvernement du Québec';
 $provincesFr['pov-sask'] = 'Gouvernement de Saskatchewan';
 $provincesFr['pov-yuk'] = 'Gouvernement du Yukon';
-$departmentsFr = array_merge($departmentsFr,$provincesFr);
+$departmentsFr = array_merge($departmentsFr, $provincesFr);
 
-if (get_current_language()=='en'){
-    $deptString = $departmentsEn[$department]." / ".$departmentsFr[$department];
-}else{
-    $deptString = $departmentsFr[$department]." / ".$departmentsEn[$department];
+if (get_current_language() == 'en') {
+    $deptString = $departmentsEn[$department] . " / " . $departmentsFr[$department];
+} else {
+    $deptString = $departmentsFr[$department] . " / " . $departmentsEn[$department];
 }
 
 //save dept
@@ -62,5 +62,5 @@ 
 //save time
 elgg_get_logged_in_user_entity()->set('last_department_verify', time());
 
-system_message($deptString );
+system_message($deptString);
     ?>

Braces +1 added lines, -1 removed lines

@@ -53,7 +53,7 @@
 
 if (get_current_language()=='en'){
     $deptString = $departmentsEn[$department]." / ".$departmentsFr[$department];
-}else{
+} else{
     $deptString = $departmentsFr[$department]." / ".$departmentsEn[$department];
 }
 

mod/wet4/actions/bilingual_content/update_to_json.php

Spacing +37 added lines, -37 removed lines

@@ -29,25 +29,25 @@ 
 
 $db_prefix = elgg_get_config('dbprefix');
 
-$title2_id = elgg_get_metastring_id('title2', true);	// get the metastring id, create the metastring if it does not exist
+$title2_id = elgg_get_metastring_id('title2', true); // get the metastring id, create the metastring if it does not exist
 $title3_id = elgg_get_metastring_id('title3', true);
 
-$name2_id = elgg_get_metastring_id('name2', true);	// get the metastring id, create the metastring if it does not exist
+$name2_id = elgg_get_metastring_id('name2', true); // get the metastring id, create the metastring if it does not exist
 $name3_id = elgg_get_metastring_id('name3', true);
 
-$question2_id = elgg_get_metastring_id('question2', true);	// get the metastring id, create the metastring if it does not exist
+$question2_id = elgg_get_metastring_id('question2', true); // get the metastring id, create the metastring if it does not exist
 $question3_id = elgg_get_metastring_id('question3', true);
 
-$description2_id = elgg_get_metastring_id('description2', true);	// get the metastring id, create the metastring if it does not exist
+$description2_id = elgg_get_metastring_id('description2', true); // get the metastring id, create the metastring if it does not exist
 $description3_id = elgg_get_metastring_id('description3', true);
 
-$briefdescription2_id = elgg_get_metastring_id('briefdescription2', true);	// get the metastring id, create the metastring if it does not exist
+$briefdescription2_id = elgg_get_metastring_id('briefdescription2', true); // get the metastring id, create the metastring if it does not exist
 $briefdescription3_id = elgg_get_metastring_id('briefdescription3', true);
 
-$excerpt2_id = elgg_get_metastring_id('excerpt2', true);	// get the metastring id, create the metastring if it does not exist
+$excerpt2_id = elgg_get_metastring_id('excerpt2', true); // get the metastring id, create the metastring if it does not exist
 $excerpt3_id = elgg_get_metastring_id('excerpt3', true);
 
-$poll_choice2_id = elgg_get_metastring_id('text2', true);	// get the metastring id, create the metastring if it does not exist
+$poll_choice2_id = elgg_get_metastring_id('text2', true); // get the metastring id, create the metastring if it does not exist
 $poll_choice3_id = elgg_get_metastring_id('text3', true);
 
 $update_id = elgg_get_metastring_id('enfr_update_complete', true);
@@ -67,92 +67,92 @@ 
 	}
 
 	// migrate all old storage style of bilingual content to json strings
-	foreach ( $object_guids as $object_guid ) {
+	foreach ($object_guids as $object_guid) {
 		$object = get_entity($object_guid->guid);
 
 		// check, migrate title
-		if ( isset($object->title2) ){
-			$new_title = gc_implode_translation( $object->title, $object->title2 );
+		if (isset($object->title2)) {
+			$new_title = gc_implode_translation($object->title, $object->title2);
 			$object->title = $new_title;
 			$object->enfr_update_complete = 1;
 			$object->save();
 		}
-		else if ( isset($object->title3 ) ){
-			$object->title = gc_implode_translation( old_gc_explode_translation($object->title3, 'en'), old_gc_explode_translation($object->title3, 'fr') );
+		else if (isset($object->title3)) {
+			$object->title = gc_implode_translation(old_gc_explode_translation($object->title3, 'en'), old_gc_explode_translation($object->title3, 'fr'));
 			$object->enfr_update_complete = 1;
 			$object->save();
 		}
 
 		// check, migrate group names
-		if ( isset($object->name2) ){
-			$new_name = gc_implode_translation( $object->name, $object->name2 );
+		if (isset($object->name2)) {
+			$new_name = gc_implode_translation($object->name, $object->name2);
 			$object->name = $new_name;
 			$object->enfr_update_complete = 1;
 			$object->save();
 		}
-		else if ( isset($object->name3 ) ){
-			$object->name = gc_implode_translation( old_gc_explode_translation($object->name3, 'en'), old_gc_explode_translation($object->name3, 'fr') );
+		else if (isset($object->name3)) {
+			$object->name = gc_implode_translation(old_gc_explode_translation($object->name3, 'en'), old_gc_explode_translation($object->name3, 'fr'));
 			$object->enfr_update_complete = 1;
 			$object->save();
 		}
 
 		// check, migrate poll questions, which are also titles...
-		if ( isset($object->question2) ){
-			$new_name = gc_implode_translation( $object->question, $object->question2 );
+		if (isset($object->question2)) {
+			$new_name = gc_implode_translation($object->question, $object->question2);
 			$object->question = $new_name;
 			$object->enfr_update_complete = 1;
 			$object->save();
 		}
-		else if ( isset($object->question3 ) ){
-			$object->question = gc_implode_translation( old_gc_explode_translation($object->question3, 'en'), old_gc_explode_translation($object->question3, 'fr') );
+		else if (isset($object->question3)) {
+			$object->question = gc_implode_translation(old_gc_explode_translation($object->question3, 'en'), old_gc_explode_translation($object->question3, 'fr'));
 			$object->enfr_update_complete = 1;
 			$object->save();
 		}
 
 		// check, migrate description
-		if ( isset($object->description2) ){
-			$object->description = gc_implode_translation( $object->description, $object->description2 );
+		if (isset($object->description2)) {
+			$object->description = gc_implode_translation($object->description, $object->description2);
 			$object->enfr_update_complete = 1;
 			$object->save();
 		}
-		else if ( isset($object->description3 ) ){
-			$object->description = gc_implode_translation( old_gc_explode_translation($object->description3, 'en'), old_gc_explode_translation($object->description3, 'fr') );
+		else if (isset($object->description3)) {
+			$object->description = gc_implode_translation(old_gc_explode_translation($object->description3, 'en'), old_gc_explode_translation($object->description3, 'fr'));
 			$object->enfr_update_complete = 1;
 			$object->save();
 		}
 
 		// check, migrate briefdescription
-		if ( isset($object->briefdescription2) ){
-			$object->briefdescription = gc_implode_translation( $object->briefdescription, $object->briefdescription2 );
+		if (isset($object->briefdescription2)) {
+			$object->briefdescription = gc_implode_translation($object->briefdescription, $object->briefdescription2);
 			$object->enfr_update_complete = 1;
 			$object->save();
 		}
-		else if ( isset($object->briefdescription3 ) ){
-			$object->briefdescription = gc_implode_translation( old_gc_explode_translation($object->briefdescription3, 'en'), old_gc_explode_translation($object->briefdescription3, 'fr') );
+		else if (isset($object->briefdescription3)) {
+			$object->briefdescription = gc_implode_translation(old_gc_explode_translation($object->briefdescription3, 'en'), old_gc_explode_translation($object->briefdescription3, 'fr'));
 			$object->enfr_update_complete = 1;
 			$object->save();
 		}
 
 		// check, migrate excerpt
-		if ( isset($object->excerpt2) ){
-			$object->excerpt = gc_implode_translation( $object->excerpt, $object->excerpt2 );
+		if (isset($object->excerpt2)) {
+			$object->excerpt = gc_implode_translation($object->excerpt, $object->excerpt2);
 			$object->enfr_update_complete = 1;
 			$object->save();
 		}
-		else if ( isset($object->excerpt3 ) ){
-			$object->excerpt = gc_implode_translation( old_gc_explode_translation($object->excerpt3, 'en'), old_gc_explode_translation($object->excerpt3, 'fr') );
+		else if (isset($object->excerpt3)) {
+			$object->excerpt = gc_implode_translation(old_gc_explode_translation($object->excerpt3, 'en'), old_gc_explode_translation($object->excerpt3, 'fr'));
 			$object->enfr_update_complete = 1;
 			$object->save();
 		}
 
 		// check, migrate poll_choice
-		if ( isset($object->text2) ){
-			$object->text = gc_implode_translation( $object->text, $object->text2 );
+		if (isset($object->text2)) {
+			$object->text = gc_implode_translation($object->text, $object->text2);
 			$object->enfr_update_complete = 1;
 			$object->save();
 		}
-		else if ( isset($object->text3) ){
-			$object->text = gc_implode_translation( old_gc_explode_translation($object->text3, 'en'), old_gc_explode_translation($object->text3, 'fr') );
+		else if (isset($object->text3)) {
+			$object->text = gc_implode_translation(old_gc_explode_translation($object->text3, 'en'), old_gc_explode_translation($object->text3, 'fr'));
 			$object->enfr_update_complete = 1;
 			$object->save();
 		}
@@ -176,7 +176,7 @@ 
 		'processComplete' => true,
 	));
 }
-else{
+else {
 	// Give some feedback for the UI
 	echo json_encode(array(
 		'numSuccess' => $success_count,

Braces +8 added lines, -16 removed lines

@@ -76,8 +76,7 @@ 
 			$object->title = $new_title;
 			$object->enfr_update_complete = 1;
 			$object->save();
-		}
-		else if ( isset($object->title3 ) ){
+		} else if ( isset($object->title3 ) ){
 			$object->title = gc_implode_translation( old_gc_explode_translation($object->title3, 'en'), old_gc_explode_translation($object->title3, 'fr') );
 			$object->enfr_update_complete = 1;
 			$object->save();
@@ -89,8 +88,7 @@ 
 			$object->name = $new_name;
 			$object->enfr_update_complete = 1;
 			$object->save();
-		}
-		else if ( isset($object->name3 ) ){
+		} else if ( isset($object->name3 ) ){
 			$object->name = gc_implode_translation( old_gc_explode_translation($object->name3, 'en'), old_gc_explode_translation($object->name3, 'fr') );
 			$object->enfr_update_complete = 1;
 			$object->save();
@@ -102,8 +100,7 @@ 
 			$object->question = $new_name;
 			$object->enfr_update_complete = 1;
 			$object->save();
-		}
-		else if ( isset($object->question3 ) ){
+		} else if ( isset($object->question3 ) ){
 			$object->question = gc_implode_translation( old_gc_explode_translation($object->question3, 'en'), old_gc_explode_translation($object->question3, 'fr') );
 			$object->enfr_update_complete = 1;
 			$object->save();
@@ -114,8 +111,7 @@ 
 			$object->description = gc_implode_translation( $object->description, $object->description2 );
 			$object->enfr_update_complete = 1;
 			$object->save();
-		}
-		else if ( isset($object->description3 ) ){
+		} else if ( isset($object->description3 ) ){
 			$object->description = gc_implode_translation( old_gc_explode_translation($object->description3, 'en'), old_gc_explode_translation($object->description3, 'fr') );
 			$object->enfr_update_complete = 1;
 			$object->save();
@@ -126,8 +122,7 @@ 
 			$object->briefdescription = gc_implode_translation( $object->briefdescription, $object->briefdescription2 );
 			$object->enfr_update_complete = 1;
 			$object->save();
-		}
-		else if ( isset($object->briefdescription3 ) ){
+		} else if ( isset($object->briefdescription3 ) ){
 			$object->briefdescription = gc_implode_translation( old_gc_explode_translation($object->briefdescription3, 'en'), old_gc_explode_translation($object->briefdescription3, 'fr') );
 			$object->enfr_update_complete = 1;
 			$object->save();
@@ -138,8 +133,7 @@ 
 			$object->excerpt = gc_implode_translation( $object->excerpt, $object->excerpt2 );
 			$object->enfr_update_complete = 1;
 			$object->save();
-		}
-		else if ( isset($object->excerpt3 ) ){
+		} else if ( isset($object->excerpt3 ) ){
 			$object->excerpt = gc_implode_translation( old_gc_explode_translation($object->excerpt3, 'en'), old_gc_explode_translation($object->excerpt3, 'fr') );
 			$object->enfr_update_complete = 1;
 			$object->save();
@@ -150,8 +144,7 @@ 
 			$object->text = gc_implode_translation( $object->text, $object->text2 );
 			$object->enfr_update_complete = 1;
 			$object->save();
-		}
-		else if ( isset($object->text3) ){
+		} else if ( isset($object->text3) ){
 			$object->text = gc_implode_translation( old_gc_explode_translation($object->text3, 'en'), old_gc_explode_translation($object->text3, 'fr') );
 			$object->enfr_update_complete = 1;
 			$object->save();
@@ -175,8 +168,7 @@ 
 		'numErrors' => $error_count,
 		'processComplete' => true,
 	));
-}
-else{
+} else{
 	// Give some feedback for the UI
 	echo json_encode(array(
 		'numSuccess' => $success_count,

mod/wet4/actions/login.php

Indentation +3 added lines, -3 removed lines

@@ -81,9 +81,9 @@
 	$forward_url = elgg_trigger_plugin_hook('login:forward', 'user', $params, $forward_url);
 }else{
 	$obj = elgg_get_entities(array(
-     			'type' => 'object',
-     			'subtype' => 'gcpedia_account',
-     			'owner_guid' => elgg_get_logged_in_user_guid()
+	 			'type' => 'object',
+	 			'subtype' => 'gcpedia_account',
+	 			'owner_guid' => elgg_get_logged_in_user_guid()
 			 ));
 			 $gcpuser = $obj[0]->title;
 			 $gcpemail =$obj[0]->description;

Spacing +12 added lines, -12 removed lines

@@ -62,7 +62,7 @@ 
 // @todo we need to use the config object to store this so that the current language
 // can be changed. Refs #4171
 $display_name = $user->name;
-setcookie('connex_lang', $user->language, time()+(1000 * 60 * 60 * 24), '/');
+setcookie('connex_lang', $user->language, time() + (1000 * 60 * 60 * 24), '/');
 if ($user->language) {
 //give user a custom welcome message
 	$message = elgg_echo('wet:loginok', array($display_name));
@@ -77,36 +77,36 @@ 
 
 
 
-if (strpos($_SERVER['HTTP_REFERER'], elgg_get_site_url()."saml/idp_login")=== false){
+if (strpos($_SERVER['HTTP_REFERER'], elgg_get_site_url() . "saml/idp_login") === false) {
 	$forward_url = elgg_trigger_plugin_hook('login:forward', 'user', $params, $forward_url);
-}else{
+} else {
 	$obj = elgg_get_entities(array(
      			'type' => 'object',
      			'subtype' => 'gcpedia_account',
      			'owner_guid' => elgg_get_logged_in_user_guid()
 			 ));
 			 $gcpuser = $obj[0]->title;
-			 $gcpemail =$obj[0]->description;
+			 $gcpemail = $obj[0]->description;
 			 //if (elgg_get_context()=="saml"){
-			 if ($gcpuser == NULL || $gcpuser == ""){
+			 if ($gcpuser == NULL || $gcpuser == "") {
 			 	forward("saml_link/link");
-			 }else{
-			 	$refererQuery = parse_url($_SERVER['HTTP_REFERER'],PHP_URL_QUERY);
+			 } else {
+			 	$refererQuery = parse_url($_SERVER['HTTP_REFERER'], PHP_URL_QUERY);
 			 	$refererQueries = explode('%26', urldecode($refererQuery));
-			 	$relayState = explode('%3D',$refererQueries[count($refererQueries)-1]);
+			 	$relayState = explode('%3D', $refererQueries[count($refererQueries) - 1]);
 			 	$relayAddress = rawurldecode($relayState[1]);
 			 	//error_log('relay: -> '.$relayAddress);
 			 	$host = parse_url(rawurldecode($relayAddress));
 			 	//error_log('host -> '.json_encode($host));
-			 	$spentityid = $host['scheme'].'://'.$host['host'];
-			 	if($host['host'] == 'gcdirectory-gcannuaire.itsso.gc.ca' || $host['host'] == 'geds20admin-sage20admin.itsso.gc.ca'){
+			 	$spentityid = $host['scheme'] . '://' . $host['host'];
+			 	if ($host['host'] == 'gcdirectory-gcannuaire.itsso.gc.ca' || $host['host'] == 'geds20admin-sage20admin.itsso.gc.ca') {
 			 		$service = 'default-sp';
-			 	}else{
+			 	} else {
 			 		$service = 'elgg-idp';
 			 	}
 			 	//error_log('here: -> '.explode('&', parse_url($_SERVER['HTTP_REFERER'],PHP_URL_QUERY)));
 			 	//$forward_url = "http://".$_SERVER[HTTP_HOST]."/simplesaml/saml2/idp/SSOService.php?spentityid=".elgg_get_plugin_setting('gcpedia_url','saml_link')."simplesaml/module.php/saml/sp/metadata.php/elgg-idp&RelayState=".urldecode($relayState[1]);
-		 		$forward_url = "http://".$_SERVER[HTTP_HOST]."/simplesaml/saml2/idp/SSOService.php?spentityid=".$spentityid."/simplesaml/module.php/saml/sp/metadata.php/".$service."&RelayState=".urldecode($relayState[1]);
+		 		$forward_url = "http://" . $_SERVER[HTTP_HOST] . "/simplesaml/saml2/idp/SSOService.php?spentityid=" . $spentityid . "/simplesaml/module.php/saml/sp/metadata.php/" . $service . "&RelayState=" . urldecode($relayState[1]);
 		 	
 			 }
 	

Braces +3 added lines, -3 removed lines

@@ -79,7 +79,7 @@ 
 
 if (strpos($_SERVER['HTTP_REFERER'], elgg_get_site_url()."saml/idp_login")=== false){
 	$forward_url = elgg_trigger_plugin_hook('login:forward', 'user', $params, $forward_url);
-}else{
+} else{
 	$obj = elgg_get_entities(array(
      			'type' => 'object',
      			'subtype' => 'gcpedia_account',
@@ -90,7 +90,7 @@ 
 			 //if (elgg_get_context()=="saml"){
 			 if ($gcpuser == NULL || $gcpuser == ""){
 			 	forward("saml_link/link");
-			 }else{
+			 } else{
 			 	$refererQuery = parse_url($_SERVER['HTTP_REFERER'],PHP_URL_QUERY);
 			 	$refererQueries = explode('%26', urldecode($refererQuery));
 			 	$relayState = explode('%3D',$refererQueries[count($refererQueries)-1]);
@@ -101,7 +101,7 @@ 
 			 	$spentityid = $host['scheme'].'://'.$host['host'];
 			 	if($host['host'] == 'gcdirectory-gcannuaire.itsso.gc.ca' || $host['host'] == 'geds20admin-sage20admin.itsso.gc.ca'){
 			 		$service = 'default-sp';
-			 	}else{
+			 	} else{
 			 		$service = 'elgg-idp';
 			 	}
 			 	//error_log('here: -> '.explode('&', parse_url($_SERVER['HTTP_REFERER'],PHP_URL_QUERY)));

mod/wet4/pages/questions/view.php

Spacing +2 added lines, -2 removed lines

@@ -15,7 +15,7 @@ 
 $page_owner = $question->getContainerEntity();
 
 // set breadcrumb
-$crumbs_title = gc_explode_translation($page_owner->name,$lang);
+$crumbs_title = gc_explode_translation($page_owner->name, $lang);
 
 
 if ($page_owner instanceof ElggGroup) {
@@ -33,7 +33,7 @@ 
 // build page elements
 $title_icon = '';
 
-$content = elgg_view_entity($question,['full_view' => true]);
+$content = elgg_view_entity($question, ['full_view' => true]);
 
 $answers = '';
 

mod/wet4/start.php

Indentation +675 added lines, -675 removed lines

@@ -24,41 +24,41 @@ 
 	elgg_extend_view('object/widget/elements/content','page/elements/gsa_view_start',1);
 	elgg_extend_view('object/widget/elements/content','page/elements/gsa_view_end',1000);
 
-    // cyu - are we overriding the settings page handler? (note: the one in this plugin does nothing)
-    elgg_unregister_page_handler('settings');
-    elgg_register_page_handler('settings', '_elgg_wet_user_settings_page_handler');
-
-
-    //reload groups library to have our sidebar changes
-
-    elgg_register_library('GCconnex_logging', elgg_get_plugins_path() . 'wet4/lib/logging.php');
-    elgg_register_library('GCconnex_display_in_language', elgg_get_plugins_path() . 'wet4/lib/translate_display.php');
-    //elgg_register_library('elgg:user_settings', elgg_get_plugins_path(). 'wet4/lib/user_settings.php');
-    elgg_register_library('wet:custom_core', elgg_get_plugins_path() . 'wet4/lib/custom_core.php');
-
-    //elgg_load_library('user_settings');
-    elgg_load_library('GCconnex_logging');
-    elgg_load_library('GCconnex_display_in_language');
-    elgg_load_library('wet:custom_core');
-    //get rid of reply icon on river menu
-    elgg_unregister_plugin_hook_handler('register', 'menu:river', 'discussion_add_to_river_menu');
-
-    //change icons for blog entity
-    elgg_unregister_plugin_hook_handler("register", "menu:entity", array("\ColdTrick\BlogTools\EntityMenu", "register"));
-    elgg_register_plugin_hook_handler("register", "menu:entity", 'wet4_blog_entity_menu');
-    //Friendly Time - Nick
-    elgg_register_plugin_hook_handler('format', 'friendly:time', 'enhanced_friendly_time_hook');
+	// cyu - are we overriding the settings page handler? (note: the one in this plugin does nothing)
+	elgg_unregister_page_handler('settings');
+	elgg_register_page_handler('settings', '_elgg_wet_user_settings_page_handler');
+
+
+	//reload groups library to have our sidebar changes
+
+	elgg_register_library('GCconnex_logging', elgg_get_plugins_path() . 'wet4/lib/logging.php');
+	elgg_register_library('GCconnex_display_in_language', elgg_get_plugins_path() . 'wet4/lib/translate_display.php');
+	//elgg_register_library('elgg:user_settings', elgg_get_plugins_path(). 'wet4/lib/user_settings.php');
+	elgg_register_library('wet:custom_core', elgg_get_plugins_path() . 'wet4/lib/custom_core.php');
+
+	//elgg_load_library('user_settings');
+	elgg_load_library('GCconnex_logging');
+	elgg_load_library('GCconnex_display_in_language');
+	elgg_load_library('wet:custom_core');
+	//get rid of reply icon on river menu
+	elgg_unregister_plugin_hook_handler('register', 'menu:river', 'discussion_add_to_river_menu');
+
+	//change icons for blog entity
+	elgg_unregister_plugin_hook_handler("register", "menu:entity", array("\ColdTrick\BlogTools\EntityMenu", "register"));
+	elgg_register_plugin_hook_handler("register", "menu:entity", 'wet4_blog_entity_menu');
+	//Friendly Time - Nick
+	elgg_register_plugin_hook_handler('format', 'friendly:time', 'enhanced_friendly_time_hook');
 	elgg_register_event_handler('pagesetup', 'system', 'wet4_theme_pagesetup', 1000);
-    elgg_register_event_handler('pagesetup', 'system', 'wet4_riverItem_remove');
-    elgg_register_event_handler('pagesetup', 'system', 'messages_notifier');
+	elgg_register_event_handler('pagesetup', 'system', 'wet4_riverItem_remove');
+	elgg_register_event_handler('pagesetup', 'system', 'messages_notifier');
 
-    elgg_register_plugin_hook_handler('register', 'menu:entity', 'wet4_elgg_entity_menu_setup');
-    elgg_register_plugin_hook_handler('register', 'menu:widget', 'wet4_widget_menu_setup');
-    elgg_register_plugin_hook_handler('register', 'menu:page', 'wet4_elgg_page_menu_setup');
-    elgg_register_plugin_hook_handler('register', 'menu:river', 'wet4_elgg_river_menu_setup');
+	elgg_register_plugin_hook_handler('register', 'menu:entity', 'wet4_elgg_entity_menu_setup');
+	elgg_register_plugin_hook_handler('register', 'menu:widget', 'wet4_widget_menu_setup');
+	elgg_register_plugin_hook_handler('register', 'menu:page', 'wet4_elgg_page_menu_setup');
+	elgg_register_plugin_hook_handler('register', 'menu:river', 'wet4_elgg_river_menu_setup');
 
-    elgg_register_plugin_hook_handler('register', 'menu:entity', 'wet4_likes_entity_menu_setup', 400);
-    //elgg_register_plugin_hook_handler('register', 'menu:entity', 'wet4_delete_entity_menu', 400);
+	elgg_register_plugin_hook_handler('register', 'menu:entity', 'wet4_likes_entity_menu_setup', 400);
+	//elgg_register_plugin_hook_handler('register', 'menu:entity', 'wet4_delete_entity_menu', 400);
 
 		//questions modifications
 		elgg_register_action('object/question/save', elgg_get_plugins_path()."wet4/actions/object/question/save.php"); //add english/french toggle
@@ -70,30 +70,30 @@ 
 	elgg_extend_view('css/elgg', 'wet4_theme/css');
 	elgg_extend_view('css/elgg', 'wet4_theme/custom_css');
 
-    //remove_group_tool_option('activity');
+	//remove_group_tool_option('activity');
 
-    //extending views to pass metadata to head.php
-    elgg_extend_view("object/elements/full", "wet4_theme/track_page_entity", 451);
-    elgg_extend_view('profile/wrapper', 'wet4_theme/pass');
+	//extending views to pass metadata to head.php
+	elgg_extend_view("object/elements/full", "wet4_theme/track_page_entity", 451);
+	elgg_extend_view('profile/wrapper', 'wet4_theme/pass');
 
-    elgg_extend_view('forms/notificationsettings/save', 'forms/notificationsettings/groupsave');
+	elgg_extend_view('forms/notificationsettings/save', 'forms/notificationsettings/groupsave');
 
-    //register a page handler for friends
-    elgg_unregister_page_handler('friends'); //unregister core page handler
-    elgg_unregister_page_handler('dashboard'); //unregister dashboard handler to make our own
-    elgg_register_page_handler('dashboard', 'wet4_dashboard_page_handler');
-    elgg_register_page_handler('friends', '_wet4_friends_page_handler'); //register new page handler for data tables
+	//register a page handler for friends
+	elgg_unregister_page_handler('friends'); //unregister core page handler
+	elgg_unregister_page_handler('dashboard'); //unregister dashboard handler to make our own
+	elgg_register_page_handler('dashboard', 'wet4_dashboard_page_handler');
+	elgg_register_page_handler('friends', '_wet4_friends_page_handler'); //register new page handler for data tables
 	elgg_register_page_handler('friendsof', '_wet4_friends_page_handler');
-    elgg_register_page_handler('activity', 'activity_page_handler');
-    elgg_unregister_page_handler('messages', 'messages_page_handler');
-    elgg_register_page_handler('messages', 'wet4_messages_page_handler');
+	elgg_register_page_handler('activity', 'activity_page_handler');
+	elgg_unregister_page_handler('messages', 'messages_page_handler');
+	elgg_register_page_handler('messages', 'wet4_messages_page_handler');
 
-    elgg_register_page_handler('collections', 'wet4_collections_page_handler');
+	elgg_register_page_handler('collections', 'wet4_collections_page_handler');
 
 		//register login as menu item into user menu
 		elgg_register_event_handler('pagesetup', 'system', 'login_as_add_user_menu_link');
 
-    //datatables css file
+	//datatables css file
 	elgg_extend_view('css/elgg', '//cdn.datatables.net/1.10.10/css/jquery.dataTables.css');
 
 	elgg_register_simplecache_view('wet4/validate.js');
@@ -102,29 +102,29 @@ 
 	//elgg_unextend_view('page/elements/header', 'search/header');
 	//elgg_extend_view('page/elements/sidebar', 'search/header', 0);
 
-    //load datatables
-    elgg_require_js("wet4/test");
+	//load datatables
+	elgg_require_js("wet4/test");
 
-    //the wire reply and thread
-    elgg_register_ajax_view("thewire_tools/reply");
+	//the wire reply and thread
+	elgg_register_ajax_view("thewire_tools/reply");
 	  elgg_register_ajax_view("thewire_tools/thread");
 		//viewing phot on newsfeed
-    elgg_register_ajax_view("ajax/photo");
+	elgg_register_ajax_view("ajax/photo");
 		//edit colleague circle
-    elgg_register_ajax_view("friend_circle/edit");
+	elgg_register_ajax_view("friend_circle/edit");
 		//verfiy department pop up
-    elgg_register_ajax_view("verify_department/verify_department");
+	elgg_register_ajax_view("verify_department/verify_department");
 
-    //file tools
+	//file tools
 		elgg_register_ajax_view("file_tools/move");
 		//message preview
-    elgg_register_ajax_view("messages/message_preview");
+	elgg_register_ajax_view("messages/message_preview");
 
-    //Group AJAX loading view
+	//Group AJAX loading view
 		/*REMOVE_GROUP
     elgg_register_ajax_view('ajax/grp_ajax_content');
 	elgg_extend_view("js/elgg", "js/wet4/group_ajax");*/
-    elgg_extend_view("js/elgg", "js/wet4/discussion_quick_start");
+	elgg_extend_view("js/elgg", "js/wet4/discussion_quick_start");
 
 
 
@@ -136,92 +136,92 @@ 
 
 	elgg_register_plugin_hook_handler('head', 'page', 'wet4_theme_setup_head');
 	elgg_register_plugin_hook_handler('register', 'menu:owner_block', 'my_owner_block_handler');
-    elgg_register_plugin_hook_handler('register', 'menu:title', 'my_title_menu_handler');
-    elgg_register_plugin_hook_handler('register', 'menu:filter', 'my_filter_menu_handler');
-    elgg_register_plugin_hook_handler('register', 'menu:site', 'my_site_menu_handler');
+	elgg_register_plugin_hook_handler('register', 'menu:title', 'my_title_menu_handler');
+	elgg_register_plugin_hook_handler('register', 'menu:filter', 'my_filter_menu_handler');
+	elgg_register_plugin_hook_handler('register', 'menu:site', 'my_site_menu_handler');
 	elgg_register_plugin_hook_handler('register', 'menu:river', 'river_handler');
 
-    elgg_register_simplecache_view('wet4/test.js');
+	elgg_register_simplecache_view('wet4/test.js');
 
-    //added since goups didnt have this action but called it
-    elgg_register_action("discussion_reply/delete", elgg_get_plugins_path() . "/wet4/actions/discussion/reply/delete.php");
+	//added since goups didnt have this action but called it
+	elgg_register_action("discussion_reply/delete", elgg_get_plugins_path() . "/wet4/actions/discussion/reply/delete.php");
 
-    if(elgg_is_active_plugin('au_subgroups')){
-        elgg_register_action("groups/invite", elgg_get_plugins_path() . "/wet4/actions/groups/invite.php");
-    }
+	if(elgg_is_active_plugin('au_subgroups')){
+		elgg_register_action("groups/invite", elgg_get_plugins_path() . "/wet4/actions/groups/invite.php");
+	}
  elgg_register_action("comment/join", elgg_get_plugins_path() . "groups/actions/groups/membership/join.php");
 
 		elgg_register_action("file/move_folder", elgg_get_plugins_path() . "/wet4/actions/file/move.php");
-    elgg_register_action("friends/collections/edit", elgg_get_plugins_path() . "/wet4/actions/friends/collections/edit.php");
-    elgg_register_action("login", elgg_get_plugins_path() . "/wet4/actions/login.php", "public");
-    elgg_register_action("widgets/delete", elgg_get_plugins_path() . "/wet4/actions/widgets/delete.php");
-    elgg_register_action("user/requestnewpassword", elgg_get_plugins_path() . "/wet4/actions/user/requestnewpassword.php", "public");
+	elgg_register_action("friends/collections/edit", elgg_get_plugins_path() . "/wet4/actions/friends/collections/edit.php");
+	elgg_register_action("login", elgg_get_plugins_path() . "/wet4/actions/login.php", "public");
+	elgg_register_action("widgets/delete", elgg_get_plugins_path() . "/wet4/actions/widgets/delete.php");
+	elgg_register_action("user/requestnewpassword", elgg_get_plugins_path() . "/wet4/actions/user/requestnewpassword.php", "public");
 		elgg_register_action('logout_as', elgg_get_plugins_path() . '/wet4/actions/logout_as.php'); //login as out
 		elgg_register_action("question/autocomplete", elgg_get_plugins_path() . "/wet4/actions/object/question/autocomplete.php");
 		elgg_register_action("deptactivity/filter", elgg_get_plugins_path() . "/wet4/actions/deptactivity/filter.php");
 
-    //Verify the department action
-    elgg_register_action("department/verify_department", elgg_get_plugins_path() . "/wet4/actions/department/verify_department.php");
+	//Verify the department action
+	elgg_register_action("department/verify_department", elgg_get_plugins_path() . "/wet4/actions/department/verify_department.php");
 
-    // bilingual content upgrade script
-    elgg_register_action("wet4/update_to_json", elgg_get_plugins_path() . "/wet4/actions/bilingual_content/update_to_json.php");
+	// bilingual content upgrade script
+	elgg_register_action("wet4/update_to_json", elgg_get_plugins_path() . "/wet4/actions/bilingual_content/update_to_json.php");
 
 	// non-members do not get visible links to RSS feeds
 	if (!elgg_is_logged_in()) {
 		elgg_unregister_plugin_hook_handler('output:before', 'layout', 'elgg_views_add_rss_link');
 	}
 
-    // new widgets
-    //registering wet 4 activity widget
+	// new widgets
+	//registering wet 4 activity widget
 
-    elgg_register_widget_type('suggested_friends', elgg_echo('sf:suggcolleagues'), elgg_echo('sf:suggcolleagues'), array('custom_index_widgets'),false);
-    elgg_register_widget_type('feature_tour', 'feature_tour', 'feature_tour', array('custom_index_widgets'),false);
+	elgg_register_widget_type('suggested_friends', elgg_echo('sf:suggcolleagues'), elgg_echo('sf:suggcolleagues'), array('custom_index_widgets'),false);
+	elgg_register_widget_type('feature_tour', 'feature_tour', 'feature_tour', array('custom_index_widgets'),false);
 
-    //WET my groups widget
-    elgg_register_widget_type('wet_mygroups_index', $mygroups_title, 'My Groups Index', array('custom_index_widgets'),true);
-    elgg_register_widget_type('most_liked', elgg_echo('activity:module:weekly_likes'), elgg_echo('activity:module:weekly_likes'), array('dashboard','custom_index_widgets'),true);
+	//WET my groups widget
+	elgg_register_widget_type('wet_mygroups_index', $mygroups_title, 'My Groups Index', array('custom_index_widgets'),true);
+	elgg_register_widget_type('most_liked', elgg_echo('activity:module:weekly_likes'), elgg_echo('activity:module:weekly_likes'), array('dashboard','custom_index_widgets'),true);
 
 
-    //Temp fix for river widget
-    elgg_unregister_widget_type("group_river_widget");
+	//Temp fix for river widget
+	elgg_unregister_widget_type("group_river_widget");
 
-    //extend views of plugin files to remove unwanted menu items
-    $active_plugins = elgg_get_plugins();
-    foreach ($active_plugins as $plugin) {
+	//extend views of plugin files to remove unwanted menu items
+	$active_plugins = elgg_get_plugins();
+	foreach ($active_plugins as $plugin) {
 		$plugin_id = $plugin->getID();
 		if (elgg_view_exists("usersettings/$plugin_id/edit") || elgg_view_exists("plugins/$plugin_id/usersettings")) {
 
-            elgg_extend_view("usersettings/$plugin_id/edit", "forms/usersettings/menus");
-            elgg_extend_view("plugins/$plugin_id/usersettings", "forms/usersettings/menus");
+			elgg_extend_view("usersettings/$plugin_id/edit", "forms/usersettings/menus");
+			elgg_extend_view("plugins/$plugin_id/usersettings", "forms/usersettings/menus");
 
 		}
 	}
-    elgg_extend_view("core/settings/statistics", "forms/usersettings/menus");
-    elgg_extend_view('forms/account/settings', 'core/settings/account/landing_page');
+	elgg_extend_view("core/settings/statistics", "forms/usersettings/menus");
+	elgg_extend_view('forms/account/settings', 'core/settings/account/landing_page');
 
 
-    //set up metadata for user's landing page preference
-    if(elgg_is_logged_in()){
-        $user = elgg_get_logged_in_user_entity();
-        if(!isset($user->landingpage)){
-            $user->landingpage = 'news';
-        }
-    }
+	//set up metadata for user's landing page preference
+	if(elgg_is_logged_in()){
+		$user = elgg_get_logged_in_user_entity();
+		if(!isset($user->landingpage)){
+			$user->landingpage = 'news';
+		}
+	}
 
-    //save new user settings on landing page
-    elgg_register_plugin_hook_handler('usersettings:save', 'user', '_elgg_set_landing_page');
+	//save new user settings on landing page
+	elgg_register_plugin_hook_handler('usersettings:save', 'user', '_elgg_set_landing_page');
 
 
-    elgg_register_page_handler('groups_autocomplete', 'groups_autocomplete');
+	elgg_register_page_handler('groups_autocomplete', 'groups_autocomplete');
 
 
-    //jobs.gc.ca menu link
-    elgg_register_menu_item('subSite', array(
-        'name' => 'jobs',
-        'text' => elgg_echo('wet:jobs:link'),
-        'href' => elgg_echo('wet:jobs:href'),
-        'target' => '_blank',
-    ));
+	//jobs.gc.ca menu link
+	elgg_register_menu_item('subSite', array(
+		'name' => 'jobs',
+		'text' => elgg_echo('wet:jobs:link'),
+		'href' => elgg_echo('wet:jobs:href'),
+		'target' => '_blank',
+	));
 
 		//newsfeed-like department pages
 		if(elgg_is_logged_in() && elgg_get_plugin_setting('deptActivity', 'wet4')){
@@ -233,7 +233,7 @@ 
 
 			if(elgg_is_active_plugin('gc_newsfeed')){
 				elgg_extend_view('widgets/stream_newsfeed_index/content', 'dept_activity/tabs', 451);
-		    elgg_extend_view('widgets/newsfeed/content', 'dept_activity/tabs', 451);
+			elgg_extend_view('widgets/newsfeed/content', 'dept_activity/tabs', 451);
 			}
 		}
 
@@ -242,15 +242,15 @@ 
 
 global $CONFIG;
 $dbprefix = elgg_get_config('dbprefix');
-    // user default access if enabled
-    if ($CONFIG->remove_logged_in) {
-    $query = "UPDATE {$dbprefix}entities SET access_id = 2 WHERE access_id = 1";//change access logged in to public
-    update_data($query);
+	// user default access if enabled
+	if ($CONFIG->remove_logged_in) {
+	$query = "UPDATE {$dbprefix}entities SET access_id = 2 WHERE access_id = 1";//change access logged in to public
+	update_data($query);
 }
 
 function department_page_handler() {
-    require_once elgg_get_plugins_path() . 'wet4/pages/department/activity.php';
-    return true;
+	require_once elgg_get_plugins_path() . 'wet4/pages/department/activity.php';
+	return true;
 }
 
  /*
@@ -258,56 +258,56 @@ 
   * loads library for groups autocomplete in group creation form
   */
 function groups_autocomplete() {
-    require_once elgg_get_plugins_path() . 'wet4/lib/groups_autocomplete.php';
-    return true;
+	require_once elgg_get_plugins_path() . 'wet4/lib/groups_autocomplete.php';
+	return true;
 }
 
 
 
 
 function _elgg_wet_user_settings_page_handler($page) {
-    global $CONFIG;
-
-    if (!isset($page[0])) {
-        $page[0] = 'user';
-    }
-
-    if (isset($page[1])) {
-        $user = get_user_by_username($page[1]);
-        elgg_set_page_owner_guid($user->guid);
-    } else {
-        $user = elgg_get_logged_in_user_entity();
-        elgg_set_page_owner_guid($user->guid);
-    }
-
-    elgg_push_breadcrumb(elgg_echo('settings'), "settings/user/$user->username");
-
-    switch ($page[0]) {
-        case 'notifications':
-            elgg_push_breadcrumb(elgg_echo('cp_notifications:name'));
-            $path = elgg_get_plugins_path() . "/cp_notifications/" . "pages/cp_notifications/notification_setting.php";
-            break;
-        case 'statistics':
-            elgg_push_breadcrumb(elgg_echo('usersettings:statistics:opt:linktext'));
-            $path = $CONFIG->path . "pages/settings/statistics.php";
-            break;
-        /*case 'plugins':
+	global $CONFIG;
+
+	if (!isset($page[0])) {
+		$page[0] = 'user';
+	}
+
+	if (isset($page[1])) {
+		$user = get_user_by_username($page[1]);
+		elgg_set_page_owner_guid($user->guid);
+	} else {
+		$user = elgg_get_logged_in_user_entity();
+		elgg_set_page_owner_guid($user->guid);
+	}
+
+	elgg_push_breadcrumb(elgg_echo('settings'), "settings/user/$user->username");
+
+	switch ($page[0]) {
+		case 'notifications':
+			elgg_push_breadcrumb(elgg_echo('cp_notifications:name'));
+			$path = elgg_get_plugins_path() . "/cp_notifications/" . "pages/cp_notifications/notification_setting.php";
+			break;
+		case 'statistics':
+			elgg_push_breadcrumb(elgg_echo('usersettings:statistics:opt:linktext'));
+			$path = $CONFIG->path . "pages/settings/statistics.php";
+			break;
+		/*case 'plugins':
             if (isset($page[2])) {
                 set_input("plugin_id", $page[2]);
                 elgg_push_breadcrumb(elgg_echo('usersettings:plugins:opt:linktext'));
                 $path = $CONFIG->path . "pages/settings/tools.php";
             }
             break;*/
-        case 'user':
-            $path = $CONFIG->path . "pages/settings/account.php";
-            break;
-    }
-
-    if (isset($path)) {
-        require $path;
-        return true;
-    }
-    return false;
+		case 'user':
+			$path = $CONFIG->path . "pages/settings/account.php";
+			break;
+	}
+
+	if (isset($path)) {
+		require $path;
+		return true;
+	}
+	return false;
 }
 
 
@@ -318,23 +318,23 @@ 
  * Override activity page handler
  */
 function activity_page_handler($page){
-    elgg_set_page_owner_guid(elgg_get_logged_in_user_guid());
-
-    // make a URL segment available in page handler script
-    $page_type = elgg_extract(0, $page, 'all');
-    $page_type = preg_replace('[\W]', '', $page_type);
-    if ($page_type == 'owner') {
-        elgg_gatekeeper();
-        $page_username = elgg_extract(1, $page, '');
-        if ($page_username == elgg_get_logged_in_user_entity()->username) {
-            $page_type = 'mine';
-        } else {
-            set_input('subject_username', $page_username);
-        }
-    }
-    set_input('page_type', $page_type);
-    @include (dirname ( __FILE__ ) . "/pages/river.php");
-    return true;
+	elgg_set_page_owner_guid(elgg_get_logged_in_user_guid());
+
+	// make a URL segment available in page handler script
+	$page_type = elgg_extract(0, $page, 'all');
+	$page_type = preg_replace('[\W]', '', $page_type);
+	if ($page_type == 'owner') {
+		elgg_gatekeeper();
+		$page_username = elgg_extract(1, $page, '');
+		if ($page_username == elgg_get_logged_in_user_entity()->username) {
+			$page_type = 'mine';
+		} else {
+			set_input('subject_username', $page_username);
+		}
+	}
+	set_input('page_type', $page_type);
+	@include (dirname ( __FILE__ ) . "/pages/river.php");
+	return true;
 }
 
 
@@ -440,51 +440,51 @@ 
 		}
 
 
-        //style colleague requests tab
-        $context = elgg_get_context();
-        $page_owner = elgg_get_page_owner_entity();
-
-        if(elgg_is_logged_in()){
-            $user = elgg_get_logged_in_user_guid();
-        }
-
-        if ($page_owner instanceof ElggUser && $page_owner->guid == $user) {
-            // Show menu link in the correct context
-            if (in_array($context, array("friends", "friendsof", "collections"))) {
-                $options = array(
-                    "type" => "user",
-                    "count" => true,
-                    "relationship" => "friendrequest",
-                    "relationship_guid" => $page_owner->getGUID(),
-                    "inverse_relationship" => true
-                );
-
-                $count = elgg_get_entities_from_relationship($options);
-                $extra = "";
-                if (!empty($count)) {
-                    if($count >= 10){
-                        //$count = '9+';
-                    }
-                    $extra = '<span aria-hidden="true" class="notif-badge">' . $count . '</span>';
-                }
-
-                // add menu item
-                $menu_item = array(
-                    "name" => "friend_request",
-                    "text" => elgg_echo("friend_request:menu") . $extra,
-                    "href" => "friend_request/" . $page_owner->username,
-                    "contexts" => array("friends", "friendsof", "collections")
-                );
-
-                elgg_register_menu_item("page", $menu_item);
+		//style colleague requests tab
+		$context = elgg_get_context();
+		$page_owner = elgg_get_page_owner_entity();
 
+		if(elgg_is_logged_in()){
+			$user = elgg_get_logged_in_user_guid();
+		}
 
-            }
-        }
+		if ($page_owner instanceof ElggUser && $page_owner->guid == $user) {
+			// Show menu link in the correct context
+			if (in_array($context, array("friends", "friendsof", "collections"))) {
+				$options = array(
+					"type" => "user",
+					"count" => true,
+					"relationship" => "friendrequest",
+					"relationship_guid" => $page_owner->getGUID(),
+					"inverse_relationship" => true
+				);
+
+				$count = elgg_get_entities_from_relationship($options);
+				$extra = "";
+				if (!empty($count)) {
+					if($count >= 10){
+						//$count = '9+';
+					}
+					$extra = '<span aria-hidden="true" class="notif-badge">' . $count . '</span>';
+				}
 
-        if(elgg_in_context('messages')){
-                elgg_unregister_menu_item("page", "friend_request");
-            }
+				// add menu item
+				$menu_item = array(
+					"name" => "friend_request",
+					"text" => elgg_echo("friend_request:menu") . $extra,
+					"href" => "friend_request/" . $page_owner->username,
+					"contexts" => array("friends", "friendsof", "collections")
+				);
+
+				elgg_register_menu_item("page", $menu_item);
+
+
+			}
+		}
+
+		if(elgg_in_context('messages')){
+				elgg_unregister_menu_item("page", "friend_request");
+			}
 
 	}
 
@@ -494,43 +494,43 @@ 
 *    taken from friend_request module
 *    edited to place badge on colleagues instead of creating new icon
 */
-    $user = elgg_get_logged_in_user_entity();
+	$user = elgg_get_logged_in_user_entity();
 
-    $params = array(
+	$params = array(
 				"name" => "Colleagues",
 				"href" => "friends/" . $user->username,
 				"text" => '<i class="fa fa-users mrgn-rght-sm mrgn-tp-sm fa-lg"></i><span class="hidden-xs">' . elgg_echo("userMenu:colleagues") . '</span>',
 				"title" => elgg_echo('userMenu:colleagues'),
-        "class" => '',
-        'item_class' => '',
+		"class" => '',
+		'item_class' => '',
 				'priority' => '1'
 			);
 
 			elgg_register_menu_item("user_menu", $params);
 
 
-    $context = elgg_get_context();
+	$context = elgg_get_context();
 	$page_owner = elgg_get_page_owner_entity();
 
 	// Remove link to friendsof
 	elgg_unregister_menu_item("page", "friends:of");
 
-    // Settings notifications tab in the User's setting page
-    // cyu - allow site administrators to view user notification settings page
+	// Settings notifications tab in the User's setting page
+	// cyu - allow site administrators to view user notification settings page
 	elgg_unregister_menu_item('page', '2_a_user_notify');
-    if ($page_owner instanceof ElggUser) {
-        $params = array(
-            "name" => "2_a_user_notify",
-            "href" => "/settings/notifications/{$page_owner->username}",
-            "text" =>  elgg_echo('notifications:subscriptions:changesettings'),
-            'section' => 'configure',
-            'priority' => '100',
-            'context' => 'settings',
-        );
-    }
+	if ($page_owner instanceof ElggUser) {
+		$params = array(
+			"name" => "2_a_user_notify",
+			"href" => "/settings/notifications/{$page_owner->username}",
+			"text" =>  elgg_echo('notifications:subscriptions:changesettings'),
+			'section' => 'configure',
+			'priority' => '100',
+			'context' => 'settings',
+		);
+	}
 
 
-    elgg_register_menu_item("page", $params);
+	elgg_register_menu_item("page", $params);
 
 	if (!empty($user)) {
 		$options = array(
@@ -544,22 +544,22 @@ 
 		$count = elgg_get_entities_from_relationship($options);
 		if (!empty($count)) {
 
-            //user menu
+			//user menu
 
-            $countTitle = $count;
+			$countTitle = $count;
 
-            //display 9+ instead of huge numbers in notif badge
-            if($count >= 10){
-                $count = '9+';
-            }
+			//display 9+ instead of huge numbers in notif badge
+			if($count >= 10){
+				$count = '9+';
+			}
 
 			$params = array(
 				"name" => "Colleagues",
 				"href" => "friends/" . $user->username,
 				"text" => '<i class="fa fa-users mrgn-rght-sm mrgn-tp-sm fa-lg"></i><span class="hidden-xs">'. elgg_echo("friends") . "</span><span class='notif-badge'>" . $count . "</span>",
 				"title" => elgg_echo('userMenu:colleagues') . ' - ' . $countTitle . ' ' . elgg_echo('friend_request') .'(s)',
-        "class" => '',
-        'item_class' => '',
+		"class" => '',
+		'item_class' => '',
 				'priority' => '1'
 			);
 
@@ -567,14 +567,14 @@ 
 
 
 
-            //topbar
+			//topbar
 
-      $params = array(
+	  $params = array(
 				"name" => "friends",
 				"href" => "friends/" . $user->username,
 				"text" => elgg_echo("friends") . "<span class='badge'>" . $count . "</span>",
 				"title" => elgg_echo('friends') . ' - Requests(' . $count .')',
-        "class" => 'friend-icon',
+		"class" => 'friend-icon',
 			);
 
 			elgg_register_menu_item("topbar", $params);
@@ -584,47 +584,47 @@ 
 
 
 
-    //likes and stuff yo
-    $item = elgg_get_menu_item('entity', 'likes');
+	//likes and stuff yo
+	$item = elgg_get_menu_item('entity', 'likes');
 		if ($item) {
 			$item->setText('likes');
-      $item->setItemClass('msg-icon');
+	  $item->setItemClass('msg-icon');
 		}
 
-    $item = elgg_get_menu_item('entity', 'delete');
+	$item = elgg_get_menu_item('entity', 'delete');
 		if ($item){
-    	echo '<div> What that mean?</div>';
-    }
+		echo '<div> What that mean?</div>';
+	}
 
-    if (elgg_is_logged_in() && elgg_get_config('allow_registration')) {
+	if (elgg_is_logged_in() && elgg_get_config('allow_registration')) {
 			$params = array(
 				'name' => 'invite',
 				'text' => elgg_echo('friends:invite'),
 				'href' => "invite/". $user->username,
 				'contexts' => array('friends'),
-        'priority' => 300,
+		'priority' => 300,
 			);
 			elgg_register_menu_item('page', $params);
 		}
 
 
-    //new folder button for files
+	//new folder button for files
 
-    if(elgg_is_logged_in()){
-        $user = elgg_get_logged_in_user_entity();
-        if($user->canEdit()){
-            $params = array(
-                'name' => 'new_folder',
-                'text' => elgg_echo("file_tools:new:title"),
-                'href' => "#",
-                "id" => "file_tools_list_new_folder_toggle",
-                'item_class' => 'mrgn-lft-sm',
-                'context' => 'file',
-            );
-            elgg_register_menu_item('title2', $params);
+	if(elgg_is_logged_in()){
+		$user = elgg_get_logged_in_user_entity();
+		if($user->canEdit()){
+			$params = array(
+				'name' => 'new_folder',
+				'text' => elgg_echo("file_tools:new:title"),
+				'href' => "#",
+				"id" => "file_tools_list_new_folder_toggle",
+				'item_class' => 'mrgn-lft-sm',
+				'context' => 'file',
+			);
+			elgg_register_menu_item('title2', $params);
 
-        }
-    }
+		}
+	}
 
 }
 
@@ -658,7 +658,7 @@ 
  */
 function wet4_likes_entity_menu_setup($hook, $type, $return, $params) {
 	// make the widget view produce the same entity menu as the other objects
-    if (elgg_in_context('widgets')) {
+	if (elgg_in_context('widgets')) {
 		//return $return;
 	}
 
@@ -733,7 +733,7 @@ 
 			'text' => $count,
 			'href' => false,
 			'priority' => 999,
-      'item_class' => 'entity-menu-bubble',
+	  'item_class' => 'entity-menu-bubble',
 		);
 		$return[] = ElggMenuItem::factory($options);
 	}
@@ -748,45 +748,45 @@ 
  */
 function wet4_elgg_page_menu_setup($hook, $type, $return, $params) {
 
-    if(elgg_in_context('settings')){
+	if(elgg_in_context('settings')){
 
-        $user = elgg_get_page_owner_entity();
+		$user = elgg_get_page_owner_entity();
 
-        $dropdown = '<ul class="dropdown-menu pull-right subMenu">';
+		$dropdown = '<ul class="dropdown-menu pull-right subMenu">';
 
-        $active_plugins = elgg_get_plugins();
+		$active_plugins = elgg_get_plugins();
 
-        foreach ($active_plugins as $plugin) {
-            $plugin_id = $plugin->getID();
-            if (elgg_view_exists("usersettings/$plugin_id/edit") || elgg_view_exists("plugins/$plugin_id/usersettings")) {
-                $params = array(
-                    'name' => $plugin_id,
-                    'text' => $plugin->getFriendlyName(),
-                    'href' => "settings/plugins/{$user->username}/$plugin_id",
-                );
+		foreach ($active_plugins as $plugin) {
+			$plugin_id = $plugin->getID();
+			if (elgg_view_exists("usersettings/$plugin_id/edit") || elgg_view_exists("plugins/$plugin_id/usersettings")) {
+				$params = array(
+					'name' => $plugin_id,
+					'text' => $plugin->getFriendlyName(),
+					'href' => "settings/plugins/{$user->username}/$plugin_id",
+				);
 
-                $dropdown .= '<li><a href="' . elgg_get_site_url() . 'settings/plugins/' . $user->username . '/' . $plugin_id . '">' . $plugin->getFriendlyName() . '</a></li>';
-            }
-        }
+				$dropdown .= '<li><a href="' . elgg_get_site_url() . 'settings/plugins/' . $user->username . '/' . $plugin_id . '">' . $plugin->getFriendlyName() . '</a></li>';
+			}
+		}
 
-        $dropdown .= '</ul>';
+		$dropdown .= '</ul>';
 
-        $options = array(
-                   'name' => 'plugin_tools',
-                   'text' => elgg_echo('usersettings:plugins:opt:linktext') . '<b class="caret"></b>' . $dropdown,
-                   'priority' => 150,
-                   'section' => 'configure',
-                   'item_class' => 'dropdown',
-                   'data-toggle' => 'dropdown',
-                   'aria-expanded' => 'false',
-                   'class' => 'dropdown-toggle  dropdownToggle',
-               );
-        $return[] = \ElggMenuItem::factory($options);
+		$options = array(
+				   'name' => 'plugin_tools',
+				   'text' => elgg_echo('usersettings:plugins:opt:linktext') . '<b class="caret"></b>' . $dropdown,
+				   'priority' => 150,
+				   'section' => 'configure',
+				   'item_class' => 'dropdown',
+				   'data-toggle' => 'dropdown',
+				   'aria-expanded' => 'false',
+				   'class' => 'dropdown-toggle  dropdownToggle',
+			   );
+		$return[] = \ElggMenuItem::factory($options);
 
 
-        return $return;
+		return $return;
 
-    }
+	}
 
 }
 
@@ -795,14 +795,14 @@ 
  * Override blog entity menu to include font awesome icons and add accessability
  */
 function wet4_blog_entity_menu($hook, $entity_type, $returnvalue, $params) {
-    if (empty($params) || !is_array($params)) {
-        return $returnvalue;
-    }
+	if (empty($params) || !is_array($params)) {
+		return $returnvalue;
+	}
 
-    $entity = elgg_extract("entity", $params);
-    if (empty($entity) || !elgg_instanceof($entity, "object", "blog")) {
-        return $returnvalue;
-    }
+	$entity = elgg_extract("entity", $params);
+	if (empty($entity) || !elgg_instanceof($entity, "object", "blog")) {
+		return $returnvalue;
+	}
 
 		if($entity->title3){
 				$entName = gc_explode_translation($entity->title3, $lang);
@@ -810,41 +810,41 @@ 
 				$entName = $entity->title;
 		}
 
-    // only published blogs
-    if ($entity->status == "draft") {
-        return $returnvalue;
-    }
-
-    if (!elgg_in_context("widgets") && elgg_is_admin_logged_in()) {
-        $returnvalue[] = \ElggMenuItem::factory(array(
-            "name" => "blog-feature",
-            "text" => elgg_echo("blog_tools:toggle:feature"),
-            "href" => "action/blog_tools/toggle_metadata?guid=" . $entity->getGUID() . "&metadata=featured",
-            "item_class" => empty($entity->featured) ? "" : "hidden",
-            "is_action" => true,
-            "priority" => 175
-        ));
-        $returnvalue[] = \ElggMenuItem::factory(array(
-            "name" => "blog-unfeature",
-            "text" => elgg_echo("blog_tools:toggle:unfeature"),
-            "href" => "action/blog_tools/toggle_metadata?guid=" . $entity->getGUID() . "&metadata=featured",
-            "item_class" => empty($entity->featured) ? "hidden" : "",
-            "is_action" => true,
-            "priority" => 176
-        ));
-    }
-
-    if ($entity->canComment()) {
-        $returnvalue[] = \ElggMenuItem::factory(array(
-            "name" => "comments",
-            "text" => '<i class="fa fa-lg fa-comment icon-unsel"><span class="wb-inv">' . elgg_echo("entity:comment:link:blog", array($entName)) . '</span></i>',
-            "title" => elgg_echo("comment:this"),
-            "href" => $entity->getURL() . "#comments"
-        ));
-
-    }
-
-    return $returnvalue;
+	// only published blogs
+	if ($entity->status == "draft") {
+		return $returnvalue;
+	}
+
+	if (!elgg_in_context("widgets") && elgg_is_admin_logged_in()) {
+		$returnvalue[] = \ElggMenuItem::factory(array(
+			"name" => "blog-feature",
+			"text" => elgg_echo("blog_tools:toggle:feature"),
+			"href" => "action/blog_tools/toggle_metadata?guid=" . $entity->getGUID() . "&metadata=featured",
+			"item_class" => empty($entity->featured) ? "" : "hidden",
+			"is_action" => true,
+			"priority" => 175
+		));
+		$returnvalue[] = \ElggMenuItem::factory(array(
+			"name" => "blog-unfeature",
+			"text" => elgg_echo("blog_tools:toggle:unfeature"),
+			"href" => "action/blog_tools/toggle_metadata?guid=" . $entity->getGUID() . "&metadata=featured",
+			"item_class" => empty($entity->featured) ? "hidden" : "",
+			"is_action" => true,
+			"priority" => 176
+		));
+	}
+
+	if ($entity->canComment()) {
+		$returnvalue[] = \ElggMenuItem::factory(array(
+			"name" => "comments",
+			"text" => '<i class="fa fa-lg fa-comment icon-unsel"><span class="wb-inv">' . elgg_echo("entity:comment:link:blog", array($entName)) . '</span></i>',
+			"title" => elgg_echo("comment:this"),
+			"href" => $entity->getURL() . "#comments"
+		));
+
+	}
+
+	return $returnvalue;
 }
 
 /*
@@ -853,7 +853,7 @@ 
  */
 function wet4_elgg_entity_menu_setup($hook, $type, $return, $params) {
 	//Have widgets show the same entity menu
-    if (elgg_in_context('widgets')) {
+	if (elgg_in_context('widgets')) {
 		//return $return;
 	}
 
@@ -862,23 +862,23 @@ 
 	/* @var \ElggEntity $entity */
 	$handler = elgg_extract('handler', $params, false);
 
-    //Nick -Remove empty comment and reply links from river menu
-        foreach ($return as $key => $item){
+	//Nick -Remove empty comment and reply links from river menu
+		foreach ($return as $key => $item){
 
-            switch ($item->getName()) {
-                case 'access':
-                    //$item->setItemClass('removeMe');
-                    unset($return[$key]);
-                    break;
+			switch ($item->getName()) {
+				case 'access':
+					//$item->setItemClass('removeMe');
+					unset($return[$key]);
+					break;
 
-            }
+			}
 
-    }
+	}
 
 
 
 
-    $entContext = $entity->getType();
+	$entContext = $entity->getType();
 
 		//check if entity is an object or group
 		if($entContext == 'object'){
@@ -918,14 +918,14 @@ 
 		$hiddenText = generate_hidden_text($contentType, $entName);
 
 
-        $blocked_subtypes = array('comment', 'discussion_reply');
-        if(in_array($entity->getSubtype(), $blocked_subtypes) || elgg_instanceof($entity, 'user')){
+		$blocked_subtypes = array('comment', 'discussion_reply');
+		if(in_array($entity->getSubtype(), $blocked_subtypes) || elgg_instanceof($entity, 'user')){
 
-            //do not let comments or discussion replies to be reshared on the wire
+			//do not let comments or discussion replies to be reshared on the wire
 
-        } else {
+		} else {
 
-        // check is this item was shared on thewire
+		// check is this item was shared on thewire
 			$count = $entity->getEntitiesFromRelationship(array(
 				'type' => 'object',
 				'subtype' => 'thewire',
@@ -936,11 +936,11 @@ 
 
 			if ($count) {
 
-                if($count >=2){
-                    $share = elgg_echo('thewire:shares');
-                } else {
-                    $share = elgg_echo('thewire:share');
-                }
+				if($count >=2){
+					$share = elgg_echo('thewire:shares');
+				} else {
+					$share = elgg_echo('thewire:share');
+				}
 
 				// show counter
 				$return[] = \ElggMenuItem::factory(array(
@@ -949,7 +949,7 @@ 
 					'title' => elgg_echo('thewire_tools:reshare:count'),
 					'href' => 'ajax/view/thewire_tools/reshare_list?entity_guid=' . $entity->getGUID(),
 					'link_class' => 'elgg-lightbox',
-                    'item_class' => ' entity-menu-bubble',
+					'item_class' => ' entity-menu-bubble',
 					'is_trusted' => true,
 					'priority' => 501,
 					'data-colorbox-opts' => json_encode(array(
@@ -959,117 +959,117 @@ 
 			}
 
 
-            if(elgg_is_logged_in()){
+			if(elgg_is_logged_in()){
 
-                //reshare on the wire
-                $options = array(
-                    'name' => 'thewire_tools_reshare',
-                    'text' => '<i class="fa fa-share-alt fa-lg icon-unsel"><span class="wb-inv">'.$hiddenText['share'].'</span></i>',
-                    'title' => elgg_echo('thewire_tools:reshare'),
-                    'href' => 'ajax/view/thewire_tools/reshare?reshare_guid=' . $entity->getGUID(),
-                    'link_class' => 'elgg-lightbox',
-                    'item_class' => '',
-                    'is_trusted' => true,
-                    'priority' => 500
-                );
-                $return[] = \ElggMenuItem::factory($options);
+				//reshare on the wire
+				$options = array(
+					'name' => 'thewire_tools_reshare',
+					'text' => '<i class="fa fa-share-alt fa-lg icon-unsel"><span class="wb-inv">'.$hiddenText['share'].'</span></i>',
+					'title' => elgg_echo('thewire_tools:reshare'),
+					'href' => 'ajax/view/thewire_tools/reshare?reshare_guid=' . $entity->getGUID(),
+					'link_class' => 'elgg-lightbox',
+					'item_class' => '',
+					'is_trusted' => true,
+					'priority' => 500
+				);
+				$return[] = \ElggMenuItem::factory($options);
 
 
 
-            } else {
-                $options = array(
-                    'name' => 'thewire_tools_reshare',
-                    'text' => '',
-                    'item_class' => 'removeMe',
-                );
-                $return[] = \ElggMenuItem::factory($options);
+			} else {
+				$options = array(
+					'name' => 'thewire_tools_reshare',
+					'text' => '',
+					'item_class' => 'removeMe',
+				);
+				$return[] = \ElggMenuItem::factory($options);
+
+				//elgg_unregister_menu_item('entity', 'thewire_tools_reshare');
+			}
+		}
 
-                //elgg_unregister_menu_item('entity', 'thewire_tools_reshare');
-            }
-        }
-
-        //only show reply on the wire with logged in user
-        if($entity->getSubtype() == 'thewire' && elgg_is_logged_in()){
-            $options = array(
-                'name' => 'reply',
-                'text' => '<i class="fa fa-reply fa-lg icon-unsel"><span class="wb-inv">'.$hiddenText['reply'].'</span></i>',
-                'title' => elgg_echo('reply'),
-                'href' => 'ajax/view/thewire_tools/reply?guid=' . $entity->getGUID(),
-                'link_class' => 'elgg-lightbox',
-                'is_trusted' => true,
-                'priority' => 100
-            );
-            $return[] = \ElggMenuItem::factory($options);
-        }
+		//only show reply on the wire with logged in user
+		if($entity->getSubtype() == 'thewire' && elgg_is_logged_in()){
+			$options = array(
+				'name' => 'reply',
+				'text' => '<i class="fa fa-reply fa-lg icon-unsel"><span class="wb-inv">'.$hiddenText['reply'].'</span></i>',
+				'title' => elgg_echo('reply'),
+				'href' => 'ajax/view/thewire_tools/reply?guid=' . $entity->getGUID(),
+				'link_class' => 'elgg-lightbox',
+				'is_trusted' => true,
+				'priority' => 100
+			);
+			$return[] = \ElggMenuItem::factory($options);
+		}
 
 	if (($entity->countEntitiesFromRelationship("parent") || $entity->countEntitiesFromRelationship("parent", true))) {
-                $options = array(
-                    'name' => 'thread',
-                    'text' => elgg_echo('thewire:thread'),
-                    'href' => 'ajax/view/thewire_tools/thread?thread_id=' . $entity->wire_thread,
-                    'link_class' => 'elgg-lightbox',
-                    'is_trusted' => true,
-                    'priority' => 170,
-                );
-                $return[] = ElggMenuItem::factory($options);
-            }
+				$options = array(
+					'name' => 'thread',
+					'text' => elgg_echo('thewire:thread'),
+					'href' => 'ajax/view/thewire_tools/thread?thread_id=' . $entity->wire_thread,
+					'link_class' => 'elgg-lightbox',
+					'is_trusted' => true,
+					'priority' => 170,
+				);
+				$return[] = ElggMenuItem::factory($options);
+			}
 	if ($entity->canEdit() && $handler) {
 		// edit link
 
-        //checks so the edit icon is not placed on incorrect entities
-        if($handler != 'group_operators'){
-            if($entity->getSubtype() != 'thewire'){
-                $options = array(
-                    'name' => 'edit',
-                    'text' => '<i class="fa fa-edit fa-lg icon-unsel"><span class="wb-inv">'.$hiddenText['edit'].'</span></i>',
-                    'title' => elgg_echo('edit:this') . ' ' . $entContext,
-                    'href' => "$handler/edit/{$entity->getGUID()}",
-                    'priority' => 299,
-                );
-                $return[] = \ElggMenuItem::factory($options);
-            }
+		//checks so the edit icon is not placed on incorrect entities
+		if($handler != 'group_operators'){
+			if($entity->getSubtype() != 'thewire'){
+				$options = array(
+					'name' => 'edit',
+					'text' => '<i class="fa fa-edit fa-lg icon-unsel"><span class="wb-inv">'.$hiddenText['edit'].'</span></i>',
+					'title' => elgg_echo('edit:this') . ' ' . $entContext,
+					'href' => "$handler/edit/{$entity->getGUID()}",
+					'priority' => 299,
+				);
+				$return[] = \ElggMenuItem::factory($options);
+			}
 		// delete link
 
-            if (elgg_is_logged_in()){
-        		$options = array(
-        			'name' => 'delete',
-        			'text' => '<i class="fa fa-trash-o fa-lg icon-unsel"><span class="wb-inv">'.$hiddenText['delete'].'</span></i>',
-        			'title' => elgg_echo('delete:this') . ' ' . $entContext,
-        			'href' => "action/$handler/delete?guid={$entity->getGUID()}",
-        			'confirm' => elgg_echo('deleteconfirm'),
-        			'priority' => 300,
-        		);
-        		$return[] = \ElggMenuItem::factory($options);
-            }
-        }
+			if (elgg_is_logged_in()){
+				$options = array(
+					'name' => 'delete',
+					'text' => '<i class="fa fa-trash-o fa-lg icon-unsel"><span class="wb-inv">'.$hiddenText['delete'].'</span></i>',
+					'title' => elgg_echo('delete:this') . ' ' . $entContext,
+					'href' => "action/$handler/delete?guid={$entity->getGUID()}",
+					'confirm' => elgg_echo('deleteconfirm'),
+					'priority' => 300,
+				);
+				$return[] = \ElggMenuItem::factory($options);
+			}
+		}
 	}
 
 
-    if($entity->getSubType() == 'file'){
-        // download link
+	if($entity->getSubType() == 'file'){
+		// download link
 		$options = array(
 			'name' => 'download',
 			'text' => '<i class="fa fa-download fa-lg icon-unsel"><span class="wb-inv">'.$hiddenText['download'].'</span></i>',
 			'title' => 'Download File',
 			'href' => "file/download/{$entity->getGUID()}",
 			'priority' => 300,
-            //'context' => array('file_tools_selector', 'file'),
+			//'context' => array('file_tools_selector', 'file'),
 		);
 		$return[] = \ElggMenuItem::factory($options);
-    }
+	}
 
 
-    if($entity->getSubType() == 'page_top'){
-                //history icon
-            $options = array(
-                'name' => 'history',
-                'text' => '<i class="fa fa-history fa-lg icon-unsel"><span class="wb-inv">' . $hiddenText['history'] . '</span></i>',
-                'title'=> elgg_echo('pages:history'),
-                'href' => "pages/history/$entity->guid",
-                'priority' => 150,
-            );
-            $return[] = \ElggMenuItem::factory($options);
-        }
+	if($entity->getSubType() == 'page_top'){
+				//history icon
+			$options = array(
+				'name' => 'history',
+				'text' => '<i class="fa fa-history fa-lg icon-unsel"><span class="wb-inv">' . $hiddenText['history'] . '</span></i>',
+				'title'=> elgg_echo('pages:history'),
+				'href' => "pages/history/$entity->guid",
+				'priority' => 150,
+			);
+			$return[] = \ElggMenuItem::factory($options);
+		}
 
 //opening and close dicussions
 if (elgg_instanceof($entity, "object", "groupforumtopic") && $entity->canEdit() && elgg_is_active_plugin('group_tools')) {
@@ -1079,7 +1079,7 @@ 
 					"confirm" => elgg_echo("group_tools:discussion:confirm:open"),
 					"href" => "action/discussion/toggle_status?guid=" . $entity->getGUID(),
 					"is_trusted" => true,
-	                 "title" => "Open the topic",
+					 "title" => "Open the topic",
 					"priority" => 200,
 					"item_class" => ($entity->status == "closed") ? "" : "hidden"
 				));
@@ -1089,7 +1089,7 @@ 
 					"confirm" => elgg_echo("group_tools:discussion:confirm:close"),
 					"href" => "action/discussion/toggle_status?guid=" . $entity->getGUID(),
 					"is_trusted" => true,
-	                "title" => "Close the topic",
+					"title" => "Close the topic",
 					"priority" => 201,
 					"item_class" => ($entity->status == "closed") ? "hidden" : ""
 				));
@@ -1118,7 +1118,7 @@ 
  * Override friends page handler to use wet4 pages
  */
 function _wet4_friends_page_handler($page, $handler) {
-    //change the page handler for friends to user our own pages. This increases the limit of friends for data table parsing and such :)
+	//change the page handler for friends to user our own pages. This increases the limit of friends for data table parsing and such :)
 	elgg_set_context('friends');
 
 	if (isset($page[0]) && $user = get_user_by_username($page[0])) {
@@ -1128,11 +1128,11 @@ 
 	if (!elgg_get_page_owner_guid()) {
 		return false;
 	}
-    $plugin_path = elgg_get_plugins_path();
-    //echo $plugin_path;
+	$plugin_path = elgg_get_plugins_path();
+	//echo $plugin_path;
 	switch ($handler) {
 		case 'friends':
-            //use the pages in our theme instead of the core pages
+			//use the pages in our theme instead of the core pages
 			require($plugin_path ."wet4/pages/friends/index.php");
 			break;
 		case 'friendsof':
@@ -1150,8 +1150,8 @@ 
  * Remove unwanted river items
  */
 function wet4_riverItem_remove(){
-    elgg_unregister_menu_item('river', 'comment');
-    elgg_unregister_menu_item('river', 'reply');
+	elgg_unregister_menu_item('river', 'comment');
+	elgg_unregister_menu_item('river', 'reply');
 }
 /*
  * wet4_elgg_river_menu_setup
@@ -1170,21 +1170,21 @@ 
 	if (!$object || !$object->canAnnotate(0, 'likes')) {
 		return;
 	}
-        //Nick -Remove empty comment and reply links from river menu
-        foreach ($return as $key => $item){
-
-            switch ($item->getName()) {
-                case 'comment':
-                    //$item->setItemClass('removeMe');
-                    unset($return[$key]);
-                    break;
-                case 'reply':
-                    //$item->setItemClass('removeMe');
-                    unset($return[$key]);
-                    break;
-            }
+		//Nick -Remove empty comment and reply links from river menu
+		foreach ($return as $key => $item){
+
+			switch ($item->getName()) {
+				case 'comment':
+					//$item->setItemClass('removeMe');
+					unset($return[$key]);
+					break;
+				case 'reply':
+					//$item->setItemClass('removeMe');
+					unset($return[$key]);
+					break;
+			}
 
-    }
+	}
 
 		$entContext = $object->getType();
 		//check if entity is an object or group
@@ -1258,23 +1258,23 @@ 
 		}
 	}
 
-           $blocked_subtypes = array('comment', 'discussion_reply');
-           if(in_array($object->getSubtype(), $blocked_subtypes) || elgg_instanceof($object, 'user')){
+		   $blocked_subtypes = array('comment', 'discussion_reply');
+		   if(in_array($object->getSubtype(), $blocked_subtypes) || elgg_instanceof($object, 'user')){
 
-               //do not let comments or discussion replies to be reshared on the wire
+			   //do not let comments or discussion replies to be reshared on the wire
 
-           } else {
-               $return[]= ElggMenuItem::factory(array(
-                   'name' => 'thewire_tools_reshare',
-                   'text' => '<i class="fa fa-share-alt fa-lg icon-unsel"><span class="wb-inv">'.$hiddenText['share'].'</span></i>',
-                   'title' => elgg_echo('thewire_tools:reshare'),
-                   'href' => 'ajax/view/thewire_tools/reshare?reshare_guid=' . $object->getGUID(),
-                   'link_class' => 'elgg-lightbox',
-                   'item_class' => '',
-                   'is_trusted' => true,
-                   'priority' => 500
-                   ));
-           }
+		   } else {
+			   $return[]= ElggMenuItem::factory(array(
+				   'name' => 'thewire_tools_reshare',
+				   'text' => '<i class="fa fa-share-alt fa-lg icon-unsel"><span class="wb-inv">'.$hiddenText['share'].'</span></i>',
+				   'title' => elgg_echo('thewire_tools:reshare'),
+				   'href' => 'ajax/view/thewire_tools/reshare?reshare_guid=' . $object->getGUID(),
+				   'link_class' => 'elgg-lightbox',
+				   'item_class' => '',
+				   'is_trusted' => true,
+				   'priority' => 500
+				   ));
+		   }
 
 		if (elgg_is_admin_logged_in()) {
 			$options = array(
@@ -1300,30 +1300,30 @@ 
  * Rearrange filter menu for The Wire
  */
 function my_filter_menu_handler($hook, $type, $menu, $params){
-    foreach ($menu as $key => $item){
-        if(elgg_in_context('thewire')){
-        switch ($item->getName()) {
+	foreach ($menu as $key => $item){
+		if(elgg_in_context('thewire')){
+		switch ($item->getName()) {
 
-                case 'all':
-                    $item->setPriority('1');
+				case 'all':
+					$item->setPriority('1');
 
-                    break;
-                case 'friend':
-                    $item->setPriority('2');
+					break;
+				case 'friend':
+					$item->setPriority('2');
 
-                    break;
-                case 'mention':
-                    $item->setText(elgg_echo('search'));
-                    $item->setPriority('4');
+					break;
+				case 'mention':
+					$item->setText(elgg_echo('search'));
+					$item->setPriority('4');
 
-                    break;
-                case 'mine':
-                    $item->setPriority('3');
+					break;
+				case 'mine':
+					$item->setPriority('3');
 
-                    break;
-            }
-        }
-    }
+					break;
+			}
+		}
+	}
 }
 
 /*
@@ -1332,13 +1332,13 @@ 
  */
 function my_site_menu_handler($hook, $type, $menu, $params){
 
-    if (!is_array($menu))
-        return;
+	if (!is_array($menu))
+		return;
 
-    foreach ($menu as $key => $item) {
-        if ($item->getName() === 'groups')
-            (elgg_is_logged_in()) ? $item->setHref(elgg_get_site_url().'groups/all?filter=yours') : $item->setHref( elgg_get_site_url().'groups/all?filter=popular');
-    }
+	foreach ($menu as $key => $item) {
+		if ($item->getName() === 'groups')
+			(elgg_is_logged_in()) ? $item->setHref(elgg_get_site_url().'groups/all?filter=yours') : $item->setHref( elgg_get_site_url().'groups/all?filter=popular');
+	}
 }
 
 /*
@@ -1347,17 +1347,17 @@ 
  */
 function my_title_menu_handler($hook, $type, $menu, $params){
 
-    if (!is_array($menu))
-        return;
+	if (!is_array($menu))
+		return;
 
-    foreach ($menu as $key => $item) {
+	foreach ($menu as $key => $item) {
 
-        if ($item->getName() === 'slideshow')
-            $item->setText(elgg_echo('album:slideshow'));
-        elseif ($item->getName() === 'addphotos')
-            $item->setItemClass('mrgn-rght-sm');
+		if ($item->getName() === 'slideshow')
+			$item->setText(elgg_echo('album:slideshow'));
+		elseif ($item->getName() === 'addphotos')
+			$item->setItemClass('mrgn-rght-sm');
 
-    }
+	}
 
 }
 
@@ -1367,7 +1367,7 @@ 
  */
 function my_owner_block_handler($hook, $type, $menu, $params){
 
-    /*
+	/*
      *
      * If new tool has been added to group tools
      * Make sure the priority is less then 100
@@ -1375,100 +1375,100 @@ 
      */
 
 
-        //rearrange menu items
-    if(elgg_get_context() == 'profile'){
-
-        elgg_unregister_menu_item('owner_block', 'activity');
-
-        //turn owner_block  menu into tabs
-        foreach ($menu as $key => $item){
-
-            switch ($item->getName()) {
-                case 'discussion':
-                    $item->setText(elgg_echo('gprofile:discussion'));
-
-                    $item->setPriority('1');
-                    break;
-                case 'file':
-                    $item->setText(elgg_echo('gprofile:files'));
-                    $item->setHref('#file');
-                    $item->setPriority('2');
-                    break;
-                case 'blog':
-                    $item->setText(elgg_echo('gprofile:blogs'));
-                    $item->setHref('#blog');
-                    $item->setPriority('3');
-                    break;
-                case 'event_calendar':
-                    $item->setText(elgg_echo('gprofile:events'));
-                    $item->setHref('#events');
-                    $item->setPriority('6');
-                    break;
-                case 'pages':
-                    $item->setText(elgg_echo('gprofile:pages'));
-                    $item->setHref('#page_top');
-                    $item->setPriority('7');
-                    break;
-                case 'bookmarks':
-                    $item->setText(elgg_echo('gprofile:bookmarks'));
-                    $item->setHref('#bookmarks');
-                    $item->setPriority('8');
-                    break;
-                case 'polls':
-                    $item->setText(elgg_echo('gprofile:polls'));
-                    $item->setHref('#poll');
-                    $item->setPriority('9');
-                    break;
-                case 'tasks':
-                    $item->setText(elgg_echo('gprofile:tasks'));
-                    $item->setHref('#task_top');
-                    $item->setPriority('10');
-                    break;
-                case 'photos':
-                    $item->setText(elgg_echo('gprofile:photos'));
-                    $item->addItemClass('removeMe');
-                    $item->setPriority('11');
-                    break;
-                case 'photo_albums':
-                    $item->setText(elgg_echo('gprofile:albumsCatch'));
-                    $item->setHref('#album');
-                    $item->setPriority('12');
-                    break;
-                case 'ideas':
-                    $item->setText(elgg_echo('gprofile:ideas'));
-                    $item->addItemClass('removeMe');
-                    $item->setPriority('12');
-                    break;
-
-                case 'orgs':
-                    $item->setPriority('13');
-                    break;
-                case 'thewire':
-                    //$item->setText(elgg_echo('The Wire'));
-                    $item->setHref('#thewire');
-                    $item->setPriority('5');
-                    break;
-                case 'activity':
-                    $item->setText('Activity');
-
-                    $item->setPriority('13');
-                    $item->addItemClass('removeMe');
-                    break;
-                case 'user_invite_from_profile':
-                    $item->setPriority('13');
-                    break;
+		//rearrange menu items
+	if(elgg_get_context() == 'profile'){
+
+		elgg_unregister_menu_item('owner_block', 'activity');
+
+		//turn owner_block  menu into tabs
+		foreach ($menu as $key => $item){
+
+			switch ($item->getName()) {
+				case 'discussion':
+					$item->setText(elgg_echo('gprofile:discussion'));
+
+					$item->setPriority('1');
+					break;
+				case 'file':
+					$item->setText(elgg_echo('gprofile:files'));
+					$item->setHref('#file');
+					$item->setPriority('2');
+					break;
+				case 'blog':
+					$item->setText(elgg_echo('gprofile:blogs'));
+					$item->setHref('#blog');
+					$item->setPriority('3');
+					break;
+				case 'event_calendar':
+					$item->setText(elgg_echo('gprofile:events'));
+					$item->setHref('#events');
+					$item->setPriority('6');
+					break;
+				case 'pages':
+					$item->setText(elgg_echo('gprofile:pages'));
+					$item->setHref('#page_top');
+					$item->setPriority('7');
+					break;
+				case 'bookmarks':
+					$item->setText(elgg_echo('gprofile:bookmarks'));
+					$item->setHref('#bookmarks');
+					$item->setPriority('8');
+					break;
+				case 'polls':
+					$item->setText(elgg_echo('gprofile:polls'));
+					$item->setHref('#poll');
+					$item->setPriority('9');
+					break;
+				case 'tasks':
+					$item->setText(elgg_echo('gprofile:tasks'));
+					$item->setHref('#task_top');
+					$item->setPriority('10');
+					break;
+				case 'photos':
+					$item->setText(elgg_echo('gprofile:photos'));
+					$item->addItemClass('removeMe');
+					$item->setPriority('11');
+					break;
+				case 'photo_albums':
+					$item->setText(elgg_echo('gprofile:albumsCatch'));
+					$item->setHref('#album');
+					$item->setPriority('12');
+					break;
+				case 'ideas':
+					$item->setText(elgg_echo('gprofile:ideas'));
+					$item->addItemClass('removeMe');
+					$item->setPriority('12');
+					break;
+
+				case 'orgs':
+					$item->setPriority('13');
+					break;
+				case 'thewire':
+					//$item->setText(elgg_echo('The Wire'));
+					$item->setHref('#thewire');
+					$item->setPriority('5');
+					break;
+				case 'activity':
+					$item->setText('Activity');
+
+					$item->setPriority('13');
+					$item->addItemClass('removeMe');
+					break;
+				case 'user_invite_from_profile':
+					$item->setPriority('13');
+					break;
 								case 'questions':
-			              $item->setText(elgg_echo('widget:questions:title'));
-			              $item->setHref('#question');
-			              $item->setPriority('8');
-		                break;
-            }
+						  $item->setText(elgg_echo('widget:questions:title'));
+						  $item->setHref('#question');
+						  $item->setPriority('8');
+						break;
+			}
 
-        }
+		}
 
 
 
-    }
+	}
 
 }
 
@@ -1501,7 +1501,7 @@ 
 		'num_columns' => 2,
 		'show_access' => false,
 	);
-    //use our own layouts for dashboard and stuff
+	//use our own layouts for dashboard and stuff
 	$widgets = elgg_view_layout('db_widgets', $params);
 
 	$body = elgg_view_layout('dashboard', array(
@@ -1523,17 +1523,17 @@ 
 	/* @var \ElggWidget $widget */
 	$show_edit = elgg_extract('show_edit', $params, true);
 
-    $options = array(
+	$options = array(
 		'name' => 'collapse',
 		'text' => '<i class="fa fa-lg icon-unsel"><span class="wb-inv">'. elgg_echo('wet:collapseWidget', array($widget->getTitle())).'</span></i> ',
-        'title' => elgg_echo('wet:collapseWidget', array($widget->getTitle())),
+		'title' => elgg_echo('wet:collapseWidget', array($widget->getTitle())),
 		'href' => "#elgg-widget-content-$widget->guid",
 		'link_class' => 'elgg-widget-collapse-button ',
 		'rel' => 'toggle',
 		'priority' => 1,
 	);
 
-    $return[] = \ElggMenuItem::factory($options);
+	$return[] = \ElggMenuItem::factory($options);
 	if ($widget->canEdit()) {
 		$options = array(
 			'name' => 'delete',
@@ -1547,7 +1547,7 @@ 
 			'priority' => 900,
 		);
 		$return[] = \ElggMenuItem::factory($options);
-        // This is to maybe have a move button on widgets to move them with the keyboard.
+		// This is to maybe have a move button on widgets to move them with the keyboard.
 
 		if ($show_edit) {
 			$options = array(
@@ -1578,7 +1578,7 @@ 
 		elgg_get_session()->set('last_forward_from', current_page_url());
 		forward('');
 	}
-    elgg_set_context('friends');
+	elgg_set_context('friends');
 	//elgg_push_breadcrumb(elgg_echo('messages'), 'messages/inbox/' . $current_user->username);
 
 
@@ -1641,10 +1641,10 @@ 
 			set_input('username', $page[1]);
 			include("$base_dir/inbox.php");
 			break;
-        case 'notifications':
-            set_input('username', $page[1]);
-            include("$base_dir/notifications.php");
-            break;
+		case 'notifications':
+			set_input('username', $page[1]);
+			include("$base_dir/notifications.php");
+			break;
 		case 'sent':
 			set_input('username', $page[1]);
 			include("$base_dir/sent.php");
@@ -1745,81 +1745,81 @@ 
  */
 function proper_subtypes($type){
 
-    switch ($type) {
-        case 'page_top':
-            $subtype = elgg_echo('page');
-            break;
+	switch ($type) {
+		case 'page_top':
+			$subtype = elgg_echo('page');
+			break;
 
 				case 'page':
-		        $subtype = elgg_echo('page');
-		        break;
+				$subtype = elgg_echo('page');
+				break;
 
-        case 'thewire':
-            $subtype = elgg_echo('wire:post');
-            break;
+		case 'thewire':
+			$subtype = elgg_echo('wire:post');
+			break;
 
-        case 'blog':
-            $subtype = elgg_echo('blog:blog');
-            break;
+		case 'blog':
+			$subtype = elgg_echo('blog:blog');
+			break;
 
-        case 'comment':
-            $subtype = elgg_echo('comment');
-            break;
+		case 'comment':
+			$subtype = elgg_echo('comment');
+			break;
 
-        case 'groupforumtopic':
-            $subtype = elgg_echo('discussion');
-            break;
+		case 'groupforumtopic':
+			$subtype = elgg_echo('discussion');
+			break;
 
-        case 'discussion_reply':
-            $subtype = elgg_echo('group:replyitem');
-            break;
+		case 'discussion_reply':
+			$subtype = elgg_echo('group:replyitem');
+			break;
 
-        case 'file':
-            $subtype = elgg_echo('file:file');
-            break;
+		case 'file':
+			$subtype = elgg_echo('file:file');
+			break;
 
-        case 'folder':
-            $subtype = elgg_echo('item:object:folder');
-            break;
+		case 'folder':
+			$subtype = elgg_echo('item:object:folder');
+			break;
 
-        case 'event_calendar':
-            $subtype = elgg_echo('event_calendar:agenda:column:session');
-            break;
+		case 'event_calendar':
+			$subtype = elgg_echo('event_calendar:agenda:column:session');
+			break;
 
-        case 'bookmarks':
-            $subtype = elgg_echo('bookmark');
-            break;
+		case 'bookmarks':
+			$subtype = elgg_echo('bookmark');
+			break;
 
-        case 'poll':
-            $subtype = elgg_echo('poll');
-            break;
+		case 'poll':
+			$subtype = elgg_echo('poll');
+			break;
 
-        case 'album':
-            $subtype = elgg_echo('album');
-            break;
+		case 'album':
+			$subtype = elgg_echo('album');
+			break;
 
-        case 'image':
-            $subtype = elgg_echo('image');
-            break;
+		case 'image':
+			$subtype = elgg_echo('image');
+			break;
 
-        case 'idea':
-            $subtype = elgg_echo('item:object:idea');
-            break;
+		case 'idea':
+			$subtype = elgg_echo('item:object:idea');
+			break;
 
-        case 'groups':
-            $subtype = elgg_echo('group:group');
-            break;
+		case 'groups':
+			$subtype = elgg_echo('group:group');
+			break;
 
 				case 'question':
 						$subtype = elgg_echo('questions:edit:question:title');
 						break;
 
 				case 'answer':
-				    $subtype = elgg_echo('questions:search:answer:title');
-				    break;
-    }
+					$subtype = elgg_echo('questions:search:answer:title');
+					break;
+	}
 
-    return $subtype;
+	return $subtype;
 }
 
 /*
@@ -1924,21 +1924,21 @@ 
  */
 function embed_discussion_river($desc){
 
-    $patterns = array('#(((https://)?)|(^./))(((www.)?)|(^./))youtube\.com/watch[?]v=([^\[\]()<.,\s\n\t\r]+)#i'
+	$patterns = array('#(((https://)?)|(^./))(((www.)?)|(^./))youtube\.com/watch[?]v=([^\[\]()<.,\s\n\t\r]+)#i'
 						,'#(((https://)?)|(^./))(((www.)?)|(^./))youtu\.be/([^\[\]()<.,\s\n\t\r]+)#i'
 						,'/(https:\/\/)?(www\.)?(vimeo\.com\/groups)(.*)(\/videos\/)([0-9]*)(\/)?/'
 						,'/(https:\/\/)(www\.)?(metacafe\.com\/watch\/)([0-9a-zA-Z_-]*)(\/[0-9a-zA-Z_-]*)(\/)/'
 						 ,'/(https:\/\/)?(www\.)?(vimeo.com\/)([^a-zA-Z][0-9]*)(\/)?/','/(https:\/\/)?(www\.)?(dailymotion.com\/video)([^a-zA-Z][0-9]*)(\/)?/');
 
-    //Replace video providers with embebed content
-    foreach($patterns as $pattern){
-	    if(preg_match_all($pattern, $desc, $matches)){
+	//Replace video providers with embebed content
+	foreach($patterns as $pattern){
+		if(preg_match_all($pattern, $desc, $matches)){
 
-            $strAndPara = $matches[0];
+			$strAndPara = $matches[0];
 
-	    }
-    }
-    return $strAndPara;
+		}
+	}
+	return $strAndPara;
 
 }
 

Spacing +132 added lines, -132 removed lines

@@ -5,24 +5,24 @@ 
  * @package wet4Theme
  */
 
-elgg_register_event_handler('init','system','wet4_theme_init');
+elgg_register_event_handler('init', 'system', 'wet4_theme_init');
 
 function wet4_theme_init() {
 
 	/* cyu - global change to sidebars, display when it is not the crawler
 	 * the following batch of elgg_extend_view overwrites the elements in the page
 	 */
-	elgg_extend_view('page/elements/sidebar','page/elements/gsa_view_start',1);
-	elgg_extend_view('page/elements/sidebar','page/elements/gsa_view_end',1000);
+	elgg_extend_view('page/elements/sidebar', 'page/elements/gsa_view_start', 1);
+	elgg_extend_view('page/elements/sidebar', 'page/elements/gsa_view_end', 1000);
 
-	elgg_extend_view('page/elements/footer','page/elements/gsa_view_start',1);
-	elgg_extend_view('page/elements/footer','page/elements/gsa_view_end',1000);
+	elgg_extend_view('page/elements/footer', 'page/elements/gsa_view_start', 1);
+	elgg_extend_view('page/elements/footer', 'page/elements/gsa_view_end', 1000);
 
-	elgg_extend_view('navigation/breadcrumbs','page/elements/gsa_view_start',1);
-	elgg_extend_view('navigation/breadcrumbs','page/elements/gsa_view_end',1000);
+	elgg_extend_view('navigation/breadcrumbs', 'page/elements/gsa_view_start', 1);
+	elgg_extend_view('navigation/breadcrumbs', 'page/elements/gsa_view_end', 1000);
 
-	elgg_extend_view('object/widget/elements/content','page/elements/gsa_view_start',1);
-	elgg_extend_view('object/widget/elements/content','page/elements/gsa_view_end',1000);
+	elgg_extend_view('object/widget/elements/content', 'page/elements/gsa_view_start', 1);
+	elgg_extend_view('object/widget/elements/content', 'page/elements/gsa_view_end', 1000);
 
     // cyu - are we overriding the settings page handler? (note: the one in this plugin does nothing)
     elgg_unregister_page_handler('settings');
@@ -61,7 +61,7 @@ 
     //elgg_register_plugin_hook_handler('register', 'menu:entity', 'wet4_delete_entity_menu', 400);
 
 		//questions modifications
-		elgg_register_action('object/question/save', elgg_get_plugins_path()."wet4/actions/object/question/save.php"); //add english/french toggle
+		elgg_register_action('object/question/save', elgg_get_plugins_path() . "wet4/actions/object/question/save.php"); //add english/french toggle
 		elgg_register_page_handler('questions', 'wet_questions_page_handler');
 		elgg_unregister_plugin_hook_handler('register', 'menu:filter', 'questions_filter_menu_handler');
 		elgg_register_plugin_hook_handler('register', 'menu:filter', 'wet_questions_filter_menu_handler');
@@ -128,8 +128,8 @@ 
 
 
 
-   elgg_extend_view("js/elgg","js/wet4/language_ajax");
-   elgg_extend_view("js/elgg","js/wet4/rotate_ajax");
+   elgg_extend_view("js/elgg", "js/wet4/language_ajax");
+   elgg_extend_view("js/elgg", "js/wet4/rotate_ajax");
 
 		//Notification / Messages dropdown view
 		elgg_register_ajax_view('ajax/notif_dd');
@@ -146,7 +146,7 @@ 
     //added since goups didnt have this action but called it
     elgg_register_action("discussion_reply/delete", elgg_get_plugins_path() . "/wet4/actions/discussion/reply/delete.php");
 
-    if(elgg_is_active_plugin('au_subgroups')){
+    if (elgg_is_active_plugin('au_subgroups')) {
         elgg_register_action("groups/invite", elgg_get_plugins_path() . "/wet4/actions/groups/invite.php");
     }
  elgg_register_action("comment/join", elgg_get_plugins_path() . "groups/actions/groups/membership/join.php");
@@ -174,12 +174,12 @@ 
     // new widgets
     //registering wet 4 activity widget
 
-    elgg_register_widget_type('suggested_friends', elgg_echo('sf:suggcolleagues'), elgg_echo('sf:suggcolleagues'), array('custom_index_widgets'),false);
-    elgg_register_widget_type('feature_tour', 'feature_tour', 'feature_tour', array('custom_index_widgets'),false);
+    elgg_register_widget_type('suggested_friends', elgg_echo('sf:suggcolleagues'), elgg_echo('sf:suggcolleagues'), array('custom_index_widgets'), false);
+    elgg_register_widget_type('feature_tour', 'feature_tour', 'feature_tour', array('custom_index_widgets'), false);
 
     //WET my groups widget
-    elgg_register_widget_type('wet_mygroups_index', $mygroups_title, 'My Groups Index', array('custom_index_widgets'),true);
-    elgg_register_widget_type('most_liked', elgg_echo('activity:module:weekly_likes'), elgg_echo('activity:module:weekly_likes'), array('dashboard','custom_index_widgets'),true);
+    elgg_register_widget_type('wet_mygroups_index', $mygroups_title, 'My Groups Index', array('custom_index_widgets'), true);
+    elgg_register_widget_type('most_liked', elgg_echo('activity:module:weekly_likes'), elgg_echo('activity:module:weekly_likes'), array('dashboard', 'custom_index_widgets'), true);
 
 
     //Temp fix for river widget
@@ -201,9 +201,9 @@ 
 
 
     //set up metadata for user's landing page preference
-    if(elgg_is_logged_in()){
+    if (elgg_is_logged_in()) {
         $user = elgg_get_logged_in_user_entity();
-        if(!isset($user->landingpage)){
+        if (!isset($user->landingpage)) {
             $user->landingpage = 'news';
         }
     }
@@ -224,14 +224,14 @@ 
     ));
 
 		//newsfeed-like department pages
-		if(elgg_is_logged_in() && elgg_get_plugin_setting('deptActivity', 'wet4')){
+		if (elgg_is_logged_in() && elgg_get_plugin_setting('deptActivity', 'wet4')) {
 
 			elgg_register_ajax_view('ajax/deptactivity_check');
 			elgg_register_ajax_view('ajax/deptactivity_items');
 
 			elgg_register_page_handler('department', 'department_page_handler');
 
-			if(elgg_is_active_plugin('gc_newsfeed')){
+			if (elgg_is_active_plugin('gc_newsfeed')) {
 				elgg_extend_view('widgets/stream_newsfeed_index/content', 'dept_activity/tabs', 451);
 		    elgg_extend_view('widgets/newsfeed/content', 'dept_activity/tabs', 451);
 			}
@@ -244,7 +244,7 @@ 
 $dbprefix = elgg_get_config('dbprefix');
     // user default access if enabled
     if ($CONFIG->remove_logged_in) {
-    $query = "UPDATE {$dbprefix}entities SET access_id = 2 WHERE access_id = 1";//change access logged in to public
+    $query = "UPDATE {$dbprefix}entities SET access_id = 2 WHERE access_id = 1"; //change access logged in to public
     update_data($query);
 }
 
@@ -317,7 +317,7 @@ 
  * activity_page_handler
  * Override activity page handler
  */
-function activity_page_handler($page){
+function activity_page_handler($page) {
     elgg_set_page_owner_guid(elgg_get_logged_in_user_guid());
 
     // make a URL segment available in page handler script
@@ -333,7 +333,7 @@ 
         }
     }
     set_input('page_type', $page_type);
-    @include (dirname ( __FILE__ ) . "/pages/river.php");
+    @include (dirname(__FILE__) . "/pages/river.php");
     return true;
 }
 
@@ -444,7 +444,7 @@ 
         $context = elgg_get_context();
         $page_owner = elgg_get_page_owner_entity();
 
-        if(elgg_is_logged_in()){
+        if (elgg_is_logged_in()) {
             $user = elgg_get_logged_in_user_guid();
         }
 
@@ -462,7 +462,7 @@ 
                 $count = elgg_get_entities_from_relationship($options);
                 $extra = "";
                 if (!empty($count)) {
-                    if($count >= 10){
+                    if ($count >= 10) {
                         //$count = '9+';
                     }
                     $extra = '<span aria-hidden="true" class="notif-badge">' . $count . '</span>';
@@ -482,7 +482,7 @@ 
             }
         }
 
-        if(elgg_in_context('messages')){
+        if (elgg_in_context('messages')) {
                 elgg_unregister_menu_item("page", "friend_request");
             }
 
@@ -549,15 +549,15 @@ 
             $countTitle = $count;
 
             //display 9+ instead of huge numbers in notif badge
-            if($count >= 10){
+            if ($count >= 10) {
                 $count = '9+';
             }
 
 			$params = array(
 				"name" => "Colleagues",
 				"href" => "friends/" . $user->username,
-				"text" => '<i class="fa fa-users mrgn-rght-sm mrgn-tp-sm fa-lg"></i><span class="hidden-xs">'. elgg_echo("friends") . "</span><span class='notif-badge'>" . $count . "</span>",
-				"title" => elgg_echo('userMenu:colleagues') . ' - ' . $countTitle . ' ' . elgg_echo('friend_request') .'(s)',
+				"text" => '<i class="fa fa-users mrgn-rght-sm mrgn-tp-sm fa-lg"></i><span class="hidden-xs">' . elgg_echo("friends") . "</span><span class='notif-badge'>" . $count . "</span>",
+				"title" => elgg_echo('userMenu:colleagues') . ' - ' . $countTitle . ' ' . elgg_echo('friend_request') . '(s)',
         "class" => '',
         'item_class' => '',
 				'priority' => '1'
@@ -573,7 +573,7 @@ 
 				"name" => "friends",
 				"href" => "friends/" . $user->username,
 				"text" => elgg_echo("friends") . "<span class='badge'>" . $count . "</span>",
-				"title" => elgg_echo('friends') . ' - Requests(' . $count .')',
+				"title" => elgg_echo('friends') . ' - Requests(' . $count . ')',
         "class" => 'friend-icon',
 			);
 
@@ -592,7 +592,7 @@ 
 		}
 
     $item = elgg_get_menu_item('entity', 'delete');
-		if ($item){
+		if ($item) {
     	echo '<div> What that mean?</div>';
     }
 
@@ -600,7 +600,7 @@ 
 			$params = array(
 				'name' => 'invite',
 				'text' => elgg_echo('friends:invite'),
-				'href' => "invite/". $user->username,
+				'href' => "invite/" . $user->username,
 				'contexts' => array('friends'),
         'priority' => 300,
 			);
@@ -610,9 +610,9 @@ 
 
     //new folder button for files
 
-    if(elgg_is_logged_in()){
+    if (elgg_is_logged_in()) {
         $user = elgg_get_logged_in_user_entity();
-        if($user->canEdit()){
+        if ($user->canEdit()) {
             $params = array(
                 'name' => 'new_folder',
                 'text' => elgg_echo("file_tools:new:title"),
@@ -667,20 +667,20 @@ 
 	$entContext = $entity->getType();
 
 	//check if entity is an object or group
-	if($entContext == 'object'){
+	if ($entContext == 'object') {
 
 		//find subtype
 		$contentType = $entity->getSubtype();
 		//convert subtype into plain language
-		$entContext =  proper_subtypes($contentType);//$entity->getSubtype();
+		$entContext = proper_subtypes($contentType); //$entity->getSubtype();
 
 		//check to see if entity is one f the entities with a title
-		if(!in_array($entity->getSubtype(), array('comment', 'discussion_reply', 'thewire'))){
+		if (!in_array($entity->getSubtype(), array('comment', 'discussion_reply', 'thewire'))) {
 
 
-			if($entity->title3){
+			if ($entity->title3) {
 					$entName = gc_explode_translation($entity->title3, $lang);
-			}else{
+			} else {
 					$entName = $entity->title;
 			}
 
@@ -689,12 +689,12 @@ 
 			$entName = $entity->getOwnerEntity()->name;
 		}
 
-	} else if($entContext == 'group'){
+	} else if ($entContext == 'group') {
 			$contentType = 'group';
 			$entContext = elgg_echo('group');
-			if($entity->title3){
+			if ($entity->title3) {
 					$entName = gc_explode_translation($entity->title3, $lang);
-			}else{
+			} else {
 					$entName = $entity->name;
 			}
 
@@ -710,7 +710,7 @@ 
 		$return[] = ElggMenuItem::factory(array(
 			'name' => 'likes',
 			'href' => elgg_add_action_tokens_to_url("/action/likes/add?guid={$entity->guid}"),
-			'text' => '<i class="fa fa-thumbs-up fa-lg icon-unsel"></i><span class="wb-inv">'.$hiddenText['like'].'</span>',
+			'text' => '<i class="fa fa-thumbs-up fa-lg icon-unsel"></i><span class="wb-inv">' . $hiddenText['like'] . '</span>',
 			'title' => elgg_echo('likes:likethis') . ' ' . $entContext,
 			'item_class' => $hasLiked ? 'hidden' : '',
 			'priority' => 998,
@@ -718,7 +718,7 @@ 
 		$return[] = ElggMenuItem::factory(array(
 			'name' => 'unlike',
 			'href' => elgg_add_action_tokens_to_url("/action/likes/delete?guid={$entity->guid}"),
-			'text' => '<i class="fa fa-thumbs-up fa-lg icon-sel"></i><span class="wb-inv">'.$hiddenText['unlike'].'</span>',
+			'text' => '<i class="fa fa-thumbs-up fa-lg icon-sel"></i><span class="wb-inv">' . $hiddenText['unlike'] . '</span>',
 			'title' => elgg_echo('likes:remove') . ' ' . $entContext,
 			'item_class' => $hasLiked ? 'pad-rght-xs' : 'hidden',
 			'priority' => 998,
@@ -748,7 +748,7 @@ 
  */
 function wet4_elgg_page_menu_setup($hook, $type, $return, $params) {
 
-    if(elgg_in_context('settings')){
+    if (elgg_in_context('settings')) {
 
         $user = elgg_get_page_owner_entity();
 
@@ -804,9 +804,9 @@ 
         return $returnvalue;
     }
 
-		if($entity->title3){
+		if ($entity->title3) {
 				$entName = gc_explode_translation($entity->title3, $lang);
-		}else{
+		} else {
 				$entName = $entity->title;
 		}
 
@@ -863,7 +863,7 @@ 
 	$handler = elgg_extract('handler', $params, false);
 
     //Nick -Remove empty comment and reply links from river menu
-        foreach ($return as $key => $item){
+        foreach ($return as $key => $item) {
 
             switch ($item->getName()) {
                 case 'access':
@@ -881,20 +881,20 @@ 
     $entContext = $entity->getType();
 
 		//check if entity is an object or group
-		if($entContext == 'object'){
+		if ($entContext == 'object') {
 
 			//find subtype
 			$contentType = $entity->getSubtype();
 			//convert subtype into plain language
-			$entContext =  proper_subtypes($contentType);//$entity->getSubtype();
+			$entContext = proper_subtypes($contentType); //$entity->getSubtype();
 
 			//check to see if entity is one f the entities with a title
-			if(!in_array($entity->getSubtype(), array('comment', 'discussion_reply', 'thewire', 'answer'))){
+			if (!in_array($entity->getSubtype(), array('comment', 'discussion_reply', 'thewire', 'answer'))) {
 
 
-				if($entity->title3){
+				if ($entity->title3) {
 						$entName = gc_explode_translation($entity->title3, $lang);
-				}else{
+				} else {
 						$entName = $entity->title;
 				}
 
@@ -903,12 +903,12 @@ 
 				$entName = $entity->getOwnerEntity()->name;
 			}
 
-		} else if($entContext == 'group'){
+		} else if ($entContext == 'group') {
 				$contentType = 'group';
 				$entContext = elgg_echo('group');
-				if($entity->title3){
+				if ($entity->title3) {
 						$entName = gc_explode_translation($entity->title3, $lang);
-				}else{
+				} else {
 						$entName = $entity->name;
 				}
 
@@ -919,7 +919,7 @@ 
 
 
         $blocked_subtypes = array('comment', 'discussion_reply');
-        if(in_array($entity->getSubtype(), $blocked_subtypes) || elgg_instanceof($entity, 'user')){
+        if (in_array($entity->getSubtype(), $blocked_subtypes) || elgg_instanceof($entity, 'user')) {
 
             //do not let comments or discussion replies to be reshared on the wire
 
@@ -936,7 +936,7 @@ 
 
 			if ($count) {
 
-                if($count >=2){
+                if ($count >= 2) {
                     $share = elgg_echo('thewire:shares');
                 } else {
                     $share = elgg_echo('thewire:share');
@@ -959,12 +959,12 @@ 
 			}
 
 
-            if(elgg_is_logged_in()){
+            if (elgg_is_logged_in()) {
 
                 //reshare on the wire
                 $options = array(
                     'name' => 'thewire_tools_reshare',
-                    'text' => '<i class="fa fa-share-alt fa-lg icon-unsel"><span class="wb-inv">'.$hiddenText['share'].'</span></i>',
+                    'text' => '<i class="fa fa-share-alt fa-lg icon-unsel"><span class="wb-inv">' . $hiddenText['share'] . '</span></i>',
                     'title' => elgg_echo('thewire_tools:reshare'),
                     'href' => 'ajax/view/thewire_tools/reshare?reshare_guid=' . $entity->getGUID(),
                     'link_class' => 'elgg-lightbox',
@@ -989,10 +989,10 @@ 
         }
 
         //only show reply on the wire with logged in user
-        if($entity->getSubtype() == 'thewire' && elgg_is_logged_in()){
+        if ($entity->getSubtype() == 'thewire' && elgg_is_logged_in()) {
             $options = array(
                 'name' => 'reply',
-                'text' => '<i class="fa fa-reply fa-lg icon-unsel"><span class="wb-inv">'.$hiddenText['reply'].'</span></i>',
+                'text' => '<i class="fa fa-reply fa-lg icon-unsel"><span class="wb-inv">' . $hiddenText['reply'] . '</span></i>',
                 'title' => elgg_echo('reply'),
                 'href' => 'ajax/view/thewire_tools/reply?guid=' . $entity->getGUID(),
                 'link_class' => 'elgg-lightbox',
@@ -1017,11 +1017,11 @@ 
 		// edit link
 
         //checks so the edit icon is not placed on incorrect entities
-        if($handler != 'group_operators'){
-            if($entity->getSubtype() != 'thewire'){
+        if ($handler != 'group_operators') {
+            if ($entity->getSubtype() != 'thewire') {
                 $options = array(
                     'name' => 'edit',
-                    'text' => '<i class="fa fa-edit fa-lg icon-unsel"><span class="wb-inv">'.$hiddenText['edit'].'</span></i>',
+                    'text' => '<i class="fa fa-edit fa-lg icon-unsel"><span class="wb-inv">' . $hiddenText['edit'] . '</span></i>',
                     'title' => elgg_echo('edit:this') . ' ' . $entContext,
                     'href' => "$handler/edit/{$entity->getGUID()}",
                     'priority' => 299,
@@ -1030,10 +1030,10 @@ 
             }
 		// delete link
 
-            if (elgg_is_logged_in()){
+            if (elgg_is_logged_in()) {
         		$options = array(
         			'name' => 'delete',
-        			'text' => '<i class="fa fa-trash-o fa-lg icon-unsel"><span class="wb-inv">'.$hiddenText['delete'].'</span></i>',
+        			'text' => '<i class="fa fa-trash-o fa-lg icon-unsel"><span class="wb-inv">' . $hiddenText['delete'] . '</span></i>',
         			'title' => elgg_echo('delete:this') . ' ' . $entContext,
         			'href' => "action/$handler/delete?guid={$entity->getGUID()}",
         			'confirm' => elgg_echo('deleteconfirm'),
@@ -1045,11 +1045,11 @@ 
 	}
 
 
-    if($entity->getSubType() == 'file'){
+    if ($entity->getSubType() == 'file') {
         // download link
 		$options = array(
 			'name' => 'download',
-			'text' => '<i class="fa fa-download fa-lg icon-unsel"><span class="wb-inv">'.$hiddenText['download'].'</span></i>',
+			'text' => '<i class="fa fa-download fa-lg icon-unsel"><span class="wb-inv">' . $hiddenText['download'] . '</span></i>',
 			'title' => 'Download File',
 			'href' => "file/download/{$entity->getGUID()}",
 			'priority' => 300,
@@ -1059,7 +1059,7 @@ 
     }
 
 
-    if($entity->getSubType() == 'page_top'){
+    if ($entity->getSubType() == 'page_top') {
                 //history icon
             $options = array(
                 'name' => 'history',
@@ -1075,7 +1075,7 @@ 
 if (elgg_instanceof($entity, "object", "groupforumtopic") && $entity->canEdit() && elgg_is_active_plugin('group_tools')) {
 				$return[] = ElggMenuItem::factory(array(
 					"name" => "status_change_open",
-					"text" => '<i class="fa fa-lock fa-lg icon-unsel"><span class="wb-inv">'.$hiddenText['unlock'].'</span></i>', //elgg_echo("open");,
+					"text" => '<i class="fa fa-lock fa-lg icon-unsel"><span class="wb-inv">' . $hiddenText['unlock'] . '</span></i>', //elgg_echo("open");,
 					"confirm" => elgg_echo("group_tools:discussion:confirm:open"),
 					"href" => "action/discussion/toggle_status?guid=" . $entity->getGUID(),
 					"is_trusted" => true,
@@ -1085,7 +1085,7 @@ 
 				));
 				$return[] = ElggMenuItem::factory(array(
 					"name" => "status_change_close",
-					"text" => '<i class="fa fa-unlock fa-lg icon-unsel"><span class="wb-inv">'.$hiddenText['lock'].'</span></i>', //elgg_echo("close");,
+					"text" => '<i class="fa fa-unlock fa-lg icon-unsel"><span class="wb-inv">' . $hiddenText['lock'] . '</span></i>', //elgg_echo("close");,
 					"confirm" => elgg_echo("group_tools:discussion:confirm:close"),
 					"href" => "action/discussion/toggle_status?guid=" . $entity->getGUID(),
 					"is_trusted" => true,
@@ -1101,7 +1101,7 @@ 
 				if (elgg_extract('full_view', $params, false) || ($entity instanceof ElggAnswer)) {
 					$options = array(
 						'name' => 'comments',
-						"text" => '<span class="fa fa-lg fa-comment icon-unsel"><span class="wb-inv">' . elgg_echo("entity:comment:link:".$entity->getSubtype(), array($entName)) . '</span></span>',
+						"text" => '<span class="fa fa-lg fa-comment icon-unsel"><span class="wb-inv">' . elgg_echo("entity:comment:link:" . $entity->getSubtype(), array($entName)) . '</span></span>',
 						"title" => elgg_echo("comment:this") . ' ' . $entContext,
 						'href' => "#comments-add-{$entity->getGUID()}",
 						'priority' => 288,
@@ -1133,11 +1133,11 @@ 
 	switch ($handler) {
 		case 'friends':
             //use the pages in our theme instead of the core pages
-			require($plugin_path ."wet4/pages/friends/index.php");
+			require($plugin_path . "wet4/pages/friends/index.php");
 			break;
 		case 'friendsof':
 
-			require($plugin_path ."wet4/pages/friends/of.php");
+			require($plugin_path . "wet4/pages/friends/of.php");
 			break;
 		default:
 			return false;
@@ -1149,7 +1149,7 @@ 
  * wet4_riverItem_remove
  * Remove unwanted river items
  */
-function wet4_riverItem_remove(){
+function wet4_riverItem_remove() {
     elgg_unregister_menu_item('river', 'comment');
     elgg_unregister_menu_item('river', 'reply');
 }
@@ -1157,7 +1157,7 @@ 
  * wet4_elgg_river_menu_setup
  * Override river menu to use font awesome icons + add accessability
  */
-function wet4_elgg_river_menu_setup($hook, $type, $return, $params){
+function wet4_elgg_river_menu_setup($hook, $type, $return, $params) {
    // $entity = $params['entity'];
 
 	if (elgg_is_logged_in()) {
@@ -1171,7 +1171,7 @@ 
 		return;
 	}
         //Nick -Remove empty comment and reply links from river menu
-        foreach ($return as $key => $item){
+        foreach ($return as $key => $item) {
 
             switch ($item->getName()) {
                 case 'comment':
@@ -1188,20 +1188,20 @@ 
 
 		$entContext = $object->getType();
 		//check if entity is an object or group
-		if($entContext == 'object'){
+		if ($entContext == 'object') {
 
 			//find subtype
 			$contentType = $object->getSubtype();
 			//convert subtype into plain language
-			$entContext =  proper_subtypes($contentType);
+			$entContext = proper_subtypes($contentType);
 
 			//check to see if entity is one f the entities with a title
-			if(!in_array($object->getSubtype(), array('comment', 'discussion_reply', 'thewire', 'answer'))){
+			if (!in_array($object->getSubtype(), array('comment', 'discussion_reply', 'thewire', 'answer'))) {
 
 
-				if($object->title3){
+				if ($object->title3) {
 						$entName = gc_explode_translation($object->title3, $lang);
-				}else{
+				} else {
 						$entName = $object->title;
 				}
 
@@ -1210,12 +1210,12 @@ 
 				$entName = $object->getOwnerEntity()->name;
 			}
 
-		} else if($entContext == 'group'){
+		} else if ($entContext == 'group') {
 				$contentType = 'group';
 				$entContext = elgg_echo('group');
-				if($object->title3){
+				if ($object->title3) {
 						$entName = gc_explode_translation($object->title3, $lang);
-				}else{
+				} else {
 						$entName = $object->name;
 				}
 
@@ -1224,7 +1224,7 @@ 
 		//pass type and entiey/owner name to function to return array of text
 		$hiddenText = generate_hidden_text($contentType, $entName);
 
-	if($entContext != 'user'){
+	if ($entContext != 'user') {
 
 		$hasLiked = \Elgg\Likes\DataService::instance()->currentUserLikesEntity($object->guid);
 
@@ -1232,7 +1232,7 @@ 
 		$return[] = ElggMenuItem::factory(array(
 			'name' => 'likes',
 			'href' => elgg_add_action_tokens_to_url("/action/likes/add?guid={$object->guid}"),
-			'text' => '<i class="fa fa-thumbs-up fa-lg icon-unsel"></i><span class="wb-inv">'.$hiddenText['like'].'</span>',
+			'text' => '<i class="fa fa-thumbs-up fa-lg icon-unsel"></i><span class="wb-inv">' . $hiddenText['like'] . '</span>',
 			'title' => elgg_echo('likes:likethis') . ' ' . $entContext,
 			'item_class' => $hasLiked ? 'hidden' : '',
 			'priority' => 100,
@@ -1240,7 +1240,7 @@ 
 		$return[] = ElggMenuItem::factory(array(
 			'name' => 'unlike',
 			'href' => elgg_add_action_tokens_to_url("/action/likes/delete?guid={$object->guid}"),
-			'text' => '<i class="fa fa-thumbs-up fa-lg icon-sel"></i><span class="wb-inv">'.$hiddenText['unlike'].'</span>',
+			'text' => '<i class="fa fa-thumbs-up fa-lg icon-sel"></i><span class="wb-inv">' . $hiddenText['unlike'] . '</span>',
 			'title' => elgg_echo('likes:remove') . ' ' . $entContext,
 			'item_class' => $hasLiked ? '' : 'hidden',
 			'priority' => 100,
@@ -1259,14 +1259,14 @@ 
 	}
 
            $blocked_subtypes = array('comment', 'discussion_reply');
-           if(in_array($object->getSubtype(), $blocked_subtypes) || elgg_instanceof($object, 'user')){
+           if (in_array($object->getSubtype(), $blocked_subtypes) || elgg_instanceof($object, 'user')) {
 
                //do not let comments or discussion replies to be reshared on the wire
 
            } else {
-               $return[]= ElggMenuItem::factory(array(
+               $return[] = ElggMenuItem::factory(array(
                    'name' => 'thewire_tools_reshare',
-                   'text' => '<i class="fa fa-share-alt fa-lg icon-unsel"><span class="wb-inv">'.$hiddenText['share'].'</span></i>',
+                   'text' => '<i class="fa fa-share-alt fa-lg icon-unsel"><span class="wb-inv">' . $hiddenText['share'] . '</span></i>',
                    'title' => elgg_echo('thewire_tools:reshare'),
                    'href' => 'ajax/view/thewire_tools/reshare?reshare_guid=' . $object->getGUID(),
                    'link_class' => 'elgg-lightbox',
@@ -1299,9 +1299,9 @@ 
  * my_filter_menu_handler
  * Rearrange filter menu for The Wire
  */
-function my_filter_menu_handler($hook, $type, $menu, $params){
-    foreach ($menu as $key => $item){
-        if(elgg_in_context('thewire')){
+function my_filter_menu_handler($hook, $type, $menu, $params) {
+    foreach ($menu as $key => $item) {
+        if (elgg_in_context('thewire')) {
         switch ($item->getName()) {
 
                 case 'all':
@@ -1330,14 +1330,14 @@ 
  * my_site_menu_handler
  * Set href of groups link depending if a logged in user is using site
  */
-function my_site_menu_handler($hook, $type, $menu, $params){
+function my_site_menu_handler($hook, $type, $menu, $params) {
 
     if (!is_array($menu))
         return;
 
     foreach ($menu as $key => $item) {
         if ($item->getName() === 'groups')
-            (elgg_is_logged_in()) ? $item->setHref(elgg_get_site_url().'groups/all?filter=yours') : $item->setHref( elgg_get_site_url().'groups/all?filter=popular');
+            (elgg_is_logged_in()) ? $item->setHref(elgg_get_site_url() . 'groups/all?filter=yours') : $item->setHref(elgg_get_site_url() . 'groups/all?filter=popular');
     }
 }
 
@@ -1345,7 +1345,7 @@ 
  * my_title_menu_handler
  * Add styles to phot album title menu
  */
-function my_title_menu_handler($hook, $type, $menu, $params){
+function my_title_menu_handler($hook, $type, $menu, $params) {
 
     if (!is_array($menu))
         return;
@@ -1365,7 +1365,7 @@ 
  * my_owner_block_handler
  * Override owner_block menu to become tabs in profile
  */
-function my_owner_block_handler($hook, $type, $menu, $params){
+function my_owner_block_handler($hook, $type, $menu, $params) {
 
     /*
      *
@@ -1376,12 +1376,12 @@ 
 
 
         //rearrange menu items
-    if(elgg_get_context() == 'profile'){
+    if (elgg_get_context() == 'profile') {
 
         elgg_unregister_menu_item('owner_block', 'activity');
 
         //turn owner_block  menu into tabs
-        foreach ($menu as $key => $item){
+        foreach ($menu as $key => $item) {
 
             switch ($item->getName()) {
                 case 'discussion':
@@ -1476,7 +1476,7 @@ 
  * river_handler
  * Remove comment menu item
  */
-function river_handler($hook, $type, $menu, $params){
+function river_handler($hook, $type, $menu, $params) {
 
 }
 
@@ -1525,7 +1525,7 @@ 
 
     $options = array(
 		'name' => 'collapse',
-		'text' => '<i class="fa fa-lg icon-unsel"><span class="wb-inv">'. elgg_echo('wet:collapseWidget', array($widget->getTitle())).'</span></i> ',
+		'text' => '<i class="fa fa-lg icon-unsel"><span class="wb-inv">' . elgg_echo('wet:collapseWidget', array($widget->getTitle())) . '</span></i> ',
         'title' => elgg_echo('wet:collapseWidget', array($widget->getTitle())),
 		'href' => "#elgg-widget-content-$widget->guid",
 		'link_class' => 'elgg-widget-collapse-button ',
@@ -1537,7 +1537,7 @@ 
 	if ($widget->canEdit()) {
 		$options = array(
 			'name' => 'delete',
-			'text' => '<i class="fa fa-trash-o fa-lg icon-unsel"><span class="wb-inv">'.elgg_echo('widget:delete', array($widget->getTitle())).'</span></i>',
+			'text' => '<i class="fa fa-trash-o fa-lg icon-unsel"><span class="wb-inv">' . elgg_echo('widget:delete', array($widget->getTitle())) . '</span></i>',
 			'title' => elgg_echo('widget:delete', array($widget->getTitle())),
 			'href' => "action/widgets/delete?widget_guid=$widget->guid&context=" . $widget->getContainerGUID(),
 			'is_action' => true,
@@ -1552,7 +1552,7 @@ 
 		if ($show_edit) {
 			$options = array(
 				'name' => 'settings',
-				'text' => '<i class="fa fa-cog fa-lg icon-unsel"><span class="wb-inv">'.elgg_echo('widget:edit', array($widget->getTitle())).'</span></i>',
+				'text' => '<i class="fa fa-cog fa-lg icon-unsel"><span class="wb-inv">' . elgg_echo('widget:edit', array($widget->getTitle())) . '</span></i>',
 				'title' => elgg_echo('widget:edit', array($widget->getTitle())),
 				'href' => "#widget-edit-$widget->guid",
 				'link_class' => "elgg-widget-edit-button",
@@ -1710,13 +1710,13 @@ 
 		//PHPlord let check for day, days, weeks and finally output date if too far away...
 		if ($diff == 1) {
 			$friendly_time = elgg_echo("friendlytime:days:singular", array($diff));
-		} else if(6 >= $diff){
+		} else if (6 >= $diff) {
 			$friendly_time = elgg_echo("friendlytime:days", array($diff));
-		} else if(13 >= $diff){
+		} else if (13 >= $diff) {
 			$friendly_time = elgg_echo("friendlytime:weeks:singular", array($diff));
-		} else if($diff == 14){
+		} else if ($diff == 14) {
 			$friendly_time = elgg_echo("friendlytime:weeks", array($diff));
-		} else{
+		} else {
 			$date_day = date('d', $params['time']);
 			$date_month = date('m', $params['time']);
 			$date_year = date('Y', $params['time']);
@@ -1743,7 +1743,7 @@ 
  * @param [string] [type] [<Entity subtype.>]
  * @return [string] [<Subtype>]
  */
-function proper_subtypes($type){
+function proper_subtypes($type) {
 
     switch ($type) {
         case 'page_top':
@@ -1831,20 +1831,20 @@ 
  * @param [string] [type] [<Entity subtype.>]
  * @return [array] [<Contains different text for each menu item>]
  */
-function generate_hidden_text($type, $name){
+function generate_hidden_text($type, $name) {
 
 	//create all unique menu items
 	switch ($type) {
 			case 'page_top':
-						$hiddenText['history'] = elgg_echo('entity:history:link:'.$type, array($name));
+						$hiddenText['history'] = elgg_echo('entity:history:link:' . $type, array($name));
 					break;
 
 			case 'page':
-						$hiddenText['history'] = elgg_echo('entity:history:link:'.$type, array($name));
+						$hiddenText['history'] = elgg_echo('entity:history:link:' . $type, array($name));
 					break;
 
 			case 'thewire':
-						$hiddenText['reply'] = elgg_echo('entity:reply:link:'.$type, array($name));
+						$hiddenText['reply'] = elgg_echo('entity:reply:link:' . $type, array($name));
 					break;
 
 			case 'blog':
@@ -1852,12 +1852,12 @@ 
 					break;
 
 			case 'comment':
-						$hiddenText['comment'] = elgg_echo('entity:comment:link:'.$type, array($name));
+						$hiddenText['comment'] = elgg_echo('entity:comment:link:' . $type, array($name));
 					break;
 
 			case 'groupforumtopic':
-						$hiddenText['lock'] = elgg_echo('entity:lock:link:'.$type, array($name));
-						$hiddenText['unlock'] = elgg_echo('entity:unlock:link:'.$type, array($name));
+						$hiddenText['lock'] = elgg_echo('entity:lock:link:' . $type, array($name));
+						$hiddenText['unlock'] = elgg_echo('entity:unlock:link:' . $type, array($name));
 					break;
 
 			case 'discussion_reply':
@@ -1865,7 +1865,7 @@ 
 					break;
 
 			case 'file':
-						$hiddenText['download'] = elgg_echo('entity:download:link:'.$type, array($name));
+						$hiddenText['download'] = elgg_echo('entity:download:link:' . $type, array($name));
 					break;
 
 			case 'folder':
@@ -1893,8 +1893,8 @@ 
 					break;
 
 			case 'idea':
-						$hiddenText['upvote'] = elgg_echo('entity:upvote:link:'.$type, array($name));
-						$hiddenText['downvote'] = elgg_echo('entity:downvote:link:'.$type, array($name));
+						$hiddenText['upvote'] = elgg_echo('entity:upvote:link:' . $type, array($name));
+						$hiddenText['downvote'] = elgg_echo('entity:downvote:link:' . $type, array($name));
 					break;
 
 			case 'groups':
@@ -1903,12 +1903,12 @@ 
 	}
 
 	//default menus that ever item has
-	$hiddenText['like'] = elgg_echo('entity:like:link:'.$type, array($name));
-	$hiddenText['unlike'] = elgg_echo('entity:unlike:link:'.$type, array($name));
-	$hiddenText['edit'] = elgg_echo('entity:edit:link:'.$type, array($name));
-	$hiddenText['delete'] = elgg_echo('entity:delete:link:'.$type, array($name));
-	$hiddenText['share'] = elgg_echo('entity:share:link:'.$type, array($name));
-  $hiddenText['subscribe'] = elgg_echo('entity:subscribe:link:'.$type, array($name));
+	$hiddenText['like'] = elgg_echo('entity:like:link:' . $type, array($name));
+	$hiddenText['unlike'] = elgg_echo('entity:unlike:link:' . $type, array($name));
+	$hiddenText['edit'] = elgg_echo('entity:edit:link:' . $type, array($name));
+	$hiddenText['delete'] = elgg_echo('entity:delete:link:' . $type, array($name));
+	$hiddenText['share'] = elgg_echo('entity:share:link:' . $type, array($name));
+  $hiddenText['subscribe'] = elgg_echo('entity:subscribe:link:' . $type, array($name));
 
 	return $hiddenText;
 }
@@ -1922,17 +1922,17 @@ 
  * @param [string] [desc] [<Preview text from the discussion.>]
  * @return [string] [<HTML to create embeded video>]
  */
-function embed_discussion_river($desc){
+function embed_discussion_river($desc) {
 
     $patterns = array('#(((https://)?)|(^./))(((www.)?)|(^./))youtube\.com/watch[?]v=([^\[\]()<.,\s\n\t\r]+)#i'
 						,'#(((https://)?)|(^./))(((www.)?)|(^./))youtu\.be/([^\[\]()<.,\s\n\t\r]+)#i'
 						,'/(https:\/\/)?(www\.)?(vimeo\.com\/groups)(.*)(\/videos\/)([0-9]*)(\/)?/'
 						,'/(https:\/\/)(www\.)?(metacafe\.com\/watch\/)([0-9a-zA-Z_-]*)(\/[0-9a-zA-Z_-]*)(\/)/'
-						 ,'/(https:\/\/)?(www\.)?(vimeo.com\/)([^a-zA-Z][0-9]*)(\/)?/','/(https:\/\/)?(www\.)?(dailymotion.com\/video)([^a-zA-Z][0-9]*)(\/)?/');
+						 ,'/(https:\/\/)?(www\.)?(vimeo.com\/)([^a-zA-Z][0-9]*)(\/)?/', '/(https:\/\/)?(www\.)?(dailymotion.com\/video)([^a-zA-Z][0-9]*)(\/)?/');
 
     //Replace video providers with embebed content
-    foreach($patterns as $pattern){
-	    if(preg_match_all($pattern, $desc, $matches)){
+    foreach ($patterns as $pattern) {
+	    if (preg_match_all($pattern, $desc, $matches)) {
 
             $strAndPara = $matches[0];
 
@@ -1949,7 +1949,7 @@ 
 function login_as_add_user_menu_link() {
 	$item = elgg_get_menu_item('topbar', 'login_as_return');
 
-	if(isset($item)){
+	if (isset($item)) {
 			$item->addLinkClass('no-style-link');
 			$item->addItemClass('login-as-out');
 		elgg_register_menu_item('user_menu', $item);

Braces +21 added lines, -17 removed lines

@@ -680,7 +680,7 @@ 
 
 			if($entity->title3){
 					$entName = gc_explode_translation($entity->title3, $lang);
-			}else{
+			} else{
 					$entName = $entity->title;
 			}
 
@@ -694,7 +694,7 @@ 
 			$entContext = elgg_echo('group');
 			if($entity->title3){
 					$entName = gc_explode_translation($entity->title3, $lang);
-			}else{
+			} else{
 					$entName = $entity->name;
 			}
 
@@ -806,7 +806,7 @@ 
 
 		if($entity->title3){
 				$entName = gc_explode_translation($entity->title3, $lang);
-		}else{
+		} else{
 				$entName = $entity->title;
 		}
 
@@ -894,7 +894,7 @@ 
 
 				if($entity->title3){
 						$entName = gc_explode_translation($entity->title3, $lang);
-				}else{
+				} else{
 						$entName = $entity->title;
 				}
 
@@ -908,7 +908,7 @@ 
 				$entContext = elgg_echo('group');
 				if($entity->title3){
 						$entName = gc_explode_translation($entity->title3, $lang);
-				}else{
+				} else{
 						$entName = $entity->name;
 				}
 
@@ -1201,7 +1201,7 @@ 
 
 				if($object->title3){
 						$entName = gc_explode_translation($object->title3, $lang);
-				}else{
+				} else{
 						$entName = $object->title;
 				}
 
@@ -1215,7 +1215,7 @@ 
 				$entContext = elgg_echo('group');
 				if($object->title3){
 						$entName = gc_explode_translation($object->title3, $lang);
-				}else{
+				} else{
 						$entName = $object->name;
 				}
 
@@ -1332,12 +1332,14 @@ 
  */
 function my_site_menu_handler($hook, $type, $menu, $params){
 
-    if (!is_array($menu))
-        return;
+    if (!is_array($menu)) {
+            return;
+    }
 
     foreach ($menu as $key => $item) {
-        if ($item->getName() === 'groups')
-            (elgg_is_logged_in()) ? $item->setHref(elgg_get_site_url().'groups/all?filter=yours') : $item->setHref( elgg_get_site_url().'groups/all?filter=popular');
+        if ($item->getName() === 'groups') {
+                    (elgg_is_logged_in()) ? $item->setHref(elgg_get_site_url().'groups/all?filter=yours') : $item->setHref( elgg_get_site_url().'groups/all?filter=popular');
+        }
     }
 }
 
@@ -1347,15 +1349,17 @@ 
  */
 function my_title_menu_handler($hook, $type, $menu, $params){
 
-    if (!is_array($menu))
-        return;
+    if (!is_array($menu)) {
+            return;
+    }
 
     foreach ($menu as $key => $item) {
 
-        if ($item->getName() === 'slideshow')
-            $item->setText(elgg_echo('album:slideshow'));
-        elseif ($item->getName() === 'addphotos')
-            $item->setItemClass('mrgn-rght-sm');
+        if ($item->getName() === 'slideshow') {
+                    $item->setText(elgg_echo('album:slideshow'));
+        } elseif ($item->getName() === 'addphotos') {
+                    $item->setItemClass('mrgn-rght-sm');
+        }
 
     }
 

mod/wet4/views/default/au_subgroups/sidebar/subgroups.php

Indentation +4 added lines, -4 removed lines

@@ -33,9 +33,9 @@ 
 		);
 	}
 
-    //count total number of subgroups and add it to view all link
-    $subgroupsTotalCount = get_subgroups($vars['entity']);
-    $sgCount = '(' . count($subgroupsTotalCount) . ')';
+	//count total number of subgroups and add it to view all link
+	$subgroupsTotalCount = get_subgroups($vars['entity']);
+	$sgCount = '(' . count($subgroupsTotalCount) . ')';
 }
 
 $title = elgg_echo('au_subgroups:subgroups');
@@ -50,5 +50,5 @@ 
 
 //only show subgroups widget if the group has subgroups
 if($sgCount){
-    echo elgg_view_module('aside', $title, $body, array('footer' => $footer,));
+	echo elgg_view_module('aside', $title, $body, array('footer' => $footer,));
 }

Spacing +2 added lines, -2 removed lines

@@ -22,7 +22,7 @@ 
 	foreach ($subgroups as $subgroup) {
 
 		
-			$subgroup_name = gc_explode_translation( $subgroup->title, $lang);
+			$subgroup_name = gc_explode_translation($subgroup->title, $lang);
 
 
 		$body .= elgg_view_image_block(
@@ -49,6 +49,6 @@ 
 $footer = "<div class='text-right'>$all_link</div>";
 
 //only show subgroups widget if the group has subgroups
-if($sgCount){
+if ($sgCount) {
     echo elgg_view_module('aside', $title, $body, array('footer' => $footer,));
 }