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

main/admin/index.php

@@ -7,6 +7,7 @@
 /**
  * Code
  */
+
 // Language files that need to be included.
 $language_file = array('admin', 'tracking','coursebackup');
 
@@ -228,9 +229,20 @@ if (api_is_platform_admin()) {
 		$items[] = array('url'=>'filler.php', 	'label' => get_lang('DataFiller'));
 	}
 	$items[] = array('url'=>'archive_cleanup.php', 	'label' => get_lang('ArchiveDirCleanup'));
-        if (api_get_setting('server_type') === 'test') {
-            $items[] = array('url'=>'system_management.php', 'label' => get_lang('SystemManagement'));
-        }
+    if (api_get_setting('server_type') === 'test') {
+        $items[] = array('url'=>'system_management.php', 'label' => get_lang('SystemManagement'));
+    }
+
+    if (isset($_configuration['db_manager_enabled']) &&
+        $_configuration['db_manager_enabled'] == true &&
+        api_is_global_platform_admin()
+    ) {
+        $host = $_configuration['db_host'];
+        $username = $_configuration['db_user'];
+        $databaseName = $_configuration['main_database'];
+
+        $items[] = array('url'=>"db.php?username=$username&db=$databaseName&server=$host", 'label' => get_lang('Database Manager'));
+    }
 
 	$blocks['settings']['items'] = $items;
     $blocks['settings']['extra'] = null;

main/inc/lib/extra_field_value.lib.php

@@ -104,7 +104,6 @@ class ExtraFieldValue extends Model
                 if (!isset($params[$tempKey])) {
                     $params[$tempKey] = array();
                 }
-                break;
             }
         }
 
@@ -123,8 +122,8 @@ class ExtraFieldValue extends Model
                         case ExtraField::FIELD_TYPE_TAG :
 
                             $old = self::getAllValuesByItemAndField(
-                                $extra_field_info['id'],
-                                $params[$this->handler_id]
+                                $params[$this->handler_id],
+                                $extra_field_info['id']
                             );
 
                             $deleteItems = array();
@@ -149,8 +148,8 @@ class ExtraFieldValue extends Model
                             if (!empty($deleteItems)) {
                                 foreach ($deleteItems as $deleteFieldValue) {
                                     self::deleteValuesByHandlerAndFieldAndValue(
-                                        $extra_field_info['id'],
                                         $params[$this->handler_id],
+                                        $extra_field_info['id'],
                                         $deleteFieldValue
                                     );
                                 }

main/inc/lib/fckeditor/editor/plugins/media/lang/nl.js

@@ -0,0 +1,20 @@
+/*
+ * For FCKeditor 2.3
+ *
+ *
+ */
+
+FCKLang['MediaTip']			 = 'Media invoegen/uitgeven' ;
+FCKLang['DlgMediaTitle']		= 'Media eigenschap' ;
+FCKLang['DlgMediaCode']		= '"Please insert the URL of Media videos."' ;
+FCKLang['DlgMediaSecurity']	= 'Ongeldige URL.' ;
+FCKLang['DlgMediaURL']	    = 'URL' ;
+FCKLang['DlgMediaWidth']	    = 'Breedte' ;
+FCKLang['DlgMediaHeight']	    = 'Hoogte' ;
+FCKLang['DlgMediaQuality']    = 'Qualiteit' ;
+FCKLang['DlgMediaLow']	    = 'Laag' ;
+FCKLang['DlgMediaHigh']	    = 'Hoog (indien beschikbaar)' ;
+FCKLang['DlgMediaURLTip']		= 'Tip:' ;
+FCKLang['DlgMediaURLTipContent1']  = 'Go to %s. Navigate within the site to find your video.' ;
+FCKLang['DlgMediaURLTipContent2']  = 'Copy the URL of the video from your browser\'s address box and paste it in this dialog, the "URL" box.' ;
+FCKLang['DlgMediaURLTipContent3']  = 'The copied URL should look like %s.' ;

main/install/configuration.dist.php

@@ -6,7 +6,7 @@
  *		Virtual campus configuration
  *
  * This file contains a list of variables that can be modified by the campus
- * site's server administrator. Pay attention when changing these variables, 
+ * site's server administrator. Pay attention when changing these variables,
  * some changes may cause Chamilo to stop working.
  * If you changed some settings and want to restore them, please have a look at
  * configuration.dist.php. That file is an exact copy of the config file at
@@ -15,13 +15,13 @@
 
 /**
  * $_configuration define only the bare essential variables
- * for configuring the platform (paths, database connections, ...). 
+ * for configuring the platform (paths, database connections, ...).
  * Changing a $_configuration variable CAN generally break the installation.
- * Besides the $_configuration, a $_settings array also exists, that 
+ * Besides the $_configuration, a $_settings array also exists, that
  * contains variables that can be changed and will not break the platform.
- * These optional settings are defined in the database, now 
+ * These optional settings are defined in the database, now
  * (table settings_current).
- * example: $_configuration['tracking_enabled'] (assuming that the install 
+ * example: $_configuration['tracking_enabled'] (assuming that the install
  * script creates the necessary tables anyway).
  */
 
@@ -55,6 +55,8 @@ $_configuration['statistics_database']   ='{DATABASE_STATS}';
 // User Personal Database (where all the personal stuff of the user is stored
 // (personal agenda items, course sorting)
 $_configuration['user_personal_database']='{DATABASE_PERSONAL}';
+// Enable access to database management for platform admins.
+$_configuration['db_manager_enabled'] = false;
 
 /**
  * Directory settings
@@ -79,7 +81,7 @@ $_configuration['course_folder']  = "courses/";
 $_configuration['db_admin_path']  = '';
 
 /**
- * 
+ *
  * Login modules settings
  */
 // CAS IMPLEMENTATION
@@ -103,7 +105,7 @@ $extAuthSource["cas"]["newUser"] = $_configuration['root_sys'].$_configuration['
 // $extAuthSource["external_login"]["updateUser"] = $_configuration['root_sys'].$_configuration['code_append']."auth/external_login/updateUser.php";
 
 /**
- * 
+ *
  * Hosting settings - Allows you to set limits to the Chamilo portal when
  * hosting it for a third party. These settings can be overwritten by an
  * optionally-loaded extension file with only the settings (no comments).
@@ -124,7 +126,7 @@ $_configuration[1]['hosting_limit_sessions'] = 0;
 $_configuration[1]['hosting_limit_disk_space'] = 0;
 
 /**
- * Content Delivery Network (CDN) settings. Only use if you need a separate 
+ * Content Delivery Network (CDN) settings. Only use if you need a separate
  * server to serve your static data. If you don't know what a CDN is, you
  * don't need it. These settings are for simple Origin Pull CDNs and are
  * experimental. Enable only if you really know what you're doing.
@@ -191,4 +193,4 @@ $_configuration['system_stable']     = NEW_VERSION_STABLE;
 // Boost query on last connection time
 //$_configuration['save_user_last_login'] = true;
 // Allow course tutors in sessions to add existing students to their session
-//$_configuration['allow_tutors_to_assign_students_to_session'] = 'false'; 
+//$_configuration['allow_tutors_to_assign_students_to_session'] = 'false';