diff --git a/main/dropbox/dropbox_class.inc.php b/main/dropbox/dropbox_class.inc.php index fdf998b495..b3f7657914 100755 --- a/main/dropbox/dropbox_class.inc.php +++ b/main/dropbox/dropbox_class.inc.php @@ -75,20 +75,20 @@ class Dropbox_Work } } - /** - * private function creating a new work object - * - * @param int $uploader_id - * @param string $title - * @param string $description - * @param string $author - * @param string $filename - * @param int $filesize - * - * @todo $author was originally a field but this has now been replaced by the first and lastname of the uploader (to prevent anonymous uploads) - * As a consequence this parameter can be removed - */ - public function _createNewWork($uploader_id, $title, $description, $author, $filename, $filesize) + /** + * private function creating a new work object + * + * @param int $uploader_id + * @param string $title + * @param string $description + * @param string $author + * @param string $filename + * @param int $filesize + * + * @todo $author was originally a field but this has now been replaced by the first and lastname of the uploader (to prevent anonymous uploads) + * As a consequence this parameter can be removed + */ + public function _createNewWork($uploader_id, $title, $description, $author, $filename, $filesize) { // Fill in the properties $this->uploader_id = intval($uploader_id); @@ -103,17 +103,20 @@ class Dropbox_Work // Check if object exists already. If it does, the old object is used // with updated information (authors, description, upload_date) $this->isOldWork = false; - $sql = "SELECT id, upload_date FROM ".Database::get_course_table(TABLE_DROPBOX_FILE)." - WHERE c_id = $course_id AND filename = '".Database::escape_string($this->filename)."'"; + $sql = "SELECT id, upload_date + FROM ".Database::get_course_table(TABLE_DROPBOX_FILE)." + WHERE + c_id = $course_id AND + filename = '".Database::escape_string($this->filename)."'"; $result = Database::query($sql); - $res = Database::fetch_array($result); - if ($res) { - $this->isOldWork = true; - } - // Insert or update the dropbox_file table and set the id property - if ($this->isOldWork) { - $this->id = $res['id']; - $this->upload_date = $res['upload_date']; + $res = Database::fetch_array($result); + if ($res) { + $this->isOldWork = true; + } + // Insert or update the dropbox_file table and set the id property + if ($this->isOldWork) { + $this->id = $res['id']; + $this->upload_date = $res['upload_date']; $params = [ 'filesize' => $this->filesize, @@ -129,9 +132,9 @@ class Dropbox_Work $params, ['c_id = ? AND id = ?' => [$course_id, $this->id]] ); - } else { - $this->upload_date = $this->last_upload_date; - $params = [ + } else { + $this->upload_date = $this->last_upload_date; + $params = [ 'c_id' => $course_id, 'uploader_id' => $this->uploader_id, 'filename' => $this->filename, @@ -143,38 +146,36 @@ class Dropbox_Work 'last_upload_date' => $this->last_upload_date, 'session_id' => api_get_session_id(), 'cat_id' => 0 - ]; + ]; - $this->id = Database::insert(Database::get_course_table(TABLE_DROPBOX_FILE), $params); - if ($this->id) { - $sql = "UPDATE ".Database::get_course_table(TABLE_DROPBOX_FILE)." SET id = iid WHERE iid = {$this->id}"; - Database::query($sql); - } - } + $this->id = Database::insert(Database::get_course_table(TABLE_DROPBOX_FILE), $params); + if ($this->id) { + $sql = "UPDATE ".Database::get_course_table(TABLE_DROPBOX_FILE)." SET id = iid WHERE iid = {$this->id}"; + Database::query($sql); + } + } $sql = "SELECT count(file_id) as count - FROM ". Database::get_course_table(TABLE_DROPBOX_PERSON)." - WHERE c_id = $course_id AND file_id = ".intval($this->id)." AND user_id = ".$this->uploader_id; + FROM ". Database::get_course_table(TABLE_DROPBOX_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); if ($row['count'] == 0) { - // Insert entries into person table $sql = "INSERT INTO ".Database::get_course_table(TABLE_DROPBOX_PERSON)." (c_id, file_id, user_id) VALUES ($course_id, ".intval($this->id)." , ".intval($this->uploader_id).")"; Database::query($sql); } - } - - /** - * private function creating existing object by retreiving info from db - * - * @param int $id - */ - public function _createExistingWork($id) - { - $course_id = api_get_course_int_id(); + } + /** + * private function creating existing object by retreiving info from db + * + * @param int $id + */ + public function _createExistingWork($id) + { + $course_id = api_get_course_int_id(); $action = isset($_GET['action']) ? $_GET['action'] : null; // Do some sanity checks @@ -209,7 +210,7 @@ class Dropbox_Work $this->category = $res['cat_id']; // Getting the feedback on the work. - if ($action == 'viewfeedback' AND $this->id == $_GET['id']) { + if ($action == 'viewfeedback' && $this->id == $_GET['id']) { $feedback2 = array(); $sql = "SELECT * FROM ".Database::get_course_table(TABLE_DROPBOX_FEEDBACK)." WHERE c_id = $course_id AND file_id='".$id."' @@ -221,12 +222,12 @@ class Dropbox_Work } $this->feedback2 = $feedback2; } - } + } /** * @return bool */ - public function updateFile() + public function updateFile() { $course_id = api_get_course_int_id(); if (empty($this->id) || empty($course_id)) { @@ -256,45 +257,45 @@ class Dropbox_Work class Dropbox_SentWork extends Dropbox_Work { - public $recipients; //array of ['id']['name'] arrays - - /** - * Constructor calls private functions to create a new work or retreive an existing work from DB - * depending on the number of parameters - * - * @param int $arg1 - * @param string $arg2 - * @param string $arg3 - * @param string $arg4 - * @param string $arg5 - * @param int $arg6 - * @param array $arg7 - */ - public function __construct($arg1, $arg2 = null, $arg3 = null, $arg4 = null, $arg5 = null, $arg6 = null, $arg7 = null) + public $recipients; //array of ['id']['name'] arrays + + /** + * Constructor calls private functions to create a new work or retreive an existing work from DB + * depending on the number of parameters + * + * @param int $arg1 + * @param string $arg2 + * @param string $arg3 + * @param string $arg4 + * @param string $arg5 + * @param int $arg6 + * @param array $arg7 + */ + public function __construct($arg1, $arg2 = null, $arg3 = null, $arg4 = null, $arg5 = null, $arg6 = null, $arg7 = null) { - if (func_num_args() > 1) { - $this->_createNewSentWork($arg1, $arg2, $arg3, $arg4, $arg5, $arg6, $arg7); - } else { - $this->_createExistingSentWork($arg1); - } - } - - /** - * private function creating a new SentWork object - * - * @param int $uploader_id - * @param string $title - * @param string $description - * @param string $author - * @param string $filename - * @param int $filesize - * @param array $recipient_ids - */ - public function _createNewSentWork($uploader_id, $title, $description, $author, $filename, $filesize, $recipient_ids) + if (func_num_args() > 1) { + $this->_createNewSentWork($arg1, $arg2, $arg3, $arg4, $arg5, $arg6, $arg7); + } else { + $this->_createExistingSentWork($arg1); + } + } + + /** + * private function creating a new SentWork object + * + * @param int $uploader_id + * @param string $title + * @param string $description + * @param string $author + * @param string $filename + * @param int $filesize + * @param array $recipient_ids + */ + public function _createNewSentWork($uploader_id, $title, $description, $author, $filename, $filesize, $recipient_ids) { $_course = api_get_course_info(); - // Call constructor of Dropbox_Work object + // Call constructor of Dropbox_Work object parent::__construct( $uploader_id, $title, @@ -304,33 +305,33 @@ class Dropbox_SentWork extends Dropbox_Work $filesize ); - $course_id = api_get_course_int_id(); - - // Do sanity checks on recipient_ids array & property fillin - // The sanity check for ex-coursemembers is already done in base constructor - $uploader_id = (int) $uploader_id; + $course_id = api_get_course_int_id(); - $justSubmit = false; - if (is_int($recipient_ids)) { - $justSubmit = true; - $recipient_ids = array($recipient_ids + $this->id); - } elseif (count($recipient_ids) == 0) { - $justSubmit = true; - $recipient_ids = array($uploader_id); - } + // Do sanity checks on recipient_ids array & property fillin + // The sanity check for ex-coursemembers is already done in base constructor + $uploader_id = (int) $uploader_id; + + $justSubmit = false; + if (is_int($recipient_ids)) { + $justSubmit = true; + $recipient_ids = array($recipient_ids + $this->id); + } elseif (count($recipient_ids) == 0) { + $justSubmit = true; + $recipient_ids = array($uploader_id); + } - if (!is_array($recipient_ids) || count($recipient_ids) == 0) { - die(get_lang('GeneralError').' (code 209)'); - } + if (!is_array($recipient_ids) || count($recipient_ids) == 0) { + die(get_lang('GeneralError').' (code 209)'); + } - foreach ($recipient_ids as $rec) { - if (empty($rec)) { - continue; + foreach ($recipient_ids as $rec) { + if (empty($rec)) { + continue; } //this check is done when validating submitted data - $this->recipients[] = array('id' => $rec); - } + $this->recipients[] = array('id' => $rec); + } $table_post = Database::get_course_table(TABLE_DROPBOX_POST); $table_person = Database::get_course_table(TABLE_DROPBOX_PERSON); @@ -340,12 +341,12 @@ class Dropbox_SentWork extends Dropbox_Work $mailId = get_mail_id_base(); // Insert data in dropbox_post and dropbox_person table for each recipient - foreach ($this->recipients as $rec) { + foreach ($this->recipients as $rec) { $file_id = (int) $this->id; $user_id = (int) $rec['id']; - $sql = "INSERT INTO $table_post (c_id, file_id, dest_user_id, session_id, feedback_date, cat_id) + $sql = "INSERT INTO $table_post (c_id, file_id, dest_user_id, session_id, feedback_date, cat_id) VALUES ($course_id, $file_id, $user_id, $session_id, '$now', 0)"; - Database::query($sql); + Database::query($sql); // If work already exists no error is generated /** @@ -362,13 +363,13 @@ class Dropbox_SentWork extends Dropbox_Work } } - // Update item_property table for each recipient - if (($ownerid = $this->uploader_id) > $mailId) { - $ownerid = getUserOwningThisMailing($ownerid); - } - if (($recipid = $rec["id"]) > $mailId) { - $recipid = $ownerid; // mailing file recipient = mailing id, not a person - } + // Update item_property table for each recipient + if (($ownerid = $this->uploader_id) > $mailId) { + $ownerid = getUserOwningThisMailing($ownerid); + } + if (($recipid = $rec["id"]) > $mailId) { + $recipid = $ownerid; // mailing file recipient = mailing id, not a person + } api_item_property_update( $_course, TOOL_DROPBOX, @@ -378,87 +379,87 @@ class Dropbox_SentWork extends Dropbox_Work null, $recipid ); - } - } - - /** - * private function creating existing object by retreiving info from db - * - * @param int $id - */ - public function _createExistingSentWork($id) + } + } + + /** + * private function creating existing object by retreiving info from db + * + * @param int $id + */ + public function _createExistingSentWork($id) { $id = intval($id); - $course_id = api_get_course_int_id(); + $course_id = api_get_course_int_id(); - // Call constructor of Dropbox_Work object - parent::__construct($id); + // Call constructor of Dropbox_Work object + parent::__construct($id); - // Fill in recipients array - $this->recipients = array(); - $sql = "SELECT dest_user_id, feedback_date, feedback - FROM ".Database::get_course_table(TABLE_DROPBOX_POST)." - WHERE c_id = $course_id AND file_id = ".intval($id).""; + // Fill in recipients array + $this->recipients = array(); + $sql = "SELECT dest_user_id, feedback_date, feedback + FROM ".Database::get_course_table(TABLE_DROPBOX_POST)." + WHERE c_id = $course_id AND file_id = ".intval($id).""; $result = Database::query($sql); - while ($res = Database::fetch_array($result, 'ASSOC')) { - // Check for deleted users - $dest_user_id = $res['dest_user_id']; - $user_info = api_get_user_info($dest_user_id); - if (!$user_info) { - $this->recipients[] = array('id' => -1, 'name' => get_lang('Unknown', '')); - } else { - $this->recipients[] = array( + while ($res = Database::fetch_array($result, 'ASSOC')) { + // Check for deleted users + $dest_user_id = $res['dest_user_id']; + $user_info = api_get_user_info($dest_user_id); + if (!$user_info) { + $this->recipients[] = array('id' => -1, 'name' => get_lang('Unknown', '')); + } else { + $this->recipients[] = array( 'id' => $dest_user_id, 'name' => $user_info['complete_name'], 'user_id' => $dest_user_id, - 'feedback_date' => $res['feedback_date'], + 'feedback_date' => $res['feedback_date'], 'feedback' => $res['feedback'] ); - } - } - } + } + } + } } class Dropbox_Person { - // The receivedWork and the sentWork arrays are sorted. - public $receivedWork; // an array of Dropbox_Work objects - public $sentWork; // an array of Dropbox_SentWork objects - - public $userId = 0; - public $isCourseAdmin = false; - public $isCourseTutor = false; - public $_orderBy = ''; // private property that determines by which field - - /** - * Constructor for recreating the Dropbox_Person object - * - * @param int $userId - * @param bool $isCourseAdmin - * @param bool $isCourseTutor - */ - public function __construct($userId, $isCourseAdmin, $isCourseTutor) + // The receivedWork and the sentWork arrays are sorted. + public $receivedWork; // an array of Dropbox_Work objects + public $sentWork; // an array of Dropbox_SentWork objects + + public $userId = 0; + public $isCourseAdmin = false; + public $isCourseTutor = false; + public $_orderBy = ''; // private property that determines by which field + + /** + * Constructor for recreating the Dropbox_Person object + * + * @param int $userId + * @param bool $isCourseAdmin + * @param bool $isCourseTutor + */ + public function __construct($userId, $isCourseAdmin, $isCourseTutor) { - $course_id = api_get_course_int_id(); + $course_id = api_get_course_int_id(); - // Fill in properties + // Fill in properties $this->userId = $userId; $this->isCourseAdmin = $isCourseAdmin; $this->isCourseTutor = $isCourseTutor; $this->receivedWork = array(); $this->sentWork = array(); - // Note: perhaps include an ex coursemember check to delete old files + // Note: perhaps include an ex coursemember check to delete old files - $session_id = api_get_session_id(); - $condition_session = api_get_session_condition($session_id); + $session_id = api_get_session_id(); + $condition_session = api_get_session_condition($session_id); - $post_tbl = Database::get_course_table(TABLE_DROPBOX_POST); - $person_tbl = Database::get_course_table(TABLE_DROPBOX_PERSON); - $file_tbl = Database::get_course_table(TABLE_DROPBOX_FILE); + $post_tbl = Database::get_course_table(TABLE_DROPBOX_POST); + $person_tbl = Database::get_course_table(TABLE_DROPBOX_PERSON); + $file_tbl = Database::get_course_table(TABLE_DROPBOX_FILE); // Find all entries where this person is the recipient - $sql = "SELECT DISTINCT r.file_id, r.cat_id + $sql = "SELECT DISTINCT r.file_id, r.cat_id 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 ) @@ -467,176 +468,181 @@ class Dropbox_Person r.dest_user_id = ".intval($this->userId)." $condition_session "; $result = Database::query($sql); - while ($res = Database::fetch_array($result)) { - $temp = new Dropbox_Work($res['file_id']); - $temp->category = $res['cat_id']; - $this->receivedWork[] = $temp; - } - // Find all entries where this person is the sender/uploader + while ($res = Database::fetch_array($result)) { + $temp = new Dropbox_Work($res['file_id']); + $temp->category = $res['cat_id']; + $this->receivedWork[] = $temp; + } + // Find all entries where this person is the sender/uploader $sql = "SELECT DISTINCT f.id - 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) + 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 p.user_id = ".intval($this->userId)." $condition_session "; $result = Database::query($sql); - while ($res = Database::fetch_array($result)) { - $this->sentWork[] = new Dropbox_SentWork($res['id']); - } - } - - /** - * Deletes all the received work of this person - */ - public function deleteAllReceivedWork() + while ($res = Database::fetch_array($result)) { + $this->sentWork[] = new Dropbox_SentWork($res['id']); + } + } + + /** + * Deletes all the received work of this person + */ + public function deleteAllReceivedWork() { - $course_id = api_get_course_int_id(); - // Delete entries in person table concerning received works - foreach ($this->receivedWork as $w) { + $course_id = api_get_course_int_id(); + // Delete entries in person table concerning received works + foreach ($this->receivedWork as $w) { $sql = "DELETE FROM ".Database::get_course_table(TABLE_DROPBOX_PERSON)." - WHERE c_id = $course_id AND user_id='".$this->userId."' AND file_id='".$w->id."'"; - Database::query($sql); - } + WHERE c_id = $course_id AND user_id='".$this->userId."' AND file_id='".$w->id."'"; + Database::query($sql); + } // Check for unused files - removeUnusedFiles(); - } - - /** - * Deletes all the received categories and work of this person - * @param integer $id - */ - public function deleteReceivedWorkFolder($id) + removeUnusedFiles(); + } + + /** + * Deletes all the received categories and work of this person + * @param integer $id + * @return bool + */ + public function deleteReceivedWorkFolder($id) { $course_id = api_get_course_int_id(); - $id = intval($id); - $sql = "DELETE FROM ".Database::get_course_table(TABLE_DROPBOX_FILE)." - WHERE c_id = $course_id AND cat_id = '".$id."' "; - if (!Database::query($sql)) return false; - $sql = "DELETE FROM ".Database::get_course_table(TABLE_DROPBOX_CATEGORY)." - WHERE c_id = $course_id AND cat_id = '".$id."' "; - if (!Database::query($sql)) return false; - $sql = "DELETE FROM ".Database::get_course_table(TABLE_DROPBOX_POST)." - WHERE c_id = $course_id AND cat_id = '".$id."' "; - if (!Database::query($sql)) return false; - return true; - } - - /** - * Deletes a received dropbox file of this person with id=$id - * - * @param integer $id - */ - public function deleteReceivedWork($id) + $id = intval($id); + $sql = "DELETE FROM ".Database::get_course_table(TABLE_DROPBOX_FILE)." + WHERE c_id = $course_id AND cat_id = '".$id."' "; + if (!Database::query($sql)) return false; + $sql = "DELETE FROM ".Database::get_course_table(TABLE_DROPBOX_CATEGORY)." + WHERE c_id = $course_id AND cat_id = '".$id."' "; + if (!Database::query($sql)) return false; + $sql = "DELETE FROM ".Database::get_course_table(TABLE_DROPBOX_POST)." + WHERE c_id = $course_id AND cat_id = '".$id."' "; + if (!Database::query($sql)) return false; + return true; + } + + /** + * Deletes a received dropbox file of this person with id=$id + * + * @param integer $id + */ + public function deleteReceivedWork($id) { - $course_id = api_get_course_int_id(); - $id = intval($id); - - // index check - $found = false; - foreach ($this->receivedWork as $w) { - if ($w->id == $id) { - $found = true; - break; - } - } - - if (!$found) { - if (!$this->deleteReceivedWorkFolder($id)) { - die(get_lang('GeneralError').' (code 216)'); - } - } - // Delete entries in person table concerning received works + $course_id = api_get_course_int_id(); + $id = intval($id); + + // index check + $found = false; + foreach ($this->receivedWork as $w) { + if ($w->id == $id) { + $found = true; + break; + } + } + + if (!$found) { + if (!$this->deleteReceivedWorkFolder($id)) { + die(get_lang('GeneralError').' (code 216)'); + } + } + // Delete entries in person table concerning received works $sql = "DELETE FROM ".Database::get_course_table(TABLE_DROPBOX_PERSON)." WHERE c_id = $course_id AND user_id = '".$this->userId."' AND file_id ='".$id."'"; - Database::query($sql); - removeUnusedFiles(); // Check for unused files - } - - /** - * Deletes all the sent dropbox files of this person - */ - public function deleteAllSentWork() + Database::query($sql); + removeUnusedFiles(); // Check for unused files + } + + /** + * Deletes all the sent dropbox files of this person + */ + public function deleteAllSentWork() { - $course_id = api_get_course_int_id(); - //delete entries in person table concerning sent works - foreach ($this->sentWork as $w) { + $course_id = api_get_course_int_id(); + //delete entries in person table concerning sent works + foreach ($this->sentWork as $w) { $sql = "DELETE FROM ".Database::get_course_table(TABLE_DROPBOX_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 - } - - /** - * Deletes a sent dropbox file of this person with id=$id - * - * @param int $id - */ - public function deleteSentWork($id) + 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 + } + + /** + * Deletes a sent dropbox file of this person with id=$id + * + * @param int $id + */ + public function deleteSentWork($id) { - $course_id = api_get_course_int_id(); - - $id = intval($id); - - // index check - $found = false; - foreach ($this->sentWork as $w) { - if ($w->id == $id) { - $found = true; - break; - } - } - if (!$found) { - if (!$this->deleteReceivedWorkFolder($id)) { - die(get_lang('GeneralError').' (code 219)'); - } - } - //$file_id = $this->sentWork[$index]->id; - // Delete entries in person table concerning sent works + $course_id = api_get_course_int_id(); + + $id = intval($id); + + // index check + $found = false; + foreach ($this->sentWork as $w) { + if ($w->id == $id) { + $found = true; + break; + } + } + if (!$found) { + if (!$this->deleteReceivedWorkFolder($id)) { + die(get_lang('GeneralError').' (code 219)'); + } + } + //$file_id = $this->sentWork[$index]->id; + // Delete entries in person table concerning sent works $sql = "DELETE FROM ".Database::get_course_table(TABLE_DROPBOX_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 - } - - /** - * Updates feedback for received work of this person with id=$id - * - * @param string $id - * @param string $text - */ - public function updateFeedback($id, $text) + Database::query($sql); + removeMoreIfMailing($id); + removeUnusedFiles(); // Check for unused files + } + + /** + * Updates feedback for received work of this person with id=$id + * + * @param string $id + * @param string $text + * @return bool + */ + public function updateFeedback($id, $text) { - $course_id = api_get_course_int_id(); + $course_id = api_get_course_int_id(); $_course = api_get_course_info(); $dropbox_cnf = getDropboxConf(); - $id = intval($id); + $id = intval($id); - // index check - $found = false; - $wi = -1; - foreach ($this->receivedWork as $w) { - $wi++; - if ($w->id == $id) { - $found = true; - break; - } // foreach (... as $wi -> $w) gives error 221! (no idea why...) - } + // index check + $found = false; + $wi = -1; + foreach ($this->receivedWork as $w) { + $wi++; + if ($w->id == $id) { + $found = true; + break; + } // foreach (... as $wi -> $w) gives error 221! (no idea why...) + } - if (!$found) { - return false; - } + if (!$found) { + return false; + } - $feedback_date = api_get_utc_datetime(); - $this->receivedWork[$wi]->feedback_date = $feedback_date; - $this->receivedWork[$wi]->feedback = $text; + $feedback_date = api_get_utc_datetime(); + $this->receivedWork[$wi]->feedback_date = $feedback_date; + $this->receivedWork[$wi]->feedback = $text; $params = [ 'feedback_date' => $feedback_date, @@ -654,11 +660,11 @@ class Dropbox_Person ] ); - // Update item_property table + // Update item_property table $mailId = get_mail_id_base(); - if (($ownerid = $this->receivedWork[$wi]->uploader_id) > $mailId) { - $ownerid = getUserOwningThisMailing($ownerid); - } + if (($ownerid = $this->receivedWork[$wi]->uploader_id) > $mailId) { + $ownerid = getUserOwningThisMailing($ownerid); + } api_item_property_update( $_course, @@ -669,34 +675,33 @@ class Dropbox_Person null, $ownerid ); + } - } - - /** - * Filter the received work - * @param string $type - * @param string $value - */ - public function filter_received_work($type, $value) + /** + * Filter the received work + * @param string $type + * @param string $value + */ + public function filter_received_work($type, $value) { $dropbox_cnf = getDropboxConf(); - $new_received_work = array(); + $new_received_work = array(); $mailId = get_mail_id_base(); foreach ($this->receivedWork as $work) { - switch ($type) { - case 'uploader_id': - if ($work->uploader_id == $value || - ($work->uploader_id > $mailId && + switch ($type) { + case 'uploader_id': + if ($work->uploader_id == $value || + ($work->uploader_id > $mailId && getUserOwningThisMailing($work->uploader_id) == $value) ) { - $new_received_work[] = $work; - } - break; - default: - $new_received_work[] = $work; + $new_received_work[] = $work; + } break; - } - } - $this->receivedWork = $new_received_work; - } + default: + $new_received_work[] = $work; + break; + } + } + $this->receivedWork = $new_received_work; + } } diff --git a/main/survey/surveyUtil.class.php b/main/survey/surveyUtil.class.php index 10d3895bc9..2db9b5959f 100755 --- a/main/survey/surveyUtil.class.php +++ b/main/survey/surveyUtil.class.php @@ -1,5 +1,6 @@ , Ghent University @@ -187,7 +188,13 @@ class SurveyUtil if ($error) { $tool_name = get_lang('Reporting'); - Display::addFlash(Display::return_message(get_lang('Error').': '.$error, 'error', false)); + Display::addFlash( + Display::return_message( + get_lang('Error').': '.$error, + 'error', + false + ) + ); Display::display_header($tool_name); Display::display_footer(); exit; @@ -663,7 +670,6 @@ class SurveyUtil } if (isset($_GET['viewoption'])) { echo '
'; - echo '

'.get_lang('PeopleWhoAnswered').': '.strip_tags($options[Security::remove_XSS($_GET['viewoption'])]['option_text']).'

'; if (is_numeric($_GET['value'])) { @@ -792,7 +798,7 @@ class SurveyUtil /** * This functions displays the complete reporting - * @return string HTML code + * @return string HTML code * @todo open questions are not in the complete report yet. * @author Patrick Cool , Ghent University * @version February 2007 @@ -2861,7 +2867,7 @@ class SurveyUtil $last_version_surveys = $survey_tree->surveylist; $list = array(); foreach ($last_version_surveys as & $survey) { - $list[]=$survey['id']; + $list[] = $survey['id']; } if (count($list) > 0) { $list_condition = " AND survey.survey_id IN (".implode(',',$list).") "; @@ -2879,7 +2885,6 @@ class SurveyUtil $table_survey = Database::get_course_table(TABLE_SURVEY); $table_survey_question = Database::get_course_table(TABLE_SURVEY_QUESTION); $table_user = Database::get_main_table(TABLE_MAIN_USER); - $course_id = api_get_course_int_id(); $sql = "SELECT @@ -3333,7 +3338,7 @@ class SurveyUtil { $tableSurveyAnswer = Database::get_course_table(TABLE_SURVEY_ANSWER); $courseId = api_get_course_int_id(); - $surveyId = (int)$surveyId; + $surveyId = (int) $surveyId; if (empty($courseId) || empty($surveyId)) { return false;