From 768e1263fe35d5e653c5c022122cc7eae39d8f23 Mon Sep 17 00:00:00 2001 From: Yannick Warnier Date: Mon, 10 Oct 2016 10:42:13 -0500 Subject: [PATCH] Rename suscribe_users_to_session() to subscribe_users_to_session() --- main/admin/user_move_stats.php | 2 +- main/auth/courses.php | 2 +- main/inc/lib/usergroup.lib.php | 4 ++-- main/session/add_users_to_session.php | 2 +- main/session/session_user_import.php | 2 +- main/user/add_users_to_session.php | 2 +- main/webservices/registration.soap.php | 4 ++-- main/webservices/webservice_session.php | 2 +- .../ajax/advanced_subscription.ajax.php | 2 +- plugin/advanced_subscription/src/open_session.php | 2 +- plugin/buycourses/src/buy_course_plugin.class.php | 2 +- tests/main/inc/lib/sessionmanager.lib.test.php | 4 ++-- tests/main/inc/lib/usermanager.lib.test.php | 2 +- tests/phpunit/classes/SessionManager.lib.php | 6 +++--- 14 files changed, 19 insertions(+), 19 deletions(-) diff --git a/main/admin/user_move_stats.php b/main/admin/user_move_stats.php index af90e2740f..5848beb595 100755 --- a/main/admin/user_move_stats.php +++ b/main/admin/user_move_stats.php @@ -109,7 +109,7 @@ if (isset($_REQUEST['load_ajax'])) { if (empty($result) || !in_array($user_id, array_keys($result))) { if ($debug) echo 'User added to the session'; //Registering user to the new session - SessionManager::suscribe_users_to_session($new_session_id,array($user_id),false); + SessionManager::subscribe_users_to_session($new_session_id,array($user_id),false); } //Begin with the import process diff --git a/main/auth/courses.php b/main/auth/courses.php index aa4fec2885..cf3046c85c 100755 --- a/main/auth/courses.php +++ b/main/auth/courses.php @@ -283,7 +283,7 @@ switch ($action) { } } - SessionManager::suscribe_users_to_session( + SessionManager::subscribe_users_to_session( $_GET['session_id'], array($userId), SESSION_VISIBLE_READ_ONLY, diff --git a/main/inc/lib/usergroup.lib.php b/main/inc/lib/usergroup.lib.php index 4b910d018d..014f7e2c09 100755 --- a/main/inc/lib/usergroup.lib.php +++ b/main/inc/lib/usergroup.lib.php @@ -637,7 +637,7 @@ class UserGroup extends Model Database::insert($this->usergroup_rel_session_table, $params); if (!empty($user_list)) { - SessionManager::suscribe_users_to_session($session_id, $user_list, null, false); + SessionManager::subscribe_users_to_session($session_id, $user_list, null, false); } } } @@ -774,7 +774,7 @@ class UserGroup extends Model // Adding sessions if (!empty($session_list)) { foreach ($session_list as $session_id) { - SessionManager::suscribe_users_to_session($session_id, $new_items, null, false); + SessionManager::subscribe_users_to_session($session_id, $new_items, null, false); } } diff --git a/main/session/add_users_to_session.php b/main/session/add_users_to_session.php index 123aaf67e2..629b5f01c1 100644 --- a/main/session/add_users_to_session.php +++ b/main/session/add_users_to_session.php @@ -317,7 +317,7 @@ if (isset($_POST['form_sent']) && $_POST['form_sent']) { if ($form_sent == 1) { // Added a parameter to send emails when registering a user - SessionManager::suscribe_users_to_session( + SessionManager::subscribe_users_to_session( $id_session, $UserList, null, diff --git a/main/session/session_user_import.php b/main/session/session_user_import.php index 6e56565718..d9645e2008 100644 --- a/main/session/session_user_import.php +++ b/main/session/session_user_import.php @@ -44,7 +44,7 @@ if (isset($_POST['formSent']) && $_POST['formSent']) { } if (!empty($user_list)) { - SessionManager::suscribe_users_to_session( + SessionManager::subscribe_users_to_session( $session_id, $user_list, null, diff --git a/main/user/add_users_to_session.php b/main/user/add_users_to_session.php index 8dd0eae8e8..d75b37533d 100755 --- a/main/user/add_users_to_session.php +++ b/main/user/add_users_to_session.php @@ -277,7 +277,7 @@ if ($allowTutors == 'true') { if ($form_sent == 1) { //added a parameter to send emails when registering a user - SessionManager::suscribe_users_to_session($id_session, $UserList, null, true); + SessionManager::subscribe_users_to_session($id_session, $UserList, null, true); header('Location: resume_session.php?id_session='.$id_session); exit; } diff --git a/main/webservices/registration.soap.php b/main/webservices/registration.soap.php index 6c5dc0d8db..5e99a59fcd 100755 --- a/main/webservices/registration.soap.php +++ b/main/webservices/registration.soap.php @@ -5213,7 +5213,7 @@ function WSSuscribeUsersToSession($params) continue; // user_id is not active. } - SessionManager::suscribe_users_to_session($sessionId, array($user_id), SESSION_VISIBLE_READ_ONLY, false); + SessionManager::subscribe_users_to_session($sessionId, array($user_id), SESSION_VISIBLE_READ_ONLY, false); $results[] = 1; if ($debug) error_log("subscribe user:$user_id to session $sessionId"); @@ -5294,7 +5294,7 @@ function WSSubscribeUserToSessionSimple($params) { error_log($result); } } else { - SessionManager::suscribe_users_to_session( + SessionManager::subscribe_users_to_session( $session_id, array($user_id), SESSION_VISIBLE_READ_ONLY, diff --git a/main/webservices/webservice_session.php b/main/webservices/webservice_session.php index 7d4270ac35..c8124ceffb 100755 --- a/main/webservices/webservice_session.php +++ b/main/webservices/webservice_session.php @@ -302,7 +302,7 @@ class WSSession extends WS return $user_id; } else { if($state == 1) { - SessionManager::suscribe_users_to_session($session_id, array($user_id)); + SessionManager::subscribe_users_to_session($session_id, array($user_id)); } else { $result = SessionManager::unsubscribe_user_from_session($session_id, $user_id); if (!$result) { diff --git a/plugin/advanced_subscription/ajax/advanced_subscription.ajax.php b/plugin/advanced_subscription/ajax/advanced_subscription.ajax.php index 23b61443cd..4ab5f36897 100644 --- a/plugin/advanced_subscription/ajax/advanced_subscription.ajax.php +++ b/plugin/advanced_subscription/ajax/advanced_subscription.ajax.php @@ -312,7 +312,7 @@ if ($verified) { // Student Session inscription if ($data['newStatus'] == ADVANCED_SUBSCRIPTION_QUEUE_STATUS_ADMIN_APPROVED) { - SessionManager::suscribe_users_to_session( + SessionManager::subscribe_users_to_session( $data['sessionId'], array($data['studentUserId']), null, diff --git a/plugin/advanced_subscription/src/open_session.php b/plugin/advanced_subscription/src/open_session.php index 4c0d142007..9452d48d2b 100644 --- a/plugin/advanced_subscription/src/open_session.php +++ b/plugin/advanced_subscription/src/open_session.php @@ -42,7 +42,7 @@ if (SessionManager::isUserSubscribedAsStudent( $tpl->assign('is_subscribed', false); $tpl->assign('errorMessages', $plugin->getErrorMessages()); } else { - SessionManager::suscribe_users_to_session( + SessionManager::subscribe_users_to_session( $_GET['session_id'], [$_GET['user_id']], SESSION_VISIBLE_READ_ONLY, diff --git a/plugin/buycourses/src/buy_course_plugin.class.php b/plugin/buycourses/src/buy_course_plugin.class.php index 09af1c39a1..281edb8143 100644 --- a/plugin/buycourses/src/buy_course_plugin.class.php +++ b/plugin/buycourses/src/buy_course_plugin.class.php @@ -912,7 +912,7 @@ class BuyCoursesPlugin extends Plugin $saleIsCompleted = CourseManager::subscribe_user($sale['user_id'], $course['code']); break; case self::PRODUCT_TYPE_SESSION: - SessionManager::suscribe_users_to_session( + SessionManager::subscribe_users_to_session( $sale['product_id'], [$sale['user_id']], api_get_session_visibility($sale['product_id']), diff --git a/tests/main/inc/lib/sessionmanager.lib.test.php b/tests/main/inc/lib/sessionmanager.lib.test.php index a4b35bb7c8..f3e87852fd 100755 --- a/tests/main/inc/lib/sessionmanager.lib.test.php +++ b/tests/main/inc/lib/sessionmanager.lib.test.php @@ -121,10 +121,10 @@ class TestSessionManager extends UnitTestCase { //var_dump($res); } - function testsuscribe_users_to_session() { + function testsubscribe_users_to_session() { $id_session=''; $user_list=''; - $res=SessionManager::suscribe_users_to_session($id_session,$user_list,$empty_users=true); + $res=SessionManager::subscribe_users_to_session($id_session,$user_list,$empty_users=true); if(!is_null($res)) $this->assertTrue(is_bool($res)); //var_dump($res); } diff --git a/tests/main/inc/lib/usermanager.lib.test.php b/tests/main/inc/lib/usermanager.lib.test.php index db868203be..1e3921c6e6 100755 --- a/tests/main/inc/lib/usermanager.lib.test.php +++ b/tests/main/inc/lib/usermanager.lib.test.php @@ -278,7 +278,7 @@ class TestUserManager extends UnitTestCase { function testSuscribeUsersToSession() { $id_session=1; $UserList=''; - $res=UserManager::suscribe_users_to_session($id_session,$UserList); + $res=UserManager::subscribe_users_to_session($id_session,$UserList); $this->assertTrue(is_null($res)); } */ diff --git a/tests/phpunit/classes/SessionManager.lib.php b/tests/phpunit/classes/SessionManager.lib.php index 8431f79957..013ca10320 100755 --- a/tests/phpunit/classes/SessionManager.lib.php +++ b/tests/phpunit/classes/SessionManager.lib.php @@ -123,10 +123,10 @@ class SessionManagerTest extends PHPUnit_Framework_TestCase } /** - * @covers SessionManager::suscribe_users_to_session - * @todo Implement testSuscribe_users_to_session(). + * @covers SessionManager::subscribe_users_to_session + * @todo Implement testSubscribe_users_to_session(). */ - public function testSuscribe_users_to_session() + public function testSubscribe_users_to_session() { // Remove the following lines when you implement this test. $this->markTestIncomplete(