gctools-outilsgc / gcconnex

mod/gcRegistration/actions/register.php

Indentation +1 added lines, -1 removed lines

@@ -247,7 +247,7 @@
 			}
 			
 			$new_user->set('department',$deptString);
-            $new_user->last_department_verify = time();
+			$new_user->last_department_verify = time();
 			
 			// Forward on success, assume everything else is an error...
 			forward();

Spacing +21 added lines, -21 removed lines

@@ -39,11 +39,11 @@ 
 //if (get_input('noscript') !== 'retired' && get_input('form_type') === 'standard')
 //{
 	$username = get_input('username');
-	$email = str_replace(' ','',trim(get_input('email')));
+	$email = str_replace(' ', '', trim(get_input('email')));
 	$password = trim(get_input('password', null, false));
 	$password2 = trim(get_input('password2', null, false));
 	$name = get_input('name');
-	$email2 = str_replace(' ','',get_input('email_initial'));
+	$email2 = str_replace(' ', '', get_input('email_initial'));
 	$toc = get_input('toc2');
 
 
@@ -112,15 +112,15 @@ 
 			$read_settings = $db_config->getConnectionConfig(\Elgg\Database\Config::READ_WRITE);
 		}
 
-		$connection = mysqli_connect($read_settings["host"], $read_settings["user"], $read_settings["password"], $read_settings["database"])or die(mysqli_error($connection));
-		$emaildomain = explode('@',$email);
-		$query = "SELECT count(*) AS num FROM email_extensions WHERE ext ='".$emaildomain[1]."'";
+		$connection = mysqli_connect($read_settings["host"], $read_settings["user"], $read_settings["password"], $read_settings["database"]) or die(mysqli_error($connection));
+		$emaildomain = explode('@', $email);
+		$query = "SELECT count(*) AS num FROM email_extensions WHERE ext ='" . $emaildomain[1] . "'";
 		
-		$result = mysqli_query($connection, $query)or die(mysqli_error($connection));
+		$result = mysqli_query($connection, $query) or die(mysqli_error($connection));
 		$result = mysqli_fetch_array($result);
 		
-		$emailgc = explode('.',$emaildomain[1]);
-		$gcca = $emailgc[count($emailgc) - 2] .".".$emailgc[count($emailgc) - 1];
+		$emailgc = explode('.', $emaildomain[1]);
+		$gcca = $emailgc[count($emailgc) - 2] . "." . $emailgc[count($emailgc) - 1];
 		
 		mysqli_close($connection);
 
@@ -129,15 +129,15 @@ 
 		if ($toc[0] != 1)
 		{
 			//throw new RegistrationException(elgg_echo('gcRegister:toc_error'));
-			$resulting_error .= elgg_echo('gcRegister:toc_error').'<br/>';
+			$resulting_error .= elgg_echo('gcRegister:toc_error') . '<br/>';
 		}
-		error_log('num - '.is_null($result));
+		error_log('num - ' . is_null($result));
 		// if domain doesn't exist in database, check if it's a gc.ca domain
 		if ($result['num'][0] <= 0) 
 		{
 			if ($gcca !== 'gc.ca')
 				//throw new RegistrationException(elgg_echo('gcRegister:email_error'));
-				$resulting_error .= '- '.elgg_echo('gcRegister:invalid_email').'<br/>';
+				$resulting_error .= '- ' . elgg_echo('gcRegister:invalid_email') . '<br/>';
 			
 		}
 
@@ -145,17 +145,17 @@ 
 		{
 			if (trim($email) !== trim($email2)) 
 				//throw new RegistrationException(elgg_echo('gcRegister:email_error'));
-				$resulting_error .= elgg_echo('gcRegister:email_mismatch').'<br/>';
+				$resulting_error .= elgg_echo('gcRegister:email_mismatch') . '<br/>';
 		}
 
 		if (trim($password) == "" || trim($password2) == "") {
 			//throw new RegistrationException(elgg_echo('RegistrationException:EmptyPassword'));
-			$resulting_error .= '- '.elgg_echo('RegistrationException:EmptyPassword').'<br/>';
+			$resulting_error .= '- ' . elgg_echo('RegistrationException:EmptyPassword') . '<br/>';
 		}
 
 		if (strcmp($password, $password2) != 0) {
 			//throw new RegistrationException(elgg_echo('RegistrationException:PasswordMismatch'));
-			$resulting_error .= '- '.elgg_echo('RegistrationException:PasswordMismatch').'<br/>';
+			$resulting_error .= '- ' . elgg_echo('RegistrationException:PasswordMismatch') . '<br/>';
 		}
 
 
@@ -222,7 +222,7 @@ 
 			$provincesEn['pov-que'] = 'Government of Quebec';
 			$provincesEn['pov-sask'] = 'Government of Saskatchewan';
 			$provincesEn['pov-yuk'] = 'Government of Yukon';
-			$departmentsEn = array_merge($departmentsEn,$provincesEn);
+			$departmentsEn = array_merge($departmentsEn, $provincesEn);
 			
 			$departmentsFr = json_decode($obj[0]->deptsFr, true);
 			$provincesFr['pov-alb'] = "Gouvernement de l'Alberta";
@@ -238,15 +238,15 @@ 
 			$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[$deptNum]." / ".$departmentsFr[$deptNum];
-			}else{
-				$deptString = $departmentsFr[$deptNum]." / ".$departmentsEn[$deptNum];
+			if (get_current_language() == 'en') {
+				$deptString = $departmentsEn[$deptNum] . " / " . $departmentsFr[$deptNum];
+			} else {
+				$deptString = $departmentsFr[$deptNum] . " / " . $departmentsEn[$deptNum];
 			}
 			
-			$new_user->set('department',$deptString);
+			$new_user->set('department', $deptString);
             $new_user->last_department_verify = time();
 			
 			// Forward on success, assume everything else is an error...

Braces +7 added lines, -5 removed lines

@@ -135,17 +135,19 @@ 
 		// if domain doesn't exist in database, check if it's a gc.ca domain
 		if ($result['num'][0] <= 0) 
 		{
-			if ($gcca !== 'gc.ca')
-				//throw new RegistrationException(elgg_echo('gcRegister:email_error'));
+			if ($gcca !== 'gc.ca') {
+							//throw new RegistrationException(elgg_echo('gcRegister:email_error'));
 				$resulting_error .= '- '.elgg_echo('gcRegister:invalid_email').'<br/>';
+			}
 			
 		}
 
 		if (get_input('form_type') !== 'standard')
 		{
-			if (trim($email) !== trim($email2)) 
-				//throw new RegistrationException(elgg_echo('gcRegister:email_error'));
+			if (trim($email) !== trim($email2)) {
+							//throw new RegistrationException(elgg_echo('gcRegister:email_error'));
 				$resulting_error .= elgg_echo('gcRegister:email_mismatch').'<br/>';
+			}
 		}
 
 		if (trim($password) == "" || trim($password2) == "") {
@@ -242,7 +244,7 @@ 
 			
 			if (get_current_language()=='en'){
 				$deptString = $departmentsEn[$deptNum]." / ".$departmentsFr[$deptNum];
-			}else{
+			} else{
 				$deptString = $departmentsFr[$deptNum]." / ".$departmentsEn[$deptNum];
 			}
 			

mod/rename_friends/languages/fr.php

Indentation +3 added lines, -3 removed lines

@@ -78,13 +78,13 @@
 	'rename_friends:settings' => "Rename Friends for each language",
 	'rename_friends:singular' => "Singular",
 
-    /*
+	/*
      * 	Default Notification Settings
      */
 	'notifications_tools:friends_notifications' => "Choose the default notification method for {$lplural} notifications (This will be applied when a new user acount is created)",
-    'notifications_tools:friends_batch_method' => "Choose a notification method for {$lplural} notifications (This will affect all site users)",
+	'notifications_tools:friends_batch_method' => "Choose a notification method for {$lplural} notifications (This will affect all site users)",
 
-    /*
+	/*
      * Elgg Core
      */
 

Spacing +5 added lines, -5 removed lines

@@ -9,8 +9,8 @@ 
 $plural = elgg_get_plugin_setting($pluralvar, 'rename_friends');
 
 // set defaults if setting can't be found
-if(empty($singular)){ $singular = elgg_echo('collègue'); }
-if(empty($plural)){ $plural = elgg_echo('collègues'); }
+if (empty($singular)) { $singular = elgg_echo('collègue'); }
+if (empty($plural)) { $plural = elgg_echo('collègues'); }
 
 // get first letter of each, and register variables for starting with uppercase and lowercase first letter
 // $usingle = uppercase singluar eg. Friend
@@ -38,14 +38,14 @@ 
 // get variables for groups 
 $singular = '';
 $plural = '';
-if(elgg_is_active_plugin('rename_groups')){
+if (elgg_is_active_plugin('rename_groups')) {
   $singular = elgg_get_plugin_setting($singularvar, 'rename_groups');
   $plural = elgg_get_plugin_setting($pluralvar, 'rename_groups');
 }
 
   // set defaults if setting can't be found
-  if(empty($singular)){ $singular = elgg_echo('groups:group'); }
-  if(empty($plural)){ $plural = elgg_echo('groups'); }
+  if (empty($singular)) { $singular = elgg_echo('groups:group'); }
+  if (empty($plural)) { $plural = elgg_echo('groups'); }
 
   // get first letter of each, and register variables for starting with uppercase and lowercase first letter
   // $usingle = uppercase singluar eg. Group

mod/rename_friends/languages/en.php

Indentation +8 added lines, -8 removed lines

@@ -79,13 +79,13 @@ 
 	'rename_friends:singular' => "Singular",
 
 
-    /*
+	/*
      * 	Default Notification Settings
      */
 	'notifications_tools:friends_notifications' => "Choose the default notification method for {$lplural} notifications (This will be applied when a new user acount is created)",
-    'notifications_tools:friends_batch_method' => "Choose a notification method for {$lplural} notifications (This will affect all site users)",
+	'notifications_tools:friends_batch_method' => "Choose a notification method for {$lplural} notifications (This will affect all site users)",
 
-    /*
+	/*
      * Elgg Core
      */
 
@@ -127,7 +127,7 @@ 
 
 You cannot reply to this email.",
 
-    /*
+	/*
      * 	Extendafriend
      */
 
@@ -135,7 +135,7 @@ 
 	'extendafriend:updated' => "{$usingle} access circles have been updated",
 
 
-    /*
+	/*
      * 	Friend Request
      */
 
@@ -192,13 +192,13 @@ 
 
 
 
-    /*
+	/*
      * 	HypeEvents
      */
 
-    'hj:events:friendevents' => "{$uplural} Events",
+	'hj:events:friendevents' => "{$uplural} Events",
 
-    /*
+	/*
      * 	Invite Friends
      */
 	

Spacing +5 added lines, -5 removed lines

@@ -9,8 +9,8 @@ 
 $plural = elgg_get_plugin_setting($pluralvar, 'rename_friends');
 
 // set defaults if setting can't be found
-if(empty($singular)){ $singular = elgg_echo('friend'); }
-if(empty($plural)){ $plural = elgg_echo('friends'); }
+if (empty($singular)) { $singular = elgg_echo('friend'); }
+if (empty($plural)) { $plural = elgg_echo('friends'); }
 
 // get first letter of each, and register variables for starting with uppercase and lowercase first letter
 // $usingle = uppercase singluar eg. Friend
@@ -38,14 +38,14 @@ 
 // get variables for groups 
 $singular = '';
 $plural = '';
-if(elgg_is_active_plugin('rename_groups')){
+if (elgg_is_active_plugin('rename_groups')) {
   $singular = elgg_get_plugin_setting($singularvar, 'rename_groups');
   $plural = elgg_get_plugin_setting($pluralvar, 'rename_groups');
 }
 
   // set defaults if setting can't be found
-  if(empty($singular)){ $singular = elgg_echo('groups:group'); }
-  if(empty($plural)){ $plural = elgg_echo('groups'); }
+  if (empty($singular)) { $singular = elgg_echo('groups:group'); }
+  if (empty($plural)) { $plural = elgg_echo('groups'); }
 
   // get first letter of each, and register variables for starting with uppercase and lowercase first letter
   // $usingle = uppercase singluar eg. Group

mod/gc_tags/actions/blog/save.php

Spacing +4 added lines, -4 removed lines

@@ -15,7 +15,7 @@ 
 elgg_make_sticky_form('blog');
 
 // save or preview
-$save = (bool)get_input('preview');
+$save = (bool) get_input('preview');
 
 // store errors to pass along
 $error = FALSE;
@@ -57,7 +57,7 @@ 
 	'comments_on' => 'On',
 	'excerpt' => '',
 	'tags' => '',
-	'container_guid' => (int)get_input('container_guid'),
+	'container_guid' => (int) get_input('container_guid'),
 );
 
 // fail if a required entity isn't set
@@ -112,7 +112,7 @@ 
 //implode for tranlation
 $values['title'] = gc_implode_translation($values['title'], $values['title2']);
 $values['excerpt'] = gc_implode_translation($values['excerpt'], $values['excerpt2']);
-$values['description'] =gc_implode_translation($values['description'], $values['description2']);
+$values['description'] = gc_implode_translation($values['description'], $values['description2']);
 
 // if preview, force status to be draft
 if ($save == true) {
@@ -128,7 +128,7 @@ 
 // assign values to the entity, stopping on error.
 if (!$error) {
 	foreach ($values as $name => $value) {
-		if (($name != 'title2') && ($name != 'description2') &&  ($name != 'excerpt2')){ // remove input 2 in metastring table
+		if (($name != 'title2') && ($name != 'description2') && ($name != 'excerpt2')) { // remove input 2 in metastring table
 		$blog->$name = $value;
 		}
 	}

mod/gc_tags/views/default/page/elements/tags_modal.php

Indentation +29 added lines, -29 removed lines

@@ -12,49 +12,49 @@ 
 $guid = elgg_extract('guid', $vars, null);

 

 $help_link_main = elgg_view('output/url', array(

-    'text' => '[?] <span class="wb-invisible">'.elgg_echo("gctags:help:title").'</span>',

-    'href' => '/community-help',

-    'title' => elgg_echo("gctags:help:title"),

-    'target' => '_blank',

+	'text' => '[?] <span class="wb-invisible">'.elgg_echo("gctags:help:title").'</span>',

+	'href' => '/community-help',

+	'title' => elgg_echo("gctags:help:title"),

+	'target' => '_blank',

 ));

 

 $help_link_tags = elgg_view('output/url', array(

-    'text' => '[?] <span class="wb-invisible">'.elgg_echo("gctags:help:tags").'</span>',

-    'href' => '/community-help#what-are-tags',

-    'title' => elgg_echo("gctags:help:tags"),

-    'target' => '_blank',

+	'text' => '[?] <span class="wb-invisible">'.elgg_echo("gctags:help:tags").'</span>',

+	'href' => '/community-help#what-are-tags',

+	'title' => elgg_echo("gctags:help:tags"),

+	'target' => '_blank',

 ));

 

 $community_button = elgg_view('input/community',array(

-    'entity' => $entity,

-    'value' => $vars['audience'],

-    'guid' => $guid,

+	'entity' => $entity,

+	'value' => $vars['audience'],

+	'guid' => $guid,

 ));

 

 //different mods like to call tags other things! neato

 if(elgg_in_context('groups')){

-    $tag_name = 'interests';

+	$tag_name = 'interests';

 }else{

-    $tag_name ='tags';

+	$tag_name ='tags';

 }

 $tags_button = elgg_view('input/tags',array(

-    'name' => $tag_name,

-    'value' => $vars[$tag_name],

+	'name' => $tag_name,

+	'value' => $vars[$tag_name],

 ));

 

 

 $save_button = elgg_view('input/submit', array(

 	'value' => elgg_echo('publish'),

 	'name' => 'save',

-    'class' => 'btn btn-primary form-submit',

+	'class' => 'btn btn-primary form-submit',

 ));

 

 $cancel_tagging = elgg_view('output/url',array(

-    'text' => elgg_echo('close'),

-    'href' => '#',

-    'class' => 'close-tag-modal',

-    'data-dismiss' => 'modal',

-    'aria-label' => 'Close',

+	'text' => elgg_echo('close'),

+	'href' => '#',

+	'class' => 'close-tag-modal',

+	'data-dismiss' => 'modal',

+	'aria-label' => 'Close',

 ));

 $buttonText = elgg_echo('gctags:button:create');

 ?>

@@ -72,18 +72,18 @@ 
             </div>

             <div class="modal-body">

                <?php

-                 echo $community_button;

-                echo elgg_format_element('label', array('for' => 'tags'), elgg_echo('tags'));

-                echo elgg_format_element('span',array('class' => 'mrgn-lft-sm'),$help_link_tags);

-                echo $tags_button;

+				 echo $community_button;

+				echo elgg_format_element('label', array('for' => 'tags'), elgg_echo('tags'));

+				echo elgg_format_element('span',array('class' => 'mrgn-lft-sm'),$help_link_tags);

+				echo $tags_button;

                 

-                ?>

+				?>

             </div>

             <div class="modal-footer">

                 <?php 

-                    echo $cancel_tagging;

-                    echo $save_button; 

-                ?>

+					echo $cancel_tagging;

+					echo $save_button; 

+				?>

             </div>

         </div>

     </div>

Spacing +10 added lines, -10 removed lines

@@ -12,32 +12,32 @@ 
 $guid = elgg_extract('guid', $vars, null);

 

 $help_link_main = elgg_view('output/url', array(

-    'text' => '[?] <span class="wb-invisible">'.elgg_echo("gctags:help:title").'</span>',

+    'text' => '[?] <span class="wb-invisible">' . elgg_echo("gctags:help:title") . '</span>',

     'href' => '/community-help',

     'title' => elgg_echo("gctags:help:title"),

     'target' => '_blank',

 ));

 

 $help_link_tags = elgg_view('output/url', array(

-    'text' => '[?] <span class="wb-invisible">'.elgg_echo("gctags:help:tags").'</span>',

+    'text' => '[?] <span class="wb-invisible">' . elgg_echo("gctags:help:tags") . '</span>',

     'href' => '/community-help#what-are-tags',

     'title' => elgg_echo("gctags:help:tags"),

     'target' => '_blank',

 ));

 

-$community_button = elgg_view('input/community',array(

+$community_button = elgg_view('input/community', array(

     'entity' => $entity,

     'value' => $vars['audience'],

     'guid' => $guid,

 ));

 

 //different mods like to call tags other things! neato

-if(elgg_in_context('groups')){

+if (elgg_in_context('groups')) {

     $tag_name = 'interests';

-}else{

-    $tag_name ='tags';

+} else {

+    $tag_name = 'tags';

 }

-$tags_button = elgg_view('input/tags',array(

+$tags_button = elgg_view('input/tags', array(

     'name' => $tag_name,

     'value' => $vars[$tag_name],

 ));

@@ -49,7 +49,7 @@ 
     'class' => 'btn btn-primary form-submit',

 ));

 

-$cancel_tagging = elgg_view('output/url',array(

+$cancel_tagging = elgg_view('output/url', array(

     'text' => elgg_echo('close'),

     'href' => '#',

     'class' => 'close-tag-modal',

@@ -66,7 +66,7 @@ 
             <div class="modal-header"> 

             <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>

                 <div class="modal-title">

-                    <span class="h4"><?php echo elgg_echo('gctags:modal:header');?></span>

+                    <span class="h4"><?php echo elgg_echo('gctags:modal:header'); ?></span>

                     <span><?php echo $help_link; ?></span>

                 </div>

             </div>

@@ -74,7 +74,7 @@ 
                <?php

                  echo $community_button;

                 echo elgg_format_element('label', array('for' => 'tags'), elgg_echo('tags'));

-                echo elgg_format_element('span',array('class' => 'mrgn-lft-sm'),$help_link_tags);

+                echo elgg_format_element('span', array('class' => 'mrgn-lft-sm'), $help_link_tags);

                 echo $tags_button;

                 

                 ?>

Braces +1 added lines, -1 removed lines

@@ -34,7 +34,7 @@
 //different mods like to call tags other things! neato

 if(elgg_in_context('groups')){

     $tag_name = 'interests';

-}else{

+} else{

     $tag_name ='tags';

 }

 $tags_button = elgg_view('input/tags',array(

mod/gccollab_theme/languages/fr.php

Spacing +9 added lines, -9 removed lines

@@ -133,9 +133,9 @@ 
   /**
    * External Pages
    */
-  'expages:about' => "About",     // GCChange change - Ilia: Bilingual page url
-  'expages:terms' => "Terms",     // GCChange change - Ilia: Bilingual page url
-  'expages:privacy' => "Privacy",   // GCChange change - Ilia: Bilingual page url
+  'expages:about' => "About", // GCChange change - Ilia: Bilingual page url
+  'expages:terms' => "Terms", // GCChange change - Ilia: Bilingual page url
+  'expages:privacy' => "Privacy", // GCChange change - Ilia: Bilingual page url
   'expages:a_propos' => "À propos",
   'expages:termes' => "Termes",
   'expages:confidentialite' => "Confidentialité",
@@ -147,20 +147,20 @@ 
   /**
    * Notifications
    */
-  'cp_newsletter:notice' => "Choisissez le moyen par lequel vous souhaitez recevoir des avis sur les activités de GCcollab qui vous intéressent. Le <strong>résumé des notifications</strong> vous permet de recevoir un courriel quotidien ou hebdomadaire contenant un sommaire des activités auxquelles vous êtes abonné. Vous préférez recevoir un avis instantané? Oubliez le résumé et sélectionnez le contenu pour lequel vous souhaitez recevoir des avis en temps réel. Veuillez noter que les avis par courriel sont envoyés à l’adresse électronique utilisée dans vos <a href='".elgg_get_site_url()."settings/user/?utm_source=notification_digest&utm_medium=email'>paramètres d’utilisateur</a>.",
+  'cp_newsletter:notice' => "Choisissez le moyen par lequel vous souhaitez recevoir des avis sur les activités de GCcollab qui vous intéressent. Le <strong>résumé des notifications</strong> vous permet de recevoir un courriel quotidien ou hebdomadaire contenant un sommaire des activités auxquelles vous êtes abonné. Vous préférez recevoir un avis instantané? Oubliez le résumé et sélectionnez le contenu pour lequel vous souhaitez recevoir des avis en temps réel. Veuillez noter que les avis par courriel sont envoyés à l’adresse électronique utilisée dans vos <a href='" . elgg_get_site_url() . "settings/user/?utm_source=notification_digest&utm_medium=email'>paramètres d’utilisateur</a>.",
   'cp_newsletter:notice:disable_digest' => "Le résumé des avis est maintenant activé; veuillez choisir ci après vos préférences applicables au résumé (fréquence et langue). Le résumé comprendra tout le contenu sélectionné dans la colonne « Courriel », de même que les abonnements dans la section « Autres abonnements de contenu ». Si vous choisissez d’activer le résumé des notifications, vous ne recevrez plus de notifications par courriel ou de site en temps réel (instantanément) au moment où ont lieu les différentes activités de GCcollab (à l’exception des notifications de type administratif).",
   'cp_notifications:mail_body:subtype:thewire' => "<a href='%s'>%s</a> a publié sur le <a href='%s'>%s</a>",
-  'cp_newsletter:body:nothing' => "Il semble que c'était calme dans votre réseau sur GCcollab. Joignez-vous à des <a href='".elgg_get_site_url()."groups/all?filter=popular?utm_source=notification_digest&utm_medium=email'>groupes</a> d'intérêt, partagez des informations et ajoutez des nouveaux <a href='".elgg_get_site_url()."members/popular?utm_source=notification_digest&utm_medium=email'>collègues</a> pour rester informé et grandir votre réseau!",
+  'cp_newsletter:body:nothing' => "Il semble que c'était calme dans votre réseau sur GCcollab. Joignez-vous à des <a href='" . elgg_get_site_url() . "groups/all?filter=popular?utm_source=notification_digest&utm_medium=email'>groupes</a> d'intérêt, partagez des informations et ajoutez des nouveaux <a href='" . elgg_get_site_url() . "members/popular?utm_source=notification_digest&utm_medium=email'>collègues</a> pour rester informé et grandir votre réseau!",
   'cp_notification:email_header' => "Ceci est un message généré par le système de GCcollab. Veuillez ne pas répondre à ce message",
   'cp_notify:body_edit:description' => "<a href='%s'>Visualiser ou afficher un commentaire</a> <br/>
     Vous pouvez aimer, partager et vous abonner à ce contenu dans GCcollab.",
   'cp_notify:body_group_invite_email:title' => "<a href='%s'>%s</a> vous a invité à joindre le groupe <a href='%s'>%s</a> sur GCcollab. <br>",
   'cp_notify:body_group_invite_email:description' => "<a href='%s'>Inscrivez-vous maintenant</a> et vous serez automatiquement ajouté au groupe.<br/><br/>
 
-  Si vous désirez vous inscrire à une date ultérieure en utilisant le <a href='".elgg_get_site_url()."register'>formulaire d’inscription</a> sur GCcollab, vous pouvez vous joindre au groupe en utilisant le code suivant sur votre page d'<a href='%s'>invitation de groupe</a> : %s .<br/><br/>
+  Si vous désirez vous inscrire à une date ultérieure en utilisant le <a href='".elgg_get_site_url() . "register'>formulaire d’inscription</a> sur GCcollab, vous pouvez vous joindre au groupe en utilisant le code suivant sur votre page d'<a href='%s'>invitation de groupe</a> : %s .<br/><br/>
  
-  Vous-êtes déjà sur GCcollab? Votre adresse est peut-être désuète. <a href='".elgg_get_site_url()."login'>Connectez-vous</a> et mettez à jour vos paramètres de comptes.<br/> ",
-  'cp_notify:footer:no_user' => 'Besoin d\'aide? <a href="'.elgg_get_site_url().'help/knowledgebase/?utm_source=notification&utm_medium=email">Contactez-nous</a>.',
+  Vous-êtes déjà sur GCcollab? Votre adresse est peut-être désuète. <a href='".elgg_get_site_url() . "login'>Connectez-vous</a> et mettez à jour vos paramètres de comptes.<br/> ",
+  'cp_notify:footer:no_user' => 'Besoin d\'aide? <a href="' . elgg_get_site_url() . 'help/knowledgebase/?utm_source=notification&utm_medium=email">Contactez-nous</a>.',
   'cp_personalized_message' => "<div style='border: 1px solid #46246A; padding:5px; margin-bottom:10px;'>%s vous a envoyé un message personnalisé:<br/><i>%s</i></div>",
   'cp_notify:body_new_content:description' => "La description de leur nouvelle publication se lit comme suit : <br/> 
     %s <br/>
@@ -192,7 +192,7 @@ 
 <p>Il est possible d’obtenir des réponses à toute question ayant trait au codage et à tout problème lié(e) à la plateforme à partir de GitHub. Ainsi, si vous avez des suggestions ou souhaitez nous aider à les améliorer, joignez-vous à nous!</p>",
   'cp_notify:body_validate_user:description' => "Bienvenue sur GCconnex. Afin de compléter votre inscription, veuillez valider votre compte enregistré sous le nom %s en cliquant sur le lien suivant : %s",
   'cp_notify:footer' => "",
-  'cp_notify:footer2' => "Besoin d’aide? <a href='".elgg_get_site_url()."help/knowledgebase/?utm_source=notification&utm_medium=email'>Contactez-nous</a>.<br/>Pour vous désabonner de ces notifications, connectez-vous à GCcollab et modifiez vos <a href='%s'>paramètres de notifications</a>.",
+  'cp_notify:footer2' => "Besoin d’aide? <a href='" . elgg_get_site_url() . "help/knowledgebase/?utm_source=notification&utm_medium=email'>Contactez-nous</a>.<br/>Pour vous désabonner de ces notifications, connectez-vous à GCcollab et modifiez vos <a href='%s'>paramètres de notifications</a>.",
   'cp_notify:visitTutorials'=>'',
   'cp_notify:body:contentshare:description' => "<p>%s a partagé votre contenu sur le fil.</p> 
                           <p><i>%s</i></p> <br/>

mod/gccollab_theme/languages/en.php

Spacing +9 added lines, -9 removed lines

@@ -149,9 +149,9 @@ 
   /**
    * External Pages
    */
-  'expages:about' => "About",     // GCChange change - Ilia: Bilingual page url
-  'expages:terms' => "Terms",     // GCChange change - Ilia: Bilingual page url
-  'expages:privacy' => "Privacy",   // GCChange change - Ilia: Bilingual page url
+  'expages:about' => "About", // GCChange change - Ilia: Bilingual page url
+  'expages:terms' => "Terms", // GCChange change - Ilia: Bilingual page url
+  'expages:privacy' => "Privacy", // GCChange change - Ilia: Bilingual page url
   'expages:a_propos' => "À propos",
   'expages:termes' => "Termes",
   'expages:confidentialite' => "Confidentialité",
@@ -163,19 +163,19 @@ 
   /**
    * Notifications
    */
-  'cp_newsletter:notice' => "Choose how you want to be notified of GCcollab activities of interest to you. The <strong>notifications digest</strong> can be used to receive a daily or weekly email that provides a summary of the activities to which you are subscribed. Prefer to receive instant notification? Forgo the digest and select the content for which you want to receive notification in real-time. Please note that email notifications are sent to the email address used in your <a href='".elgg_get_site_url()."settings/user/?utm_source=notification_digest&utm_medium=email'>Account Settings</a>.",
+  'cp_newsletter:notice' => "Choose how you want to be notified of GCcollab activities of interest to you. The <strong>notifications digest</strong> can be used to receive a daily or weekly email that provides a summary of the activities to which you are subscribed. Prefer to receive instant notification? Forgo the digest and select the content for which you want to receive notification in real-time. Please note that email notifications are sent to the email address used in your <a href='" . elgg_get_site_url() . "settings/user/?utm_source=notification_digest&utm_medium=email'>Account Settings</a>.",
   'cp_newsletter:notice:disable_digest' => "The notifications digest is now enabled; please select your digest preferences below (frequency and language preference). The digest will include all content selected in the 'Email' column below, as well the subscriptions in the 'Other content subscriptions' section. If you choose to enable the notifications digest, you will no longer receive real-time (instant) notifications by email and/or on the site, about activities happening on GCcollab (with the exception of administrative-type notifications).",
   'cp_notifications:mail_body:subtype:thewire' => "<a href='%s'>%s</a> posted on the <a href='%s'>%s</a>",
-  'cp_newsletter:body:nothing' => "It seems it was quiet in your network on GCcollab. Join <a href='".elgg_get_site_url()."groups/all?filter=popular?utm_source=notification_digest&utm_medium=email'>groups</a> of interest, share information and add new <a href='".elgg_get_site_url()."members/popular?utm_source=notification_digest&utm_medium=email'>colleagues</a> to stay informed and grow your network!",
+  'cp_newsletter:body:nothing' => "It seems it was quiet in your network on GCcollab. Join <a href='" . elgg_get_site_url() . "groups/all?filter=popular?utm_source=notification_digest&utm_medium=email'>groups</a> of interest, share information and add new <a href='" . elgg_get_site_url() . "members/popular?utm_source=notification_digest&utm_medium=email'>colleagues</a> to stay informed and grow your network!",
   'cp_notification:email_header' => "This is a system-generated message from GCcollab. Please do not reply to this message",
   'cp_notify:body_edit:description' => "<a href='%s'>View or comment</a><br/>You can like, share or subscribe to this content directly in GCcollab",
   'cp_notify:body_group_invite_email:title' => "<a href='%s'>%s</a> invited you to join the <a href='%s'>%s</a> group on GCcollab.<br>",
   'cp_notify:body_group_invite_email:description' => "<a href='%s'>Register now</a> and be automatically added to the group.<br/><br/>
 
-  If you would like to register at a later time using the <a href='".elgg_get_site_url()."register'>Registration form</a> on GCcollab, you can join the group by using the following code on your <a href='%s'>group invitations</a> page: %s .<br/><br/>
+  If you would like to register at a later time using the <a href='".elgg_get_site_url() . "register'>Registration form</a> on GCcollab, you can join the group by using the following code on your <a href='%s'>group invitations</a> page: %s .<br/><br/>
  
-  Already on GCcollab? Your email address may be out of date. <a href='".elgg_get_site_url()."login'>Login</a> and update your account settings.<br/> ",
-  'cp_notify:footer:no_user' => 'Need help? <a href="'.elgg_get_site_url().'help/knowledgebase/?utm_source=notification&utm_medium=email">Contact us</a>.',
+  Already on GCcollab? Your email address may be out of date. <a href='".elgg_get_site_url() . "login'>Login</a> and update your account settings.<br/> ",
+  'cp_notify:footer:no_user' => 'Need help? <a href="' . elgg_get_site_url() . 'help/knowledgebase/?utm_source=notification&utm_medium=email">Contact us</a>.',
   'cp_personalized_message' => "<div style='border: 1px solid #46246A; padding:5px; margin-bottom:10px;'>Personalized message from %s:<br/><i>%s</i></div>",
   'cp_notify:body_new_content:description' => "The description of the new posting is: <br/>
     %s <br/>
@@ -207,7 +207,7 @@ 
 <p>All of the code and issues related to the platform are available on GitHub, so if you have any suggestions or want to help us make them better, please join in!</p>",
   'cp_notify:body_validate_user:description' => "Welcome to GCcollab, to complete your registration, please validate the account registered under %s by clicking on this link: %s",
   'cp_notify:footer' => "",
-  'cp_notify:footer2' => "Need help? <a href='".elgg_get_site_url()."help/knowledgebase/?utm_source=notification&utm_medium=email'>Contact us</a>.<br/>To unsubscribe from these notifications, login to GCcollab and edit your <a href='%s'>notifications' settings</a>.",
+  'cp_notify:footer2' => "Need help? <a href='" . elgg_get_site_url() . "help/knowledgebase/?utm_source=notification&utm_medium=email'>Contact us</a>.<br/>To unsubscribe from these notifications, login to GCcollab and edit your <a href='%s'>notifications' settings</a>.",
   'cp_notify:visitTutorials'=>'',
   'cp_notify:body:contentshare:description' => "<p>%s shared your content on the wire.</p> 
                           <p><i>%s</i></p> <br/>

mod/gccollab_theme/start.php

Indentation +298 added lines, -298 removed lines

@@ -11,61 +11,61 @@ 
 elgg_register_event_handler('init', 'system', 'gccollab_theme_init');
 
 function gccollab_theme_init() {
-    elgg_register_page_handler('hello', 'gccollab_theme_page_handler');
-    elgg_register_plugin_hook_handler('register', 'menu:site', 'career_menu_hander');
+	elgg_register_page_handler('hello', 'gccollab_theme_page_handler');
+	elgg_register_plugin_hook_handler('register', 'menu:site', 'career_menu_hander');
     
-    //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',
+	));
     
-    //menu item for Jobs Marketplace
-    elgg_register_menu_item('subSite', array(
-        'name' => 'Jobs Marketplace',
-        'text' => elgg_echo('wet:marketplace:link'),
-        'href' => elgg_echo('wet:marketplace:href'),
-    ));
+	//menu item for Jobs Marketplace
+	elgg_register_menu_item('subSite', array(
+		'name' => 'Jobs Marketplace',
+		'text' => elgg_echo('wet:marketplace:link'),
+		'href' => elgg_echo('wet:marketplace:href'),
+	));
     
-    //menu item for career dropdown
-    elgg_register_menu_item('site', array(
+	//menu item for career dropdown
+	elgg_register_menu_item('site', array(
 		'name' => 'career',
 		'href' => '#career_menu',
 		'text' => elgg_echo('career') . '<span class="expicon glyphicon glyphicon-chevron-down"></span>'
-    ));
+	));
 
-    elgg_register_page_handler('about', 'expages_collab_page_handler');        
-    elgg_register_page_handler('a_propos', 'expages_collab_page_handler');
+	elgg_register_page_handler('about', 'expages_collab_page_handler');        
+	elgg_register_page_handler('a_propos', 'expages_collab_page_handler');
 
-    elgg_register_page_handler('terms', 'expages_collab_page_handler');
-    elgg_register_page_handler('termes', 'expages_collab_page_handler');   
+	elgg_register_page_handler('terms', 'expages_collab_page_handler');
+	elgg_register_page_handler('termes', 'expages_collab_page_handler');   
 
-    elgg_register_page_handler('privacy', 'expages_collab_page_handler');
-    elgg_register_page_handler('confidentialite', 'expages_collab_page_handler');
+	elgg_register_page_handler('privacy', 'expages_collab_page_handler');
+	elgg_register_page_handler('confidentialite', 'expages_collab_page_handler');
 
-    elgg_register_page_handler('faq', 'expages_collab_page_handler');
-    elgg_register_page_handler('qfp', 'expages_collab_page_handler');
+	elgg_register_page_handler('faq', 'expages_collab_page_handler');
+	elgg_register_page_handler('qfp', 'expages_collab_page_handler');
 
-    elgg_register_page_handler('participating_organizations', 'expages_collab_page_handler');
-    elgg_register_page_handler('organismes_participants', 'expages_collab_page_handler');
+	elgg_register_page_handler('participating_organizations', 'expages_collab_page_handler');
+	elgg_register_page_handler('organismes_participants', 'expages_collab_page_handler');
 
-    // Register public external pages
-    elgg_register_plugin_hook_handler('public_pages', 'walled_garden', 'expages_collab_public');
+	// Register public external pages
+	elgg_register_plugin_hook_handler('public_pages', 'walled_garden', 'expages_collab_public');
 
-    elgg_register_plugin_hook_handler('register', 'menu:expages', 'expages_collab_menu_register_hook');
+	elgg_register_plugin_hook_handler('register', 'menu:expages', 'expages_collab_menu_register_hook');
 
-    // add footer links
-    expages_collab_setup_footer_menu();
+	// add footer links
+	expages_collab_setup_footer_menu();
 
-    elgg_register_plugin_hook_handler('register', 'menu:owner_block', 'collab_menu_block_handler');
+	elgg_register_plugin_hook_handler('register', 'menu:owner_block', 'collab_menu_block_handler');
 
-    elgg_register_plugin_hook_handler('members:list', 'type', "members_list_type");
-    elgg_register_plugin_hook_handler('members:config', 'tabs', "members_nav_type");
+	elgg_register_plugin_hook_handler('members:list', 'type', "members_list_type");
+	elgg_register_plugin_hook_handler('members:config', 'tabs', "members_nav_type");
 
-    elgg_register_widget_type('poll',elgg_echo('polls:my_widget_title'),elgg_echo('polls:my_widget_description'), array("profile", "dashboard", "index", "groups"), true);
-    elgg_register_widget_type('poll_individual',elgg_echo('polls:individual'),elgg_echo('poll_individual_group:widget:description'), array("profile", "dashboard", "index", "groups"), true);   
+	elgg_register_widget_type('poll',elgg_echo('polls:my_widget_title'),elgg_echo('polls:my_widget_description'), array("profile", "dashboard", "index", "groups"), true);
+	elgg_register_widget_type('poll_individual',elgg_echo('polls:individual'),elgg_echo('poll_individual_group:widget:description'), array("profile", "dashboard", "index", "groups"), true);   
 }
 
 /**
@@ -73,24 +73,24 @@ 
  *
  */
 function expages_collab_public($hook, $handler, $return, $params){
-    $pages = array('about', 'a_propos', 'terms', 'termes', 'privacy', 'confidentialite', 'faq', 'qfp', 'participating_organizations', 'organismes_participants', 'help/knowledgebase');     // GCChange change - Ilia: Bilingual page url
-    return array_merge($pages, $return);
+	$pages = array('about', 'a_propos', 'terms', 'termes', 'privacy', 'confidentialite', 'faq', 'qfp', 'participating_organizations', 'organismes_participants', 'help/knowledgebase');     // GCChange change - Ilia: Bilingual page url
+	return array_merge($pages, $return);
 }
 
 /**
  * Setup the links to site pages
  */
 function expages_collab_setup_footer_menu() {
-    $pages = array('about', 'a_propos', 'terms', 'termes', 'privacy', 'confidentialite', 'faq', 'qfp', 'participating_organizations', 'organismes_participants', 'help/knowledgebase');     // GCChange change - Ilia: Bilingual page url
+	$pages = array('about', 'a_propos', 'terms', 'termes', 'privacy', 'confidentialite', 'faq', 'qfp', 'participating_organizations', 'organismes_participants', 'help/knowledgebase');     // GCChange change - Ilia: Bilingual page url
     
-    foreach ($pages as $page) {
-        $url = "$page";
-        $wg_item = new ElggMenuItem($page, elgg_echo("expages:$page"), $url);
-        elgg_register_menu_item('walled_garden', $wg_item);
-
-        $footer_item = clone $wg_item;
-        elgg_register_menu_item('footer', $footer_item);
-    }
+	foreach ($pages as $page) {
+		$url = "$page";
+		$wg_item = new ElggMenuItem($page, elgg_echo("expages:$page"), $url);
+		elgg_register_menu_item('walled_garden', $wg_item);
+
+		$footer_item = clone $wg_item;
+		elgg_register_menu_item('footer', $footer_item);
+	}
 }
 
 /**
@@ -101,44 +101,44 @@ 
  * @return bool
  */
 function expages_collab_page_handler($page, $handler) {
-    if ($handler == 'expages') {
-        expages_url_forwarder($page[1]);
-    }
-    $type = strtolower($handler);
-
-    $title = elgg_echo("expages:$type");
-    $header = elgg_view_title($title);
-
-    $object = elgg_get_entities(array(
-        'type' => 'object',
-        'subtype' => $type,
-        'limit' => 1,
-    ));
-    if ($object) {
-        $content .= elgg_view('output/longtext', array('value' => $object[0]->description));
-    } else {
-        $content .= elgg_echo("expages:notset");
-    }
-    $content = elgg_view('expages/wrapper', array('content' => $content));
+	if ($handler == 'expages') {
+		expages_url_forwarder($page[1]);
+	}
+	$type = strtolower($handler);
+
+	$title = elgg_echo("expages:$type");
+	$header = elgg_view_title($title);
+
+	$object = elgg_get_entities(array(
+		'type' => 'object',
+		'subtype' => $type,
+		'limit' => 1,
+	));
+	if ($object) {
+		$content .= elgg_view('output/longtext', array('value' => $object[0]->description));
+	} else {
+		$content .= elgg_echo("expages:notset");
+	}
+	$content = elgg_view('expages/wrapper', array('content' => $content));
     
-    if (elgg_is_admin_logged_in()) {
-        elgg_register_menu_item('title', array(
-            'name' => 'edit',
-            'text' => elgg_echo('edit'),
-            'href' => "admin/appearance/expages?type=$type",
-            'link_class' => 'elgg-button elgg-button-action',
-        ));
-    }
-
-    if (elgg_is_logged_in() || !elgg_get_config('walled_garden')) {
-        $body = elgg_view_layout('one_column', array('title' => $title, 'content' => $content));
-        echo elgg_view_page($title, $body);
-    } else {
-        elgg_load_css('elgg.walled_garden');
-        $body = elgg_view_layout('walled_garden', array('content' => $header . $content));
-        echo elgg_view_page($title, $body, 'walled_garden');
-    }
-    return true;
+	if (elgg_is_admin_logged_in()) {
+		elgg_register_menu_item('title', array(
+			'name' => 'edit',
+			'text' => elgg_echo('edit'),
+			'href' => "admin/appearance/expages?type=$type",
+			'link_class' => 'elgg-button elgg-button-action',
+		));
+	}
+
+	if (elgg_is_logged_in() || !elgg_get_config('walled_garden')) {
+		$body = elgg_view_layout('one_column', array('title' => $title, 'content' => $content));
+		echo elgg_view_page($title, $body);
+	} else {
+		elgg_load_css('elgg.walled_garden');
+		$body = elgg_view_layout('walled_garden', array('content' => $header . $content));
+		echo elgg_view_page($title, $body, 'walled_garden');
+	}
+	return true;
 }
 
 /**
@@ -152,208 +152,208 @@ 
  * @return array
  */
 function expages_collab_menu_register_hook($hook, $type, $return, $params) {
-    $type = elgg_extract('type', $params);
+	$type = elgg_extract('type', $params);
         
-    $pages = array('about', 'a_propos', 'terms', 'termes', 'privacy', 'confidentialite', 'faq', 'qfp', 'participating_organizations', 'organismes_participants');
-    foreach ($pages as $page) {
-        $return[] = ElggMenuItem::factory(array(
-            'name' => $page,
-            'text' => elgg_echo("expages:$page"),
-            'href' => "admin/appearance/expages?type=$page",
-            'selected' => $page === $type,
-        ));
-    }
-    return $return;
+	$pages = array('about', 'a_propos', 'terms', 'termes', 'privacy', 'confidentialite', 'faq', 'qfp', 'participating_organizations', 'organismes_participants');
+	foreach ($pages as $page) {
+		$return[] = ElggMenuItem::factory(array(
+			'name' => $page,
+			'text' => elgg_echo("expages:$page"),
+			'href' => "admin/appearance/expages?type=$page",
+			'selected' => $page === $type,
+		));
+	}
+	return $return;
 }
 
 // function that handles moving jobs marketplace and micro missions into drop down menu
 function career_menu_hander($hook, $type, $menu, $params){
-    foreach ($menu as $key => $item){
+	foreach ($menu as $key => $item){
 
-        switch ($item->getName()) {
-            case 'career':
-                $item->addChild(elgg_get_menu_item('subSite', 'Jobs Marketplace'));
+		switch ($item->getName()) {
+			case 'career':
+				$item->addChild(elgg_get_menu_item('subSite', 'Jobs Marketplace'));
                 
-                if(elgg_is_active_plugin('missions')){
-                    $item->addChild(elgg_get_menu_item('site', 'mission_main'));
-                }
-                if(elgg_is_active_plugin('gcforums')){
-                    $item->addChild(elgg_get_menu_item('subSite', 'Forum'));
-                }
-
-                $item->addChild(elgg_get_menu_item('subSite', 'jobs'));
-                $item->setLinkClass('item');
-                break;
-        }
-    }
+				if(elgg_is_active_plugin('missions')){
+					$item->addChild(elgg_get_menu_item('site', 'mission_main'));
+				}
+				if(elgg_is_active_plugin('gcforums')){
+					$item->addChild(elgg_get_menu_item('subSite', 'Forum'));
+				}
+
+				$item->addChild(elgg_get_menu_item('subSite', 'jobs'));
+				$item->setLinkClass('item');
+				break;
+		}
+	}
 }
 
 function collab_menu_block_handler($hook, $type, $menu, $params){
-    //rearrange menu items
-    if(elgg_get_context() == 'groupSubPage' || elgg_in_context('group_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 'gcforums':
-                    $item->setPriority('1');
-                    $item->setLinkClass('forums');
-                    break;
-                case 'file':
-                    $item->setText(elgg_echo('gprofile:files'));
-                    $item->setPriority('2');
-                    break;
-                case 'blog':
-                    $item->setText(elgg_echo('gprofile:blogs'));
-                    $item->setPriority('3');
-                    break;
-                case 'event_calendar':
-                    $item->setText(elgg_echo('gprofile:events'));
-                    $item->setPriority('4');
-                    break;
-                case 'etherpad':
-                    $item->setPriority('5');
-                    break;
-                case 'pages':
-                    $item->setText(elgg_echo('gprofile:pages'));
-                    $item->setPriority('6');
-                    break;
-                case 'bookmarks':
-                    $item->setText(elgg_echo('gprofile:bookmarks'));
-                    $item->setPriority('7');
-                    break;
-                case 'activity':
-                    $item->setText('Activity');
-                    $item->setPriority('8');
-                    $item->addItemClass('removeMe');
-                    break;
-                case 'questions':
-                    $item->setText(elgg_echo('widget:questions:title'));
-                    $item->setPriority('9');
-                    break;
-                case 'polls':
-                    $item->setText(elgg_echo('gprofile:polls'));
-                    $item->setPriority('10');
-                    break;
-                case 'tasks':
-                    $item->setText(elgg_echo('gprofile:tasks'));
-                    $item->setPriority('11');
-                    break;
-                case 'photos':
-                    $item->setText(elgg_echo('gprofile:photos'));
-                    $item->addItemClass('removeMe');
-                    $item->setPriority('12');
-                    break;
-                case 'photo_albums':
-                    $item->setText(elgg_echo('gprofile:albumsCatch'));
-                    $item->setPriority('13');
-                    break;
-                case 'ideas':
-                    $item->setText(elgg_echo('gprofile:ideas'));
-                    $item->setPriority('14');
-                    break;
-                case 'related_groups':
-                    $item->setPriority('15');
-                    break;
-            }
-        }
-    }
-
-    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('4');
-                    break;
-                case 'thewire':
-                    //$item->setText(elgg_echo('The Wire'));
-                    $item->setHref('#thewire');
-                    $item->setPriority('5');
-                    break;
-                case 'etherpad':
-                    $item->setHref('#etherpad');
-                    $item->setPriority('6');
-                    break;
-                case 'pages':
-                    $item->setText(elgg_echo('gprofile:pages'));
-                    $item->setHref('#page_top');
-                    $item->setPriority('7');
-                    break;
-                case 'questions':
-                    $item->setText(elgg_echo('widget:questions:title'));
-                    $item->setHref('#question');
-                    $item->setPriority('8');
-                    break;
-                case 'bookmarks':
-                    $item->setText(elgg_echo('gprofile:bookmarks'));
-                    $item->setHref('#bookmarks');
-                    $item->setPriority('9');
-                    break;
-                case 'polls':
-                    $item->setText(elgg_echo('gprofile:polls'));
-                    $item->setHref('#poll');
-                    $item->setPriority('10');
-                    break;
-                case 'tasks':
-                    $item->setText(elgg_echo('gprofile:tasks'));
-                    $item->setHref('#task_top');
-                    $item->setPriority('11');
-                    break;
-                case 'photos':
-                    $item->setText(elgg_echo('gprofile:photos'));
-                    $item->addItemClass('removeMe');
-                    $item->setPriority('12');
-                    break;
-                case 'photo_albums':
-                    $item->setText(elgg_echo('gprofile:albumsCatch'));
-                    $item->setHref('#album');
-                    $item->setPriority('13');
-                    break;
-                case 'ideas':
-                    $item->setText(elgg_echo('gprofile:ideas'));
-                    $item->addItemClass('removeMe');
-                    $item->setPriority('14');
-                    break;
-                case 'orgs':
-                    $item->setPriority('15');
-                    break;
-                case 'activity':
-                    $item->setText('Activity');
-                    $item->setPriority('16');
-                    $item->addItemClass('removeMe');
-                    break;
-                case 'user_invite_from_profile':
-                    $item->setPriority('17');
-                    break;
-            }
-        }
-    }
+	//rearrange menu items
+	if(elgg_get_context() == 'groupSubPage' || elgg_in_context('group_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 'gcforums':
+					$item->setPriority('1');
+					$item->setLinkClass('forums');
+					break;
+				case 'file':
+					$item->setText(elgg_echo('gprofile:files'));
+					$item->setPriority('2');
+					break;
+				case 'blog':
+					$item->setText(elgg_echo('gprofile:blogs'));
+					$item->setPriority('3');
+					break;
+				case 'event_calendar':
+					$item->setText(elgg_echo('gprofile:events'));
+					$item->setPriority('4');
+					break;
+				case 'etherpad':
+					$item->setPriority('5');
+					break;
+				case 'pages':
+					$item->setText(elgg_echo('gprofile:pages'));
+					$item->setPriority('6');
+					break;
+				case 'bookmarks':
+					$item->setText(elgg_echo('gprofile:bookmarks'));
+					$item->setPriority('7');
+					break;
+				case 'activity':
+					$item->setText('Activity');
+					$item->setPriority('8');
+					$item->addItemClass('removeMe');
+					break;
+				case 'questions':
+					$item->setText(elgg_echo('widget:questions:title'));
+					$item->setPriority('9');
+					break;
+				case 'polls':
+					$item->setText(elgg_echo('gprofile:polls'));
+					$item->setPriority('10');
+					break;
+				case 'tasks':
+					$item->setText(elgg_echo('gprofile:tasks'));
+					$item->setPriority('11');
+					break;
+				case 'photos':
+					$item->setText(elgg_echo('gprofile:photos'));
+					$item->addItemClass('removeMe');
+					$item->setPriority('12');
+					break;
+				case 'photo_albums':
+					$item->setText(elgg_echo('gprofile:albumsCatch'));
+					$item->setPriority('13');
+					break;
+				case 'ideas':
+					$item->setText(elgg_echo('gprofile:ideas'));
+					$item->setPriority('14');
+					break;
+				case 'related_groups':
+					$item->setPriority('15');
+					break;
+			}
+		}
+	}
+
+	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('4');
+					break;
+				case 'thewire':
+					//$item->setText(elgg_echo('The Wire'));
+					$item->setHref('#thewire');
+					$item->setPriority('5');
+					break;
+				case 'etherpad':
+					$item->setHref('#etherpad');
+					$item->setPriority('6');
+					break;
+				case 'pages':
+					$item->setText(elgg_echo('gprofile:pages'));
+					$item->setHref('#page_top');
+					$item->setPriority('7');
+					break;
+				case 'questions':
+					$item->setText(elgg_echo('widget:questions:title'));
+					$item->setHref('#question');
+					$item->setPriority('8');
+					break;
+				case 'bookmarks':
+					$item->setText(elgg_echo('gprofile:bookmarks'));
+					$item->setHref('#bookmarks');
+					$item->setPriority('9');
+					break;
+				case 'polls':
+					$item->setText(elgg_echo('gprofile:polls'));
+					$item->setHref('#poll');
+					$item->setPriority('10');
+					break;
+				case 'tasks':
+					$item->setText(elgg_echo('gprofile:tasks'));
+					$item->setHref('#task_top');
+					$item->setPriority('11');
+					break;
+				case 'photos':
+					$item->setText(elgg_echo('gprofile:photos'));
+					$item->addItemClass('removeMe');
+					$item->setPriority('12');
+					break;
+				case 'photo_albums':
+					$item->setText(elgg_echo('gprofile:albumsCatch'));
+					$item->setHref('#album');
+					$item->setPriority('13');
+					break;
+				case 'ideas':
+					$item->setText(elgg_echo('gprofile:ideas'));
+					$item->addItemClass('removeMe');
+					$item->setPriority('14');
+					break;
+				case 'orgs':
+					$item->setPriority('15');
+					break;
+				case 'activity':
+					$item->setText('Activity');
+					$item->setPriority('16');
+					$item->addItemClass('removeMe');
+					break;
+				case 'user_invite_from_profile':
+					$item->setPriority('17');
+					break;
+			}
+		}
+	}
 }
 
 /**
@@ -366,17 +366,17 @@ 
  * @return string
  */
 function members_list_type($hook, $type, $returnvalue, $params) {
-    if ($returnvalue !== null) {
-        return;
-    }
+	if ($returnvalue !== null) {
+		return;
+	}
 
-    $type = get_input('type');
+	$type = get_input('type');
 
-    $user_types = array('' => elgg_echo('gcRegister:make_selection'), 'academic' => elgg_echo('gcRegister:occupation:academic'), 'student' => elgg_echo('gcRegister:occupation:student'), 'federal' => elgg_echo('gcRegister:occupation:federal'), 'provincial' => elgg_echo('gcRegister:occupation:provincial'), 'municipal' => elgg_echo('gcRegister:occupation:municipal'), 'international' => elgg_echo('gcRegister:occupation:international'), 'ngo' => elgg_echo('gcRegister:occupation:ngo'), 'community' => elgg_echo('gcRegister:occupation:community'), 'business' => elgg_echo('gcRegister:occupation:business'), 'media' => elgg_echo('gcRegister:occupation:media'), 'retired' => elgg_echo('gcRegister:occupation:retired'), 'other' => elgg_echo('gcRegister:occupation:other'));
+	$user_types = array('' => elgg_echo('gcRegister:make_selection'), 'academic' => elgg_echo('gcRegister:occupation:academic'), 'student' => elgg_echo('gcRegister:occupation:student'), 'federal' => elgg_echo('gcRegister:occupation:federal'), 'provincial' => elgg_echo('gcRegister:occupation:provincial'), 'municipal' => elgg_echo('gcRegister:occupation:municipal'), 'international' => elgg_echo('gcRegister:occupation:international'), 'ngo' => elgg_echo('gcRegister:occupation:ngo'), 'community' => elgg_echo('gcRegister:occupation:community'), 'business' => elgg_echo('gcRegister:occupation:business'), 'media' => elgg_echo('gcRegister:occupation:media'), 'retired' => elgg_echo('gcRegister:occupation:retired'), 'other' => elgg_echo('gcRegister:occupation:other'));
     
-    $data = "<label class='mtm' for='by_type'>" . elgg_echo('gcRegister:membertype') . "</label>" . elgg_view('input/dropdown', array('id' => 'by_type', 'class' => 'mbm', 'name' => 'by_type', 'options_values' => $user_types, 'value' => $type));
+	$data = "<label class='mtm' for='by_type'>" . elgg_echo('gcRegister:membertype') . "</label>" . elgg_view('input/dropdown', array('id' => 'by_type', 'class' => 'mbm', 'name' => 'by_type', 'options_values' => $user_types, 'value' => $type));
 
-    $data .= '<script>$(function() {
+	$data .= '<script>$(function() {
             $("#by_type").on("change", function() {
                 if( $(this).val() !== "" ){
                     window.location.href = window.location.href.replace(/[\?#].*|$/, "?type=" + $(this).val());
@@ -384,15 +384,15 @@ 
             });
         });</script>';
 
-    $data .= elgg_list_entities_from_metadata(array(
-        'type' => 'user', 
-        'metadata_name' => 'user_type', 
-        'metadata_value' => $type, 
-        'pagination' => true,
-        'limit' => 10
-    ));
+	$data .= elgg_list_entities_from_metadata(array(
+		'type' => 'user', 
+		'metadata_name' => 'user_type', 
+		'metadata_value' => $type, 
+		'pagination' => true,
+		'limit' => 10
+	));
 
-    return $data;
+	return $data;
 }
 
 /**
@@ -405,9 +405,9 @@ 
  * @return array
  */
 function members_nav_type($hook, $type, $returnvalue, $params) {
-    $returnvalue['type'] = array(
-        'title' => elgg_echo('members:label:type'),
-        'url' => "members/type",
-    );
-    return $returnvalue;
+	$returnvalue['type'] = array(
+		'title' => elgg_echo('members:label:type'),
+		'url' => "members/type",
+	);
+	return $returnvalue;
 }

Spacing +14 added lines, -14 removed lines

@@ -64,16 +64,16 @@ 
     elgg_register_plugin_hook_handler('members:list', 'type', "members_list_type");
     elgg_register_plugin_hook_handler('members:config', 'tabs', "members_nav_type");
 
-    elgg_register_widget_type('poll',elgg_echo('polls:my_widget_title'),elgg_echo('polls:my_widget_description'), array("profile", "dashboard", "index", "groups"), true);
-    elgg_register_widget_type('poll_individual',elgg_echo('polls:individual'),elgg_echo('poll_individual_group:widget:description'), array("profile", "dashboard", "index", "groups"), true);   
+    elgg_register_widget_type('poll', elgg_echo('polls:my_widget_title'), elgg_echo('polls:my_widget_description'), array("profile", "dashboard", "index", "groups"), true);
+    elgg_register_widget_type('poll_individual', elgg_echo('polls:individual'), elgg_echo('poll_individual_group:widget:description'), array("profile", "dashboard", "index", "groups"), true);   
 }
 
 /**
  * Extend the public pages range
  *
  */
-function expages_collab_public($hook, $handler, $return, $params){
-    $pages = array('about', 'a_propos', 'terms', 'termes', 'privacy', 'confidentialite', 'faq', 'qfp', 'participating_organizations', 'organismes_participants', 'help/knowledgebase');     // GCChange change - Ilia: Bilingual page url
+function expages_collab_public($hook, $handler, $return, $params) {
+    $pages = array('about', 'a_propos', 'terms', 'termes', 'privacy', 'confidentialite', 'faq', 'qfp', 'participating_organizations', 'organismes_participants', 'help/knowledgebase'); // GCChange change - Ilia: Bilingual page url
     return array_merge($pages, $return);
 }
 
@@ -81,7 +81,7 @@ 
  * Setup the links to site pages
  */
 function expages_collab_setup_footer_menu() {
-    $pages = array('about', 'a_propos', 'terms', 'termes', 'privacy', 'confidentialite', 'faq', 'qfp', 'participating_organizations', 'organismes_participants', 'help/knowledgebase');     // GCChange change - Ilia: Bilingual page url
+    $pages = array('about', 'a_propos', 'terms', 'termes', 'privacy', 'confidentialite', 'faq', 'qfp', 'participating_organizations', 'organismes_participants', 'help/knowledgebase'); // GCChange change - Ilia: Bilingual page url
     
     foreach ($pages as $page) {
         $url = "$page";
@@ -167,17 +167,17 @@ 
 }
 
 // function that handles moving jobs marketplace and micro missions into drop down menu
-function career_menu_hander($hook, $type, $menu, $params){
-    foreach ($menu as $key => $item){
+function career_menu_hander($hook, $type, $menu, $params) {
+    foreach ($menu as $key => $item) {
 
         switch ($item->getName()) {
             case 'career':
                 $item->addChild(elgg_get_menu_item('subSite', 'Jobs Marketplace'));
                 
-                if(elgg_is_active_plugin('missions')){
+                if (elgg_is_active_plugin('missions')) {
                     $item->addChild(elgg_get_menu_item('site', 'mission_main'));
                 }
-                if(elgg_is_active_plugin('gcforums')){
+                if (elgg_is_active_plugin('gcforums')) {
                     $item->addChild(elgg_get_menu_item('subSite', 'Forum'));
                 }
 
@@ -188,14 +188,14 @@ 
     }
 }
 
-function collab_menu_block_handler($hook, $type, $menu, $params){
+function collab_menu_block_handler($hook, $type, $menu, $params) {
     //rearrange menu items
-    if(elgg_get_context() == 'groupSubPage' || elgg_in_context('group_profile')){
+    if (elgg_get_context() == 'groupSubPage' || elgg_in_context('group_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':
                     $item->setText(elgg_echo('gprofile:discussion'));
@@ -265,12 +265,12 @@ 
         }
     }
 
-    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':
                     $item->setText(elgg_echo('gprofile:discussion'));

mod/gccollab_theme/include/fgcontactform.php

Indentation +579 added lines, -579 removed lines

@@ -19,8 +19,8 @@ 
 */
 class FG_CaptchaHandler
 {
-    function Validate() { return false;}
-    function GetError(){ return '';}
+	function Validate() { return false;}
+	function GetError(){ return '';}
 }
 /*
 FGContactForm is a general purpose contact form class
@@ -29,256 +29,256 @@ 
 */
 class FGContactForm
 {
-    var $receipients;
-    var $errors;
-    var $error_message;
-    var $name;
-    var $email;
-    var $message;
-    var $from_address;
-    var $form_random_key;
-    var $conditional_field;
-    var $arr_conditional_receipients;
-    var $fileupload_fields;
-    var $captcha_handler;
-    var $mailer;
-
-    function FGContactForm()
-    {
-        $this->receipients = array();
-        $this->errors = array();
-        $this->form_random_key = 'HTgsjhartag';
-        $this->conditional_field='';
-        $this->arr_conditional_receipients=array();
-        $this->fileupload_fields=array();
-        $this->mailer = new PHPMailer();
-        $this->mailer->CharSet = 'utf-8';
-        $this->mailer->IsSMTP();
-        $this->mailer->Host = elgg_get_plugin_setting('phpmailer_host', 'phpmailer'); // SMTP server
-        $this->mailer->Port = elgg_get_plugin_setting('ep_phpmailer_port', 'phpmailer'); // SMTP server port
-        $this->mailer->SMTPSecure = 'tls';
-        $this->mailer->SMTPAuth = 'true';
-        $this->mailer->Username = elgg_get_plugin_setting('phpmailer_username', 'phpmailer');
-        $this->mailer->Password = elgg_get_plugin_setting('phpmailer_password', 'phpmailer');
-    }
-
-    function EnableCaptcha($captcha_handler)
-    {
-        $this->captcha_handler = $captcha_handler;
-        session_start();
-    }
-
-    function AddRecipient($email,$name="")
-    {
-        $this->mailer->AddAddress($email,$name);
-    }
-
-    function SetFromAddress($from)
-    {
-        $this->from_address = $from;
-    }
-    function SetFormRandomKey($key)
-    {
-        $this->form_random_key = $key;
-    }
-    function GetSpamTrapInputName()
-    {
-        return 'sp'.md5('KHGdnbvsgst'.$this->GetKey());
-    }
-    function SafeDisplay($value_name)
-    {
-        if(empty($_POST[$value_name]))
-        {
-            return'';
-        }
-        return htmlentities($_POST[$value_name]);
-    }
-    function GetFormIDInputName()
-    {
-        $rand = md5('TygshRt'.$this->GetKey());
-
-        $rand = substr($rand,0,20);
-        return 'id'.$rand;
-    }
-
-
-    function GetFormIDInputValue()
-    {
-        return md5('jhgahTsajhg'.$this->GetKey());
-    }
-
-    function SetConditionalField($field)
-    {
-        $this->conditional_field = $field;
-    }
-    function AddConditionalReceipent($value,$email)
-    {
-        $this->arr_conditional_receipients[$value] =  $email;
-    }
-
-    function AddFileUploadField($file_field_name,$accepted_types,$max_size)
-    {
-
-        $this->fileupload_fields[] =
-            array("name"=>$file_field_name,
-            "file_types"=>$accepted_types,
-            "maxsize"=>$max_size);
-    }
-
-    function ProcessForm()
-    {
-        if(!isset($_POST['submitted']))
-        {
-           return false;
-        }
-        if(!$this->Validate())
-        {
-           // $this->error_message = implode('<br/><br/><br/>',$this->errors);
-            return false;
-        }
-        $this->CollectData();
-
-        $ret = $this->SendFormSubmission();
-
-        return $ret;
-    }
-
-    function RedirectToURL($url)
-    {
-        header("Location: $url");
-        exit;
-    }
-
-    function GetErrorMessage()
-    {
-        return $this->error_message;
-    }
-    function GetSelfScript()
-    {
-        return htmlentities($_SERVER['PHP_SELF']);
-    }
-
-    function GetName()
-    {
-        return $this->name;
-    }
-    function GetEmail()
-    {
-        return $this->email;
-    }
-    function GetMessage()
-    {
-        return htmlentities($this->message,ENT_QUOTES,"UTF-8");
-    }
+	var $receipients;
+	var $errors;
+	var $error_message;
+	var $name;
+	var $email;
+	var $message;
+	var $from_address;
+	var $form_random_key;
+	var $conditional_field;
+	var $arr_conditional_receipients;
+	var $fileupload_fields;
+	var $captcha_handler;
+	var $mailer;
+
+	function FGContactForm()
+	{
+		$this->receipients = array();
+		$this->errors = array();
+		$this->form_random_key = 'HTgsjhartag';
+		$this->conditional_field='';
+		$this->arr_conditional_receipients=array();
+		$this->fileupload_fields=array();
+		$this->mailer = new PHPMailer();
+		$this->mailer->CharSet = 'utf-8';
+		$this->mailer->IsSMTP();
+		$this->mailer->Host = elgg_get_plugin_setting('phpmailer_host', 'phpmailer'); // SMTP server
+		$this->mailer->Port = elgg_get_plugin_setting('ep_phpmailer_port', 'phpmailer'); // SMTP server port
+		$this->mailer->SMTPSecure = 'tls';
+		$this->mailer->SMTPAuth = 'true';
+		$this->mailer->Username = elgg_get_plugin_setting('phpmailer_username', 'phpmailer');
+		$this->mailer->Password = elgg_get_plugin_setting('phpmailer_password', 'phpmailer');
+	}
+
+	function EnableCaptcha($captcha_handler)
+	{
+		$this->captcha_handler = $captcha_handler;
+		session_start();
+	}
+
+	function AddRecipient($email,$name="")
+	{
+		$this->mailer->AddAddress($email,$name);
+	}
+
+	function SetFromAddress($from)
+	{
+		$this->from_address = $from;
+	}
+	function SetFormRandomKey($key)
+	{
+		$this->form_random_key = $key;
+	}
+	function GetSpamTrapInputName()
+	{
+		return 'sp'.md5('KHGdnbvsgst'.$this->GetKey());
+	}
+	function SafeDisplay($value_name)
+	{
+		if(empty($_POST[$value_name]))
+		{
+			return'';
+		}
+		return htmlentities($_POST[$value_name]);
+	}
+	function GetFormIDInputName()
+	{
+		$rand = md5('TygshRt'.$this->GetKey());
+
+		$rand = substr($rand,0,20);
+		return 'id'.$rand;
+	}
+
+
+	function GetFormIDInputValue()
+	{
+		return md5('jhgahTsajhg'.$this->GetKey());
+	}
+
+	function SetConditionalField($field)
+	{
+		$this->conditional_field = $field;
+	}
+	function AddConditionalReceipent($value,$email)
+	{
+		$this->arr_conditional_receipients[$value] =  $email;
+	}
+
+	function AddFileUploadField($file_field_name,$accepted_types,$max_size)
+	{
+
+		$this->fileupload_fields[] =
+			array("name"=>$file_field_name,
+			"file_types"=>$accepted_types,
+			"maxsize"=>$max_size);
+	}
+
+	function ProcessForm()
+	{
+		if(!isset($_POST['submitted']))
+		{
+		   return false;
+		}
+		if(!$this->Validate())
+		{
+		   // $this->error_message = implode('<br/><br/><br/>',$this->errors);
+			return false;
+		}
+		$this->CollectData();
+
+		$ret = $this->SendFormSubmission();
+
+		return $ret;
+	}
+
+	function RedirectToURL($url)
+	{
+		header("Location: $url");
+		exit;
+	}
+
+	function GetErrorMessage()
+	{
+		return $this->error_message;
+	}
+	function GetSelfScript()
+	{
+		return htmlentities($_SERVER['PHP_SELF']);
+	}
+
+	function GetName()
+	{
+		return $this->name;
+	}
+	function GetEmail()
+	{
+		return $this->email;
+	}
+	function GetMessage()
+	{
+		return htmlentities($this->message,ENT_QUOTES,"UTF-8");
+	}
 
 /*--------  Private (Internal) Functions -------- */
 
 
-    function SendFormSubmission()
-    {
-              $reason = $_POST['reason'];
-                $option = explode("$", $_POST['reason']);
-                    $categoryfr = $option[0];
-                    $categoryen = $option[1]; 
-
-        $depart = $_POST['depart'];
-        $reason = $_POST['reason'];
-                $option = explode("$", $_POST['reason']);
-                    $french = $option[0];
-                    $english = $option[1]; 
-         if(empty($_POST['subject']))
-           {
-           $subject = $categoryen." - ".$depart. " - $this->name  / ".$categoryfr." - ".$depart. " - $this->name";
-           }else{
-            $subject = "GCconnex - ".$depart. " - $this->name  / GCconnex - ".$depart. " - $this->name";
-           }
+	function SendFormSubmission()
+	{
+			  $reason = $_POST['reason'];
+				$option = explode("$", $_POST['reason']);
+					$categoryfr = $option[0];
+					$categoryen = $option[1]; 
+
+		$depart = $_POST['depart'];
+		$reason = $_POST['reason'];
+				$option = explode("$", $_POST['reason']);
+					$french = $option[0];
+					$english = $option[1]; 
+		 if(empty($_POST['subject']))
+		   {
+		   $subject = $categoryen." - ".$depart. " - $this->name  / ".$categoryfr." - ".$depart. " - $this->name";
+		   }else{
+			$subject = "GCconnex - ".$depart. " - $this->name  / GCconnex - ".$depart. " - $this->name";
+		   }
         
-        $this->CollectConditionalReceipients();
-        $this->mailer->CharSet = 'utf-8';
-        $this->mailer->Subject = $subject;
-        $this->mailer->From = elgg_get_plugin_setting('phpmailer_from_email', 'phpmailer');
-        $this->mailer->FromName = elgg_get_plugin_setting('phpmailer_from_name', 'phpmailer');
-        $this->mailer->AddCC($this->email);
-        $message = $this->ComposeFormtoEmail();
-        $this->mailer->ConfirmReadingTo = $this->email;
-        $textMsg = trim(strip_tags(preg_replace('/<(head|title|style|script)[^>]*>.*?<\/\\1>/s','',$message)));
-        $this->mailer->AltBody = @html_entity_decode($textMsg,ENT_QUOTES,"UTF-8");
-        $this->mailer->MsgHTML($message);
-        $this->AttachFiles();
-
-        if(!$this->mailer->Send())
-        {
-            $this->add_error("Failed sending email!");
-            return false;
-        }
-
-        return true;
-    }
-
-    function CollectConditionalReceipients()
-    {
-        if(count($this->arr_conditional_receipients)>0 &&
-          !empty($this->conditional_field) &&
-          !empty($_POST[$this->conditional_field]))
-        {
-            foreach($this->arr_conditional_receipients as $condn => $rec)
-            {
-                if(strcasecmp($condn,$_POST[$this->conditional_field])==0 &&
-                !empty($rec))
-                {
-                    $this->AddRecipient($rec);
-                }
-            }
-        }
-    }
-
-    /*
+		$this->CollectConditionalReceipients();
+		$this->mailer->CharSet = 'utf-8';
+		$this->mailer->Subject = $subject;
+		$this->mailer->From = elgg_get_plugin_setting('phpmailer_from_email', 'phpmailer');
+		$this->mailer->FromName = elgg_get_plugin_setting('phpmailer_from_name', 'phpmailer');
+		$this->mailer->AddCC($this->email);
+		$message = $this->ComposeFormtoEmail();
+		$this->mailer->ConfirmReadingTo = $this->email;
+		$textMsg = trim(strip_tags(preg_replace('/<(head|title|style|script)[^>]*>.*?<\/\\1>/s','',$message)));
+		$this->mailer->AltBody = @html_entity_decode($textMsg,ENT_QUOTES,"UTF-8");
+		$this->mailer->MsgHTML($message);
+		$this->AttachFiles();
+
+		if(!$this->mailer->Send())
+		{
+			$this->add_error("Failed sending email!");
+			return false;
+		}
+
+		return true;
+	}
+
+	function CollectConditionalReceipients()
+	{
+		if(count($this->arr_conditional_receipients)>0 &&
+		  !empty($this->conditional_field) &&
+		  !empty($_POST[$this->conditional_field]))
+		{
+			foreach($this->arr_conditional_receipients as $condn => $rec)
+			{
+				if(strcasecmp($condn,$_POST[$this->conditional_field])==0 &&
+				!empty($rec))
+				{
+					$this->AddRecipient($rec);
+				}
+			}
+		}
+	}
+
+	/*
     Internal variables, that you donot want to appear in the email
     Add those variables in this array.
     */
-    function IsInternalVariable($varname)
-    {
-        $arr_interanl_vars = array('scaptcha',
-                            'submitted',
-                            $this->GetSpamTrapInputName(),
-                            $this->GetFormIDInputName()
-                            );
-        if(in_array($varname,$arr_interanl_vars))
-        {
-            return true;
-        }
-        return false;
-    }
-
-    function FormSubmissionToMail()
-    {
-        $ret_str='';
+	function IsInternalVariable($varname)
+	{
+		$arr_interanl_vars = array('scaptcha',
+							'submitted',
+							$this->GetSpamTrapInputName(),
+							$this->GetFormIDInputName()
+							);
+		if(in_array($varname,$arr_interanl_vars))
+		{
+			return true;
+		}
+		return false;
+	}
+
+	function FormSubmissionToMail()
+	{
+		$ret_str='';
         
-                $name = $_POST['name'];
-                $email = $_POST['email'];
-                $reason = $_POST['reason'];
-                $option = explode("$", $_POST['reason']);
-                    $french = $option[0];
-                    $english = $option[1]; 
-                if(empty($_POST['subject']))
-                {
-                    $subject = "$this->name has contacted you about ". $english." / $this->name vous a envoyé un message à propos de ".$french;
-                }else{
-                    $subject = $_POST['subject'];
-                }
+				$name = $_POST['name'];
+				$email = $_POST['email'];
+				$reason = $_POST['reason'];
+				$option = explode("$", $_POST['reason']);
+					$french = $option[0];
+					$english = $option[1]; 
+				if(empty($_POST['subject']))
+				{
+					$subject = "$this->name has contacted you about ". $english." / $this->name vous a envoyé un message à propos de ".$french;
+				}else{
+					$subject = $_POST['subject'];
+				}
         
-                $message = $_POST['message'];
+				$message = $_POST['message'];
         
-        $name=htmlentities($name, ENT_QUOTES, "UTF-8");
-        $email=htmlentities($email, ENT_QUOTES, "UTF-8");
-        $reason=htmlentities($reason, ENT_QUOTES, "UTF-8");
-        $subject=htmlentities($subject, ENT_QUOTES, "UTF-8");
-        $message=htmlentities($message, ENT_QUOTES, "UTF-8");
+		$name=htmlentities($name, ENT_QUOTES, "UTF-8");
+		$email=htmlentities($email, ENT_QUOTES, "UTF-8");
+		$reason=htmlentities($reason, ENT_QUOTES, "UTF-8");
+		$subject=htmlentities($subject, ENT_QUOTES, "UTF-8");
+		$message=htmlentities($message, ENT_QUOTES, "UTF-8");
       
-                $value = htmlentities($value,ENT_QUOTES,"UTF-8");
-                $value = nl2br($value);
-                $key = ucfirst($key);
-                $ret_str .= '
+				$value = htmlentities($value,ENT_QUOTES,"UTF-8");
+				$value = nl2br($value);
+				$key = ucfirst($key);
+				$ret_str .= '
 
 <!-- beginning of email template -->
   <div width="100%" bgcolor="#fcfcfc">
@@ -358,34 +358,34 @@ 
     </div>
   </div>';
 
-        foreach($this->fileupload_fields as $upload_field)
-        {
-            $field_name = $upload_field["name"];
-            if(!$this->IsFileUploaded($field_name))
-            {
-                continue;
-            }        
+		foreach($this->fileupload_fields as $upload_field)
+		{
+			$field_name = $upload_field["name"];
+			if(!$this->IsFileUploaded($field_name))
+			{
+				continue;
+			}        
             
-            $filename = basename($_FILES[$field_name]['name']);
-            $ret_str .= "<div class='label'>File upload '$field_name' :</div><div class='value'>$filename </div>\n";
-        }
-        return $ret_str;
-    }
-
-    function ExtraInfoToMail()
-    {
-        $ret_str='';
-
-        $ip = $_SERVER['REMOTE_ADDR'];
-        $ret_str = "<div class='label'>IP address of the submitter:</div><div class='value'>$ip</div>\n";
-
-        return $ret_str;
-    }
-
-    function GetHTMLHeaderPart()
-    {
-         $retstr = '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">'."\n".
-                   '<html><head><title></title><style type="text/css">
+			$filename = basename($_FILES[$field_name]['name']);
+			$ret_str .= "<div class='label'>File upload '$field_name' :</div><div class='value'>$filename </div>\n";
+		}
+		return $ret_str;
+	}
+
+	function ExtraInfoToMail()
+	{
+		$ret_str='';
+
+		$ip = $_SERVER['REMOTE_ADDR'];
+		$ret_str = "<div class='label'>IP address of the submitter:</div><div class='value'>$ip</div>\n";
+
+		return $ret_str;
+	}
+
+	function GetHTMLHeaderPart()
+	{
+		 $retstr = '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">'."\n".
+				   '<html><head><title></title><style type="text/css">
   body {margin: 0; padding: 0; min-width: 100%!important;}
   img {height: auto;}
   .content {width: 100%; max-width: 600px;}
@@ -417,324 +417,324 @@ 
   </style>'.
   '<meta http-equiv=Content-Type content="text/html; charset=utf-8">';
        
-         $retstr .= '</head><body yahoo bgcolor="#fcfcfc" style="margin: 0; padding: 0; min-width: 100%!important;">';
-         return $retstr;
-    }
-
-    function GetHTMLFooterPart()
-    {
-        $retstr ='</body></html>';
-        return $retstr ;
-    }
-
-    function ComposeFormtoEmail()
-    {
-        $header = $this->GetHTMLHeaderPart();
-        $formsubmission = $this->FormSubmissionToMail();
-        $footer = $this->GetHTMLFooterPart();
-        $message = $header."<p>$formsubmission</p><hr/>$extra_info".$footer;
-
-        return $message;
-    }
-
-    function AttachFiles()
-    {
-        foreach($this->fileupload_fields as $upld_field)
-        {
-            $field_name = $upld_field["name"];
-            if(!$this->IsFileUploaded($field_name))
-            {
-                continue;
-            }
+		 $retstr .= '</head><body yahoo bgcolor="#fcfcfc" style="margin: 0; padding: 0; min-width: 100%!important;">';
+		 return $retstr;
+	}
+
+	function GetHTMLFooterPart()
+	{
+		$retstr ='</body></html>';
+		return $retstr ;
+	}
+
+	function ComposeFormtoEmail()
+	{
+		$header = $this->GetHTMLHeaderPart();
+		$formsubmission = $this->FormSubmissionToMail();
+		$footer = $this->GetHTMLFooterPart();
+		$message = $header."<p>$formsubmission</p><hr/>$extra_info".$footer;
+
+		return $message;
+	}
+
+	function AttachFiles()
+	{
+		foreach($this->fileupload_fields as $upld_field)
+		{
+			$field_name = $upld_field["name"];
+			if(!$this->IsFileUploaded($field_name))
+			{
+				continue;
+			}
             
-            $filename =basename($_FILES[$field_name]['name']);
-            $this->mailer->AddAttachment($_FILES[$field_name]["tmp_name"],$filename);
-        }
-    }
-
-    function GetFromAddress()
-    {
-        if(!empty($this->from_address))
-        {
-            return $this->from_address;
-        }
-
-        $host = $_SERVER['SERVER_NAME'];
-        $from ="nobody@$host";
-        return $from;
-    }
-
-    function Validate()
-    {
-        $ret = true;
-        $numErr=0;
-        //security validations
-        if(empty($_POST[$this->GetFormIDInputName()]) ||
-          $_POST[$this->GetFormIDInputName()] != $this->GetFormIDInputValue() )
-        {
-            $numErr=$numErr+1;
-            //The proper error is not given intentionally
-            $this->add_error();
-            register_error("Automated submission prevention: case 1 failed");
-            $ret = false;
-        }
-
-        //This is a hidden input field. Humans won't fill this field.
-        if(!empty($_POST[$this->GetSpamTrapInputName()]) )
-        {
-            $numErr=$numErr+1;
-            //The proper error is not given intentionally
-            $this->add_error();
-            register_error("Automated submission prevention: case 2 failed");
-            $ret = false;
-        }
-
-        //select validations
-        if((($_POST['reason']) =='Select...') || (($_POST['reason']) == "Choisir..."))
-        {
-            $numErr=$numErr+1;
-            $this->add_error();
-            register_error(str_replace('[#]',$numErr,elgg_echo('contactform:Errreason')));
-            $ret = false;
-        }
-
-        if ($_POST['reason'] == 'Autres$Other')
-        {
-            if (empty($_POST['subject']))
-            {
-                $numErr=$numErr+1;
-                $this->add_error();
-                register_error(str_replace('[#]',$numErr,elgg_echo('contactform:Errsubject')));
-                $ret = false;
-            }
-        }
-
-        //name validations
-        if(empty($_POST['name']))
-        {
-            $numErr=$numErr+1;
-            $this->add_error();
-            //'contactform:Errname'
-            register_error(str_replace('[#]',$numErr,elgg_echo('contactform:Errname')));
-            $ret = false;
-        }
-        else
-            if(strlen($_POST['name'])>75)
-            {
-                $numErr=$numErr+1;
-                $this->add_error();
-                //'contactform:Errnamebig'
-                register_error(str_replace('[#]',$numErr,elgg_echo('contactform:Errnamebig')));
-                $ret = false;
-            }
-
-        //email validations
-        if(empty($_POST['email']))
-        {
-            $numErr=$numErr+1;
-            $this->add_error();
-            register_error(str_replace('[#]',$numErr,elgg_echo('contactform:Erremail')));
-            $ret = false;
-        }
-        else
-            if(strlen($_POST['email'])>100)
-            {
-                $numErr=$numErr+1;
-                $this->add_error();
-                register_error(str_replace('[#]',$numErr,elgg_echo('contactform:Erremailbig')));
-                $ret = false;
-            }
-            else
-                if(!$this->validate_email($_POST['email']))
-                {
-                    $numErr=$numErr+1;
-                    $this->add_error();
-                    //'contactform:Erremailvalid'
-                    register_error(str_replace('[#]',$numErr,elgg_echo('contactform:Erremailvalid')));
-                    $ret = false;
-                }
-
-        //department validaions
-        if(empty($_POST['depart']))
-        {
-            $numErr=$numErr+1;
-            $this->add_error();
-            register_error(str_replace('[#]',$numErr,elgg_echo('contactform:Errdepart')));
-            $ret = false;
-        }
-        else
-            if(strlen($_POST['depart'])>255)
-            {
-                $numErr=$numErr+1;
-                $this->add_error();
-                register_error(str_replace('[#]',$numErr,elgg_echo('contactform:Errdepartbig')));
-                $ret = false;
-            }
-
-        //message validaions
-        if(empty($_POST['message']))
-        {
-            $numErr=$numErr+1;
-            $this->add_error();
-            register_error(str_replace('[#]',$numErr,elgg_echo('contactform:Errmess')));
-            $ret = false;
-        }
-        else
-            if(strlen($_POST['message'])>2048)
-            {
-                $numErr=$numErr+1;
-                $this->add_error();
-                register_error(str_replace('[#]',$numErr,elgg_echo('contactform:Errmessbig')));
-                $ret = false;
-            }
-
-        //file upload validations
-        if(!empty($this->fileupload_fields))
-        {
-            $numErr=$numErr+1;
-            if(!$this->ValidateFileUploads($numErr))
-            {
-                $ret = false;
-            }
-        }
-        return $ret;
-    }
-
-    function ValidateFileType($field_name,$valid_filetypes)
-    {
-        $ret=true;
-        $info = pathinfo($_FILES[$field_name]['name']);
-        $extn = $info['extension'];
-        $extn = strtolower($extn);
-
-        $arr_valid_filetypes= explode(',',$valid_filetypes);
-        if(!in_array($extn,$arr_valid_filetypes))
-        {
-            $this->add_error();
-            register_error("Valid file types are: $valid_filetypes");
-            $ret=false;
-        }
-        return $ret;
-    }
-
-    function ValidateFileSize($field_name,$max_size)
-    {
-        $size_of_uploaded_file = $_FILES[$field_name]["size"]/1024;//size in KBs
-        if($size_of_uploaded_file > $max_size)
-        {
-            $this->add_error();
-            register_error("The file is too big. File size should be less than $max_size KB");
-            return false;
-        }
-        return true;
-    }
-
-    function IsFileUploaded($field_name)
-    {
-        if(empty($_FILES[$field_name]['name']))
-        {
-            return false;
-        }
-        if(!is_uploaded_file($_FILES[$field_name]['tmp_name']))
-        {
-            return false;
-        }
-        return true;
-    }
-    function ValidateFileUploads()
-    {
-        $ret=true;
-        foreach($this->fileupload_fields as $upld_field)
-        {
-            $field_name = $upld_field["name"];
-
-            $valid_filetypes = $upld_field["file_types"];
+			$filename =basename($_FILES[$field_name]['name']);
+			$this->mailer->AddAttachment($_FILES[$field_name]["tmp_name"],$filename);
+		}
+	}
+
+	function GetFromAddress()
+	{
+		if(!empty($this->from_address))
+		{
+			return $this->from_address;
+		}
+
+		$host = $_SERVER['SERVER_NAME'];
+		$from ="nobody@$host";
+		return $from;
+	}
+
+	function Validate()
+	{
+		$ret = true;
+		$numErr=0;
+		//security validations
+		if(empty($_POST[$this->GetFormIDInputName()]) ||
+		  $_POST[$this->GetFormIDInputName()] != $this->GetFormIDInputValue() )
+		{
+			$numErr=$numErr+1;
+			//The proper error is not given intentionally
+			$this->add_error();
+			register_error("Automated submission prevention: case 1 failed");
+			$ret = false;
+		}
+
+		//This is a hidden input field. Humans won't fill this field.
+		if(!empty($_POST[$this->GetSpamTrapInputName()]) )
+		{
+			$numErr=$numErr+1;
+			//The proper error is not given intentionally
+			$this->add_error();
+			register_error("Automated submission prevention: case 2 failed");
+			$ret = false;
+		}
+
+		//select validations
+		if((($_POST['reason']) =='Select...') || (($_POST['reason']) == "Choisir..."))
+		{
+			$numErr=$numErr+1;
+			$this->add_error();
+			register_error(str_replace('[#]',$numErr,elgg_echo('contactform:Errreason')));
+			$ret = false;
+		}
+
+		if ($_POST['reason'] == 'Autres$Other')
+		{
+			if (empty($_POST['subject']))
+			{
+				$numErr=$numErr+1;
+				$this->add_error();
+				register_error(str_replace('[#]',$numErr,elgg_echo('contactform:Errsubject')));
+				$ret = false;
+			}
+		}
+
+		//name validations
+		if(empty($_POST['name']))
+		{
+			$numErr=$numErr+1;
+			$this->add_error();
+			//'contactform:Errname'
+			register_error(str_replace('[#]',$numErr,elgg_echo('contactform:Errname')));
+			$ret = false;
+		}
+		else
+			if(strlen($_POST['name'])>75)
+			{
+				$numErr=$numErr+1;
+				$this->add_error();
+				//'contactform:Errnamebig'
+				register_error(str_replace('[#]',$numErr,elgg_echo('contactform:Errnamebig')));
+				$ret = false;
+			}
+
+		//email validations
+		if(empty($_POST['email']))
+		{
+			$numErr=$numErr+1;
+			$this->add_error();
+			register_error(str_replace('[#]',$numErr,elgg_echo('contactform:Erremail')));
+			$ret = false;
+		}
+		else
+			if(strlen($_POST['email'])>100)
+			{
+				$numErr=$numErr+1;
+				$this->add_error();
+				register_error(str_replace('[#]',$numErr,elgg_echo('contactform:Erremailbig')));
+				$ret = false;
+			}
+			else
+				if(!$this->validate_email($_POST['email']))
+				{
+					$numErr=$numErr+1;
+					$this->add_error();
+					//'contactform:Erremailvalid'
+					register_error(str_replace('[#]',$numErr,elgg_echo('contactform:Erremailvalid')));
+					$ret = false;
+				}
+
+		//department validaions
+		if(empty($_POST['depart']))
+		{
+			$numErr=$numErr+1;
+			$this->add_error();
+			register_error(str_replace('[#]',$numErr,elgg_echo('contactform:Errdepart')));
+			$ret = false;
+		}
+		else
+			if(strlen($_POST['depart'])>255)
+			{
+				$numErr=$numErr+1;
+				$this->add_error();
+				register_error(str_replace('[#]',$numErr,elgg_echo('contactform:Errdepartbig')));
+				$ret = false;
+			}
+
+		//message validaions
+		if(empty($_POST['message']))
+		{
+			$numErr=$numErr+1;
+			$this->add_error();
+			register_error(str_replace('[#]',$numErr,elgg_echo('contactform:Errmess')));
+			$ret = false;
+		}
+		else
+			if(strlen($_POST['message'])>2048)
+			{
+				$numErr=$numErr+1;
+				$this->add_error();
+				register_error(str_replace('[#]',$numErr,elgg_echo('contactform:Errmessbig')));
+				$ret = false;
+			}
+
+		//file upload validations
+		if(!empty($this->fileupload_fields))
+		{
+			$numErr=$numErr+1;
+			if(!$this->ValidateFileUploads($numErr))
+			{
+				$ret = false;
+			}
+		}
+		return $ret;
+	}
+
+	function ValidateFileType($field_name,$valid_filetypes)
+	{
+		$ret=true;
+		$info = pathinfo($_FILES[$field_name]['name']);
+		$extn = $info['extension'];
+		$extn = strtolower($extn);
+
+		$arr_valid_filetypes= explode(',',$valid_filetypes);
+		if(!in_array($extn,$arr_valid_filetypes))
+		{
+			$this->add_error();
+			register_error("Valid file types are: $valid_filetypes");
+			$ret=false;
+		}
+		return $ret;
+	}
+
+	function ValidateFileSize($field_name,$max_size)
+	{
+		$size_of_uploaded_file = $_FILES[$field_name]["size"]/1024;//size in KBs
+		if($size_of_uploaded_file > $max_size)
+		{
+			$this->add_error();
+			register_error("The file is too big. File size should be less than $max_size KB");
+			return false;
+		}
+		return true;
+	}
+
+	function IsFileUploaded($field_name)
+	{
+		if(empty($_FILES[$field_name]['name']))
+		{
+			return false;
+		}
+		if(!is_uploaded_file($_FILES[$field_name]['tmp_name']))
+		{
+			return false;
+		}
+		return true;
+	}
+	function ValidateFileUploads()
+	{
+		$ret=true;
+		foreach($this->fileupload_fields as $upld_field)
+		{
+			$field_name = $upld_field["name"];
+
+			$valid_filetypes = $upld_field["file_types"];
             
-            if(!$this->IsFileUploaded($field_name))
-            {
-                continue;
-            }
-
-            if($_FILES[$field_name]["error"] != 0)
-            {
-                $this->add_error("Error in file upload; Error code:".$_FILES[$field_name]["error"]);
-                $ret=false;
-            }
-
-            if(!empty($valid_filetypes) &&
-             !$this->ValidateFileType($field_name,$valid_filetypes))
-            {
-                $ret=false;
-            }
-
-            if(!empty($upld_field["maxsize"]) &&
-            $upld_field["maxsize"]>0)
-            {
-                if(!$this->ValidateFileSize($field_name,$upld_field["maxsize"]))
-                {
-                    $ret=false;
-                }
-            }
-        }
-        return $ret;
-    }
-
-    function StripSlashes($str)
-    {
-        if(get_magic_quotes_gpc())
-        {
-            $str = stripslashes($str);
-        }
-        return $str;
-    }
-    /*
+			if(!$this->IsFileUploaded($field_name))
+			{
+				continue;
+			}
+
+			if($_FILES[$field_name]["error"] != 0)
+			{
+				$this->add_error("Error in file upload; Error code:".$_FILES[$field_name]["error"]);
+				$ret=false;
+			}
+
+			if(!empty($valid_filetypes) &&
+			 !$this->ValidateFileType($field_name,$valid_filetypes))
+			{
+				$ret=false;
+			}
+
+			if(!empty($upld_field["maxsize"]) &&
+			$upld_field["maxsize"]>0)
+			{
+				if(!$this->ValidateFileSize($field_name,$upld_field["maxsize"]))
+				{
+					$ret=false;
+				}
+			}
+		}
+		return $ret;
+	}
+
+	function StripSlashes($str)
+	{
+		if(get_magic_quotes_gpc())
+		{
+			$str = stripslashes($str);
+		}
+		return $str;
+	}
+	/*
     Sanitize() function removes any potential threat from the
     data submitted. Prevents email injections or any other hacker attempts.
     if $remove_nl is true, newline chracters are removed from the input.
     */
-    function Sanitize($str,$remove_nl=true)
-    {
-        $str = $this->StripSlashes($str);
-
-        if($remove_nl)
-        {
-            $injections = array('/(\n+)/i',
-                '/(\r+)/i',
-                '/(\t+)/i',
-                '/(%0A+)/i',
-                '/(%0D+)/i',
-                '/(%08+)/i',
-                '/(%09+)/i'
-                );
-            $str = preg_replace($injections,'',$str);
-        }
-
-        return $str;
-    }
-
-    /*Collects clean data from the $_POST array and keeps in internal variables.*/
-    function CollectData()
-    {
-        $this->name = $this->Sanitize($_POST['name']);
-        $this->email = $this->Sanitize($_POST['email']);
-
-        /*newline is OK in the message.*/
-        $this->message = $this->StripSlashes($_POST['message']);
-    }
-
-    function add_error($error)
-    {
-        array_push($this->errors,$error);
-    }
-    function validate_email($email)
-    {
-        return eregi("^[_\.0-9a-zA-Z-]+@([0-9a-zA-Z][0-9a-zA-Z-]+\.)+[a-zA-Z]{2,6}$", $email);
-    }
-
-    function GetKey()
-    {
-        return $this->form_random_key.$_SERVER['SERVER_NAME'].$_SERVER['REMOTE_ADDR'];
-    }
+	function Sanitize($str,$remove_nl=true)
+	{
+		$str = $this->StripSlashes($str);
+
+		if($remove_nl)
+		{
+			$injections = array('/(\n+)/i',
+				'/(\r+)/i',
+				'/(\t+)/i',
+				'/(%0A+)/i',
+				'/(%0D+)/i',
+				'/(%08+)/i',
+				'/(%09+)/i'
+				);
+			$str = preg_replace($injections,'',$str);
+		}
+
+		return $str;
+	}
+
+	/*Collects clean data from the $_POST array and keeps in internal variables.*/
+	function CollectData()
+	{
+		$this->name = $this->Sanitize($_POST['name']);
+		$this->email = $this->Sanitize($_POST['email']);
+
+		/*newline is OK in the message.*/
+		$this->message = $this->StripSlashes($_POST['message']);
+	}
+
+	function add_error($error)
+	{
+		array_push($this->errors,$error);
+	}
+	function validate_email($email)
+	{
+		return eregi("^[_\.0-9a-zA-Z-]+@([0-9a-zA-Z][0-9a-zA-Z-]+\.)+[a-zA-Z]{2,6}$", $email);
+	}
+
+	function GetKey()
+	{
+		return $this->form_random_key.$_SERVER['SERVER_NAME'].$_SERVER['REMOTE_ADDR'];
+	}
 
 }
 

Spacing +134 added lines, -134 removed lines

@@ -12,15 +12,15 @@ 
 
 @copyright html-form-guide.com 2010
 */
-require_once( elgg_get_plugins_path() ."phpmailer/vendors/class.phpmailer.php");
+require_once(elgg_get_plugins_path() . "phpmailer/vendors/class.phpmailer.php");
 
 /*
 Interface to Captcha handler
 */
 class FG_CaptchaHandler
 {
-    function Validate() { return false;}
-    function GetError(){ return '';}
+    function Validate() { return false; }
+    function GetError() { return ''; }
 }
 /*
 FGContactForm is a general purpose contact form class
@@ -48,9 +48,9 @@ 
         $this->receipients = array();
         $this->errors = array();
         $this->form_random_key = 'HTgsjhartag';
-        $this->conditional_field='';
-        $this->arr_conditional_receipients=array();
-        $this->fileupload_fields=array();
+        $this->conditional_field = '';
+        $this->arr_conditional_receipients = array();
+        $this->fileupload_fields = array();
         $this->mailer = new PHPMailer();
         $this->mailer->CharSet = 'utf-8';
         $this->mailer->IsSMTP();
@@ -68,9 +68,9 @@ 
         session_start();
     }
 
-    function AddRecipient($email,$name="")
+    function AddRecipient($email, $name = "")
     {
-        $this->mailer->AddAddress($email,$name);
+        $this->mailer->AddAddress($email, $name);
     }
 
     function SetFromAddress($from)
@@ -83,11 +83,11 @@ 
     }
     function GetSpamTrapInputName()
     {
-        return 'sp'.md5('KHGdnbvsgst'.$this->GetKey());
+        return 'sp' . md5('KHGdnbvsgst' . $this->GetKey());
     }
     function SafeDisplay($value_name)
     {
-        if(empty($_POST[$value_name]))
+        if (empty($_POST[$value_name]))
         {
             return'';
         }
@@ -95,28 +95,28 @@ 
     }
     function GetFormIDInputName()
     {
-        $rand = md5('TygshRt'.$this->GetKey());
+        $rand = md5('TygshRt' . $this->GetKey());
 
-        $rand = substr($rand,0,20);
-        return 'id'.$rand;
+        $rand = substr($rand, 0, 20);
+        return 'id' . $rand;
     }
 
 
     function GetFormIDInputValue()
     {
-        return md5('jhgahTsajhg'.$this->GetKey());
+        return md5('jhgahTsajhg' . $this->GetKey());
     }
 
     function SetConditionalField($field)
     {
         $this->conditional_field = $field;
     }
-    function AddConditionalReceipent($value,$email)
+    function AddConditionalReceipent($value, $email)
     {
-        $this->arr_conditional_receipients[$value] =  $email;
+        $this->arr_conditional_receipients[$value] = $email;
     }
 
-    function AddFileUploadField($file_field_name,$accepted_types,$max_size)
+    function AddFileUploadField($file_field_name, $accepted_types, $max_size)
     {
 
         $this->fileupload_fields[] =
@@ -127,11 +127,11 @@ 
 
     function ProcessForm()
     {
-        if(!isset($_POST['submitted']))
+        if (!isset($_POST['submitted']))
         {
            return false;
         }
-        if(!$this->Validate())
+        if (!$this->Validate())
         {
            // $this->error_message = implode('<br/><br/><br/>',$this->errors);
             return false;
@@ -168,7 +168,7 @@ 
     }
     function GetMessage()
     {
-        return htmlentities($this->message,ENT_QUOTES,"UTF-8");
+        return htmlentities($this->message, ENT_QUOTES, "UTF-8");
     }
 
 /*--------  Private (Internal) Functions -------- */
@@ -186,11 +186,11 @@ 
                 $option = explode("$", $_POST['reason']);
                     $french = $option[0];
                     $english = $option[1]; 
-         if(empty($_POST['subject']))
+         if (empty($_POST['subject']))
            {
-           $subject = $categoryen." - ".$depart. " - $this->name  / ".$categoryfr." - ".$depart. " - $this->name";
-           }else{
-            $subject = "GCconnex - ".$depart. " - $this->name  / GCconnex - ".$depart. " - $this->name";
+           $subject = $categoryen . " - " . $depart . " - $this->name  / " . $categoryfr . " - " . $depart . " - $this->name";
+           } else {
+            $subject = "GCconnex - " . $depart . " - $this->name  / GCconnex - " . $depart . " - $this->name";
            }
         
         $this->CollectConditionalReceipients();
@@ -201,12 +201,12 @@ 
         $this->mailer->AddCC($this->email);
         $message = $this->ComposeFormtoEmail();
         $this->mailer->ConfirmReadingTo = $this->email;
-        $textMsg = trim(strip_tags(preg_replace('/<(head|title|style|script)[^>]*>.*?<\/\\1>/s','',$message)));
-        $this->mailer->AltBody = @html_entity_decode($textMsg,ENT_QUOTES,"UTF-8");
+        $textMsg = trim(strip_tags(preg_replace('/<(head|title|style|script)[^>]*>.*?<\/\\1>/s', '', $message)));
+        $this->mailer->AltBody = @html_entity_decode($textMsg, ENT_QUOTES, "UTF-8");
         $this->mailer->MsgHTML($message);
         $this->AttachFiles();
 
-        if(!$this->mailer->Send())
+        if (!$this->mailer->Send())
         {
             $this->add_error("Failed sending email!");
             return false;
@@ -217,13 +217,13 @@ 
 
     function CollectConditionalReceipients()
     {
-        if(count($this->arr_conditional_receipients)>0 &&
+        if (count($this->arr_conditional_receipients) > 0 &&
           !empty($this->conditional_field) &&
           !empty($_POST[$this->conditional_field]))
         {
-            foreach($this->arr_conditional_receipients as $condn => $rec)
+            foreach ($this->arr_conditional_receipients as $condn => $rec)
             {
-                if(strcasecmp($condn,$_POST[$this->conditional_field])==0 &&
+                if (strcasecmp($condn, $_POST[$this->conditional_field]) == 0 &&
                 !empty($rec))
                 {
                     $this->AddRecipient($rec);
@@ -243,7 +243,7 @@ 
                             $this->GetSpamTrapInputName(),
                             $this->GetFormIDInputName()
                             );
-        if(in_array($varname,$arr_interanl_vars))
+        if (in_array($varname, $arr_interanl_vars))
         {
             return true;
         }
@@ -252,7 +252,7 @@ 
 
     function FormSubmissionToMail()
     {
-        $ret_str='';
+        $ret_str = '';
         
                 $name = $_POST['name'];
                 $email = $_POST['email'];
@@ -260,22 +260,22 @@ 
                 $option = explode("$", $_POST['reason']);
                     $french = $option[0];
                     $english = $option[1]; 
-                if(empty($_POST['subject']))
+                if (empty($_POST['subject']))
                 {
-                    $subject = "$this->name has contacted you about ". $english." / $this->name vous a envoyé un message à propos de ".$french;
-                }else{
+                    $subject = "$this->name has contacted you about " . $english . " / $this->name vous a envoyé un message à propos de " . $french;
+                } else {
                     $subject = $_POST['subject'];
                 }
         
                 $message = $_POST['message'];
         
-        $name=htmlentities($name, ENT_QUOTES, "UTF-8");
-        $email=htmlentities($email, ENT_QUOTES, "UTF-8");
-        $reason=htmlentities($reason, ENT_QUOTES, "UTF-8");
-        $subject=htmlentities($subject, ENT_QUOTES, "UTF-8");
-        $message=htmlentities($message, ENT_QUOTES, "UTF-8");
+        $name = htmlentities($name, ENT_QUOTES, "UTF-8");
+        $email = htmlentities($email, ENT_QUOTES, "UTF-8");
+        $reason = htmlentities($reason, ENT_QUOTES, "UTF-8");
+        $subject = htmlentities($subject, ENT_QUOTES, "UTF-8");
+        $message = htmlentities($message, ENT_QUOTES, "UTF-8");
       
-                $value = htmlentities($value,ENT_QUOTES,"UTF-8");
+                $value = htmlentities($value, ENT_QUOTES, "UTF-8");
                 $value = nl2br($value);
                 $key = ucfirst($key);
                 $ret_str .= '
@@ -316,11 +316,11 @@ 
             </h2>
 
             <!-- BODY OF CONTENT -->
-            <b>Name:</b> '.$name.'<br/>
-            <b>Email:</b> '.$email.'<br/>
-            <b>Reason:</b> '.$english.' <br/>
-            <b>Subject:</b> '.$subject.'<br/>
-            <b>Message:</b>'.$message .'<br/>
+            <b>Name:</b> '.$name . '<br/>
+            <b>Email:</b> '.$email . '<br/>
+            <b>Reason:</b> '.$english . ' <br/>
+            <b>Subject:</b> '.$subject . '<br/>
+            <b>Message:</b>'.$message . '<br/>
             </div>
                 
             <div style="margin-top:15px; padding: 5px; color: #6d6d6d; border-bottom: 1px solid #ddd;"></div>
@@ -338,11 +338,11 @@ 
             </h2>
 
             <!-- BODY OF CONTENT -->
-            <b>Nom :</b> '.$name.'<br/> 
-            <b>Courriel :</b> '.$email.'<br/>
-            <b>Raison :</b> '.$french.'<br/>
-            <b>Sujet :</b> '.$subject.'<br/>
-            <b>Message :</b>'.$message.'<br/>
+            <b>Nom :</b> '.$name . '<br/> 
+            <b>Courriel :</b> '.$email . '<br/>
+            <b>Raison :</b> '.$french . '<br/>
+            <b>Sujet :</b> '.$subject . '<br/>
+            <b>Message :</b>'.$message . '<br/>
             </div>
             <div style="margin-top:15px; padding: 5px; color: #6d6d6d;"></div>
 
@@ -358,10 +358,10 @@ 
     </div>
   </div>';
 
-        foreach($this->fileupload_fields as $upload_field)
+        foreach ($this->fileupload_fields as $upload_field)
         {
             $field_name = $upload_field["name"];
-            if(!$this->IsFileUploaded($field_name))
+            if (!$this->IsFileUploaded($field_name))
             {
                 continue;
             }        
@@ -374,7 +374,7 @@ 
 
     function ExtraInfoToMail()
     {
-        $ret_str='';
+        $ret_str = '';
 
         $ip = $_SERVER['REMOTE_ADDR'];
         $ret_str = "<div class='label'>IP address of the submitter:</div><div class='value'>$ip</div>\n";
@@ -384,7 +384,7 @@ 
 
     function GetHTMLHeaderPart()
     {
-         $retstr = '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">'."\n".
+         $retstr = '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">' . "\n" .
                    '<html><head><title></title><style type="text/css">
   body {margin: 0; padding: 0; min-width: 100%!important;}
   img {height: auto;}
@@ -423,8 +423,8 @@ 
 
     function GetHTMLFooterPart()
     {
-        $retstr ='</body></html>';
-        return $retstr ;
+        $retstr = '</body></html>';
+        return $retstr;
     }
 
     function ComposeFormtoEmail()
@@ -432,47 +432,47 @@ 
         $header = $this->GetHTMLHeaderPart();
         $formsubmission = $this->FormSubmissionToMail();
         $footer = $this->GetHTMLFooterPart();
-        $message = $header."<p>$formsubmission</p><hr/>$extra_info".$footer;
+        $message = $header . "<p>$formsubmission</p><hr/>$extra_info" . $footer;
 
         return $message;
     }
 
     function AttachFiles()
     {
-        foreach($this->fileupload_fields as $upld_field)
+        foreach ($this->fileupload_fields as $upld_field)
         {
             $field_name = $upld_field["name"];
-            if(!$this->IsFileUploaded($field_name))
+            if (!$this->IsFileUploaded($field_name))
             {
                 continue;
             }
             
-            $filename =basename($_FILES[$field_name]['name']);
-            $this->mailer->AddAttachment($_FILES[$field_name]["tmp_name"],$filename);
+            $filename = basename($_FILES[$field_name]['name']);
+            $this->mailer->AddAttachment($_FILES[$field_name]["tmp_name"], $filename);
         }
     }
 
     function GetFromAddress()
     {
-        if(!empty($this->from_address))
+        if (!empty($this->from_address))
         {
             return $this->from_address;
         }
 
         $host = $_SERVER['SERVER_NAME'];
-        $from ="nobody@$host";
+        $from = "nobody@$host";
         return $from;
     }
 
     function Validate()
     {
         $ret = true;
-        $numErr=0;
+        $numErr = 0;
         //security validations
-        if(empty($_POST[$this->GetFormIDInputName()]) ||
-          $_POST[$this->GetFormIDInputName()] != $this->GetFormIDInputValue() )
+        if (empty($_POST[$this->GetFormIDInputName()]) ||
+          $_POST[$this->GetFormIDInputName()] != $this->GetFormIDInputValue())
         {
-            $numErr=$numErr+1;
+            $numErr = $numErr + 1;
             //The proper error is not given intentionally
             $this->add_error();
             register_error("Automated submission prevention: case 1 failed");
@@ -480,9 +480,9 @@ 
         }
 
         //This is a hidden input field. Humans won't fill this field.
-        if(!empty($_POST[$this->GetSpamTrapInputName()]) )
+        if (!empty($_POST[$this->GetSpamTrapInputName()]))
         {
-            $numErr=$numErr+1;
+            $numErr = $numErr + 1;
             //The proper error is not given intentionally
             $this->add_error();
             register_error("Automated submission prevention: case 2 failed");
@@ -490,11 +490,11 @@ 
         }
 
         //select validations
-        if((($_POST['reason']) =='Select...') || (($_POST['reason']) == "Choisir..."))
+        if ((($_POST['reason']) == 'Select...') || (($_POST['reason']) == "Choisir..."))
         {
-            $numErr=$numErr+1;
+            $numErr = $numErr + 1;
             $this->add_error();
-            register_error(str_replace('[#]',$numErr,elgg_echo('contactform:Errreason')));
+            register_error(str_replace('[#]', $numErr, elgg_echo('contactform:Errreason')));
             $ret = false;
         }
 
@@ -502,97 +502,97 @@ 
         {
             if (empty($_POST['subject']))
             {
-                $numErr=$numErr+1;
+                $numErr = $numErr + 1;
                 $this->add_error();
-                register_error(str_replace('[#]',$numErr,elgg_echo('contactform:Errsubject')));
+                register_error(str_replace('[#]', $numErr, elgg_echo('contactform:Errsubject')));
                 $ret = false;
             }
         }
 
         //name validations
-        if(empty($_POST['name']))
+        if (empty($_POST['name']))
         {
-            $numErr=$numErr+1;
+            $numErr = $numErr + 1;
             $this->add_error();
             //'contactform:Errname'
-            register_error(str_replace('[#]',$numErr,elgg_echo('contactform:Errname')));
+            register_error(str_replace('[#]', $numErr, elgg_echo('contactform:Errname')));
             $ret = false;
         }
         else
-            if(strlen($_POST['name'])>75)
+            if (strlen($_POST['name']) > 75)
             {
-                $numErr=$numErr+1;
+                $numErr = $numErr + 1;
                 $this->add_error();
                 //'contactform:Errnamebig'
-                register_error(str_replace('[#]',$numErr,elgg_echo('contactform:Errnamebig')));
+                register_error(str_replace('[#]', $numErr, elgg_echo('contactform:Errnamebig')));
                 $ret = false;
             }
 
         //email validations
-        if(empty($_POST['email']))
+        if (empty($_POST['email']))
         {
-            $numErr=$numErr+1;
+            $numErr = $numErr + 1;
             $this->add_error();
-            register_error(str_replace('[#]',$numErr,elgg_echo('contactform:Erremail')));
+            register_error(str_replace('[#]', $numErr, elgg_echo('contactform:Erremail')));
             $ret = false;
         }
         else
-            if(strlen($_POST['email'])>100)
+            if (strlen($_POST['email']) > 100)
             {
-                $numErr=$numErr+1;
+                $numErr = $numErr + 1;
                 $this->add_error();
-                register_error(str_replace('[#]',$numErr,elgg_echo('contactform:Erremailbig')));
+                register_error(str_replace('[#]', $numErr, elgg_echo('contactform:Erremailbig')));
                 $ret = false;
             }
             else
-                if(!$this->validate_email($_POST['email']))
+                if (!$this->validate_email($_POST['email']))
                 {
-                    $numErr=$numErr+1;
+                    $numErr = $numErr + 1;
                     $this->add_error();
                     //'contactform:Erremailvalid'
-                    register_error(str_replace('[#]',$numErr,elgg_echo('contactform:Erremailvalid')));
+                    register_error(str_replace('[#]', $numErr, elgg_echo('contactform:Erremailvalid')));
                     $ret = false;
                 }
 
         //department validaions
-        if(empty($_POST['depart']))
+        if (empty($_POST['depart']))
         {
-            $numErr=$numErr+1;
+            $numErr = $numErr + 1;
             $this->add_error();
-            register_error(str_replace('[#]',$numErr,elgg_echo('contactform:Errdepart')));
+            register_error(str_replace('[#]', $numErr, elgg_echo('contactform:Errdepart')));
             $ret = false;
         }
         else
-            if(strlen($_POST['depart'])>255)
+            if (strlen($_POST['depart']) > 255)
             {
-                $numErr=$numErr+1;
+                $numErr = $numErr + 1;
                 $this->add_error();
-                register_error(str_replace('[#]',$numErr,elgg_echo('contactform:Errdepartbig')));
+                register_error(str_replace('[#]', $numErr, elgg_echo('contactform:Errdepartbig')));
                 $ret = false;
             }
 
         //message validaions
-        if(empty($_POST['message']))
+        if (empty($_POST['message']))
         {
-            $numErr=$numErr+1;
+            $numErr = $numErr + 1;
             $this->add_error();
-            register_error(str_replace('[#]',$numErr,elgg_echo('contactform:Errmess')));
+            register_error(str_replace('[#]', $numErr, elgg_echo('contactform:Errmess')));
             $ret = false;
         }
         else
-            if(strlen($_POST['message'])>2048)
+            if (strlen($_POST['message']) > 2048)
             {
-                $numErr=$numErr+1;
+                $numErr = $numErr + 1;
                 $this->add_error();
-                register_error(str_replace('[#]',$numErr,elgg_echo('contactform:Errmessbig')));
+                register_error(str_replace('[#]', $numErr, elgg_echo('contactform:Errmessbig')));
                 $ret = false;
             }
 
         //file upload validations
-        if(!empty($this->fileupload_fields))
+        if (!empty($this->fileupload_fields))
         {
-            $numErr=$numErr+1;
-            if(!$this->ValidateFileUploads($numErr))
+            $numErr = $numErr + 1;
+            if (!$this->ValidateFileUploads($numErr))
             {
                 $ret = false;
             }
@@ -600,27 +600,27 @@ 
         return $ret;
     }
 
-    function ValidateFileType($field_name,$valid_filetypes)
+    function ValidateFileType($field_name, $valid_filetypes)
     {
-        $ret=true;
+        $ret = true;
         $info = pathinfo($_FILES[$field_name]['name']);
         $extn = $info['extension'];
         $extn = strtolower($extn);
 
-        $arr_valid_filetypes= explode(',',$valid_filetypes);
-        if(!in_array($extn,$arr_valid_filetypes))
+        $arr_valid_filetypes = explode(',', $valid_filetypes);
+        if (!in_array($extn, $arr_valid_filetypes))
         {
             $this->add_error();
             register_error("Valid file types are: $valid_filetypes");
-            $ret=false;
+            $ret = false;
         }
         return $ret;
     }
 
-    function ValidateFileSize($field_name,$max_size)
+    function ValidateFileSize($field_name, $max_size)
     {
-        $size_of_uploaded_file = $_FILES[$field_name]["size"]/1024;//size in KBs
-        if($size_of_uploaded_file > $max_size)
+        $size_of_uploaded_file = $_FILES[$field_name]["size"] / 1024; //size in KBs
+        if ($size_of_uploaded_file > $max_size)
         {
             $this->add_error();
             register_error("The file is too big. File size should be less than $max_size KB");
@@ -631,11 +631,11 @@ 
 
     function IsFileUploaded($field_name)
     {
-        if(empty($_FILES[$field_name]['name']))
+        if (empty($_FILES[$field_name]['name']))
         {
             return false;
         }
-        if(!is_uploaded_file($_FILES[$field_name]['tmp_name']))
+        if (!is_uploaded_file($_FILES[$field_name]['tmp_name']))
         {
             return false;
         }
@@ -643,36 +643,36 @@ 
     }
     function ValidateFileUploads()
     {
-        $ret=true;
-        foreach($this->fileupload_fields as $upld_field)
+        $ret = true;
+        foreach ($this->fileupload_fields as $upld_field)
         {
             $field_name = $upld_field["name"];
 
             $valid_filetypes = $upld_field["file_types"];
             
-            if(!$this->IsFileUploaded($field_name))
+            if (!$this->IsFileUploaded($field_name))
             {
                 continue;
             }
 
-            if($_FILES[$field_name]["error"] != 0)
+            if ($_FILES[$field_name]["error"] != 0)
             {
-                $this->add_error("Error in file upload; Error code:".$_FILES[$field_name]["error"]);
-                $ret=false;
+                $this->add_error("Error in file upload; Error code:" . $_FILES[$field_name]["error"]);
+                $ret = false;
             }
 
-            if(!empty($valid_filetypes) &&
-             !$this->ValidateFileType($field_name,$valid_filetypes))
+            if (!empty($valid_filetypes) &&
+             !$this->ValidateFileType($field_name, $valid_filetypes))
             {
-                $ret=false;
+                $ret = false;
             }
 
-            if(!empty($upld_field["maxsize"]) &&
-            $upld_field["maxsize"]>0)
+            if (!empty($upld_field["maxsize"]) &&
+            $upld_field["maxsize"] > 0)
             {
-                if(!$this->ValidateFileSize($field_name,$upld_field["maxsize"]))
+                if (!$this->ValidateFileSize($field_name, $upld_field["maxsize"]))
                 {
-                    $ret=false;
+                    $ret = false;
                 }
             }
         }
@@ -681,7 +681,7 @@ 
 
     function StripSlashes($str)
     {
-        if(get_magic_quotes_gpc())
+        if (get_magic_quotes_gpc())
         {
             $str = stripslashes($str);
         }
@@ -692,11 +692,11 @@ 
     data submitted. Prevents email injections or any other hacker attempts.
     if $remove_nl is true, newline chracters are removed from the input.
     */
-    function Sanitize($str,$remove_nl=true)
+    function Sanitize($str, $remove_nl = true)
     {
         $str = $this->StripSlashes($str);
 
-        if($remove_nl)
+        if ($remove_nl)
         {
             $injections = array('/(\n+)/i',
                 '/(\r+)/i',
@@ -706,7 +706,7 @@ 
                 '/(%08+)/i',
                 '/(%09+)/i'
                 );
-            $str = preg_replace($injections,'',$str);
+            $str = preg_replace($injections, '', $str);
         }
 
         return $str;
@@ -724,7 +724,7 @@ 
 
     function add_error($error)
     {
-        array_push($this->errors,$error);
+        array_push($this->errors, $error);
     }
     function validate_email($email)
     {
@@ -733,7 +733,7 @@ 
 
     function GetKey()
     {
-        return $this->form_random_key.$_SERVER['SERVER_NAME'].$_SERVER['REMOTE_ADDR'];
+        return $this->form_random_key . $_SERVER['SERVER_NAME'] . $_SERVER['REMOTE_ADDR'];
     }
 
 }

Braces +7 added lines, -12 removed lines

@@ -189,7 +189,7 @@ 
          if(empty($_POST['subject']))
            {
            $subject = $categoryen." - ".$depart. " - $this->name  / ".$categoryfr." - ".$depart. " - $this->name";
-           }else{
+           } else{
             $subject = "GCconnex - ".$depart. " - $this->name  / GCconnex - ".$depart. " - $this->name";
            }
         
@@ -263,7 +263,7 @@ 
                 if(empty($_POST['subject']))
                 {
                     $subject = "$this->name has contacted you about ". $english." / $this->name vous a envoyé un message à propos de ".$french;
-                }else{
+                } else{
                     $subject = $_POST['subject'];
                 }
         
@@ -517,8 +517,7 @@ 
             //'contactform:Errname'
             register_error(str_replace('[#]',$numErr,elgg_echo('contactform:Errname')));
             $ret = false;
-        }
-        else
+        } else
             if(strlen($_POST['name'])>75)
             {
                 $numErr=$numErr+1;
@@ -535,16 +534,14 @@ 
             $this->add_error();
             register_error(str_replace('[#]',$numErr,elgg_echo('contactform:Erremail')));
             $ret = false;
-        }
-        else
+        } else
             if(strlen($_POST['email'])>100)
             {
                 $numErr=$numErr+1;
                 $this->add_error();
                 register_error(str_replace('[#]',$numErr,elgg_echo('contactform:Erremailbig')));
                 $ret = false;
-            }
-            else
+            } else
                 if(!$this->validate_email($_POST['email']))
                 {
                     $numErr=$numErr+1;
@@ -561,8 +558,7 @@ 
             $this->add_error();
             register_error(str_replace('[#]',$numErr,elgg_echo('contactform:Errdepart')));
             $ret = false;
-        }
-        else
+        } else
             if(strlen($_POST['depart'])>255)
             {
                 $numErr=$numErr+1;
@@ -578,8 +574,7 @@ 
             $this->add_error();
             register_error(str_replace('[#]',$numErr,elgg_echo('contactform:Errmess')));
             $ret = false;
-        }
-        else
+        } else
             if(strlen($_POST['message'])>2048)
             {
                 $numErr=$numErr+1;