moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-05 00:46:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

MDL-20534 lti: Replacing <<< strings with normal multi-line strings.

Browse source
This commit is contained in:
Chris Scribner 2011-11-07 01:05:42 -05:00
parent a55c361955
commit 5de15b83cc
8 changed files with 157 additions and 156 deletions
Download patch file Download diff file Expand all files Collapse all files

14
mod/lti/grade.php
View file

@ -87,17 +87,17 @@ $PAGE->requires->js_init_call('M.mod_lti.submissions.init', array(), true, $modu
$PAGE->requires->yui2_lib('datatable'); $PAGE->requires->yui2_lib('datatable');
$submissionquery = <<<SQL $submissionquery = '
SELECT s.id, u.firstname, u.lastname, u.id AS userid, s.datesubmitted, s.gradepercent SELECT s.id, u.firstname, u.lastname, u.id AS userid, s.datesubmitted, s.gradepercent
FROM {lti_submission} s FROM {lti_submission} s
INNER JOIN {user} u ON s.userid = u.id INNER JOIN {user} u ON s.userid = u.id
WHERE s.ltiid = :ltiid WHERE s.ltiid = :ltiid
ORDER BY s.datesubmitted DESC ORDER BY s.datesubmitted DESC
SQL; ';
$submissions = $DB->get_records_sql($submissionquery, array('ltiid' => $lti->id)); $submissions = $DB->get_records_sql($submissionquery, array('ltiid' => $lti->id));
$html = <<<HTML $html = '
<noscript> <noscript>
<!-- If javascript is disabled, we need to show the table using CSS. <!-- If javascript is disabled, we need to show the table using CSS.
The table starts out hidden to avoid flickering as it loads --> The table starts out hidden to avoid flickering as it loads -->
@ -107,7 +107,7 @@ $html = <<<HTML
</noscript> </noscript>
<div id="lti_submissions_table_container" style="display:none"> <div id="lti_submissions_table_container" style="display:none">
<table id='lti_submissions_table'> <table id="lti_submissions_table">
<thead> <thead>
<tr> <tr>
<th>User</th> <th>User</th>
@ -120,9 +120,9 @@ $html = <<<HTML
</tbody> </tbody>
</table> </table>
</div> </div>
HTML; ';
$rowtemplate = <<<HTML $rowtemplate = '
<tr> <tr>
<td> <td>
<!--firstname--> <!--lastname--> <!--firstname--> <!--lastname-->
@ -134,7 +134,7 @@ $rowtemplate = <<<HTML
<!--gradepercent--> <!--gradepercent-->
</td> </td>
</tr> </tr>
HTML; ';
$rows = ''; $rows = '';

18
mod/lti/instructor_edit_tool_type.php
View file

@ -63,12 +63,12 @@ if (isset($data->submitbutton) && confirm_sesskey()) {
$json = json_encode($fromdb); $json = json_encode($fromdb);
//Output script to update the calling window. //Output script to update the calling window.
$script = <<<SCRIPT $script = "
<script type="text/javascript"> <script type=\"text/javascript\">
window.opener.M.mod_lti.editor.updateToolType({$json}); window.opener.M.mod_lti.editor.updateToolType({$json});
window.close(); window.close();
</script> </script>
SCRIPT; ";
echo $script; echo $script;
die; die;
@ -82,23 +82,23 @@ SCRIPT;
$json = json_encode($fromdb); $json = json_encode($fromdb);
//Output script to update the calling window. //Output script to update the calling window.
$script = <<<SCRIPT $script = "
<script type="text/javascript"> <script type=\"text/javascript\">
window.opener.M.mod_lti.editor.addToolType({$json}); window.opener.M.mod_lti.editor.addToolType({$json});
window.close(); window.close();
</script> </script>
SCRIPT; ";
echo $script; echo $script;
die; die;
} }
} else if (isset($data->cancel)) { } else if (isset($data->cancel)) {
$script = <<<SCRIPT $script = "
<script type="text/javascript"> <script type=\"text/javascript\">
window.close(); window.close();
</script> </script>
SCRIPT; ";
echo $script; echo $script;
die; die;

157
mod/lti/lang/en/lti.php
View file

@ -225,7 +225,7 @@ $string['secure_icon_url'] = 'Secure Icon URL';
$string['return_to_course'] = 'Click <a href="{$a->link}" target="_top">here</a> to return to the course.'; $string['return_to_course'] = 'Click <a href="{$a->link}" target="_top">here</a> to return to the course.';
$string['lti_launch_error'] = 'An error occured when launching the external tool: '; $string['lti_launch_error'] = 'An error occured when launching the external tool: ';
$string['lti_launch_error_unsigned_help'] = <<<'HTML' $string['lti_launch_error_unsigned_help'] = '
<p> <p>
This error may be a result of a missing consumer key and shared secret for the tool provider. This error may be a result of a missing consumer key and shared secret for the tool provider.
</p> </p>
@ -233,24 +233,25 @@ $string['lti_launch_error_unsigned_help'] = <<<'HTML'
If you have a consumer key and shared secret, you may enter it when editing the external tool instance (make sure advanced options are visible).<br /> If you have a consumer key and shared secret, you may enter it when editing the external tool instance (make sure advanced options are visible).<br />
Alternatively, you may create a course level tool provider configuration <a href="{$a->course_tool_editor}">here</a>. Alternatively, you may create a course level tool provider configuration <a href="{$a->course_tool_editor}">here</a>.
</p> </p>
HTML; ';
$string['lti_launch_error_tool_request'] = <<<'HTML'
$string['lti_launch_error_tool_request'] = '
<p> <p>
To submit a request for an administrator to complete the tool configuration, click <a href="{$a->admin_request_url}" target="_top">here</a>. To submit a request for an administrator to complete the tool configuration, click <a href="{$a->admin_request_url}" target="_top">here</a>.
</p> </p>
HTML; ';
$string['lti_tool_request_added'] = <<<HTML $string['lti_tool_request_added'] = '
Tool configuration request successfully submitted. You may need to contact an administrator to complete the tool configuration. Tool configuration request successfully submitted. You may need to contact an administrator to complete the tool configuration.
HTML; ';
$string['lti_tool_request_existing'] = <<<HTML $string['lti_tool_request_existing'] = '
A tool configuration for the tool domain has already been submitted. A tool configuration for the tool domain has already been submitted.
HTML; ';
//Instance help //Instance help
$string['external_tool_type_help'] = <<<HTML $string['external_tool_type_help'] = '
The main purpose of a tool configuration is to set up a secure communication channel between Moodle and the tool provider. The main purpose of a tool configuration is to set up a secure communication channel between Moodle and the tool provider.
It also provides an opportunity for configuration defaults and setting up additional services provided by the tool. It also provides an opportunity for configuration defaults and setting up additional services provided by the tool.
@ -288,35 +289,35 @@ Three icons are available after the External tool type dropdown list:
<b>Delete</b> - Remove the selected course level tool type. <b>Delete</b> - Remove the selected course level tool type.
</li> </li>
</ul> </ul>
HTML; ';
$string['launch_url_help'] = <<<HTML $string['launch_url_help'] = '
The Launch URL indicates the web address of the External Tool, and may contain additional information, such as the resource to show. The Launch URL indicates the web address of the External Tool, and may contain additional information, such as the resource to show.
If you are unsure what to enter for the Launch URL, please check with the tool provider for more information. If you are unsure what to enter for the Launch URL, please check with the tool provider for more information.
If you have selected a specific tool type, you may not need to enter a Launch URL. If the tool link is used to just launch If you have selected a specific tool type, you may not need to enter a Launch URL. If the tool link is used to just launch
into the tool provider's system, and not go to a specific resource, this will likely be the case. into the tool provider\'s system, and not go to a specific resource, this will likely be the case.
HTML; ';
$string['secure_launch_url_help'] = <<<HTML $string['secure_launch_url_help'] = '
Similar to Launch URL, but used instead of the launch url if high security is required. Moodle will use the Similar to Launch URL, but used instead of the launch url if high security is required. Moodle will use the
secure launch URL instead of the launch URL if the Moodle site is accessed through SSL, or if the tool configuration secure launch URL instead of the launch URL if the Moodle site is accessed through SSL, or if the tool configuration
is set to always launch through SSL. is set to always launch through SSL.
The Launch URL may also be set to an https address to force launching through SSL, and this field may be left blank. The Launch URL may also be set to an https address to force launching through SSL, and this field may be left blank.
HTML; ';
$string['icon_url_help'] = <<<HTML $string['icon_url_help'] = '
The icon URL allows the icon that shows up in the course listing for this activity to be modified. Instead of using the default The icon URL allows the icon that shows up in the course listing for this activity to be modified. Instead of using the default
LTI icon, an icon which conveys the type of activity may be specified. LTI icon, an icon which conveys the type of activity may be specified.
HTML; '
$string['secure_icon_url_help'] = <<<HTML $string['secure_icon_url_help'] = '
Similar to the icon URL, but used if the user accessing Moodle securely through SSL. The main purpose for this field is to prevent Similar to the icon URL, but used if the user accessing Moodle securely through SSL. The main purpose for this field is to prevent
the browser from warning the user if the underlying page was accessed over SSL, but requesting to show an unsecure image. the browser from warning the user if the underlying page was accessed over SSL, but requesting to show an unsecure image.
HTML; ';
$string['launchinpopup_help'] = <<<HTML $string['launchinpopup_help'] = '
The launch container affects the display of the tool when launched from the course. Some launch containers provide more screen The launch container affects the display of the tool when launched from the course. Some launch containers provide more screen
real estate to the tool, and others provide a more integrated feel with the Moodle environemnt. real estate to the tool, and others provide a more integrated feel with the Moodle environemnt.
@ -337,9 +338,9 @@ real estate to the tool, and others provide a more integrated feel with the Mood
It is possible that browsers will prevent the new window from opening. It is possible that browsers will prevent the new window from opening.
</li> </li>
</ul> </ul>
HTML; ';
$string['resourcekey_help'] = <<<HTML $string['resourcekey_help'] = '
For pre-configured tools, it is not necessary to enter a resource key here, as the consumer key will be For pre-configured tools, it is not necessary to enter a resource key here, as the consumer key will be
provided as part of the configuration process. provided as part of the configuration process.
@ -354,9 +355,9 @@ tool providers. It may be an automated process, or it may require a dialogue wit
Tools which do not require secure communication from Moodle and do not provide additional services (such as grade reporting) Tools which do not require secure communication from Moodle and do not provide additional services (such as grade reporting)
may not require a resource key. may not require a resource key.
HTML; ';
$string['password_help'] = <<<HTML $string['password_help'] = '
For pre-configured tools, it is not necessary to enter a shared secret here, as the shared secret will be For pre-configured tools, it is not necessary to enter a shared secret here, as the shared secret will be
provided as part of the configuration process. provided as part of the configuration process.
@ -368,69 +369,69 @@ along with the consumer key from the tool provider.
Tools which do not require secure communication from Moodle and do not provide additional services (such as grade reporting) Tools which do not require secure communication from Moodle and do not provide additional services (such as grade reporting)
may not require a shared secret. may not require a shared secret.
HTML; ';
$string['custom_help'] = <<<HTML $string['custom_help'] = '
Custom parameters are settings used by the tool provider. For example, a custom parameter may be used to display Custom parameters are settings used by the tool provider. For example, a custom parameter may be used to display
a specific resource from the provider. a specific resource from the provider.
It is safe to leave this field unchanged unless directed by the tool provider. It is safe to leave this field unchanged unless directed by the tool provider.
HTML; ';
$string['share_name_help'] = <<<HTML $string['share_name_help'] = '
Specify whether the full name of the user launching the tool should be shared with the tool provider. Specify whether the full name of the user launching the tool should be shared with the tool provider.
The tool provider may need launchers' names to show meaningful information within the tool. The tool provider may need launchers\' names to show meaningful information within the tool.
Note that this setting may be overriden in the tool configuration. Note that this setting may be overriden in the tool configuration.
HTML; ';
$string['share_email_help'] = <<<HTML $string['share_email_help'] = '
Specify whether the e-mail address of the user launching the tool will be shared with the tool provider. Specify whether the e-mail address of the user launching the tool will be shared with the tool provider.
The tool provider may need launcher's e-mail addresses to distinguish users with the same name, or send e-mails The tool provider may need launcher\'s e-mail addresses to distinguish users with the same name, or send e-mails
to users based on actions within the tool. to users based on actions within the tool.
Note that this setting may be overriden in the tool configuration. Note that this setting may be overriden in the tool configuration.
HTML; ';
$string['accept_grades_help'] = <<<HTML $string['accept_grades_help'] = '
Specify whether the tool provider can add, update, read, and delete grades associated only with this external tool instance. Specify whether the tool provider can add, update, read, and delete grades associated only with this external tool instance.
Some tool providers support reporting grades back to Moodle based on actions taken within the tool, creating a more integrated Some tool providers support reporting grades back to Moodle based on actions taken within the tool, creating a more integrated
experience. experience.
Note that this setting may be overriden in the tool configuration. Note that this setting may be overriden in the tool configuration.
HTML; ';
$string['share_roster_help'] = <<<HTML $string['share_roster_help'] = '
Specify whether the tool can access the list of users enrolled in this course. Specify whether the tool can access the list of users enrolled in this course.
Note that this setting may be overriden in the tool configuration. Note that this setting may be overriden in the tool configuration.
HTML; ';
$string['display_name_help'] = <<<HTML $string['display_name_help'] = '
If selected, the activity name (specified above) will display above the tool provider's content. If selected, the activity name (specified above) will display above the tool provider\'s content.
It is possible that the tool provider may also display the title. This option can prevent the activity title from It is possible that the tool provider may also display the title. This option can prevent the activity title from
being displayed twice. being displayed twice.
The title is never displayed when the tool's launch container is in a new window. The title is never displayed when the tool\'s launch container is in a new window.
HTML; ';
$string['display_description_help'] = <<<HTML $string['display_description_help'] = '
If selected, the activity description (specified above) will display above the tool provider's content. If selected, the activity description (specified above) will display above the tool provider\'s content.
The description may be used to provide additional instructions for launchers of the tool, but it is not required. The description may be used to provide additional instructions for launchers of the tool, but it is not required.
The description is never displayed when the tool's launch container is in a new window. The description is never displayed when the tool\'s launch container is in a new window.
HTML; ';
//Admin help //Admin help
$string['typename_help'] = <<<HTML $string['typename_help'] = '
The tool name is used to identify the tool provider within Moodle. The name entered will be visible The tool name is used to identify the tool provider within Moodle. The name entered will be visible
to instructors when adding external tools within courses. to instructors when adding external tools within courses.
HTML; ';
$string['toolurl_help'] = <<<HTML $string['toolurl_help'] = '
The tool base URL is used to match tool launch URLs to the correct tool configuration. Prefxing the URL with http(s) is optional. The tool base URL is used to match tool launch URLs to the correct tool configuration. Prefxing the URL with http(s) is optional.
Additionally, the base URL is used as the launch URL if a launch URL is not specified in the external tool instance. Additionally, the base URL is used as the launch URL if a launch URL is not specified in the external tool instance.
@ -475,9 +476,9 @@ Additionally, the base URL is used as the launch URL if a launch URL is not spec
</table> </table>
If two different tool configurations are for the same domain, the most specific match will be used. If two different tool configurations are for the same domain, the most specific match will be used.
HTML; ';
$string['resourcekey_admin_help'] = <<<HTML $string['resourcekey_admin_help'] = '
The consumer key can be thought of as a username used to authenticate access to the tool. The consumer key can be thought of as a username used to authenticate access to the tool.
It can be used by the tool provider to uniquely identify the Moodle site from which users launch into the tool. It can be used by the tool provider to uniquely identify the Moodle site from which users launch into the tool.
@ -486,17 +487,17 @@ tool providers. It may be an automated process, or it may require a dialogue wit
Tools which do not require secure communication from Moodle and do not provide additional services (such as grade reporting) Tools which do not require secure communication from Moodle and do not provide additional services (such as grade reporting)
may not require a resource key. may not require a resource key.
HTML; ';
$string['password_admin_help'] = <<<HTML $string['password_admin_help'] = '
The shared secret can be thought of as a password used to authenticate access to the tool. It should be provided The shared secret can be thought of as a password used to authenticate access to the tool. It should be provided
along with the consumer key from the tool provider. along with the consumer key from the tool provider.
Tools which do not require secure communication from Moodle and do not provide additional services (such as grade reporting) Tools which do not require secure communication from Moodle and do not provide additional services (such as grade reporting)
may not require a shared secret. may not require a shared secret.
HTML; ';
$string['show_in_course_help'] = <<<HTML $string['show_in_course_help'] = '
If selected, this tool configuration will appear in the "External tool type" dropdown when instructors If selected, this tool configuration will appear in the "External tool type" dropdown when instructors
configure external tools within courses. configure external tools within courses.
@ -505,9 +506,9 @@ based on the Launch URL matching the Tool base URL, which is the preferred metho
The only case in which this option should be selected is if the tool configuration is just intended for single sign on. The only case in which this option should be selected is if the tool configuration is just intended for single sign on.
For example, if all launches to the tool provider just take the user to a landing page instead of to a specific resource. For example, if all launches to the tool provider just take the user to a landing page instead of to a specific resource.
HTML; ';
$string['default_launch_container_help'] = <<<HTML $string['default_launch_container_help'] = '
The launch container affects the display of the tool when launched from the course. Some launch containers provide more screen The launch container affects the display of the tool when launched from the course. Some launch containers provide more screen
real estate to the tool, and others provide a more integrated feel with the Moodle environemnt. real estate to the tool, and others provide a more integrated feel with the Moodle environemnt.
@ -528,36 +529,36 @@ real estate to the tool, and others provide a more integrated feel with the Mood
It is possible that browsers will prevent the new window from opening. It is possible that browsers will prevent the new window from opening.
</li> </li>
</ul> </ul>
HTML; ';
$string['share_name_admin_help'] = <<<HTML $string['share_name_admin_help'] = '
Specify whether the full name of the user launching the tool should be shared with the tool provider. Specify whether the full name of the user launching the tool should be shared with the tool provider.
The tool provider may need launchers' names to show meaningful information within the tool. The tool provider may need launchers\' names to show meaningful information within the tool.
HTML; ';
$string['share_email_admin_help'] = <<<HTML $string['share_email_admin_help'] = '
Specify whether the e-mail address of the user launching the tool will be shared with the tool provider. Specify whether the e-mail address of the user launching the tool will be shared with the tool provider.
The tool provider may need launcher's e-mail addresses to distinguish users with the same name in the UI, or send e-mails The tool provider may need launcher\'s e-mail addresses to distinguish users with the same name in the UI, or send e-mails
to users based on actions within the tool. to users based on actions within the tool.
HTML; ';
$string['accept_grades_admin_help'] = <<<HTML $string['accept_grades_admin_help'] = '
Specify whether the tool provider can add, update, read, and delete grades associated with instances of this tool type. Specify whether the tool provider can add, update, read, and delete grades associated with instances of this tool type.
Some tool providers support reporting grades back to Moodle based on actions taken within the tool, creating a more integrated Some tool providers support reporting grades back to Moodle based on actions taken within the tool, creating a more integrated
experience. experience.
HTML; ';
$string['share_roster_admin_help'] = <<<HTML $string['share_roster_admin_help'] = '
Specify whether the tool can access the list of users enrolled in courses from which this tool type is launched. Specify whether the tool can access the list of users enrolled in courses from which this tool type is launched.
HTML; ';
$string['main_admin'] = 'General help'; $string['main_admin'] = 'General help';
$string['main_admin_help'] = <<<HTML $string['main_admin_help'] = '
External tools allow Moodle users to seamlessly interact with learning resources hosted remotely. Through a special External tools allow Moodle users to seamlessly interact with learning resources hosted remotely. Through a special
launch protocol, the remote tool will have access to some general information about the launching user. For example, launch protocol, the remote tool will have access to some general information about the launching user. For example,
the institution name, course id, user id, and other information such as the user's name or e-mail address. the institution name, course id, user id, and other information such as the user\'s name or e-mail address.
Tool types listed on this page are separated into three categories: Tool types listed on this page are separated into three categories:
@ -576,9 +577,9 @@ Tool types listed on this page are separated into three categories:
Moodle instance. Instructors may still use tools from these providers if they have a consumer key and shared secret, or if none is required. Moodle instance. Instructors may still use tools from these providers if they have a consumer key and shared secret, or if none is required.
</li> </li>
</ul> </ul>
HTML; ';
$string['modulename_help'] = <<<HTML $string['modulename_help'] = '
External tools allow Moodle users to interact with learning resources and activities on other web sites. For instance, an External tools allow Moodle users to interact with learning resources and activities on other web sites. For instance, an
external tool could provide access to a new activity type or learning materials from a publisher. external tool could provide access to a new activity type or learning materials from a publisher.
@ -601,24 +602,24 @@ External tools differ from URL resources in a few ways:
between them. between them.
</li> </li>
</ul> </ul>
HTML; ';
$string['force_ssl_help'] = <<<HTML $string['force_ssl_help'] = '
Selecting this option forces all launches to this tool provider to use SSL. Selecting this option forces all launches to this tool provider to use SSL.
In addition, all web service requests from the tool provider will use SSL. In addition, all web service requests from the tool provider will use SSL.
If using this option, confirm that this Moodle site and the tool provider support SSL. If using this option, confirm that this Moodle site and the tool provider support SSL.
HTML; ';
$string['organizationid_help'] = <<<HTML $string['organizationid_help'] = '
A unique identifier for this Moodle instance. Typically, the DNS name of the organization is used. A unique identifier for this Moodle instance. Typically, the DNS name of the organization is used.
If this field is left blank, the host name of this Moodle site will be used as the default value. If this field is left blank, the host name of this Moodle site will be used as the default value.
HTML; ';
$string['organizationurl_help'] = <<<HTML $string['organizationurl_help'] = '
The base URL of this Moodle instance. The base URL of this Moodle instance.
If this field is left blank, a default value will be used based on the site configuration. If this field is left blank, a default value will be used based on the site configuration.
HTML; ';

52
mod/lti/locallib.php
View file

@ -346,9 +346,9 @@ function lti_get_tool_table($tools, $id) {
} }
if (!empty($tools)) { if (!empty($tools)) {
$html .= <<<HTML $html .= "
<div id="{$id}_container" style="margin-top:.5em;margin-bottom:.5em"> <div id=\"{$id}_container\" style=\"margin-top:.5em;margin-bottom:.5em\">
<table id="{$id}_tools"> <table id=\"{$id}_tools\">
<thead> <thead>
<tr> <tr>
<th>$typename</th> <th>$typename</th>
@ -357,7 +357,7 @@ function lti_get_tool_table($tools, $id) {
<th>$action</th> <th>$action</th>
</tr> </tr>
</thead> </thead>
HTML; ";
foreach ($tools as $type) { foreach ($tools as $type) {
$date = userdate($type->timecreated); $date = userdate($type->timecreated);
@ -365,11 +365,11 @@ HTML;
$update = get_string('update', 'lti'); $update = get_string('update', 'lti');
$delete = get_string('delete', 'lti'); $delete = get_string('delete', 'lti');
$accepthtml = <<<HTML $accepthtml = "
<a class="editing_accept" href="{$CFG->wwwroot}/mod/lti/typessettings.php?action=accept&amp;id={$type->id}&amp;sesskey={$USER->sesskey}&amp;tab={$id}" title="{$accept}"> <a class=\"editing_accept\" href=\"{$CFG->wwwroot}/mod/lti/typessettings.php?action=accept&amp;id={$type->id}&amp;sesskey={$USER->sesskey}&amp;tab={$id}\" title=\"{$accept}\">
<img class="iconsmall" alt="{$accept}" src="{$CFG->wwwroot}/pix/t/clear.gif"/> <img class=\"iconsmall\" alt=\"{$accept}\" src=\"{$CFG->wwwroot}/pix/t/clear.gif\"/>
</a> </a>
HTML; ";
$deleteaction = 'delete'; $deleteaction = 'delete';
@ -382,7 +382,7 @@ HTML;
$delete = get_string('reject', 'lti'); $delete = get_string('reject', 'lti');
} }
$html .= <<<HTML $html .= "
<tr> <tr>
<td> <td>
{$type->name} {$type->name}
@ -393,17 +393,17 @@ HTML;
<td> <td>
{$date} {$date}
</td> </td>
<td align="center"> <td align=\"center\">
{$accepthtml} {$accepthtml}
<a class="editing_update" href="{$CFG->wwwroot}/mod/lti/typessettings.php?action=update&amp;id={$type->id}&amp;sesskey={$USER->sesskey}&amp;tab={$id}" title="{$update}"> <a class=\"editing_update\" href=\"{$CFG->wwwroot}/mod/lti/typessettings.php?action=update&amp;id={$type->id}&amp;sesskey={$USER->sesskey}&amp;tab={$id}\" title=\"{$update}\">
<img class="iconsmall" alt="{$update}" src="{$CFG->wwwroot}/pix/t/edit.gif"/> <img class=\"iconsmall\" alt=\"{$update}\" src=\"{$CFG->wwwroot}/pix/t/edit.gif\"/>
</a> </a>
<a class="editing_delete" href="{$CFG->wwwroot}/mod/lti/typessettings.php?action={$deleteaction}&amp;id={$type->id}&amp;sesskey={$USER->sesskey}&amp;tab={$id}" title="{$delete}"> <a class=\"editing_delete\" href=\"{$CFG->wwwroot}/mod/lti/typessettings.php?action={$deleteaction}&amp;id={$type->id}&amp;sesskey={$USER->sesskey}&amp;tab={$id}\" title=\"{$delete}\">
<img class="iconsmall" alt="{$delete}" src="{$CFG->wwwroot}/pix/t/delete.gif"/> <img class=\"iconsmall\" alt=\"{$delete}\" src=\"{$CFG->wwwroot}/pix/t/delete.gif\"/>
</a> </a>
</td> </td>
</tr> </tr>
HTML; ";
} }
$html .= '</table></div>'; $html .= '</table></div>';
} else { } else {
@ -508,17 +508,17 @@ function lti_get_ims_role($user, $cmid, $courseid) {
function lti_get_type_config($typeid) { function lti_get_type_config($typeid) {
global $DB; global $DB;
$query = <<<QUERY $query = '
SELECT name, value SELECT name, value
FROM {lti_types_config} FROM {lti_types_config}
WHERE typeid = :typeid1 WHERE typeid = :typeid1
UNION ALL UNION ALL
SELECT 'toolurl' AS name, baseurl AS value SELECT \'toolurl\' AS name, baseurl AS value
FROM {lti_types} FROM {lti_types}
WHERE id = :typeid2 WHERE id = :typeid2
QUERY; ';
$typeconfig = array(); $typeconfig = array();
$configs = $DB->get_records_sql($query, array('typeid1' => $typeid, 'typeid2' => $typeid)); $configs = $DB->get_records_sql($query, array('typeid1' => $typeid, 'typeid2' => $typeid));
@ -554,13 +554,13 @@ function lti_get_tools_by_domain($domain, $state = null, $courseid = null) {
$coursefilter = 'OR course = :courseid'; $coursefilter = 'OR course = :courseid';
} }
$query = <<<QUERY $query = '
SELECT * FROM {lti_types} SELECT * FROM {lti_types}
WHERE WHERE
tooldomain = :tooldomain tooldomain = :tooldomain
AND (course = :siteid $coursefilter) AND (course = :siteid $coursefilter)
$statefilter $statefilter
QUERY; ';
return $DB->get_records_sql($query, array( return $DB->get_records_sql($query, array(
'courseid' => $courseid, 'courseid' => $courseid,
@ -589,14 +589,14 @@ function lti_filter_get_types($course) {
function lti_get_types_for_add_instance() { function lti_get_types_for_add_instance() {
global $DB, $SITE, $COURSE; global $DB, $SITE, $COURSE;
$query = <<<QUERY $query = '
SELECT * SELECT *
FROM {lti_types} FROM {lti_types}
WHERE WHERE
coursevisible = 1 coursevisible = 1
AND (course = :siteid OR course = :courseid) AND (course = :siteid OR course = :courseid)
AND state = :active AND state = :active
QUERY; ';
$admintypes = $DB->get_records_sql($query, array('siteid' => $SITE->id, 'courseid' => $COURSE->id, 'active' => LTI_TOOL_STATE_CONFIGURED)); $admintypes = $DB->get_records_sql($query, array('siteid' => $SITE->id, 'courseid' => $COURSE->id, 'active' => LTI_TOOL_STATE_CONFIGURED));
@ -692,15 +692,15 @@ function lti_get_shared_secrets_by_key($key) {
//Look up the shared secret for the specified key in both the types_config table (for configured tools) //Look up the shared secret for the specified key in both the types_config table (for configured tools)
//And in the lti resource table for ad-hoc tools //And in the lti resource table for ad-hoc tools
$query = <<<QUERY $query = '
SELECT t2.value SELECT t2.value
FROM {lti_types_config} t1 FROM {lti_types_config} t1
INNER JOIN {lti_types_config} t2 ON t1.typeid = t2.typeid INNER JOIN {lti_types_config} t2 ON t1.typeid = t2.typeid
INNER JOIN {lti_types} type ON t2.typeid = type.id INNER JOIN {lti_types} type ON t2.typeid = type.id
WHERE WHERE
t1.name = 'resourcekey' t1.name = \'resourcekey\'
AND t1.value = :key1 AND t1.value = :key1
AND t2.name = 'password' AND t2.name = \'password\'
AND type.state = :configured AND type.state = :configured
UNION UNION
@ -708,7 +708,7 @@ function lti_get_shared_secrets_by_key($key) {
SELECT password AS value SELECT password AS value
FROM {lti} FROM {lti}
WHERE resourcekey = :key2 WHERE resourcekey = :key2
QUERY; ';
$sharedsecrets = $DB->get_records_sql($query, array('configured' => LTI_TOOL_STATE_CONFIGURED, 'key1' => $key, 'key2' => $key)); $sharedsecrets = $DB->get_records_sql($query, array('configured' => LTI_TOOL_STATE_CONFIGURED, 'key1' => $key, 'key2' => $key));

10
mod/lti/return.php
View file

@ -87,23 +87,23 @@ if (!empty($errormsg)) {
echo '<html><body>'; echo '<html><body>';
$script = <<<SCRIPT $script = "
<script type='text/javascript'> <script type=\"text/javascript\">
//<![CDATA[ //<![CDATA[
if(window != top){ if(window != top){
top.location.href = '{$url}'; top.location.href = '{$url}';
} }
//]] //]]
</script> </script>
SCRIPT; ";
$clickhere = get_string('return_to_course', 'lti', (object)array('link' => $url)); $clickhere = get_string('return_to_course', 'lti', (object)array('link' => $url));
$noscript = <<<NOSCRIPT $noscript = "
<noscript> <noscript>
{$clickhere} {$clickhere}
</noscript> </noscript>
NOSCRIPT; ";
echo $script; echo $script;
echo $noscript; echo $noscript;

44
mod/lti/settings.php
View file

@ -99,26 +99,26 @@ if ($ADMIN->fulltree) {
break; break;
} }
$template = <<<HTML $template = "
<div id="lti_tabs" class="yui-navset"> <div id=\"lti_tabs\" class=\"yui-navset\">
<ul id="lti_tab_heading" class="yui-nav" style="display:none"> <ul id=\"lti_tab_heading\" class=\"yui-nav\" style=\"display:none\">
<li {$activeselected}> <li {$activeselected}>
<a href="#tab1"> <a href=\"#tab1\">
<em>$active</em> <em>$active</em>
</a> </a>
</li> </li>
<li {$pendingselected}> <li {$pendingselected}>
<a href="#tab2"> <a href=\"#tab2\">
<em>$pending</em> <em>$pending</em>
</a> </a>
</li> </li>
<li {$rejectedselected}> <li {$rejectedselected}>
<a href="#tab3"> <a href=\"#tab3\">
<em>$rejected</em> <em>$rejected</em>
</a> </a>
</li> </li>
</ul> </ul>
<div class="yui-content"> <div class=\"yui-content\">
<div> <div>
$configuredtoolshtml $configuredtoolshtml
</div> </div>
@ -131,7 +131,7 @@ if ($ADMIN->fulltree) {
</div> </div>
</div> </div>
<script type='text/javascript'> <script type=\"text/javascript\">
//<![CDATA[ //<![CDATA[
(function(){ (function(){
//If javascript is disabled, they will just see the three tabs one after another //If javascript is disabled, they will just see the three tabs one after another
@ -141,29 +141,29 @@ if ($ADMIN->fulltree) {
new YAHOO.widget.TabView('lti_tabs'); new YAHOO.widget.TabView('lti_tabs');
var setupTools = function(id, sort){ var setupTools = function(id, sort){
var lti_tools = YAHOO.util.Dom.get(id + "_tools"); var lti_tools = YAHOO.util.Dom.get(id + '_tools');
if(lti_tools){ if(lti_tools){
var dataSource = new YAHOO.util.DataSource(lti_tools); var dataSource = new YAHOO.util.DataSource(lti_tools);
var configuredColumns = [ var configuredColumns = [
{key:"name", label:"$typename", sortable:true}, {key:'name', label:'$typename', sortable:true},
{key:"baseURL", label:"$baseurl", sortable:true}, {key:'baseURL', label:'$baseurl', sortable:true},
{key:"timecreated", label:"$createdon", sortable:true, formatter:YAHOO.widget.DataTable.formatDate}, {key:'timecreated', label:'$createdon', sortable:true, formatter:YAHOO.widget.DataTable.formatDate},
{key:"action", label:"$action"} {key:'action', label:'$action'}
]; ];
dataSource.responseType = YAHOO.util.DataSource.TYPE_HTMLTABLE; dataSource.responseType = YAHOO.util.DataSource.TYPE_HTMLTABLE;
dataSource.responseSchema = { dataSource.responseSchema = {
fields: [ fields: [
{key:"name"}, {key:'name'},
{key:"baseURL"}, {key:'baseURL'},
{key:"timecreated", parser:"date"}, {key:'timecreated', parser:'date'},
{key:"action"} {key:'action'}
] ]
}; };
new YAHOO.widget.DataTable(id + "_container", configuredColumns, dataSource, new YAHOO.widget.DataTable(id + '_container', configuredColumns, dataSource,
{ {
sortedBy: sort sortedBy: sort
} }
@ -171,13 +171,13 @@ if ($ADMIN->fulltree) {
} }
}; };
setupTools('lti_configured', {key:"name", dir:"asc"}); setupTools('lti_configured', {key:'name', dir:'asc'});
setupTools('lti_pending', {key:"timecreated", dir:"desc"}); setupTools('lti_pending', {key:'timecreated', dir:'desc'});
setupTools('lti_rejected', {key:"timecreated", dir:"desc"}); setupTools('lti_rejected', {key:'timecreated', dir:'desc'});
})(); })();
//]] //]]
</script> </script>
HTML; ";
$PAGE->requires->yui2_lib('tabview'); $PAGE->requires->yui2_lib('tabview');
$PAGE->requires->yui2_lib('datatable'); $PAGE->requires->yui2_lib('datatable');

4
mod/lti/simpletest/testlocallib.php
View file

@ -90,7 +90,7 @@ class lti_locallib_test extends UnitTestCase {
} }
public function test_parse_grade_replace_message() { public function test_parse_grade_replace_message() {
$message = <<<XML $message = '
<imsx_POXEnvelopeRequest xmlns = "http://www.imsglobal.org/lis/oms1p0/pox"> <imsx_POXEnvelopeRequest xmlns = "http://www.imsglobal.org/lis/oms1p0/pox">
<imsx_POXHeader> <imsx_POXHeader>
<imsx_POXRequestHeaderInfo> <imsx_POXRequestHeaderInfo>
@ -114,7 +114,7 @@ class lti_locallib_test extends UnitTestCase {
</replaceResultRequest> </replaceResultRequest>
</imsx_POXBody> </imsx_POXBody>
</imsx_POXEnvelopeRequest> </imsx_POXEnvelopeRequest>
XML; ';
$parsed = lti_parse_grade_replace_message(new SimpleXMLElement($message)); $parsed = lti_parse_grade_replace_message(new SimpleXMLElement($message));

14
mod/lti/view.php
View file

@ -120,17 +120,17 @@ if ( $launchcontainer == LTI_LAUNCH_CONTAINER_WINDOW ) {
echo '<object id="contentframe" height="600px" width="100%" type="text/html" data="launch.php?id='.$cm->id.'"></object>'; echo '<object id="contentframe" height="600px" width="100%" type="text/html" data="launch.php?id='.$cm->id.'"></object>';
//Output script to make the object tag be as large as possible //Output script to make the object tag be as large as possible
$resize = <<<'SCRIPT' $resize = '
<script type='text/javascript'> <script type="text/javascript">
//<![CDATA[ //<![CDATA[
(function(){ (function(){
//Take scrollbars off the outer document to prevent double scroll bar effect //Take scrollbars off the outer document to prevent double scroll bar effect
document.body.style.overflow = 'hidden'; document.body.style.overflow = "hidden";
var dom = YAHOO.util.Dom; var dom = YAHOO.util.Dom;
var frame = document.getElementById('contentframe'); var frame = document.getElementById("contentframe");
var padding = 15; //The bottom of the iframe wasn't visible on some themes. Probably because of border widths, etc. var padding = 15; //The bottom of the iframe wasn\'t visible on some themes. Probably because of border widths, etc.
var lastHeight; var lastHeight;
@ -139,7 +139,7 @@ if ( $launchcontainer == LTI_LAUNCH_CONTAINER_WINDOW ) {
if(lastHeight !== Math.min(dom.getDocumentHeight(), viewportHeight)){ if(lastHeight !== Math.min(dom.getDocumentHeight(), viewportHeight)){
frame.style.height = viewportHeight - dom.getY(frame) - padding + 'px'; frame.style.height = viewportHeight - dom.getY(frame) - padding + "px";
lastHeight = Math.min(dom.getDocumentHeight(), dom.getViewportHeight()); lastHeight = Math.min(dom.getDocumentHeight(), dom.getViewportHeight());
} }
@ -151,7 +151,7 @@ if ( $launchcontainer == LTI_LAUNCH_CONTAINER_WINDOW ) {
})(); })();
//]] //]]
</script> </script>
SCRIPT; ';
echo $resize; echo $resize;
} }