chamilo
/
chamilo-lms
mirror of https://github.com/chamilo/chamilo-lms/tree/1.11.x
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

user remote service plugin PHP < 7.3 compatibility - refs BT#16297

Browse Source
pull/3357/head
Sébastien Ducoulombier 5 years ago
parent 07e11708a6
commit a53833b9ce
3 changed files with 12 additions and 18 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 7
      plugin/userremoteservice/lang/english.php
  2. 11
      plugin/userremoteservice/lang/french.php
  3. 12
      plugin/userremoteservice/src/user_remote_service_plugin.class.php

7
plugin/userremoteservice/lang/english.php
Unescape View File

@ -5,15 +5,14 @@ $strings['plugin_title'] = 'User Remote Services';
$strings['plugin_comment'] = 'Appends site-specific iframe-targetted user-identifying links to the menu bar.'; $strings['plugin_comment'] = 'Appends site-specific iframe-targetted user-identifying links to the menu bar.';
$strings['salt'] = 'Salt'; $strings['salt'] = 'Salt';
$strings['salt_help'] = <<<'EOT' $strings['salt_help'] =
Secret character string, used to generate the <em>hash</em> URL parameter. The longest, the best. 'Secret character string, used to generate the <em>hash</em> URL parameter. The longest, the best.
<br/>Remote user services can check the generated URL authenticity with the following PHP expression : <br/>Remote user services can check the generated URL authenticity with the following PHP expression :
<br/><code class="php">password_verify($salt.$userId, $hash)</code> <br/><code class="php">password_verify($salt.$userId, $hash)</code>
<br/>Where <br/>Where
<br/><code>$salt</code> is this input value, <br/><code>$salt</code> is this input value,
<br/><code>$userId</code> is the number of the user referenced by the <em>username</em> URL parameter value and <br/><code>$userId</code> is the number of the user referenced by the <em>username</em> URL parameter value and
<br/><code>$hash</code> contains the <em>hash</em> URL parameter value. <br/><code>$hash</code> contains the <em>hash</em> URL parameter value.';
EOT;
// Please keep alphabetically sorted // Please keep alphabetically sorted
$strings['CreateService'] = 'Add service to menu bar'; $strings['CreateService'] = 'Add service to menu bar';

11
plugin/userremoteservice/lang/french.php
Unescape View File

@ -7,15 +7,14 @@ $strings['plugin_comment'] =
/* Strings for settings */ /* Strings for settings */
$strings['salt'] = "Sel"; $strings['salt'] = "Sel";
$strings['salt_help'] = <<<'EOT' $strings['salt_help'] =
Chaine de caractère secrète, utilisée pour générer le paramètre d'URL <em>hash</em>. Plus il est long et mieux c'est. 'Chaine de caractère secrète, utilisée pour générer le paramètre d\'URL <em>hash</em>. Plus il est long et mieux c\'est.
<br/>Les services distants peuvent vérifier la validité de l'URL générée avec l'expression PHP suivante : <br/>Les services distants peuvent vérifier la validité de l\'URL générée avec l\'expression PHP suivante :
<br/><code class="php">password_verify($salt.$userId, $hash)</code> <br/><code class="php">password_verify($salt.$userId, $hash)</code>
<br/>Où <br/>Où
<br/><code>$salt</code> est la valeur saisie ici, <br/><code>$salt</code> est la valeur saisie ici,
<br/><code>$userId</code> est le numéro de l'utilisateur auquel fait référence le paramètre d'URL <em>username</em> et <br/><code>$userId</code> est le numéro de l\'utilisateur auquel fait référence le paramètre d\'URL <em>username</em> et
<br/><code>$hash</code> représente la valeur du paramètre d'URL <em>hash</em>. <br/><code>$hash</code> représente la valeur du paramètre d\'URL <em>hash</em>.';
EOT;
// Please keep alphabetically sorted // Please keep alphabetically sorted
$strings['CreateService'] = "Ajouter le service au menu"; $strings['CreateService'] = "Ajouter le service au menu";

12
plugin/userremoteservice/src/user_remote_service_plugin.class.php
Unescape View File

@ -42,13 +42,11 @@ class UserRemoteServicePlugin extends Plugin
{ {
Database::query( Database::query(
sprintf( sprintf(
<<<OEQ 'create table if not exists %s (
create table if not exists %s (
id int unsigned not null auto_increment primary key, id int unsigned not null auto_increment primary key,
title varchar(255) not null, title varchar(255) not null,
url varchar(255) not null url varchar(255) not null
) )',
OEQ,
Database::get_main_table(self::TABLE) Database::get_main_table(self::TABLE)
) )
); );
@ -268,11 +266,9 @@ OEQ,
{ {
$userInfo = api_get_user_info(); $userInfo = api_get_user_info();
return sprintf( return sprintf(
<<<HTML '<div class="embed-responsive embed-responsive-16by9">
<div class="embed-responsive embed-responsive-16by9">
<iframe class="embed-responsive-item" src="%s"></iframe> <iframe class="embed-responsive-item" src="%s"></iframe>
</div> </div>',
HTML,
$this->getService( $this->getService(
$this->getActiveServiceId() $this->getActiveServiceId()
)->getCustomUserURL($userInfo['username'], $userInfo['id'], $this->salt()) )->getCustomUserURL($userInfo['username'], $userInfo['id'], $this->salt())

Write Preview
Loading…
Cancel
Save