chamilo / chamilo-lms

main/exercise/hotspot.class.php

Indentation +98 added lines, -98 removed lines

@@ -12,31 +12,31 @@ 
  **/
 class HotSpot extends Question
 {
-	public static $typePicture = 'hotspot.png';
-	public static $explanationLangVar = 'HotSpot';
+    public static $typePicture = 'hotspot.png';
+    public static $explanationLangVar = 'HotSpot';
 
     /**
      * HotSpot constructor.
      */
-	public function __construct()
-	{
-		parent::__construct();
-		$this->type = HOT_SPOT;
-	}
-
-	public function display()
-	{
-	}
-
-	/**
-	 * @param FormValidator $form
-	 * @param int $fck_config
-	 */
-	public function createForm (&$form, $fck_config=0)
-	{
-		parent::createForm($form, $fck_config);
-
-		if (!isset($_GET['editQuestion'])) {
+    public function __construct()
+    {
+        parent::__construct();
+        $this->type = HOT_SPOT;
+    }
+
+    public function display()
+    {
+    }
+
+    /**
+     * @param FormValidator $form
+     * @param int $fck_config
+     */
+    public function createForm (&$form, $fck_config=0)
+    {
+        parent::createForm($form, $fck_config);
+
+        if (!isset($_GET['editQuestion'])) {
             $form->addElement(
                 'file',
                 'imageUpload',
@@ -46,54 +46,54 @@ 
                 )
             );
 
-			// setting the save button here and not in the question class.php
-			// Saving a question
-			$form->addButtonSave(get_lang('GoToQuestion'), 'submitQuestion');
-			//$form->addButtonSave(get_lang('GoToQuestion'), 'submitQuestion');
-			$form->addRule('imageUpload', get_lang('OnlyImagesAllowed'), 'filetype', array ('jpg', 'jpeg', 'png', 'gif'));
-			$form->addRule('imageUpload', get_lang('NoImage'), 'uploadedfile');
-		} else {
-			// setting the save button here and not in the question class.php
-			// Editing a question
-			$form->addButtonUpdate(get_lang('ModifyExercise'), 'submitQuestion');
-		}
-	}
-
-	/**
-	 * @param FormValidator $form
-	 * @param null $objExercise
-	 * @return null|false
-	 */
-	public function processCreation($form, $objExercise = null)
-	{
-		$file_info = $form->getSubmitValue('imageUpload');
-		$_course = api_get_course_info();
-		parent::processCreation($form, $objExercise);
-
-		if(!empty($file_info['tmp_name'])) {
-			$this->uploadPicture($file_info['tmp_name'], $file_info['name']);
-			$documentPath  = api_get_path(SYS_COURSE_PATH).$_course['path'].'/document';
-			$picturePath   = $documentPath.'/images';
-
-			// fixed width ang height
-			if (file_exists($picturePath.'/'.$this->picture)) {
-				$this->resizePicture('width', 800);
-				$this->save();
-			} else {
-				return false;
-			}
-		}
-	}
-
-	function createAnswersForm($form)
-	{
-		// nothing
-	}
-
-	function processAnswersCreation($form)
-	{
-		// nothing
-	}
+            // setting the save button here and not in the question class.php
+            // Saving a question
+            $form->addButtonSave(get_lang('GoToQuestion'), 'submitQuestion');
+            //$form->addButtonSave(get_lang('GoToQuestion'), 'submitQuestion');
+            $form->addRule('imageUpload', get_lang('OnlyImagesAllowed'), 'filetype', array ('jpg', 'jpeg', 'png', 'gif'));
+            $form->addRule('imageUpload', get_lang('NoImage'), 'uploadedfile');
+        } else {
+            // setting the save button here and not in the question class.php
+            // Editing a question
+            $form->addButtonUpdate(get_lang('ModifyExercise'), 'submitQuestion');
+        }
+    }
+
+    /**
+     * @param FormValidator $form
+     * @param null $objExercise
+     * @return null|false
+     */
+    public function processCreation($form, $objExercise = null)
+    {
+        $file_info = $form->getSubmitValue('imageUpload');
+        $_course = api_get_course_info();
+        parent::processCreation($form, $objExercise);
+
+        if(!empty($file_info['tmp_name'])) {
+            $this->uploadPicture($file_info['tmp_name'], $file_info['name']);
+            $documentPath  = api_get_path(SYS_COURSE_PATH).$_course['path'].'/document';
+            $picturePath   = $documentPath.'/images';
+
+            // fixed width ang height
+            if (file_exists($picturePath.'/'.$this->picture)) {
+                $this->resizePicture('width', 800);
+                $this->save();
+            } else {
+                return false;
+            }
+        }
+    }
+
+    function createAnswersForm($form)
+    {
+        // nothing
+    }
+
+    function processAnswersCreation($form)
+    {
+        // nothing
+    }
 }
 
 /**
@@ -101,38 +101,38 @@ 
  */
 class HotSpotDelineation extends HotSpot
 {
-	public static $typePicture = 'hotspot-delineation.png';
-	public static $explanationLangVar = 'HotspotDelineation';
+    public static $typePicture = 'hotspot-delineation.png';
+    public static $explanationLangVar = 'HotspotDelineation';
 
     /**
      * HotSpotDelineation constructor.
      */
-	public function __construct()
-	{
-		parent::__construct();
-		$this -> type = HOT_SPOT_DELINEATION;
-
-	}
-
-	function createForm(&$form, $fck_config=0)
-	{
-		parent::createForm ($form, $fck_config);
-	}
-
-	function processCreation ($form, $objExercise = null)
-	{
-		$file_info = $form -> getSubmitValue('imageUpload');
-		parent::processCreation ($form, $objExercise);
-	}
-
-	function createAnswersForm ($form)
-	{
-		parent::createAnswersForm ($form);
-	}
-
-	function processAnswersCreation ($form)
-	{
-		parent::processAnswersCreation ($form);
-	}
+    public function __construct()
+    {
+        parent::__construct();
+        $this -> type = HOT_SPOT_DELINEATION;
+
+    }
+
+    function createForm(&$form, $fck_config=0)
+    {
+        parent::createForm ($form, $fck_config);
+    }
+
+    function processCreation ($form, $objExercise = null)
+    {
+        $file_info = $form -> getSubmitValue('imageUpload');
+        parent::processCreation ($form, $objExercise);
+    }
+
+    function createAnswersForm ($form)
+    {
+        parent::createAnswersForm ($form);
+    }
+
+    function processAnswersCreation ($form)
+    {
+        parent::processAnswersCreation ($form);
+    }
 }
 

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/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/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));

main/admin/ldap_users_list.php

Indentation +132 added lines, -132 removed lines

@@ -20,7 +20,7 @@ 
 // Login as ...
 if ($action == "login_as" && !empty ($login_as_user_id))
 {
-	login_user($login_as_user_id);
+    login_user($login_as_user_id);
 }
 
 //if we already have a session id and a user...
@@ -37,150 +37,150 @@ 
 
 if (isset ($_GET['action']))
 {
-	$check = Security::check_token('get');
-	if($check)
-	{
-		switch ($_GET['action'])
-		{
-			case 'show_message' :
-				Display :: display_header($tool_name);
-				Display :: display_normal_message($_GET['message']);
-				break;
-			case 'delete_user' :
-				Display :: display_header($tool_name);
-				if ($user_id != $_user['user_id'] && UserManager :: delete_user($_GET['user_id']))
-				{
-					Display :: display_normal_message(get_lang('UserDeleted'));
-				}
-				else
-				{
-					Display :: display_error_message(get_lang('CannotDeleteUser'));
-				}
-				break;
-			case 'lock' :
-				Display :: display_header($tool_name);
-				$message=lock_unlock_user('lock',$_GET['user_id']);
-				Display :: display_normal_message($message);
-				break;
-			case 'unlock';
-				Display :: display_header($tool_name);
-				$message=lock_unlock_user('unlock',$_GET['user_id']);
-				Display :: display_normal_message($message);
-				break;
-			case 'add_user';
-				$id=$_GET['id'];
-				$UserList=array();
-				$userid_match_login = array();
-				foreach ($id as $user_id) {
-					$tmp = ldap_add_user($user_id);
-					$UserList[]= $tmp;
-					$userid_match_login[$tmp] = $user_id;
-				}
-				if (isset($_GET['id_session']) && ($_GET['id_session'] == strval(intval($_GET['id_session']))) && ($_GET['id_session']>0)) {
-					ldap_add_user_to_session($UserList, $_GET['id_session']);
-					header('Location: resume_session.php?id_session='.intval($_GET['id_session']));
-				} else {
-					Display :: display_header($tool_name);
-					if(count($userid_match_login)>0)
-					{
-						$message=get_lang('LDAPUsersAddedOrUpdated').':<br />';
-						foreach($userid_match_login as $user_id => $login)
-						{
-							$message .= '- '.$login.'<br />';
-						}
-					}
-					else
-					{
-						$message=get_lang('NoUserAdded');
-					}
-					Display :: display_normal_message($message,false);
-				}
-				break;
-			default :
-				Display :: display_header($tool_name);
-		}
-		Security::clear_token();
-	}
-	else
-	{
-		Display::display_header($tool_name);
-	}
+    $check = Security::check_token('get');
+    if($check)
+    {
+        switch ($_GET['action'])
+        {
+            case 'show_message' :
+                Display :: display_header($tool_name);
+                Display :: display_normal_message($_GET['message']);
+                break;
+            case 'delete_user' :
+                Display :: display_header($tool_name);
+                if ($user_id != $_user['user_id'] && UserManager :: delete_user($_GET['user_id']))
+                {
+                    Display :: display_normal_message(get_lang('UserDeleted'));
+                }
+                else
+                {
+                    Display :: display_error_message(get_lang('CannotDeleteUser'));
+                }
+                break;
+            case 'lock' :
+                Display :: display_header($tool_name);
+                $message=lock_unlock_user('lock',$_GET['user_id']);
+                Display :: display_normal_message($message);
+                break;
+            case 'unlock';
+                Display :: display_header($tool_name);
+                $message=lock_unlock_user('unlock',$_GET['user_id']);
+                Display :: display_normal_message($message);
+                break;
+            case 'add_user';
+                $id=$_GET['id'];
+                $UserList=array();
+                $userid_match_login = array();
+                foreach ($id as $user_id) {
+                    $tmp = ldap_add_user($user_id);
+                    $UserList[]= $tmp;
+                    $userid_match_login[$tmp] = $user_id;
+                }
+                if (isset($_GET['id_session']) && ($_GET['id_session'] == strval(intval($_GET['id_session']))) && ($_GET['id_session']>0)) {
+                    ldap_add_user_to_session($UserList, $_GET['id_session']);
+                    header('Location: resume_session.php?id_session='.intval($_GET['id_session']));
+                } else {
+                    Display :: display_header($tool_name);
+                    if(count($userid_match_login)>0)
+                    {
+                        $message=get_lang('LDAPUsersAddedOrUpdated').':<br />';
+                        foreach($userid_match_login as $user_id => $login)
+                        {
+                            $message .= '- '.$login.'<br />';
+                        }
+                    }
+                    else
+                    {
+                        $message=get_lang('NoUserAdded');
+                    }
+                    Display :: display_normal_message($message,false);
+                }
+                break;
+            default :
+                Display :: display_header($tool_name);
+        }
+        Security::clear_token();
+    }
+    else
+    {
+        Display::display_header($tool_name);
+    }
 }
 else
 {
-	Display::display_header($tool_name);
+    Display::display_header($tool_name);
 }
 if (isset ($_POST['action']))
 {
-	$check = Security::check_token('get');
-	if($check)
-	{
-		switch ($_POST['action'])
-		{
-			case 'delete' :
-				$number_of_selected_users = count($_POST['id']);
-				$number_of_deleted_users = 0;
-				foreach ($_POST['id'] as $index => $user_id)
-				{
-					if($user_id != $_user['user_id'])
-					{
-						if(UserManager :: delete_user($user_id))
-						{
-							$number_of_deleted_users++;
-						}
-					}
-				}
-				if($number_of_selected_users == $number_of_deleted_users)
-				{
-					Display :: display_normal_message(get_lang('SelectedUsersDeleted'));
-				}
-				else
-				{
-					Display :: display_error_message(get_lang('SomeUsersNotDeleted'));
-				}
-				break;
-			case 'add_user' :
-				$number_of_selected_users = count($_POST['id']);
-				$number_of_added_users = 0;
-				$UserList=array();
-				foreach ($_POST['id'] as $index => $user_id)
-				{
-					if($user_id != $_user['user_id'])
-					{
-						$UserList[] = ldap_add_user($user_id);
-					}
-				}
-				if (isset($_GET['id_session']) && (trim($_GET['id_session'])!=""))
-					addUserToSession($UserList, $_GET['id_session']);
-				if(count($UserList)>0)
-				{
-					Display :: display_normal_message(count($UserList)." ".get_lang('LDAPUsersAdded'));
-				}
-				else
-				{
-					Display :: display_normal_message(get_lang('NoUserAdded'));
-				}
-				break;
+    $check = Security::check_token('get');
+    if($check)
+    {
+        switch ($_POST['action'])
+        {
+            case 'delete' :
+                $number_of_selected_users = count($_POST['id']);
+                $number_of_deleted_users = 0;
+                foreach ($_POST['id'] as $index => $user_id)
+                {
+                    if($user_id != $_user['user_id'])
+                    {
+                        if(UserManager :: delete_user($user_id))
+                        {
+                            $number_of_deleted_users++;
+                        }
+                    }
+                }
+                if($number_of_selected_users == $number_of_deleted_users)
+                {
+                    Display :: display_normal_message(get_lang('SelectedUsersDeleted'));
+                }
+                else
+                {
+                    Display :: display_error_message(get_lang('SomeUsersNotDeleted'));
+                }
+                break;
+            case 'add_user' :
+                $number_of_selected_users = count($_POST['id']);
+                $number_of_added_users = 0;
+                $UserList=array();
+                foreach ($_POST['id'] as $index => $user_id)
+                {
+                    if($user_id != $_user['user_id'])
+                    {
+                        $UserList[] = ldap_add_user($user_id);
+                    }
+                }
+                if (isset($_GET['id_session']) && (trim($_GET['id_session'])!=""))
+                    addUserToSession($UserList, $_GET['id_session']);
+                if(count($UserList)>0)
+                {
+                    Display :: display_normal_message(count($UserList)." ".get_lang('LDAPUsersAdded'));
+                }
+                else
+                {
+                    Display :: display_normal_message(get_lang('NoUserAdded'));
+                }
+                break;
 
-		}
-		Security::clear_token();
-	}
+        }
+        Security::clear_token();
+    }
 }
 
 $form = new FormValidator('advanced_search','get');
 $form->addText('keyword_username',get_lang('LoginName'),false);
 if (api_is_western_name_order())
 {
-	$form->addText('keyword_firstname', get_lang('FirstName'), false);
-	$form->addText('keyword_lastname', get_lang('LastName'), false);
+    $form->addText('keyword_firstname', get_lang('FirstName'), false);
+    $form->addText('keyword_lastname', get_lang('LastName'), false);
 }
 else
 {
-	$form->addText('keyword_lastname',get_lang('LastName'),false);
-	$form->addText('keyword_firstname',get_lang('FirstName'),false);
+    $form->addText('keyword_lastname',get_lang('LastName'),false);
+    $form->addText('keyword_firstname',get_lang('FirstName'),false);
 }
 if (isset($_GET['id_session']))
-	$form->addElement('hidden','id_session',$_GET['id_session']);
+    $form->addElement('hidden','id_session',$_GET['id_session']);
 
 $type = array();
 $type["all"] = get_lang('All');
@@ -202,7 +202,7 @@ 
 $parameters['keyword_lastname'] = @$_GET['keyword_lastname'] ?: null;
 $parameters['keyword_email'] = @$_GET['keyword_email'] ?: null;
 if (isset($_GET['id_session']))
-	$parameters['id_session'] = $_GET['id_session'];
+    $parameters['id_session'] = $_GET['id_session'];
 // Create a sortable table with user-data
 
 $parameters['sec_token'] = Security::get_token();
@@ -212,13 +212,13 @@ 
 $table->set_header(1, get_lang('LoginName'));
 if (api_is_western_name_order())
 {
-	$table->set_header(2, get_lang('FirstName'));
-	$table->set_header(3, get_lang('LastName'));
+    $table->set_header(2, get_lang('FirstName'));
+    $table->set_header(3, get_lang('LastName'));
 }
 else
 {
-	$table->set_header(2, get_lang('LastName'));
-	$table->set_header(3, get_lang('FirstName'));
+    $table->set_header(2, get_lang('LastName'));
+    $table->set_header(3, get_lang('FirstName'));
 }
 $table->set_header(4, get_lang('Email'));
 $table->set_header(5, get_lang('Actions'));