Merge pull request #4371 from christianbeeznest/GH-2560

User - Convert user_api_key.api_service to 'default' - refs CT#2560

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];

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;

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;

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');