gctools-outilsgc / gcconnex

mod/wet4/lib/groups_autocomplete.php

Spacing +7 added lines, -7 removed lines

@@ -14,14 +14,14 @@ 
 	$user = elgg_get_logged_in_user_entity();
 	$lang = get_current_language();
 
-	if(!empty($q)){
+	if (!empty($q)) {
 		$db_prefix = elgg_get_config('dbprefix');
 		$params['type'] = 'group';
 		$params['limit'] = $limit;
-		if (strlen($q) <=3) {
+		if (strlen($q) <= 3) {
 			$params['query'] = $q;
 		} else {
-			$params['query'] = '*'.$q.'*';
+			$params['query'] = '*' . $q . '*';
 		}
 		$join = "JOIN {$db_prefix}groups_entity ge ON e.guid = ge.guid";
 		$params['joins'] = array($join);
@@ -32,12 +32,12 @@ 
 		$params['subtype'] = ELGG_ENTITIES_ANY_VALUE;
 		//$params['count'] = TRUE;
 		$groups = elgg_get_entities($params);
-		foreach($groups as $group){
+		foreach ($groups as $group) {
 			//if (! $group->isMember($user)) {
-				if (! $group->isPublicMembership()) {
-					$result[] = array("type" => "group", "value" => $group->getGUID(),"label" => $group->name,"content" => "<a class=' text-unstyled ' href='".$group->getURL()."'><img class='mrgn-rght-sm' src='" . $group->getIconURL("small") . "' /><span>" . gc_explode_translation($group->name,$lang) . "</span></a>", "name" => $group->name);
+				if (!$group->isPublicMembership()) {
+					$result[] = array("type" => "group", "value" => $group->getGUID(), "label" => $group->name, "content" => "<a class=' text-unstyled ' href='" . $group->getURL() . "'><img class='mrgn-rght-sm' src='" . $group->getIconURL("small") . "' /><span>" . gc_explode_translation($group->name, $lang) . "</span></a>", "name" => $group->name);
 				} else {
-					$result[] = array("type" => "group", "value" => $group->getGUID(),"label" => $group->name,"content" => "<a class=' text-unstyled ' href='".$group->getURL()."'><img class='mrgn-rght-sm' src='" . $group->getIconURL("small") . "' /><span>" . gc_explode_translation($group->name,$lang)."</span></a>", "name" => $group->name);
+					$result[] = array("type" => "group", "value" => $group->getGUID(), "label" => $group->name, "content" => "<a class=' text-unstyled ' href='" . $group->getURL() . "'><img class='mrgn-rght-sm' src='" . $group->getIconURL("small") . "' /><span>" . gc_explode_translation($group->name, $lang) . "</span></a>", "name" => $group->name);
 				}
 			//}
 		}

mod/wet4/lib/user_settings.php

Indentation +2 added lines, -2 removed lines

@@ -339,13 +339,13 @@
 			'text' => elgg_echo('notifications:subscriptions:changesettings'),
 			'href' => "notifications/personal/{$user->username}",
 			'section' => "configure",
-            );
+			);
     
 		elgg_register_menu_item('page', $params);
 		
 		if (elgg_is_active_plugin('groups')) {
 			$params = array(
-            'name' => '2_group_notify',
+			'name' => '2_group_notify',
 			'text' => elgg_echo('notifications:subscriptions:changesettings:groups'),
 			'href' => "notifications/group/{$user->username}",
 			'section' => "configure",

Spacing +1 added lines, -1 removed lines

@@ -178,7 +178,7 @@
 		$domain_addr = explode('.', $dom);
 		$domain_len = count($domain_addr) - 1;
 
-		if ($domain_addr[$domain_len - 1].'.'.$domain_addr[$domain_len] === 'gc.ca')
+		if ($domain_addr[$domain_len - 1] . '.' . $domain_addr[$domain_len] === 'gc.ca')
 		{
 			//elgg_log('cyu - domain:'.$dom. ' this is a valid domain', 'NOTICE');
 			$isNotValid = false;

mod/wet4/lib/translate_display.php

Indentation +68 added lines, -68 removed lines

@@ -13,91 +13,91 @@
 
  ***********************************************************************/
  /**
- * GCconnex combine English and French text into one string
- *
- *
- * @uses string    $english_txt            English text
- * @uses string  $french_txt          French Text
- *
- */
+  * GCconnex combine English and French text into one string
+  *
+  *
+  * @uses string    $english_txt            English text
+  * @uses string  $french_txt          French Text
+  *
+  */
 function gc_implode_translation($english_txt,$french_txt)
 {
-    $value = json_encode( array( "en" => $english_txt, "fr" => $french_txt ) );
+	$value = json_encode( array( "en" => $english_txt, "fr" => $french_txt ) );
 
-    return $value;
+	return $value;
 }
 
 function gc_explode_translation($imploded_txt, $lang)
 {
-    $json=json_decode($imploded_txt);
+	$json=json_decode($imploded_txt);
 
-    if( isset($json->en) || isset($json->fr) ){
-        if( $lang == 'en' && trim($json->en) != ''){
-            $value=$json->en;
-        }
-        else if( $lang == 'fr' && trim($json->fr) != ''){
-            $value=$json->fr;
-        }
-        else
-        {
-            if( ($lang=='fr') && trim($json->fr) == '' ){
-                $value=$json->en;
-            }
-            else if( ($lang=='en') && trim($json->en) == '' ){
-                $value=$json->fr;
-            }
-        }
-    }
-    else
-    {
-        $value=$imploded_txt;
-    }
+	if( isset($json->en) || isset($json->fr) ){
+		if( $lang == 'en' && trim($json->en) != ''){
+			$value=$json->en;
+		}
+		else if( $lang == 'fr' && trim($json->fr) != ''){
+			$value=$json->fr;
+		}
+		else
+		{
+			if( ($lang=='fr') && trim($json->fr) == '' ){
+				$value=$json->en;
+			}
+			else if( ($lang=='en') && trim($json->en) == '' ){
+				$value=$json->fr;
+			}
+		}
+	}
+	else
+	{
+		$value=$imploded_txt;
+	}
 
-    return $value;
+	return $value;
 }
 
 function old_gc_explode_translation($imploded_txt, $lang)
 {
-    $text_ar=explode('[:',$imploded_txt);
-    $en='';
-    $fr='';
-    if(count($text_ar)>0){
-        foreach($text_ar as $value){
-            if(strpos($value, "en]")!==false){
-                $en=substr($value,3,strlen($value));
-            }
-            elseif(strpos($value, "fr]")!==false)
-            {
-                $fr=substr($value,3,strlen($value));
-            }
-        }
-        if($lang=='en' && trim($en)<>''){
-            $value=$en;
-        }
-        elseif($lang=='fr' && trim($fr)<>''){
-            $value=$fr;
-        }
-        else
-        {
-            if(($lang=='fr') && (!$fr)){
-       /*         $value=$fr;
+	$text_ar=explode('[:',$imploded_txt);
+	$en='';
+	$fr='';
+	if(count($text_ar)>0){
+		foreach($text_ar as $value){
+			if(strpos($value, "en]")!==false){
+				$en=substr($value,3,strlen($value));
+			}
+			elseif(strpos($value, "fr]")!==false)
+			{
+				$fr=substr($value,3,strlen($value));
+			}
+		}
+		if($lang=='en' && trim($en)<>''){
+			$value=$en;
+		}
+		elseif($lang=='fr' && trim($fr)<>''){
+			$value=$fr;
+		}
+		else
+		{
+			if(($lang=='fr') && (!$fr)){
+	   /*         $value=$fr;
             }else{*/
-                $value="";      // for migration we want to maintain these as is
-            }
+				$value="";      // for migration we want to maintain these as is
+			}
 
-             if(($lang=='en') && (!$en)){
-      /*          $value=$en;
+			 if(($lang=='en') && (!$en)){
+	  /*          $value=$en;
             }else{*/
-                $value="";      // for migration we want to maintain these as is
-            }
+				$value="";      // for migration we want to maintain these as is
+			}
 
-        }
-    }
-    else
-    {
-        $value=$imploded_txt;
-    }
-    return $value;
+		}
+	}
+	else
+	{
+		$value=$imploded_txt;
+	}
+	return $value;
 
 }
 ?>
\ No newline at end of file

Spacing +31 added lines, -31 removed lines

@@ -20,37 +20,37 @@ 
  * @uses string  $french_txt          French Text
  *
  */
-function gc_implode_translation($english_txt,$french_txt)
+function gc_implode_translation($english_txt, $french_txt)
 {
-    $value = json_encode( array( "en" => $english_txt, "fr" => $french_txt ) );
+    $value = json_encode(array("en" => $english_txt, "fr" => $french_txt));
 
     return $value;
 }
 
 function gc_explode_translation($imploded_txt, $lang)
 {
-    $json=json_decode($imploded_txt);
+    $json = json_decode($imploded_txt);
 
-    if( isset($json->en) || isset($json->fr) ){
-        if( $lang == 'en' && trim($json->en) != ''){
-            $value=$json->en;
+    if (isset($json->en) || isset($json->fr)) {
+        if ($lang == 'en' && trim($json->en) != '') {
+            $value = $json->en;
         }
-        else if( $lang == 'fr' && trim($json->fr) != ''){
-            $value=$json->fr;
+        else if ($lang == 'fr' && trim($json->fr) != '') {
+            $value = $json->fr;
         }
         else
         {
-            if( ($lang=='fr') && trim($json->fr) == '' ){
-                $value=$json->en;
+            if (($lang == 'fr') && trim($json->fr) == '') {
+                $value = $json->en;
             }
-            else if( ($lang=='en') && trim($json->en) == '' ){
-                $value=$json->fr;
+            else if (($lang == 'en') && trim($json->en) == '') {
+                $value = $json->fr;
             }
         }
     }
     else
     {
-        $value=$imploded_txt;
+        $value = $imploded_txt;
     }
 
     return $value;
@@ -58,44 +58,44 @@ 
 
 function old_gc_explode_translation($imploded_txt, $lang)
 {
-    $text_ar=explode('[:',$imploded_txt);
-    $en='';
-    $fr='';
-    if(count($text_ar)>0){
-        foreach($text_ar as $value){
-            if(strpos($value, "en]")!==false){
-                $en=substr($value,3,strlen($value));
+    $text_ar = explode('[:', $imploded_txt);
+    $en = '';
+    $fr = '';
+    if (count($text_ar) > 0) {
+        foreach ($text_ar as $value) {
+            if (strpos($value, "en]") !== false) {
+                $en = substr($value, 3, strlen($value));
             }
-            elseif(strpos($value, "fr]")!==false)
+            elseif (strpos($value, "fr]") !== false)
             {
-                $fr=substr($value,3,strlen($value));
+                $fr = substr($value, 3, strlen($value));
             }
         }
-        if($lang=='en' && trim($en)<>''){
-            $value=$en;
+        if ($lang == 'en' && trim($en) <> '') {
+            $value = $en;
         }
-        elseif($lang=='fr' && trim($fr)<>''){
-            $value=$fr;
+        elseif ($lang == 'fr' && trim($fr) <> '') {
+            $value = $fr;
         }
         else
         {
-            if(($lang=='fr') && (!$fr)){
+            if (($lang == 'fr') && (!$fr)) {
        /*         $value=$fr;
             }else{*/
-                $value="";      // for migration we want to maintain these as is
+                $value = ""; // for migration we want to maintain these as is
             }
 
-             if(($lang=='en') && (!$en)){
+             if (($lang == 'en') && (!$en)) {
       /*          $value=$en;
             }else{*/
-                $value="";      // for migration we want to maintain these as is
+                $value = ""; // for migration we want to maintain these as is
             }
 
         }
     }
     else
     {
-        $value=$imploded_txt;
+        $value = $imploded_txt;
     }
     return $value;
 

Braces +8 added lines, -16 removed lines

@@ -34,21 +34,17 @@ 
     if( isset($json->en) || isset($json->fr) ){
         if( $lang == 'en' && trim($json->en) != ''){
             $value=$json->en;
-        }
-        else if( $lang == 'fr' && trim($json->fr) != ''){
+        } else if( $lang == 'fr' && trim($json->fr) != ''){
             $value=$json->fr;
-        }
-        else
+        } else
         {
             if( ($lang=='fr') && trim($json->fr) == '' ){
                 $value=$json->en;
-            }
-            else if( ($lang=='en') && trim($json->en) == '' ){
+            } else if( ($lang=='en') && trim($json->en) == '' ){
                 $value=$json->fr;
             }
         }
-    }
-    else
+    } else
     {
         $value=$imploded_txt;
     }
@@ -65,19 +61,16 @@ 
         foreach($text_ar as $value){
             if(strpos($value, "en]")!==false){
                 $en=substr($value,3,strlen($value));
-            }
-            elseif(strpos($value, "fr]")!==false)
+            } elseif(strpos($value, "fr]")!==false)
             {
                 $fr=substr($value,3,strlen($value));
             }
         }
         if($lang=='en' && trim($en)<>''){
             $value=$en;
-        }
-        elseif($lang=='fr' && trim($fr)<>''){
+        } elseif($lang=='fr' && trim($fr)<>''){
             $value=$fr;
-        }
-        else
+        } else
         {
             if(($lang=='fr') && (!$fr)){
        /*         $value=$fr;
@@ -92,8 +85,7 @@ 
             }
 
         }
-    }
-    else
+    } else
     {
         $value=$imploded_txt;
     }

mod/gccollab_stats/languages/fr.php

Indentation +50 added lines, -50 removed lines

@@ -1,59 +1,59 @@
 <?php
 $french = array(
-    'gccollab_stats:title' => "Statistiques de GCcollab",
-    'gcconnex_stats:title' => "Statistiques de GCconnex",
-    'gccollab_stats:unknown' => "Inconnu",
-    'gccollab_stats:membercount' => "Membres inscrits",
-    'gccollab_stats:loading' => "Chargement des données...",
+	'gccollab_stats:title' => "Statistiques de GCcollab",
+	'gcconnex_stats:title' => "Statistiques de GCconnex",
+	'gccollab_stats:unknown' => "Inconnu",
+	'gccollab_stats:membercount' => "Membres inscrits",
+	'gccollab_stats:loading' => "Chargement des données...",
     
-    'gccollab_stats:registration:title' => "Inscription des membres",
-    'gccollab_stats:types:select' => "Sélectionner le type de membre :",
-    'gccollab_stats:types:title' => "Types de membres",
-    'gccollab_stats:federal:title' => "Gouvernement fédéral",
-    'gccollab_stats:student:title' => "Étudiants",
-    'gccollab_stats:academic:title' => "Universitaires",
-    'gccollab_stats:provincial:title' => "Provinciaux/territoriaux",
-    'gccollab_stats:municipal:title' => "Administration municipale",
-    'gccollab_stats:international:title' => "International / Gouvernement étranger",
-    'gccollab_stats:ngo:title' => "Organismes non gouvernementaux",
-    'gccollab_stats:community:title' => "Collectivité / Sans but lucratif",
-    'gccollab_stats:business:title' => "Entreprise",
-    'gccollab_stats:media:title' => "Média",
-    'gccollab_stats:retired:title' => "Fonctionnaire à la retraité(e)",
-    'gccollab_stats:other:title' => "Autres",
+	'gccollab_stats:registration:title' => "Inscription des membres",
+	'gccollab_stats:types:select' => "Sélectionner le type de membre :",
+	'gccollab_stats:types:title' => "Types de membres",
+	'gccollab_stats:federal:title' => "Gouvernement fédéral",
+	'gccollab_stats:student:title' => "Étudiants",
+	'gccollab_stats:academic:title' => "Universitaires",
+	'gccollab_stats:provincial:title' => "Provinciaux/territoriaux",
+	'gccollab_stats:municipal:title' => "Administration municipale",
+	'gccollab_stats:international:title' => "International / Gouvernement étranger",
+	'gccollab_stats:ngo:title' => "Organismes non gouvernementaux",
+	'gccollab_stats:community:title' => "Collectivité / Sans but lucratif",
+	'gccollab_stats:business:title' => "Entreprise",
+	'gccollab_stats:media:title' => "Média",
+	'gccollab_stats:retired:title' => "Fonctionnaire à la retraité(e)",
+	'gccollab_stats:other:title' => "Autres",
 
-    'gccollab_stats:organization' => "Organisation",
-    'gccollab_stats:membertype' => "Type de membre",
-    'gccollab_stats:date' => "Date :",
-    'gccollab_stats:signups' => "Inscriptions :",
-    'gccollab_stats:total' => "Total :",
-    'gccollab_stats:users' => "utilisateur(s)",
-    'gccollab_stats:department' => "Département",
-    'gccollab_stats:province' => "Province / Territoire",
+	'gccollab_stats:organization' => "Organisation",
+	'gccollab_stats:membertype' => "Type de membre",
+	'gccollab_stats:date' => "Date :",
+	'gccollab_stats:signups' => "Inscriptions :",
+	'gccollab_stats:total' => "Total :",
+	'gccollab_stats:users' => "utilisateur(s)",
+	'gccollab_stats:department' => "Département",
+	'gccollab_stats:province' => "Province / Territoire",
 
-    'gccollab_stats:wireposts:title' => "Messages sur le fil",
-    'gccollab_stats:wireposts:amount' => "Nombre de messages sur le fil",
-    'gccollab_stats:blogposts:title' => "Billets de blogue",
-    'gccollab_stats:blogposts:amount' => "Nombre de billets de blogue",
-    'gccollab_stats:comments:title' => "Commentaires",
-    'gccollab_stats:comments:amount' => "Nombre de commentaires",
-    'gccollab_stats:groups:label' => "Groupes :",
-    'gccollab_stats:groups:amount' => "Nombre de groupes",
-    'gccollab_stats:groupscreated:title' => "Groupes créés",
-    'gccollab_stats:groupscreated:amount' => "Nombre de groupes créés",
-    'gccollab_stats:groupsjoined:title' => "Groupes rejoints",
-    'gccollab_stats:groupsjoined:amount' => "Nombre de groupes rejoints",
-    'gccollab_stats:likes:title' => "J\'aimes",
-    'gccollab_stats:likes:amount' => "Nombre de j\'aimes",
-    'gccollab_stats:messages:title' => "Messages",
-    'gccollab_stats:messages:amount' => "Nombre de messages",
-    'gccollab_stats:optins:title' => "Inscriptions",
-    'gccollab_stats:optins:amount' => "Nombre d'inscriptions",
+	'gccollab_stats:wireposts:title' => "Messages sur le fil",
+	'gccollab_stats:wireposts:amount' => "Nombre de messages sur le fil",
+	'gccollab_stats:blogposts:title' => "Billets de blogue",
+	'gccollab_stats:blogposts:amount' => "Nombre de billets de blogue",
+	'gccollab_stats:comments:title' => "Commentaires",
+	'gccollab_stats:comments:amount' => "Nombre de commentaires",
+	'gccollab_stats:groups:label' => "Groupes :",
+	'gccollab_stats:groups:amount' => "Nombre de groupes",
+	'gccollab_stats:groupscreated:title' => "Groupes créés",
+	'gccollab_stats:groupscreated:amount' => "Nombre de groupes créés",
+	'gccollab_stats:groupsjoined:title' => "Groupes rejoints",
+	'gccollab_stats:groupsjoined:amount' => "Nombre de groupes rejoints",
+	'gccollab_stats:likes:title' => "J\'aimes",
+	'gccollab_stats:likes:amount' => "Nombre de j\'aimes",
+	'gccollab_stats:messages:title' => "Messages",
+	'gccollab_stats:messages:amount' => "Nombre de messages",
+	'gccollab_stats:optins:title' => "Inscriptions",
+	'gccollab_stats:optins:amount' => "Nombre d'inscriptions",
 
-    'gccollab_stats:ministrymessage' => "Cliquez sur les colonnes pour afficher les ministères de la province ou du territoire",
-    'gccollab_stats:schoolmessage' => "Cliquez sur les colonnes pour afficher les différentes écoles",
-    'gccollab_stats:zoommessage' => "-  Cliquez et glissez pour faire un zoom avant",
-    'gccollab_stats:pinchmessage' => "Pincer le graphique pour le zoomer",
+	'gccollab_stats:ministrymessage' => "Cliquez sur les colonnes pour afficher les ministères de la province ou du territoire",
+	'gccollab_stats:schoolmessage' => "Cliquez sur les colonnes pour afficher les différentes écoles",
+	'gccollab_stats:zoommessage' => "-  Cliquez et glissez pour faire un zoom avant",
+	'gccollab_stats:pinchmessage' => "Pincer le graphique pour le zoomer",
 );
 
 add_translation("fr", $french);
\ No newline at end of file

mod/gccollab_stats/languages/en.php

Indentation +50 added lines, -50 removed lines

@@ -1,59 +1,59 @@
 <?php
 $english = array(
-    'gccollab_stats:title' => "GCcollab Statistics",
-    'gcconnex_stats:title' => "GCconnex Statistics",
-    'gccollab_stats:unknown' => "Unknown",
-    'gccollab_stats:membercount' => "Registered Members",
-    'gccollab_stats:loading' => "Loading data...",
+	'gccollab_stats:title' => "GCcollab Statistics",
+	'gcconnex_stats:title' => "GCconnex Statistics",
+	'gccollab_stats:unknown' => "Unknown",
+	'gccollab_stats:membercount' => "Registered Members",
+	'gccollab_stats:loading' => "Loading data...",
     
-    'gccollab_stats:registration:title' => "Member Registration",
-    'gccollab_stats:types:select' => "Select Member Type:",
-    'gccollab_stats:types:title' => "Member Types",
-    'gccollab_stats:federal:title' => "Federal",
-    'gccollab_stats:student:title' => "Student",
-    'gccollab_stats:academic:title' => "Academic",
-    'gccollab_stats:provincial:title' => "Provincial/Territorial",
-    'gccollab_stats:municipal:title' => "Municipal Government",
-    'gccollab_stats:international:title' => "International/Foreign Government",
-    'gccollab_stats:ngo:title' => "Non-Governmental Organization",
-    'gccollab_stats:community:title' => "Community/Non-profit",
-    'gccollab_stats:business:title' => "Business",
-    'gccollab_stats:media:title' => "Media",
-    'gccollab_stats:retired:title' => "Retired Public Servants",
-    'gccollab_stats:other:title' => "Other",
+	'gccollab_stats:registration:title' => "Member Registration",
+	'gccollab_stats:types:select' => "Select Member Type:",
+	'gccollab_stats:types:title' => "Member Types",
+	'gccollab_stats:federal:title' => "Federal",
+	'gccollab_stats:student:title' => "Student",
+	'gccollab_stats:academic:title' => "Academic",
+	'gccollab_stats:provincial:title' => "Provincial/Territorial",
+	'gccollab_stats:municipal:title' => "Municipal Government",
+	'gccollab_stats:international:title' => "International/Foreign Government",
+	'gccollab_stats:ngo:title' => "Non-Governmental Organization",
+	'gccollab_stats:community:title' => "Community/Non-profit",
+	'gccollab_stats:business:title' => "Business",
+	'gccollab_stats:media:title' => "Media",
+	'gccollab_stats:retired:title' => "Retired Public Servants",
+	'gccollab_stats:other:title' => "Other",
 
-    'gccollab_stats:organization' => "Organization",
-    'gccollab_stats:membertype' => "Member Type",
-    'gccollab_stats:date' => "Date:",
-    'gccollab_stats:signups' => "Signups:",
-    'gccollab_stats:total' => "Total:",
-    'gccollab_stats:users' => "user(s)",
-    'gccollab_stats:department' => "Department",
-    'gccollab_stats:province' => "Province/Territory",
+	'gccollab_stats:organization' => "Organization",
+	'gccollab_stats:membertype' => "Member Type",
+	'gccollab_stats:date' => "Date:",
+	'gccollab_stats:signups' => "Signups:",
+	'gccollab_stats:total' => "Total:",
+	'gccollab_stats:users' => "user(s)",
+	'gccollab_stats:department' => "Department",
+	'gccollab_stats:province' => "Province/Territory",
 
-    'gccollab_stats:wireposts:title' => "Wire Posts",
-    'gccollab_stats:wireposts:amount' => "Amount of Wire Posts",
-    'gccollab_stats:blogposts:title' => "Blog Posts",
-    'gccollab_stats:blogposts:amount' => "Amount of Blog Posts",
-    'gccollab_stats:comments:title' => "Comments",
-    'gccollab_stats:comments:amount' => "Amount of Comments",
-    'gccollab_stats:groups:label' => "Groups:",
-    'gccollab_stats:groups:amount' => "Amount of Groups",
-    'gccollab_stats:groupscreated:title' => "Groups Created",
-    'gccollab_stats:groupscreated:amount' => "Amount of Groups Created",
-    'gccollab_stats:groupsjoined:title' => "Groups Joined",
-    'gccollab_stats:groupsjoined:amount' => "Amount of Groups Joined",
-    'gccollab_stats:likes:title' => "Likes",
-    'gccollab_stats:likes:amount' => "Amount of Likes",
-    'gccollab_stats:messages:title' => "Messages",
-    'gccollab_stats:messages:amount' => "Amount of Messages",
-    'gccollab_stats:optins:title' => "Opt Ins",
-    'gccollab_stats:optins:amount' => "Amount of Opt Ins",
+	'gccollab_stats:wireposts:title' => "Wire Posts",
+	'gccollab_stats:wireposts:amount' => "Amount of Wire Posts",
+	'gccollab_stats:blogposts:title' => "Blog Posts",
+	'gccollab_stats:blogposts:amount' => "Amount of Blog Posts",
+	'gccollab_stats:comments:title' => "Comments",
+	'gccollab_stats:comments:amount' => "Amount of Comments",
+	'gccollab_stats:groups:label' => "Groups:",
+	'gccollab_stats:groups:amount' => "Amount of Groups",
+	'gccollab_stats:groupscreated:title' => "Groups Created",
+	'gccollab_stats:groupscreated:amount' => "Amount of Groups Created",
+	'gccollab_stats:groupsjoined:title' => "Groups Joined",
+	'gccollab_stats:groupsjoined:amount' => "Amount of Groups Joined",
+	'gccollab_stats:likes:title' => "Likes",
+	'gccollab_stats:likes:amount' => "Amount of Likes",
+	'gccollab_stats:messages:title' => "Messages",
+	'gccollab_stats:messages:amount' => "Amount of Messages",
+	'gccollab_stats:optins:title' => "Opt Ins",
+	'gccollab_stats:optins:amount' => "Amount of Opt Ins",
 
-    'gccollab_stats:ministrymessage' => "Click the columns to view the ministries within the province/territory",
-    'gccollab_stats:schoolmessage' => "Click the columns to view the various schools",
-    'gccollab_stats:zoommessage' => "-  Click and drag to zoom in",
-    'gccollab_stats:pinchmessage' => "Pinch the chart to zoom in",
+	'gccollab_stats:ministrymessage' => "Click the columns to view the ministries within the province/territory",
+	'gccollab_stats:schoolmessage' => "Click the columns to view the various schools",
+	'gccollab_stats:zoommessage' => "-  Click and drag to zoom in",
+	'gccollab_stats:pinchmessage' => "Pinch the chart to zoom in",
 );
 
 add_translation("en", $english);
\ No newline at end of file

mod/gccollab_stats/start.php

Indentation +23 added lines, -23 removed lines

@@ -9,29 +9,29 @@ 
 	}
 
 	elgg_ws_expose_function(
-        "member.stats",
-        "get_member_data",
-        array(
-        	"type" => array('type' => 'string', 'required' => true),
-        	"lang" => array('type' => 'string', 'required' => false, 'default' => 'en')
-        ),
-        'Exposes member data for use with dashboard',
-        'GET',
-        false,
-        false
+		"member.stats",
+		"get_member_data",
+		array(
+			"type" => array('type' => 'string', 'required' => true),
+			"lang" => array('type' => 'string', 'required' => false, 'default' => 'en')
+		),
+		'Exposes member data for use with dashboard',
+		'GET',
+		false,
+		false
 	);
 
 	elgg_ws_expose_function(
-        "site.stats",
-        "get_site_data",
-        array(
-        	"type" => array('type' => 'string', 'required' => true),
-        	"lang" => array('type' => 'string', 'required' => false, 'default' => 'en')
-        ),
-        'Exposes site data for use with dashboard',
-        'GET',
-        false,
-        false
+		"site.stats",
+		"get_site_data",
+		array(
+			"type" => array('type' => 'string', 'required' => true),
+			"lang" => array('type' => 'string', 'required' => false, 'default' => 'en')
+		),
+		'Exposes site data for use with dashboard',
+		'GET',
+		false,
+		false
 	);
 }
 
@@ -306,7 +306,7 @@ 
 		$data = get_data($query);
 	} else if ($type === 'gcconnex') {
 		$dbprefix = elgg_get_config('dbprefix');
-	    $query = "SELECT msv.string as department, count(*) as count FROM {$dbprefix}users_entity u LEFT JOIN {$dbprefix}metadata md ON u.guid = md.entity_guid LEFT JOIN {$dbprefix}metastrings msn ON md.name_id = msn.id LEFT JOIN {$dbprefix}metastrings msv ON md.value_id = msv.id WHERE msn.string = 'department' GROUP BY department ORDER BY count DESC LIMIT 25";
+		$query = "SELECT msv.string as department, count(*) as count FROM {$dbprefix}users_entity u LEFT JOIN {$dbprefix}metadata md ON u.guid = md.entity_guid LEFT JOIN {$dbprefix}metastrings msn ON md.name_id = msn.id LEFT JOIN {$dbprefix}metastrings msv ON md.value_id = msv.id WHERE msn.string = 'department' GROUP BY department ORDER BY count DESC LIMIT 25";
 		$departments = get_data($query);
 
 		foreach($departments as $key => $obj){
@@ -314,7 +314,7 @@ 
 		}
 	}
 
-    return $data;
+	return $data;
 }
 
 function get_site_data($type, $lang) {
@@ -443,5 +443,5 @@ 
 			}
 		}
 	}
-    return $data;
+	return $data;
 }
\ No newline at end of file

Spacing +82 added lines, -82 removed lines

@@ -4,7 +4,7 @@ 
 
 function gccollab_stats_init() {
 	elgg_register_page_handler('stats', 'stats_page_handler');
-	if( strpos(elgg_get_site_entity()->name, 'collab') !== false ){
+	if (strpos(elgg_get_site_entity()->name, 'collab') !== false) {
 		elgg_register_plugin_hook_handler('public_pages', 'walled_garden', 'gccollab_stats_public_page');
 	}
 
@@ -35,7 +35,7 @@ 
 	);
 }
 
-function gccollab_stats_public_page($hook, $handler, $return, $params){
+function gccollab_stats_public_page($hook, $handler, $return, $params) {
 	$pages = array('stats');
 	return array_merge($pages, $return);
 }
@@ -58,15 +58,15 @@ 
 			'limit' => 0
 		));
 
-		if ($lang == 'fr'){
+		if ($lang == 'fr') {
 			$users_types = array('federal' => 'féderal', 'academic' => 'milieu universitaire', 'student' => 'étudiant', 'provincial' => 'provincial', 'municipal' => 'municipale', 'international' => 'international', 'ngo' => 'ngo', 'community' => 'collectivité', 'business' => 'entreprise', 'media' => 'média', 'retired' => 'retraité(e)', 'other' => 'autre');
 
-			foreach($users as $key => $obj){
-				$data[$users_types[$obj->user_type]] = isset( $data[$users_types[$obj->user_type]] ) ? $data[$users_types[$obj->user_type]] + 1 : 1;
+			foreach ($users as $key => $obj) {
+				$data[$users_types[$obj->user_type]] = isset($data[$users_types[$obj->user_type]]) ? $data[$users_types[$obj->user_type]] + 1 : 1;
 			}
 		} else {
-			foreach($users as $key => $obj){
-				$data[$obj->user_type] = isset( $data[$obj->user_type] ) ? $data[$obj->user_type] + 1 : 1;
+			foreach ($users as $key => $obj) {
+				$data[$obj->user_type] = isset($data[$obj->user_type]) ? $data[$obj->user_type] + 1 : 1;
 			}
 		}
 	} else if ($type === 'federal') {
@@ -78,7 +78,7 @@ 
 			'limit' => 0
 		));
 
-		if ($lang == 'fr'){
+		if ($lang == 'fr') {
 			$deptObj = elgg_get_entities(array(
 			   	'type' => 'object',
 			   	'subtype' => 'federal_departments',
@@ -86,12 +86,12 @@ 
 			$depts = get_entity($deptObj[0]->guid);
 			$federal_departments = json_decode($depts->federal_departments_fr, true);
 
-			foreach($users as $key => $obj){
-				$data[$federal_departments[$obj->federal]] = isset( $data[$federal_departments[$obj->federal]] ) ? $data[$federal_departments[$obj->federal]] + 1 : 1;
+			foreach ($users as $key => $obj) {
+				$data[$federal_departments[$obj->federal]] = isset($data[$federal_departments[$obj->federal]]) ? $data[$federal_departments[$obj->federal]] + 1 : 1;
 			}
 		} else {
-			foreach($users as $key => $obj){
-				$data[$obj->federal] = isset( $data[$obj->federal] ) ? $data[$obj->federal] + 1 : 1;
+			foreach ($users as $key => $obj) {
+				$data[$obj->federal] = isset($data[$obj->federal]) ? $data[$obj->federal] + 1 : 1;
 			}
 		}
 	} else if ($type === 'academic') {
@@ -102,13 +102,13 @@ 
 			),
 			'limit' => 0
 		));
-		foreach($users as $key => $obj){
-			$data[$obj->institution]['total'] = isset( $data[$obj->institution]['total'] ) ? $data[$obj->institution]['total'] + 1 : 1;
-			if($obj->university){
-				$data[$obj->institution][$obj->university] = isset( $data[$obj->institution][$obj->university] ) ? $data[$obj->institution][$obj->university] + 1 : 1;
+		foreach ($users as $key => $obj) {
+			$data[$obj->institution]['total'] = isset($data[$obj->institution]['total']) ? $data[$obj->institution]['total'] + 1 : 1;
+			if ($obj->university) {
+				$data[$obj->institution][$obj->university] = isset($data[$obj->institution][$obj->university]) ? $data[$obj->institution][$obj->university] + 1 : 1;
 			}
-			if($obj->college){
-				$data[$obj->institution][$obj->college] = isset( $data[$obj->institution][$obj->college] ) ? $data[$obj->institution][$obj->college] + 1 : 1;
+			if ($obj->college) {
+				$data[$obj->institution][$obj->college] = isset($data[$obj->institution][$obj->college]) ? $data[$obj->institution][$obj->college] + 1 : 1;
 			}
 		}
 	} else if ($type === 'student') {
@@ -119,16 +119,16 @@ 
 			),
 			'limit' => 0
 		));
-		foreach($users as $key => $obj){
-			$data[$obj->institution]['total'] = isset( $data[$obj->institution]['total'] ) ? $data[$obj->institution]['total'] + 1 : 1;
-			if($obj->university){
-				$data[$obj->institution][$obj->university] = isset( $data[$obj->institution][$obj->university] ) ? $data[$obj->institution][$obj->university] + 1 : 1;
+		foreach ($users as $key => $obj) {
+			$data[$obj->institution]['total'] = isset($data[$obj->institution]['total']) ? $data[$obj->institution]['total'] + 1 : 1;
+			if ($obj->university) {
+				$data[$obj->institution][$obj->university] = isset($data[$obj->institution][$obj->university]) ? $data[$obj->institution][$obj->university] + 1 : 1;
 			}
-			if($obj->college){
-				$data[$obj->institution][$obj->college] = isset( $data[$obj->institution][$obj->college] ) ? $data[$obj->institution][$obj->college] + 1 : 1;
+			if ($obj->college) {
+				$data[$obj->institution][$obj->college] = isset($data[$obj->institution][$obj->college]) ? $data[$obj->institution][$obj->college] + 1 : 1;
 			}
-			if($obj->highschool){
-				$data[$obj->institution][$obj->highschool] = isset( $data[$obj->institution][$obj->highschool] ) ? $data[$obj->institution][$obj->highschool] + 1 : 1;
+			if ($obj->highschool) {
+				$data[$obj->institution][$obj->highschool] = isset($data[$obj->institution][$obj->highschool]) ? $data[$obj->institution][$obj->highschool] + 1 : 1;
 			}
 		}
 	} else if ($type === 'university') {
@@ -140,9 +140,9 @@ 
 			),
 			'limit' => 0
 		));
-		foreach($users as $key => $obj){
-			$data['total'] = isset( $data['total'] ) ? $data['total'] + 1 : 1;
-			$data[$obj->university] = isset( $data[$obj->university] ) ? $data[$obj->university] + 1 : 1;
+		foreach ($users as $key => $obj) {
+			$data['total'] = isset($data['total']) ? $data['total'] + 1 : 1;
+			$data[$obj->university] = isset($data[$obj->university]) ? $data[$obj->university] + 1 : 1;
 		}
 	} else if ($type === 'college') {
 		$users = elgg_get_entities_from_metadata(array(
@@ -153,11 +153,11 @@ 
 			),
 			'limit' => 0
 		));
-		foreach($users as $key => $obj){
-			$data['total'] = isset( $data['total'] ) ? $data['total'] + 1 : 1;
-			$data[$obj->college] = isset( $data[$obj->college] ) ? $data[$obj->college] + 1 : 1;
+		foreach ($users as $key => $obj) {
+			$data['total'] = isset($data['total']) ? $data['total'] + 1 : 1;
+			$data[$obj->college] = isset($data[$obj->college]) ? $data[$obj->college] + 1 : 1;
 		}
-	}  else if ($type === 'highschool') {
+	} else if ($type === 'highschool') {
 		$users = elgg_get_entities_from_metadata(array(
 			'type' => 'user',
 			'metadata_name_value_pairs' => array(
@@ -166,9 +166,9 @@ 
 			),
 			'limit' => 0
 		));
-		foreach($users as $key => $obj){
-			$data['total'] = isset( $data['total'] ) ? $data['total'] + 1 : 1;
-			$data[$obj->highschool] = isset( $data[$obj->highschool] ) ? $data[$obj->highschool] + 1 : 1;
+		foreach ($users as $key => $obj) {
+			$data['total'] = isset($data['total']) ? $data['total'] + 1 : 1;
+			$data[$obj->highschool] = isset($data[$obj->highschool]) ? $data[$obj->highschool] + 1 : 1;
 		}
 	} else if ($type === 'provincial') {
 		$users = elgg_get_entities_from_metadata(array(
@@ -179,7 +179,7 @@ 
 			'limit' => 0
 		));
 
-		if ($lang == 'fr'){
+		if ($lang == 'fr') {
 			$provObj = elgg_get_entities(array(
 			   	'type' => 'object',
 			   	'subtype' => 'provinces',
@@ -194,14 +194,14 @@ 
 			$mins = get_entity($minObj[0]->guid);
 			$ministries = json_decode($mins->ministries_fr, true);
 
-			foreach($users as $key => $obj){
-				$data[$provincial_departments[$obj->provincial]]['total'] = isset( $data[$provincial_departments[$obj->provincial]]['total'] ) ? $data[$provincial_departments[$obj->provincial]]['total'] + 1 : 1;
-				$data[$provincial_departments[$obj->provincial]][$ministries[$obj->provincial][$obj->ministry]] = isset( $data[$provincial_departments[$obj->provincial]][$ministries[$obj->provincial][$obj->ministry]] ) ? $data[$provincial_departments[$obj->provincial]][$ministries[$obj->provincial][$obj->ministry]] + 1 : 1;
+			foreach ($users as $key => $obj) {
+				$data[$provincial_departments[$obj->provincial]]['total'] = isset($data[$provincial_departments[$obj->provincial]]['total']) ? $data[$provincial_departments[$obj->provincial]]['total'] + 1 : 1;
+				$data[$provincial_departments[$obj->provincial]][$ministries[$obj->provincial][$obj->ministry]] = isset($data[$provincial_departments[$obj->provincial]][$ministries[$obj->provincial][$obj->ministry]]) ? $data[$provincial_departments[$obj->provincial]][$ministries[$obj->provincial][$obj->ministry]] + 1 : 1;
 			}
 		} else {
-			foreach($users as $key => $obj){
-				$data[$obj->provincial]['total'] = isset( $data[$obj->provincial]['total'] ) ? $data[$obj->provincial]['total'] + 1 : 1;
-				$data[$obj->provincial][$obj->ministry] = isset( $data[$obj->provincial][$obj->ministry] ) ? $data[$obj->provincial][$obj->ministry] + 1 : 1;
+			foreach ($users as $key => $obj) {
+				$data[$obj->provincial]['total'] = isset($data[$obj->provincial]['total']) ? $data[$obj->provincial]['total'] + 1 : 1;
+				$data[$obj->provincial][$obj->ministry] = isset($data[$obj->provincial][$obj->ministry]) ? $data[$obj->provincial][$obj->ministry] + 1 : 1;
 			}
 		}
 	} else if ($type === 'municipal') {
@@ -212,9 +212,9 @@ 
 			),
 			'limit' => 0
 		));
-		foreach($users as $key => $obj){
-			$data['total'] = isset( $data['total'] ) ? $data['total'] + 1 : 1;
-			$data[$obj->municipal] = isset( $data[$obj->municipal] ) ? $data[$obj->municipal] + 1 : 1;
+		foreach ($users as $key => $obj) {
+			$data['total'] = isset($data['total']) ? $data['total'] + 1 : 1;
+			$data[$obj->municipal] = isset($data[$obj->municipal]) ? $data[$obj->municipal] + 1 : 1;
 		}
 	} else if ($type === 'international') {
 		$users = elgg_get_entities_from_metadata(array(
@@ -224,9 +224,9 @@ 
 			),
 			'limit' => 0
 		));
-		foreach($users as $key => $obj){
-			$data['total'] = isset( $data['total'] ) ? $data['total'] + 1 : 1;
-			$data[$obj->international] = isset( $data[$obj->international] ) ? $data[$obj->international] + 1 : 1;
+		foreach ($users as $key => $obj) {
+			$data['total'] = isset($data['total']) ? $data['total'] + 1 : 1;
+			$data[$obj->international] = isset($data[$obj->international]) ? $data[$obj->international] + 1 : 1;
 		}
 	} else if ($type === 'ngo') {
 		$users = elgg_get_entities_from_metadata(array(
@@ -236,9 +236,9 @@ 
 			),
 			'limit' => 0
 		));
-		foreach($users as $key => $obj){
-			$data['total'] = isset( $data['total'] ) ? $data['total'] + 1 : 1;
-			$data[$obj->ngo] = isset( $data[$obj->ngo] ) ? $data[$obj->ngo] + 1 : 1;
+		foreach ($users as $key => $obj) {
+			$data['total'] = isset($data['total']) ? $data['total'] + 1 : 1;
+			$data[$obj->ngo] = isset($data[$obj->ngo]) ? $data[$obj->ngo] + 1 : 1;
 		}
 	} else if ($type === 'community') {
 		$users = elgg_get_entities_from_metadata(array(
@@ -248,9 +248,9 @@ 
 			),
 			'limit' => 0
 		));
-		foreach($users as $key => $obj){
-			$data['total'] = isset( $data['total'] ) ? $data['total'] + 1 : 1;
-			$data[$obj->community] = isset( $data[$obj->community] ) ? $data[$obj->community] + 1 : 1;
+		foreach ($users as $key => $obj) {
+			$data['total'] = isset($data['total']) ? $data['total'] + 1 : 1;
+			$data[$obj->community] = isset($data[$obj->community]) ? $data[$obj->community] + 1 : 1;
 		}
 	} else if ($type === 'business') {
 		$users = elgg_get_entities_from_metadata(array(
@@ -260,9 +260,9 @@ 
 			),
 			'limit' => 0
 		));
-		foreach($users as $key => $obj){
-			$data['total'] = isset( $data['total'] ) ? $data['total'] + 1 : 1;
-			$data[$obj->business] = isset( $data[$obj->business] ) ? $data[$obj->business] + 1 : 1;
+		foreach ($users as $key => $obj) {
+			$data['total'] = isset($data['total']) ? $data['total'] + 1 : 1;
+			$data[$obj->business] = isset($data[$obj->business]) ? $data[$obj->business] + 1 : 1;
 		}
 	} else if ($type === 'media') {
 		$users = elgg_get_entities_from_metadata(array(
@@ -272,9 +272,9 @@ 
 			),
 			'limit' => 0
 		));
-		foreach($users as $key => $obj){
-			$data['total'] = isset( $data['total'] ) ? $data['total'] + 1 : 1;
-			$data[$obj->media] = isset( $data[$obj->media] ) ? $data[$obj->media] + 1 : 1;
+		foreach ($users as $key => $obj) {
+			$data['total'] = isset($data['total']) ? $data['total'] + 1 : 1;
+			$data[$obj->media] = isset($data[$obj->media]) ? $data[$obj->media] + 1 : 1;
 		}
 	} else if ($type === 'retired') {
 		$users = elgg_get_entities_from_metadata(array(
@@ -284,9 +284,9 @@ 
 			),
 			'limit' => 0
 		));
-		foreach($users as $key => $obj){
-			$data['total'] = isset( $data['total'] ) ? $data['total'] + 1 : 1;
-			$data[$obj->retired] = isset( $data[$obj->retired] ) ? $data[$obj->retired] + 1 : 1;
+		foreach ($users as $key => $obj) {
+			$data['total'] = isset($data['total']) ? $data['total'] + 1 : 1;
+			$data[$obj->retired] = isset($data[$obj->retired]) ? $data[$obj->retired] + 1 : 1;
 		}
 	} else if ($type === 'other') {
 		$users = elgg_get_entities_from_metadata(array(
@@ -296,9 +296,9 @@ 
 			),
 			'limit' => 0
 		));
-		foreach($users as $key => $obj){
-			$data['total'] = isset( $data['total'] ) ? $data['total'] + 1 : 1;
-			$data[$obj->other] = isset( $data[$obj->other] ) ? $data[$obj->other] + 1 : 1;
+		foreach ($users as $key => $obj) {
+			$data['total'] = isset($data['total']) ? $data['total'] + 1 : 1;
+			$data[$obj->other] = isset($data[$obj->other]) ? $data[$obj->other] + 1 : 1;
 		}
 	} else if ($type === 'time') {
 		$dbprefix = elgg_get_config('dbprefix');
@@ -309,8 +309,8 @@ 
 	    $query = "SELECT msv.string as department, count(*) as count FROM {$dbprefix}users_entity u LEFT JOIN {$dbprefix}metadata md ON u.guid = md.entity_guid LEFT JOIN {$dbprefix}metastrings msn ON md.name_id = msn.id LEFT JOIN {$dbprefix}metastrings msv ON md.value_id = msv.id WHERE msn.string = 'department' GROUP BY department ORDER BY count DESC LIMIT 25";
 		$departments = get_data($query);
 
-		foreach($departments as $key => $obj){
-			$data[$obj->department] = (int)$obj->count;
+		foreach ($departments as $key => $obj) {
+			$data[$obj->department] = (int) $obj->count;
 		}
 	}
 
@@ -329,7 +329,7 @@ 
 		$query = "SELECT guid, time_created, owner_guid FROM {$dbprefix}entities WHERE type = 'object' AND subtype = {$typeid} AND enabled = 'yes'";
 		$wireposts = get_data($query);
 
-		foreach($wireposts as $key => $obj){
+		foreach ($wireposts as $key => $obj) {
 			$data[] = array($obj->time_created, "", $obj->owner_guid);
 		}
 	} else if ($type === 'blogposts') {
@@ -338,7 +338,7 @@ 
 		$query = "SELECT guid, time_created, owner_guid FROM {$dbprefix}entities WHERE type = 'object' AND subtype = {$typeid} AND enabled = 'yes'";
 		$blogposts = get_data($query);
 
-		foreach($blogposts as $key => $obj){
+		foreach ($blogposts as $key => $obj) {
 			$data[] = array($obj->time_created, "", "", $obj->owner_guid);
 		}
 	} else if ($type === 'comments') {
@@ -347,22 +347,22 @@ 
 		$query = "SELECT guid, time_created, owner_guid FROM {$dbprefix}entities WHERE type = 'object' AND subtype = {$typeid} AND enabled = 'yes'";
 		$comments = get_data($query);
 
-		foreach($comments as $key => $obj){
+		foreach ($comments as $key => $obj) {
 			$data[] = array($obj->time_created, "", $obj->owner_guid);
 		}
 	} else if ($type === 'groupscreated') {
 		$query = "SELECT guid, time_created, owner_guid FROM {$dbprefix}entities WHERE type = 'group' AND enabled = 'yes'";
 		$groupscreated = get_data($query);
 
-		foreach($groupscreated as $key => $obj){
+		foreach ($groupscreated as $key => $obj) {
 			$data[] = array($obj->time_created, "", "", $obj->owner_guid);
 		}
 	} else if ($type === 'groupsjoined') {
 		$query = "SELECT * FROM {$dbprefix}entity_relationships WHERE relationship = 'member'";
 		$groupsjoined = get_data($query);
 
-		foreach($groupsjoined as $key => $obj){
-			if ( $obj->time_created ){
+		foreach ($groupsjoined as $key => $obj) {
+			if ($obj->time_created) {
 				$data[] = array($obj->time_created, $obj->guid_one, $obj->guid_two);
 			}
 		}
@@ -372,7 +372,7 @@ 
 		$query = "SELECT * FROM {$dbprefix}annotations WHERE name_id = $likesID";
 		$likes = get_data($query);
 
-		foreach($likes as $key => $obj){
+		foreach ($likes as $key => $obj) {
 			$data[] = array($obj->time_created, $obj->owner_guid, "");
 		}
 	} else if ($type === 'messages') {
@@ -384,7 +384,7 @@ 
 					WHERE md.name_id = {$name_id}";
 		$messages = get_data($query);
 
-		foreach($messages as $key => $obj){
+		foreach ($messages as $key => $obj) {
 			$data[] = array($obj->time_created, "", $obj->sender_guid);
 		}
 	} else if ($type === 'optins') {
@@ -425,18 +425,18 @@ 
 			$result = get_data($temp)[0];
 			$count = intval($result->num);
 
-			if($count > 0){
+			if ($count > 0) {
 				$string = elgg_echo($index, $lang);
-				if(stripos($optin_type, 'create') !== false){
+				if (stripos($optin_type, 'create') !== false) {
 					$string .= " (" . elgg_echo("missions:offering", $lang) . ")";
 				}
-				if(stripos($optin_type, 'seek') !== false){
+				if (stripos($optin_type, 'seek') !== false) {
 					$string .= " (" . elgg_echo("missions:seeking", $lang) . ")";
 				}
-				if($optin_type == "opt_in_mentored"){
+				if ($optin_type == "opt_in_mentored") {
 					$string .= " (" . elgg_echo("gcconnex_profile:opt:mentored", $lang) . ")";
 				}
-				if($optin_type == "opt_in_mentoring"){
+				if ($optin_type == "opt_in_mentoring") {
 					$string .= " (" . elgg_echo("gcconnex_profile:opt:mentoring", $lang) . ")";
 				}
 				$data[$string] = $count;

Braces +1 added lines, -1 removed lines

@@ -157,7 +157,7 @@
 			$data['total'] = isset( $data['total'] ) ? $data['total'] + 1 : 1;
 			$data[$obj->college] = isset( $data[$obj->college] ) ? $data[$obj->college] + 1 : 1;
 		}
-	}  else if ($type === 'highschool') {
+	} else if ($type === 'highschool') {
 		$users = elgg_get_entities_from_metadata(array(
 			'type' => 'user',
 			'metadata_name_value_pairs' => array(

mod/embed_extender/languages/fr.php

Spacing +1 added lines, -1 removed lines

@@ -16,4 +16,4 @@
 	'embedvideo:parseerror' => "Impossible d'analyse l'adresse URL de %s",
 	'embed_extender:custom:views' =>  "<b>Avancé</b> : Afficher une vidéo dans des vues personnalisées. Entrez une vue par ligne."
 );
-add_translation("fr",$french);
+add_translation("fr", $french);

mod/gcRegistration/languages/fr.php

Indentation +3 added lines, -3 removed lines

@@ -39,9 +39,9 @@
 'gcRegister:email_mismatch' => '<a href="#email_initial">Les adresses de courriel ne sont pas identitiques</a>',
 'gcRegister:display_name_is_empty' => '<a href="#name">Le champ « Nom à afficher » ne peut pas être laissé vide</a>',
 
-    'registration:userexists' => 'That username already exists. <a href=forgotpassword>Retrieve your password</a>(translate me)',
-    'gcRegister:department' => 'Ministère',
-    'gcRegister:required' => 'Obligatoires',
+	'registration:userexists' => 'That username already exists. <a href=forgotpassword>Retrieve your password</a>(translate me)',
+	'gcRegister:department' => 'Ministère',
+	'gcRegister:required' => 'Obligatoires',
 );
  
 add_translation("fr", $french);

mod/gcRegistration/languages/en.php

Indentation +2 added lines, -2 removed lines

@@ -2,7 +2,7 @@ 
 
 $english = array(
 	// labels
-    'gcRegister:form' => 'Registration form',
+	'gcRegister:form' => 'Registration form',
 	'gcRegister:email_initial' => 'Enter your e-mail',
 	'gcRegister:email_secondary' => 'Confirm your e-mail',
 	'gcRegister:username' => 'Your username (auto-generated)',
@@ -17,7 +17,7 @@ 
 	// error messages on the form
 	'gcRegister:failedMySQLconnection' => 'Unable to connect to the database',
 	'gcRegister:invalid_email' => '<a href="#email_initial">Invalid email</a>',
-    'gcRegister:invalid_email2' => 'Invalid email',
+	'gcRegister:invalid_email2' => 'Invalid email',
 	'gcRegister:empty_field' => 'empty field',
 	'gcRegister:mismatch' => 'mismatch',