Overwritting Version 2.0.0.10 with Version 2.0.0.11

WebPA · Apr 8, 2014 · 865a6ea · 865a6ea
1 parent e2a5986
commit 865a6ea
Show file tree

Hide file tree

Showing 83 changed files with 29 additions and 6 deletions.
diff --git a/.project b/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>webpaos-local</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>net.sourceforge.phpeclipse.parserbuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>net.sourceforge.phpeclipse.phpnature</nature>
+	</natures>
+</projectDescription>
diff --git a/images/backgrounds/gradient_grey-white_l-r.png b/images/backgrounds/gradient_grey-white_l-r.png
diff --git a/images/backgrounds/gradient_light_blue-white_l-r.png b/images/backgrounds/gradient_light_blue-white_l-r.png
diff --git a/images/backgrounds/gradient_light_green-white_l-r.png b/images/backgrounds/gradient_light_green-white_l-r.png
diff --git a/images/backgrounds/gradient_pale_yellow-white_l-r.png b/images/backgrounds/gradient_pale_yellow-white_l-r.png
diff --git a/images/backgrounds/gradient_pink-white_l-r.png b/images/backgrounds/gradient_pink-white_l-r.png
diff --git a/images/buttons/arrow_green_down.gif b/images/buttons/arrow_green_down.gif
diff --git a/images/buttons/arrow_green_left.gif b/images/buttons/arrow_green_left.gif
diff --git a/images/buttons/arrow_green_right.gif b/images/buttons/arrow_green_right.gif
diff --git a/images/buttons/arrow_green_up.gif b/images/buttons/arrow_green_up.gif
diff --git a/images/buttons/assessments.gif b/images/buttons/assessments.gif
diff --git a/images/buttons/button_assessment_clone.gif b/images/buttons/button_assessment_clone.gif
diff --git a/images/buttons/button_assessment_create.gif b/images/buttons/button_assessment_create.gif
diff --git a/images/buttons/button_assessment_edit.gif b/images/buttons/button_assessment_edit.gif
diff --git a/images/buttons/button_assessment_list.gif b/images/buttons/button_assessment_list.gif
diff --git a/images/buttons/button_form_clone.gif b/images/buttons/button_form_clone.gif
diff --git a/images/buttons/button_form_create.gif b/images/buttons/button_form_create.gif
diff --git a/images/buttons/button_form_edit.gif b/images/buttons/button_form_edit.gif
diff --git a/images/buttons/button_form_import.gif b/images/buttons/button_form_import.gif
diff --git a/images/buttons/button_form_list.gif b/images/buttons/button_form_list.gif
diff --git a/images/buttons/button_group_clone.gif b/images/buttons/button_group_clone.gif
diff --git a/images/buttons/button_group_create.gif b/images/buttons/button_group_create.gif
diff --git a/images/buttons/button_group_edit.gif b/images/buttons/button_group_edit.gif
diff --git a/images/buttons/button_group_list.gif b/images/buttons/button_group_list.gif
diff --git a/images/buttons/button_help.gif b/images/buttons/button_help.gif
diff --git a/images/buttons/button_load_data.gif b/images/buttons/button_load_data.gif
diff --git a/images/buttons/button_search_user.png b/images/buttons/button_search_user.png
diff --git a/images/buttons/button_staff_user.png b/images/buttons/button_staff_user.png
diff --git a/images/buttons/button_student_user.png b/images/buttons/button_student_user.png
diff --git a/images/buttons/button_view_data.gif b/images/buttons/button_view_data.gif
diff --git a/images/buttons/button_view_modules.png b/images/buttons/button_view_modules.png
diff --git a/images/buttons/cross.gif b/images/buttons/cross.gif
diff --git a/images/buttons/edit.gif b/images/buttons/edit.gif
diff --git a/images/buttons/email.gif b/images/buttons/email.gif
diff --git a/images/buttons/group_marks.gif b/images/buttons/group_marks.gif
diff --git a/images/buttons/mark_sheet.gif b/images/buttons/mark_sheet.gif
diff --git a/images/buttons/students_responded.gif b/images/buttons/students_responded.gif
diff --git a/images/file_icons/csv.gif b/images/file_icons/csv.gif
diff --git a/images/file_icons/moodle.gif b/images/file_icons/moodle.gif
diff --git a/images/file_icons/package_go.png b/images/file_icons/package_go.png
diff --git a/images/file_icons/page_white_word.png b/images/file_icons/page_white_word.png
diff --git a/images/file_icons/report.png b/images/file_icons/report.png
diff --git a/images/file_icons/xml.gif b/images/file_icons/xml.gif
diff --git a/images/footer/eec_logo_grey.png b/images/footer/eec_logo_grey.png
diff --git a/images/footer/engcetl_logo_grey.png b/images/footer/engcetl_logo_grey.png
diff --git a/images/footer/lu_logo_grey.png b/images/footer/lu_logo_grey.png
diff --git a/images/icons/_template_add_x.psp b/images/icons/_template_add_x.psp
diff --git a/images/icons/_template_edit_x.psp b/images/icons/_template_edit_x.psp
diff --git a/images/icons/advanced_options.gif b/images/icons/advanced_options.gif
diff --git a/images/icons/assessments.gif b/images/icons/assessments.gif
diff --git a/images/icons/assessments_grey.gif b/images/icons/assessments_grey.gif
diff --git a/images/icons/closed_icon.gif b/images/icons/closed_icon.gif
diff --git a/images/icons/cross.gif b/images/icons/cross.gif
diff --git a/images/icons/filing_cabinet_2.gif b/images/icons/filing_cabinet_2.gif
diff --git a/images/icons/finished_icon.gif b/images/icons/finished_icon.gif
diff --git a/images/icons/form.gif b/images/icons/form.gif
diff --git a/images/icons/form_clone.gif b/images/icons/form_clone.gif
diff --git a/images/icons/form_grey.gif b/images/icons/form_grey.gif
diff --git a/images/icons/group_delete.png b/images/icons/group_delete.png
diff --git a/images/icons/groups.gif b/images/icons/groups.gif
diff --git a/images/icons/groups_add.gif b/images/icons/groups_add.gif
diff --git a/images/icons/groups_clone.gif b/images/icons/groups_clone.gif
diff --git a/images/icons/groups_clone2.gif b/images/icons/groups_clone2.gif
diff --git a/images/icons/groups_edit.gif b/images/icons/groups_edit.gif
diff --git a/images/icons/groups_grey.gif b/images/icons/groups_grey.gif
diff --git a/images/icons/load_data.gif b/images/icons/load_data.gif
diff --git a/images/icons/open_icon.gif b/images/icons/open_icon.gif
diff --git a/images/icons/package_add.png b/images/icons/package_add.png
diff --git a/images/icons/padlock_16.gif b/images/icons/padlock_16.gif
diff --git a/images/icons/padlock_32.gif b/images/icons/padlock_32.gif
diff --git a/images/icons/pending_icon.gif b/images/icons/pending_icon.gif
diff --git a/images/icons/spot_black.gif b/images/icons/spot_black.gif
diff --git a/images/icons/tick.gif b/images/icons/tick.gif
diff --git a/images/icons/view_data.gif b/images/icons/view_data.gif
diff --git a/images/partners.gif b/images/partners.gif
diff --git a/images/tab_bar/tab_hover.png b/images/tab_bar/tab_hover.png
diff --git a/images/tab_bar/tab_off.png b/images/tab_bar/tab_off.png
diff --git a/images/tab_bar/tab_on.png b/images/tab_bar/tab_on.png
diff --git a/images/tab_bar/tab_padding.png b/images/tab_bar/tab_padding.png
diff --git a/images/tool/appbar_webpa_logo.png b/images/tool/appbar_webpa_logo.png
diff --git a/images/tool/menu_arrow.gif b/images/tool/menu_arrow.gif
diff --git a/includes/classes/class_assessment.php b/includes/classes/class_assessment.php
@@ -147,7 +147,8 @@ function save() {
       return false;
     } else {
       // Save the Form
-      $fields = array ('assessment_id'    => $this->id ,
+      $fields = array (
+      	       'assessment_id'    => $this->id ,
                'assessment_name'    => $this->name ,
                'module_id'       => $this->module_id ,
                'collection_id'    => $this->_collection_id ,
@@ -164,14 +165,19 @@ function save() {
                'email_closing'    =>($this->email_closing)? 1 : 0 ,
                'feedback_name'    => $this->feedback_name ,
                'feedback_length'    => 0 ,
-               'feedback_optional'    => 0);
+               'feedback_optional'    => 0
+      );
+
+      $ass_name = $this->_DAO->escape_str($fields['assessment_name']);
+      $ass_intro = $this->_DAO->escape_str($fields['introduction']);
       $xml = $this->_DAO->_prepare_field_value($fields['form_xml']);
+
       $sql = 'INSERT INTO ' . APP__DB_TABLE_PREFIX . 'assessment ({fields}) VALUES ({values}) ';
-      $sql .= "ON DUPLICATE KEY UPDATE assessment_name = '{$fields['assessment_name']}', module_id = {$fields['module_id']}, " .
+      $sql .= "ON DUPLICATE KEY UPDATE assessment_name = '{$ass_name}', module_id = {$fields['module_id']}, " .
               "collection_id = '{$fields['collection_id']}', form_xml = {$xml}, " .
               "open_date = '{$fields['open_date']}', close_date = '{$fields['close_date']}', " .
               "retract_date = '{$fields['retract_date']}', " .
-              "introduction = '{$fields['introduction']}', allow_feedback = {$fields['allow_feedback']}, " .
+              "introduction = '{$ass_intro}', allow_feedback = {$fields['allow_feedback']}, " .
               "assessment_type = {$fields['assessment_type']}, student_feedback = {$fields['student_feedback']}, " .
               "contact_email = '{$fields['contact_email']}', " .
               "email_opening = {$fields['email_opening']}, email_closing = {$fields['email_closing']}, " .

diff --git a/includes/classes/class_form.php b/includes/classes/class_form.php
@@ -133,8 +133,8 @@ function save() {
 
       // Save the Form
       $this->_DAO->execute('INSERT INTO ' . APP__DB_TABLE_PREFIX . 'form (form_id, form_name, form_type, form_xml) ' .
-         "VALUES ('{$this->id}', '{$this->name}', '{$this->type}', '') " .
-         "ON DUPLICATE KEY UPDATE form_name = '{$this->name}', form_type = '{$this->type}'");
+         "VALUES ('{$this->id}', '" . $this->_DAO->escape_str($this->name) . "', '" . $this->_DAO->escape_str($this->type) . "', '') " .
+         "ON DUPLICATE KEY UPDATE form_name = '" . $this->_DAO->escape_str($this->name) . "', form_type = '" . $this->_DAO->escape_str($this->type) . "'");
       $this->_DAO->execute('UPDATE ' . APP__DB_TABLE_PREFIX . "form SET form_xml = '{$form_xml}' WHERE form_id = '{$this->id}'");
 
       if (count($this->modules) > 0) {