chamilo / chamilo-lms

plugin/tour/src/tour_plugin.class.php

Spacing +2 added lines, -2 removed lines

@@ -129,8 +129,8 @@
      */
     public function getTourConfig()
     {
-        $pluginPath = api_get_path(SYS_PLUGIN_PATH) . 'tour/';
-        $jsonContent = file_get_contents($pluginPath . 'config/tour.json');
+        $pluginPath = api_get_path(SYS_PLUGIN_PATH).'tour/';
+        $jsonContent = file_get_contents($pluginPath.'config/tour.json');
         $jsonData = json_decode($jsonContent, true);
 
         return $jsonData;

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/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>';
         }

main/auth/external_login/facebook.init.php

Spacing +1 added lines, -1 removed lines

@@ -22,5 +22,5 @@
  * See facebook section of the auth.conf.php file
  */
 
-require dirname(__FILE__) . '/../../../app/config/auth.conf.php';
+require dirname(__FILE__).'/../../../app/config/auth.conf.php';