chamilo / chamilo-lms

main/dropbox/dropbox_class.inc.php

Doc Comments +1 added lines, -1 removed lines

@@ -267,7 +267,7 @@
 	 * @param string $author
 	 * @param string $filename
 	 * @param int $filesize
-	 * @param array $recipient_ids
+	 * @param unknown_type|null $recipient_ids
 	 */
 	public function _createNewSentWork($uploader_id, $title, $description, $author, $filename, $filesize, $recipient_ids)
     {

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -210,7 +210,7 @@
         $this->category = $res['cat_id'];
 
         // Getting the feedback on the work.
-        if ($action == 'viewfeedback' AND $this->id == $_GET['id']) {
+        if ($action == 'viewfeedback' and $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."' 

Indentation +324 added lines, -324 removed lines

@@ -76,20 +76,20 @@ 
         }
     }
 
-	/**
-	 * 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);
@@ -104,17 +104,17 @@ 
         // 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)."
+        $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,
@@ -130,9 +130,9 @@ 
                 $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,
@@ -144,14 +144,14 @@ 
                 '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)."
@@ -165,16 +165,16 @@ 
                     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)
+    }
+
+    /**
+     * private function creating existing object by retreiving info from db
+     *
+     * @param int $id
+     */
+    public function _createExistingWork($id)
     {
-	    $course_id = api_get_course_int_id();
+        $course_id = api_get_course_int_id();
 
         $action = isset($_GET['action']) ? $_GET['action'] : null;
 
@@ -222,12 +222,12 @@ 
             }
             $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)) {
@@ -257,46 +257,46 @@ 
 
 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 unknown_type $arg1
-	 * @param unknown_type $arg2
-	 * @param unknown_type $arg3
-	 * @param unknown_type $arg4
-	 * @param unknown_type $arg5
-	 * @param unknown_type $arg6
-	 * @param unknown_type $arg7
-	 * @return Dropbox_SentWork
-	 */
-	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 unknown_type $arg1
+     * @param unknown_type $arg2
+     * @param unknown_type $arg3
+     * @param unknown_type $arg4
+     * @param unknown_type $arg5
+     * @param unknown_type $arg6
+     * @param unknown_type $arg7
+     * @return Dropbox_SentWork
+     */
+    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,
@@ -306,33 +306,33 @@ 
             $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);
@@ -342,12 +342,12 @@ 
         $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
 
             /**
@@ -364,13 +364,13 @@ 
                 }
             }
 
-			// 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,
@@ -380,88 +380,88 @@ 
                 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
+        // 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
-	 * @return Dropbox_Person
-	 */
-	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
+     * @return Dropbox_Person
+     */
+    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 )
@@ -470,12 +470,12 @@ 
                      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
@@ -486,160 +486,160 @@ 
                     $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);
-		}
+            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
+     */
+    public function deleteReceivedWorkFolder($id)
     {
         $course_id = api_get_course_int_id();
 
-		$id = intval($id);
-		$sql = "DELETE FROM ".Database::get_course_table(TABLE_DROPBOX_FILE)."
+        $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)."
+        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)."
+        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)
+        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)
+            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
+     */
+    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,
@@ -657,11 +657,11 @@ 
             ]
         );
 
-		// 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,
@@ -673,33 +673,33 @@ 
             $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;
+    }
 }

Braces +23 added lines, -17 removed lines

@@ -90,7 +90,7 @@ 
 	 * 			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);
         $this->filename = $filename;
@@ -173,7 +173,7 @@ 
 	 * @param int $id
 	 */
 	public function _createExistingWork($id)
-    {
+	{
 	    $course_id = api_get_course_int_id();
 
         $action = isset($_GET['action']) ? $_GET['action'] : null;
@@ -228,7 +228,7 @@ 
      * @return bool
      */
 	public function updateFile()
-    {
+	{
         $course_id = api_get_course_int_id();
         if (empty($this->id) || empty($course_id)) {
             return false;
@@ -273,7 +273,7 @@ 
 	 * @return Dropbox_SentWork
 	 */
 	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 {
@@ -293,7 +293,7 @@ 
 	 * @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
@@ -389,7 +389,7 @@ 
 	 * @param int $id
 	 */
 	public function _createExistingSentWork($id)
-    {
+	{
         $id = intval($id);
 		$course_id = api_get_course_int_id();
 
@@ -441,7 +441,7 @@ 
 	 * @return Dropbox_Person
 	 */
 	public function __construct($userId, $isCourseAdmin, $isCourseTutor)
-    {
+	{
 	    $course_id = api_get_course_int_id();
 
 		// Fill in properties
@@ -495,7 +495,7 @@ 
 	 * 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) {
@@ -512,19 +512,25 @@ 
 	 * @param integer $id
 	 */
 	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;
+		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;
+		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;
+		if (!Database::query($sql)) {
+		    return false;
+		}
 		return true;
 	}
 
@@ -534,7 +540,7 @@ 
 	 * @param integer $id
 	 */
 	public function deleteReceivedWork($id)
-    {
+	{
 	    $course_id = api_get_course_int_id();
 		$id = intval($id);
 
@@ -563,7 +569,7 @@ 
 	 * 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) {
@@ -581,7 +587,7 @@ 
 	 * @param int $id
 	 */
 	public function deleteSentWork($id)
-    {
+	{
 	    $course_id = api_get_course_int_id();
 
 		$id = intval($id);
@@ -615,7 +621,7 @@ 
 	 * @param string $text
 	 */
 	public function updateFeedback($id, $text)
-    {
+	{
 	    $course_id = api_get_course_int_id();
         $_course = api_get_course_info();
         $dropbox_cnf = getDropboxConf();
@@ -681,7 +687,7 @@ 
 	 * @param string $value
 	 */
 	public function filter_received_work($type, $value)
-    {
+	{
         $dropbox_cnf = getDropboxConf();
     	$new_received_work = array();
         $mailId = get_mail_id_base();

main/admin/course_user_import.php

Doc Comments +3 added lines, -1 removed lines

@@ -9,6 +9,7 @@ 
 
 /**
  * Validates the imported data.
+ * @param Ddeboer\DataImport\Reader\CsvReader $users_courses
  */
 function validate_data($users_courses)
 {
@@ -65,6 +66,7 @@ 
 
 /**
  * Saves imported data.
+ * @param Ddeboer\DataImport\Reader\CsvReader $users_courses
  */
 function save_data($users_courses)
 {
@@ -133,7 +135,7 @@ 
 /**
  * Reads CSV-file.
  * @param string $file Path to the CSV-file
- * @return array All course-information read from the file
+ * @return Ddeboer\DataImport\Reader\CsvReader All course-information read from the file
  */
 function parse_csv_data($file)
 {

main/admin/course_user_import_by_email.php

Doc Comments +3 added lines, -1 removed lines

@@ -8,6 +8,7 @@ 
  */
 /**
  * Validates the imported data.
+ * @param Ddeboer\DataImport\Reader\CsvReader $users_courses
  */
 function validate_data($users_courses)
 {
@@ -66,6 +67,7 @@ 
 
 /**
  * Saves imported data.
+ * @param Ddeboer\DataImport\Reader\CsvReader $users_courses
  */
 function save_data($users_courses)
 {
@@ -134,7 +136,7 @@ 
 /**
  * Reads CSV-file.
  * @param string $file Path to the CSV-file
- * @return array All course-information read from the file
+ * @return Ddeboer\DataImport\Reader\CsvReader All course-information read from the file
  */
 function parse_csv_data($file)
 {

main/admin/skills_import.php

Doc Comments +3 added lines, -2 removed lines

@@ -12,7 +12,7 @@ 
 
 /**
  * Validate the imported data.
- * @param $skills
+ * @param Ddeboer\DataImport\Reader\CsvReader $skills
  * @return array
  */
 function validate_data($skills)
@@ -50,6 +50,7 @@ 
 /**
  * Save the imported data
  * @param   array   List of users
+ * @param Ddeboer\DataImport\Reader\CsvReader $skills
  * @return  void
  * @uses global variable $inserted_in_course,
  * which returns the list of courses the user was inserted in
@@ -77,7 +78,7 @@ 
 /**
  * Read the CSV-file
  * @param string $file Path to the CSV-file
- * @return array All userinformation read from the file
+ * @return Ddeboer\DataImport\Reader\CsvReader All userinformation read from the file
  */
 function parse_csv_data($file)
 {

Indentation +12 added lines, -12 removed lines

@@ -70,7 +70,7 @@ 
             $oskill = new Skill();
             $skill_id = $oskill->add($skill);
             $parents[$saved_id] = $skill_id;
-		}
+        }
     }
 }
 
@@ -81,12 +81,12 @@ 
  */
 function parse_csv_data($file)
 {
-	$skills = Import :: csvToArray($file);
-	foreach ($skills as $index => $skill) {
-		$skills[$index] = $skill;
-	}
+    $skills = Import :: csvToArray($file);
+    foreach ($skills as $index => $skill) {
+        $skills[$index] = $skill;
+    }
 
-	return $skills;
+    return $skills;
 }
 
 /**
@@ -94,7 +94,7 @@ 
  */
 function element_start($parser, $data)
 {
-	$data = api_utf8_decode($data);
+    $data = api_utf8_decode($data);
     global $skill;
     global $current_tag;
     switch ($data) {
@@ -111,7 +111,7 @@ 
  */
 function element_end($parser, $data)
 {
-	$data = api_utf8_decode($data);
+    $data = api_utf8_decode($data);
     global $skill;
     global $skills;
     global $current_value;
@@ -130,9 +130,9 @@ 
  */
 function character_data($parser, $data)
 {
-	$data = trim(api_utf8_decode($data));
-	global $current_value;
-	$current_value = $data;
+    $data = trim(api_utf8_decode($data));
+    global $current_value;
+    $current_value = $data;
 }
 
 /**
@@ -154,7 +154,7 @@ 
     xml_parse($parser, api_utf8_encode_xml(file_get_contents($file)));
     xml_parser_free($parser);
 
-	return $skills;
+    return $skills;
 }
 
 $this_section = SECTION_PLATFORM_ADMIN;

Spacing +1 added lines, -1 removed lines

@@ -277,7 +277,7 @@
     );
 
 
-$actions = '<div class="actions">' . $toolbar . '</div>';
+$actions = '<div class="actions">'.$toolbar.'</div>';
 
 echo $actions;
 

main/admin/user_update_import.php

Doc Comments +4 added lines, -1 removed lines

@@ -15,6 +15,9 @@ 
 // Set this option to true to enforce strict purification for usenames.
 $purification_option_for_usernames = false;
 
+/**
+ * @param Ddeboer\DataImport\Reader\CsvReader $users
+ */
 function validate_data($users)
 {
     global $defined_auth_sources;
@@ -228,7 +231,7 @@ 
 /**
  * Read the CSV-file
  * @param string $file Path to the CSV-file
- * @return array All userinformation read from the file
+ * @return Ddeboer\DataImport\Reader\CsvReader All userinformation read from the file
  */
 function parse_csv_data($file)
 {

Braces +4 added lines, -1 removed lines

@@ -464,7 +464,10 @@
 <blockquote>
     <pre>
         <b>UserName</b>;LastName;FirstName;Email;NewUserName;Password;AuthSource;OfficialCode;PhoneNumber;Status;ExpiryDate;Active;Language;Courses;ClassId;
-        xxx;xxx;xxx;xxx;xxx;xxx;xxx;xxx;xxx;user/teacher/drh;YYYY-MM-DD 00:00:00;0/1;xxx;<span style="color:red;"><?php if (count($list_reponse) > 0) echo implode(';', $list_reponse).';'; ?></span>xxx1|xxx2|xxx3;1;<br />
+        xxx;xxx;xxx;xxx;xxx;xxx;xxx;xxx;xxx;user/teacher/drh;YYYY-MM-DD 00:00:00;0/1;xxx;<span style="color:red;"><?php if (count($list_reponse) > 0) {
+    echo implode(';', $list_reponse).';';
+}
+?></span>xxx1|xxx2|xxx3;1;<br />
     </pre>
 </blockquote>
 <p><?php

main/admin/usergroup_import.php

Doc Comments +2 added lines, -1 removed lines

@@ -9,6 +9,7 @@ 
 
 /**
  * Validates imported data.
+ * @param Ddeboer\DataImport\Reader\CsvReader $classes
  */
 function validate_data($classes) {
     $errors = array();
@@ -36,7 +37,7 @@ 
 /**
  * Save imported class data to database
  *
- * @param $classes
+ * @param Ddeboer\DataImport\Reader\CsvReader $classes
  *
  * @return int
  */

Braces +2 added lines, -1 removed lines

@@ -10,7 +10,8 @@
 /**
  * Validates imported data.
  */
-function validate_data($classes) {
+function validate_data($classes)
+{
     $errors = array();
     $usergroup = new UserGroup();
     foreach ($classes as $index => $class) {

main/admin/usergroup_user_import.php

Doc Comments +3 added lines, -1 removed lines

@@ -11,6 +11,7 @@ 
 
 /**
  * Validates imported data.
+ * @param Ddeboer\DataImport\Reader\CsvReader $user_classes
  */
 function validate_data($user_classes) {
     global $purification_option_for_usernames;
@@ -66,6 +67,7 @@ 
 
 /**
  * Saves imported data.
+ * @param Ddeboer\DataImport\Reader\CsvReader $users_classes
  */
 function save_data($users_classes, $deleteUsersNotInList = false) {
 
@@ -115,7 +117,7 @@ 
 /**
  * Reads a CSV-file.
  * @param string $file Path to the CSV-file
- * @return array All course-information read from the file
+ * @return Ddeboer\DataImport\Reader\CsvReader All course-information read from the file
  */
 function parse_csv_data($file) {
     $courses = Import::csvToArray($file);

Braces +6 added lines, -3 removed lines

@@ -12,7 +12,8 @@ 
 /**
  * Validates imported data.
  */
-function validate_data($user_classes) {
+function validate_data($user_classes)
+{
     global $purification_option_for_usernames;
     $errors = array();
     $classcodes = array();
@@ -67,7 +68,8 @@ 
 /**
  * Saves imported data.
  */
-function save_data($users_classes, $deleteUsersNotInList = false) {
+function save_data($users_classes, $deleteUsersNotInList = false)
+{
 
     global $purification_option_for_usernames;
 
@@ -117,7 +119,8 @@ 
  * @param string $file Path to the CSV-file
  * @return array All course-information read from the file
  */
-function parse_csv_data($file) {
+function parse_csv_data($file)
+{
     $courses = Import::csvToArray($file);
     return $courses;
 }

main/inc/lib/export.lib.inc.php

Doc Comments +3 added lines, -3 removed lines

@@ -38,7 +38,7 @@ 
      * @param array $data
      * @param string $filename
      *
-     * @return mixed csv file | false if no data to export
+     * @return false|null csv file | false if no data to export
      */
     public static function arrayToCsv($data, $filename = 'export')
     {
@@ -160,7 +160,7 @@ 
      * @param string Name of common tag to place each line in
      * @param string Name of the root element. A root element should always be given.
      * @param string Encoding in which the data is provided
-     * @return void  Prompts the user for a file download
+     * @return boolean  Prompts the user for a file download
      */
     public static function export_complex_table_xml(
         $data,
@@ -286,7 +286,7 @@ 
      * @param string $name
      * @param string $format
      *
-     * @return bool
+     * @return false|null
      */
     public static function htmlToOdt($html, $name, $format = 'odt')
     {

Indentation +8 added lines, -8 removed lines

@@ -115,13 +115,13 @@ 
     }
 
     /**
-    * Export tabular data to XML-file
-    * @param array  Simple array of data to put in XML
-    * @param string Name of file to be given to the user
-    * @param string Name of common tag to place each line in
-    * @param string Name of the root element. A root element should always be given.
-    * @param string Encoding in which the data is provided
-    */
+     * Export tabular data to XML-file
+     * @param array  Simple array of data to put in XML
+     * @param string Name of file to be given to the user
+     * @param string Name of common tag to place each line in
+     * @param string Name of the root element. A root element should always be given.
+     * @param string Encoding in which the data is provided
+     */
     public static function arrayToXml(
         $data,
         $filename = 'export',
@@ -200,7 +200,7 @@ 
         foreach ($data as $row) {
             $string .= "\n".str_repeat("\t", $level).'<'.$row['name'].'>';
             if (is_array($row['value'])) {
-            	$string .= self::_export_complex_table_xml_helper($row['value'], $level + 1)."\n";
+                $string .= self::_export_complex_table_xml_helper($row['value'], $level + 1)."\n";
                 $string .= str_repeat("\t", $level).'</'.$row['name'].'>';
             } else {
                 $string .= $row['value'];

src/Chamilo/TicketBundle/Entity/Ticket.php

Indentation +6 added lines, -6 removed lines

@@ -94,12 +94,12 @@
      */
     protected $assignedLastUser;
 
-     /**
-     * @var Status
-     *
-     * @ORM\ManyToOne(targetEntity="Chamilo\TicketBundle\Entity\Status")
-     * @ORM\JoinColumn(name="status_id", referencedColumnName="id")
-     **/
+        /**
+         * @var Status
+         *
+         * @ORM\ManyToOne(targetEntity="Chamilo\TicketBundle\Entity\Status")
+         * @ORM\JoinColumn(name="status_id", referencedColumnName="id")
+         **/
     protected $status;
 
     /**