Merge branch '1.10.x' of https://github.com/chamilo/chamilo-lms into 1.10.x

app/Migrations/Schema/V110/Version20150522222222.php

@@ -17,9 +17,41 @@ class Version20150522222222 extends AbstractMigrationChamilo
      */
     public function up(Schema $schema)
     {
-        $this->addSql('ALTER TABLE user ADD COLUMN last_login datetime DEFAULT NULL');
+        // The first ALTER queries here requires a check because the field might already exist
+        $connection = $this->connection;
+        $fieldExists = false;
+        $sql = "SELECT *
+                FROM user
+                LIMIT 1";
+        $result = $connection->executeQuery($sql);
+        $dataList = $result->fetchAll();
+        if (!empty($dataList)) {
+            foreach ($dataList as $data) {
+                if (isset($data['last_login'])) {
+                    $fieldExists = true;
+                }
+            }
+        }
+        if (!$fieldExists) {
+            $this->addSql('ALTER TABLE user ADD COLUMN last_login datetime DEFAULT NULL');
+        }
         // calendar events comments
-        $this->addSql("ALTER TABLE c_calendar_event ADD COLUMN comment TEXT");
+        $fieldExists = false;
+        $sql = "SELECT *
+                FROM c_calendar_event
+                LIMIT 1";
+        $result = $connection->executeQuery($sql);
+        $dataList = $result->fetchAll();
+        if (!empty($dataList)) {
+            foreach ($dataList as $data) {
+                if (isset($data['comment'])) {
+                    $fieldExists = true;
+                }
+            }
+        }
+        if (!$fieldExists) {
+            $this->addSql("ALTER TABLE c_calendar_event ADD COLUMN comment TEXT");
+        }
 
         // Move some settings from configuration.php to the database
         // Current settings categories are:

main/inc/lib/api.lib.php

@@ -4297,8 +4297,6 @@ function api_get_language_id($language)
  **/
 function api_get_language_from_type($lang_type)
 {
-    $_user = api_get_user_info();
-    $_course = api_get_course_info();
     $return = false;
 
     switch ($lang_type) {
@@ -4308,6 +4306,7 @@ function api_get_language_from_type($lang_type)
                 $return = $temp_lang;
             break;
         case 'user_profil_lang':
+            $_user = api_get_user_info();
             if (isset($_user['language']) && !empty($_user['language']))
                 $return = $_user['language'];
             break;
@@ -4316,6 +4315,21 @@ function api_get_language_from_type($lang_type)
                 $return = $_SESSION['user_language_choice'];
             break;
         case 'course_lang':
+            global $_course;
+            $cidReq = null;
+            if (empty($_course)) {
+                // Code modified because the local.inc.php file it's declarated after this work
+                // causing the function api_get_course_info() returns a null value
+                $cidReq = isset($_GET["cidReq"]) ? Database::escape_string($_GET["cidReq"]) : null;
+                $cDir = (!empty($_GET['cDir']) ? $_GET['cDir'] : null);
+                if (empty($cidReq) && !empty($cDir)) {
+                    $c = CourseManager::get_course_id_from_path($cDir);
+                    if ($c) {
+                        $cidReq = $c;
+                    }
+                } 
+            }
+            $_course = api_get_course_info($cidReq);
             if (isset($_course['language']) && !empty($_course['language']))
                 $return = $_course['language'];
             break;

main/inc/lib/course.lib.php

@@ -2464,7 +2464,7 @@ class CourseManager
             if ($access_url_id != -1) {
                 $tbl_url_course = Database:: get_main_table(TABLE_MAIN_ACCESS_URL_REL_COURSE);
                 $join_access_url = "LEFT JOIN $tbl_url_course url_rel_course
-                                    ON url_rel_course.c_id = tcfv.c_id ";
+                                    ON url_rel_course.c_id = tcfv.item_id ";
                 $where_access_url = " AND access_url_id = $access_url_id ";
             }
         }

main/install/install.lib.php

@@ -1101,11 +1101,6 @@ function display_license_agreement()
                     <?php echo get_lang('IAccept'); ?>
                 </label>
             </div>
-        </div>
-    </div>
-    <div class="row">
-        <div class="col-md-12">
-            <p class="alert alert-info"><?php echo get_lang('LMSMediaLicense'); ?></p>
             <button type="submit" class="btn btn-default" name="step1" value="&lt; <?php echo get_lang('Previous'); ?>" >
                 <i class="fa fa-backward"> </i> <?php echo get_lang('Previous'); ?>
             </button>
@@ -1113,6 +1108,12 @@ function display_license_agreement()
             <button type="submit" class="btn btn-success" name="step3" onclick="javascript: if(!document.getElementById('accept_licence').checked) { alert('<?php echo get_lang('YouMustAcceptLicence')?>');return false;}" value="<?php echo get_lang('Next'); ?> &gt;" >
                 <i class="fa fa-forward"> </i> <?php echo get_lang('Next'); ?>
             </button>
+
+        </div>
+    </div>
+    <div class="row">
+        <div class="col-md-12">
+            <p class="alert alert-info"><?php echo get_lang('LMSMediaLicense'); ?></p>
         </div>
     </div>
 

main/template/default/layout/hot_course_item.tpl

@@ -3,7 +3,7 @@
                     <div class="col-md-4">
                         <div class="items-course">
                             <div class="items-course-image">
-                                <img class="img-responsive" src="{{ hot_course.extra_info.course_image_large }}" alt="{{ hot_course.extra_info.title|e }}"/>
+                                <a href="{{ hot_course.extra_info.course_public_url }}"><img class="img-responsive" src="{{ hot_course.extra_info.course_image_large }}" alt="{{ hot_course.extra_info.title|e }}"/></a>
                             </div>
                             <div class="items-course-info">
                                 <h4 class="title">