Cosmetic changes

main/announcements/announcements.php

@@ -3,7 +3,7 @@
 /**
  * @author Frederik Vermeire <frederik.vermeire@pandora.be>, UGent Internship
  * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University: code cleaning
- * @author Julio MMontoya <gugli100@gmail.com>, MORE code cleaning
+ * @author Julio Montoya <gugli100@gmail.com>, MORE code cleaning
  * @abstract The task of the internship was to integrate the 'send messages to specific users' with the
  *			 Announcements tool and also add the resource linker here. The database also needed refactoring
  *			 as there was no title field (the title was merged into the content field)
@@ -67,11 +67,10 @@ $tbl_item_property  	= Database::get_course_table(TABLE_ITEM_PROPERTY);
 $_SESSION['source_type']="Ad_Valvas";
 include '../resourcelinker/resourcelinker.inc.php';
 
-if (!empty($_POST['addresources'])) // When the "Add Resource" button is clicked we store all the form data into a session
+if (!empty($_POST['addresources'])) {
-{
+	// When the "Add Resource" button is clicked we store all the form data into a session
-	include('announcements.inc.php');
+	require_once 'announcements.inc.php';
-
+    $form_elements= array ('emailTitle'=>Security::remove_XSS($emailTitle), 'newContent'=>Security::remove_XSS($newContent), 'id'=>$id, 'to'=>$selectedform, 'emailoption'=>$email_ann);
-    $form_elements= array ('emailTitle'=>stripslashes($emailTitle), 'newContent'=>stripslashes($newContent), 'id'=>$id, 'to'=>$selectedform, 'emailoption'=>$email_ann);
     $_SESSION['formelements']=$form_elements;
 
     if($id) // this is to correctly handle edits
@@ -349,9 +348,7 @@ if (api_is_allowed_to_edit(false,true) OR (api_get_course_setting('allow_user_ed
 		//Database::query("DELETE FROM $tbl_announcement");
 		if (api_is_allowed_to_edit()) {
 			Database::query("UPDATE $tbl_item_property SET visibility='2' WHERE tool='".TOOL_ANNOUNCEMENT."'");
-
 			delete_all_resources_type("Ad_Valvas");
-
 			$id = null;
 			$emailTitle = null;
 			$newContent = null;
@@ -405,6 +402,7 @@ if (api_is_allowed_to_edit(false,true) OR (api_get_course_setting('allow_user_ed
 	/*
 		Move announcement up/down
 	*/
+	
 	if ($ctok == $_GET['sec_token']) {
 		if (!empty($_GET['down'])) {
 			$thisAnnouncementId = intval($_GET['down']);
@@ -502,6 +500,7 @@ if (api_is_allowed_to_edit(false,true) OR (api_get_course_setting('allow_user_ed
 					if (!empty($_SESSION['toolgroup'])) {
 						$insert_id = store_advalvas_group_item($safe_emailTitle,$safe_newContent,$order,array('GROUP:'.$_SESSION['toolgroup']),$_POST['selectedform'],$file,$file_comment);
 					} else {
+						
 						$insert_id = store_advalvas_item($safe_emailTitle, $safe_newContent, $order, $_POST['selectedform'], $file, $file_comment);
 					}
 				    store_resources($_SESSION['source_type'],$insert_id);
@@ -509,9 +508,7 @@ if (api_is_allowed_to_edit(false,true) OR (api_get_course_setting('allow_user_ed
 				    $message = get_lang('AnnouncementAdded');
 				}
 
-/*
+				/*		MAIL WHEN USER COMES FROM SURVEY	*/
-		MAIL WHEN USER COMES FROM SURVEY
-*/
 
 				if ($_POST['emailsAdd']) {
 
@@ -569,9 +566,7 @@ if (api_is_allowed_to_edit(false,true) OR (api_get_course_setting('allow_user_ed
 					}
 				}
 
-/*
+				/*		MAIL FUNCTION	*/
-		MAIL FUNCTION
-*/
 
 				if ($_POST['email_ann'] && empty($_POST['onlyThoseMails'])) {
 
@@ -581,16 +576,11 @@ if (api_is_allowed_to_edit(false,true) OR (api_get_course_setting('allow_user_ed
 
 			        // groepen omzetten in users
 			        if ($grouplist) {
-
 						$grouplist = "'".implode("', '",$grouplist)."'";	//protect individual elements with surrounding quotes
 						$sql = "SELECT user_id
 								FROM $tbl_groupUser gu
 								WHERE gu.group_id IN (".$grouplist.")";
-
-
 						$groupMemberResult = Database::query($sql);
-
-
 						if ($groupMemberResult) {
 							while ($u = Database::fetch_array($groupMemberResult)) {
 								$userlist [] = $u ['user_id']; // complete the user id list ...
@@ -598,7 +588,6 @@ if (api_is_allowed_to_edit(false,true) OR (api_get_course_setting('allow_user_ed
 						}
 					}
 
-
 				    if (is_array($userlist)) {
 				    	$userlist = "'".implode("', '", array_unique($userlist) )."'";
 
@@ -626,19 +615,11 @@ if (api_is_allowed_to_edit(false,true) OR (api_get_course_setting('allow_user_ed
 
 					if ($sqlmail != '') {
 						$rs_mail = Database::query($sqlmail);
-				    	/*=================================================================================
-							    				send email one by one to avoid antispam
-					    =================================================================================*/
-						$db_name = Database::get_course_table(TABLE_MAIN_SURVEY);
-						while ($myrow = Database::fetch_array($rs_mail)) {
-							/*    Header : Bericht van uw lesgever - GES ($_cid)
-
-								  Body :   John Doe (prenom + nom) <john_doe@hotmail.com> (email)
 						
-								  		   Morgen geen les!! (emailTitle)
+				    	/*	Send email one by one to avoid antispam */
 				    	
-								  		   Morgen is er geen les, de les wordt geschrapt wegens vergadering (newContent)
+						$db_name = Database::get_course_table(TABLE_MAIN_SURVEY);
-						    */
+						while ($myrow = Database::fetch_array($rs_mail)) {
 							
 							$emailSubject = "[" . $_course['official_code'] . "] " . $emailTitle;
 
@@ -653,15 +634,14 @@ if (api_is_allowed_to_edit(false,true) OR (api_get_course_setting('allow_user_ed
 							    $sender_name = api_get_person_name($_SESSION['_user']['lastName'], $_SESSION['_user']['firstName'], null, PERSON_NAME_EMAIL_ADDRESS);
 							    $email = $_SESSION['_user']['mail'];
 								$headers="From:$sender_name\r\nReply-to: $email";							
-								//@mail($myrow["email"],stripslashes($emailTitle),$message,$headers);
 								@api_mail('',$myrow["email"],stripslashes($emailTitle),$message,$sender_name,$email);
 	                        } else {
 	                            // intro of the email: receiver name and subject
                                 $mail_body = api_get_person_name($myrow["lastname"], $myrow["firstname"], null, PERSON_NAME_EMAIL_ADDRESS)."<br />\n".stripslashes($emailTitle)."<br />";
 
-	                            // main part of the email
+	                            // Main part of the email
 	                            $mail_body .= trim(stripslashes($newContent));
-                                    // signature of email: sender name and course URL after -- line
+                                // Signature of email: sender name and course URL after -- line
 	                            $mail_body .= "<br />-- <br />";
 	                            $mail_body .= api_get_person_name($_user['firstName'], $_user['lastName'], null, PERSON_NAME_EMAIL_ADDRESS)." \n";
 	                            $mail_body .= "<br /> \n<a href=\"".api_get_path(WEB_CODE_PATH).'announcements/announcements.php?'.api_get_cidreq()."\">";
@@ -717,7 +697,6 @@ if (api_is_allowed_to_edit(false,true) OR (api_get_course_setting('allow_user_ed
 						update_mail_sent($insert_id);
 						$message = $added_and_sent;
 					}
-
 				} // $email_ann*/
 			} // end condition token
 		}	// isset