diff --git a/public/main/auth/profile.php b/public/main/auth/profile.php index 61a9e55a8f..67bacab252 100644 --- a/public/main/auth/profile.php +++ b/public/main/auth/profile.php @@ -95,7 +95,7 @@ $user_data = api_get_user_info( true ); $array_list_key = UserManager::get_api_keys(api_get_user_id()); -$id_temp_key = UserManager::get_api_key_id(api_get_user_id(), 'dokeos'); +$id_temp_key = UserManager::get_api_key_id(api_get_user_id(), 'default'); $value_array = []; if (isset($array_list_key[$id_temp_key])) { $value_array = $array_list_key[$id_temp_key]; diff --git a/public/main/inc/lib/usermanager.lib.php b/public/main/inc/lib/usermanager.lib.php index 50f1923072..45495424f5 100644 --- a/public/main/inc/lib/usermanager.lib.php +++ b/public/main/inc/lib/usermanager.lib.php @@ -3274,7 +3274,7 @@ class UserManager * * @return mixed Non-indexed array containing the list of API keys for this user, or FALSE on error */ - public static function get_api_keys($user_id = null, $api_service = 'dokeos') + public static function get_api_keys($user_id = null, $api_service = 'default') { if ($user_id != strval(intval($user_id))) { return false; @@ -3315,7 +3315,7 @@ class UserManager * * @return bool True on success, false on failure */ - public static function add_api_key($user_id = null, $api_service = 'dokeos') + public static function add_api_key($user_id = null, $api_service = 'default') { if ($user_id != strval(intval($user_id))) { return false; diff --git a/public/main/webservices/courses_list.soap.php b/public/main/webservices/courses_list.soap.php index 8cd4126239..cc89ccd7fa 100644 --- a/public/main/webservices/courses_list.soap.php +++ b/public/main/webservices/courses_list.soap.php @@ -95,7 +95,7 @@ function WSCourseList($username, $signature, $visibilities = 'public') return -1; } - $list = UserManager::get_api_keys($user_id, 'dokeos'); + $list = UserManager::get_api_keys($user_id, 'default'); $key = ''; foreach ($list as $key) { break; diff --git a/src/CoreBundle/Migrations/Schema/V200/Version20.php b/src/CoreBundle/Migrations/Schema/V200/Version20.php index a49c0c7fb0..c11d117224 100644 --- a/src/CoreBundle/Migrations/Schema/V200/Version20.php +++ b/src/CoreBundle/Migrations/Schema/V200/Version20.php @@ -264,6 +264,11 @@ class Version20 extends AbstractMigrationChamilo $this->addSql('ALTER TABLE personal_agenda ADD CONSTRAINT FK_D86124608D93D649 FOREIGN KEY (user) REFERENCES user (id) ON DELETE CASCADE'); } + // Convert user_api_key.api_service to 'default' + $table = $schema->getTable('user_api_key'); + if ($table->hasColumn('api_service')) { + $this->addSql("UPDATE user_api_key SET api_service = 'default' WHERE api_service = 'dokeos'"); + } //$this->addSql('ALTER TABLE c_tool_intro CHANGE id tool VARCHAR(255) NOT NULL'); /*$table = $schema->getTable('course_rel_class');