chamilo / chamilo-lms

main/inc/lib/blog.lib.php

Indentation +97 added lines, -98 removed lines

@@ -6,7 +6,6 @@ 
  *
  * Contains several functions dealing with displaying,
  * editing,... of a blog
-
  * @package chamilo.blogs
  * @author Toon Keppens <toon@vi-host.net>
  * @author Julio Montoya - Cleaning code
@@ -333,7 +332,7 @@ 
                     // 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' )";
+                                "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) {
@@ -470,7 +469,7 @@ 
                     // 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."'  )";
+                                "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();
@@ -1389,10 +1388,10 @@ 
             echo '<span class="blogpost_title">' . get_lang('TaskList') . '</span><br />';
             echo "<table class=\"data_table\">";
             echo	"<tr bgcolor=\"$color2\" align=\"center\" valign=\"top\">",
-                     "<th width='240'><b>",get_lang('Title'),"</b></th>",
-                     "<th><b>",get_lang('Description'),"</b></th>",
-                     "<th><b>",get_lang('Color'),"</b></th>",
-                     "<th width='50'><b>",get_lang('Modify'),"</b></th>",
+                        "<th width='240'><b>",get_lang('Title'),"</b></th>",
+                        "<th><b>",get_lang('Description'),"</b></th>",
+                        "<th><b>",get_lang('Color'),"</b></th>",
+                        "<th width='50'><b>",get_lang('Modify'),"</b></th>",
                 "</tr>";
 
 
@@ -1424,14 +1423,14 @@ 
                 echo '<td width="50">';
                 echo '<a href="'.api_get_self().'?action=manage_tasks&blog_id='.$task['blog_id'].'&do=edit&task_id='.$task['task_id'].'">';
                 echo Display::return_icon('edit.png', get_lang('EditTask'));
-                      echo "</a>";
-                      echo '<a href="'.$delete_link.'"';
-                      echo $delete_confirm;
-                       echo '>';
+                        echo "</a>";
+                        echo '<a href="'.$delete_link.'"';
+                        echo $delete_confirm;
+                        echo '>';
                         echo Display::return_icon($delete_icon, $delete_title);
-                       echo "</a>";
-                     echo '</td>';
-                   echo '</tr>';
+                        echo "</a>";
+                        echo '</td>';
+                    echo '</tr>';
             }
             echo "</table>";
         }
@@ -1455,11 +1454,11 @@ 
         echo '<span class="blogpost_title">' . get_lang('AssignedTasks') . '</span><br />';
         echo "<table class=\"data_table\">";
         echo	"<tr bgcolor=\"$color2\" align=\"center\" valign=\"top\">",
-                 "<th width='240'><b>",get_lang('Member'),"</b></th>",
-                 "<th><b>",get_lang('Task'),"</b></th>",
-                 "<th><b>",get_lang('Description'),"</b></th>",
-                 "<th><b>",get_lang('TargetDate'),"</b></th>",
-                 "<th width='50'><b>",get_lang('Modify'),"</b></th>",
+                    "<th width='240'><b>",get_lang('Member'),"</b></th>",
+                    "<th><b>",get_lang('Task'),"</b></th>",
+                    "<th><b>",get_lang('Description'),"</b></th>",
+                    "<th><b>",get_lang('TargetDate'),"</b></th>",
+                    "<th width='50'><b>",get_lang('Modify'),"</b></th>",
             "</tr>";
 
         $course_id = api_get_course_int_id();
@@ -2307,7 +2306,7 @@ 
      * @param Integer $year: the 4-digit year indication e.g. 2005
      *
      * @return html code
-    */
+     */
     public static function display_minimonthcalendar($month, $year, $blog_id)
     {
         // Init
@@ -2600,34 +2599,34 @@ 
  */
 function get_blog_attachment($blog_id, $post_id=null,$comment_id=null)
 {
-	$blog_table_attachment = Database::get_course_table(TABLE_BLOGS_ATTACHMENT);
-
-	$blog_id = intval($blog_id);
-	$comment_id = intval($comment_id);
-	$post_id = intval($post_id);
-	$row=array();
-	$where='';
-	if (!empty ($post_id) && is_numeric($post_id)) {
-		$where.=' AND post_id ="'.$post_id.'" ';
-	}
-
-	if (!empty ($comment_id) && is_numeric($comment_id)) {
-		if (!empty ($post_id)) {
-			$where.= ' AND ';
-		}
-		$where.=' comment_id ="'.$comment_id.'" ';
-	}
+    $blog_table_attachment = Database::get_course_table(TABLE_BLOGS_ATTACHMENT);
+
+    $blog_id = intval($blog_id);
+    $comment_id = intval($comment_id);
+    $post_id = intval($post_id);
+    $row=array();
+    $where='';
+    if (!empty ($post_id) && is_numeric($post_id)) {
+        $where.=' AND post_id ="'.$post_id.'" ';
+    }
+
+    if (!empty ($comment_id) && is_numeric($comment_id)) {
+        if (!empty ($post_id)) {
+            $where.= ' AND ';
+        }
+        $where.=' comment_id ="'.$comment_id.'" ';
+    }
 
     $course_id = api_get_course_int_id();
 
-	$sql = 'SELECT path, filename, comment FROM '. $blog_table_attachment.'
+    $sql = 'SELECT path, filename, comment FROM '. $blog_table_attachment.'
 	        WHERE c_id = '.$course_id.' AND blog_id ="'.intval($blog_id).'"  '.$where;
 
-	$result=Database::query($sql);
-	if (Database::num_rows($result)!=0) {
-		$row=Database::fetch_array($result);
-	}
-	return $row;
+    $result=Database::query($sql);
+    if (Database::num_rows($result)!=0) {
+        $row=Database::fetch_array($result);
+    }
+    return $row;
 }
 
 /**
@@ -2644,16 +2643,16 @@ 
 
 function delete_all_blog_attachment($blog_id,$post_id=null,$comment_id=null)
 {
-	$_course = api_get_course_info();
-	$blog_table_attachment = Database::get_course_table(TABLE_BLOGS_ATTACHMENT);
-	$blog_id = intval($blog_id);
-	$comment_id = intval($comment_id);
-	$post_id = intval($post_id);
+    $_course = api_get_course_info();
+    $blog_table_attachment = Database::get_course_table(TABLE_BLOGS_ATTACHMENT);
+    $blog_id = intval($blog_id);
+    $comment_id = intval($comment_id);
+    $post_id = intval($post_id);
 
     $course_id = api_get_course_int_id();
-	$where = null;
+    $where = null;
 
-	// delete files in DB
+    // delete files in DB
     if (!empty ($post_id) && is_numeric($post_id)) {
         $where .= ' AND post_id ="'.$post_id.'" ';
     }
@@ -2665,25 +2664,25 @@ 
         $where .= ' comment_id ="'.$comment_id.'" ';
     }
 
-	// delete all files in directory
-	$courseDir   = $_course['path'].'/upload/blog';
-	$sys_course_path = api_get_path(SYS_COURSE_PATH);
-	$updir = $sys_course_path.$courseDir;
+    // delete all files in directory
+    $courseDir   = $_course['path'].'/upload/blog';
+    $sys_course_path = api_get_path(SYS_COURSE_PATH);
+    $updir = $sys_course_path.$courseDir;
 
-	$sql = 'SELECT path FROM '.$blog_table_attachment.'
+    $sql = 'SELECT path FROM '.$blog_table_attachment.'
 	        WHERE c_id = '.$course_id.' AND blog_id ="'.intval($blog_id).'"  '.$where;
-	$result=Database::query($sql);
-
-	while ($row=Database::fetch_row($result)) {
-		$file=$updir.'/'.$row[0];
-		if (Security::check_abs_path($file,$updir) )
-		{
-			@ unlink($file);
-		}
-	}
-	$sql = 'DELETE FROM '. $blog_table_attachment.'
+    $result=Database::query($sql);
+
+    while ($row=Database::fetch_row($result)) {
+        $file=$updir.'/'.$row[0];
+        if (Security::check_abs_path($file,$updir) )
+        {
+            @ unlink($file);
+        }
+    }
+    $sql = 'DELETE FROM '. $blog_table_attachment.'
 	        WHERE c_id = '.$course_id.' AND  blog_id ="'.intval($blog_id).'"  '.$where;
-	Database::query($sql);
+    Database::query($sql);
 }
 
 /**
@@ -2693,12 +2692,12 @@ 
  */
 function get_blog_post_from_user($course_code, $user_id)
 {
-	$tbl_blogs 		= Database::get_course_table(TABLE_BLOGS);
-	$tbl_blog_post 	= Database::get_course_table(TABLE_BLOGS_POSTS);
-	$course_info 	= api_get_course_info($course_code);
-	$course_id 		= $course_info['real_id'];
+    $tbl_blogs 		= Database::get_course_table(TABLE_BLOGS);
+    $tbl_blog_post 	= Database::get_course_table(TABLE_BLOGS_POSTS);
+    $course_info 	= api_get_course_info($course_code);
+    $course_id 		= $course_info['real_id'];
 
-	$sql = "SELECT DISTINCT blog.blog_id, post_id, title, full_text, post.date_creation
+    $sql = "SELECT DISTINCT blog.blog_id, post_id, title, full_text, post.date_creation
 			FROM $tbl_blogs blog
 			INNER JOIN  $tbl_blog_post post
 			ON (blog.blog_id = post.blog_id)
@@ -2707,19 +2706,19 @@ 
 				post.c_id = $course_id AND
 				author_id =  $user_id AND visibility = 1
 			ORDER BY post.date_creation DESC ";
-	$result = Database::query($sql);
-	$return_data = '';
-
-	if (Database::num_rows($result)!=0) {
-		while ($row=Database::fetch_array($result)) {
-			$return_data.=  '<div class="clear"></div><br />';
-			$return_data.=  '<div class="actions" style="margin-left:5px;margin-right:5px;">'.Display::return_icon('blog_article.png',get_lang('BlogPosts')).' '.$row['title'].'&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<div style="float:right;margin-top:-18px"><a href="../blog/blog.php?blog_id='.$row['blog_id'].'&gidReq=&cidReq='.$my_course_id.' " >'.get_lang('SeeBlog').'</a></div></div>';
-			$return_data.=  '<br / >';
-			$return_data.= $row['full_text'];
-			$return_data.= '<br /><br />';
-		}
-	}
-	return $return_data;
+    $result = Database::query($sql);
+    $return_data = '';
+
+    if (Database::num_rows($result)!=0) {
+        while ($row=Database::fetch_array($result)) {
+            $return_data.=  '<div class="clear"></div><br />';
+            $return_data.=  '<div class="actions" style="margin-left:5px;margin-right:5px;">'.Display::return_icon('blog_article.png',get_lang('BlogPosts')).' '.$row['title'].'&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<div style="float:right;margin-top:-18px"><a href="../blog/blog.php?blog_id='.$row['blog_id'].'&gidReq=&cidReq='.$my_course_id.' " >'.get_lang('SeeBlog').'</a></div></div>';
+            $return_data.=  '<br / >';
+            $return_data.= $row['full_text'];
+            $return_data.= '<br /><br />';
+        }
+    }
+    return $return_data;
 }
 
 /**
@@ -2736,7 +2735,7 @@ 
     $course_info = api_get_course_info($course_code);
     $course_id = $course_info['real_id'];
 
-	$sql = "SELECT DISTINCT blog.blog_id, comment_id, title, comment, comment.date_creation
+    $sql = "SELECT DISTINCT blog.blog_id, comment_id, title, comment, comment.date_creation
 			FROM $tbl_blogs blog INNER JOIN  $tbl_blog_comment comment
 			ON (blog.blog_id = comment.blog_id)
 			WHERE 	blog.c_id = $course_id AND
@@ -2744,18 +2743,18 @@ 
 					author_id =  $user_id AND
 					visibility = 1
 			ORDER BY blog_name";
-	$result = Database::query($sql);
-	$return_data = '';
-	if (Database::num_rows($result)!=0) {
-		while ($row=Database::fetch_array($result)) {
-			$return_data.=  '<div class="clear"></div><br />';
-			$return_data.=  '<div class="actions" style="margin-left:5px;margin-right:5px;">'.$row['title'].'&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<div style="float:right;margin-top:-18px"><a href="../blog/blog.php?blog_id='.$row['blog_id'].'&gidReq=&cidReq='.Security::remove_XSS($course_code).' " >'.get_lang('SeeBlog').'</a></div></div>';
-			$return_data.=  '<br / >';
-			//$return_data.=  '<strong>'.$row['title'].'</strong>'; echo '<br>';*/
-			$return_data.=  $row['comment'];
-			$return_data.=  '<br />';
-		}
-	}
-	return $return_data;
+    $result = Database::query($sql);
+    $return_data = '';
+    if (Database::num_rows($result)!=0) {
+        while ($row=Database::fetch_array($result)) {
+            $return_data.=  '<div class="clear"></div><br />';
+            $return_data.=  '<div class="actions" style="margin-left:5px;margin-right:5px;">'.$row['title'].'&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<div style="float:right;margin-top:-18px"><a href="../blog/blog.php?blog_id='.$row['blog_id'].'&gidReq=&cidReq='.Security::remove_XSS($course_code).' " >'.get_lang('SeeBlog').'</a></div></div>';
+            $return_data.=  '<br / >';
+            //$return_data.=  '<strong>'.$row['title'].'</strong>'; echo '<br>';*/
+            $return_data.=  $row['comment'];
+            $return_data.=  '<br />';
+        }
+    }
+    return $return_data;
 }
 

main/inc/lib/grade_model.lib.php

Indentation +12 added lines, -12 removed lines

@@ -51,15 +51,15 @@ 
     /**
      * Displays the title + grid
      */
-	public function display()
+    public function display()
     {
-		// action links
-		echo '<div class="actions" style="margin-bottom:20px">';
+        // action links
+        echo '<div class="actions" style="margin-bottom:20px">';
         echo '<a href="grade_models.php">'.Display::return_icon('back.png',get_lang('Back'),'', ICON_SIZE_MEDIUM).'</a>';
-		echo '<a href="'.api_get_self().'?action=add">'.Display::return_icon('add.png', get_lang('Add'), '', ICON_SIZE_MEDIUM).'</a>';
-		echo '</div>';
+        echo '<a href="'.api_get_self().'?action=add">'.Display::return_icon('add.png', get_lang('Add'), '', ICON_SIZE_MEDIUM).'</a>';
+        echo '</div>';
         echo Display::grid_html('grade_model');
-	}
+    }
 
     /**
      * Returns a Form validator Obj
@@ -117,7 +117,7 @@ 
         }
 
         $form->addElement('hidden', 'maxvalue', '100');
-		$form->addElement('hidden', 'minvalue', '0');
+        $form->addElement('hidden', 'minvalue', '0');
         $renderer = & $form->defaultRenderer();
 
         $component_array = array();
@@ -192,7 +192,7 @@ 
         // Setting the rules
         $form->addRule('name', get_lang('ThisFieldIsRequired'), 'required');
 
-		return $form;
+        return $form;
     }
 
     /**
@@ -255,7 +255,7 @@ 
      */
     public function delete($id)
     {
-	    parent::delete($id);
+        parent::delete($id);
     }
 
     /**
@@ -309,11 +309,11 @@ 
     /**
      * GradeModelComponents constructor.
      */
-	public function __construct()
+    public function __construct()
     {
         parent::__construct();
         $this->table = Database::get_main_table(TABLE_GRADE_MODEL_COMPONENTS);
-	}
+    }
 
     /**
      * @param array $params
@@ -322,7 +322,7 @@ 
      */
     public function save($params, $show_query = false)
     {
-	    $id = parent::save($params, $show_query);
+        $id = parent::save($params, $show_query);
 
         return $id;
     }

main/inc/lib/dashboard.lib.php

Indentation +39 added lines, -39 removed lines

@@ -307,8 +307,8 @@ 
             }
         }
 
-		return $block_data;
-	}
+        return $block_data;
+    }
 
     /**
      * get data about enabled dashboard block (stored insise block table)
@@ -491,42 +491,42 @@ 
         return $data;
     }
 
-	/**
-	 * This function update extra user blocks data after closing a dashboard block
-	 * @param int 		User id
-	 * @param string	plugin path
-	 * @param integer $user_id
-	 * @return bool
-	 */
-	public static function close_user_block($user_id, $path)
+    /**
+     * This function update extra user blocks data after closing a dashboard block
+     * @param int 		User id
+     * @param string	plugin path
+     * @param integer $user_id
+     * @return bool
+     */
+    public static function close_user_block($user_id, $path)
     {
-		$enabled_dashboard_blocks = self::get_enabled_dashboard_blocks($path);
-		$user_block_data = self::get_user_block_data($user_id);
-
-		foreach ($enabled_dashboard_blocks as $enabled_block) {
-			unset($user_block_data[$enabled_block['id']]);
-		}
-
-		// get columns and blocks id for updating extra user data
-		$columns = array();
-		$user_blocks_id = array();
-		foreach ($user_block_data as $data) {
-			$user_blocks_id[$data['block_id']] = true;
-			$columns[$data['block_id']] = $data['column'];
-		}
-
-		// update extra user blocks data
-		$upd_extra_field = self::store_user_blocks($user_id, $user_blocks_id, $columns);
-
-		return $upd_extra_field;
-	}
-
-	/**
-	 * get links for styles from dashboard plugins
-	 * @return string   links
-	 */
-	public static function get_links_for_styles_from_dashboard_plugins() {
-
-		return '<link rel="stylesheet" href="'.api_get_path(WEB_PLUGIN_PATH).'dashboard/css/default.css" type="text/css" />'.PHP_EOL;
-	}
+        $enabled_dashboard_blocks = self::get_enabled_dashboard_blocks($path);
+        $user_block_data = self::get_user_block_data($user_id);
+
+        foreach ($enabled_dashboard_blocks as $enabled_block) {
+            unset($user_block_data[$enabled_block['id']]);
+        }
+
+        // get columns and blocks id for updating extra user data
+        $columns = array();
+        $user_blocks_id = array();
+        foreach ($user_block_data as $data) {
+            $user_blocks_id[$data['block_id']] = true;
+            $columns[$data['block_id']] = $data['column'];
+        }
+
+        // update extra user blocks data
+        $upd_extra_field = self::store_user_blocks($user_id, $user_blocks_id, $columns);
+
+        return $upd_extra_field;
+    }
+
+    /**
+     * get links for styles from dashboard plugins
+     * @return string   links
+     */
+    public static function get_links_for_styles_from_dashboard_plugins() {
+
+        return '<link rel="stylesheet" href="'.api_get_path(WEB_PLUGIN_PATH).'dashboard/css/default.css" type="text/css" />'.PHP_EOL;
+    }
 }

main/inc/lib/system_announcements.lib.php

Indentation +122 added lines, -122 removed lines

@@ -10,12 +10,12 @@ 
     CONST VISIBLE_STUDENT = 2;
     CONST VISIBLE_TEACHER = 3;
 
-	/**
-	 * Displays all announcements
-	 * @param int $visible VISIBLE_GUEST, VISIBLE_STUDENT or VISIBLE_TEACHER
-	 * @param int $id The identifier of the announcement to display
-	 */
-	public static function display_announcements($visible, $id = -1)
+    /**
+     * Displays all announcements
+     * @param int $visible VISIBLE_GUEST, VISIBLE_STUDENT or VISIBLE_TEACHER
+     * @param int $id The identifier of the announcement to display
+     */
+    public static function display_announcements($visible, $id = -1)
     {
         $user_selected_language = api_get_interface_language();
         $db_table = Database :: get_main_table(TABLE_MAIN_SYSTEM_ANNOUNCEMENTS);
@@ -424,10 +424,10 @@ 
     }
 
     /**
-    * Makes the announcement id visible only for groups in groups_array
-    * @param int $announcement_id
-    * @param array $group_array array of group id
-    **/
+     * Makes the announcement id visible only for groups in groups_array
+     * @param int $announcement_id
+     * @param array $group_array array of group id
+     **/
     public static function announcement_for_groups($announcement_id, $group_array)
     {
         $tbl_announcement_group = Database:: get_main_table(
@@ -460,10 +460,10 @@ 
     }
 
     /**
-    * Gets the groups of this announce
-    * @param int announcement id
-    * @return array array of group id
-    **/
+     * Gets the groups of this announce
+     * @param int announcement id
+     * @return array array of group id
+     **/
     public static function get_announcement_groups($announcement_id)
     {
         $tbl_announcement_group = Database :: get_main_table(TABLE_MAIN_SYSTEM_ANNOUNCEMENTS_GROUPS);
@@ -483,15 +483,15 @@ 
         return $groups;
     }
 
-	/**
-	 * Updates an announcement to the database
-	 * @param integer $id      : id of the announcement
-	 * @param string  $title   : title of the announcement
-	 * @param string  $content : content of the announcement
-	 * @param array $date_start: start date of announcement (0 => day ; 1 => month ; 2 => year ; 3 => hour ; 4 => minute)
-	 * @param array $date_end : end date of announcement (0 => day ; 1 => month ; 2 => year ; 3 => hour ; 4 => minute)
-	 * @return	bool	True on success, false on failure
-	 */
+    /**
+     * Updates an announcement to the database
+     * @param integer $id      : id of the announcement
+     * @param string  $title   : title of the announcement
+     * @param string  $content : content of the announcement
+     * @param array $date_start: start date of announcement (0 => day ; 1 => month ; 2 => year ; 3 => hour ; 4 => minute)
+     * @param array $date_end : end date of announcement (0 => day ; 1 => month ; 2 => year ; 3 => hour ; 4 => minute)
+     * @return	bool	True on success, false on failure
+     */
     public static function update_announcement(
         $id,
         $title,
@@ -525,26 +525,26 @@ 
             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;
-		}
+            Display :: display_normal_message(get_lang('InvalidEndDate'));
+            return false;
+        }
 
-		if (strlen(trim($title)) == 0) {
-			Display::display_normal_message(get_lang('InvalidTitle'));
-			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);
+        //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);
 
@@ -594,81 +594,81 @@ 
         $em->merge($announcement);
         $em->flush();
 
-		return true;
-	}
+        return true;
+    }
 
-	/**
-	 * Deletes an announcement
-	 * @param 	int $id The identifier of the announcement that should be
-	 * @return	bool	True on success, false on failure
-	 */
-	public static function delete_announcement($id)
+    /**
+     * Deletes an announcement
+     * @param 	int $id The identifier of the announcement that should be
+     * @return	bool	True on success, false on failure
+     */
+    public static function delete_announcement($id)
     {
-		$db_table = Database :: get_main_table(TABLE_MAIN_SYSTEM_ANNOUNCEMENTS);
-		$id = intval($id);
-		$sql = "DELETE FROM ".$db_table." WHERE id =".$id;
-		$res = Database::query($sql);
-		if ($res === false) {
-
-			return false;
-		}
-		return true;
-	}
-
-	/**
-	 * Gets an announcement
-	 * @param 	int		$id The identifier of the announcement that should be
-	 * @return	object	Object of class StdClass or the required class, containing the query result row
-	 */
-	public static function get_announcement($id)
+        $db_table = Database :: get_main_table(TABLE_MAIN_SYSTEM_ANNOUNCEMENTS);
+        $id = intval($id);
+        $sql = "DELETE FROM ".$db_table." WHERE id =".$id;
+        $res = Database::query($sql);
+        if ($res === false) {
+
+            return false;
+        }
+        return true;
+    }
+
+    /**
+     * Gets an announcement
+     * @param 	int		$id The identifier of the announcement that should be
+     * @return	object	Object of class StdClass or the required class, containing the query result row
+     */
+    public static function get_announcement($id)
     {
-		$db_table = Database :: get_main_table(TABLE_MAIN_SYSTEM_ANNOUNCEMENTS);
-		$id = intval($id);
-		$sql = "SELECT * FROM ".$db_table." WHERE id = ".$id;
-		$announcement = Database::fetch_object(Database::query($sql));
-
-		return $announcement;
-	}
-
-	/**
-	 * Change the visibility of an announcement
-	 * @param 	int $announcement_id
-	 * @param 	int $user For who should the visibility be changed
+        $db_table = Database :: get_main_table(TABLE_MAIN_SYSTEM_ANNOUNCEMENTS);
+        $id = intval($id);
+        $sql = "SELECT * FROM ".$db_table." WHERE id = ".$id;
+        $announcement = Database::fetch_object(Database::query($sql));
+
+        return $announcement;
+    }
+
+    /**
+     * Change the visibility of an announcement
+     * @param 	int $announcement_id
+     * @param 	int $user For who should the visibility be changed
      * (possible values are VISIBLE_TEACHER, VISIBLE_STUDENT, VISIBLE_GUEST)
-	 * @return 	bool	True on success, false on failure
-	 */
-	public static function set_visibility($announcement_id, $user, $visible)
+     * @return 	bool	True on success, false on failure
+     */
+    public static function set_visibility($announcement_id, $user, $visible)
     {
-		$db_table = Database::get_main_table(TABLE_MAIN_SYSTEM_ANNOUNCEMENTS);
-		$visible = intval($visible);
-		$announcement_id = intval($announcement_id);
+        $db_table = Database::get_main_table(TABLE_MAIN_SYSTEM_ANNOUNCEMENTS);
+        $visible = intval($visible);
+        $announcement_id = intval($announcement_id);
 
         if (!in_array($user, array(self::VISIBLE_GUEST, self::VISIBLE_STUDENT, self::VISIBLE_TEACHER))) {
             return false;
         }
 
-		$field = ($user == self::VISIBLE_TEACHER ? 'visible_teacher' : ($user == self::VISIBLE_STUDENT ? 'visible_student' : 'visible_guest'));
+        $field = ($user == self::VISIBLE_TEACHER ? 'visible_teacher' : ($user == self::VISIBLE_STUDENT ? 'visible_student' : 'visible_guest'));
 
-		$sql = "UPDATE ".$db_table." SET ".$field." = '".$visible."'
+        $sql = "UPDATE ".$db_table." SET ".$field." = '".$visible."'
 		        WHERE id='".$announcement_id."'";
-		$res = Database::query($sql);
-
-		if ($res === false) {
-			return false;
-		}
-
-		return true;
-	}
-
-	/**
-	 * Send a system announcement by e-mail to all teachers/students depending on parameters
-	 * @param	string	Title
-	 * @param	string	Content
-	 * @param	int		Whether to send to all teachers (1) or not (0)
-	 * @param	int		Whether to send to all students (1) or not (0)
-	 * @param	string	Language (optional, considered for all languages if left empty)
+        $res = Database::query($sql);
+
+        if ($res === false) {
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * Send a system announcement by e-mail to all teachers/students depending on parameters
+     * @param	string	Title
+     * @param	string	Content
+     * @param	int		Whether to send to all teachers (1) or not (0)
+     * @param	int		Whether to send to all students (1) or not (0)
+     * @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,
@@ -677,7 +677,7 @@ 
         $language = null,
         $sendEmailTest = false
     ) {
-		global $charset;
+        global $charset;
 
         $title = api_html_entity_decode(stripslashes($title), ENT_QUOTES, $charset);
         $content = api_html_entity_decode(stripslashes(str_replace(array('\r\n', '\n', '\r'),'', $content)), ENT_QUOTES, $charset);
@@ -696,22 +696,22 @@ 
         }
 
         if ($teacher <> 0 AND $student == 0) {
-			$sql = "SELECT DISTINCT u.user_id FROM $user_table u $url_condition WHERE status = '1' ";
-		}
+            $sql = "SELECT DISTINCT u.user_id FROM $user_table u $url_condition WHERE status = '1' ";
+        }
 
-		if ($teacher == 0 AND $student <> 0) {
-			$sql = "SELECT DISTINCT u.user_id FROM $user_table u $url_condition WHERE status = '5' ";
-		}
+        if ($teacher == 0 AND $student <> 0) {
+            $sql = "SELECT DISTINCT u.user_id FROM $user_table u $url_condition WHERE status = '5' ";
+        }
 
-		if ($teacher<> 0 AND $student <> 0) {
-			$sql = "SELECT DISTINCT u.user_id FROM $user_table u $url_condition WHERE 1 = 1 ";
-		}
+        if ($teacher<> 0 AND $student <> 0) {
+            $sql = "SELECT DISTINCT u.user_id FROM $user_table u $url_condition WHERE 1 = 1 ";
+        }
 
-		if (!empty($language)) { //special condition because language was already treated for SQL insert before
-			$sql .= " AND language = '".Database::escape_string($language)."' ";
-		}
+        if (!empty($language)) { //special condition because language was already treated for SQL insert before
+            $sql .= " AND language = '".Database::escape_string($language)."' ";
+        }
 
-		if (api_is_multiple_url_enabled()) {
+        if (api_is_multiple_url_enabled()) {
             $sql .= " AND access_url_id = '".$current_access_url_id."' ";
         }
 
@@ -721,25 +721,25 @@ 
         // Expiration date
         $sql .= " AND (expiration_date = '' OR expiration_date IS NULL OR expiration_date > '$now') ";
 
-		if ((empty($teacher) or $teacher == '0') AND  (empty($student) or $student == '0')) {
-			return true;
-		}
+        if ((empty($teacher) or $teacher == '0') AND  (empty($student) or $student == '0')) {
+            return true;
+        }
 
-		$result = Database::query($sql);
-		if ($result === false) {
-			return false;
-		}
+        $result = Database::query($sql);
+        if ($result === false) {
+            return false;
+        }
 
         $message_sent = false;
 
-		while ($row = Database::fetch_array($result,'ASSOC')) {
+        while ($row = Database::fetch_array($result,'ASSOC')) {
             MessageManager::send_message_simple($row['user_id'], $title, $content);
             $message_sent = true;
-		}
-		return $message_sent; //true if at least one e-mail was sent
-	}
+        }
+        return $message_sent; //true if at least one e-mail was sent
+    }
 
-	/**
+    /**
      * Displays announcements as an slideshow
      * @param int $visible VISIBLE_GUEST, VISIBLE_STUDENT or VISIBLE_TEACHER
      * @param int $id The identifier of the announcement to display

main/inc/lib/legal.lib.php

Indentation +91 added lines, -91 removed lines

@@ -15,15 +15,15 @@ 
     {
     }
 
-	/**
-	 * Add a new Term and Condition
-	 * @param int $language language id
-	 * @param string $content content
-	 * @param int $type term and condition type (0 or 1)
-	 * @param string $changes explain changes
-	 * @return boolean success
-	 */
-	public static function add($language, $content, $type, $changes)
+    /**
+     * Add a new Term and Condition
+     * @param int $language language id
+     * @param string $content content
+     * @param int $type term and condition type (0 or 1)
+     * @param string $changes explain changes
+     * @return boolean success
+     */
+    public static function add($language, $content, $type, $changes)
     {
         $legal_table = Database::get_main_table(TABLE_MAIN_LEGAL);
         $last = self::get_last_condition($language);
@@ -96,27 +96,27 @@ 
         }
     }
 
-	/**
-	 * Gets the data 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($language)
+    /**
+     * Gets the data 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($language)
     {
-		$legal_conditions_table = Database::get_main_table(TABLE_MAIN_LEGAL);
-		$language= Database::escape_string($language);
-		$sql = "SELECT * FROM $legal_conditions_table
+        $legal_conditions_table = Database::get_main_table(TABLE_MAIN_LEGAL);
+        $language= Database::escape_string($language);
+        $sql = "SELECT * FROM $legal_conditions_table
                 WHERE language_id = '".$language."'
                 ORDER BY version DESC
                 LIMIT 1 ";
-		$result = Database::query($sql);
-		$result = Database::fetch_array($result, 'ASSOC');
+        $result = Database::query($sql);
+        $result = Database::fetch_array($result, 'ASSOC');
 
         if (isset($result['content'])) {
             $result['content'] = self::replaceTags($result['content']);
         }
         return $result;
-	}
+    }
 
     /**
      * @param string $content
@@ -140,12 +140,12 @@ 
         return $content;
     }
 
-	/**
-	 * Gets the last version of a Term and condition by language
-	 * @param int $language language id
-	 * @return boolean | int the version or false if does not exist
-	 */
-	public static function get_last_version($language)
+    /**
+     * Gets the last version of a Term and condition by language
+     * @param int $language language id
+     * @return boolean | int the version or false if does not exist
+     */
+    public static function get_last_version($language)
     {
         $legal_conditions_table = Database::get_main_table(TABLE_MAIN_LEGAL);
         $language = intval($language);
@@ -163,15 +163,15 @@ 
 
             return false;
         }
-	}
+    }
 
-	/**
-	 * Show the last condition
-	 * @param array $term_preview with type and content i.e array('type'=>'1', 'content'=>'hola');
+    /**
+     * Show the last condition
+     * @param array $term_preview with type and content i.e array('type'=>'1', 'content'=>'hola');
      *
-	 * @return string html preview
-	 */
-	public static function show_last_condition($term_preview)
+     * @return string html preview
+     */
+    public static function show_last_condition($term_preview)
     {
         $preview = '';
         switch ($term_preview['type']) {
@@ -201,37 +201,37 @@ 
             default:
                 break;
         }
-		return 	$preview;
-	}
+        return 	$preview;
+    }
 
-	/**
-	 * Get the terms and condition table (only for maintenance)
-	 * @param int $from
-	 * @param int $number_of_items
-	 * @param int $column
-	 * @return array
-	 */
-	public static function get_legal_data($from, $number_of_items, $column)
+    /**
+     * Get the terms and condition table (only for maintenance)
+     * @param int $from
+     * @param int $number_of_items
+     * @param int $column
+     * @return array
+     */
+    public static function get_legal_data($from, $number_of_items, $column)
     {
-		$legal_conditions_table = Database::get_main_table(TABLE_MAIN_LEGAL);
-		$lang_table = Database::get_main_table(TABLE_MAIN_LANGUAGE);
-		$from = intval($from);
-		$number_of_items = intval($number_of_items);
-		$column = intval($column);
+        $legal_conditions_table = Database::get_main_table(TABLE_MAIN_LEGAL);
+        $lang_table = Database::get_main_table(TABLE_MAIN_LANGUAGE);
+        $from = intval($from);
+        $number_of_items = intval($number_of_items);
+        $column = intval($column);
 
- 		$sql  = "SELECT version, original_name as language, content, changes, type, FROM_UNIXTIME(date)
+            $sql  = "SELECT version, original_name as language, content, changes, type, FROM_UNIXTIME(date)
 				FROM $legal_conditions_table inner join $lang_table l on(language_id = l.id) ";
-		$sql .= "ORDER BY language, version ASC ";
-		$sql .= "LIMIT $from, $number_of_items ";
+        $sql .= "ORDER BY language, version ASC ";
+        $sql .= "LIMIT $from, $number_of_items ";
 
-		$result = Database::query($sql);
-		$legals = array();
-		$versions = array();
-		while ($legal = Database::fetch_array($result)) {
-			// max 2000 chars
-			//echo strlen($legal[1]); echo '<br>';
-			$versions[] = $legal[0];
-			$languages[] = $legal[1];
+        $result = Database::query($sql);
+        $legals = array();
+        $versions = array();
+        while ($legal = Database::fetch_array($result)) {
+            // max 2000 chars
+            //echo strlen($legal[1]); echo '<br>';
+            $versions[] = $legal[0];
+            $languages[] = $legal[1];
             if (strlen($legal[2]) > 2000) {
                 $legal[2] = substr($legal[2], 0, 2000).' ... ';
             }
@@ -240,50 +240,50 @@ 
             } elseif ($legal[4] == 1) {
                 $legal[4] = get_lang('PageLink');
             }
-			$legals[] = $legal;
-		}
-		return $legals;
-	}
+            $legals[] = $legal;
+        }
+        return $legals;
+    }
 
-	/**
-	 * Gets the number of terms and conditions available
-	 * @return int
-	 */
-	public static function count()
+    /**
+     * Gets the number of terms and conditions available
+     * @return int
+     */
+    public static function count()
     {
-		$legal_conditions_table = Database::get_main_table(TABLE_MAIN_LEGAL);
-		$sql = "SELECT count(*) as count_result
+        $legal_conditions_table = Database::get_main_table(TABLE_MAIN_LEGAL);
+        $sql = "SELECT count(*) as count_result
 		        FROM $legal_conditions_table
 		        ORDER BY id DESC ";
-		$result = Database::query($sql);
-		$url = Database::fetch_array($result,'ASSOC');
-		$result = $url['count_result'];
+        $result = Database::query($sql);
+        $url = Database::fetch_array($result,'ASSOC');
+        $result = $url['count_result'];
 
-		return $result;
-	}
+        return $result;
+    }
 
-	/**
-	 * Get type of terms and conditions
-	 * @param int $legal_id
-	 * @param int $language_id
-	 * @return int The current type of terms and conditions
-	 */
-	public static function get_type_of_terms_and_conditions($legal_id, $language_id)
+    /**
+     * Get type of terms and conditions
+     * @param int $legal_id
+     * @param int $language_id
+     * @return int The current type of terms and conditions
+     */
+    public static function get_type_of_terms_and_conditions($legal_id, $language_id)
     {
-		$legal_conditions_table = Database::get_main_table(TABLE_MAIN_LEGAL);
-		$legal_id = intval($legal_id);
-		$language_id = intval($language_id);
-		$sql = 'SELECT type FROM '.$legal_conditions_table.'
+        $legal_conditions_table = Database::get_main_table(TABLE_MAIN_LEGAL);
+        $legal_id = intval($legal_id);
+        $language_id = intval($language_id);
+        $sql = 'SELECT type FROM '.$legal_conditions_table.'
 		        WHERE id =  "'.$legal_id.'" AND language_id="'.$language_id.'"';
-		$rs = Database::query($sql);
+        $rs = Database::query($sql);
 
-		return Database::result($rs,0,'type');
-	}
+        return Database::result($rs,0,'type');
+    }
 
     /**
      * @param int $userId
      */
-	public static function sendLegal($userId)
+    public static function sendLegal($userId)
     {
         $subject = get_lang('SendTermsSubject');
         $content = sprintf(

main/gradebook/lib/be/studentpublicationlink.class.php

Indentation +246 added lines, -246 removed lines

@@ -8,101 +8,101 @@ 
  */
 class StudentPublicationLink extends AbstractLink
 {
-	private $studpub_table = null;
-	private $itemprop_table = null;
-
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		parent::__construct();
-		$this->set_type(LINK_STUDENTPUBLICATION);
-	}
-
-	/**
-	 *
-	 * Returns the URL of a document
-	 * This function is loaded when using a gradebook as a tab (gradebook = -1)
-	 * see issue #2705
-	 *
-	 */
-	public function get_view_url($stud_id)
-	{
-		// find a file uploaded by the given student,
-		// with the same title as the evaluation name
-
-		$eval = $this->get_evaluation();
-		$stud_id = intval($stud_id);
-
-		$sql = 'SELECT pub.url
+    private $studpub_table = null;
+    private $itemprop_table = null;
+
+    /**
+     * Constructor
+     */
+    public function __construct()
+    {
+        parent::__construct();
+        $this->set_type(LINK_STUDENTPUBLICATION);
+    }
+
+    /**
+     *
+     * Returns the URL of a document
+     * This function is loaded when using a gradebook as a tab (gradebook = -1)
+     * see issue #2705
+     *
+     */
+    public function get_view_url($stud_id)
+    {
+        // find a file uploaded by the given student,
+        // with the same title as the evaluation name
+
+        $eval = $this->get_evaluation();
+        $stud_id = intval($stud_id);
+
+        $sql = 'SELECT pub.url
 				FROM '.$this->get_itemprop_table().' prop, '.$this->get_studpub_table().' pub'
-			." WHERE
+            ." WHERE
 					prop.c_id = ".$this->course_id." AND
 					pub.c_id = ".$this->course_id." AND
 					prop.tool = 'work'"
-			.' AND prop.insert_user_id = '.$stud_id
-			.' AND prop.ref = pub.id'
-			." AND pub.title = '".Database::escape_string($eval->get_name())."' AND pub.session_id=".api_get_session_id()."";
-
-		$result = Database::query($sql);
-		if ($fileurl = Database::fetch_row($result)) {
-			return null;
-		} else {
-			return null;
-		}
-	}
-
-	public function get_type_name()
-	{
-		return get_lang('Works');
-	}
-
-	public function is_allowed_to_change_name()
-	{
-		return false;
-	}
-
-	/**
-	 * Generate an array of exercises that a teacher hasn't created a link for.
-	 * @return array 2-dimensional array - every element contains 2 subelements (id, name)
-	 */
-	public function get_not_created_links()
-	{
-		return false;
-		if (empty($this->course_code)) {
-			die('Error in get_not_created_links() : course code not set');
-		}
-		$tbl_grade_links = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_LINK);
-
-		$sql = 'SELECT id, url from '.$this->get_studpub_table()
-			.' pup WHERE c_id = '.$this->course_id.' AND has_properties != '."''".' AND id NOT IN'
-			.' (SELECT ref_id FROM '.$tbl_grade_links
-			.' WHERE type = '.LINK_STUDENTPUBLICATION
-			." AND course_code = '".Database::escape_string($this->get_course_code())."'"
-			.') AND pub.session_id='.api_get_session_id().'';
-
-		$result = Database::query($sql);
-
-		$cats=array();
-		while ($data=Database::fetch_array($result)) {
-			$cats[] = array ($data['id'], $data['url']);
-		}
-		return $cats;
-	}
-
-	/**
-	 * Generate an array of all exercises available.
-	 * @return array 2-dimensional array - every element contains 2 subelements (id, name)
-	 */
-	public function get_all_links()
-	{
-		if (empty($this->course_code)) {
-			die('Error in get_not_created_links() : course code not set');
-		}
-		$em = Database::getManager();
+            .' AND prop.insert_user_id = '.$stud_id
+            .' AND prop.ref = pub.id'
+            ." AND pub.title = '".Database::escape_string($eval->get_name())."' AND pub.session_id=".api_get_session_id()."";
+
+        $result = Database::query($sql);
+        if ($fileurl = Database::fetch_row($result)) {
+            return null;
+        } else {
+            return null;
+        }
+    }
+
+    public function get_type_name()
+    {
+        return get_lang('Works');
+    }
+
+    public function is_allowed_to_change_name()
+    {
+        return false;
+    }
+
+    /**
+     * Generate an array of exercises that a teacher hasn't created a link for.
+     * @return array 2-dimensional array - every element contains 2 subelements (id, name)
+     */
+    public function get_not_created_links()
+    {
+        return false;
+        if (empty($this->course_code)) {
+            die('Error in get_not_created_links() : course code not set');
+        }
+        $tbl_grade_links = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_LINK);
+
+        $sql = 'SELECT id, url from '.$this->get_studpub_table()
+            .' pup WHERE c_id = '.$this->course_id.' AND has_properties != '."''".' AND id NOT IN'
+            .' (SELECT ref_id FROM '.$tbl_grade_links
+            .' WHERE type = '.LINK_STUDENTPUBLICATION
+            ." AND course_code = '".Database::escape_string($this->get_course_code())."'"
+            .') AND pub.session_id='.api_get_session_id().'';
+
+        $result = Database::query($sql);
+
+        $cats=array();
+        while ($data=Database::fetch_array($result)) {
+            $cats[] = array ($data['id'], $data['url']);
+        }
+        return $cats;
+    }
+
+    /**
+     * Generate an array of all exercises available.
+     * @return array 2-dimensional array - every element contains 2 subelements (id, name)
+     */
+    public function get_all_links()
+    {
+        if (empty($this->course_code)) {
+            die('Error in get_not_created_links() : course code not set');
+        }
+        $em = Database::getManager();
         $session = $em->find('ChamiloCoreBundle:Session', api_get_session_id());
-		/*
+        /*
         if (empty($session_id)) {
             $session_condition = api_get_session_condition(0, true);
         } else {
@@ -111,8 +111,8 @@ 
         $sql = "SELECT id, url, title FROM $tbl_grade_links
                 WHERE c_id = {$this->course_id}  AND filetype='folder' AND active = 1 $session_condition ";*/
 
-		//Only show works from the session
-		//AND has_properties != ''
+        //Only show works from the session
+        //AND has_properties != ''
         $links = $em
             ->getRepository('ChamiloCourseBundle:CStudentPublication')
             ->findBy([
@@ -123,22 +123,22 @@ 
             ]);
 
         foreach ($links as $data) {
-			$work_name = $data->getTitle();
-			if (empty($work_name)) {
-				$work_name = basename($data->getUrl());
-			}
-			$cats[] = array ($data->getId(), $work_name);
-		}
-		$cats=isset($cats) ? $cats : array();
-		return $cats;
-	}
-
-	/**
-	 * Has anyone done this exercise yet ?
-	 */
-	public function has_results()
-	{
-	    $em = Database::getManager();
+            $work_name = $data->getTitle();
+            if (empty($work_name)) {
+                $work_name = basename($data->getUrl());
+            }
+            $cats[] = array ($data->getId(), $work_name);
+        }
+        $cats=isset($cats) ? $cats : array();
+        return $cats;
+    }
+
+    /**
+     * Has anyone done this exercise yet ?
+     */
+    public function has_results()
+    {
+        $em = Database::getManager();
         $session = $em->find('ChamiloCoreBundle:Session', api_get_session_id());
         $results = $em
             ->getRepository('ChamiloCourseBundle:CStudentPublication')
@@ -149,15 +149,15 @@ 
             ]);
 
         return count($results) != 0;
-	}
-
-	/**
-	 * @param null $stud_id
-	 * @return array|null
-	 */
-	public function calc_score($stud_id = null, $type = null)
-	{
-		$stud_id = intval($stud_id);
+    }
+
+    /**
+     * @param null $stud_id
+     * @return array|null
+     */
+    public function calc_score($stud_id = null, $type = null)
+    {
+        $stud_id = intval($stud_id);
         $em = Database::getManager();
 
         $session = $em->find('ChamiloCoreBundle:Session', api_get_session_id());
@@ -172,7 +172,7 @@ 
 
         $parentId = !$assignment ? 0 : $assignment->getId();
 
-		$dql = 'SELECT a FROM ChamiloCourseBundle:CStudentPublication a
+        $dql = 'SELECT a FROM ChamiloCourseBundle:CStudentPublication a
     			WHERE
     				a.cId = :course AND
     				active = 1 AND
@@ -182,31 +182,31 @@ 
 				';
         $params = ['course' => $this->course_id, 'parent' => $parentId, 'session' => $session];
 
-		if (!empty($stud_id)) {
-		    $dql .= ' AND a.userId = :student ';
+        if (!empty($stud_id)) {
+            $dql .= ' AND a.userId = :student ';
             $params['student'] = $stud_id;
-		}
-
-		$order = api_get_setting('student_publication_to_take_in_gradebook');
-
-		switch ($order) {
-			case 'last':
-				// latest attempt
-				$dql .= ' ORDER BY a.sentDate DESC';
-				break;
-			case 'first':
-			default:
-				// first attempt
-				$dql .= ' ORDER BY a.id';
-				break;
-		}
+        }
+
+        $order = api_get_setting('student_publication_to_take_in_gradebook');
+
+        switch ($order) {
+            case 'last':
+                // latest attempt
+                $dql .= ' ORDER BY a.sentDate DESC';
+                break;
+            case 'first':
+            default:
+                // first attempt
+                $dql .= ' ORDER BY a.id';
+                break;
+        }
 
         $scores = $em->createQuery($dql)->execute([$params]);
 
-		// for 1 student
-		if (!empty($stud_id)) {
-		    if (!count($scores)) {
-		        return '';
+        // for 1 student
+        if (!empty($stud_id)) {
+            if (!count($scores)) {
+                return '';
             }
 
             $data = $scores[0];
@@ -215,7 +215,7 @@ 
                 $data->getQualification(),
                 $assignment->getQualification()
             ];
-		}
+        }
 
         $students = array();  // user list, needed to make sure we only
         // take first attempts into account
@@ -259,116 +259,116 @@ 
                 return array($sum, $rescount);
                 break;
         }
-	}
-
-	/**
-	 * Lazy load function to get the database table of the student publications
-	 */
-	private function get_studpub_table()
-	{
-		return $this->studpub_table = Database :: get_course_table(TABLE_STUDENT_PUBLICATION);
-	}
-
-	/**
-	 * Lazy load function to get the database table of the item properties
-	 */
-	private function get_itemprop_table()
-	{
-		return $this->itemprop_table = Database :: get_course_table(TABLE_ITEM_PROPERTY);
-	}
-
-	public function needs_name_and_description()
-	{
-		return false;
-	}
-
-	public function get_name()
-	{
-		$this->get_exercise_data();
-		return (isset($this->exercise_data['title']) && !empty($this->exercise_data['title'])) ? $this->exercise_data['title'] : get_lang('Untitled');
-	}
-
-	public function get_description()
-	{
-		$this->get_exercise_data();
-		return isset($this->exercise_data['description']) ? $this->exercise_data['description'] : null;
-	}
-
-	public function get_test_id()
-	{
-		return 'DEBUG:ID';
-	}
-
-	public function get_link()
-	{
-		$session_id = api_get_session_id();
-		$url = api_get_path(WEB_PATH).'main/work/work.php?'.api_get_cidreq_params($this->get_course_code(), $session_id).'&id='.$this->exercise_data['id'].'&gradebook=view';
-
-		return $url;
-	}
-
-	private function get_exercise_data()
-	{
-		$tbl_name = $this->get_studpub_table();
-		$course_info = api_get_course_info($this->get_course_code());
-		if ($tbl_name=='') {
-			return false;
-		} elseif (!isset($this->exercise_data)) {
-			$sql = 'SELECT * FROM '.$this->get_studpub_table()."
+    }
+
+    /**
+     * Lazy load function to get the database table of the student publications
+     */
+    private function get_studpub_table()
+    {
+        return $this->studpub_table = Database :: get_course_table(TABLE_STUDENT_PUBLICATION);
+    }
+
+    /**
+     * Lazy load function to get the database table of the item properties
+     */
+    private function get_itemprop_table()
+    {
+        return $this->itemprop_table = Database :: get_course_table(TABLE_ITEM_PROPERTY);
+    }
+
+    public function needs_name_and_description()
+    {
+        return false;
+    }
+
+    public function get_name()
+    {
+        $this->get_exercise_data();
+        return (isset($this->exercise_data['title']) && !empty($this->exercise_data['title'])) ? $this->exercise_data['title'] : get_lang('Untitled');
+    }
+
+    public function get_description()
+    {
+        $this->get_exercise_data();
+        return isset($this->exercise_data['description']) ? $this->exercise_data['description'] : null;
+    }
+
+    public function get_test_id()
+    {
+        return 'DEBUG:ID';
+    }
+
+    public function get_link()
+    {
+        $session_id = api_get_session_id();
+        $url = api_get_path(WEB_PATH).'main/work/work.php?'.api_get_cidreq_params($this->get_course_code(), $session_id).'&id='.$this->exercise_data['id'].'&gradebook=view';
+
+        return $url;
+    }
+
+    private function get_exercise_data()
+    {
+        $tbl_name = $this->get_studpub_table();
+        $course_info = api_get_course_info($this->get_course_code());
+        if ($tbl_name=='') {
+            return false;
+        } elseif (!isset($this->exercise_data)) {
+            $sql = 'SELECT * FROM '.$this->get_studpub_table()."
 					WHERE
 					 	c_id ='".$course_info['real_id']."' AND
 					 	id = '".intval($this->get_ref_id())."' ";
-			$query = Database::query($sql);
-			$this->exercise_data = Database::fetch_array($query);
-		}
-		return $this->exercise_data;
-	}
-
-	public function needs_max()
-	{
-		return false;
-	}
-
-	public function needs_results()
-	{
-		return false;
-	}
-
-	public function is_valid_link()
-	{
-		$sql = 'SELECT count(id) FROM '.$this->get_studpub_table().'
+            $query = Database::query($sql);
+            $this->exercise_data = Database::fetch_array($query);
+        }
+        return $this->exercise_data;
+    }
+
+    public function needs_max()
+    {
+        return false;
+    }
+
+    public function needs_results()
+    {
+        return false;
+    }
+
+    public function is_valid_link()
+    {
+        $sql = 'SELECT count(id) FROM '.$this->get_studpub_table().'
     			WHERE c_id = "'.$this->course_id.'" AND id = '.intval($this->get_ref_id()).'';
-		$result = Database::query($sql);
-		$number = Database::fetch_row($result);
-		return ($number[0] != 0);
-	}
-
-	public function get_icon_name()
-	{
-		return 'studentpublication';
-	}
-
-	public function save_linked_data()
-	{
-		$weight = (float)$this->get_weight();
-		$ref_id = $this->get_ref_id();
-
-		if (!empty($ref_id)) {
-			//Cleans works
-			$sql = 'UPDATE '.$this->get_studpub_table().' SET weight= '.$weight.'
+        $result = Database::query($sql);
+        $number = Database::fetch_row($result);
+        return ($number[0] != 0);
+    }
+
+    public function get_icon_name()
+    {
+        return 'studentpublication';
+    }
+
+    public function save_linked_data()
+    {
+        $weight = (float)$this->get_weight();
+        $ref_id = $this->get_ref_id();
+
+        if (!empty($ref_id)) {
+            //Cleans works
+            $sql = 'UPDATE '.$this->get_studpub_table().' SET weight= '.$weight.'
                     WHERE c_id = '.$this->course_id.' AND id ='.$ref_id;
-			Database::query($sql);
-		}
-	}
-
-	public function delete_linked_data()
-	{
-		$ref_id = $this->get_ref_id();
-		if (!empty($ref_id)) {
-			//Cleans works
-			$sql = 'UPDATE '.$this->get_studpub_table().' SET weight=0
+            Database::query($sql);
+        }
+    }
+
+    public function delete_linked_data()
+    {
+        $ref_id = $this->get_ref_id();
+        if (!empty($ref_id)) {
+            //Cleans works
+            $sql = 'UPDATE '.$this->get_studpub_table().' SET weight=0
                     WHERE c_id = '.$this->course_id.' AND id ='.$ref_id;
-			Database::query($sql);
-		}
-	}
+            Database::query($sql);
+        }
+    }
 }

main/social/profile.php

Indentation +1 added lines, -1 removed lines

@@ -607,7 +607,7 @@
                                 .' width="40px">';
                     $userInfo = api_get_user_info($user_invitation_id);
                     $invitations .= '<a href="'.api_get_path(WEB_PATH).'main/social/profile.php?u='.$user_invitation_id.'">'
-                                 .api_get_person_name($userInfo['firstname'],$userInfo['lastname']).'</a>';
+                                    .api_get_person_name($userInfo['firstname'],$userInfo['lastname']).'</a>';
                     
                     $invitations .='<div class="pull-right">';
                     $invitations .=  '<a title="'.get_lang('SocialAddToFriends').'" id="btn_accepted_'.$user_invitation_id.'" class="btn btn-default btn-sm" onclick="register_friend(this)" href="javascript:void(0)">'

plugin/vchamilo/lib/Virtual.php

Indentation +21 added lines, -21 removed lines

@@ -137,11 +137,11 @@ 
     }
 
     /**
-    * provides a side connection to a vchamilo database
-    * @param array $_configuration
+     * provides a side connection to a vchamilo database
+     * @param array $_configuration
      *
-    * @return \Doctrine\DBAL\Driver\Connection
-    */
+     * @return \Doctrine\DBAL\Driver\Connection
+     */
     public static function bootConnection(&$_configuration)
     {
         $dbParams = array(
@@ -249,10 +249,10 @@ 
     }
 
     /**
-    * drop a vchamilo instance databases using the physical connection
-    * @param stdClass $params
-    * return an array of errors or false if ok
-    */
+     * drop a vchamilo instance databases using the physical connection
+     * @param stdClass $params
+     * return an array of errors or false if ok
+     */
     public static function dropDatabase($params)
     {
         $params = clone $params;
@@ -302,10 +302,10 @@ 
     }
 
     /**
-    * get a proper SQLdump command
-    * @param object $vmoodledata the complete new host information
-    * @return string the shell command
-    */
+     * get a proper SQLdump command
+     * @param object $vmoodledata the complete new host information
+     * @return string the shell command
+     */
     public static function getDatabaseDumpCmd($vchamilodata)
     {
         $pgm = self::getConfig('vchamilo', 'mysql_cmd');
@@ -469,8 +469,8 @@ 
     }
 
     /**
-    * read manifest values in vchamilo template.
-    */
+     * read manifest values in vchamilo template.
+     */
     public static function getVmanifest($version)
     {
         $file = api_get_path(SYS_PATH).'/plugin/vchamilo/templates/'.$version.'/manifest.php';
@@ -490,8 +490,8 @@ 
     }
 
     /**
-    * make a fake vchamilo that represents the current host
-    */
+     * make a fake vchamilo that represents the current host
+     */
     public static function makeThis()
     {
         global $_configuration;
@@ -556,11 +556,11 @@ 
     }
 
     /**
-    * this function set will map standard moodle API calls to chamilo
-    * internal primitives. This avoids too many changes to do in imported
-    * code
-    *
-    */
+     * this function set will map standard moodle API calls to chamilo
+     * internal primitives. This avoids too many changes to do in imported
+     * code
+     *
+     */
     public static function getConfig($module, $key, $isplugin = true)
     {
         if ($isplugin) {

main/calendar/ical_export.php

Indentation +1 added lines, -1 removed lines

@@ -43,7 +43,7 @@
 $event = $agenda->get_event($id);
 
 if (!empty($event)) {
-	define('ICAL_LANG', api_get_language_isocode());
+    define('ICAL_LANG', api_get_language_isocode());
 
     $ical = new vcalendar();
     $ical->setConfig('unique_id',api_get_path(WEB_PATH));