From c0a5c87db45da47aa46ae6165e91eddca98f3647 Mon Sep 17 00:00:00 2001 From: Julio Montoya Date: Mon, 13 Apr 2015 15:19:51 +0200 Subject: [PATCH] Fix queries + fix PHP warnings. --- main/attendance/attendance_controller.php | 1 + .../classes/CourseBuilder.class.php | 30 +++--- .../classes/CourseRestorer.class.php | 94 ++++++++++++++----- main/dropbox/dropbox_class.inc.php | 75 ++++++++++----- main/inc/lib/attendance.lib.php | 26 +++-- main/wiki/wiki.inc.php | 9 +- main/work/work.lib.php | 20 ++-- 7 files changed, 174 insertions(+), 81 deletions(-) diff --git a/main/attendance/attendance_controller.php b/main/attendance/attendance_controller.php index 73b8b14380..2d47444138 100755 --- a/main/attendance/attendance_controller.php +++ b/main/attendance/attendance_controller.php @@ -179,6 +179,7 @@ class AttendanceController public function attendanceSetVisible($attendanceId) { $attendance = new Attendance(); + $affectedRows = null; if (!empty($attendanceId)) { $affectedRows = $attendance->changeVisibility($attendanceId, 1); } diff --git a/main/coursecopy/classes/CourseBuilder.class.php b/main/coursecopy/classes/CourseBuilder.class.php index 640a1ccf09..84f9fe3bcc 100755 --- a/main/coursecopy/classes/CourseBuilder.class.php +++ b/main/coursecopy/classes/CourseBuilder.class.php @@ -80,15 +80,9 @@ class CourseBuilder $this->course = new Course(); $this->course->code = $_course['official_code']; $this->course->type = $type; - $this->course->path = api_get_path( - SYS_COURSE_PATH - ).$_course['path'].'/'; - $this->course->backup_path = api_get_path( - SYS_COURSE_PATH - ).$_course['path']; - $this->course->encoding = api_get_system_encoding( - ); //current platform encoding - $this->course->db_name = $_course['dbName']; + $this->course->path = api_get_path(SYS_COURSE_PATH).$_course['path'].'/'; + $this->course->backup_path = api_get_path(SYS_COURSE_PATH).$_course['path']; + $this->course->encoding = api_get_system_encoding(); $this->course->info = $_course; } @@ -954,7 +948,7 @@ class CourseBuilder $id_list = array() ) { $table = Database:: get_course_table(TABLE_ANNOUNCEMENT); - $course_id = api_get_course_int_id(); + $courseId = api_get_course_int_id(); $sessionCondition = api_get_session_condition( $session_id, @@ -962,22 +956,27 @@ class CourseBuilder $with_base_content ); - $sql = 'SELECT * FROM '.$table.' WHERE c_id = '.$course_id.' '.$sessionCondition; + $sql = 'SELECT * FROM '.$table.' WHERE c_id = '.$courseId.' '.$sessionCondition; $db_result = Database::query($sql); $table_attachment = Database:: get_course_table( TABLE_ANNOUNCEMENT_ATTACHMENT ); while ($obj = Database::fetch_object($db_result)) { - $sql = 'SELECT path, comment, filename, size FROM '.$table_attachment.' WHERE c_id = '.$course_id.' AND announcement_id = '.$obj->id.''; + + $sql = 'SELECT path, comment, filename, size + FROM '.$table_attachment.' + WHERE c_id = '.$courseId.' AND announcement_id = '.$obj->id.''; $result = Database::query($sql); $attachment_obj = Database::fetch_object($result); $att_path = $att_filename = $att_size = $atth_comment = ''; + if (!empty($attachment_obj)) { $att_path = $attachment_obj->path; $att_filename = $attachment_obj->filename; $att_size = $attachment_obj->size; $atth_comment = $attachment_obj->comment; } + $announcement = new Announcement( $obj->id, $obj->title, @@ -991,7 +990,6 @@ class CourseBuilder $atth_comment ); $this->course->add_resource($announcement); - } } @@ -1467,11 +1465,13 @@ class CourseBuilder $with_base_content ); - $sql = 'SELECT * FROM '.$table_attendance.' WHERE c_id = '.$course_id.' '.$sessionCondition; + $sql = 'SELECT * FROM '.$table_attendance.' + WHERE c_id = '.$course_id.' '.$sessionCondition; $db_result = Database::query($sql); while ($row = Database::fetch_array($db_result, 'ASSOC')) { $obj = new Attendance($row); - $sql = 'SELECT * FROM '.$table_attendance_calendar.' WHERE c_id = '.$course_id.' AND attendance_id = '.$row['id']; + $sql = 'SELECT * FROM '.$table_attendance_calendar.' + WHERE c_id = '.$course_id.' AND attendance_id = '.$row['id']; $result = Database::query($sql); while ($sub_row = Database::fetch_array($result, 'ASSOC')) { diff --git a/main/coursecopy/classes/CourseRestorer.class.php b/main/coursecopy/classes/CourseRestorer.class.php index f8b8517d0c..15ed4346ed 100755 --- a/main/coursecopy/classes/CourseRestorer.class.php +++ b/main/coursecopy/classes/CourseRestorer.class.php @@ -818,7 +818,7 @@ class CourseRestorer if (file_exists($path.$document->path)) { switch ($this->file_option) { - case FILE_OVERWRITE : + case FILE_OVERWRITE: rmdirr($path.$document->path); copyDirTo( $this->course->backup_path . '/' . $document->path, @@ -1123,11 +1123,15 @@ class CourseRestorer $tool_intro_table = Database :: get_course_table(TABLE_TOOL_INTRO); $resources = $this->course->resources; foreach ($resources[RESOURCE_TOOL_INTRO] as $id => $tool_intro) { - $sql = "DELETE FROM ".$tool_intro_table." WHERE c_id = ".$this->destination_course_id." AND id='".self::DBUTF8escapestring($tool_intro->id)."'"; + $sql = "DELETE FROM ".$tool_intro_table." + WHERE c_id = ".$this->destination_course_id." AND id='".self::DBUTF8escapestring($tool_intro->id)."'"; Database::query($sql); $tool_intro->intro_text = DocumentManager::replace_urls_inside_content_html_from_copy_course($tool_intro->intro_text,$this->course->code, $this->course->destination_path, $this->course->backup_path, $this->course->info['path']); - $sql = "INSERT INTO ".$tool_intro_table." SET c_id = ".$this->destination_course_id." , id='".self::DBUTF8escapestring($tool_intro->id)."', intro_text = '".self::DBUTF8escapestring($tool_intro->intro_text)."'"; - $sql.= ", session_id = $sessionId"; + $sql = "INSERT INTO ".$tool_intro_table." SET + c_id = ".$this->destination_course_id.", + id='".self::DBUTF8escapestring($tool_intro->id)."', + intro_text = '".self::DBUTF8escapestring($tool_intro->intro_text)."' + session_id = $sessionId"; Database::query($sql); $this->course->resources[RESOURCE_TOOL_INTRO][$id]->destination_id = Database::insert_id(); @@ -1156,7 +1160,12 @@ class CourseRestorer $result=Database::query($sql); list($orderMax)=Database::fetch_array($result,'NUM'); $display_order=$orderMax+1; - $sql = "INSERT INTO ".$link_cat_table." SET c_id = ".$this->destination_course_id." , category_title = '".self::DBUTF8escapestring($link_cat->title)."', description='".self::DBUTF8escapestring($link_cat->description)."', display_order='".$display_order."' $condition_session "; + $sql = "INSERT INTO $link_cat_table SET + c_id = ".$this->destination_course_id.", + category_title = '".self::DBUTF8escapestring($link_cat->title)."', + description = '".self::DBUTF8escapestring($link_cat->description)."', + display_order = '".$display_order."' + $condition_session "; Database::query($sql); $new_id = Database::insert_id(); $this->course->resources[RESOURCE_LINKCATEGORY][$id]->destination_id = $new_id; @@ -1190,8 +1199,8 @@ class CourseRestorer content = '".self::DBUTF8escapestring($event->content)."', all_day = '".$event->all_day."', start_date = '".$event->start_date."', - end_date = '".$event->end_date."'"; - $sql.= ", session_id = $sessionId"; + end_date = '".$event->end_date."', + session_id = $sessionId"; Database::query($sql); $new_event_id = Database::insert_id(); @@ -1205,7 +1214,9 @@ class CourseRestorer if (!empty($this->course->orig)) { $table_attachment = Database :: get_course_table(TABLE_AGENDA_ATTACHMENT); - $sql = 'SELECT path, comment, size, filename FROM '.$table_attachment.' WHERE c_id = '.$this->destination_course_id.' AND agenda_id = '.$id; + $sql = 'SELECT path, comment, size, filename + FROM '.$table_attachment.' + WHERE c_id = '.$this->destination_course_id.' AND agenda_id = '.$id; $attachment_event = Database::query($sql); $attachment_event = Database::fetch_object($attachment_event); @@ -1215,7 +1226,13 @@ class CourseRestorer //$copy_result = true; if ($copy_result) { $table_attachment = Database :: get_course_table(TABLE_AGENDA_ATTACHMENT); - $sql = "INSERT INTO ".$table_attachment." SET c_id = ".$this->destination_course_id." , path = '".self::DBUTF8escapestring($new_filename)."', comment = '".self::DBUTF8escapestring($attachment_event->comment)."', size = '".$attachment_event->size."', filename = '".$attachment_event->filename."' , agenda_id = '".$new_event_id."' "; + $sql = "INSERT INTO ".$table_attachment." SET + c_id = ".$this->destination_course_id.", + path = '".self::DBUTF8escapestring($new_filename)."', + comment = '".self::DBUTF8escapestring($attachment_event->comment)."', + size = '".$attachment_event->size."', + filename = '".$attachment_event->filename."', + agenda_id = '".$new_event_id."' "; Database::query($sql); } } @@ -1226,7 +1243,13 @@ class CourseRestorer $copy_result = copy($origin_path.$event->attachment_path, $destination_path.$new_filename); if ($copy_result) { $table_attachment = Database :: get_course_table(TABLE_AGENDA_ATTACHMENT); - $sql = "INSERT INTO ".$table_attachment." SET c_id = ".$this->destination_course_id." , path = '".self::DBUTF8escapestring($new_filename)."', comment = '".self::DBUTF8escapestring($event->attachment_comment)."', size = '".$event->attachment_size."', filename = '".$event->attachment_filename."' , agenda_id = '".$new_event_id."' "; + $sql = "INSERT INTO ".$table_attachment." SET + c_id = ".$this->destination_course_id.", + path = '".self::DBUTF8escapestring($new_filename)."', + comment = '".self::DBUTF8escapestring($event->attachment_comment)."', + size = '".$event->attachment_size."', + filename = '".$event->attachment_filename."', + agenda_id = '".$new_event_id."' "; Database::query($sql); } } @@ -1266,7 +1289,12 @@ class CourseRestorer $session_id = intval($session_id); $condition_session = " , session_id = '$session_id' "; } - $sql = "INSERT INTO ".$table." SET c_id = ".$this->destination_course_id." , description_type = '".self::DBUTF8escapestring($cd->description_type)."',title = '".self::DBUTF8escapestring($cd->title)."', content = '".self::DBUTF8escapestring($description_content)."' $condition_session"; + $sql = "INSERT INTO ".$table." SET + c_id = ".$this->destination_course_id." , + description_type = '".self::DBUTF8escapestring($cd->description_type)."', + title = '".self::DBUTF8escapestring($cd->title)."', + content = '".self::DBUTF8escapestring($description_content)."' + $condition_session"; Database::query($sql); $this->course->resources[RESOURCE_COURSEDESCRIPTION][$id]->destination_id = Database::insert_id(); } @@ -1294,18 +1322,17 @@ class CourseRestorer ); $sql = "INSERT INTO ".$table." " ."SET - c_id = ".$this->destination_course_id." , - title = '".self::DBUTF8escapestring($announcement->title)."'," . - "content = '".self::DBUTF8escapestring($announcement->content)."', " . - "end_date = '".$announcement->date."', " . - "display_order = '".$announcement->display_order."', " . - "email_sent = '".$announcement->email_sent."', " - . "session_id = $sessionId"; + c_id = ".$this->destination_course_id.", + title = '".self::DBUTF8escapestring($announcement->title)."', + content = '".self::DBUTF8escapestring($announcement->content)."', + end_date = '".$announcement->date."', + display_order = '".$announcement->display_order."', + email_sent = '".$announcement->email_sent."', + session_id = $sessionId"; Database::query($sql); $new_announcement_id = Database::insert_id(); $this->course->resources[RESOURCE_ANNOUNCEMENT][$id]->destination_id = $new_announcement_id; - $origin_path = $this->course->backup_path.'/upload/announcements/'; $destination_path = api_get_path(SYS_COURSE_PATH).$this->course->destination_path.'/upload/announcements/'; @@ -1314,30 +1341,49 @@ class CourseRestorer $table_attachment = Database :: get_course_table(TABLE_ANNOUNCEMENT_ATTACHMENT); - $sql = 'SELECT path, comment, size, filename FROM '.$table_attachment.' WHERE c_id = '.$this->destination_course_id.' AND announcement_id = '.$id; + $sql = 'SELECT path, comment, size, filename + FROM '.$table_attachment.' + WHERE c_id = '.$this->destination_course_id.' AND announcement_id = '.$id; $attachment_event = Database::query($sql); $attachment_event = Database::fetch_object($attachment_event); - if (file_exists($origin_path.$attachment_event->path) && !is_dir($origin_path.$attachment_event->path) ) { + if (file_exists($origin_path.$attachment_event->path) && + !is_dir($origin_path.$attachment_event->path) + ) { $new_filename = uniqid(''); //ass seen in the add_agenda_attachment_file() function in agenda.inc.php $copy_result = copy($origin_path.$attachment_event->path, $destination_path.$new_filename); //error_log($destination_path.$new_filename); error_log($copy_result); //$copy_result = true; if ($copy_result) { $table_attachment = Database :: get_course_table(TABLE_ANNOUNCEMENT_ATTACHMENT); - $sql = "INSERT INTO ".$table_attachment." SET c_id = ".$this->destination_course_id." , path = '".self::DBUTF8escapestring($new_filename)."', comment = '".self::DBUTF8escapestring($attachment_event->comment)."', size = '".$attachment_event->size."', filename = '".$attachment_event->filename."' , announcement_id = '".$new_announcement_id."' "; + $sql = "INSERT INTO ".$table_attachment." SET + c_id = ".$this->destination_course_id.", + path = '".self::DBUTF8escapestring($new_filename)."', + comment = '".self::DBUTF8escapestring($attachment_event->comment)."', + size = '".$attachment_event->size."', + filename = '".$attachment_event->filename."', + announcement_id = '".$new_announcement_id."' + "; Database::query($sql); } } } else { // get the info of the file - if(!empty($announcement->attachment_path) && is_file($origin_path.$announcement->attachment_path) && is_readable($origin_path.$announcement->attachment_path)) { + if (!empty($announcement->attachment_path) && + is_file($origin_path.$announcement->attachment_path) && + is_readable($origin_path.$announcement->attachment_path) + ) { $new_filename = uniqid(''); //ass seen in the add_agenda_attachment_file() function in agenda.inc.php $copy_result = copy($origin_path.$announcement->attachment_path, $destination_path.$new_filename); if ($copy_result) { $table_attachment = Database :: get_course_table(TABLE_ANNOUNCEMENT_ATTACHMENT); - $sql = "INSERT INTO ".$table_attachment." SET c_id = ".$this->destination_course_id." , path = '".self::DBUTF8escapestring($new_filename)."', comment = '".self::DBUTF8escapestring($announcement->attachment_comment)."', size = '".$announcement->attachment_size."', filename = '".$announcement->attachment_filename."' , announcement_id = '".$new_announcement_id."' "; + $sql = "INSERT INTO ".$table_attachment." SET + c_id = ".$this->destination_course_id." , + path = '".self::DBUTF8escapestring($new_filename)."', + comment = '".self::DBUTF8escapestring($announcement->attachment_comment)."', + size = '".$announcement->attachment_size."', filename = '".$announcement->attachment_filename."', + announcement_id = '".$new_announcement_id."' "; Database::query($sql); } } diff --git a/main/dropbox/dropbox_class.inc.php b/main/dropbox/dropbox_class.inc.php index bac703a691..1cccfc40d4 100755 --- a/main/dropbox/dropbox_class.inc.php +++ b/main/dropbox/dropbox_class.inc.php @@ -145,9 +145,14 @@ class Dropbox_Work Database::query($sql); $this->id = Database::insert_id(); // Get automatically inserted id + if ($this->id) { + $sql = "UPDATE ".$dropbox_cnf['tbl_file']." SET id = iid WHERE iid = {$this->id}"; + Database::query($sql); + } } - $sql = "SELECT count(file_id) as count FROM ".$dropbox_cnf['tbl_person']." + $sql = "SELECT count(file_id) as count + FROM ".$dropbox_cnf['tbl_person']." WHERE c_id = $course_id AND file_id = ".intval($this->id)." AND user_id = ".$this->uploader_id; $result = Database::query($sql); $row = Database::fetch_array($result); @@ -155,11 +160,13 @@ class Dropbox_Work // Insert entries into person table $sql = "INSERT INTO ".$dropbox_cnf['tbl_person']." (c_id, file_id, user_id) - VALUES ($course_id, - ".intval($this->id)." - , ".intval($this->uploader_id)." - )"; + VALUES ($course_id, ".intval($this->id)." , ".intval($this->uploader_id).")"; Database::query($sql); + /*$id = Database::insert_id(); + if ($id) { + $sql = "UPDATE ".$dropbox_cnf['tbl_person']." SET id = iid WHERE iid = {$this->id}"; + Database::query($sql); + }*/ } } @@ -211,7 +218,8 @@ class Dropbox_Work // Getting the feedback on the work. if ($action == 'viewfeedback' AND $this->id == $_GET['id']) { $feedback2 = array(); - $sql_feedback = "SELECT * FROM ".$dropbox_cnf['tbl_feedback']." WHERE c_id = $course_id AND file_id='".$id."' ORDER BY feedback_id ASC"; + $sql_feedback = "SELECT * FROM ".$dropbox_cnf['tbl_feedback']." + WHERE c_id = $course_id AND file_id='".$id."' ORDER BY feedback_id ASC"; $result = Database::query($sql_feedback); while ($row_feedback = Database::fetch_array($result)) { $row_feedback['feedback'] = Security::remove_XSS($row_feedback['feedback']); @@ -337,7 +345,7 @@ class Dropbox_SentWork extends Dropbox_Work * * @param unknown_type $id */ - function _createExistingSentWork ($id) + function _createExistingSentWork($id) { $dropbox_cnf = getDropboxConf(); $id = intval($id); @@ -367,7 +375,8 @@ class Dropbox_SentWork extends Dropbox_Work 'name' => $user_info['complete_name'], 'user_id' => $dest_user_id, 'feedback_date' => $res['feedback_date'], - 'feedback' => $res['feedback']); + 'feedback' => $res['feedback'] + ); } } } @@ -392,7 +401,8 @@ class Dropbox_Person * @param bool $isCourseTutor * @return Dropbox_Person */ - function Dropbox_Person($userId, $isCourseAdmin, $isCourseTutor) { + function Dropbox_Person($userId, $isCourseAdmin, $isCourseTutor) + { $course_id = api_get_course_int_id(); // Fill in properties @@ -413,7 +423,8 @@ class Dropbox_Person // Find all entries where this person is the recipient $sql = "SELECT DISTINCT r.file_id, r.cat_id - FROM $post_tbl r INNER JOIN $person_tbl p + FROM $post_tbl r + INNER JOIN $person_tbl p ON (r.file_id = p.file_id AND r.c_id = $course_id AND p.c_id = $course_id ) WHERE p.user_id = ".intval($this->userId)." AND @@ -427,7 +438,8 @@ class Dropbox_Person } // Find all entries where this person is the sender/uploader $sql = "SELECT DISTINCT f.id - FROM $file_tbl f INNER JOIN $person_tbl p + FROM $file_tbl f + INNER JOIN $person_tbl p ON (f.id = p.file_id AND f.c_id = $course_id AND p.c_id = $course_id) WHERE f.uploader_id = ".intval($this->userId)." AND @@ -455,7 +467,9 @@ class Dropbox_Person $sort = $this->_orderBy; $aval = $a->$sort; $bval = $b->$sort; - if ($sort == 'recipients') { // The recipients property is an array so we do the comparison based on the first item of the recipients array + if ($sort == 'recipients') { + // The recipients property is an array so we do the comparison based + // on the first item of the recipients array $aval = $aval[0]['name']; $bval = $bval[0]['name']; } @@ -507,7 +521,8 @@ class Dropbox_Person * $sort can be lastDate, firstDate, title, size, ... * @param unknown_type $sort */ - function orderReceivedWork($sort) { + function orderReceivedWork($sort) + { switch($sort) { case 'lastDate': $this->_orderBy = 'last_upload_date'; @@ -537,14 +552,18 @@ class Dropbox_Person /** * Deletes all the received work of this person */ - function deleteAllReceivedWork () { + function deleteAllReceivedWork() + { $course_id = api_get_course_int_id(); $dropbox_cnf = getDropboxConf(); // Delete entries in person table concerning received works foreach ($this->receivedWork as $w) { - Database::query("DELETE FROM ".$dropbox_cnf['tbl_person']." WHERE c_id = $course_id AND user_id='".$this->userId."' AND file_id='".$w->id."'"); + $sql = "DELETE FROM ".$dropbox_cnf['tbl_person']." + WHERE c_id = $course_id AND user_id='".$this->userId."' AND file_id='".$w->id."'"; + Database::query($sql); } - removeUnusedFiles(); // Check for unused files + // Check for unused files + removeUnusedFiles(); } /** @@ -591,7 +610,8 @@ class Dropbox_Person } } // Delete entries in person table concerning received works - $sql = "DELETE FROM ".$dropbox_cnf['tbl_person']." WHERE c_id = $course_id AND user_id = '".$this->userId."' AND file_id ='".$id."'"; + $sql = "DELETE FROM ".$dropbox_cnf['tbl_person']." + WHERE c_id = $course_id AND user_id = '".$this->userId."' AND file_id ='".$id."'"; Database::query($sql); removeUnusedFiles(); // Check for unused files } @@ -605,7 +625,9 @@ class Dropbox_Person $dropbox_cnf = getDropboxConf(); //delete entries in person table concerning sent works foreach ($this->sentWork as $w) { - Database::query("DELETE FROM ".$dropbox_cnf['tbl_person']." WHERE c_id = $course_id AND user_id='".$this->userId."' AND file_id='".$w->id."'"); + $sql = "DELETE FROM ".$dropbox_cnf['tbl_person']." + WHERE c_id = $course_id AND user_id='".$this->userId."' AND file_id='".$w->id."'"; + Database::query($sql); removeMoreIfMailing($w->id); } removeUnusedFiles(); // Check for unused files @@ -638,7 +660,8 @@ class Dropbox_Person } //$file_id = $this->sentWork[$index]->id; // Delete entries in person table concerning sent works - Database::query("DELETE FROM ".$dropbox_cnf['tbl_person']." WHERE c_id = $course_id AND user_id='".$this->userId."' AND file_id='".$id."'"); + $sql = "DELETE FROM ".$dropbox_cnf['tbl_person']." WHERE c_id = $course_id AND user_id='".$this->userId."' AND file_id='".$id."'"; + Database::query($sql); removeMoreIfMailing($id); removeUnusedFiles(); // Check for unused files } @@ -684,7 +707,15 @@ class Dropbox_Person if (($ownerid = $this->receivedWork[$wi]->uploader_id) > $dropbox_cnf['mailingIdBase']) { $ownerid = getUserOwningThisMailing($ownerid); } - api_item_property_update($_course, TOOL_DROPBOX, $this->receivedWork[$wi]->id, 'DropboxFileUpdated', $this->userId, null, $ownerid) ; + api_item_property_update( + $_course, + TOOL_DROPBOX, + $this->receivedWork[$wi]->id, + 'DropboxFileUpdated', + $this->userId, + null, + $ownerid + ); } @@ -701,7 +732,9 @@ class Dropbox_Person switch ($type) { case 'uploader_id': if ($work->uploader_id == $value || - ($work->uploader_id > $dropbox_cnf['mailingIdBase'] && getUserOwningThisMailing($work->uploader_id) == $value)) { + ($work->uploader_id > $dropbox_cnf['mailingIdBase'] && + getUserOwningThisMailing($work->uploader_id) == $value) + ) { $new_received_work[] = $work; } break; diff --git a/main/inc/lib/attendance.lib.php b/main/inc/lib/attendance.lib.php index 9c2449f217..d1634c90cf 100755 --- a/main/inc/lib/attendance.lib.php +++ b/main/inc/lib/attendance.lib.php @@ -288,13 +288,13 @@ class Attendance */ public function attendance_add($link_to_gradebook = false) { - global $_course; + $_course = api_get_course_info(); $tbl_attendance = Database :: get_course_table(TABLE_ATTENDANCE); - $table_link = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_LINK); - $session_id = api_get_session_id(); - $user_id = api_get_user_id(); - $course_code = api_get_course_id(); - $course_id = api_get_course_int_id(); + $table_link = Database:: get_main_table(TABLE_MAIN_GRADEBOOK_LINK); + $session_id = api_get_session_id(); + $user_id = api_get_user_id(); + $course_code = api_get_course_id(); + $course_id = api_get_course_int_id(); $title_gradebook= Database::escape_string($this->attendance_qualify_title); $value_calification = 0; $weight_calification = floatval($this->attendance_weight); @@ -311,11 +311,19 @@ class Attendance if (!empty($affected_rows)) { // save inside item property table $last_id = Database::insert_id(); + if ($last_id) { - $sql = "UPDATE $tbl_attendance SET cat_id = $last_id WHERE iid = $last_id"; - Database::query($sql); + $sql = "UPDATE $tbl_attendance SET id = iid WHERE iid = $last_id"; + Database::query($sql); - api_item_property_update($_course, TOOL_ATTENDANCE, $last_id,"AttendanceAdded", $user_id); + api_item_property_update( + $_course, + TOOL_ATTENDANCE, + $last_id, + "AttendanceAdded", + $user_id + ); + } } // add link to gradebook if ($link_to_gradebook && !empty($this->category_id)) { diff --git a/main/wiki/wiki.inc.php b/main/wiki/wiki.inc.php index 9d7a79f925..6d802aa550 100755 --- a/main/wiki/wiki.inc.php +++ b/main/wiki/wiki.inc.php @@ -331,7 +331,7 @@ class Wiki $id = Database::insert_id(); if ($id > 0) { - $sql = "UPDATE $tbl_wiki SET id = iid WHERE iid = $insertId"; + $sql = "UPDATE $tbl_wiki SET id = iid WHERE iid = $id"; Database::query($sql); //insert into item_property @@ -346,7 +346,8 @@ class Wiki } if ($_clean['page_id'] == 0) { - $sql = 'UPDATE '.$tbl_wiki.' SET page_id="'.$id.'" WHERE c_id = '.$course_id.' AND id="'.$id.'"'; + $sql = 'UPDATE '.$tbl_wiki.' SET page_id="'.$id.'" + WHERE c_id = '.$course_id.' AND id="'.$id.'"'; Database::query($sql); } @@ -356,7 +357,9 @@ class Wiki VALUES ($course_id, '".$id."','".$_clean['task']."','".$_clean['feedback1']."','".$_clean['feedback2']."','".$_clean['feedback3']."','".$_clean['fprogress1']."','".$_clean['fprogress2']."','".$_clean['fprogress3']."','".$_clean['max_text']."','".$_clean['max_version']."','".$_clean['startdate_assig']."','".$_clean['enddate_assig']."','".$_clean['delayedsubmit']."')"; Database::query($sql); - $sql = "UPDATE $tbl_wiki_conf SET page_id = $survey_id WHERE iid = $survey_id"; + $confId = Database::insert_id(); + + $sql = "UPDATE $tbl_wiki_conf SET page_id = $confId WHERE iid = $confId"; Database::query($sql); } else { $sql = 'UPDATE '.$tbl_wiki_conf.' SET diff --git a/main/work/work.lib.php b/main/work/work.lib.php index ce1ee7e481..de41f6d787 100755 --- a/main/work/work.lib.php +++ b/main/work/work.lib.php @@ -4034,10 +4034,11 @@ function addDir($params, $user_id, $courseInfo, $group_id, $session_id) // Add the directory $id = Database::insert_id(); - $sql = "UPDATE $work_table SET id = iid WHERE iid = $id"; - Database::query($sql); - if ($id) { + + $sql = "UPDATE $work_table SET id = iid WHERE iid = $id"; + Database::query($sql); + // Folder created api_item_property_update( $courseInfo, @@ -4203,13 +4204,14 @@ function updatePublicationAssignment($workId, $params, $courseInfo, $groupId) Database::query($sql); $my_last_id = Database::insert_id(); + if ($my_last_id) { - $sql = "UPDATE $workTable SET - has_properties = $my_last_id , - view_properties = 1 - WHERE c_id = $course_id AND id = $workId"; - Database::query($sql); - exit; + $sql = "UPDATE $workTable SET + has_properties = $my_last_id, + view_properties = 1 + WHERE c_id = $course_id AND id = $workId"; + Database::query($sql); + } } else { $sql = "UPDATE $table SET expires_on = '".$expiryDate."',