Przeglądaj źródła

Minor - Format code

jmontoyaa 8 lat temu
rodzic
commit
e5840e28d7

+ 1 - 1
main/auth/courses.php

@@ -1,7 +1,7 @@
 <?php
 /* For licensing terms, see /license.txt */
 
-use \Chamilo\CoreBundle\Entity\SequenceResource;
+use Chamilo\CoreBundle\Entity\SequenceResource;
 
 /**
 * Template (front controller in MVC pattern) used for distpaching

+ 6 - 6
main/inc/lib/api.lib.php

@@ -574,8 +574,8 @@ define('FILE_RENAME', 2);
 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_ASSET', 'asset');
 define('RESOURCE_DOCUMENT', 'document');
@@ -921,12 +921,12 @@ function api_get_cdn_path($web_path)
 {
     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);
@@ -7805,8 +7805,8 @@ function api_mail_html(
     if (isset($additionalParameters['link'])) {
         $mailView->assign('link', $additionalParameters['link']);
     }
-    $mailView->assign('mail_header_style',api_get_configuration_value('mail_header_style'));
-    $mailView->assign('mail_content_style',api_get_configuration_value('mail_content_style'));
+    $mailView->assign('mail_header_style', api_get_configuration_value('mail_header_style'));
+    $mailView->assign('mail_content_style', api_get_configuration_value('mail_content_style'));
     $layout = $mailView->get_template('mail/mail.tpl');
     $mail->Body = $mailView->fetch($layout);
 

+ 1 - 4
main/lp/lp_controller.php

@@ -1377,12 +1377,10 @@ switch ($action) {
         }
 
         $selectedItem = null;
-
         foreach ($_SESSION['oLP']->items as $item) {
             if ($item->db_id != $_GET['id']) {
                 continue;
             }
-
             $selectedItem = $item;
         }
 
@@ -1418,14 +1416,13 @@ switch ($action) {
         }
 
         $_SESSION['refresh'] = 1;
-
         if (!isset($_POST['submit']) || empty($post_title)) {
             break;
         }
 
         $_SESSION['oLP']->getFinalItemForm();
 
-        $redirectTo = api_get_self() . '?' . http_build_query([
+        $redirectTo = api_get_self() . '?' . api_get_cidreq().'&'.http_build_query([
             'action' => 'add_item',
             'type' => 'step',
             'lp_id' => intval($_SESSION['oLP']->lp_id)

+ 4 - 5
main/lp/lp_view_item.php

@@ -18,7 +18,6 @@ require_once __DIR__.'/../inc/global.inc.php';
 api_protect_course_script();
 
 if (isset($_GET['lp_item_id'])) {
-
     // Get parameter only came from lp_view.php.
     $lp_item_id  = intval($_GET['lp_item_id']);
     if (isset($_SESSION['lpobject'])) {
@@ -62,18 +61,18 @@ $learnpath_id   = (int) $_REQUEST['lp_id'];
 
 if ((!$is_allowed_to_edit) || $isStudentView) {
     error_log('New LP - User not authorized in lp_view_item.php');
-    header('location:lp_controller.php?action=view&lp_id='.$learnpath_id);
+    header('Location: '.api_get_path(WEB_CODE_PATH).'lp/lp_controller.php?action=view&lp_id='.$learnpath_id.'&'.api_get_cidreq());
     exit;
 }
 // From here on, we are admin because of the previous condition, so don't check anymore.
 
 $course_id = api_get_course_int_id();
-$sql_query = "SELECT * FROM $tbl_lp WHERE c_id = $course_id AND id = $learnpath_id";
-$result=Database::query($sql_query);
+$sql = "SELECT * FROM $tbl_lp 
+        WHERE c_id = $course_id AND id = $learnpath_id";
+$result=Database::query($sql);
 $therow = Database::fetch_array($result);
 
 /* SHOWING THE ADMIN TOOLS	*/
-
 if (api_is_in_gradebook()) {
     $interbreadcrumb[] = array (
         'url' => api_get_path(WEB_CODE_PATH).'gradebook/index.php?'.api_get_cidreq(),