chamilo / chamilo-lms

plugin/tour/config.php

Spacing +3 added lines, -3 removed lines

@@ -9,7 +9,7 @@
 
 define('TABLE_TOUR_LOG', 'plugin_tour_log');
 
-require_once api_get_path(SYS_PATH) . 'main/inc/global.inc.php';
-require_once api_get_path(LIBRARY_PATH) . 'plugin.class.php';
-require_once api_get_path(SYS_PLUGIN_PATH) . 'tour/src/tour_plugin.class.php';
+require_once api_get_path(SYS_PATH).'main/inc/global.inc.php';
+require_once api_get_path(LIBRARY_PATH).'plugin.class.php';
+require_once api_get_path(SYS_PLUGIN_PATH).'tour/src/tour_plugin.class.php';
 // Edit the config/tour.json file to add more pages or more elements to the guide

plugin/tour/ajax/steps.ajax.php

Spacing +2 added lines, -2 removed lines

@@ -6,8 +6,8 @@
  * @package chamilo.plugin.tour
  */
 require_once __DIR__.'/../../../main/inc/global.inc.php';
-require_once api_get_path(LIBRARY_PATH) . 'plugin.class.php';
-require_once api_get_path(SYS_PLUGIN_PATH) . 'tour/src/tour_plugin.class.php';
+require_once api_get_path(LIBRARY_PATH).'plugin.class.php';
+require_once api_get_path(SYS_PLUGIN_PATH).'tour/src/tour_plugin.class.php';
 
 if (!api_is_anonymous()) {
     $currentPageClass = isset($_GET['page_class']) ? $_GET['page_class'] : '';

main/document/create_paint.php

Indentation +13 added lines, -13 removed lines

@@ -50,26 +50,26 @@ 
 // Please, do not modify this dirname formatting
 
 if (strstr($dir, '..')) {
-	$dir = '/';
+    $dir = '/';
 }
 
 if ($dir[0] == '.') {
-	$dir = substr($dir, 1);
+    $dir = substr($dir, 1);
 }
 
 if ($dir[0] != '/') {
-	$dir = '/'.$dir;
+    $dir = '/'.$dir;
 }
 
 if ($dir[strlen($dir) - 1] != '/') {
-	$dir .= '/';
+    $dir .= '/';
 }
 
 $filepath = api_get_path(SYS_COURSE_PATH).$_course['path'].'/document'.$dir;
 
 if (!is_dir($filepath)) {
-	$filepath = api_get_path(SYS_COURSE_PATH).$_course['path'].'/document/';
-	$dir = '/';
+    $filepath = api_get_path(SYS_COURSE_PATH).$_course['path'].'/document/';
+    $dir = '/';
 }
 
 $groupId = api_get_group_id();
@@ -97,7 +97,7 @@ 
 }
 
 if (!($is_allowed_to_edit || $_SESSION['group_member_with_upload_rights'] ||
-	DocumentManager::is_my_shared_folder($_user['user_id'], Security::remove_XSS($dir), api_get_session_id()))
+    DocumentManager::is_my_shared_folder($_user['user_id'], Security::remove_XSS($dir), api_get_session_id()))
 ) {
     api_not_allowed(true);
 }
@@ -114,7 +114,7 @@ 
 
 // Interbreadcrumb for the current directory root path
 if (empty($document_data['parents'])) {
-	$interbreadcrumb[] = array('url' => '#', 'name' => $document_data['title']);
+    $interbreadcrumb[] = array('url' => '#', 'name' => $document_data['title']);
 } else {
     foreach ($document_data['parents'] as $document_sub_data) {
         $interbreadcrumb[] = array('url' => $document_sub_data['document_url'], 'name' => $document_sub_data['title']);
@@ -147,17 +147,17 @@ 
 $locktitle="false";
 
 if ($_SERVER['HTTP_HOST']=="localhost") {
-	$path_and_file= api_get_path(SYS_PATH).'/crossdomain.xml';
-	if (!file_exists($path_and_file)) {
-		$crossdomain='<?xml version="1.0"?>
+    $path_and_file= api_get_path(SYS_PATH).'/crossdomain.xml';
+    if (!file_exists($path_and_file)) {
+        $crossdomain='<?xml version="1.0"?>
 			<!DOCTYPE cross-domain-policy SYSTEM "http://www.adobe.com/xml/dtds/cross-domain-policy.dtd">
 			<cross-domain-policy>
 				<allow-access-from domain="cdn.pixlr.com" />
 				<site-control permitted-cross-domain-policies="master-only"/>
 				<allow-http-request-headers-from domain="cnd.pixlr.com" headers="*" secure="true"/>
 			</cross-domain-policy>';//more open domain="*"
-		@file_put_contents($path_and_file, $crossdomain);
-	}
+        @file_put_contents($path_and_file, $crossdomain);
+    }
     $credentials = "true";
 } else {
     $credentials = "false";

Spacing +15 added lines, -15 removed lines

@@ -129,27 +129,27 @@
 
 // pixlr
 // max size 1 Mb ??
-$title = urlencode(utf8_encode(get_lang('NewImage')));//TODO:check
+$title = urlencode(utf8_encode(get_lang('NewImage'))); //TODO:check
 //
 $image = Display::returnIconPath('canvas1024x768.png');
 //
 $pixlr_code_translation_table = array('' => 'en', 'pt' => 'pt-Pt', 'sr' => 'sr_latn');
-$langpixlr  = api_get_language_isocode();
+$langpixlr = api_get_language_isocode();
 $langpixlr = isset($pixlr_code_translation_table[$langpixlr]) ? $pixlredit_code_translation_table[$langpixlr] : $langpixlr;
-$loc=$langpixlr;// deprecated ?? TODO:check pixlr read user browser
-
-$exit_path=api_get_path(WEB_CODE_PATH).'document/exit_pixlr.php';
-$_SESSION['exit_pixlr']=$document_data['path'];
-$referrer="Chamilo";
-$target_path=api_get_path(WEB_CODE_PATH).'document/save_pixlr.php';
-$target=$target_path;
-$locktarget="true";
-$locktitle="false";
-
-if ($_SERVER['HTTP_HOST']=="localhost") {
-	$path_and_file= api_get_path(SYS_PATH).'/crossdomain.xml';
+$loc = $langpixlr; // deprecated ?? TODO:check pixlr read user browser
+
+$exit_path = api_get_path(WEB_CODE_PATH).'document/exit_pixlr.php';
+$_SESSION['exit_pixlr'] = $document_data['path'];
+$referrer = "Chamilo";
+$target_path = api_get_path(WEB_CODE_PATH).'document/save_pixlr.php';
+$target = $target_path;
+$locktarget = "true";
+$locktitle = "false";
+
+if ($_SERVER['HTTP_HOST'] == "localhost") {
+	$path_and_file = api_get_path(SYS_PATH).'/crossdomain.xml';
 	if (!file_exists($path_and_file)) {
-		$crossdomain='<?xml version="1.0"?>
+		$crossdomain = '<?xml version="1.0"?>
 			<!DOCTYPE cross-domain-policy SYSTEM "http://www.adobe.com/xml/dtds/cross-domain-policy.dtd">
 			<cross-domain-policy>
 				<allow-access-from domain="cdn.pixlr.com" />

main/gradebook/lib/fe/resulttable.class.php

Indentation +154 added lines, -154 removed lines

@@ -10,166 +10,166 @@
  */
 class ResultTable extends SortableTable
 {
-	private $datagen;
-	private $evaluation;
-	private $allresults;
-	private $iscourse;
-
-	/**
-	 * Constructor
-	 */
+    private $datagen;
+    private $evaluation;
+    private $allresults;
+    private $iscourse;
+
+    /**
+     * Constructor
+     */
     public function __construct($evaluation, $results = array(), $iscourse, $addparams = null,$forprint = false)
-	{
-    	parent :: __construct('resultlist', null, null, (api_is_western_name_order() xor api_sort_by_first_name()) ? 2 : 1);
-
-		$this->datagen = new ResultsDataGenerator($evaluation, $results, true);
-
-		$this->evaluation = $evaluation;
-		$this->iscourse = $iscourse;
-		$this->forprint = $forprint;
-
-		if (isset ($addparams))  {
-			$this->set_additional_parameters($addparams);
-		}
-		$scoredisplay = ScoreDisplay :: instance();
-		$column= 0;
-		if ($this->iscourse == '1') {
-			$this->set_header($column++, '', false);
-			$this->set_form_actions(array (
-					'delete' => get_lang('Delete')
-			));
-		}
-		if (api_is_western_name_order()) {
-			$this->set_header($column++, get_lang('FirstName'));
-			$this->set_header($column++, get_lang('LastName'));
-		} else {
-			$this->set_header($column++, get_lang('LastName'));
-			$this->set_header($column++, get_lang('FirstName'));
-		}
-		$this->set_header($column++, get_lang('Score'));
-		if ($scoredisplay->is_custom()) {
-			$this->set_header($column++, get_lang('Display'));
-		}
-		if (!$this->forprint) {
-			$this->set_header($column++, get_lang('Modify'),false);
-		}
+    {
+        parent :: __construct('resultlist', null, null, (api_is_western_name_order() xor api_sort_by_first_name()) ? 2 : 1);
+
+        $this->datagen = new ResultsDataGenerator($evaluation, $results, true);
+
+        $this->evaluation = $evaluation;
+        $this->iscourse = $iscourse;
+        $this->forprint = $forprint;
+
+        if (isset ($addparams))  {
+            $this->set_additional_parameters($addparams);
+        }
+        $scoredisplay = ScoreDisplay :: instance();
+        $column= 0;
+        if ($this->iscourse == '1') {
+            $this->set_header($column++, '', false);
+            $this->set_form_actions(array (
+                    'delete' => get_lang('Delete')
+            ));
+        }
+        if (api_is_western_name_order()) {
+            $this->set_header($column++, get_lang('FirstName'));
+            $this->set_header($column++, get_lang('LastName'));
+        } else {
+            $this->set_header($column++, get_lang('LastName'));
+            $this->set_header($column++, get_lang('FirstName'));
+        }
+        $this->set_header($column++, get_lang('Score'));
+        if ($scoredisplay->is_custom()) {
+            $this->set_header($column++, get_lang('Display'));
+        }
+        if (!$this->forprint) {
+            $this->set_header($column++, get_lang('Modify'),false);
+        }
     }
 
 
-	/**
-	 * Function used by SortableTable to get total number of items in the table
-	 */
-	public function get_total_number_of_items ()
+    /**
+     * Function used by SortableTable to get total number of items in the table
+     */
+    public function get_total_number_of_items ()
     {
-		return $this->datagen->get_total_results_count();
-	}
-
-	/**
-	 * Function used by SortableTable to generate the data to display
-	 */
-	public function get_table_data($from = 1, $per_page = null, $column = null, $direction = null, $sort = null) {
-
-		$is_western_name_order = api_is_western_name_order();
-		$scoredisplay = ScoreDisplay :: instance();
-
-		// determine sorting type
-		$col_adjust = $this->iscourse == '1' ? 1 : 0;
-
-		switch ($this->column) {
-			// first name or last name
-			case (0 + $col_adjust):
-				if ($is_western_name_order) {
-					$sorting = ResultsDataGenerator :: RDG_SORT_FIRSTNAME;
-				} else {
-					$sorting = ResultsDataGenerator :: RDG_SORT_LASTNAME;
-				}
-				break;
+        return $this->datagen->get_total_results_count();
+    }
+
+    /**
+     * Function used by SortableTable to generate the data to display
+     */
+    public function get_table_data($from = 1, $per_page = null, $column = null, $direction = null, $sort = null) {
+
+        $is_western_name_order = api_is_western_name_order();
+        $scoredisplay = ScoreDisplay :: instance();
+
+        // determine sorting type
+        $col_adjust = $this->iscourse == '1' ? 1 : 0;
+
+        switch ($this->column) {
             // first name or last name
-			case (1 + $col_adjust):
-				if ($is_western_name_order) {
-					$sorting = ResultsDataGenerator :: RDG_SORT_LASTNAME;
-				} else {
-					$sorting = ResultsDataGenerator :: RDG_SORT_FIRSTNAME;
-				}
-				break;
+            case (0 + $col_adjust):
+                if ($is_western_name_order) {
+                    $sorting = ResultsDataGenerator :: RDG_SORT_FIRSTNAME;
+                } else {
+                    $sorting = ResultsDataGenerator :: RDG_SORT_LASTNAME;
+                }
+                break;
+            // first name or last name
+            case (1 + $col_adjust):
+                if ($is_western_name_order) {
+                    $sorting = ResultsDataGenerator :: RDG_SORT_LASTNAME;
+                } else {
+                    $sorting = ResultsDataGenerator :: RDG_SORT_FIRSTNAME;
+                }
+                break;
             //Score
-			case (2 + $col_adjust):
-				$sorting = ResultsDataGenerator :: RDG_SORT_SCORE;
-				break;
-			case (3 + $col_adjust):
-				$sorting = ResultsDataGenerator :: RDG_SORT_MASK;
-				break;
-		}
-
-		if ($this->direction == 'DESC') {
-			$sorting |= ResultsDataGenerator :: RDG_SORT_DESC;
-		} else {
-			$sorting |= ResultsDataGenerator :: RDG_SORT_ASC;
-		}
-
-		$data_array = $this->datagen->get_data($sorting, $from, $this->per_page);
-
-		// generate the data to display
-		$sortable_data = array();
-		foreach ($data_array as $item) {
-			$row = array ();
-			if ($this->iscourse == '1') {
-				 $row[] = $item['result_id'];
-			}
-			if ($is_western_name_order) {
-				$row[] = $item['firstname'];
-				$row[] = $item['lastname'];
-			} else {
-				$row[] = $item['lastname'];
-				$row[] = $item['firstname'];
-			}
-
-			$row[] =  Display::bar_progress($item['percentage_score'], false, $item['score']);
+            case (2 + $col_adjust):
+                $sorting = ResultsDataGenerator :: RDG_SORT_SCORE;
+                break;
+            case (3 + $col_adjust):
+                $sorting = ResultsDataGenerator :: RDG_SORT_MASK;
+                break;
+        }
+
+        if ($this->direction == 'DESC') {
+            $sorting |= ResultsDataGenerator :: RDG_SORT_DESC;
+        } else {
+            $sorting |= ResultsDataGenerator :: RDG_SORT_ASC;
+        }
+
+        $data_array = $this->datagen->get_data($sorting, $from, $this->per_page);
+
+        // generate the data to display
+        $sortable_data = array();
+        foreach ($data_array as $item) {
+            $row = array ();
+            if ($this->iscourse == '1') {
+                    $row[] = $item['result_id'];
+            }
+            if ($is_western_name_order) {
+                $row[] = $item['firstname'];
+                $row[] = $item['lastname'];
+            } else {
+                $row[] = $item['lastname'];
+                $row[] = $item['firstname'];
+            }
+
+            $row[] =  Display::bar_progress($item['percentage_score'], false, $item['score']);
             //$row[] =  Display::bar_progress($item['percentage_score'], true);
-			if ($scoredisplay->is_custom()) {
-				$row[] = $item['display'];
-			}
-			if (!$this->forprint) {
-				$row[] = $this->build_edit_column ($item);
-			}
-			$sortable_data[] = $row;
-		}
-
-		return $sortable_data;
-	}
-
-	private function build_edit_column ($item)
-	{
-		$status = CourseManager::get_user_in_course_status(api_get_user_id(), api_get_course_id());
-		$locked_status = $this->evaluation->get_locked();
-		if (api_is_allowed_to_edit(null, true) && $locked_status == 0) {
-			//api_is_course_admin()
-			$edit_column = '<a href="' . api_get_self() . '?editres=' . $item['result_id'] . '&selecteval=' . $this->evaluation->get_id().'&'.api_get_cidreq().'">'.
-				Display::return_icon('edit.png', get_lang('Modify'),'','22').'</a>';
-			$edit_column .= ' <a href="' . api_get_self() . '?delete_mark=' . $item['result_id'] . '&selecteval=' . $this->evaluation->get_id().'&'.api_get_cidreq().'">'.
-				Display::return_icon('delete.png', get_lang('Delete'),'','22').'</a>';
-		}
-
-		if ($this->evaluation->get_course_code() == null) {
-			$edit_column .= '&nbsp;<a href="' . api_get_self() . '?resultdelete=' . $item['result_id'] . '&selecteval=' . $this->evaluation->get_id() . '" onclick="return confirmationuser();">';
-			$edit_column .= Display::return_icon('delete.png', get_lang('Delete'));
-			$edit_column .= '</a>';
-		    $edit_column .= '&nbsp;<a href="user_stats.php?userid=' . $item['id'] . '&selecteval=' . $this->evaluation->get_id() . '&'.api_get_cidreq().'">';
-			$edit_column .= Display::return_icon('statistics.gif', get_lang('Statistics'));
-		    $edit_column .= '</a>';
-		}
-
-		// Evaluation's origin is a link
-		if ($this->evaluation->get_category_id() < 0) {
-			$link = LinkFactory::get_evaluation_link($this->evaluation->get_id());
-			$doc_url = $link->get_view_url($item['id']);
-
-			if ($doc_url != null) {
-				$edit_column .= '&nbsp;<a href="'. $doc_url . '" target="_blank">';
-				$edit_column .= Display::return_icon('link.gif', get_lang('OpenDocument')).'</a>';
-			}
-		}
-
-		return $edit_column;
-	}
+            if ($scoredisplay->is_custom()) {
+                $row[] = $item['display'];
+            }
+            if (!$this->forprint) {
+                $row[] = $this->build_edit_column ($item);
+            }
+            $sortable_data[] = $row;
+        }
+
+        return $sortable_data;
+    }
+
+    private function build_edit_column ($item)
+    {
+        $status = CourseManager::get_user_in_course_status(api_get_user_id(), api_get_course_id());
+        $locked_status = $this->evaluation->get_locked();
+        if (api_is_allowed_to_edit(null, true) && $locked_status == 0) {
+            //api_is_course_admin()
+            $edit_column = '<a href="' . api_get_self() . '?editres=' . $item['result_id'] . '&selecteval=' . $this->evaluation->get_id().'&'.api_get_cidreq().'">'.
+                Display::return_icon('edit.png', get_lang('Modify'),'','22').'</a>';
+            $edit_column .= ' <a href="' . api_get_self() . '?delete_mark=' . $item['result_id'] . '&selecteval=' . $this->evaluation->get_id().'&'.api_get_cidreq().'">'.
+                Display::return_icon('delete.png', get_lang('Delete'),'','22').'</a>';
+        }
+
+        if ($this->evaluation->get_course_code() == null) {
+            $edit_column .= '&nbsp;<a href="' . api_get_self() . '?resultdelete=' . $item['result_id'] . '&selecteval=' . $this->evaluation->get_id() . '" onclick="return confirmationuser();">';
+            $edit_column .= Display::return_icon('delete.png', get_lang('Delete'));
+            $edit_column .= '</a>';
+            $edit_column .= '&nbsp;<a href="user_stats.php?userid=' . $item['id'] . '&selecteval=' . $this->evaluation->get_id() . '&'.api_get_cidreq().'">';
+            $edit_column .= Display::return_icon('statistics.gif', get_lang('Statistics'));
+            $edit_column .= '</a>';
+        }
+
+        // Evaluation's origin is a link
+        if ($this->evaluation->get_category_id() < 0) {
+            $link = LinkFactory::get_evaluation_link($this->evaluation->get_id());
+            $doc_url = $link->get_view_url($item['id']);
+
+            if ($doc_url != null) {
+                $edit_column .= '&nbsp;<a href="'. $doc_url . '" target="_blank">';
+                $edit_column .= Display::return_icon('link.gif', get_lang('OpenDocument')).'</a>';
+            }
+        }
+
+        return $edit_column;
+    }
 }

Spacing +17 added lines, -17 removed lines

@@ -18,7 +18,7 @@ 
 	/**
 	 * Constructor
 	 */
-    public function __construct($evaluation, $results = array(), $iscourse, $addparams = null,$forprint = false)
+    public function __construct($evaluation, $results = array(), $iscourse, $addparams = null, $forprint = false)
 	{
     	parent :: __construct('resultlist', null, null, (api_is_western_name_order() xor api_sort_by_first_name()) ? 2 : 1);
 
@@ -28,14 +28,14 @@ 
 		$this->iscourse = $iscourse;
 		$this->forprint = $forprint;
 
-		if (isset ($addparams))  {
+		if (isset ($addparams)) {
 			$this->set_additional_parameters($addparams);
 		}
 		$scoredisplay = ScoreDisplay :: instance();
-		$column= 0;
+		$column = 0;
 		if ($this->iscourse == '1') {
 			$this->set_header($column++, '', false);
-			$this->set_form_actions(array (
+			$this->set_form_actions(array(
 					'delete' => get_lang('Delete')
 			));
 		}
@@ -51,7 +51,7 @@ 
 			$this->set_header($column++, get_lang('Display'));
 		}
 		if (!$this->forprint) {
-			$this->set_header($column++, get_lang('Modify'),false);
+			$this->set_header($column++, get_lang('Modify'), false);
 		}
     }
 
@@ -59,7 +59,7 @@ 
 	/**
 	 * Function used by SortableTable to get total number of items in the table
 	 */
-	public function get_total_number_of_items ()
+	public function get_total_number_of_items()
     {
 		return $this->datagen->get_total_results_count();
 	}
@@ -112,7 +112,7 @@ 
 		// generate the data to display
 		$sortable_data = array();
 		foreach ($data_array as $item) {
-			$row = array ();
+			$row = array();
 			if ($this->iscourse == '1') {
 				 $row[] = $item['result_id'];
 			}
@@ -124,13 +124,13 @@ 
 				$row[] = $item['firstname'];
 			}
 
-			$row[] =  Display::bar_progress($item['percentage_score'], false, $item['score']);
+			$row[] = Display::bar_progress($item['percentage_score'], false, $item['score']);
             //$row[] =  Display::bar_progress($item['percentage_score'], true);
 			if ($scoredisplay->is_custom()) {
 				$row[] = $item['display'];
 			}
 			if (!$this->forprint) {
-				$row[] = $this->build_edit_column ($item);
+				$row[] = $this->build_edit_column($item);
 			}
 			$sortable_data[] = $row;
 		}
@@ -138,23 +138,23 @@ 
 		return $sortable_data;
 	}
 
-	private function build_edit_column ($item)
+	private function build_edit_column($item)
 	{
 		$status = CourseManager::get_user_in_course_status(api_get_user_id(), api_get_course_id());
 		$locked_status = $this->evaluation->get_locked();
 		if (api_is_allowed_to_edit(null, true) && $locked_status == 0) {
 			//api_is_course_admin()
-			$edit_column = '<a href="' . api_get_self() . '?editres=' . $item['result_id'] . '&selecteval=' . $this->evaluation->get_id().'&'.api_get_cidreq().'">'.
-				Display::return_icon('edit.png', get_lang('Modify'),'','22').'</a>';
-			$edit_column .= ' <a href="' . api_get_self() . '?delete_mark=' . $item['result_id'] . '&selecteval=' . $this->evaluation->get_id().'&'.api_get_cidreq().'">'.
-				Display::return_icon('delete.png', get_lang('Delete'),'','22').'</a>';
+			$edit_column = '<a href="'.api_get_self().'?editres='.$item['result_id'].'&selecteval='.$this->evaluation->get_id().'&'.api_get_cidreq().'">'.
+				Display::return_icon('edit.png', get_lang('Modify'), '', '22').'</a>';
+			$edit_column .= ' <a href="'.api_get_self().'?delete_mark='.$item['result_id'].'&selecteval='.$this->evaluation->get_id().'&'.api_get_cidreq().'">'.
+				Display::return_icon('delete.png', get_lang('Delete'), '', '22').'</a>';
 		}
 
 		if ($this->evaluation->get_course_code() == null) {
-			$edit_column .= '&nbsp;<a href="' . api_get_self() . '?resultdelete=' . $item['result_id'] . '&selecteval=' . $this->evaluation->get_id() . '" onclick="return confirmationuser();">';
+			$edit_column .= '&nbsp;<a href="'.api_get_self().'?resultdelete='.$item['result_id'].'&selecteval='.$this->evaluation->get_id().'" onclick="return confirmationuser();">';
 			$edit_column .= Display::return_icon('delete.png', get_lang('Delete'));
 			$edit_column .= '</a>';
-		    $edit_column .= '&nbsp;<a href="user_stats.php?userid=' . $item['id'] . '&selecteval=' . $this->evaluation->get_id() . '&'.api_get_cidreq().'">';
+		    $edit_column .= '&nbsp;<a href="user_stats.php?userid='.$item['id'].'&selecteval='.$this->evaluation->get_id().'&'.api_get_cidreq().'">';
 			$edit_column .= Display::return_icon('statistics.gif', get_lang('Statistics'));
 		    $edit_column .= '</a>';
 		}
@@ -165,7 +165,7 @@ 
 			$doc_url = $link->get_view_url($item['id']);
 
 			if ($doc_url != null) {
-				$edit_column .= '&nbsp;<a href="'. $doc_url . '" target="_blank">';
+				$edit_column .= '&nbsp;<a href="'.$doc_url.'" target="_blank">';
 				$edit_column .= Display::return_icon('link.gif', get_lang('OpenDocument')).'</a>';
 			}
 		}

main/inc/lib/api.lib.php

Indentation +2 added lines, -4 removed lines

@@ -625,7 +625,6 @@ 
  * The other configuration parameters have not been changed.
  *
  * This is how we can get most used paths, for common purpose:
-
  * api_get_path(REL_PATH)                       /chamilo/
  * api_get_path(REL_COURSE_PATH)                /chamilo/courses/
  * api_get_path(REL_CODE_PATH)                  /chamilo/main/
@@ -1803,7 +1802,6 @@ 
 
 /**
  * Returns the current course info array.
-
  * Now if the course_code is given, the returned array gives info about that
  * particular course, not specially the current one.
  * @param int $id Numeric ID of the course
@@ -2734,7 +2732,7 @@ 
         switch ($session_user_status) {
             case 0:
                 $session_status['status'] = 'student';
-               break;
+                break;
             case 2:
                 $session_status['status'] = 'coach';
             break;
@@ -6492,7 +6490,7 @@ 
 function api_get_jquery_ui_js($include_jqgrid = false) {
     $libraries = array();
     if ($include_jqgrid) {
-       $libraries[]='jqgrid';
+        $libraries[]='jqgrid';
     }
     return api_get_jquery_libraries_js($libraries);
 }

Braces +19 added lines, -16 removed lines

@@ -1701,7 +1701,9 @@ 
     }
 
     global $_course;
-    if ($_course == '-1') $_course = array();
+    if ($_course == '-1') {
+        $_course = array();
+    }
     return $_course;
 }
 
@@ -4154,18 +4156,21 @@ 
     switch ($lang_type) {
         case 'platform_lang':
             $temp_lang = api_get_setting('platformLanguage');
-            if (!empty($temp_lang))
-                $return = $temp_lang;
+            if (!empty($temp_lang)) {
+                            $return = $temp_lang;
+            }
             break;
         case 'user_profil_lang':
             $_user = api_get_user_info();
 
-            if (isset($_user['language']) && !empty($_user['language']))
-                $return = $_user['language'];
+            if (isset($_user['language']) && !empty($_user['language'])) {
+                            $return = $_user['language'];
+            }
             break;
         case 'user_selected_lang':
-            if (isset($_SESSION['user_language_choice']) && !empty($_SESSION['user_language_choice']))
-                $return = $_SESSION['user_language_choice'];
+            if (isset($_SESSION['user_language_choice']) && !empty($_SESSION['user_language_choice'])) {
+                            $return = $_SESSION['user_language_choice'];
+            }
             break;
         case 'course_lang':
             global $_course;
@@ -5434,8 +5439,7 @@ 
             $is_courseAdmin = false;
             $is_courseCoach = true;
             $is_sessionAdmin = false;
-        }
-        elseif ($row[0]['session_admin_id'] == $userid) {
+        } elseif ($row[0]['session_admin_id'] == $userid) {
             $is_courseMember = false;
             $is_courseTutor = false;
             $is_courseAdmin = false;
@@ -5778,8 +5782,7 @@ 
     elseif (isset($_ENV['OS'])) {
         // Sometimes $_ENV['OS'] may not be present (bugs?)
         $os = $_ENV['OS'];
-    }
-    elseif (defined('PHP_OS')) {
+    } elseif (defined('PHP_OS')) {
         // PHP_OS means on which OS PHP was compiled, this is why
         // using PHP_OS is the last choice for detection.
         $os = PHP_OS;
@@ -5843,12 +5846,10 @@ 
     if ($delta_width > $delta_height) {
         $result['width'] = ceil($image_width * $resize_factor_height);
         $result['height'] = ceil($image_height * $resize_factor_height);
-    }
-    elseif ($delta_width < $delta_height) {
+    } elseif ($delta_width < $delta_height) {
         $result['width'] = ceil($image_width * $resize_factor_width);
         $result['height'] = ceil($image_height * $resize_factor_width);
-    }
-    else {
+    } else {
         $result['width'] = ceil($target_width);
         $result['height'] = ceil($target_height);
     }
@@ -6629,7 +6630,9 @@ 
         }
         $ip = trim($ip1);
     }
-    if (!empty($debug)) error_log('Real IP: '.$ip);
+    if (!empty($debug)) {
+        error_log('Real IP: '.$ip);
+    }
     return $ip;
 }
 

Doc Comments +6 added lines, -3 removed lines

@@ -1240,6 +1240,7 @@ 
  * Gets the list of courses a specific user is subscribed to
  * @param int       User ID
  * @param boolean   $fetch_session Whether to get session courses or not - NOT YET IMPLEMENTED
+ * @param integer $userid
  * @return array    Array of courses in the form [0]=>('code'=>xxx,'db'=>xxx,'dir'=>xxx,'status'=>d)
  */
 function api_get_user_courses($userid, $fetch_session = true)
@@ -2949,7 +2950,7 @@ 
 * on the session visibility
 * @param bool $tutor  Whether to check if the user has the tutor role
 * @param bool  $coach Whether to check if the user has the coach role
-* @return boolean true: the user has the rights to edit, false: he does not
+* @return boolean|null true: the user has the rights to edit, false: he does not
 */
 function api_is_allowed_to_session_edit($tutor = false, $coach = false)
 {
@@ -6606,7 +6607,7 @@ 
 /**
  * Returns an array of global configuration settings which should be ignored
  * when printing the configuration settings screens
- * @return array Array of strings, each identifying one of the excluded settings
+ * @return string[] Array of strings, each identifying one of the excluded settings
  */
 function api_get_locked_settings() {
     return array(
@@ -6647,6 +6648,7 @@ 
  * false if he isn't. If the user ID is given and is an integer, then the same
  * ID is simply returned
  * @param  integer User ID
+ * @param integer $user_id
  * @return boolean Integer User ID is logged in, or false otherwise
  */
 function api_user_is_login($user_id = null) {
@@ -7091,6 +7093,7 @@ 
 /**
  * Gets memory limit in bytes
  * @param string The memory size (128M, 1G, 1000K, etc)
+ * @param string $mem
  * @return int
  * @assert (null) === false
  * @assert ('1t')  === 1099511627776
@@ -8033,7 +8036,7 @@ 
 /**
  * Like strip_tags(), but leaves an additional space and removes only the given tags
  * @param string $string
- * @param array $tags Tags to be removed
+ * @param string[] $tags Tags to be removed
  * @return  string The original string without the given tags
  */
 function stripGivenTags($string, $tags) {

Spacing +150 added lines, -150 removed lines

@@ -38,19 +38,19 @@ 
 define('PLATFORM_ADMIN', 11);
 define('SESSION_COURSE_COACH', 12);
 define('SESSION_GENERAL_COACH', 13);
-define('COURSE_STUDENT', 14);   //student subscribed in a course
-define('SESSION_STUDENT', 15);  //student subscribed in a session course
+define('COURSE_STUDENT', 14); //student subscribed in a course
+define('SESSION_STUDENT', 15); //student subscribed in a session course
 define('COURSE_TUTOR', 16); // student is tutor of a course (NOT in session)
 define('STUDENT_BOSS', 17); // student is boss
 define('INVITEE', 20);
 
 // Table of status
-$_status_list[COURSEMANAGER] = 'teacher';        // 1
-$_status_list[SESSIONADMIN] = 'session_admin';  // 3
-$_status_list[DRH] = 'drh';            // 4
-$_status_list[STUDENT] = 'user';           // 5
-$_status_list[ANONYMOUS] = 'anonymous';      // 6
-$_status_list[INVITEE] = 'invited';        // 20
+$_status_list[COURSEMANAGER] = 'teacher'; // 1
+$_status_list[SESSIONADMIN] = 'session_admin'; // 3
+$_status_list[DRH] = 'drh'; // 4
+$_status_list[STUDENT] = 'user'; // 5
+$_status_list[ANONYMOUS] = 'anonymous'; // 6
+$_status_list[INVITEE] = 'invited'; // 20
 
 // COURSE VISIBILITY CONSTANTS
 /** only visible for course admin */
@@ -260,14 +260,14 @@ 
 define('IS_WINDOWS_OS', api_is_windows_os());
 
 // Checks for installed optional php-extensions.
-define('INTL_INSTALLED', function_exists('intl_get_error_code'));   // intl extension (from PECL), it is installed by default as of PHP 5.3.0
-define('ICONV_INSTALLED', function_exists('iconv'));                // iconv extension, for PHP5 on Windows it is installed by default.
-define('MBSTRING_INSTALLED', function_exists('mb_strlen'));         // mbstring extension.
+define('INTL_INSTALLED', function_exists('intl_get_error_code')); // intl extension (from PECL), it is installed by default as of PHP 5.3.0
+define('ICONV_INSTALLED', function_exists('iconv')); // iconv extension, for PHP5 on Windows it is installed by default.
+define('MBSTRING_INSTALLED', function_exists('mb_strlen')); // mbstring extension.
 
 // Patterns for processing paths.                                   // Examples:
-define('REPEATED_SLASHES_PURIFIER', '/\/{2,}/');                    // $path = preg_replace(REPEATED_SLASHES_PURIFIER, '/', $path);
-define('VALID_WEB_PATH', '/https?:\/\/[^\/]*(\/.*)?/i');            // $is_valid_path = preg_match(VALID_WEB_PATH, $path);
-define('VALID_WEB_SERVER_BASE', '/https?:\/\/[^\/]*/i');            // $new_path = preg_replace(VALID_WEB_SERVER_BASE, $new_base, $path);
+define('REPEATED_SLASHES_PURIFIER', '/\/{2,}/'); // $path = preg_replace(REPEATED_SLASHES_PURIFIER, '/', $path);
+define('VALID_WEB_PATH', '/https?:\/\/[^\/]*(\/.*)?/i'); // $is_valid_path = preg_match(VALID_WEB_PATH, $path);
+define('VALID_WEB_SERVER_BASE', '/https?:\/\/[^\/]*/i'); // $new_path = preg_replace(VALID_WEB_SERVER_BASE, $new_base, $path);
 
 // Constants for api_get_path() and api_get_path_type(), etc. - registered path types.
 // basic (leaf elements)
@@ -360,19 +360,19 @@ 
 define('LINK_HOTPOTATOES', 9);
 
 // Score display types constants
-define('SCORE_DIV', 1);    // X / Y
-define('SCORE_PERCENT', 2);    // XX %
-define('SCORE_DIV_PERCENT', 3);    // X / Y (XX %)
-define('SCORE_AVERAGE', 4);    // XX %
-define('SCORE_DECIMAL', 5);    // 0.50  (X/Y)
-define('SCORE_BAR', 6);    // Uses the Display::bar_progress function
-define('SCORE_SIMPLE', 7);    // X
-define('SCORE_IGNORE_SPLIT', 8);    //  ??
-define('SCORE_DIV_PERCENT_WITH_CUSTOM', 9);    // X / Y (XX %) - Good!
-define('SCORE_CUSTOM', 10);    // Good!
-define('SCORE_DIV_SIMPLE_WITH_CUSTOM', 11);    // X - Good!
-define('SCORE_DIV_SIMPLE_WITH_CUSTOM_LETTERS', 12);    // X - Good!
-define('SCORE_ONLY_SCORE', 13);    // X - Good!
+define('SCORE_DIV', 1); // X / Y
+define('SCORE_PERCENT', 2); // XX %
+define('SCORE_DIV_PERCENT', 3); // X / Y (XX %)
+define('SCORE_AVERAGE', 4); // XX %
+define('SCORE_DECIMAL', 5); // 0.50  (X/Y)
+define('SCORE_BAR', 6); // Uses the Display::bar_progress function
+define('SCORE_SIMPLE', 7); // X
+define('SCORE_IGNORE_SPLIT', 8); //  ??
+define('SCORE_DIV_PERCENT_WITH_CUSTOM', 9); // X / Y (XX %) - Good!
+define('SCORE_CUSTOM', 10); // Good!
+define('SCORE_DIV_SIMPLE_WITH_CUSTOM', 11); // X - Good!
+define('SCORE_DIV_SIMPLE_WITH_CUSTOM_LETTERS', 12); // X - Good!
+define('SCORE_ONLY_SCORE', 13); // X - Good!
 
 define('SCORE_BOTH', 1);
 define('SCORE_ONLY_DEFAULT', 2);
@@ -556,8 +556,8 @@ 
 define('TIMELINE_STATUS_INACTIVE', '2');
 
 // Event email template class
-define ('EVENT_EMAIL_TEMPLATE_ACTIVE',  1);
-define ('EVENT_EMAIL_TEMPLATE_INACTIVE', 0);
+define('EVENT_EMAIL_TEMPLATE_ACTIVE', 1);
+define('EVENT_EMAIL_TEMPLATE_INACTIVE', 0);
 
 // Course home
 define('SHORTCUTS_HORIZONTAL', 0);
@@ -572,8 +572,8 @@ 
 define('FILE_OVERWRITE', 3);
 define('UTF8_CONVERT', false); //false by default
 
-define('DOCUMENT','file');
-define('FOLDER','folder');
+define('DOCUMENT', 'file');
+define('FOLDER', 'folder');
 
 define('RESOURCE_DOCUMENT', 'document');
 define('RESOURCE_GLOSSARY', 'glossary');
@@ -674,8 +674,8 @@ 
                     : 'localhost')));
                 if (isset($_SERVER['SERVER_PORT']) && !strpos($server_name, ':')
                     && (($server_protocol == 'http'
-                    && $_SERVER['SERVER_PORT'] != 80 ) || ($server_protocol == 'https' && $_SERVER['SERVER_PORT'] != 443 ))) {
-                    $server_name .= ":" . $_SERVER['SERVER_PORT'];
+                    && $_SERVER['SERVER_PORT'] != 80) || ($server_protocol == 'https' && $_SERVER['SERVER_PORT'] != 443))) {
+                    $server_name .= ":".$_SERVER['SERVER_PORT'];
                 }
                 $root_web = $server_protocol.'://'.$server_name.$root_rel;
                 $root_sys = str_replace('\\', '/', realpath(__DIR__.'/../../../')).'/';
@@ -859,7 +859,7 @@ 
                 $sys_course_code =
                     isset($_SESSION['_course']['sysCode'])  // User is inside a course?
                         ? $_SESSION['_course']['sysCode']   // Yes, then use course's directory name.
-                        : '{SYS_COURSE_CODE}';              // No, then use a fake code, it may be processed later.
+                        : '{SYS_COURSE_CODE}'; // No, then use a fake code, it may be processed later.
                 $path = $matches[1].'courses/'.$sys_course_code.'/document/'.str_replace('//', '/', $matches[3].'/'.$matches[2]);
             }
         }
@@ -885,15 +885,15 @@ 
 {
     global $_configuration;
     $web_root = api_get_path(WEB_PATH);
-    $ext = substr($web_path,strrpos($web_path,'.'));
+    $ext = substr($web_path, strrpos($web_path, '.'));
     if (isset($ext[2])) { // faster version of strlen to check if len>2
         // Check for CDN definitions
         if (!empty($_configuration['cdn_enable']) && !empty($ext)) {
             foreach ($_configuration['cdn'] as $host => $exts) {
-                if (in_array($ext,$exts)) {
+                if (in_array($ext, $exts)) {
                     //Use host as defined in $_configuration['cdn'], without
                     // trailing slash
-                    return str_replace($web_root,$host.'/',$web_path);
+                    return str_replace($web_root, $host.'/', $web_path);
                 }
             }
         }
@@ -1335,10 +1335,10 @@ 
 
     if (isset($user['email'])) {
         $result['mail'] = isset($user['email']) ? $user['email'] : null;
-        $result['email'] = isset($user['email'])? $user['email'] : null;
+        $result['email'] = isset($user['email']) ? $user['email'] : null;
     } else {
         $result['mail'] = isset($user['mail']) ? $user['mail'] : null;
-        $result['email'] = isset($user['mail'])? $user['mail'] : null;
+        $result['email'] = isset($user['mail']) ? $user['mail'] : null;
     }
     $user_id = intval($user['user_id']);
     // Maintain the user_id index for backwards compatibility
@@ -1854,7 +1854,7 @@ 
         foreach ($param_list1 as $key => $enreg) {
             list ($param_list1_keys[$key], $param_list1_vals[$key]) = explode('=', $enreg);
         }
-        $param_list1 = array ('keys' => $param_list1_keys, 'vals' => $param_list1_vals);
+        $param_list1 = array('keys' => $param_list1_keys, 'vals' => $param_list1_vals);
         foreach ($param_list2 as $enreg) {
             $enreg = explode('=', $enreg);
             $key = array_search($enreg[0], $param_list1['keys']);
@@ -1884,7 +1884,7 @@ 
         $length = 2;
     }
     $password = '';
-    for ($i = 0; $i < $length; $i ++) {
+    for ($i = 0; $i < $length; $i++) {
         $password .= $characters[rand() % strlen($characters)];
     }
     return $password;
@@ -1911,10 +1911,10 @@ 
     $digits = 0;
     $consequent_characters = 0;
     $previous_character_code = 0;
-    for ($i = 0; $i < $password_length; $i ++) {
+    for ($i = 0; $i < $password_length; $i++) {
         $current_character_code = api_ord(api_substr($password, $i, 1));
         if ($i && abs($current_character_code - $previous_character_code) <= 1) {
-            $consequent_characters ++;
+            $consequent_characters++;
             if ($consequent_characters == 3) {
                 return false;
             }
@@ -1922,9 +1922,9 @@ 
             $consequent_characters = 1;
         }
         if ($current_character_code >= 97 && $current_character_code <= 122) {
-            $letters ++;
+            $letters++;
         } elseif ($current_character_code >= 48 && $current_character_code <= 57) {
-            $digits ++;
+            $digits++;
         } else {
             return false;
         }
@@ -2029,7 +2029,7 @@ 
         if (empty($session_id)) { return null; }
     }
     $t = Database::get_main_table(TABLE_MAIN_SESSION);
-    $s = "SELECT name FROM $t WHERE id = ".(int)$session_id;
+    $s = "SELECT name FROM $t WHERE id = ".(int) $session_id;
     $r = Database::query($s);
     $c = Database::num_rows($r);
     if ($c > 0) {
@@ -2054,7 +2054,7 @@ 
         $sql = "SELECT * FROM $tbl_session WHERE id = $session_id";
         $result = Database::query($sql);
 
-        if (Database::num_rows($result)>0) {
+        if (Database::num_rows($result) > 0) {
             $data = Database::fetch_array($result, 'ASSOC');
         }
     }
@@ -2214,9 +2214,9 @@ 
  */
 function api_get_session_image($session_id, $status_id)
 {
-    $session_id = (int)$session_id;
+    $session_id = (int) $session_id;
     $session_img = '';
-    if ((int)$status_id != 5) { //check whether is not a student
+    if ((int) $status_id != 5) { //check whether is not a student
         if ($session_id > 0) {
             $session_img = "&nbsp;&nbsp;".Display::return_icon(
                 'star.png',
@@ -2281,7 +2281,7 @@ 
         $filename = api_get_path(SYS_PATH).api_get_home_path().'header_extra_content.txt';
         if (file_exists($filename)) {
             $value = file_get_contents($filename);
-            return $value ;
+            return $value;
         } else {
             return '';
         }
@@ -2290,7 +2290,7 @@ 
         $filename = api_get_path(SYS_PATH).api_get_home_path().'footer_extra_content.txt';
         if (file_exists($filename)) {
             $value = file_get_contents($filename);
-            return $value ;
+            return $value;
         } else {
             return '';
         }
@@ -2484,7 +2484,7 @@ 
     }
     $group_id   = api_get_group_id();
     $course_id  = api_get_course_int_id();
-    $course_code= api_get_course_id();
+    $course_code = api_get_course_id();
     $session_id = api_get_session_id();
 
     //Group (in course)
@@ -2492,7 +2492,7 @@ 
         $group_status = array();
         $is_subscribed = GroupManager::is_subscribed($user_id, $group_id);
         if ($is_subscribed) {
-            $group_status = array('id'=> $group_id , 'status' => 'student');
+            $group_status = array('id'=> $group_id, 'status' => 'student');
             $is_tutor = GroupManager::is_tutor_of_group($user_id, $group_id);
             if ($is_tutor) {
                 $group_status['status'] = 'tutor';
@@ -2526,7 +2526,7 @@ 
         }
         $status['session'] = $session_status;
 
-    } elseif($course_id) {
+    } elseif ($course_id) {
         //Course
         $course_status = array();
         if ($course_id) {
@@ -2534,7 +2534,7 @@ 
 
             if ($user_course_status) {
                 $course_status = array('id'=> $course_id);
-                switch($user_course_status) {
+                switch ($user_course_status) {
                     case 1:
                         $course_status['status'] = 'teacher';
                         break;
@@ -2564,7 +2564,7 @@ 
 function api_is_course_session_coach($user_id, $courseId, $session_id)
 {
     $session_table = Database::get_main_table(TABLE_MAIN_SESSION);
-    $session_rel_course_rel_user_table  = Database::get_main_table(TABLE_MAIN_SESSION_COURSE_USER);
+    $session_rel_course_rel_user_table = Database::get_main_table(TABLE_MAIN_SESSION_COURSE_USER);
 
     $user_id = intval($user_id);
     $session_id = intval($session_id);
@@ -2638,7 +2638,7 @@ 
                 ORDER BY access_start_date, access_end_date, name";
         $result = Database::query($sql);
         if (!empty($sessionIsCoach)) {
-            $sessionIsCoach = array_merge($sessionIsCoach , Database::store_result($result));
+            $sessionIsCoach = array_merge($sessionIsCoach, Database::store_result($result));
         } else {
             $sessionIsCoach = Database::store_result($result);
         }
@@ -2815,7 +2815,7 @@ 
             return '';
         }
         $sourceurl = substr($_SERVER['REQUEST_URI'], 0, strpos($_SERVER['REQUEST_URI'], '?'));
-        $sourceurl = str_replace('lp/lp_header.php', 'lp/lp_controller.php?'.api_get_cidreq().'&action=view&lp_id='.intval($_GET['lp_id']).'&isStudentView='.($_SESSION['studentview']=='studentview' ? 'false' : 'true'), $sourceurl);
+        $sourceurl = str_replace('lp/lp_header.php', 'lp/lp_controller.php?'.api_get_cidreq().'&action=view&lp_id='.intval($_GET['lp_id']).'&isStudentView='.($_SESSION['studentview'] == 'studentview' ? 'false' : 'true'), $sourceurl);
         //showinframes doesn't handle student view anyway...
         //return '';
         $is_framed = true;
@@ -3225,7 +3225,7 @@ 
         }
         $content .= '<div class="well">';
         $content .= $form->returnForm();
-        $content .='</div>';
+        $content .= '</div>';
         if (api_is_cas_activated()) {
             $content .= "</div>";
         }
@@ -3277,7 +3277,7 @@ 
         }
         $msg .= '<div class="well">';
         $msg .= $form->return_form();
-        $msg .='</div>';
+        $msg .= '</div>';
         if ($casEnabled) {
             $msg .= "</div>";
         }
@@ -3314,7 +3314,7 @@ 
     list ($last_post_date, $last_post_time) = explode(' ', $last_post_datetime);
     list ($year, $month, $day) = explode('-', $last_post_date);
     list ($hour, $min, $sec) = explode(':', $last_post_time);
-    return mktime((int)$hour, (int)$min, (int)$sec, (int)$month, (int)$day, (int)$year);
+    return mktime((int) $hour, (int) $min, (int) $sec, (int) $month, (int) $day, (int) $year);
 }
 
 /**
@@ -3794,7 +3794,7 @@ 
                 c_id = $course_id AND
                 tool = '$tool'
                 $session_condition ";
-    $rs  = Database::query($sql);
+    $rs = Database::query($sql);
     $list = array();
     if (Database::num_rows($rs) > 0) {
         while ($row = Database::fetch_array($rs, 'ASSOC')) {
@@ -3874,7 +3874,7 @@ 
                 tool = '$tool' AND
                 ref = $ref
                 $sessionCondition";
-    $rs  = Database::query($sql);
+    $rs = Database::query($sql);
     $item_property_id = '';
     if (Database::num_rows($rs) > 0) {
         $row = Database::fetch_array($rs);
@@ -3935,7 +3935,7 @@ 
     if ($result == false) {
         $result = array();
     } else {
-        $result = Database::store_result($result,'ASSOC');
+        $result = Database::store_result($result, 'ASSOC');
     }
 
     return $result;
@@ -3987,7 +3987,7 @@ 
     $rs  = Database::query($sql);
     $row = array();
     if (Database::num_rows($rs) > 0) {
-        $row = Database::fetch_array($rs,'ASSOC');
+        $row = Database::fetch_array($rs, 'ASSOC');
     }
 
     return $row;
@@ -4023,7 +4023,7 @@ 
     $languages  = $language_list['name'];
     $folder     = $language_list['folder'];
 
-    $ret .= '<select name="' . $name . '" id="language_chosen" class="selectpicker show-tick form-control">';
+    $ret .= '<select name="'.$name.'" id="language_chosen" class="selectpicker show-tick form-control">';
     foreach ($languages as $key => $value) {
         if ($folder[$key] == $default) {
             $selected = ' selected="selected"';
@@ -4076,8 +4076,8 @@ 
     //-->
     </script>';
     $html .= '<form id="lang_form" name="lang_form" method="post" action="'.api_get_self().'">';
-    $html .= '<label style="display: none;" for="language_list">' . get_lang('Language') . '</label>';
-    $html .=  '<select id="language_list" class="selectpicker show-tick form-control" name="language_list" >';
+    $html .= '<label style="display: none;" for="language_list">'.get_lang('Language').'</label>';
+    $html .= '<select id="language_list" class="selectpicker show-tick form-control" name="language_list" >';
 
     foreach ($original_languages as $key => $value) {
         if ($folder[$key] == $user_selected_language) {
@@ -4085,13 +4085,13 @@ 
         } else {
             $option_end = '>';
         }
-        $html .=  '<option value="'.api_get_self().'?language='.$folder[$key].'"'.$option_end;
+        $html .= '<option value="'.api_get_self().'?language='.$folder[$key].'"'.$option_end;
         //echo substr($value, 0, 16); // Cut string to keep 800x600 aspect.
-        $html .=  $value.'</option>';
+        $html .= $value.'</option>';
     }
-    $html .=  '</select>';
-    $html .=  '<noscript><input type="submit" name="user_select_language" value="'.get_lang('Ok').'" /></noscript>';
-    $html .=  '</form>';
+    $html .= '</select>';
+    $html .= '<noscript><input type="submit" name="user_select_language" value="'.get_lang('Ok').'" /></noscript>';
+    $html .= '</form>';
     return $html;
 }
 
@@ -4308,7 +4308,7 @@ 
  * Note: Directory names (names of themes) in the file system should contain ASCII-characters only.
  */
 function api_get_themes() {
-    $cssdir = api_get_path(SYS_CSS_PATH) . 'themes/';
+    $cssdir = api_get_path(SYS_CSS_PATH).'themes/';
     $list_dir = array();
     $list_name = array();
 
@@ -4485,7 +4485,7 @@ 
     if (is_file($dirname) || is_link($dirname)) {
         $res = unlink($dirname);
         if ($res === false) {
-            error_log(__FILE__.' line '.__LINE__.': '.((bool)ini_get('track_errors') ? $php_errormsg : 'Error not recorded because track_errors is off in your php.ini'), 0);
+            error_log(__FILE__.' line '.__LINE__.': '.((bool) ini_get('track_errors') ? $php_errormsg : 'Error not recorded because track_errors is off in your php.ini'), 0);
         }
         return $res;
     }
@@ -4522,7 +4522,7 @@ 
     if ($delete_only_content_in_folder == false) {
         $res = rmdir($dirname);
         if ($res === false) {
-            error_log(__FILE__.' line '.__LINE__.': '.((bool)ini_get('track_errors') ? $php_errormsg : 'error not recorded because track_errors is off in your php.ini'), 0);
+            error_log(__FILE__.' line '.__LINE__.': '.((bool) ini_get('track_errors') ? $php_errormsg : 'error not recorded because track_errors is off in your php.ini'), 0);
         }
     }
     return $res;
@@ -4607,7 +4607,7 @@ 
 
     $course_id = $course_info['real_id'];
 
-    $folders = explode(DIRECTORY_SEPARATOR,str_replace($base_path_document.DIRECTORY_SEPARATOR,'',$pathname));
+    $folders = explode(DIRECTORY_SEPARATOR, str_replace($base_path_document.DIRECTORY_SEPARATOR, '', $pathname));
 
     $new_pathname = $base_path_document;
     $path = '';
@@ -4625,7 +4625,7 @@ 
                         path = '$path' AND
                         filetype = 'folder' AND
                         session_id = '$session_id'";
-            $rs1  = Database::query($sql);
+            $rs1 = Database::query($sql);
             $num_rows = Database::num_rows($rs1);
 
             if ($num_rows == 0) {
@@ -4785,7 +4785,7 @@ 
             foreach (array('key', 'value1', 'value2', 'value3') as $var) {
                 $$var = isset($match[++$i]) ? $match[$i] : '';
             }
-            $value = stripslashes(substr($value1, 1, -1)) . stripslashes(substr($value2, 1, -1)) . $value3;
+            $value = stripslashes(substr($value1, 1, -1)).stripslashes(substr($value2, 1, -1)).$value3;
 
             // Parse array syntax.
             $keys = preg_split('/\]?\[/', rtrim($key, ']'));
@@ -4825,7 +4825,7 @@ 
  */
 function api_get_version() {
     global $_configuration;
-    return (string)$_configuration['system_version'];
+    return (string) $_configuration['system_version'];
 }
 
 /**
@@ -4952,7 +4952,7 @@ 
     $t_settings = Database::get_main_table(TABLE_MAIN_SETTINGS_CURRENT);
     $var = Database::escape_string($var);
     $value = Database::escape_string($value);
-    $access_url = (int)$access_url;
+    $access_url = (int) $access_url;
     if (empty($access_url)) { $access_url = 1; }
     $select = "SELECT id FROM $t_settings WHERE variable = '$var' ";
     if (!empty($subvar)) {
@@ -4973,7 +4973,7 @@ 
         // Found item for this access_url.
         $row = Database::fetch_array($res);
         $sql = "UPDATE $t_settings SET selected_value = '$value'
-                WHERE id = ".$row['id'] ;
+                WHERE id = ".$row['id'];
         Database::query($sql);
     } else {
         // Item not found for this access_url, we have to check if it exist with access_url = 1
@@ -4993,11 +4993,11 @@ 
                 $row = Database::fetch_array($res);
                 $insert = "INSERT INTO $t_settings (variable, subkey, type,category, selected_value, title, comment, scope, subkeytext, access_url)
                         VALUES
-                        ('".$row['variable']."',".(!empty($row['subkey']) ? "'".$row['subkey']."'" : "NULL")."," .
-                        "'".$row['type']."','".$row['category']."'," .
-                        "'$value','".$row['title']."'," .
-                        "".(!empty($row['comment']) ? "'".$row['comment']."'" : "NULL").",".(!empty($row['scope']) ? "'".$row['scope']."'" : "NULL")."," .
-                        "".(!empty($row['subkeytext'])?"'".$row['subkeytext']."'":"NULL").",$access_url)";
+                        ('".$row['variable']."',".(!empty($row['subkey']) ? "'".$row['subkey']."'" : "NULL").",".
+                        "'".$row['type']."','".$row['category']."',".
+                        "'$value','".$row['title']."',".
+                        "".(!empty($row['comment']) ? "'".$row['comment']."'" : "NULL").",".(!empty($row['scope']) ? "'".$row['scope']."'" : "NULL").",".
+                        "".(!empty($row['subkeytext']) ? "'".$row['subkeytext']."'" : "NULL").",$access_url)";
                 Database::query($insert);
             } else { // Such a setting does not exist.
                 error_log(__FILE__.':'.__LINE__.': Attempting to update setting '.$var.' ('.$subvar.') which does not exist at all', 0);
@@ -5017,16 +5017,16 @@ 
                 if ($row['access_url_changeable'] == 1) {
                     $insert = "INSERT INTO $t_settings (variable,subkey, type,category, selected_value,title, comment,scope, subkeytext,access_url, access_url_changeable) VALUES
                             ('".$row['variable']."',".
-                            (!empty($row['subkey']) ? "'".$row['subkey']."'" : "NULL")."," .
-                            "'".$row['type']."','".$row['category']."'," .
-                            "'$value','".$row['title']."'," .
+                            (!empty($row['subkey']) ? "'".$row['subkey']."'" : "NULL").",".
+                            "'".$row['type']."','".$row['category']."',".
+                            "'$value','".$row['title']."',".
                             "".(!empty($row['comment']) ? "'".$row['comment']."'" : "NULL").",".
-                            (!empty($row['scope']) ? "'".$row['scope']."'" : "NULL")."," .
+                            (!empty($row['scope']) ? "'".$row['scope']."'" : "NULL").",".
                             "".(!empty($row['subkeytext']) ? "'".$row['subkeytext']."'" : "NULL").",$access_url,".$row['access_url_changeable'].")";
                     Database::query($insert);
                 }
             } else { // Such a setting does not exist.
-                error_log(__FILE__.':'.__LINE__.': Attempting to update setting '.$var.' ('.$subvar.') which does not exist at all. The access_url is: '.$access_url.' ',0);
+                error_log(__FILE__.':'.__LINE__.': Attempting to update setting '.$var.' ('.$subvar.') which does not exist at all. The access_url is: '.$access_url.' ', 0);
             }
         }
     }
@@ -5054,10 +5054,10 @@ 
         $value = Database::escape_string($value);
         $sql = "UPDATE $t_s SET selected_value = '$value'
                 WHERE category = '$category' AND access_url = $access_url";
-        if (is_array($fieldtype) && count($fieldtype)>0) {
+        if (is_array($fieldtype) && count($fieldtype) > 0) {
             $sql .= " AND ( ";
             $i = 0;
-            foreach ($fieldtype as $type){
+            foreach ($fieldtype as $type) {
                 if ($i > 0) {
                     $sql .= ' OR ';
                 }
@@ -5072,10 +5072,10 @@ 
     } else {
         $sql = "UPDATE $t_s SET selected_value = NULL
                 WHERE category = '$category' AND access_url = $access_url";
-        if (is_array($fieldtype) && count($fieldtype)>0) {
+        if (is_array($fieldtype) && count($fieldtype) > 0) {
             $sql .= " AND ( ";
             $i = 0;
-            foreach ($fieldtype as $type){
+            foreach ($fieldtype as $type) {
                 if ($i > 0) {
                     $sql .= ' OR ';
                 }
@@ -5208,7 +5208,7 @@ 
         $sql .= " ORDER BY 1,2 ASC";
     }
     $result = Database::query($sql);
-    $result = Database::store_result($result,'ASSOC');
+    $result = Database::store_result($result, 'ASSOC');
     return $result;
 }
 
@@ -5221,7 +5221,7 @@ 
 function & api_get_settings_categories($exceptions = array(), $access_url = 1) {
     $access_url = (int) $access_url;
     $t_cs = Database::get_main_table(TABLE_MAIN_SETTINGS_CURRENT);
-    $list = "'".implode("','",$exceptions)."'";
+    $list = "'".implode("','", $exceptions)."'";
     $sql = "SELECT DISTINCT category FROM $t_cs WHERE category is NOT NULL ";
     if ($list != "'',''" && $list != "''" && !empty($list)) {
         $sql .= " AND category NOT IN ($list) ";
@@ -5333,12 +5333,12 @@ 
 
     // Item not found for this access_url, we have to check if the whole thing is missing
     // (in which case we ignore the insert) or if there *is* a record but just for access_url = 1
-    $insert = "INSERT INTO $t_settings " .
-                "(variable,selected_value," .
-                "type,category," .
-                "subkey,title," .
-                "comment,scope," .
-                "subkeytext,access_url,access_url_changeable)" .
+    $insert = "INSERT INTO $t_settings ".
+                "(variable,selected_value,".
+                "type,category,".
+                "subkey,title,".
+                "comment,scope,".
+                "subkeytext,access_url,access_url_changeable)".
                 " VALUES ('$var','$val',";
     if (isset($type)) {
         $type = Database::escape_string($type);
@@ -5504,7 +5504,7 @@ 
             $result = Database::query($sql);
 
             //if ($row = Database::fetch_array($result)) {
-            if (Database::num_rows($result) > 0 ) {
+            if (Database::num_rows($result) > 0) {
                 $is_courseMember = true;
                 $is_courseTutor = true;
                 $is_courseCoach = true;
@@ -5688,8 +5688,8 @@ 
 {
     $tbl_rel_course_user = Database :: get_main_table(TABLE_MAIN_COURSE_USER);
     if (!empty($user_id) && !empty($courseId)) {
-        $user_id        = intval($user_id);
-        $courseId    = intval($courseId);
+        $user_id = intval($user_id);
+        $courseId = intval($courseId);
         $sql = 'SELECT status
                 FROM '.$tbl_rel_course_user.'
                 WHERE user_id='.$user_id.' AND c_id = '.$courseId;
@@ -5801,7 +5801,7 @@ 
     } else {
         return false;
     }
-    return strtolower(substr((string)$os, 0, 3 )) == 'win';
+    return strtolower(substr((string) $os, 0, 3)) == 'win';
 }
 
 /**
@@ -6357,7 +6357,7 @@ 
 function api_get_jquery_ui_js($include_jqgrid = false) {
     $libraries = array();
     if ($include_jqgrid) {
-       $libraries[]='jqgrid';
+       $libraries[] = 'jqgrid';
     }
     return api_get_jquery_libraries_js($libraries);
 }
@@ -6381,12 +6381,12 @@ 
 
     //jqgrid js and css
     if (in_array('jqgrid', $libraries)) {
-        $languaje   = 'en';
+        $languaje = 'en';
         $platform_isocode = strtolower(api_get_language_isocode());
 
         //languages supported by jqgrid see files in main/inc/lib/javascript/jqgrid/js/i18n
         $jqgrid_langs = array(
-            'bg', 'bg1251', 'cat','cn','cs','da','de','el','en','es','fa','fi','fr','gl','he','hu','is','it','ja','nl','no','pl','pt-br','pt','ro','ru','sk','sr','sv','tr','ua'
+            'bg', 'bg1251', 'cat', 'cn', 'cs', 'da', 'de', 'el', 'en', 'es', 'fa', 'fi', 'fr', 'gl', 'he', 'hu', 'is', 'it', 'ja', 'nl', 'no', 'pl', 'pt-br', 'pt', 'ro', 'ru', 'sk', 'sr', 'sv', 'tr', 'ua'
         );
 
         if (in_array($platform_isocode, $jqgrid_langs)) {
@@ -6417,7 +6417,7 @@ 
 
     // jquery datepicker
     if (in_array('datepicker', $libraries)) {
-        $languaje   = 'en-GB';
+        $languaje = 'en-GB';
         $platform_isocode = strtolower(api_get_language_isocode());
 
         // languages supported by jqgrid see files in main/inc/lib/javascript/jqgrid/js/i18n
@@ -6583,7 +6583,7 @@ 
  * @return void
  */
 function api_check_php_version($my_inc_path = null) {
-    if (!function_exists('version_compare') || version_compare( phpversion(), REQUIRED_PHP_VERSION, '<')) {
+    if (!function_exists('version_compare') || version_compare(phpversion(), REQUIRED_PHP_VERSION, '<')) {
         $global_error_code = 1;
         // Incorrect PHP version
         $global_page = $my_inc_path.'global_error_message.inc.php';
@@ -6599,7 +6599,7 @@ 
  */
 function api_check_archive_dir() {
     if (is_dir(api_get_path(SYS_ARCHIVE_PATH)) && !is_writable(api_get_path(SYS_ARCHIVE_PATH))) {
-        $message = Display::return_message(get_lang('ArchivesDirectoryNotWriteableContactAdmin'),'warning');
+        $message = Display::return_message(get_lang('ArchivesDirectoryNotWriteableContactAdmin'), 'warning');
         api_not_allowed(true, $message);
     }
 }
@@ -6662,7 +6662,7 @@ 
  * @author Jorge Frisancho Jibaja <jrfdeft@gmail.com>, USIL - Some changes to allow the use of real IP using reverse proxy
  * @version CEV CHANGE 24APR2012
  */
-function api_get_real_ip(){
+function api_get_real_ip() {
     // Guess the IP if behind a reverse proxy
     global $debug;
     $ip = trim($_SERVER['REMOTE_ADDR']);
@@ -6688,23 +6688,23 @@ 
  * @author Yannick Warnier for improvements and managment of multiple ranges
  * @todo check for IPv6 support
  */
-function api_check_ip_in_range($ip,$range)
+function api_check_ip_in_range($ip, $range)
 {
     if (empty($ip) or empty($range)) {
         return false;
     }
-    $ip_ip = ip2long ($ip);
+    $ip_ip = ip2long($ip);
     // divide range param into array of elements
-    if (strpos($range,',')!==false) {
-        $ranges = explode(',',$range);
+    if (strpos($range, ',') !== false) {
+        $ranges = explode(',', $range);
     } else {
         $ranges = array($range);
     }
     foreach ($ranges as $range) {
         $range = trim($range);
         if (empty($range)) { continue; }
-        if (strpos($range,'/')===false) {
-            if (strcmp($ip,$range)===0) {
+        if (strpos($range, '/') === false) {
+            if (strcmp($ip, $range) === 0) {
                 return true; // there is a direct IP match, return OK
             }
             continue; //otherwise, get to the next range
@@ -6712,7 +6712,7 @@ 
         // the range contains a "/", so analyse completely
         list ($net, $mask) = explode("/", $range);
 
-        $ip_net = ip2long ($net);
+        $ip_net = ip2long($net);
         // mask binary magic
         $ip_mask = ~((1 << (32 - $mask)) - 1);
 
@@ -7074,14 +7074,14 @@ 
  * @assert (0) === true
  * @assert ('1G') === true
  */
-function api_set_memory_limit($mem){
+function api_set_memory_limit($mem) {
     //if ini_set() not available, this function is useless
     if (!function_exists('ini_set') || is_null($mem) || $mem == -1) {
         return false;
     }
 
     $memory_limit = ini_get('memory_limit');
-    if (api_get_bytes_memory_limit($mem) > api_get_bytes_memory_limit($memory_limit)){
+    if (api_get_bytes_memory_limit($mem) > api_get_bytes_memory_limit($memory_limit)) {
         ini_set('memory_limit', $mem);
         return true;
     }
@@ -7098,21 +7098,21 @@ 
  * @assert ('1m')  === 1048576
  * @assert ('100k') === 102400
  */
-function api_get_bytes_memory_limit($mem){
-    $size = strtolower(substr($mem,-1));
+function api_get_bytes_memory_limit($mem) {
+    $size = strtolower(substr($mem, -1));
 
     switch ($size) {
         case 't':
-            $mem = intval(substr($mem,-1))*1024*1024*1024*1024;
+            $mem = intval(substr($mem, -1)) * 1024 * 1024 * 1024 * 1024;
             break;
         case 'g':
-            $mem = intval(substr($mem,0,-1))*1024*1024*1024;
+            $mem = intval(substr($mem, 0, -1)) * 1024 * 1024 * 1024;
             break;
         case 'm':
-            $mem = intval(substr($mem,0,-1))*1024*1024;
+            $mem = intval(substr($mem, 0, -1)) * 1024 * 1024;
             break;
         case 'k':
-            $mem = intval(substr($mem,0,-1))*1024;
+            $mem = intval(substr($mem, 0, -1)) * 1024;
             break;
         default:
             // we assume it's integer only
@@ -7166,7 +7166,7 @@ 
     );
 
     $js = api_get_asset('pwstrength-bootstrap/dist/pwstrength-bootstrap.min.js');
-    $js .=  "<script>
+    $js .= "<script>
     var verdicts = ['".implode("','", $verdicts)."'];
     var errorMessages = {
         password_to_short : \"" . get_lang('PasswordIsTooShort')."\",
@@ -7222,7 +7222,7 @@ 
         return false;
     }
     $minutesToBlock = api_get_setting('captcha_time_to_block');
-    $time = time() + $minutesToBlock*60;
+    $time = time() + $minutesToBlock * 60;
     UserManager::update_extra_field_value(
         $userInfo['user_id'],
         'captcha_blocked_until_date',
@@ -7296,7 +7296,7 @@ 
         $out_res = str_replace('"', "''", $out_res);
     }
     // avoid text stuck together when tags are removed, adding a space after >
-    $out_res = str_replace (">", "> ", $out_res);
+    $out_res = str_replace(">", "> ", $out_res);
     $out_res = strip_tags($out_res);
 
     return $out_res;
@@ -7409,12 +7409,12 @@ 
 {
     // Clean query
     $bt = debug_backtrace();
-    $caller = array_shift($bt);;
+    $caller = array_shift($bt); ;
     if ($dump == 1) {
         $string = print_r($string, 1);
     } else {
         $string = str_replace(array("\r", "\n", "\t", "\10"), '', $string);
-        $string = str_replace('    ',' ', $string);
+        $string = str_replace('    ', ' ', $string);
     }
 
     error_log("-------------------------------------");
@@ -7524,7 +7524,7 @@ 
         $body = get_lang('PortalName').': '.api_get_path(WEB_PATH)." \n ";
         $body .= get_lang('PortalLimitType').': '.$limitName." \n ";
         if (isset($hostingParams[$limitName])) {
-            $body .= get_lang('Value') . ': ' . $hostingParams[$limitName];
+            $body .= get_lang('Value').': '.$hostingParams[$limitName];
         }
         api_mail_html(null, $email, $subject, $body);
     }
@@ -7656,7 +7656,7 @@ 
  */
 function api_set_site_use_cookie_warning_cookie()
 {
-    setcookie("ChamiloUsesCookies", "ok", time()+31556926);
+    setcookie("ChamiloUsesCookies", "ok", time() + 31556926);
 }
 
 /**
@@ -7704,10 +7704,10 @@ 
         return false;
     }
 
-    $fullPath = $parentDirectory . api_replace_dangerous_char($name);
+    $fullPath = $parentDirectory.api_replace_dangerous_char($name);
 
     if (mkdir($fullPath, api_get_permissions_for_new_directories(), true)) {
-        $fp = fopen($fullPath . '/index.html', 'w');
+        $fp = fopen($fullPath.'/index.html', 'w');
 
         if ($fp) {
             if (fwrite($fp, '<html><head></head><body></body></html>')) {
@@ -7772,7 +7772,7 @@ 
             $mail->SMTPSecure = $platform_email['SMTP_SECURE'];
         }
     }
-    $mail->SMTPDebug = isset($platform_email['SMTP_DEBUG'])?$platform_email['SMTP_DEBUG']:0;
+    $mail->SMTPDebug = isset($platform_email['SMTP_DEBUG']) ? $platform_email['SMTP_DEBUG'] : 0;
 
     // 5 = low, 1 = high
     $mail->Priority = 3;
@@ -7924,11 +7924,11 @@ 
         error_log('ERROR: mail not sent to '.$recipient_name.' ('.$recipient_email.') because of '.$mail->ErrorInfo.'<br />');
         if ($mail->SMTPDebug) {
             error_log(
-                "Connection details :: " .
-                "Protocol: " . $mail->Mailer . ' :: ' .
-                "Host/Port: " . $mail->Host . ':' . $mail->Port . ' :: ' .
-                "Authent/Open: " . ($mail->SMTPAuth?'Authent':'Open') . ' :: ' .
-                ($mail->SMTPAuth?"  User/Pass: " . $mail->Username . ':' . $mail->Password:'')
+                "Connection details :: ".
+                "Protocol: ".$mail->Mailer.' :: '.
+                "Host/Port: ".$mail->Host.':'.$mail->Port.' :: '.
+                "Authent/Open: ".($mail->SMTPAuth ? 'Authent' : 'Open').' :: '.
+                ($mail->SMTPAuth ? "  User/Pass: ".$mail->Username.':'.$mail->Password : '')
             );
         }
         return 0;
@@ -7999,13 +7999,13 @@ 
  * @return array
  *
  */
-function api_unique_multidim_array($array, $key){
+function api_unique_multidim_array($array, $key) {
     $temp_array = [];
     $i = 0;
     $key_array = [];
 
-    foreach($array as $val){
-        if(!in_array($val[$key],$key_array)){
+    foreach ($array as $val) {
+        if (!in_array($val[$key], $key_array)) {
             $key_array[$i] = $val[$key];
             $temp_array[$i] = $val;
         }
@@ -8038,9 +8038,9 @@ 
  */
 function stripGivenTags($string, $tags) {
     foreach ($tags as $tag) {
-        $string2 = preg_replace('#</' . $tag . '[^>]*>#i', ' ', $string);
+        $string2 = preg_replace('#</'.$tag.'[^>]*>#i', ' ', $string);
         if ($string2 != $string) {
-            $string = preg_replace('/<' . $tag . '[^>]*>/i', ' ', $string2);
+            $string = preg_replace('/<'.$tag.'[^>]*>/i', ' ', $string2);
         }
     }
     return $string;

main/course_home/course_home.php

Indentation +7 added lines, -7 removed lines

@@ -213,7 +213,7 @@ 
             if (Database::num_rows($result) ==  0) {
                 $condition = '';
             } else {
-            	//great, there is an specific auto launch for this session we leave the $condition
+                //great, there is an specific auto launch for this session we leave the $condition
             }
         }
 
@@ -225,7 +225,7 @@ 
             $lp_data = Database::fetch_array($result,'ASSOC');
             if (!empty($lp_data['id'])) {
                 if (api_is_platform_admin() || api_is_allowed_to_edit()) {
-                	$show_autolaunch_lp_warning = true;
+                    $show_autolaunch_lp_warning = true;
                 } else {
                     $session_key = 'lp_autolaunch_'.$session_id.'_'.api_get_course_int_id().'_'.api_get_user_id();
                     if (!isset($_SESSION[$session_key])) {
@@ -254,7 +254,7 @@ 
         //if (!isset($_SESSION[$forumKey])) {
             //redirecting to the LP
             $url = api_get_path(WEB_CODE_PATH).'forum/index.php?'.api_get_cidreq().'&id_session='.$session_id;
-          //  $_SESSION[$forumKey] = true;
+            //  $_SESSION[$forumKey] = true;
             header("Location: $url");
             exit;
         //}
@@ -280,13 +280,13 @@ 
 if (api_get_setting('course.homepage_view') == 'activity' ||
     api_get_setting('course.homepage_view') == 'activity_big'
 ) {
-	require 'activity.php';
+    require 'activity.php';
 } elseif (api_get_setting('course.homepage_view') == '2column') {
-	require '2column.php';
+    require '2column.php';
 } elseif (api_get_setting('course.homepage_view') == '3column') {
-	require '3column.php';
+    require '3column.php';
 } elseif (api_get_setting('course.homepage_view') == 'vertical_activity') {
-	require 'vertical_activity.php';
+    require 'vertical_activity.php';
 }
 
 $content = '<div id="course_tools">'.$content.'</div>';

Spacing +7 added lines, -7 removed lines

@@ -41,7 +41,7 @@ 
 //unset($_SESSION['oLP']);
 //unset($_SESSION['lpobject']);
 
-$htmlHeadXtra[] ='<script>
+$htmlHeadXtra[] = '<script>
 /* option show/hide thematic-block */
 $(document).ready(function(){
     $("#thematic-show").click(function(){
@@ -209,7 +209,7 @@ 
             $session_key = 'lp_autolaunch_'.$session_id.'_'.api_get_course_int_id().'_'.api_get_user_id();
             if (!isset($_SESSION[$session_key])) {
                 //redirecting to the LP
-                $url = api_get_path(WEB_CODE_PATH) . 'lp/lp_controller.php?' . api_get_cidreq() . '&id_session=' . $session_id;
+                $url = api_get_path(WEB_CODE_PATH).'lp/lp_controller.php?'.api_get_cidreq().'&id_session='.$session_id;
                 $_SESSION[$session_key] = true;
                 header("Location: $url");
                 exit;
@@ -220,13 +220,13 @@ 
         $course_id = api_get_course_int_id();
         $condition = '';
         if (!empty($session_id)) {
-            $condition =  api_get_session_condition($session_id);
+            $condition = api_get_session_condition($session_id);
             $sql = "SELECT id FROM $lp_table
                     WHERE c_id = $course_id AND autolaunch = 1 $condition
                     LIMIT 1";
             $result = Database::query($sql);
             //If we found nothing in the session we just called the session_id =  0 autolaunch
-            if (Database::num_rows($result) ==  0) {
+            if (Database::num_rows($result) == 0) {
                 $condition = '';
             } else {
             	//great, there is an specific auto launch for this session we leave the $condition
@@ -237,8 +237,8 @@ 
                 WHERE c_id = $course_id AND autolaunch = 1 $condition
                 LIMIT 1";
         $result = Database::query($sql);
-        if (Database::num_rows($result) >  0) {
-            $lp_data = Database::fetch_array($result,'ASSOC');
+        if (Database::num_rows($result) > 0) {
+            $lp_data = Database::fetch_array($result, 'ASSOC');
             if (!empty($lp_data['id'])) {
                 if (api_is_platform_admin() || api_is_allowed_to_edit()) {
                 	$show_autolaunch_lp_warning = true;
@@ -246,7 +246,7 @@ 
                     $session_key = 'lp_autolaunch_'.$session_id.'_'.api_get_course_int_id().'_'.api_get_user_id();
                     if (!isset($_SESSION[$session_key])) {
                         //redirecting to the LP
-                        $url = api_get_path(WEB_CODE_PATH) . 'lp/lp_controller.php?' . api_get_cidreq() . '&action=view&lp_id=' . $lp_data['id'];
+                        $url = api_get_path(WEB_CODE_PATH).'lp/lp_controller.php?'.api_get_cidreq().'&action=view&lp_id='.$lp_data['id'];
 
                         $_SESSION[$session_key] = true;
                         header("Location: $url");

src/Chamilo/FaqBundle/Entity/Question.php

Spacing +1 added lines, -1 removed lines

@@ -219,7 +219,7 @@
      */
     public function getEntityIdentifier()
     {
-        return 'GenjFaqBundle:Question:' . $this->getId();
+        return 'GenjFaqBundle:Question:'.$this->getId();
     }
 
     /**

src/Chamilo/FaqBundle/Entity/Category.php

Doc Comments +2 added lines, -2 removed lines

@@ -93,7 +93,7 @@ 
      *
      * @param string $rank
      *
-     * @return Question
+     * @return Category
      */
     public function setRank($rank)
     {
@@ -201,7 +201,7 @@ 
     /**
      * Get questions
      *
-     * @return \Doctrine\Common\Collections\Collection
+     * @return Question[]
      */
     public function getQuestions()
     {

main/course_info/tools.php

Spacing +8 added lines, -8 removed lines

@@ -46,14 +46,14 @@ 
         $interbreadcrumb[] = array('url' => api_get_self().'?'.api_get_cidreq(), 'name' => get_lang('CustomizeIcons'));
         $toolName = $tool['name'];
 
-        $currentUrl = api_get_self().'?action=edit_icon&id=' . $id.'&'.api_get_cidreq();
+        $currentUrl = api_get_self().'?action=edit_icon&id='.$id.'&'.api_get_cidreq();
 
         $form = new FormValidator('icon_edit', 'post', $currentUrl);
         $form->addElement('header', get_lang('EditIcon'));
         $form->addHtml('<div class="col-md-7">');
         $form->addElement('text', 'name', get_lang('Name'));
         $form->addElement('text', 'link', get_lang('Links'));
-        $allowed_picture_types = array ('jpg', 'jpeg', 'png');
+        $allowed_picture_types = array('jpg', 'jpeg', 'png');
         $form->addElement('file', 'icon', get_lang('CustomIcon'));
         $form->addRule('icon', get_lang('OnlyImagesAllowed').' ('.implode(',', $allowed_picture_types).')', 'filetype', $allowed_picture_types);
         $form->addElement(
@@ -118,7 +118,7 @@ 
         $iconsTools .= Display::page_header(get_lang('CustomizeIcons'), null, 'h4');
         $iconsTools .= '<div class="row">';
         foreach ($toolList as $tool) {
-            $toolIconName = 'Tool' . api_underscore_to_camel_case($tool['name']);
+            $toolIconName = 'Tool'.api_underscore_to_camel_case($tool['name']);
             $toolIconName = isset($$toolIconName) ? get_lang($toolIconName) : $tool['name'];
 
             $iconsTools .= '<div class="col-md-2">';
@@ -140,13 +140,13 @@ 
 
             $delete = (!empty($tool['custom_icon'])) ? "<a class=\"btn btn-default\" onclick=\"javascript:
                 if(!confirm('".addslashes(api_htmlentities(get_lang('ConfirmYourChoice'), ENT_QUOTES, $charset)).
-                "')) return false;\" href=\"". api_get_self() . '?action=delete_icon&id=' . $tool['iid'] . '&'.api_get_cidreq()."\">
+                "')) return false;\" href=\"".api_get_self().'?action=delete_icon&id='.$tool['iid'].'&'.api_get_cidreq()."\">
             <em class=\"fa fa-trash-o\"></em></a>" : "";
-            $edit = '<a class="btn btn-default" href="' . api_get_self() . '?action=edit_icon&id=' . $tool['iid'] . '&'.api_get_cidreq().'"><em class="fa fa-pencil"></em></a>';
+            $edit = '<a class="btn btn-default" href="'.api_get_self().'?action=edit_icon&id='.$tool['iid'].'&'.api_get_cidreq().'"><em class="fa fa-pencil"></em></a>';
 
-            $iconsTools .= '<div class="icon-tools">'. $icon . '</div>';
-            $iconsTools .= '<div class="name-tools">' . $toolIconName . '</div>';
-            $iconsTools .= '<div class="toolbar">' . $edit . $delete . '</div>';
+            $iconsTools .= '<div class="icon-tools">'.$icon.'</div>';
+            $iconsTools .= '<div class="name-tools">'.$toolIconName.'</div>';
+            $iconsTools .= '<div class="toolbar">'.$edit.$delete.'</div>';
             $iconsTools .= '</div>';
             $iconsTools .= '</div>';
         }