@@ -9,7 +9,7 @@ discard block |
||
9 | 9 | * Init |
10 | 10 | */ |
11 | 11 | |
12 | -require_once __DIR__ . '/../config.php'; |
|
12 | +require_once __DIR__.'/../config.php'; |
|
13 | 13 | $plugin = AdvancedSubscriptionPlugin::create(); |
14 | 14 | $now = api_get_utc_datetime(); |
15 | 15 | $weekAgo = api_get_utc_datetime('-1 week'); |
@@ -18,10 +18,10 @@ discard block |
||
18 | 18 | /** |
19 | 19 | * Get session list |
20 | 20 | */ |
21 | -$joinTables = Database::get_main_table(TABLE_MAIN_SESSION) . ' s INNER JOIN ' . |
|
22 | - Database::get_main_table(TABLE_MAIN_SESSION_USER) . ' su ON s.id = su.session_id INNER JOIN ' . |
|
23 | - Database::get_main_table(TABLE_MAIN_USER_REL_USER) . ' uu ON su.user_id = uu.user_id INNER JOIN ' . |
|
24 | - Database::get_main_table(TABLE_ADVANCED_SUBSCRIPTION_QUEUE) . ' asq ON su.session_id = asq.session_id AND su.user_id = asq.user_id'; |
|
21 | +$joinTables = Database::get_main_table(TABLE_MAIN_SESSION).' s INNER JOIN '. |
|
22 | + Database::get_main_table(TABLE_MAIN_SESSION_USER).' su ON s.id = su.session_id INNER JOIN '. |
|
23 | + Database::get_main_table(TABLE_MAIN_USER_REL_USER).' uu ON su.user_id = uu.user_id INNER JOIN '. |
|
24 | + Database::get_main_table(TABLE_ADVANCED_SUBSCRIPTION_QUEUE).' asq ON su.session_id = asq.session_id AND su.user_id = asq.user_id'; |
|
25 | 25 | $columns = 's.id AS session_id, uu.friend_user_id AS superior_id, uu.user_id AS student_id, asq.id AS queue_id, asq.status AS status'; |
26 | 26 | $conditions = array( |
27 | 27 | 'where' => array( |
@@ -133,8 +133,7 @@ discard block |
||
133 | 133 | $isWesternNameOrder = api_is_western_name_order(); |
134 | 134 | foreach ($admins as &$admin) { |
135 | 135 | $admin['complete_name'] = $isWesternNameOrder ? |
136 | - $admin['firstname'] . ', ' . $admin['lastname'] : |
|
137 | - $admin['lastname'] . ', ' . $admin['firstname'] |
|
136 | + $admin['firstname'].', '.$admin['lastname'] : $admin['lastname'].', '.$admin['firstname'] |
|
138 | 137 | ; |
139 | 138 | } |
140 | 139 | unset($admin); |
@@ -149,8 +148,8 @@ discard block |
||
149 | 148 | ); |
150 | 149 | foreach ($queueByAdmin as $sessionId => $studentInfo) { |
151 | 150 | $data['sessionId'] = $sessionId; |
152 | - $data['admin_view_url'] = api_get_path(WEB_PLUGIN_PATH) . |
|
153 | - 'advanced_subscription/src/admin_view.php?s=' . $data['sessionId']; |
|
151 | + $data['admin_view_url'] = api_get_path(WEB_PLUGIN_PATH). |
|
152 | + 'advanced_subscription/src/admin_view.php?s='.$data['sessionId']; |
|
154 | 153 | $data['session'] = $sessionInfoList[$sessionId]; |
155 | 154 | $data['students'] = $studentInfo['students']; |
156 | 155 | $plugin->sendMail($data, ADVANCED_SUBSCRIPTION_ACTION_REMINDER_ADMIN); |
@@ -31,7 +31,7 @@ |
||
31 | 31 | |
32 | 32 | $resubscriptionLimit = Resubscription::create()->get('resubscription_limit'); |
33 | 33 | |
34 | - // Initialize variables as a calendar year by default |
|
34 | + // Initialize variables as a calendar year by default |
|
35 | 35 | $limitDateFormat = 'Y-01-01'; |
36 | 36 | $limitDate = gmdate($limitDateFormat); |
37 | 37 | $resubscriptionOffset = "1 year"; |
@@ -101,7 +101,7 @@ |
||
101 | 101 | $resubscriptionDate = gmdate($limitDateFormat, strtotime($endDate." +$resubscriptionOffset")); |
102 | 102 | $icon = Display::return_icon('students.gif', get_lang('Student')); |
103 | 103 | $canResubscribeFrom = sprintf(get_plugin_lang('CanResubscribeFromX', 'resubscription'), $resubscriptionDate); |
104 | - throw new Exception(Display::label($icon . ' ' . $canResubscribeFrom, "info")); |
|
104 | + throw new Exception(Display::label($icon.' '.$canResubscribeFrom, "info")); |
|
105 | 105 | } |
106 | 106 | } |
107 | 107 | } |
@@ -22,7 +22,7 @@ |
||
22 | 22 | |
23 | 23 | /** |
24 | 24 | * Limit session resubscription when a Chamilo user is resubscribed to a session |
25 | - * @param HookCreateUserEventInterface $hook The hook |
|
25 | + * @param HookResubscribeEventInterface $hook The hook |
|
26 | 26 | */ |
27 | 27 | public function hookResubscribe(HookResubscribeEventInterface $hook) |
28 | 28 | { |
@@ -17,4 +17,4 @@ |
||
17 | 17 | // The plugin author. |
18 | 18 | $plugin_info['author'] = 'Julio Montoya'; |
19 | 19 | // For bigger icons change this value to addthis_32x32_style |
20 | -$plugin_info['icon_class'] = ''; |
|
20 | +$plugin_info['icon_class'] = ''; |
@@ -23,7 +23,7 @@ |
||
23 | 23 | $plugin_info['templates'] = array('template.tpl'); |
24 | 24 | |
25 | 25 | //For bigger icons change this value to addthis_32x32_style |
26 | -$plugin_info['icon_class'] = ''; |
|
26 | +$plugin_info['icon_class'] = ''; |
|
27 | 27 | |
28 | 28 | //To use vertical alignment change this value to |
29 | -$plugin_info['position'] = 'addthis_default_style'; //addthis_vertical_style |
|
29 | +$plugin_info['position'] = 'addthis_default_style'; //addthis_vertical_style |
@@ -18,7 +18,7 @@ |
||
18 | 18 | // the comm |
19 | 19 | $comm_label = api_htmlentities( |
20 | 20 | $plugin_info['settings']['add_cas_login_button_cas_button_comment'] |
21 | - );; |
|
21 | + ); ; |
|
22 | 22 | // URL of the image |
23 | 23 | $url_label = $plugin_info['settings']['add_cas_login_button_cas_image_url']; |
24 | 24 |
@@ -10,7 +10,7 @@ discard block |
||
10 | 10 | */ |
11 | 11 | |
12 | 12 | //the plugin title |
13 | -$plugin_info['title'] = 'Add a button to login using CAS'; |
|
13 | +$plugin_info['title'] = 'Add a button to login using CAS'; |
|
14 | 14 | |
15 | 15 | //the comments that go with the plugin |
16 | 16 | $plugin_info['comment'] = "If CAS is activated, this plugin add a text and a button on the login page to login with CAS. Configure plugin to add title, comment and logo."; |
@@ -38,4 +38,4 @@ discard block |
||
38 | 38 | $plugin_info['settings_form'] = $form; |
39 | 39 | |
40 | 40 | //set the templates that are going to be used |
41 | -$plugin_info['templates'] = array('template.tpl'); |
|
41 | +$plugin_info['templates'] = array('template.tpl'); |
@@ -19,6 +19,6 @@ |
||
19 | 19 | { |
20 | 20 | $this->_user = CONFIG_OPENMEETINGS_USER; |
21 | 21 | $this->_pass = CONFIG_OPENMEETINGS_PASS; |
22 | - $this->_serverBaseUrl = CONFIG_OPENMEETINGS_SERVER_URL; |
|
22 | + $this->_serverBaseUrl = CONFIG_OPENMEETINGS_SERVER_URL; |
|
23 | 23 | } |
24 | 24 | } |
@@ -49,9 +49,9 @@ discard block |
||
49 | 49 | global $_configuration; |
50 | 50 | $this->name = 'C'.api_get_real_course_id().'-'.api_get_session_id(); |
51 | 51 | $accessUrl = api_get_access_url($_configuration['access_url']); |
52 | - $this->externalRoomType = substr($accessUrl['url'], strpos($accessUrl['url'],'://')+3,-1); |
|
52 | + $this->externalRoomType = substr($accessUrl['url'], strpos($accessUrl['url'], '://') + 3, -1); |
|
53 | 53 | if (strcmp($this->externalRoomType, 'localhost') == 0) { |
54 | - $this->externalRoomType = substr(api_get_path(WEB_PATH), strpos(api_get_path(WEB_PATH),'://')+3, -1); |
|
54 | + $this->externalRoomType = substr(api_get_path(WEB_PATH), strpos(api_get_path(WEB_PATH), '://') + 3, -1); |
|
55 | 55 | } |
56 | 56 | $this->externalRoomType = 'chamilolms.'.$this->externalRoomType; |
57 | 57 | } |
@@ -110,6 +110,6 @@ discard block |
||
110 | 110 | if (!isset($this->$attribute)) { |
111 | 111 | return $voidReturn; |
112 | 112 | } |
113 | - return $this->$attribute?'true':'false'; |
|
113 | + return $this->$attribute ? 'true' : 'false'; |
|
114 | 114 | } |
115 | 115 | } |
@@ -75,14 +75,13 @@ |
||
75 | 75 | $trimmedKey = trim(CONFIG_SECURITY_API_KEY); |
76 | 76 | if (!empty($trimmedKey)) { |
77 | 77 | $message = array( |
78 | - "to" => array_key_exists("mobilePhoneNumber",$additionalParameters) ? |
|
79 | - $additionalParameters['mobilePhoneNumber'] : |
|
80 | - $this->getMobilePhoneNumberById($additionalParameters['userId']), |
|
78 | + "to" => array_key_exists("mobilePhoneNumber", $additionalParameters) ? |
|
79 | + $additionalParameters['mobilePhoneNumber'] : $this->getMobilePhoneNumberById($additionalParameters['userId']), |
|
81 | 80 | "message" => $this->getSms($additionalParameters) |
82 | 81 | ); |
83 | 82 | |
84 | 83 | if (!empty($message['message'])) { |
85 | - if(extension_loaded('curl')) { |
|
84 | + if (extension_loaded('curl')) { |
|
86 | 85 | $url = $this->hostAddress.'?username='. |
87 | 86 | $this->username.'&password='.$this->password.'&from='. |
88 | 87 | $this->from.'&to='.$message['to'].'&msg='.urlencode($message['message']); |