';
-
echo $form;
echo $table;
diff --git a/main/attendance/index.php b/main/attendance/index.php
index cd5ac40967..1d9ddeecdd 100755
--- a/main/attendance/index.php
+++ b/main/attendance/index.php
@@ -9,9 +9,7 @@
* @package chamilo.attendance
*/
-// including files
require_once '../inc/global.inc.php';
-
require_once 'attendance_controller.php';
require_once api_get_path(SYS_CODE_PATH).'gradebook/lib/fe/exportgradebook.php';
diff --git a/main/auth/courses_controller.php b/main/auth/courses_controller.php
index 64238a6456..7d34a95ff5 100755
--- a/main/auth/courses_controller.php
+++ b/main/auth/courses_controller.php
@@ -165,8 +165,14 @@ class CoursesController
* @param $limit
* @param boolean $justVisible Whether to search only in courses visibles in the catalogue
*/
- public function search_courses($search_term, $message = '', $error = '', $content = null, $limit = array(), $justVisible = false)
- {
+ public function search_courses(
+ $search_term,
+ $message = '',
+ $error = '',
+ $content = null,
+ $limit = array(),
+ $justVisible = false
+ ) {
$data = array();
$limit = !empty($limit) ? $limit : CourseCategory::getLimitArray();
@@ -264,8 +270,8 @@ class CoursesController
/**
* Change course category
* render to listing view
- * @param string Course code
- * @param int Category id
+ * @param string $course_code
+ * @param int $category_id
*/
public function change_course_category($course_code, $category_id)
{
@@ -283,9 +289,9 @@ class CoursesController
/**
* Move up/down courses inside a category
* render to listing view
- * @param string move to up or down
- * @param string Course code
- * @param int Category id
+ * @param string $move move to up or down
+ * @param string $course_code
+ * @param int $category_id Category id
*/
public function move_course($move, $course_code, $category_id)
{
@@ -300,8 +306,8 @@ class CoursesController
/**
* Move up/down categories
* render to listing view
- * @param string move to up or down
- * @param int Category id
+ * @param string $move move to up or down
+ * @param int $category_id Category id
*/
public function move_category($move, $category_id)
{
@@ -316,8 +322,8 @@ class CoursesController
/**
* Edit course category
* render to listing view
- * @param string Category title
- * @param int Category id
+ * @param string $title Category title
+ * @param int $category Category id
*/
public function edit_course_category($title, $category)
{
diff --git a/main/inc/lib/CourseChatUtils.php b/main/inc/lib/CourseChatUtils.php
index d2f428c5ae..63b5f27189 100644
--- a/main/inc/lib/CourseChatUtils.php
+++ b/main/inc/lib/CourseChatUtils.php
@@ -2,6 +2,7 @@
/* For licensing terms, see /license.txt */
use Michelf\MarkdownExtra;
+use Doctrine\Common\Collections\Criteria;
/**
* Class CourseChat
@@ -23,10 +24,10 @@ class CourseChatUtils
*/
public function __construct($courseId, $userId, $sessionId = 0, $groupId = 0)
{
- $this->courseId = intval($courseId);
- $this->userId = intval($userId);
- $this->sessionId = intval($sessionId);
- $this->groupId = intval($groupId);
+ $this->courseId = (int) $courseId;
+ $this->userId = (int) $userId;
+ $this->sessionId = (int) $sessionId;
+ $this->groupId = (int) $groupId;
}
/**
@@ -42,10 +43,7 @@ class CourseChatUtils
$course = $em->find('ChamiloCoreBundle:Course', $this->courseId);
if ($this->sessionId) {
- $criteria = \Doctrine\Common\Collections\Criteria::create()
- ->where(
- \Doctrine\Common\Collections\Criteria::expr()->eq("course", $course)
- );
+ $criteria = Criteria::create()->where(Criteria::expr()->eq("course", $course));
return $em
->find('ChamiloCoreBundle:Session', $this->sessionId)
@@ -1506,7 +1504,6 @@ class CourseChatUtils
public function getFileName($absolute = false, $friendId = 0)
{
$date = date('Y-m-d');
-
$base = 'messages-' . $date . '.log.html';
if ($this->groupId && !$friendId) {
diff --git a/main/inc/lib/GamificationUtils.php b/main/inc/lib/GamificationUtils.php
index 6704026e59..c5dc8ca679 100644
--- a/main/inc/lib/GamificationUtils.php
+++ b/main/inc/lib/GamificationUtils.php
@@ -9,7 +9,6 @@
*/
class GamificationUtils
{
-
/**
* Get the calculated points on session with gamification mode
* @param int $userId The user ID
@@ -26,6 +25,7 @@ class GamificationUtils
);
if (empty($sessions)) {
+
return 0;
}
@@ -222,5 +222,4 @@ class GamificationUtils
return round($progress / count($sessions), 2);
}
-
}
diff --git a/main/inc/lib/auth.lib.php b/main/inc/lib/auth.lib.php
index 484d1531e9..14965a07c9 100755
--- a/main/inc/lib/auth.lib.php
+++ b/main/inc/lib/auth.lib.php
@@ -406,7 +406,7 @@ class Auth
* @param boolean $justVisible search only on visible courses in the catalogue
* @return array An array containing a list of all the courses matching the the search term.
*/
- public function search_courses($search_term, $limit, $justVisible=false)
+ public function search_courses($search_term, $limit, $justVisible = false)
{
$courseTable = Database::get_main_table(TABLE_MAIN_COURSE);
$extraFieldTable = Database :: get_main_table(TABLE_EXTRA_FIELD);
@@ -434,7 +434,7 @@ class Auth
$without_special_courses = ' AND course.code NOT IN (' . implode(',', $special_course_list) . ')';
}
- $visibilityCondition = ($justVisible?CourseManager::getCourseVisibilitySQLCondition('course'):'');
+ $visibilityCondition = $justVisible ? CourseManager::getCourseVisibilitySQLCondition('course') : '';
$search_term_safe = Database::escape_string($search_term);
$sql_find = "SELECT * FROM $courseTable
@@ -503,7 +503,7 @@ class Auth
/**
* unsubscribe the user from a given course
- * @param string Course code
+ * @param string $course_code
* @return bool True if it success
*/
public function remove_user_from_course($course_code)
@@ -678,8 +678,7 @@ class Auth
$em = Database::getManager();
$qb = $em->createQueryBuilder();
- $_sessions = $qb->select('s')
- ->from('ChamiloCoreBundle:Session', 's');
+ $_sessions = $qb->select('s')->from('ChamiloCoreBundle:Session', 's');
if (!empty($limit)) {
$_sessions->setFirstResult($limit['start'])
@@ -788,12 +787,10 @@ SQL;
->getResult();
$sessionsToBrowse = [];
-
foreach ($sessions as $session) {
if ($session->getNbrCourses() === 0) {
continue;
}
-
$sessionsToBrowse[] = $session;
}
diff --git a/main/inc/lib/blog.lib.php b/main/inc/lib/blog.lib.php
index d72e000a27..9dca3b1895 100755
--- a/main/inc/lib/blog.lib.php
+++ b/main/inc/lib/blog.lib.php
@@ -13,116 +13,114 @@
*/
class Blog
{
- /**
- * Get the title of a blog
- * @author Toon Keppens
- *
- * @param int $blog_id
- *
- * @return String Blog Title
- */
- public static function get_blog_title ($blog_id)
- {
- $course_id = api_get_course_int_id();
-
- if (is_numeric($blog_id)) {
- $tbl_blogs = Database::get_course_table(TABLE_BLOGS);
-
- $sql = "SELECT blog_name
- FROM " . $tbl_blogs . "
- WHERE c_id = $course_id AND blog_id = " . intval($blog_id);
-
- $result = Database::query($sql);
- $blog = Database::fetch_array($result);
-
- return stripslashes($blog['blog_name']);
- }
- }
+ /**
+ * Get the title of a blog
+ * @author Toon Keppens
+ *
+ * @param int $blog_id
+ *
+ * @return String Blog Title
+ */
+ public static function get_blog_title($blog_id)
+ {
+ $course_id = api_get_course_int_id();
+ if (is_numeric($blog_id)) {
+ $tbl_blogs = Database::get_course_table(TABLE_BLOGS);
- /**
- * Get the description of a blog
- * @author Toon Keppens
- *
- * @param Integer $blog_id
- *
- * @return String Blog description
- */
- public static function get_blog_subtitle($blog_id)
- {
- $tbl_blogs = Database::get_course_table(TABLE_BLOGS);
- $course_id = api_get_course_int_id();
- $sql = "SELECT blog_subtitle FROM $tbl_blogs
- WHERE c_id = $course_id AND blog_id ='".intval($blog_id)."'";
- $result = Database::query($sql);
- $blog = Database::fetch_array($result);
-
- return stripslashes($blog['blog_subtitle']);
- }
+ $sql = "SELECT blog_name
+ FROM " . $tbl_blogs . "
+ WHERE c_id = $course_id AND blog_id = " . intval($blog_id);
- /**
- * Get the users of a blog
- * @author Toon Keppens
- *
- * @param Integer $blog_id
- *
- * @return Array Returns an array with [userid]=>[username]
- */
- public static function get_blog_users($blog_id)
- {
- // Database table definitions
- $tbl_users = Database::get_main_table(TABLE_MAIN_USER);
- $tbl_blogs_rel_user = Database::get_course_table(TABLE_BLOGS_REL_USER);
-
- $course_id = api_get_course_int_id();
-
- // Get blog members
- $sql = "SELECT user.user_id, user.firstname, user.lastname
- FROM " . $tbl_blogs_rel_user . " blogs_rel_user
- INNER JOIN " . $tbl_users . " user
- ON blogs_rel_user.user_id = user.user_id
- WHERE
- blogs_rel_user.c_id = $course_id AND
- blogs_rel_user.blog_id = '" . (int)$blog_id."'";
- $result = Database::query($sql);
- $blog_members = array ();
- while($user = Database::fetch_array($result)) {
- $blog_members[$user['user_id']] = api_get_person_name($user['firstname'], $user['lastname']);
- }
+ $result = Database::query($sql);
+ $blog = Database::fetch_array($result);
- return $blog_members;
- }
+ return stripslashes($blog['blog_name']);
+ }
+ }
+
+ /**
+ * Get the description of a blog
+ * @author Toon Keppens
+ *
+ * @param Integer $blog_id
+ *
+ * @return String Blog description
+ */
+ public static function get_blog_subtitle($blog_id)
+ {
+ $tbl_blogs = Database::get_course_table(TABLE_BLOGS);
+ $course_id = api_get_course_int_id();
+ $sql = "SELECT blog_subtitle FROM $tbl_blogs
+ WHERE c_id = $course_id AND blog_id ='".intval($blog_id)."'";
+ $result = Database::query($sql);
+ $blog = Database::fetch_array($result);
+
+ return stripslashes($blog['blog_subtitle']);
+ }
+
+ /**
+ * Get the users of a blog
+ * @author Toon Keppens
+ *
+ * @param Integer $blog_id
+ *
+ * @return Array Returns an array with [userid]=>[username]
+ */
+ public static function get_blog_users($blog_id)
+ {
+ // Database table definitions
+ $tbl_users = Database::get_main_table(TABLE_MAIN_USER);
+ $tbl_blogs_rel_user = Database::get_course_table(TABLE_BLOGS_REL_USER);
- /**
- * Creates a new blog in the given course
- * @author Toon Keppens
- * @param string $title
- */
- public static function create_blog($title, $subtitle)
- {
- $_user = api_get_user_info();
$course_id = api_get_course_int_id();
- $current_date=date('Y-m-d H:i:s',time());
- $session_id = api_get_session_id();
- // Tabel definitions
+ // Get blog members
+ $sql = "SELECT user.user_id, user.firstname, user.lastname
+ FROM " . $tbl_blogs_rel_user . " blogs_rel_user
+ INNER JOIN " . $tbl_users . " user
+ ON blogs_rel_user.user_id = user.user_id
+ WHERE
+ blogs_rel_user.c_id = $course_id AND
+ blogs_rel_user.blog_id = '" . (int)$blog_id."'";
+ $result = Database::query($sql);
+ $blog_members = array ();
+ while ($user = Database::fetch_array($result)) {
+ $blog_members[$user['user_id']] = api_get_person_name($user['firstname'], $user['lastname']);
+ }
+
+ return $blog_members;
+ }
+
+ /**
+ * Creates a new blog in the given course
+ * @author Toon Keppens
+ * @param string $title
+ */
+ public static function create_blog($title, $subtitle)
+ {
+ $_user = api_get_user_info();
+ $course_id = api_get_course_int_id();
+
+ $current_date = date('Y-m-d H:i:s', time());
+ $session_id = api_get_session_id();
$tbl_blogs = Database::get_course_table(TABLE_BLOGS);
$tbl_tool = Database::get_course_table(TABLE_TOOL_LIST);
$tbl_blogs_posts = Database::get_course_table(TABLE_BLOGS_POSTS);
- //verified if exist blog
- $sql = 'SELECT COUNT(*) as count FROM '.$tbl_blogs.'
- WHERE
- c_id = '.$course_id.' AND
- blog_name="'.Database::escape_string($title).'" AND
- blog_subtitle="'.Database::escape_string($subtitle).'"';
+ //verified if exist blog
+ $sql = 'SELECT COUNT(*) as count FROM '.$tbl_blogs.'
+ WHERE
+ c_id = '.$course_id.' AND
+ blog_name="'.Database::escape_string($title).'" AND
+ blog_subtitle="'.Database::escape_string($subtitle).'"';
$res = Database::query($sql);
$info_count = Database::result($res, 0, 0);
if ($info_count == 0) {
- // Create the blog
+ // Create the blog
$params = [
- 'blog_id' => 0,
+ 'blog_id' => 0,
'c_id' => $course_id,
'blog_name' => $title,
'blog_subtitle' => $subtitle,
@@ -130,14 +128,14 @@ class Blog
'visibility' => 1 ,
'session_id' => $session_id,
];
- $this_blog_id = Database::insert($tbl_blogs, $params);
+ $this_blog_id = Database::insert($tbl_blogs, $params);
- if ($this_blog_id > 0) {
+ if ($this_blog_id > 0) {
$sql = "UPDATE $tbl_blogs SET blog_id = iid WHERE iid = $this_blog_id";
Database::query($sql);
- // insert into item_property
+ // insert into item_property
api_item_property_update(
api_get_course_info(),
TOOL_BLOGS,
@@ -145,12 +143,12 @@ class Blog
'BlogAdded',
api_get_user_id()
);
- }
+ }
- // Make first post. :)
+ // Make first post. :)
$params = [
- 'post_id' => 0,
+ 'post_id' => 0,
'c_id' => $course_id,
'title' => get_lang("Welcome"),
'full_text' => get_lang('FirstPostText'),
@@ -164,10 +162,10 @@ class Blog
Database::query($sql);
}
- // Put it on course homepage
- $sql = "INSERT INTO $tbl_tool (c_id, name, link, image, visibility, admin, address, added_tool, session_id, target)
- VALUES ($course_id, '".Database::escape_string($title)."','blog/blog.php?blog_id=".(int)$this_blog_id."','blog.gif','1','0','pastillegris.gif',0,'$session_id', '')";
- Database::query($sql);
+ // Put it on course homepage
+ $sql = "INSERT INTO $tbl_tool (c_id, name, link, image, visibility, admin, address, added_tool, session_id, target)
+ VALUES ($course_id, '".Database::escape_string($title)."','blog/blog.php?blog_id=".(int)$this_blog_id."','blog.gif','1','0','pastillegris.gif',0,'$session_id', '')";
+ Database::query($sql);
$toolId = Database::insert_id();
if ($toolId) {
@@ -175,35 +173,35 @@ class Blog
Database::query($sql);
}
- // Subscribe the teacher to this blog
- Blog::set_user_subscribed($this_blog_id, $_user['user_id']);
- }
- }
+ // Subscribe the teacher to this blog
+ Blog::set_user_subscribed($this_blog_id, $_user['user_id']);
+ }
+ }
- /**
- * Update title and subtitle of a blog in the given course
- * @author Toon Keppens
- * @param string $title
- */
- public static function edit_blog($blog_id, $title, $subtitle)
- {
- // Table definitions
- $tbl_blogs = Database::get_course_table(TABLE_BLOGS);
- $tbl_tool = Database::get_course_table(TABLE_TOOL_LIST);
+ /**
+ * Update title and subtitle of a blog in the given course
+ * @author Toon Keppens
+ * @param string $title
+ */
+ public static function edit_blog($blog_id, $title, $subtitle)
+ {
+ // Table definitions
+ $tbl_blogs = Database::get_course_table(TABLE_BLOGS);
+ $tbl_tool = Database::get_course_table(TABLE_TOOL_LIST);
$course_id = api_get_course_int_id();
- // Update the blog
- $sql = "UPDATE $tbl_blogs SET
- blog_name = '".Database::escape_string($title)."',
- blog_subtitle = '".Database::escape_string($subtitle)."'
- WHERE
- c_id = $course_id AND
- blog_id ='".Database::escape_string((int)$blog_id)."'
+ // Update the blog
+ $sql = "UPDATE $tbl_blogs SET
+ blog_name = '".Database::escape_string($title)."',
+ blog_subtitle = '".Database::escape_string($subtitle)."'
+ WHERE
+ c_id = $course_id AND
+ blog_id ='".Database::escape_string((int)$blog_id)."'
LIMIT 1";
- Database::query($sql);
+ Database::query($sql);
- //update item_property (update)
+ //update item_property (update)
api_item_property_update(
api_get_course_info(),
TOOL_BLOGS,
@@ -212,21 +210,21 @@ class Blog
api_get_user_id()
);
- // Update course homepage link
- $sql = "UPDATE $tbl_tool SET
- name = '".Database::escape_string($title)."'
- WHERE c_id = $course_id AND link = 'blog/blog.php?blog_id=".(int)$blog_id."' LIMIT 1";
- Database::query($sql);
- }
+ // Update course homepage link
+ $sql = "UPDATE $tbl_tool SET
+ name = '".Database::escape_string($title)."'
+ WHERE c_id = $course_id AND link = 'blog/blog.php?blog_id=".(int)$blog_id."' LIMIT 1";
+ Database::query($sql);
+ }
- /**
- * Deletes a blog and it's posts from the course database
- * @author Toon Keppens
- * @param Integer $blog_id
- */
- public static function delete_blog($blog_id)
- {
- // Init
+ /**
+ * Deletes a blog and it's posts from the course database
+ * @author Toon Keppens
+ * @param Integer $blog_id
+ */
+ public static function delete_blog($blog_id)
+ {
+ // Init
$tbl_blogs = Database::get_course_table(TABLE_BLOGS);
$tbl_blogs_posts = Database::get_course_table(TABLE_BLOGS_POSTS);
$tbl_blogs_comment = Database::get_course_table(TABLE_BLOGS_COMMENTS);
@@ -237,34 +235,34 @@ class Blog
$course_id = api_get_course_int_id();
$blog_id = intval($blog_id);
- // Delete posts from DB and the attachments
- delete_all_blog_attachment($blog_id);
+ // Delete posts from DB and the attachments
+ delete_all_blog_attachment($blog_id);
- //Delete comments
- $sql = "DELETE FROM $tbl_blogs_comment WHERE c_id = $course_id AND blog_id ='".$blog_id."'";
- Database::query($sql);
+ //Delete comments
+ $sql = "DELETE FROM $tbl_blogs_comment WHERE c_id = $course_id AND blog_id ='".$blog_id."'";
+ Database::query($sql);
- // Delete posts
- $sql = "DELETE FROM $tbl_blogs_posts WHERE c_id = $course_id AND blog_id ='".$blog_id."'";
- Database::query($sql);
+ // Delete posts
+ $sql = "DELETE FROM $tbl_blogs_posts WHERE c_id = $course_id AND blog_id ='".$blog_id."'";
+ Database::query($sql);
- // Delete tasks
- $sql = "DELETE FROM $tbl_blogs_tasks WHERE c_id = $course_id AND blog_id ='".$blog_id."'";
- Database::query($sql);
+ // Delete tasks
+ $sql = "DELETE FROM $tbl_blogs_tasks WHERE c_id = $course_id AND blog_id ='".$blog_id."'";
+ Database::query($sql);
- // Delete ratings
- $sql = "DELETE FROM $tbl_blogs_rating WHERE c_id = $course_id AND blog_id ='".$blog_id."'";
- Database::query($sql);
+ // Delete ratings
+ $sql = "DELETE FROM $tbl_blogs_rating WHERE c_id = $course_id AND blog_id ='".$blog_id."'";
+ Database::query($sql);
- // Delete blog
- $sql ="DELETE FROM $tbl_blogs WHERE c_id = $course_id AND blog_id ='".$blog_id."'";
- Database::query($sql);
+ // Delete blog
+ $sql ="DELETE FROM $tbl_blogs WHERE c_id = $course_id AND blog_id ='".$blog_id."'";
+ Database::query($sql);
- // Delete from course homepage
- $sql = "DELETE FROM $tbl_tool WHERE c_id = $course_id AND link = 'blog/blog.php?blog_id=".$blog_id."'";
- Database::query($sql);
+ // Delete from course homepage
+ $sql = "DELETE FROM $tbl_tool WHERE c_id = $course_id AND link = 'blog/blog.php?blog_id=".$blog_id."'";
+ Database::query($sql);
- //update item_property (delete)
+ //update item_property (delete)
api_item_property_update(
api_get_course_info(),
TOOL_BLOGS,
@@ -272,152 +270,152 @@ class Blog
'delete',
api_get_user_id()
);
- }
+ }
- /**
- * Creates a new post in a given blog
- * @author Toon Keppens
- * @param String $title
- * @param String $full_text
- * @param Integer $blog_id
- */
- public static function create_post($title, $full_text, $file_comment, $blog_id)
- {
- $_user = api_get_user_info();
- $_course = api_get_course_info();
- $course_id = $_course['real_id'];
-
- $blog_table_attachment = Database::get_course_table(TABLE_BLOGS_ATTACHMENT);
- $upload_ok=true;
- $has_attachment=false;
- $current_date = api_get_utc_datetime();
-
- if (!empty($_FILES['user_upload']['name'])) {
- $upload_ok = process_uploaded_file($_FILES['user_upload']);
- $has_attachment=true;
- }
+ /**
+ * Creates a new post in a given blog
+ * @author Toon Keppens
+ * @param String $title
+ * @param String $full_text
+ * @param Integer $blog_id
+ */
+ public static function create_post($title, $full_text, $file_comment, $blog_id)
+ {
+ $_user = api_get_user_info();
+ $_course = api_get_course_info();
+ $course_id = $_course['real_id'];
+
+ $blog_table_attachment = Database::get_course_table(TABLE_BLOGS_ATTACHMENT);
+ $upload_ok=true;
+ $has_attachment=false;
+ $current_date = api_get_utc_datetime();
+
+ if (!empty($_FILES['user_upload']['name'])) {
+ $upload_ok = process_uploaded_file($_FILES['user_upload']);
+ $has_attachment=true;
+ }
- if ($upload_ok) {
- // Table Definitions
- $tbl_blogs_posts = Database::get_course_table(TABLE_BLOGS_POSTS);
+ if ($upload_ok) {
+ // Table Definitions
+ $tbl_blogs_posts = Database::get_course_table(TABLE_BLOGS_POSTS);
- // Create the post
- $sql = "INSERT INTO $tbl_blogs_posts (c_id, title, full_text, date_creation, blog_id, author_id )
- VALUES ($course_id, '".Database::escape_string($title)."', '".Database::escape_string($full_text)."','".$current_date."', '".(int)$blog_id."', '".(int)$_user['user_id']."');";
+ // Create the post
+ $sql = "INSERT INTO $tbl_blogs_posts (c_id, title, full_text, date_creation, blog_id, author_id )
+ VALUES ($course_id, '".Database::escape_string($title)."', '".Database::escape_string($full_text)."','".$current_date."', '".(int)$blog_id."', '".(int)$_user['user_id']."');";
- Database::query($sql);
- $last_post_id = Database::insert_id();
+ Database::query($sql);
+ $last_post_id = Database::insert_id();
if ($last_post_id) {
$sql = "UPDATE $tbl_blogs_posts SET post_id = iid WHERE iid = $last_post_id";
Database::query($sql);
}
- if ($has_attachment) {
- $courseDir = $_course['path'].'/upload/blog';
- $sys_course_path = api_get_path(SYS_COURSE_PATH);
- $updir = $sys_course_path.$courseDir;
-
- // Try to add an extension to the file if it hasn't one
- $new_file_name = add_ext_on_mime(stripslashes($_FILES['user_upload']['name']), $_FILES['user_upload']['type']);
-
- // user's file name
- $file_name = $_FILES['user_upload']['name'];
-
- if (!filter_extension($new_file_name)) {
- Display :: display_error_message(get_lang('UplUnableToSaveFileFilteredExtension'));
- } else {
- $new_file_name = uniqid('');
- $new_path = $updir.'/'.$new_file_name;
- $result = @move_uploaded_file($_FILES['user_upload']['tmp_name'], $new_path);
- $comment = Database::escape_string($file_comment);
-
- // Storing the attachments if any
- if ($result) {
- $sql = 'INSERT INTO '.$blog_table_attachment.'(c_id, filename,comment, path, post_id,size, blog_id,comment_id) '.
- "VALUES ($course_id, '".Database::escape_string($file_name)."', '".$comment."', '".Database::escape_string($new_file_name)."' , '".$last_post_id."', '".intval($_FILES['user_upload']['size'])."', '".$blog_id."', '0' )";
- Database::query($sql);
+ if ($has_attachment) {
+ $courseDir = $_course['path'].'/upload/blog';
+ $sys_course_path = api_get_path(SYS_COURSE_PATH);
+ $updir = $sys_course_path.$courseDir;
+
+ // Try to add an extension to the file if it hasn't one
+ $new_file_name = add_ext_on_mime(stripslashes($_FILES['user_upload']['name']), $_FILES['user_upload']['type']);
+
+ // user's file name
+ $file_name = $_FILES['user_upload']['name'];
+
+ if (!filter_extension($new_file_name)) {
+ Display :: display_error_message(get_lang('UplUnableToSaveFileFilteredExtension'));
+ } else {
+ $new_file_name = uniqid('');
+ $new_path = $updir.'/'.$new_file_name;
+ $result = @move_uploaded_file($_FILES['user_upload']['tmp_name'], $new_path);
+ $comment = Database::escape_string($file_comment);
+
+ // Storing the attachments if any
+ if ($result) {
+ $sql = 'INSERT INTO '.$blog_table_attachment.'(c_id, filename,comment, path, post_id,size, blog_id,comment_id) '.
+ "VALUES ($course_id, '".Database::escape_string($file_name)."', '".$comment."', '".Database::escape_string($new_file_name)."' , '".$last_post_id."', '".intval($_FILES['user_upload']['size'])."', '".$blog_id."', '0' )";
+ Database::query($sql);
$id = Database::insert_id();
if ($id) {
$sql = "UPDATE $blog_table_attachment SET id = iid WHERE iid = $id";
Database::query($sql);
}
- }
- }
- }
- } else {
- Display::display_error_message(get_lang('UplNoFileUploaded'));
- }
- }
+ }
+ }
+ }
+ } else {
+ Display::display_error_message(get_lang('UplNoFileUploaded'));
+ }
+ }
- /**
- * Edits a post in a given blog
- * @author Toon Keppens
- * @param Integer $blog_id
- * @param String $title
- * @param String $full_text
- * @param Integer $blog_id
- */
- public static function edit_post($post_id, $title, $full_text, $blog_id)
- {
- $tbl_blogs_posts = Database::get_course_table(TABLE_BLOGS_POSTS);
+ /**
+ * Edits a post in a given blog
+ * @author Toon Keppens
+ * @param Integer $blog_id
+ * @param String $title
+ * @param String $full_text
+ * @param Integer $blog_id
+ */
+ public static function edit_post($post_id, $title, $full_text, $blog_id)
+ {
+ $tbl_blogs_posts = Database::get_course_table(TABLE_BLOGS_POSTS);
$course_id = api_get_course_int_id();
- // Create the post
- $sql = "UPDATE $tbl_blogs_posts SET
- title = '" . Database::escape_string($title)."',
- full_text = '" . Database::escape_string($full_text)."'
- WHERE c_id = $course_id AND post_id ='".(int)$post_id."' AND blog_id ='".(int)$blog_id."'
- LIMIT 1 ";
- Database::query($sql);
- }
+ // Create the post
+ $sql = "UPDATE $tbl_blogs_posts SET
+ title = '" . Database::escape_string($title)."',
+ full_text = '" . Database::escape_string($full_text)."'
+ WHERE c_id = $course_id AND post_id ='".(int)$post_id."' AND blog_id ='".(int)$blog_id."'
+ LIMIT 1 ";
+ Database::query($sql);
+ }
- /**
- * Deletes an article and it's comments
- * @author Toon Keppens
- * @param int $blog_id
- * @param int $post_id
- */
- public static function delete_post($blog_id, $post_id)
- {
- $tbl_blogs_posts = Database::get_course_table(TABLE_BLOGS_POSTS);
- $tbl_blogs_comments = Database::get_course_table(TABLE_BLOGS_COMMENTS);
- $tbl_blogs_rating = Database::get_course_table(TABLE_BLOGS_RATING);
+ /**
+ * Deletes an article and it's comments
+ * @author Toon Keppens
+ * @param int $blog_id
+ * @param int $post_id
+ */
+ public static function delete_post($blog_id, $post_id)
+ {
+ $tbl_blogs_posts = Database::get_course_table(TABLE_BLOGS_POSTS);
+ $tbl_blogs_comments = Database::get_course_table(TABLE_BLOGS_COMMENTS);
+ $tbl_blogs_rating = Database::get_course_table(TABLE_BLOGS_RATING);
$course_id = api_get_course_int_id();
- // Delete ratings on this comment
- $sql = "DELETE FROM $tbl_blogs_rating
- WHERE c_id = $course_id AND blog_id = '".(int)$blog_id."' AND item_id = '".(int)$post_id."' AND rating_type = 'post'";
- Database::query($sql);
+ // Delete ratings on this comment
+ $sql = "DELETE FROM $tbl_blogs_rating
+ WHERE c_id = $course_id AND blog_id = '".(int)$blog_id."' AND item_id = '".(int)$post_id."' AND rating_type = 'post'";
+ Database::query($sql);
- // Delete the post
- $sql = "DELETE FROM $tbl_blogs_posts
- WHERE c_id = $course_id AND post_id = '".(int)$post_id."'";
- Database::query($sql);
+ // Delete the post
+ $sql = "DELETE FROM $tbl_blogs_posts
+ WHERE c_id = $course_id AND post_id = '".(int)$post_id."'";
+ Database::query($sql);
- // Delete the comments
- $sql = "DELETE FROM $tbl_blogs_comments
- WHERE c_id = $course_id AND post_id = '".(int)$post_id."' AND blog_id = '".(int)$blog_id."'";
- Database::query($sql);
+ // Delete the comments
+ $sql = "DELETE FROM $tbl_blogs_comments
+ WHERE c_id = $course_id AND post_id = '".(int)$post_id."' AND blog_id = '".(int)$blog_id."'";
+ Database::query($sql);
- // Delete posts and attachments
- delete_all_blog_attachment($blog_id,$post_id);
- }
+ // Delete posts and attachments
+ delete_all_blog_attachment($blog_id,$post_id);
+ }
- /**
- * Creates a comment on a post in a given blog
- * @author Toon Keppens
- * @param String $title
- * @param String $full_text
- * @param Integer $blog_id
- * @param Integer $post_id
- * @param Integer $parent_id
- */
- public static function create_comment($title, $full_text, $file_comment, $blog_id, $post_id, $parent_id, $task_id = 'NULL')
- {
- $_user = api_get_user_info();
- $_course = api_get_course_info();
+ /**
+ * Creates a comment on a post in a given blog
+ * @author Toon Keppens
+ * @param String $title
+ * @param String $full_text
+ * @param Integer $blog_id
+ * @param Integer $post_id
+ * @param Integer $parent_id
+ */
+ public static function create_comment($title, $full_text, $file_comment, $blog_id, $post_id, $parent_id, $task_id = 'NULL')
+ {
+ $_user = api_get_user_info();
+ $_course = api_get_course_info();
$blog_table_attachment = Database::get_course_table(TABLE_BLOGS_ATTACHMENT);
$upload_ok = true;
@@ -425,55 +423,55 @@ class Blog
$current_date = api_get_utc_datetime();
$course_id = api_get_course_int_id();
- if (!empty($_FILES['user_upload']['name'])) {
- $upload_ok = process_uploaded_file($_FILES['user_upload']);
- $has_attachment=true;
- }
+ if (!empty($_FILES['user_upload']['name'])) {
+ $upload_ok = process_uploaded_file($_FILES['user_upload']);
+ $has_attachment=true;
+ }
- if ($upload_ok) {
- // Table Definition
- $tbl_blogs_comments = Database::get_course_table(TABLE_BLOGS_COMMENTS);
+ if ($upload_ok) {
+ // Table Definition
+ $tbl_blogs_comments = Database::get_course_table(TABLE_BLOGS_COMMENTS);
- // Create the comment
- $sql = "INSERT INTO $tbl_blogs_comments (c_id, title, comment, author_id, date_creation, blog_id, post_id, parent_comment_id, task_id )
- VALUES ($course_id, '".Database::escape_string($title)."', '".Database::escape_string($full_text)."', '".(int)$_user['user_id']."','".$current_date."', '".(int)$blog_id."', '".(int)$post_id."', '".(int)$parent_id."', '".(int)$task_id."')";
- Database::query($sql);
+ // Create the comment
+ $sql = "INSERT INTO $tbl_blogs_comments (c_id, title, comment, author_id, date_creation, blog_id, post_id, parent_comment_id, task_id )
+ VALUES ($course_id, '".Database::escape_string($title)."', '".Database::escape_string($full_text)."', '".(int)$_user['user_id']."','".$current_date."', '".(int)$blog_id."', '".(int)$post_id."', '".(int)$parent_id."', '".(int)$task_id."')";
+ Database::query($sql);
- // Empty post values, or they are shown on the page again
- $last_id = Database::insert_id();
+ // Empty post values, or they are shown on the page again
+ $last_id = Database::insert_id();
if ($last_id) {
$sql = "UPDATE $tbl_blogs_comments SET comment_id = iid WHERE iid = $last_id";
Database::query($sql);
}
- if ($has_attachment) {
- $courseDir = $_course['path'].'/upload/blog';
- $sys_course_path = api_get_path(SYS_COURSE_PATH);
- $updir = $sys_course_path.$courseDir;
-
- // Try to add an extension to the file if it hasn't one
- $new_file_name = add_ext_on_mime(
- stripslashes($_FILES['user_upload']['name']),
- $_FILES['user_upload']['type']
- );
-
- // user's file name
- $file_name =$_FILES['user_upload']['name'];
-
- if (!filter_extension($new_file_name)) {
- Display :: display_error_message(get_lang('UplUnableToSaveFileFilteredExtension'));
- } else {
- $new_file_name = uniqid('');
- $new_path=$updir.'/'.$new_file_name;
- $result= @move_uploaded_file($_FILES['user_upload']['tmp_name'], $new_path);
- $comment = Database::escape_string($file_comment);
-
- // Storing the attachments if any
- if ($result) {
- $sql='INSERT INTO '.$blog_table_attachment.'(c_id, filename,comment, path, post_id,size,blog_id,comment_id) '.
- "VALUES ($course_id, '".Database::escape_string($file_name)."', '".$comment."', '".Database::escape_string($new_file_name)."' , '".$post_id."', '".$_FILES['user_upload']['size']."', '".$blog_id."', '".$last_id."' )";
- Database::query($sql);
+ if ($has_attachment) {
+ $courseDir = $_course['path'].'/upload/blog';
+ $sys_course_path = api_get_path(SYS_COURSE_PATH);
+ $updir = $sys_course_path.$courseDir;
+
+ // Try to add an extension to the file if it hasn't one
+ $new_file_name = add_ext_on_mime(
+ stripslashes($_FILES['user_upload']['name']),
+ $_FILES['user_upload']['type']
+ );
+
+ // user's file name
+ $file_name =$_FILES['user_upload']['name'];
+
+ if (!filter_extension($new_file_name)) {
+ Display :: display_error_message(get_lang('UplUnableToSaveFileFilteredExtension'));
+ } else {
+ $new_file_name = uniqid('');
+ $new_path=$updir.'/'.$new_file_name;
+ $result= @move_uploaded_file($_FILES['user_upload']['tmp_name'], $new_path);
+ $comment = Database::escape_string($file_comment);
+
+ // Storing the attachments if any
+ if ($result) {
+ $sql='INSERT INTO '.$blog_table_attachment.'(c_id, filename,comment, path, post_id,size,blog_id,comment_id) '.
+ "VALUES ($course_id, '".Database::escape_string($file_name)."', '".$comment."', '".Database::escape_string($new_file_name)."' , '".$post_id."', '".$_FILES['user_upload']['size']."', '".$blog_id."', '".$last_id."' )";
+ Database::query($sql);
$id = Database::insert_id();
@@ -481,91 +479,91 @@ class Blog
$sql = "UPDATE $blog_table_attachment SET id = iid WHERE iid = $id";
Database::query($sql);
}
- }
- }
- }
- }
- }
+ }
+ }
+ }
+ }
+ }
- /**
- * Deletes a comment from a blogpost
- * @author Toon Keppens
- * @param int $blog_id
- * @param int $comment_id
- */
- public static function delete_comment($blog_id, $post_id, $comment_id)
- {
- $tbl_blogs_comments = Database::get_course_table(TABLE_BLOGS_COMMENTS);
- $tbl_blogs_rating = Database::get_course_table(TABLE_BLOGS_RATING);
- $blog_id = intval($blog_id);
- $post_id = intval($post_id);
- $comment_id = intval($comment_id);
+ /**
+ * Deletes a comment from a blogpost
+ * @author Toon Keppens
+ * @param int $blog_id
+ * @param int $comment_id
+ */
+ public static function delete_comment($blog_id, $post_id, $comment_id)
+ {
+ $tbl_blogs_comments = Database::get_course_table(TABLE_BLOGS_COMMENTS);
+ $tbl_blogs_rating = Database::get_course_table(TABLE_BLOGS_RATING);
+ $blog_id = intval($blog_id);
+ $post_id = intval($post_id);
+ $comment_id = intval($comment_id);
$course_id = api_get_course_int_id();
- delete_all_blog_attachment($blog_id, $post_id, $comment_id);
-
- // Delete ratings on this comment
- $sql = "DELETE FROM $tbl_blogs_rating
- WHERE
- c_id = $course_id AND
- blog_id = '".$blog_id."' AND
- item_id = '".$comment_id."' AND
- rating_type = 'comment'";
- Database::query($sql);
-
- // select comments that have the selected comment as their parent
- $sql = "SELECT comment_id FROM $tbl_blogs_comments
- WHERE c_id = $course_id AND parent_comment_id = '".$comment_id."'";
- $result = Database::query($sql);
-
- // Delete them recursively
- while ($comment = Database::fetch_array($result)) {
- Blog::delete_comment($blog_id,$post_id,$comment['comment_id']);
- }
+ delete_all_blog_attachment($blog_id, $post_id, $comment_id);
- // Finally, delete the selected comment to
- $sql = "DELETE FROM $tbl_blogs_comments
- WHERE c_id = $course_id AND comment_id = '".$comment_id."'";
- Database::query($sql);
- }
+ // Delete ratings on this comment
+ $sql = "DELETE FROM $tbl_blogs_rating
+ WHERE
+ c_id = $course_id AND
+ blog_id = '".$blog_id."' AND
+ item_id = '".$comment_id."' AND
+ rating_type = 'comment'";
+ Database::query($sql);
+
+ // select comments that have the selected comment as their parent
+ $sql = "SELECT comment_id FROM $tbl_blogs_comments
+ WHERE c_id = $course_id AND parent_comment_id = '".$comment_id."'";
+ $result = Database::query($sql);
+
+ // Delete them recursively
+ while ($comment = Database::fetch_array($result)) {
+ Blog::delete_comment($blog_id,$post_id,$comment['comment_id']);
+ }
+
+ // Finally, delete the selected comment to
+ $sql = "DELETE FROM $tbl_blogs_comments
+ WHERE c_id = $course_id AND comment_id = '".$comment_id."'";
+ Database::query($sql);
+ }
- /**
- * Creates a new task in a blog
- * @author Toon Keppens
- * @param Integer $blog_id
- * @param String $title
- * @param String $description
- * @param String $color
- */
- public static function create_task($blog_id, $title, $description, $articleDelete, $articleEdit, $commentsDelete, $color)
- {
- $tbl_blogs_tasks = Database::get_course_table(TABLE_BLOGS_TASKS);
- $tbl_tasks_permissions = Database::get_course_table(TABLE_BLOGS_TASKS_PERMISSIONS);
+ /**
+ * Creates a new task in a blog
+ * @author Toon Keppens
+ * @param Integer $blog_id
+ * @param String $title
+ * @param String $description
+ * @param String $color
+ */
+ public static function create_task($blog_id, $title, $description, $articleDelete, $articleEdit, $commentsDelete, $color)
+ {
+ $tbl_blogs_tasks = Database::get_course_table(TABLE_BLOGS_TASKS);
+ $tbl_tasks_permissions = Database::get_course_table(TABLE_BLOGS_TASKS_PERMISSIONS);
- $course_id = api_get_course_int_id();
+ $course_id = api_get_course_int_id();
- // Create the task
- $sql = "INSERT INTO $tbl_blogs_tasks (c_id, blog_id, title, description, color, system_task)
- VALUES ($course_id , '".(int)$blog_id."', '" . Database::escape_string($title)."', '" . Database::escape_string($description)."', '" . Database::escape_string($color)."', '0');";
- Database::query($sql);
+ // Create the task
+ $sql = "INSERT INTO $tbl_blogs_tasks (c_id, blog_id, title, description, color, system_task)
+ VALUES ($course_id , '".(int)$blog_id."', '" . Database::escape_string($title)."', '" . Database::escape_string($description)."', '" . Database::escape_string($color)."', '0');";
+ Database::query($sql);
- $task_id = Database::insert_id();
+ $task_id = Database::insert_id();
if ($task_id) {
$sql = "UPDATE $tbl_blogs_tasks SET task_id = iid WHERE iid = $task_id";
Database::query($sql);
}
- $tool = 'BLOG_' . $blog_id;
+ $tool = 'BLOG_' . $blog_id;
- if ($articleDelete == 'on') {
- $sql = " INSERT INTO " . $tbl_tasks_permissions . " ( c_id, task_id, tool, action) VALUES (
- '" . (int)$course_id . "',
- '" . (int)$task_id . "',
- '" . Database::escape_string($tool) . "',
- 'article_delete'
- )";
- Database::query($sql);
+ if ($articleDelete == 'on') {
+ $sql = " INSERT INTO " . $tbl_tasks_permissions . " ( c_id, task_id, tool, action) VALUES (
+ '" . (int)$course_id . "',
+ '" . (int)$task_id . "',
+ '" . Database::escape_string($tool) . "',
+ 'article_delete'
+ )";
+ Database::query($sql);
$id = Database::insert_id();
@@ -575,171 +573,179 @@ class Blog
}
}
- if ($articleEdit == 'on') {
- $sql = "
- INSERT INTO " . $tbl_tasks_permissions . " (c_id, task_id, tool, action ) VALUES (
- '" . (int)$course_id . "',
- '" . (int)$task_id . "',
- '" . Database::escape_string($tool) . "',
- 'article_edit'
- )";
- Database::query($sql);
+ if ($articleEdit == 'on') {
+ $sql = "
+ INSERT INTO " . $tbl_tasks_permissions . " (c_id, task_id, tool, action ) VALUES (
+ '" . (int)$course_id . "',
+ '" . (int)$task_id . "',
+ '" . Database::escape_string($tool) . "',
+ 'article_edit'
+ )";
+ Database::query($sql);
$id = Database::insert_id();
if ($id) {
$sql = "UPDATE $tbl_tasks_permissions SET id = iid WHERE iid = $id";
Database::query($sql);
}
- }
+ }
- if ($commentsDelete == 'on') {
- $sql = "
- INSERT INTO " . $tbl_tasks_permissions . " (c_id, task_id, tool, action ) VALUES (
- '" . (int)$course_id . "',
- '" . (int)$task_id . "',
- '" . Database::escape_string($tool) . "',
- 'article_comments_delete'
- )";
- Database::query($sql);
+ if ($commentsDelete == 'on') {
+ $sql = "
+ INSERT INTO " . $tbl_tasks_permissions . " (c_id, task_id, tool, action ) VALUES (
+ '" . (int)$course_id . "',
+ '" . (int)$task_id . "',
+ '" . Database::escape_string($tool) . "',
+ 'article_comments_delete'
+ )";
+ Database::query($sql);
$id = Database::insert_id();
if ($id) {
$sql = "UPDATE $tbl_tasks_permissions SET id = iid WHERE iid = $id";
Database::query($sql);
}
- }
- }
+ }
+ }
- /**
- * Edit a task in a blog
- * @author Toon Keppens
- * @param Integer $task_id
- * @param String $title
- * @param String $description
- * @param String $color
- */
- public static function edit_task($blog_id, $task_id, $title, $description, $articleDelete, $articleEdit, $commentsDelete, $color)
- {
- $tbl_blogs_tasks = Database::get_course_table(TABLE_BLOGS_TASKS);
- $tbl_tasks_permissions = Database::get_course_table(TABLE_BLOGS_TASKS_PERMISSIONS);
+ /**
+ * Edit a task in a blog
+ * @author Toon Keppens
+ * @param Integer $task_id
+ * @param String $title
+ * @param String $description
+ * @param String $color
+ */
+ public static function edit_task(
+ $blog_id,
+ $task_id,
+ $title,
+ $description,
+ $articleDelete,
+ $articleEdit,
+ $commentsDelete,
+ $color
+ ) {
+ $tbl_blogs_tasks = Database::get_course_table(TABLE_BLOGS_TASKS);
+ $tbl_tasks_permissions = Database::get_course_table(TABLE_BLOGS_TASKS_PERMISSIONS);
$course_id = api_get_course_int_id();
- // Create the task
- $sql = "UPDATE $tbl_blogs_tasks SET
- title = '".Database::escape_string($title)."',
- description = '".Database::escape_string($description)."',
- color = '".Database::escape_string($color)."'
- WHERE c_id = $course_id AND task_id ='".(int)$task_id."' LIMIT 1";
- Database::query($sql);
-
- $tool = 'BLOG_' . $blog_id;
-
- $sql = "DELETE FROM " . $tbl_tasks_permissions . "
- WHERE c_id = $course_id AND task_id = '" . (int)$task_id."'";
- Database::query($sql);
-
- if ($articleDelete == 'on') {
- $sql = "INSERT INTO " . $tbl_tasks_permissions . " ( c_id, task_id, tool, action) VALUES (
- '" . (int)$course_id . "',
- '" . (int)$task_id . "',
- '" . Database::escape_string($tool) . "',
- 'article_delete'
- )";
- Database::query($sql);
+ // Create the task
+ $sql = "UPDATE $tbl_blogs_tasks SET
+ title = '".Database::escape_string($title)."',
+ description = '".Database::escape_string($description)."',
+ color = '".Database::escape_string($color)."'
+ WHERE c_id = $course_id AND task_id ='".(int)$task_id."' LIMIT 1";
+ Database::query($sql);
+
+ $tool = 'BLOG_' . $blog_id;
+
+ $sql = "DELETE FROM " . $tbl_tasks_permissions . "
+ WHERE c_id = $course_id AND task_id = '" . (int)$task_id."'";
+ Database::query($sql);
+
+ if ($articleDelete == 'on') {
+ $sql = "INSERT INTO " . $tbl_tasks_permissions . " ( c_id, task_id, tool, action) VALUES (
+ '" . (int)$course_id . "',
+ '" . (int)$task_id . "',
+ '" . Database::escape_string($tool) . "',
+ 'article_delete'
+ )";
+ Database::query($sql);
$id = Database::insert_id();
if ($id) {
$sql = "UPDATE $tbl_tasks_permissions SET id = iid WHERE iid = $id";
Database::query($sql);
}
- }
+ }
- if ($articleEdit == 'on') {
- $sql = "INSERT INTO " . $tbl_tasks_permissions . " (c_id, task_id, tool, action) VALUES (
- '" . (int)$course_id . "',
- '" . (int)$task_id . "',
- '" . Database::escape_string($tool) . "',
- 'article_edit'
- )";
- Database::query($sql);
+ if ($articleEdit == 'on') {
+ $sql = "INSERT INTO " . $tbl_tasks_permissions . " (c_id, task_id, tool, action) VALUES (
+ '" . (int)$course_id . "',
+ '" . (int)$task_id . "',
+ '" . Database::escape_string($tool) . "',
+ 'article_edit'
+ )";
+ Database::query($sql);
$id = Database::insert_id();
if ($id) {
$sql = "UPDATE $tbl_tasks_permissions SET id = iid WHERE iid = $id";
Database::query($sql);
}
- }
+ }
- if ($commentsDelete == 'on') {
- $sql = " INSERT INTO " . $tbl_tasks_permissions . " (c_id, task_id, tool, action) VALUES (
- '" . (int)$course_id . "',
- '" . (int)$task_id . "',
- '" . Database::escape_string($tool) . "',
- 'article_comments_delete'
- )";
- Database::query($sql);
+ if ($commentsDelete == 'on') {
+ $sql = " INSERT INTO " . $tbl_tasks_permissions . " (c_id, task_id, tool, action) VALUES (
+ '" . (int)$course_id . "',
+ '" . (int)$task_id . "',
+ '" . Database::escape_string($tool) . "',
+ 'article_comments_delete'
+ )";
+ Database::query($sql);
$id = Database::insert_id();
if ($id) {
$sql = "UPDATE $tbl_tasks_permissions SET id = iid WHERE iid = $id";
Database::query($sql);
}
- }
- }
+ }
+ }
- /**
- * Deletes a task from a blog
- * @param Integer $blog_id
- * @param Integer $task_id
- */
- public static function delete_task($blog_id, $task_id)
- {
- $tbl_blogs_tasks = Database::get_course_table(TABLE_BLOGS_TASKS);
- $course_id = api_get_course_int_id();
-
- // Delete posts
- $sql = "DELETE FROM $tbl_blogs_tasks
- WHERE c_id = $course_id AND blog_id = '".(int)$blog_id."' AND task_id = '".(int)$task_id."'";
- Database::query($sql);
- }
+ /**
+ * Deletes a task from a blog
+ * @param Integer $blog_id
+ * @param Integer $task_id
+ */
+ public static function delete_task($blog_id, $task_id)
+ {
+ $tbl_blogs_tasks = Database::get_course_table(TABLE_BLOGS_TASKS);
+ $course_id = api_get_course_int_id();
+
+ // Delete posts
+ $sql = "DELETE FROM $tbl_blogs_tasks
+ WHERE c_id = $course_id AND blog_id = '".(int)$blog_id."' AND task_id = '".(int)$task_id."'";
+ Database::query($sql);
+ }
- /**
- * Deletes an assigned task from a blog
- * @param Integer $blog_id
- */
- public static function delete_assigned_task($blog_id, $task_id, $user_id)
- {
- $tbl_blogs_tasks_rel_user = Database::get_course_table(TABLE_BLOGS_TASKS_REL_USER);
+ /**
+ * Deletes an assigned task from a blog
+ * @param Integer $blog_id
+ */
+ public static function delete_assigned_task($blog_id, $task_id, $user_id)
+ {
+ $tbl_blogs_tasks_rel_user = Database::get_course_table(TABLE_BLOGS_TASKS_REL_USER);
$course_id = api_get_course_int_id();
- // Delete posts
- $sql = "DELETE FROM $tbl_blogs_tasks_rel_user
- WHERE
- c_id = $course_id AND
- blog_id = '".(int)$blog_id."' AND
- task_id = '".(int)$task_id."' AND
- user_id = '".(int)$user_id."'";
- Database::query($sql);
- }
+ // Delete posts
+ $sql = "DELETE FROM $tbl_blogs_tasks_rel_user
+ WHERE
+ c_id = $course_id AND
+ blog_id = '".(int)$blog_id."' AND
+ task_id = '".(int)$task_id."' AND
+ user_id = '".(int)$user_id."'";
+ Database::query($sql);
+ }
- /**
- * Get personal task list
- * @author Toon Keppens
- * @return Returns an unsorted list (
) with the users' tasks
- */
- public static function get_personal_task_list()
- {
- $_user = api_get_user_info();
+ /**
+ * Get personal task list
+ * @author Toon Keppens
+ * @return Returns an unsorted list (
) with the users' tasks
+ */
+ public static function get_personal_task_list()
+ {
+ $_user = api_get_user_info();
- $tbl_blogs = Database::get_course_table(TABLE_BLOGS);
- $tbl_blogs_tasks_rel_user = Database::get_course_table(TABLE_BLOGS_TASKS_REL_USER);
- $tbl_blogs_tasks = Database::get_course_table(TABLE_BLOGS_TASKS);
+ $tbl_blogs = Database::get_course_table(TABLE_BLOGS);
+ $tbl_blogs_tasks_rel_user = Database::get_course_table(TABLE_BLOGS_TASKS_REL_USER);
+ $tbl_blogs_tasks = Database::get_course_table(TABLE_BLOGS_TASKS);
- $course_id = api_get_course_int_id();
+ $course_id = api_get_course_int_id();
- if ($_user['user_id']) {
- $sql = "SELECT task_rel_user.*, task.title, blog.blog_name
+ if ($_user['user_id']) {
+ $sql = "SELECT task_rel_user.*, task.title, blog.blog_name
FROM $tbl_blogs_tasks_rel_user task_rel_user
INNER JOIN $tbl_blogs_tasks task
ON task_rel_user.task_id = task.task_id
@@ -753,332 +759,332 @@ class Blog
task_rel_user.user_id = ".(int)$_user['user_id']."
ORDER BY target_date ASC";
- $result = Database::query($sql);
-
- if (Database::num_rows($result) > 0) {
- echo '
';
- while ($mytask = Database::fetch_array($result)) {
- echo '
';
@@ -1426,56 +1432,56 @@ class Blog
echo "";
echo '';
echo '
';
- }
- echo "
";
- }
- }
+ }
+ echo "
";
+ }
+ }
- /**
- * Displays a list of tasks assigned to a user in this blog
- * @author Toon Keppens
- *
- * @param Integer $blog_id
- */
- public static function display_assigned_task_list ($blog_id)
+ /**
+ * Displays a list of tasks assigned to a user in this blog
+ * @author Toon Keppens
+ *
+ * @param Integer $blog_id
+ */
+ public static function display_assigned_task_list ($blog_id)
{
- // Init
- $tbl_users = Database::get_main_table(TABLE_MAIN_USER);
- $tbl_blogs_tasks = Database::get_course_table(TABLE_BLOGS_TASKS);
- $tbl_blogs_tasks_rel_user = Database::get_course_table(TABLE_BLOGS_TASKS_REL_USER);
- $counter = 0;
- global $charset,$color2;
-
- echo '' . get_lang('AssignedTasks') . ' ';
- echo "
';
echo Display::grid_html('grade_model');
}
@@ -215,8 +215,8 @@ class GradeModel extends Model
*/
public function save($params, $show_query = false)
{
- $id = parent::save($params, $show_query);
- if (!empty($id)) {
+ $id = parent::save($params, $show_query);
+ if (!empty($id)) {
foreach ($params['components'] as $component) {
if (!empty($component['title']) && !empty($component['percentage']) && !empty($component['acronym'])) {
$obj = new GradeModelComponents();
@@ -227,7 +227,7 @@ class GradeModel extends Model
}
//event_system(LOG_CAREER_CREATE, LOG_CAREER_ID, $id, api_get_utc_datetime(), api_get_user_id());
- return $id;
+ return $id;
}
/**
@@ -248,7 +248,6 @@ class GradeModel extends Model
}
}
}
- //$params['components']
}
/**
@@ -259,6 +258,12 @@ class GradeModel extends Model
parent::delete($id);
}
+ /**
+ * @param $form
+ * @param string $name
+ * @param null $default_value
+ * @return bool
+ */
public function fill_grade_model_select_in_form(&$form, $name = 'gradebook_model_id', $default_value = null)
{
if (api_get_setting('gradebook_enable_grade_model') == 'false') {
@@ -318,7 +323,7 @@ class GradeModelComponents extends Model
public function save($params, $show_query = false)
{
$id = parent::save($params, $show_query);
-
+
return $id;
}
}
diff --git a/main/inc/lib/gradebook.lib.php b/main/inc/lib/gradebook.lib.php
index b6550204e3..7e41c817d6 100755
--- a/main/inc/lib/gradebook.lib.php
+++ b/main/inc/lib/gradebook.lib.php
@@ -26,6 +26,7 @@ class Gradebook extends Model
*/
public function __construct()
{
+ parent::__construct();
$this->table = Database::get_main_table(TABLE_MAIN_GRADEBOOK_CATEGORY);
$this->table_skill = Database::get_main_table(TABLE_MAIN_SKILL);
$this->table_skill_rel_gradebook = Database::get_main_table(TABLE_MAIN_SKILL_REL_GRADEBOOK);
@@ -198,8 +199,7 @@ class Gradebook extends Model
}
$form->addButtonCreate(get_lang('Add'), 'submit');
-
- $form->setDefaults(array('skill'=>$clean_selected_skills));
+ $form->setDefaults(array('skill' => $clean_selected_skills));
return $form;
}
@@ -208,7 +208,7 @@ class Gradebook extends Model
* @param int $gradebook_id
* @return array|resource
*/
- function get_skills_by_gradebook($gradebook_id)
+ public function get_skills_by_gradebook($gradebook_id)
{
$gradebook_id = intval($gradebook_id);
$sql = "SELECT skill.id, skill.name FROM {$this->table_skill} skill
diff --git a/main/inc/lib/legal.lib.php b/main/inc/lib/legal.lib.php
index 7cde19f59b..a506d838cc 100755
--- a/main/inc/lib/legal.lib.php
+++ b/main/inc/lib/legal.lib.php
@@ -64,37 +64,37 @@ class LegalManager
/**
* @param int $id
*/
- public static function delete($id)
+ public static function delete($id)
{
- /*
- $legal_table = Database::get_main_table(TABLE_MAIN_LEGAL);
- $id = intval($id);
- $sql = "DELETE FROM $legal_table WHERE id = '".$id."'";
- */
- }
+ /*
+ $legal_table = Database::get_main_table(TABLE_MAIN_LEGAL);
+ $id = intval($id);
+ $sql = "DELETE FROM $legal_table WHERE id = '".$id."'";
+ */
+ }
- /**
- * Gets the last version of a Term and condition by language
- * @param int $language language id
- * @return array all the info of a Term and condition
- */
- public static function get_last_condition_version($language)
+ /**
+ * Gets the last version of a Term and condition by language
+ * @param int $language language id
+ * @return array all the info of a Term and condition
+ */
+ public static function get_last_condition_version($language)
{
- $legal_conditions_table = Database::get_main_table(TABLE_MAIN_LEGAL);
- $language= Database::escape_string($language);
- $sql = "SELECT version FROM $legal_conditions_table
- WHERE language_id = '".$language."'
- ORDER BY id DESC LIMIT 1 ";
- $result = Database::query($sql);
- $row = Database::fetch_array($result);
+ $legal_conditions_table = Database::get_main_table(TABLE_MAIN_LEGAL);
+ $language= Database::escape_string($language);
+ $sql = "SELECT version FROM $legal_conditions_table
+ WHERE language_id = '".$language."'
+ ORDER BY id DESC LIMIT 1 ";
+ $result = Database::query($sql);
+ $row = Database::fetch_array($result);
if (Database::num_rows($result) > 0) {
- return $row['version'];
- } else {
+ return $row['version'];
+ } else {
- return 0;
- }
- }
+ return 0;
+ }
+ }
/**
* Gets the data of a Term and condition by language
@@ -126,7 +126,6 @@ class LegalManager
{
if (strpos($content, '{{sessions}}')) {
$sessionListToString = '';
-
$sessionList = SessionManager::get_sessions_by_user(api_get_user_id());
if ($sessionList) {
$sessionListToString = get_lang('SessionList').'
';
+ }
- return $content;
- }
+ return $content;
+ }
/**
* @param int $user_id
@@ -207,23 +207,23 @@ class SystemAnnouncementManager
*/
public static function display_arrow($user_id)
{
- $start = (int)$_GET['start'];
- $nb_announcement = SystemAnnouncementManager :: count_nb_announcement($start,$user_id);
- $next = ((int)$_GET['start']+19);
- $prev = ((int)$_GET['start']-19);
- $content = '';
- if(!isset($_GET['start']) || $_GET['start'] == 0) {
- if($nb_announcement > 20) {
- $content .= ''.get_lang('NextBis').' >> ';
- }
- } else {
- echo ' << '.get_lang('Prev').'';
- if ($nb_announcement > 20) {
- $content .= ''.get_lang('NextBis').' >> ';
- }
- }
- return $content;
- }
+ $start = (int)$_GET['start'];
+ $nb_announcement = SystemAnnouncementManager :: count_nb_announcement($start,$user_id);
+ $next = ((int)$_GET['start']+19);
+ $prev = ((int)$_GET['start']-19);
+ $content = '';
+ if(!isset($_GET['start']) || $_GET['start'] == 0) {
+ if($nb_announcement > 20) {
+ $content .= ''.get_lang('NextBis').' >> ';
+ }
+ } else {
+ echo ' << '.get_lang('Prev').'';
+ if ($nb_announcement > 20) {
+ $content .= ''.get_lang('NextBis').' >> ';
+ }
+ }
+ return $content;
+ }
/**
* @param int $start
@@ -232,82 +232,82 @@ class SystemAnnouncementManager
*/
public static function count_nb_announcement($start = 0, $user_id = '')
{
- $start = intval($start);
- $visibility = api_is_allowed_to_create_course() ? self::VISIBLE_TEACHER : self::VISIBLE_STUDENT;
- $user_selected_language = api_get_interface_language();
- $db_table = Database :: get_main_table(TABLE_MAIN_SYSTEM_ANNOUNCEMENTS);
- $sql = 'SELECT id FROM '.$db_table.'
- WHERE (lang="'.$user_selected_language.'" OR lang IS NULL) ';
- if (isset($user_id)) {
- switch ($visibility) {
- case self::VISIBLE_GUEST :
- $sql .= " AND visible_guest = 1 ";
- break;
- case self::VISIBLE_STUDENT :
- $sql .= " AND visible_student = 1 ";
- break;
- case self::VISIBLE_TEACHER :
- $sql .= " AND visible_teacher = 1 ";
- break;
- }
- }
-
- $current_access_url_id = 1;
- if (api_is_multiple_url_enabled()) {
- $current_access_url_id = api_get_current_access_url_id();
- }
- $sql .= " AND access_url_id = '$current_access_url_id' ";
+ $start = intval($start);
+ $visibility = api_is_allowed_to_create_course() ? self::VISIBLE_TEACHER : self::VISIBLE_STUDENT;
+ $user_selected_language = api_get_interface_language();
+ $db_table = Database :: get_main_table(TABLE_MAIN_SYSTEM_ANNOUNCEMENTS);
+ $sql = 'SELECT id FROM '.$db_table.'
+ WHERE (lang="'.$user_selected_language.'" OR lang IS NULL) ';
+ if (isset($user_id)) {
+ switch ($visibility) {
+ case self::VISIBLE_GUEST:
+ $sql .= " AND visible_guest = 1 ";
+ break;
+ case self::VISIBLE_STUDENT:
+ $sql .= " AND visible_student = 1 ";
+ break;
+ case self::VISIBLE_TEACHER:
+ $sql .= " AND visible_teacher = 1 ";
+ break;
+ }
+ }
+ $current_access_url_id = 1;
+ if (api_is_multiple_url_enabled()) {
+ $current_access_url_id = api_get_current_access_url_id();
+ }
+ $sql .= " AND access_url_id = '$current_access_url_id' ";
- $sql .= 'LIMIT '.$start.', 21';
- $announcements = Database::query($sql);
- $i = 0;
- while ($rows = Database::fetch_array($announcements)) {
- $i++;
- }
- return $i;
- }
- /**
- * Get all announcements
- * @return array An array with all available system announcements (as php
- * objects)
- */
- public static function get_all_announcements()
+ $sql .= 'LIMIT '.$start.', 21';
+ $announcements = Database::query($sql);
+ $i = 0;
+ while ($rows = Database::fetch_array($announcements)) {
+ $i++;
+ }
+ return $i;
+ }
+
+ /**
+ * Get all announcements
+ * @return array An array with all available system announcements (as php
+ * objects)
+ */
+ public static function get_all_announcements()
{
- $table = Database :: get_main_table(TABLE_MAIN_SYSTEM_ANNOUNCEMENTS);
- $now = api_get_utc_datetime();
- $sql = "SELECT *, IF ( '$now' >= date_start AND '$now' <= date_end, '1', '0') AS visible
- FROM $table";
+ $table = Database :: get_main_table(TABLE_MAIN_SYSTEM_ANNOUNCEMENTS);
+ $now = api_get_utc_datetime();
+ $sql = "SELECT *, IF ( '$now' >= date_start AND '$now' <= date_end, '1', '0') AS visible
+ FROM $table";
- $current_access_url_id = 1;
- if (api_is_multiple_url_enabled()) {
- $current_access_url_id = api_get_current_access_url_id();
- }
- $sql .= " WHERE access_url_id = '$current_access_url_id' ";
- $sql .= " ORDER BY date_start ASC";
+ $current_access_url_id = 1;
+ if (api_is_multiple_url_enabled()) {
+ $current_access_url_id = api_get_current_access_url_id();
+ }
+ $sql .= " WHERE access_url_id = '$current_access_url_id' ";
+ $sql .= " ORDER BY date_start ASC";
- $announcements = Database::query($sql);
- $all_announcements = array();
- while ($announcement = Database::fetch_object($announcements)) {
- $all_announcements[] = $announcement;
- }
- return $all_announcements;
- }
+ $announcements = Database::query($sql);
+ $all_announcements = array();
+ while ($announcement = Database::fetch_object($announcements)) {
+ $all_announcements[] = $announcement;
+ }
+ return $all_announcements;
+ }
- /**
- * Adds an announcement to the database
- * @param string Title of the announcement
- * @param string Content of the announcement
- * @param string Start date (YYYY-MM-DD HH:II: SS)
- * @param string End date (YYYY-MM-DD HH:II: SS)
- * @param int Whether the announcement should be visible to teachers (1) or not (0)
- * @param int Whether the announcement should be visible to students (1) or not (0)
- * @param int Whether the announcement should be visible to anonymous users (1) or not (0)
- * @param string The language for which the announvement should be shown. Leave null for all langages
- * @param int Whether to send an e-mail to all users (1) or not (0)
- * @return mixed insert_id on success, false on failure
- */
+ /**
+ * Adds an announcement to the database
+ * @param string Title of the announcement
+ * @param string Content of the announcement
+ * @param string Start date (YYYY-MM-DD HH:II: SS)
+ * @param string End date (YYYY-MM-DD HH:II: SS)
+ * @param int Whether the announcement should be visible to teachers (1) or not (0)
+ * @param int Whether the announcement should be visible to students (1) or not (0)
+ * @param int Whether the announcement should be visible to anonymous users (1) or not (0)
+ * @param string The language for which the announvement should be shown. Leave null for all langages
+ * @param int Whether to send an e-mail to all users (1) or not (0)
+ * @return mixed insert_id on success, false on failure
+ */
public static function add_announcement(
$title,
$content,
@@ -321,114 +321,112 @@ class SystemAnnouncementManager
$add_to_calendar = false,
$sendEmailTest = false
) {
- $original_content = $content;
- $a_dateS = explode(' ',$date_start);
- $a_arraySD = explode('-',$a_dateS[0]);
- $a_arraySH = explode(':',$a_dateS[1]);
- $date_start_to_compare = array_merge($a_arraySD,$a_arraySH);
+ $original_content = $content;
+ $a_dateS = explode(' ', $date_start);
+ $a_arraySD = explode('-', $a_dateS[0]);
+ $a_arraySH = explode(':', $a_dateS[1]);
+ $date_start_to_compare = array_merge($a_arraySD, $a_arraySH);
- $a_dateE = explode(' ',$date_end);
- $a_arrayED = explode('-',$a_dateE[0]);
- $a_arrayEH = explode(':',$a_dateE[1]);
- $date_end_to_compare = array_merge($a_arrayED,$a_arrayEH);
+ $a_dateE = explode(' ', $date_end);
+ $a_arrayED = explode('-', $a_dateE[0]);
+ $a_arrayEH = explode(':', $a_dateE[1]);
+ $date_end_to_compare = array_merge($a_arrayED, $a_arrayEH);
- $db_table = Database :: get_main_table(TABLE_MAIN_SYSTEM_ANNOUNCEMENTS);
+ $db_table = Database :: get_main_table(TABLE_MAIN_SYSTEM_ANNOUNCEMENTS);
- if (!checkdate($date_start_to_compare[1], $date_start_to_compare[2], $date_start_to_compare[0])) {
- Display :: display_normal_message(get_lang('InvalidStartDate'));
- return false;
- }
+ if (!checkdate($date_start_to_compare[1], $date_start_to_compare[2], $date_start_to_compare[0])) {
+ Display :: display_normal_message(get_lang('InvalidStartDate'));
+ return false;
+ }
- if (($date_end_to_compare[1] ||
+ if (($date_end_to_compare[1] ||
$date_end_to_compare[2] ||
$date_end_to_compare[0]) &&
!checkdate($date_end_to_compare[1], $date_end_to_compare[2], $date_end_to_compare[0])
) {
- Display :: display_normal_message(get_lang('InvalidEndDate'));
- return false;
- }
- if (strlen(trim($title)) == 0) {
- Display::display_normal_message(get_lang('InvalidTitle'));
- return false;
- }
+ Display :: display_normal_message(get_lang('InvalidEndDate'));
+ return false;
+ }
+ if (strlen(trim($title)) == 0) {
+ Display::display_normal_message(get_lang('InvalidTitle'));
+ return false;
+ }
- $start = api_get_utc_datetime($date_start);
+ $start = api_get_utc_datetime($date_start);
$end = api_get_utc_datetime($date_end);
- //Fixing urls that are sent by email
- //$content = str_replace('src=\"/home/', 'src=\"'.api_get_path(WEB_PATH).'home/', $content);
- //$content = str_replace('file=/home/', 'file='.api_get_path(WEB_PATH).'home/', $content);
- $content = str_replace('src=\"'.api_get_path(REL_HOME_PATH), 'src=\"'.api_get_path(WEB_PATH).api_get_path(REL_HOME_PATH), $content);
- $content = str_replace('file='.api_get_path(REL_HOME_PATH), 'file='.api_get_path(WEB_PATH).api_get_path(REL_HOME_PATH), $content);
+ //Fixing urls that are sent by email
+ //$content = str_replace('src=\"/home/', 'src=\"'.api_get_path(WEB_PATH).'home/', $content);
+ //$content = str_replace('file=/home/', 'file='.api_get_path(WEB_PATH).'home/', $content);
+ $content = str_replace('src=\"'.api_get_path(REL_HOME_PATH), 'src=\"'.api_get_path(WEB_PATH).api_get_path(REL_HOME_PATH), $content);
+ $content = str_replace('file='.api_get_path(REL_HOME_PATH), 'file='.api_get_path(WEB_PATH).api_get_path(REL_HOME_PATH), $content);
+ $lang = is_null($lang) ? '' : $lang;
+
+ $current_access_url_id = 1;
+ if (api_is_multiple_url_enabled()) {
+ $current_access_url_id = api_get_current_access_url_id();
+ }
+ $params = [
+ 'title' => $title,
+ 'content' => $content,
+ 'date_start' => $start,
+ 'date_end' => $end,
+ 'visible_teacher' => $visible_teacher,
+ 'visible_student' => $visible_student,
+ 'visible_guest' => $visible_guest,
+ 'lang' => $lang,
+ 'access_url_id' => $current_access_url_id,
+ ];
- $lang = is_null($lang) ? '' : $lang;
+ $resultId = Database::insert($db_table, $params);
- $current_access_url_id = 1;
- if (api_is_multiple_url_enabled()) {
- $current_access_url_id = api_get_current_access_url_id();
- }
+ if ($resultId) {
- $params = [
- 'title' => $title,
- 'content' => $content,
- 'date_start' => $start,
- 'date_end' => $end,
- 'visible_teacher' => $visible_teacher,
- 'visible_student' => $visible_student,
- 'visible_guest' => $visible_guest,
- 'lang' => $lang,
- 'access_url_id' => $current_access_url_id,
- ];
-
- $resultId = Database::insert($db_table, $params);
-
- if ($resultId) {
-
- if ($sendEmailTest) {
- SystemAnnouncementManager::send_system_announcement_by_email(
- $title,
- $content,
- $visible_teacher,
- $visible_student,
- $lang,
- true
- );
- } else {
- if ($send_mail == 1) {
- SystemAnnouncementManager::send_system_announcement_by_email(
- $title,
- $content,
- $visible_teacher,
- $visible_student,
- $lang
- );
- }
- }
-
- if ($add_to_calendar) {
- $agenda = new Agenda();
- $agenda->setType('admin');
- $agenda->addEvent(
- $date_start,
- $date_end,
- false,
- $title,
- $original_content
- );
- }
-
- return $resultId;
+ if ($sendEmailTest) {
+ SystemAnnouncementManager::send_system_announcement_by_email(
+ $title,
+ $content,
+ $visible_teacher,
+ $visible_student,
+ $lang,
+ true
+ );
+ } else {
+ if ($send_mail == 1) {
+ SystemAnnouncementManager::send_system_announcement_by_email(
+ $title,
+ $content,
+ $visible_teacher,
+ $visible_student,
+ $lang
+ );
+ }
+ }
- }
+ if ($add_to_calendar) {
+ $agenda = new Agenda();
+ $agenda->setType('admin');
+ $agenda->addEvent(
+ $date_start,
+ $date_end,
+ false,
+ $title,
+ $original_content
+ );
+ }
- return false;
- }
+ return $resultId;
+
+ }
+
+ return false;
+ }
/**
* Makes the announcement id visible only for groups in groups_array
- * @param int announcement id
- * @param array array of group id
+ * @param int $announcement_id
+ * @param array $group_array array of group id
**/
public static function announcement_for_groups($announcement_id, $group_array)
{
@@ -437,9 +435,8 @@ class SystemAnnouncementManager
);
//first delete all group associations for this announcement
$res = Database::query(
- "DELETE FROM $tbl_announcement_group WHERE announcement_id=".intval(
- $announcement_id
- )
+ "DELETE FROM $tbl_announcement_group
+ WHERE announcement_id=".intval($announcement_id)
);
if ($res === false) {
@@ -482,6 +479,7 @@ class SystemAnnouncementManager
ag.group_id = g.id";
$res = Database::query($sql);
$groups = Database::fetch_array($res);
+
return $groups;
}
@@ -509,22 +507,23 @@ class SystemAnnouncementManager
) {
$em = Database::getManager();
- $a_dateS = explode(' ',$date_start);
- $a_arraySD = explode('-',$a_dateS[0]);
- $a_arraySH = explode(':',$a_dateS[1]);
- $date_start_to_compare = array_merge($a_arraySD,$a_arraySH);
+ $a_dateS = explode(' ', $date_start);
+ $a_arraySD = explode('-', $a_dateS[0]);
+ $a_arraySH = explode(':', $a_dateS[1]);
+ $date_start_to_compare = array_merge($a_arraySD, $a_arraySH);
- $a_dateE = explode(' ',$date_end);
- $a_arrayED = explode('-',$a_dateE[0]);
- $a_arrayEH = explode(':',$a_dateE[1]);
- $date_end_to_compare = array_merge($a_arrayED,$a_arrayEH);
+ $a_dateE = explode(' ', $date_end);
+ $a_arrayED = explode('-', $a_dateE[0]);
+ $a_arrayEH = explode(':', $a_dateE[1]);
+ $date_end_to_compare = array_merge($a_arrayED, $a_arrayEH);
$lang = is_null($lang) ? '' : $lang;
- if (!checkdate($date_start_to_compare[1], $date_start_to_compare[2], $date_start_to_compare[0])) {
- Display :: display_normal_message(get_lang('InvalidStartDate'));
- return false;
- }
+ if (!checkdate($date_start_to_compare[1], $date_start_to_compare[2], $date_start_to_compare[0])) {
+ Display:: display_normal_message(get_lang('InvalidStartDate'));
+
+ return false;
+ }
if (($date_end_to_compare[1] ||
$date_end_to_compare[2] ||
@@ -670,8 +669,14 @@ class SystemAnnouncementManager
* @param string Language (optional, considered for all languages if left empty)
* @return bool True if the message was sent or there was no destination matching. False on database or e-mail sending error.
*/
- public static function send_system_announcement_by_email($title, $content, $teacher, $student, $language = null, $sendEmailTest = false)
- {
+ public static function send_system_announcement_by_email(
+ $title,
+ $content,
+ $teacher,
+ $student,
+ $language = null,
+ $sendEmailTest = false
+ ) {
global $charset;
$title = api_html_entity_decode(stripslashes($title), ENT_QUOTES, $charset);
@@ -753,13 +758,13 @@ class SystemAnnouncementManager
('$now' >= date_start AND '$now' <= date_end) ";
switch ($visible) {
- case self::VISIBLE_GUEST :
+ case self::VISIBLE_GUEST:
$sql .= " AND visible_guest = 1 ";
break;
- case self::VISIBLE_STUDENT :
+ case self::VISIBLE_STUDENT:
$sql .= " AND visible_student = 1 ";
break;
- case self::VISIBLE_TEACHER :
+ case self::VISIBLE_TEACHER:
$sql .= " AND visible_teacher = 1 ";
break;
}
diff --git a/main/inc/lib/thematic.lib.php b/main/inc/lib/thematic.lib.php
index f6f72f6b79..88d2e917ea 100755
--- a/main/inc/lib/thematic.lib.php
+++ b/main/inc/lib/thematic.lib.php
@@ -408,6 +408,7 @@ class Thematic
);
}
}
+
return $affected_rows;
}
@@ -654,6 +655,7 @@ class Thematic
$return .= '
';
$final_return[$thematic_id] = $return;
}
+
return $final_return;
}
@@ -668,9 +670,7 @@ class Thematic
) {
$course_info = api_get_course_info($course_code);
$tbl_thematic_advance = Database::get_course_table(TABLE_THEMATIC_ADVANCE);
-
$data = array();
-
$condition = '';
if (isset($thematic_advance_id)) {
$thematic_advance_id = intval($thematic_advance_id);
@@ -691,7 +691,7 @@ class Thematic
api_get_session_id()
);
foreach ($list as $value) {
- $elements[$value['ref']]= $value;
+ $elements[$value['ref']] = $value;
}
}
@@ -1157,9 +1157,7 @@ class Thematic
);
if ($item_info['session_id'] == $sessionId) {
-
$a_thematic_advance_ids[] = $thematic_advance['id'];
-
// update done thematic for previous advances ((done_advance = 1))
$upd = "UPDATE $tbl_thematic_advance SET
done_advance = 1
@@ -1321,7 +1319,10 @@ class Thematic
if (!empty($thematic_data)) {
foreach ($thematic_data as $thematic) {
$thematic_id = $thematic['id'];
- $a_average_of_advances_by_thematic[$thematic_id] = $this->get_average_of_advances_by_thematic($thematic_id, $course_code);
+ $a_average_of_advances_by_thematic[$thematic_id] = $this->get_average_of_advances_by_thematic(
+ $thematic_id,
+ $course_code
+ );
}
}
@@ -1331,6 +1332,7 @@ class Thematic
$score = array_sum($a_average_of_advances_by_thematic);
$total_average = round(($score * 100) / ($count_tematics * 100));
}
+
return $total_average;
}
diff --git a/main/inc/lib/urlmanager.lib.php b/main/inc/lib/urlmanager.lib.php
index 10f5931244..0750aa1b0f 100755
--- a/main/inc/lib/urlmanager.lib.php
+++ b/main/inc/lib/urlmanager.lib.php
@@ -80,22 +80,22 @@ class UrlManager
$tableGroup = Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_USERGROUP);
$sql = "DELETE FROM $tableCourse WHERE access_url_id = ".$id;
- $result = Database::query($sql);
+ Database::query($sql);
/*
$sql = "DELETE FROM $tableCourseCategory WHERE access_url_id = ".$id;
- $result = Database::query($sql);
+ Database::query($sql);
*/
$sql = "DELETE FROM $tableSession WHERE access_url_id = ".$id;
- $result = Database::query($sql);
+ Database::query($sql);
$sql = "DELETE FROM $tableGroup WHERE access_url_id = ".$id;
- $result = Database::query($sql);
+ Database::query($sql);
$sql = "DELETE FROM $tableUser WHERE access_url_id = ".$id;
- $result = Database::query($sql);
+ Database::query($sql);
$sql= "DELETE FROM $table WHERE id = ".$id;
- $result = Database::query($sql);
+ Database::query($sql);
- return $result;
+ return true;
}
/**
@@ -281,8 +281,9 @@ class UrlManager
$table_url_rel_session = Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_SESSION);
$tbl_session = Database :: get_main_table(TABLE_MAIN_SESSION);
- if (!empty($access_url_id))
- $where ="WHERE $table_url_rel_session.access_url_id = ".intval($access_url_id);
+ if (!empty($access_url_id)) {
+ $where = "WHERE $table_url_rel_session.access_url_id = ".intval($access_url_id);
+ }
$sql = "SELECT id, name, access_url_id
FROM $tbl_session u
@@ -430,8 +431,9 @@ class UrlManager
{
$table = Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_USERGROUP);
$sql= "SELECT usergroup_id FROM $table
- WHERE access_url_id = ".intval($urlId)." AND
- usergroup_id = ".intval($userGroupId);
+ WHERE
+ access_url_id = ".intval($urlId)." AND
+ usergroup_id = ".intval($userGroupId);
$result = Database::query($sql);
$num = Database::num_rows($result);
@@ -472,13 +474,15 @@ class UrlManager
$table_url_rel_user = Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
$result_array = array();
- if (is_array($user_list) && is_array($url_list)){
+ if (is_array($user_list) && is_array($url_list)) {
foreach ($url_list as $url_id) {
foreach ($user_list as $user_id) {
$count = UrlManager::relation_url_user_exist($user_id,$url_id);
- if ($count==0) {
+ if ($count == 0) {
$sql = "INSERT INTO $table_url_rel_user
- SET user_id = ".intval($user_id).", access_url_id = ".intval($url_id);
+ SET
+ user_id = ".intval($user_id).",
+ access_url_id = ".intval($url_id);
$result = Database::query($sql);
if ($result) {
$result_array[$url_id][$user_id] = 1;
@@ -643,14 +647,15 @@ class UrlManager
return Database::insert_id();
}
+
return 0;
}
/**
* Add a group of sessions into a group of URLs
* @author Julio Montoya
- * @param array of session ids
- * @param array of url_ids
+ * @param array $session_list of session ids
+ * @param array $url_list of url_ids
* @return array
* */
public static function add_sessions_to_urls($session_list, $url_list)
@@ -873,8 +878,8 @@ class UrlManager
/**
* Updates the access_url_rel_user table with a given user list
* @author Julio Montoya
- * @param array user list
- * @param int access_url_id
+ * @param array $user_list
+ * @param int $access_url_id
* */
public static function update_urls_rel_user($user_list, $access_url_id)
{
@@ -954,8 +959,8 @@ class UrlManager
/**
* Updates the access_url_rel_course table with a given user list
* @author Julio Montoya
- * @param array user list
- * @param int access_url_id
+ * @param array $userGroupList user list
+ * @param int $urlId
* */
public static function update_urls_rel_usergroup($userGroupList, $urlId)
{
@@ -987,8 +992,8 @@ class UrlManager
/**
* Updates the access_url_rel_course_category table with a given list
* @author Julio Montoya
- * @param array course category list
- * @param int access_url_id
+ * @param array $list course category list
+ * @param int $urlId access_url_id
**/
public static function updateUrlRelCourseCategory($list, $urlId)
{
@@ -1031,15 +1036,13 @@ class UrlManager
}
}
-
-
/**
* Updates the access_url_rel_session table with a given user list
* @author Julio Montoya
- * @param array user list
- * @param int access_url_id
+ * @param array $session_list
+ * @param int $access_url_id
* */
- public static function update_urls_rel_session($session_list,$access_url_id)
+ public static function update_urls_rel_session($session_list, $access_url_id)
{
$table_url_rel_session = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_SESSION);
@@ -1072,6 +1075,7 @@ class UrlManager
/**
* @param int $user_id
+ *
* @return array
*/
public static function get_access_url_from_user($user_id)
@@ -1083,6 +1087,7 @@ class UrlManager
WHERE user_id = ".intval($user_id);
$result = Database::query($sql);
$url_list = Database::store_result($result,'ASSOC');
+
return $url_list;
}
@@ -1130,6 +1135,7 @@ class UrlManager
$sql = "SELECT id FROM $table_access_url WHERE url = '".Database::escape_string($url)."'";
$result = Database::query($sql);
$access_url_id = Database::result($result, 0, 0);
+
return $access_url_id;
}
@@ -1167,6 +1173,7 @@ class UrlManager
}
}
$response->addAssign('ajax_list_courses', 'innerHTML', api_utf8_encode($return));
+
return $response;
}
}
diff --git a/main/inc/lib/userportal.lib.php b/main/inc/lib/userportal.lib.php
index 2fccb6d5fc..9577a4ceca 100755
--- a/main/inc/lib/userportal.lib.php
+++ b/main/inc/lib/userportal.lib.php
@@ -49,7 +49,7 @@ class IndexManager
/**
* @param bool $setLoginForm
*/
- function set_login_form($setLoginForm = true)
+ public function set_login_form($setLoginForm = true)
{
global $loginFailed;
$this->tpl->setLoginForm($setLoginForm);
@@ -58,7 +58,7 @@ class IndexManager
/**
* @param array $personal_course_list
*/
- function return_exercise_block($personal_course_list)
+ public function return_exercise_block($personal_course_list)
{
$exercise_list = array();
if (!empty($personal_course_list)) {
@@ -286,7 +286,7 @@ class IndexManager
return $html;
}
- function return_notice()
+ public function return_notice()
{
$user_selected_language = api_get_interface_language();
@@ -312,7 +312,7 @@ class IndexManager
return $html;
}
- function return_help()
+ public function return_help()
{
$user_selected_language = api_get_interface_language();
$platformLanguage = api_get_setting('platformLanguage');
@@ -342,7 +342,10 @@ class IndexManager
return $html;
}
- function return_skills_links()
+ /**
+ * @return null|string
+ */
+ public function return_skills_links()
{
$content = '';
$content .= '
';
@@ -411,7 +414,7 @@ class IndexManager
*
* @version 1.0.1
*/
- function handle_login_failed()
+ public function handle_login_failed()
{
return $this->tpl->handleLoginFailed();
}
@@ -424,7 +427,7 @@ class IndexManager
* @author Patrick Cool , Ghent University - refactoring and code cleaning
* @author Julio Montoya , Beeznest template modifs
*/
- function return_courses_in_categories()
+ public function return_courses_in_categories()
{
$result = '';
$stok = Security::get_token();
@@ -489,7 +492,8 @@ class IndexManager
LEFT JOIN $main_category_table t2 ON t1.code=t2.parent_id
LEFT JOIN $main_course_table t3 ON (t3.category_code = t1.code $platform_visible_courses)
WHERE t1.parent_id ". (empty ($category) ? "IS NULL" : "='$category'")."
- GROUP BY t1.name,t1.code,t1.parent_id,t1.children_count ORDER BY t1.tree_pos, t1.name";
+ GROUP BY t1.name,t1.code,t1.parent_id,t1.children_count
+ ORDER BY t1.tree_pos, t1.name";
// Showing only the category of courses of the current access_url_id
if (api_is_multiple_url_enabled()) {
@@ -805,7 +809,7 @@ class IndexManager
public function return_classes_block()
{
$html = '';
- if (api_get_setting('show_groups_to_users') == 'true') {
+ if (api_get_setting('show_groups_to_users') === 'true') {
$usergroup = new UserGroup();
$usergroup_list = $usergroup->get_usergroup_by_user(api_get_user_id());
$classes = '';
@@ -955,6 +959,9 @@ class IndexManager
return $html;
}
+ /**
+ * @return null|string
+ */
public function return_navigation_links()
{
$html = '';
@@ -975,10 +982,10 @@ class IndexManager
$content .= '';
}
$content .= '
'; - Blog::get_threaded_comments(0, 0, $blog_id, $post_id, $task_id); - echo '