From 0e55d9d0383eac546d7d89219f504c7b63e1c5cf Mon Sep 17 00:00:00 2001 From: Rajesh Taneja Date: Mon, 30 Jan 2012 12:43:13 +0800 Subject: [PATCH] mdl-15040 General:
replaced with
to keep it consistent --- admin/repository.php | 6 +++--- auth/cas/cas_form.html | 2 +- auth/ldap/lang/en/auth_ldap.php | 2 +- auth/mnet/auth.php | 2 +- auth/radius/auth.php | 20 ++++++++++---------- auth/shibboleth/config.html | 4 ++-- backup/util/loggers/file_logger.class.php | 2 +- .../util/loggers/output_indented_logger.class.php | 2 +- backup/util/loggers/output_text_logger.class.php | 2 +- enrol/mnet/lang/en/enrol_mnet.php | 2 +- filter/algebra/algebradebug.php | 16 ++++++++-------- grade/import/csv/index.php | 8 ++++---- install/lang/ast/error.php | 2 +- install/lang/ast/install.php | 2 +- install/lang/cy/install.php | 2 +- install/lang/el/install.php | 2 +- install/lang/eu/error.php | 2 +- install/lang/gl/install.php | 2 +- install/lang/he/install.php | 2 +- install/lang/is/install.php | 2 +- install/lang/km/install.php | 2 +- install/lang/mn/install.php | 2 +- install/lang/ta/install.php | 2 +- install/lang/ta_lk/install.php | 2 +- lang/en/admin.php | 4 ++-- lang/en/webservice.php | 2 +- lib/adminlib.php | 6 +++--- lib/moodlelib.php | 8 ++++---- lib/simpletest/testformslib.php | 4 ++-- login/index_form.html | 2 +- mod/assignment/lib.php | 4 ++-- .../type/uploadsingle/assignment.class.php | 2 +- mod/choice/lib.php | 2 +- mod/data/lib.php | 2 +- mod/glossary/editcategories.php | 2 +- mod/lesson/reformat.php | 4 ++-- mod/lti/locallib.php | 12 ++++++------ mod/scorm/report/basic/report.php | 4 ++-- mod/scorm/report/interactions/report.php | 4 ++-- portfolio/mahara/lib.php | 4 ++-- question/format/blackboard_six/format.php | 10 +++++----- question/format/webct/format.php | 2 +- question/type/calculated/datasetitems_form.php | 4 ++-- question/type/calculated/edit_calculated_form.php | 2 +- question/type/calculated/questiontype.php | 18 +++++++++--------- .../calculatedmulti/edit_calculatedmulti_form.php | 4 ++-- question/type/calculatedmulti/questiontype.php | 2 +- .../edit_calculatedsimple_form.php | 2 +- question/type/calculatedsimple/questiontype.php | 2 +- repository/flickr_public/lib.php | 2 +- repository/lib.php | 2 +- tag/edit_form.php | 2 +- tag/locallib.php | 2 +- tag/manage.php | 4 ++-- tag/search.php | 2 +- user/filters/date.php | 2 +- 56 files changed, 110 insertions(+), 110 deletions(-) diff --git a/admin/repository.php b/admin/repository.php index c3409a5..faebc98 100644 --- a/admin/repository.php +++ b/admin/repository.php @@ -289,11 +289,11 @@ if (($action == 'edit') || ($action == 'new')) { $settings .= '' . $settingsstr .''; $settings .= $OUTPUT->container_start('mdl-left'); - $settings .= '
'; + $settings .= '
'; $settings .= $admininstancenumbertext; - $settings .= '
'; + $settings .= '
'; $settings .= $courseinstancenumbertext; - $settings .= '
'; + $settings .= '
'; $settings .= $userinstancenumbertext; $settings .= $OUTPUT->container_end(); } diff --git a/auth/cas/cas_form.html b/auth/cas/cas_form.html index bcc464f..5d9b1b5 100644 --- a/auth/cas/cas_form.html +++ b/auth/cas/cas_form.html @@ -3,7 +3,7 @@
-
+
diff --git a/auth/ldap/lang/en/auth_ldap.php b/auth/ldap/lang/en/auth_ldap.php index bbb0ddb..32b92ab 100644 --- a/auth/ldap/lang/en/auth_ldap.php +++ b/auth/ldap/lang/en/auth_ldap.php @@ -128,7 +128,7 @@ $string['pluginname'] = 'LDAP server'; $string['pluginnotenabled'] = 'Plugin not enabled!'; $string['renamingnotallowed'] = 'User renaming not allowed in LDAP'; $string['rootdseerror'] = 'Error querying rootDSE for Active Directory'; -$string['updateremfail'] = 'Error updating LDAP record. Error code: {$a->errno}; Error string: {$a->errstring}
Key ({$a->key}) - old moodle value: \'{$a->ouvalue}\' new value: \'{$a->nuvalue}\''; +$string['updateremfail'] = 'Error updating LDAP record. Error code: {$a->errno}; Error string: {$a->errstring}
Key ({$a->key}) - old moodle value: \'{$a->ouvalue}\' new value: \'{$a->nuvalue}\''; $string['updateremfailamb'] = 'Failed to update LDAP with ambiguous field {$a->key}; old moodle value: \'{$a->ouvalue}\', new value: \'{$a->nuvalue}\''; $string['updatepasserror'] = 'Error in user_update_password(). Error code: {$a->errno}; Error string: {$a->errstring}'; $string['updatepasserrorexpire'] = 'Error in user_update_password() when reading password expiration time. Error code: {$a->errno}; Error string: {$a->errstring}'; diff --git a/auth/mnet/auth.php b/auth/mnet/auth.php index f6938f3..933d85b 100644 --- a/auth/mnet/auth.php +++ b/auth/mnet/auth.php @@ -232,7 +232,7 @@ class auth_plugin_mnet extends auth_plugin_base { print_error('mnet_session_prohibited', 'mnet', $remotepeer->wwwroot, format_string($site->fullname)); exit; } - $message .= "ERROR $code:
$errormessage
"; + $message .= "ERROR $code:
$errormessage
"; } print_error("rpcerror", '', '', $message); } diff --git a/auth/radius/auth.php b/auth/radius/auth.php index 5795978..fc079a5 100644 --- a/auth/radius/auth.php +++ b/auth/radius/auth.php @@ -47,11 +47,11 @@ class auth_plugin_radius extends auth_plugin_base { require_once 'Crypt/CHAP.php'; // Added by Clive on 7th May for test purposes - // printf("Username: $username
"); - // printf("Password: $password
"); - // printf("host: $this->config->host
"); - // printf("nasport: $this->config->nasport
"); - // printf("secret: $this->config->secret
"); + // printf("Username: $username
"); + // printf("Password: $password
"); + // printf("host: $this->config->host
"); + // printf("nasport: $this->config->nasport
"); + // printf("secret: $this->config->secret
"); // Added by Stanislav Tsymbalov on 12th March 2008 only for test purposes //$type = 'PAP'; @@ -100,25 +100,25 @@ class auth_plugin_radius extends auth_plugin_base { } if (!$rauth->start()) { - printf("Radius start: %s
\n", $rauth->getError()); + printf("Radius start: %s
\n", $rauth->getError()); exit; } $result = $rauth->send(); if (PEAR::isError($result)) { - printf("Radius send failed: %s
\n", $result->getMessage()); + printf("Radius send failed: %s
\n", $result->getMessage()); exit; } else if ($result === true) { - // printf("Radius Auth succeeded
\n"); + // printf("Radius Auth succeeded
\n"); return true; } else { - // printf("Radius Auth rejected
\n"); + // printf("Radius Auth rejected
\n"); return false; } // get attributes, even if auth failed if (!$rauth->getAttributes()) { - printf("Radius getAttributes: %s
\n", $rauth->getError()); + printf("Radius getAttributes: %s
\n", $rauth->getError()); } else { $rauth->dumpAttributes(); } diff --git a/auth/shibboleth/config.html b/auth/shibboleth/config.html index b15b17a..b95c9a7 100644 --- a/auth/shibboleth/config.html +++ b/auth/shibboleth/config.html @@ -34,7 +34,7 @@ convert_data and $config->convert_data != '' and !is_readable($config->convert_data)) { - echo '
'; + echo '
'; print_string("auth_shib_convert_data_warning", "auth_shibboleth"); echo ''; } @@ -72,7 +72,7 @@ urn:mace:organization2:providerID, Example Organization 2, /Shibboleth.sso/WAYF/ organization_selection) && empty($config->organization_selection) && isset($config->alt_login) && $config->alt_login == 'on') { - echo '
'; + echo '
'; print_string("auth_shib_no_organizations_warning", "auth_shibboleth"); echo ''; } diff --git a/backup/util/loggers/file_logger.class.php b/backup/util/loggers/file_logger.class.php index e4ab4b1..0830d9a 100644 --- a/backup/util/loggers/file_logger.class.php +++ b/backup/util/loggers/file_logger.class.php @@ -75,7 +75,7 @@ class file_logger extends base_logger { if (substr($this->fullpath, -5) !== '.html') { $content = $prefix . str_repeat(' ', $depth) . $message . PHP_EOL; } else { - $content = $prefix . str_repeat('  ', $depth) . htmlentities($message, ENT_QUOTES) . '
' . PHP_EOL; + $content = $prefix . str_repeat('  ', $depth) . htmlentities($message, ENT_QUOTES) . '
' . PHP_EOL; } if (false === fwrite($this->fhandle, $content)) { throw new base_logger_exception('error_writing_file', $this->fullpath); diff --git a/backup/util/loggers/output_indented_logger.class.php b/backup/util/loggers/output_indented_logger.class.php index 8bb6811..fa8a028 100644 --- a/backup/util/loggers/output_indented_logger.class.php +++ b/backup/util/loggers/output_indented_logger.class.php @@ -38,7 +38,7 @@ class output_indented_logger extends base_logger { if (defined('STDOUT')) { echo $prefix . str_repeat(' ', $depth) . $message . PHP_EOL; } else { - echo $prefix . str_repeat('  ', $depth) . htmlentities($message, ENT_QUOTES) . '
' . PHP_EOL; + echo $prefix . str_repeat('  ', $depth) . htmlentities($message, ENT_QUOTES) . '
' . PHP_EOL; } flush(); return true; diff --git a/backup/util/loggers/output_text_logger.class.php b/backup/util/loggers/output_text_logger.class.php index fe61536..ee00ee4 100644 --- a/backup/util/loggers/output_text_logger.class.php +++ b/backup/util/loggers/output_text_logger.class.php @@ -37,7 +37,7 @@ class output_text_logger extends base_logger { if (defined('STDOUT')) { echo $prefix . $message . PHP_EOL; } else { - echo $prefix . htmlentities($message, ENT_QUOTES) . '
' . PHP_EOL; + echo $prefix . htmlentities($message, ENT_QUOTES) . '
' . PHP_EOL; } flush(); return true; diff --git a/enrol/mnet/lang/en/enrol_mnet.php b/enrol/mnet/lang/en/enrol_mnet.php index 2171275..216782e 100644 --- a/enrol/mnet/lang/en/enrol_mnet.php +++ b/enrol/mnet/lang/en/enrol_mnet.php @@ -27,7 +27,7 @@ $string['error_multiplehost'] = 'Some instance of MNet enrolment plugin already exists for this host. Only one instance per host and/or one instance for \'All hosts\' is allowed.'; $string['instancename'] = 'Enrolment method name'; $string['instancename_help'] = 'You can optionally rename this instance of the MNet enrolment method. If you leave this field empty, the default instance name will be used, containing the name of the remote host and the assigned role for their users.'; -$string['mnet_enrol_description'] = 'Publish this service to allow administrators at {$a} to enrol their students in courses you have created on your server.
  • Dependency: You must also publish the SSO (Service Provider) service to {$a}.
  • Dependency: You must also subscribe to the SSO (Identity Provider) service on {$a}.

Subscribe to this service to be able to enrol your students in courses on {$a}.
  • Dependency: You must also subscribe to the SSO (Service Provider) service on {$a}.
  • Dependency: You must also publish the SSO (Identity Provider) service to {$a}.

'; +$string['mnet_enrol_description'] = 'Publish this service to allow administrators at {$a} to enrol their students in courses you have created on your server.
  • Dependency: You must also publish the SSO (Service Provider) service to {$a}.
  • Dependency: You must also subscribe to the SSO (Identity Provider) service on {$a}.

Subscribe to this service to be able to enrol your students in courses on {$a}.
  • Dependency: You must also subscribe to the SSO (Service Provider) service on {$a}.
  • Dependency: You must also publish the SSO (Identity Provider) service to {$a}.

'; $string['mnet_enrol_name'] = 'Remote enrolment service'; $string['pluginname'] = 'MNet remote enrolments'; $string['pluginname_desc'] = 'Allows remote MNet host to enrol their users into our courses.'; diff --git a/filter/algebra/algebradebug.php b/filter/algebra/algebradebug.php index 67b715c..98717d3 100644 --- a/filter/algebra/algebradebug.php +++ b/filter/algebra/algebradebug.php @@ -97,13 +97,13 @@ function algebra2tex($algebra) { $cmd = "cd $CFG->dirroot\\filter\\algebra & algebra2tex.pl x/2"; $test = `$cmd`; if ($test != '\frac{x}{2}') { - echo "There is a problem with either Perl or the script algebra2tex.pl
"; + echo "There is a problem with either Perl or the script algebra2tex.pl
"; $ecmd = $cmd . " 2>&1"; - echo `$ecmd` . "
\n"; - echo "The shell command
$cmd
returned status = $status
\n"; + echo `$ecmd` . "
\n"; + echo "The shell command
$cmd
returned status = $status
\n"; $commandpath = "$CFG->dirroot\\filter\\algebra\\algebra2tex.pl"; if (file_exists($commandpath)) { - echo "The file permissions of algebra2tex.pl are: " . decoct(fileperms($commandpath)) . "
"; + echo "The file permissions of algebra2tex.pl are: " . decoct(fileperms($commandpath)) . "
"; } die; } @@ -112,13 +112,13 @@ function algebra2tex($algebra) { $cmd = "cd $CFG->dirroot/filter/algebra; ./algebra2tex.pl x/2"; $test = `$cmd`; if ($test != '\frac{x}{2}') { - echo "There is a problem with either Perl or the script algebra2tex.pl
"; + echo "There is a problem with either Perl or the script algebra2tex.pl
"; $ecmd = $cmd . " 2>&1"; - echo `$ecmd` . "
\n"; - echo "The shell command
$cmd
returned status = $status
\n"; + echo `$ecmd` . "
\n"; + echo "The shell command
$cmd
returned status = $status
\n"; $commandpath = "$CFG->dirroot/filter/algebra/algebra2tex.pl"; if (file_exists($commandpath)) { - echo "The file permissions of algebra2tex.pl are: " . decoct(fileperms($commandpath)) . "
"; + echo "The file permissions of algebra2tex.pl are: " . decoct(fileperms($commandpath)) . "
"; } die; } diff --git a/grade/import/csv/index.php b/grade/import/csv/index.php index 886bf43..37cd7d9 100644 --- a/grade/import/csv/index.php +++ b/grade/import/csv/index.php @@ -380,8 +380,8 @@ if ($formdata = $mform->get_data()) { array_unshift($scales, '-'); // scales start at key 1 $key = array_search($value, $scales); if ($key === false) { - echo "
t0 is $t0"; - echo "
grade is $value"; + echo "
t0 is $t0"; + echo "
grade is $value"; $status = false; import_cleanup($importcode); echo $OUTPUT->notification(get_string('badgrade', 'grades')); @@ -396,8 +396,8 @@ if ($formdata = $mform->get_data()) { } else if (!is_numeric($value)) { // non numeric grade value supplied, possibly mapped wrong column - echo "
t0 is $t0"; - echo "
grade is $value"; + echo "
t0 is $t0"; + echo "
grade is $value"; $status = false; import_cleanup($importcode); echo $OUTPUT->notification(get_string('badgrade', 'grades')); diff --git a/install/lang/ast/error.php b/install/lang/ast/error.php index 128aba8..efd3cdb 100644 --- a/install/lang/ast/error.php +++ b/install/lang/ast/error.php @@ -42,7 +42,7 @@ $string['componentisuptodate'] = 'El compoente ta actualizáu.'; $string['downloadedfilecheckfailed'] = 'Falló la verificación del ficheru descargáu.'; $string['invalidmd5'] = 'md5 inválidu.'; $string['missingrequiredfield'] = 'Falta dalgún campu obligatoriu.'; -$string['remotedownloaderror'] = 'La descarga del componente al so servidor falló. Por favor, asegúrese de que les carauterístiques del proxy son les correutes. La estensión PHP cURL ye perrecomendable.

Tien de descargar el ficheru {$a->url} manualmente, copialu en "{$a->dest}" del so servidor y descomprimilu ellí.'; +$string['remotedownloaderror'] = 'La descarga del componente al so servidor falló. Por favor, asegúrese de que les carauterístiques del proxy son les correutes. La estensión PHP cURL ye perrecomendable.

Tien de descargar el ficheru {$a->url} manualmente, copialu en "{$a->dest}" del so servidor y descomprimilu ellí.'; $string['wrongdestpath'] = 'Ruta de destín equivocada.'; $string['wrongsourcebase'] = 'URL de la fonte equivocada.'; $string['wrongzipfilename'] = 'Nome de ficheru ZIP erroneu.'; diff --git a/install/lang/ast/install.php b/install/lang/ast/install.php index 0c21e01..c2d034a 100644 --- a/install/lang/ast/install.php +++ b/install/lang/ast/install.php @@ -57,7 +57,7 @@ $string['memorylimithelp'] = '

La llende de memoria del PHP del so servidor ta $string['phpversion'] = 'Versión PHP'; $string['phpversionhelp'] = '

Moodle necesita una versión de PHP de 4.3.0 como mínimo o 5.1.0 (5.0.x tien problemes conocíos).

Actualmente tien instalada la versión {$a}

-

Tien d\'actualizar el PHP o migrar a otru servidor con una versión más nueva de PHP!
+

Tien d\'actualizar el PHP o migrar a otru servidor con una versión más nueva de PHP!
(Nel casu de tener una versión 5.0.x pue tornar a una versión 4.4.x)

'; $string['welcomep10'] = '{$a->installername} ({$a->installerversion})'; $string['welcomep20'] = 'Ta viendo esta páxina porque consiguió instalar y arrancar el paquete {$a->packname} {$a->packversion} nel so ordeandor. ¡Felicidaes!'; diff --git a/install/lang/cy/install.php b/install/lang/cy/install.php index 0859360..27fb5ca 100644 --- a/install/lang/cy/install.php +++ b/install/lang/cy/install.php @@ -62,7 +62,7 @@ $string['memorylimithelp'] = '

Mae maint y cof PHP yn eich gweinydd ar hyn o b $string['phpversion'] = 'Fersiwn PHP'; $string['phpversionhelp'] = '

Mae angen o leiaf fersiwn PHP 4.3.0 neu 5.1.0 ar Moodle (mae llawer o broblemau gyda 5.0.x).

Ar hyn o bryd, rydych yn rhedeg fersiwn {$a}

-

Rhaid i chi uwchraddio PHP neu newid i westeiwr â fersiwn diweddarach o PHP!
+

Rhaid i chi uwchraddio PHP neu newid i westeiwr â fersiwn diweddarach o PHP!
(Os oes gennych 5.0.x gallwch hefyd is-raddio i fersiwn 4.4.x)

'; $string['welcomep10'] = '{$a->installername} ({$a->installerversion})'; $string['welcomep20'] = 'Rydych chi\'n gweld y dudalen hon gan eich bod wedi gosod a diff --git a/install/lang/el/install.php b/install/lang/el/install.php index 5ce4da5..b2d1fa3 100644 --- a/install/lang/el/install.php +++ b/install/lang/el/install.php @@ -81,7 +81,7 @@ $string['phpextension'] = 'Επέκταση {$a} της PHP'; $string['phpversion'] = 'Έκδοση της PHP'; $string['phpversionhelp'] = '

Το ΠΗΛΕΑΣ απαιτεί η έκδοση της PHP να είναι τουλάχιστον 4.3.0 ή 5.1.0 (η 5.0.x έχει ένα αριθμό γνωστών προβλημάτων).

Αυτή τη στιγμή έχετε την έκδοση {$a}

-

Πρέπει να κάνετε upgrade την PHP ή να μεταφερθείτε σε ένα κεντρικό υπολογιστή με μια νεότερη έκδοση της PHP!
+

Πρέπει να κάνετε upgrade την PHP ή να μεταφερθείτε σε ένα κεντρικό υπολογιστή με μια νεότερη έκδοση της PHP!
(Σε περίπτωση που έχετε την 5.0.x μπορείτε επίσης να κάνετε και υποβάθμιση στην έκδοση 4.4.x)

'; $string['welcomep10'] = '{$a->installername} ({$a->installerversion})'; $string['welcomep20'] = 'Βλέπετε αυτή τη σελίδα γιατί εγκαταστήσατε και ξεκινήσατε με επιτυχία το πακέτο {$a->packname} {$a->packversion} στον υπολογιστή σας. Συγχαρητήρια!'; diff --git a/install/lang/eu/error.php b/install/lang/eu/error.php index baf1749..0beedfb 100644 --- a/install/lang/eu/error.php +++ b/install/lang/eu/error.php @@ -42,7 +42,7 @@ $string['componentisuptodate'] = 'Osagaia eguneratu da'; $string['downloadedfilecheckfailed'] = 'Jaitsitako fitxategiaren konprobazioak kale egin du.'; $string['invalidmd5'] = 'md5 ez da baliagarria'; $string['missingrequiredfield'] = 'Beharrezko eremuren bat falta da.'; -$string['remotedownloaderror'] = 'Errorea osagaia zure zerbitzarian jaistean, mesedez egiaztatu proxy-ezarpenak, PHP cURL luzapea erabat gomendatzen da.

*{$a->url}* fitxategia eskuz jaitsi beharko zenuke, zure zerbitzariko "*{$a->dest}*" -ra kopiatu eta bertan deskonprimatu.'; +$string['remotedownloaderror'] = 'Errorea osagaia zure zerbitzarian jaistean, mesedez egiaztatu proxy-ezarpenak, PHP cURL luzapea erabat gomendatzen da.

*{$a->url}* fitxategia eskuz jaitsi beharko zenuke, zure zerbitzariko "*{$a->dest}*" -ra kopiatu eta bertan deskonprimatu.'; $string['wrongdestpath'] = 'Bide desegokia'; $string['wrongsourcebase'] = 'URL iturriaren oinarri akastuna'; $string['wrongzipfilename'] = 'ZIP fitxategiaren izen desegokia'; diff --git a/install/lang/gl/install.php b/install/lang/gl/install.php index 2d3518d..ce44636 100644 --- a/install/lang/gl/install.php +++ b/install/lang/gl/install.php @@ -57,7 +57,7 @@ $string['memorylimithelp'] = '

O límite de memoria para PHP do seu servidor e $string['phpversion'] = 'Versión PHP'; $string['phpversionhelp'] = '

Moodle require unha versión de PHP de 4.3.0 como mínimo ou 5.1.0 (5.0.x ten problemas coñecidos).

Actualmente está a executar a versión {$a}

-

Debe actualizar o PHP ou migrar a outro servidor cunha versión máis nova de PHP!
+

Debe actualizar o PHP ou migrar a outro servidor cunha versión máis nova de PHP!
(No caso de ter unha versión 5.0.x pode retornar para unha versión 4.4.x)

'; $string['welcomep10'] = '{$a->installername} ({$a->installerversion})'; $string['welcomep20'] = 'Está a ver esta páxina porque conseguiu instalar e iniciar o paquete {$a->packname} {$a->packversion} no seu computador. Parabéns!'; diff --git a/install/lang/he/install.php b/install/lang/he/install.php index ac6a0d4..9b9f584 100644 --- a/install/lang/he/install.php +++ b/install/lang/he/install.php @@ -88,7 +88,7 @@ $string['phpextension'] = 'הרחבת PHP {$a}'; $string['phpversion'] = 'גירסת PHP'; $string['phpversionhelp'] = '

גירסת PHP חייבת להיות לפחות 4.3.0 או 5.1.0 (בגירסאות 5.0.x קיימות מספר בעיות ידועות)

במערכת שלך פועלת כרגע גירסת {$a}

-

אתה חייב לשדרג את גירסת ה-PHP שלך או לעבור למחשב מארח עם עם גירסת PHP חדשה!
+

אתה חייב לשדרג את גירסת ה-PHP שלך או לעבור למחשב מארח עם עם גירסת PHP חדשה!
(במקרים של גרסת 5.0.x תוכל גם לרדת בגירסה ל- 4.4.x)

'; $string['welcomep10'] = '{$a->installername} ({$a->installerversion})'; diff --git a/install/lang/is/install.php b/install/lang/is/install.php index 0f3cab8..c35e066 100644 --- a/install/lang/is/install.php +++ b/install/lang/is/install.php @@ -52,7 +52,7 @@ $string['phpextension'] = '{$a} PHP viðbót'; $string['phpversion'] = 'PHP útgáfa'; $string['phpversionhelp'] = '

Moodle krefst útgáfu 4.3.0 eða 5.1.0 af PHP (5.0.x útgáfan inniheldur villur).

Þú er með útgáfu {$a}

-

Þú verður að uppfæra PHP eða velja vefþjónustu sem býður upp á nýrri útgáfu af PHP!
+

Þú verður að uppfæra PHP eða velja vefþjónustu sem býður upp á nýrri útgáfu af PHP!
(Ef þú notar útgáfu 5.0.x gætir þú hugsanlega breytt yfir í 4.4.x)

'; $string['welcomep10'] = '{$a->installername} ({$a->installerversion})'; $string['welcomep70'] = 'Smelltu á "Áfram" hnappinn hér að neðan til þess að halda áfram uppsetningunni á Moodle.'; diff --git a/install/lang/km/install.php b/install/lang/km/install.php index 7a4519e..60432e0 100644 --- a/install/lang/km/install.php +++ b/install/lang/km/install.php @@ -58,7 +58,7 @@ $string['memorylimithelp'] = '

បច្ចុប្បន្ន សតិក $string['phpversion'] = 'កំណែ PHP'; $string['phpversionhelp'] = '

Moodle ទាមទារកំណែ PHP យ៉ាងហោចណាស់ត្រឹម 4.3.0 ឬ 5.1.0 (5.0.x នៅមានបញ្ហាមួយចំនួន) ។

អ្នកកំពុងរត់កំណែ {$a}

-

អ្នកត្រូវតែធ្វើឲ្យ PHP ប្រសើរ ឬផ្លាស់ទីទៅម៉ាស៊ីនដែលមានកំណែ PHP ថ្មី ‌!
(ក្នុងករណី 5.0.x អ្នកក៏អាចបន្ទាបទៅកំណែ 4.4.x ផងដែរ)

'; +

អ្នកត្រូវតែធ្វើឲ្យ PHP ប្រសើរ ឬផ្លាស់ទីទៅម៉ាស៊ីនដែលមានកំណែ PHP ថ្មី ‌!
(ក្នុងករណី 5.0.x អ្នកក៏អាចបន្ទាបទៅកំណែ 4.4.x ផងដែរ)

'; $string['welcomep10'] = '{$a->installername} ({$a->installerversion})'; $string['welcomep20'] = 'អ្នកកំពុងមើលទំព័រនេះ ពីព្រោះអ្នកបានដំឡើង និងចាប់ផ្ដើមដំណើរការកញ្ចប់ {$a->packname} {$a->packversion} ដោយជោគជ័យ ក្នុងកុំព្យូទ័ររបស់អ្នក ។ សូមអបអរសាទរ!'; $string['welcomep30'] = 'ការចេញផ្សាយ {$a->installername} នេះ រួមបញ្ចូលនូវកម្មវិធីសម្រាប់បង្កើតបរិស្ថានមួយដែល Moodle នឹងប្រតិបត្តិ ។ វាមានឈ្មោះថា ៖'; diff --git a/install/lang/mn/install.php b/install/lang/mn/install.php index 482b10f..2498a1a 100644 --- a/install/lang/mn/install.php +++ b/install/lang/mn/install.php @@ -54,7 +54,7 @@ $string['memorylimithelp'] = '

Таны серверийн PHP санах ой $string['phpversion'] = 'РНР хувилбар'; $string['phpversionhelp'] = '

Mooдл нь РНР хувилбарын хамгийн багадаа 4.3.0 эсвэл 5.1.0 байхыг шаарддаг (5.0.x нь алдаануудтай).

Та одоо {$a} хувилбар ажиллуулж байна

-

Та PHP-гээ шинэчлэх эсвэл PHP-ийн шинэ хувилбар бүхий хост руу шилжүүл!
+

Та PHP-гээ шинэчлэх эсвэл PHP-ийн шинэ хувилбар бүхий хост руу шилжүүл!
(5.0.x тохиолдолд доошоо 4.4.x хувилбар руу орж болно)

'; $string['welcomep10'] = '{$a->installername} ({$a->installerversion})'; $string['welcomep20'] = 'Та {$a->packname} {$a->packversion} багцыг компьютер дээрээ амжилттай суулгаж ажиллуулсан тул энэ хуудсыг харж байна. Баяр хүргэе!'; diff --git a/install/lang/ta/install.php b/install/lang/ta/install.php index 4d4eee7..698b4c3 100644 --- a/install/lang/ta/install.php +++ b/install/lang/ta/install.php @@ -62,7 +62,7 @@ $string['memorylimithelp'] = '

The PHP memory limit for your server is current $string['phpversion'] = 'பிஎச்பி பதிப்பு'; $string['phpversionhelp'] = '

Moodle requires a PHP version of at least 4.3.0 or 5.1.0 (5.0.x has a number of known problems).

You are currently running version {$a}

-

You must upgrade PHP or move to a host with a newer version of PHP!
+

You must upgrade PHP or move to a host with a newer version of PHP!
(In case of 5.0.x you could also downgrade to 4.4.x version)

'; $string['welcomep10'] = '{$a->installername} ({$a->installerversion})'; $string['welcomep20'] = 'You are seeing this page because you have successfully installed and diff --git a/install/lang/ta_lk/install.php b/install/lang/ta_lk/install.php index 06f4810..f7074e4 100644 --- a/install/lang/ta_lk/install.php +++ b/install/lang/ta_lk/install.php @@ -64,7 +64,7 @@ $string['phpextension'] = '{$a} PHP நீட்சி'; $string['phpversion'] = 'PHP பதிப்பு'; $string['phpversionhelp'] = '

Moodle குறைந்தளவு ஒரு PHP பதிப்பின் 4.3.0 or 5.1.0 ஐ (5.0.x அறியப்பட்ட பிரச்சினைகளின் ஒரு எண்ணிக்கையைக் கொண்டிருக்கின்றது) வேண்டுகின்றது.

நீங்கள் தற்போதைய பதிப்பு {$a} ஐ இயக்குகின்றீர்கள்

-

நீங்கள் PHP ஐ மேம்படுத்த அல்லது PHP இன் ஒரு புதிய பதிப்புடன் ஒரு வழங்கியிற்கு நகர்த்த வேண்டும்!
+

நீங்கள் PHP ஐ மேம்படுத்த அல்லது PHP இன் ஒரு புதிய பதிப்புடன் ஒரு வழங்கியிற்கு நகர்த்த வேண்டும்!
(5.0.x இன் சம்பவத்தில்,நீங்கள் 4.4.x பதிப்பிற்கு கீழ்த்தரப்படுத்த முடிகின்றது)

'; $string['welcomep10'] = '{$a->installername} ({$a->installerversion})'; diff --git a/lang/en/admin.php b/lang/en/admin.php index 153dcb7..5a83728 100644 --- a/lang/en/admin.php +++ b/lang/en/admin.php @@ -846,8 +846,8 @@ $string['rememberusername'] = 'Remember username'; $string['rememberusername_desc'] = 'Enable if you want to store permanent cookies with usernames during user login. Permanent cookies may be considered a privacy issue if used without consent.'; $string['reportsmanage'] = 'Manage reports'; $string['reportsdeleteconfirm'] = 'You are about to completely delete the report \'{$a}\'. This will completely delete everything in the database associated with this plugin. Are you SURE you want to continue?'; -$string['requiredentrieschanged'] = 'IMPORTANT - PLEASE READ
(This warning message will only be displayed during this upgrade)
Due to a bug fix, the behaviour of database activities using the \'Required entries\' and \'Required entries before viewing settings\' settings will change. A more detailed explanation of the changes can be read on the database module forum. The expected behavior of these settings can also be read on Moodle Docs. -

This change affects the following databases in your system: (Please save this list now, and after the upgrade, check that these activities still work the way that the teacher intends.)
{$a->text}
'; +$string['requiredentrieschanged'] = 'IMPORTANT - PLEASE READ
(This warning message will only be displayed during this upgrade)
Due to a bug fix, the behaviour of database activities using the \'Required entries\' and \'Required entries before viewing settings\' settings will change. A more detailed explanation of the changes can be read on the database module forum. The expected behavior of these settings can also be read on Moodle Docs. +

This change affects the following databases in your system: (Please save this list now, and after the upgrade, check that these activities still work the way that the teacher intends.)
{$a->text}
'; $string['requiremodintro'] = 'Require activity description'; $string['requires'] = 'Requires'; $string['purgecaches']= 'Purge all caches'; diff --git a/lang/en/webservice.php b/lang/en/webservice.php index 7eb7ce4..5e52490 100644 --- a/lang/en/webservice.php +++ b/lang/en/webservice.php @@ -175,7 +175,7 @@ $string['simpleauthlog'] = 'Simple authentication login'; $string['step'] = 'Step'; $string['testauserwithtestclientdescription'] = 'Simulate external access to the service using the web service test client. Before doing so, login as a user with the moodle/webservice:createtoken capability and obtain the security key (token) via My profile settings. You will use this token in the test client. In the test client, also choose an enabled protocol with the token authentication. WARNING: The functions that you test WILL BE EXECUTED for this user, so be careful what you choose to test!'; $string['testclient'] = 'Web service test client'; -$string['testclientdescription'] = '* The web service test client executes the functions for REAL. Do not test functions that you don\'t know.
* All existing web service functions are not yet implemented into the test client.
* In order to check that a user cannot access some functions, you can test some functions that you didn\'t allow.
* To see clearer error messages set the debugging to {$a->mode} into {$a->atag}
* Access the {$a->amfatag}.'; +$string['testclientdescription'] = '* The web service test client executes the functions for REAL. Do not test functions that you don\'t know.
* All existing web service functions are not yet implemented into the test client.
* In order to check that a user cannot access some functions, you can test some functions that you didn\'t allow.
* To see clearer error messages set the debugging to {$a->mode} into {$a->atag}
* Access the {$a->amfatag}.'; $string['testwithtestclient'] = 'Test the service'; $string['testwithtestclientdescription'] = 'Simulate external access to the service using the web service test client. Use an enabled protocol with token authentication. WARNING: The functions that you test WILL BE EXECUTED, so be careful what you choose to test!'; $string['token'] = 'Token'; diff --git a/lib/adminlib.php b/lib/adminlib.php index 72d6df3..6ce0dbd 100644 --- a/lib/adminlib.php +++ b/lib/adminlib.php @@ -6523,11 +6523,11 @@ class admin_setting_managerepository extends admin_setting { $settings .= '' . $settingsstr .''; $settings .= $OUTPUT->container_start('mdl-left'); - $settings .= '
'; + $settings .= '
'; $settings .= $admininstancenumbertext; - $settings .= '
'; + $settings .= '
'; $settings .= $courseinstancenumbertext; - $settings .= '
'; + $settings .= '
'; $settings .= $userinstancenumbertext; $settings .= $OUTPUT->container_end(); } diff --git a/lib/moodlelib.php b/lib/moodlelib.php index 52d2e5d..254eb3b 100644 --- a/lib/moodlelib.php +++ b/lib/moodlelib.php @@ -6894,7 +6894,7 @@ class install_string_manager implements string_manager { * * Example usage of this function involves finding the string you would * like a local equivalent of and using its identifier and module information - * to retrieve it.
+ * to retrieve it.
* If you open moodle/lang/en/moodle.php and look near line 278 * you will find a string to prompt a user for their word for 'course' * @@ -7024,14 +7024,14 @@ function get_strings($array, $component = '') { * * Prints out a translated string using the return value from the {@link get_string()} function. * - * Example usage of this function when the string is in the moodle.php file:
+ * Example usage of this function when the string is in the moodle.php file:
* * echo ''; * print_string('course'); * echo ''; * * - * Example usage of this function when the string is not in the moodle.php file:
+ * Example usage of this function when the string is not in the moodle.php file:
* * echo '

'; * print_string('typecourse', 'calendar'); @@ -8788,7 +8788,7 @@ function shorten_text($text, $ideal=30, $exact = false, $ending='...') { foreach ($lines as $line_matchings) { // if there is any html-tag in this line, handle it and add it (uncounted) to the output if (!empty($line_matchings[1])) { - // if it's an "empty element" with or without xhtml-conform closing slash (f.e.
) + // if it's an "empty element" with or without xhtml-conform closing slash (f.e.
) if (preg_match('/^<(\s*.+?\/\s*|\s*(img|br|input|hr|area|base|basefont|col|frame|isindex|link|meta|param)(\s.+?)?)>$/is', $line_matchings[1])) { // do nothing // if tag is a closing tag (f.e. ) diff --git a/lib/simpletest/testformslib.php b/lib/simpletest/testformslib.php index 2d8d788..295cb23 100644 --- a/lib/simpletest/testformslib.php +++ b/lib/simpletest/testformslib.php @@ -72,7 +72,7 @@ class formslib_test extends UnitTestCase { $this->assertTrue($rule->validate('
')); $this->assertTrue($rule->validate('
')); $this->assertTrue($rule->validate('
')); - $this->assertTrue($rule->validate('
')); + $this->assertTrue($rule->validate('
')); $this->assertTrue($rule->validate('
')); $this->assertTrue($rule->validate(' ')); // Fails @@ -109,7 +109,7 @@ class formslib_test extends UnitTestCase { $this->assertFalse($rule->validate('

')); $this->assertFalse($rule->validate('

')); $this->assertFalse($rule->validate('
')); - $this->assertFalse($rule->validate('
')); + $this->assertFalse($rule->validate('
')); $this->assertFalse($rule->validate('
')); $this->assertFalse($rule->validate(' ')); $this->assertFalse($rule->validate('')); diff --git a/login/index_form.html b/login/index_form.html index 3455a54..9a4d0c4 100644 --- a/login/index_form.html +++ b/login/index_form.html @@ -23,7 +23,7 @@ if (empty($CFG->xmlstrictheaders) and !empty($CFG->loginpasswordautocomplete)) {
'; + echo '
'; echo '('.get_string("cookiesenabled").')'; echo $OUTPUT->help_icon('cookiesenabled'); ?> diff --git a/mod/assignment/lib.php b/mod/assignment/lib.php index 0da8827..2fc01af 100644 --- a/mod/assignment/lib.php +++ b/mod/assignment/lib.php @@ -2400,7 +2400,7 @@ class mod_assignment_grading_form extends moodleform { $mform->setType('filter', PARAM_INT); $mform->addElement('static', 'picture', $OUTPUT->user_picture($this->_customdata->user), - fullname($this->_customdata->user, true) . '
' . + fullname($this->_customdata->user, true) . '
' . userdate($this->_customdata->submission->timemodified) . $this->_customdata->lateness ); @@ -2414,7 +2414,7 @@ class mod_assignment_grading_form extends moodleform { $mform->addElement('header', 'Last Grade', get_string('lastgrade', 'assignment')); $mform->addElement('static', 'picture', $OUTPUT->user_picture($this->_customdata->teacher) , fullname($this->_customdata->teacher,true). - '
'.$datestring); + '
'.$datestring); } // buttons $this->add_action_buttons(); diff --git a/mod/assignment/type/uploadsingle/assignment.class.php b/mod/assignment/type/uploadsingle/assignment.class.php index 03f91af..64df4eb 100644 --- a/mod/assignment/type/uploadsingle/assignment.class.php +++ b/mod/assignment/type/uploadsingle/assignment.class.php @@ -44,7 +44,7 @@ class assignment_uploadsingle extends assignment_base { $path = file_encode_url($CFG->wwwroot.'/pluginfile.php', '/'.$this->context->id.'/mod_assignment/submission/'.$submission->id.'/'.$filename); $output .= ''.$mimetype.''.s($filename).'
'; $output .= plagiarism_get_links(array('userid'=>$userid, 'file'=>$file, 'cmid'=>$this->cm->id, 'course'=>$this->course, 'assignment'=>$this->assignment)); - $output .='
'; + $output .='
'; } } } diff --git a/mod/choice/lib.php b/mod/choice/lib.php index 6c247c2..dfc8a63 100644 --- a/mod/choice/lib.php +++ b/mod/choice/lib.php @@ -481,7 +481,7 @@ function prepare_choice_show_results($choice, $course, $cm, $allresponses, $forc if ($choice->limitanswers) { echo get_string("taken", "choice").":"; echo $columncount[$optionid]; - echo "
"; + echo "
"; echo get_string("limit", "choice").":"; echo $choice->maxanswers[$optionid]; } else { diff --git a/mod/data/lib.php b/mod/data/lib.php index 2bee85b..8194bd1 100644 --- a/mod/data/lib.php +++ b/mod/data/lib.php @@ -1682,7 +1682,7 @@ function data_print_preference_form($data, $perpage, $search, $sort='', $order=' echo format_text($newtext, FORMAT_HTML, $options); echo ''; - echo '
'; + echo '
'; echo ''; echo '
'; echo ''; diff --git a/mod/glossary/editcategories.php b/mod/glossary/editcategories.php index 3dc672f..055d65d 100644 --- a/mod/glossary/editcategories.php +++ b/mod/glossary/editcategories.php @@ -131,7 +131,7 @@ if ( $hook >0 ) { echo "

" . get_string("delete"). " " . get_string("category","glossary"). "

"; echo $OUTPUT->box_start('generalbox boxaligncenter errorboxcontent boxwidthnarrow'); - echo "
".format_string($category->name, true, $fmtoptions)."
"; + echo "
".format_string($category->name, true, $fmtoptions)."
"; $num_entries = $DB->count_records("glossary_entries_categories", array("categoryid"=>$category->id)); if ( $num_entries ) { diff --git a/mod/lesson/reformat.php b/mod/lesson/reformat.php index 7712341..900db2e 100644 --- a/mod/lesson/reformat.php +++ b/mod/lesson/reformat.php @@ -27,7 +27,7 @@ defined('MOODLE_INTERNAL') || die(); function removedoublecr($filename) { -// This function will adjust a file in roughly Aiken style by replacing extra newlines with
tags +// This function will adjust a file in roughly Aiken style by replacing extra newlines with
tags // so that instructors can have newlines wherever they like as long as the overall format is in Aiken $filearray = file($filename); @@ -48,7 +48,7 @@ function removedoublecr($filename) { if (count($outarray) ) { // get the last item in the outarray $cur_pos = (count($outarray) - 1); - $outarray[$cur_pos] = trim($outarray[$cur_pos])."
\n"; + $outarray[$cur_pos] = trim($outarray[$cur_pos])."
\n"; } } else { diff --git a/mod/lti/locallib.php b/mod/lti/locallib.php index 74f0276..beaba8f 100644 --- a/mod/lti/locallib.php +++ b/mod/lti/locallib.php @@ -1059,16 +1059,16 @@ function lti_post_launch_html($newparms, $endpoint, $debug=false) { $r .= ""; $r .= get_string("toggle_debug_data", "lti")."\n"; $r .= "
\n"; - $r .= "".get_string("basiclti_endpoint", "lti")."
\n"; - $r .= $endpoint . "
\n 
\n"; - $r .= "".get_string("basiclti_parameters", "lti")."
\n"; + $r .= "".get_string("basiclti_endpoint", "lti")."
\n"; + $r .= $endpoint . "
\n 
\n"; + $r .= "".get_string("basiclti_parameters", "lti")."
\n"; foreach ($newparms as $key => $value) { $key = htmlspecialchars($key); $value = htmlspecialchars($value); - $r .= "$key = $value
\n"; + $r .= "$key = $value
\n"; } - $r .= " 
\n"; - //$r .= "

".get_string("basiclti_base_string", "lti")."
\n".$lastbasestring."

\n"; + $r .= " 
\n"; + //$r .= "

".get_string("basiclti_base_string", "lti")."
\n".$lastbasestring."

\n"; $r .= "
\n"; } $r .= "\n"; diff --git a/mod/scorm/report/basic/report.php b/mod/scorm/report/basic/report.php index a201cd4..b21fc43 100644 --- a/mod/scorm/report/basic/report.php +++ b/mod/scorm/report/basic/report.php @@ -447,7 +447,7 @@ class scorm_basic_report extends scorm_default_report { $score = $strstatus; } if (!$download) { - $row[] = ''.$strstatus.'
+ $row[] = ''.$strstatus.'
'.$score.''; } else { @@ -457,7 +457,7 @@ class scorm_basic_report extends scorm_default_report { // if we don't have track data, we haven't attempted yet $strstatus = get_string('notattempted', 'scorm'); if (!$download) { - $row[] = ''.$strstatus.'
'.$strstatus; + $row[] = ''.$strstatus.'
'.$strstatus; } else { $row[] = $strstatus; } diff --git a/mod/scorm/report/interactions/report.php b/mod/scorm/report/interactions/report.php index 930d835..0d486cd 100644 --- a/mod/scorm/report/interactions/report.php +++ b/mod/scorm/report/interactions/report.php @@ -470,7 +470,7 @@ class scorm_interactions_report extends scorm_default_report { $score = $strstatus; } if (!$download) { - $row[] = ''.$strstatus.'
+ $row[] = ''.$strstatus.'
'.$score.''; } else { @@ -522,7 +522,7 @@ class scorm_interactions_report extends scorm_default_report { // if we don't have track data, we haven't attempted yet $strstatus = get_string('notattempted', 'scorm'); if (!$download) { - $row[] = ''.$strstatus.'
'.$strstatus; + $row[] = ''.$strstatus.'
'.$strstatus; } else { $row[] = $strstatus; } diff --git a/portfolio/mahara/lib.php b/portfolio/mahara/lib.php index beb43b1..5d43141 100644 --- a/portfolio/mahara/lib.php +++ b/portfolio/mahara/lib.php @@ -205,7 +205,7 @@ class portfolio_plugin_mahara extends portfolio_plugin_pull_base { if (!$client->send($this->mnethost)) { foreach ($client->error as $errormessage) { list($code, $message) = array_map('trim',explode(':', $errormessage, 2)); - $message .= "ERROR $code:
$errormessage
"; + $message .= "ERROR $code:
$errormessage
"; } throw new portfolio_export_exception($this->get('exporter'), 'failedtoping', 'portfolio_mahara', '', $message); } @@ -275,7 +275,7 @@ class portfolio_plugin_mahara extends portfolio_plugin_pull_base { if (!$client->send($this->mnethost)) { foreach ($client->error as $errormessage) { list($code, $message) = array_map('trim',explode(':', $errormessage, 2)); - $message .= "ERROR $code:
$errormessage
"; + $message .= "ERROR $code:
$errormessage
"; } throw new portfolio_export_exception($this->get('exporter'), 'failedtoping', 'portfolio_mahara', '', $message); } diff --git a/question/format/blackboard_six/format.php b/question/format/blackboard_six/format.php index 484a31d..b58552e 100644 --- a/question/format/blackboard_six/format.php +++ b/question/format/blackboard_six/format.php @@ -823,8 +823,8 @@ function process_essay($quest, &$questions) { } } else { - print "Essay question types are not handled because the quiz question type 'Essay' does not exist in this installation of Moodle
"; - print "    Omitted Question: ".$quest->QUESTION_BLOCK->text.'

'; + print "Essay question types are not handled because the quiz question type 'Essay' does not exist in this installation of Moodle
"; + print "    Omitted Question: ".$quest->QUESTION_BLOCK->text.'

'; } } @@ -884,7 +884,7 @@ function process_matching($quest, &$questions) { print "Question:".$quest->QUESTION_BLOCK->text; if (isset($quest->QUESTION_BLOCK->file)) { - print '
There is a subfile contained in the zipfile that has been copied to course files: bb_import/'.basename($quest->QUESTION_BLOCK->file).''; + print '
There is a subfile contained in the zipfile that has been copied to course files: bb_import/'.basename($quest->QUESTION_BLOCK->file).''; if (preg_match('/(gif|jpg|jpeg|png)$/i', $quest->QUESTION_BLOCK->file)) { print ''; } @@ -918,8 +918,8 @@ function process_matching($quest, &$questions) { } } else { - print "Matching question types are not handled because the quiz question type 'Rendered Matching' does not exist in this installation of Moodle
"; - print "    Omitted Question: ".$quest->QUESTION_BLOCK->text.'

'; + print "Matching question types are not handled because the quiz question type 'Rendered Matching' does not exist in this installation of Moodle
"; + print "    Omitted Question: ".$quest->QUESTION_BLOCK->text.'

'; } } diff --git a/question/format/webct/format.php b/question/format/webct/format.php index db833a0..d7443da 100644 --- a/question/format/webct/format.php +++ b/question/format/webct/format.php @@ -297,7 +297,7 @@ class qformat_webct extends qformat_default { } else { foreach ($question->answer as $key => $dataanswer) { if ($question->tempgeneralfeedback !=''){ - $question->feedback[$key] = $question->tempgeneralfeedback.'
'.$question->feedback[$key]; + $question->feedback[$key] = $question->tempgeneralfeedback.'
'.$question->feedback[$key]; } } } diff --git a/question/type/calculated/datasetitems_form.php b/question/type/calculated/datasetitems_form.php index 3d07083..f10e5f5 100644 --- a/question/type/calculated/datasetitems_form.php +++ b/question/type/calculated/datasetitems_form.php @@ -228,7 +228,7 @@ class question_dataset_dependent_items_form extends moodleform { $radiogrp[] =& $mform->createElement('radio', 'nextpageparam[forceregeneration]', null, get_string('forceregenerationall', 'qtype_calculated'), 2); $mform->addGroup($radiogrp, 'forceregenerationgrp', - get_string('nextitemtoadd', 'qtype_calculated'), "
", false); + get_string('nextitemtoadd', 'qtype_calculated'), "
", false); } $mform->addElement('submit', 'getnextbutton', get_string('getnextnow', 'qtype_calculated')); @@ -417,7 +417,7 @@ class question_dataset_dependent_items_form extends moodleform { } $totalcomment=''; foreach ($question->options->answers as $key => $answer) { - $totalcomment .= $comment->stranswers[$key].'
'; + $totalcomment .= $comment->stranswers[$key].'
'; } $formdata['answercomment['.$itemnumber.']'] = $totalcomment; } diff --git a/question/type/calculated/edit_calculated_form.php b/question/type/calculated/edit_calculated_form.php index 76dc6cd..ba58ad7 100644 --- a/question/type/calculated/edit_calculated_form.php +++ b/question/type/calculated/edit_calculated_form.php @@ -206,7 +206,7 @@ class qtype_calculated_edit_form extends qtype_numerical_edit_form { if (!isset($errors['questiontext'])) { $errors['questiontext'] = $formulaerrors.':'.$regs1[1]; } else { - $errors['questiontext'] .= '
'.$formulaerrors.':'.$regs1[1]; + $errors['questiontext'] .= '
'.$formulaerrors.':'.$regs1[1]; } } } diff --git a/question/type/calculated/questiontype.php b/question/type/calculated/questiontype.php index 99f4b7b..526e95a 100644 --- a/question/type/calculated/questiontype.php +++ b/question/type/calculated/questiontype.php @@ -755,11 +755,11 @@ class qtype_calculated extends question_type { $menu2 = html_writer::select($options, 'calcdistribution[]', $regs[1], null); return '
' + .'" value="'. get_string('generatevalue', 'qtype_calculated') . '"/>
' . ' & ' - . $menu1 . '
' + . $menu1 . '
' . $menu2; } else { return ''; @@ -1031,7 +1031,7 @@ class qtype_calculated extends question_type { } else { $strheader .= $delimiter.$answer->answer; } - $delimiter = '


'; + $delimiter = '


'; } return $strheader; } @@ -1072,12 +1072,12 @@ class qtype_calculated extends question_type { } if ($answer->min === '') { // This should mean that something is wrong - $comment->stranswers[$key] = " $formattedanswer->answer".'

'; + $comment->stranswers[$key] = " $formattedanswer->answer".'

'; } else if ($formula === '*') { $comment->stranswers[$key] = $formula . ' = ' . - get_string('anyvalue', 'qtype_calculated') . '


'; + get_string('anyvalue', 'qtype_calculated') . '


'; } else { - $comment->stranswers[$key] = $formula . ' = ' . $formattedanswer->answer . '
'; + $comment->stranswers[$key] = $formula . ' = ' . $formattedanswer->answer . '
'; $correcttrue->correct = $formattedanswer->answer; $correcttrue->true = $answer->answer; if ($formattedanswer->answer < $answer->min || @@ -1090,7 +1090,7 @@ class qtype_calculated extends question_type { $comment->stranswers[$key] .= get_string('trueanswerinsidelimits', 'qtype_calculated', $correcttrue); } - $comment->stranswers[$key] .= '
'; + $comment->stranswers[$key] .= '
'; $comment->stranswers[$key] .= get_string('min', 'qtype_calculated') . $delimiter . $answer->min . ' --- '; $comment->stranswers[$key] .= get_string('max', 'qtype_calculated') . @@ -1661,7 +1661,7 @@ class qtype_calculated extends question_type { } else { $qu->name = ''; } - $text .= "    $qu->name
"; + $text .= "    $qu->name
"; } $text .= ""; } @@ -1768,7 +1768,7 @@ class qtype_calculated extends question_type { if ($usedinquiz) { $text .= "$nbofattempts"; } else { - $text .= "
"; + $text .= "
"; } $text .= ""; diff --git a/question/type/calculatedmulti/edit_calculatedmulti_form.php b/question/type/calculatedmulti/edit_calculatedmulti_form.php index ff2b986..2347d41 100644 --- a/question/type/calculatedmulti/edit_calculatedmulti_form.php +++ b/question/type/calculatedmulti/edit_calculatedmulti_form.php @@ -238,7 +238,7 @@ class qtype_calculatedmulti_edit_form extends question_edit_form { if (!isset($errors['questiontext'])) { $errors['questiontext'] = $formulaerrors.':'.$regs1[1]; } else { - $errors['questiontext'] .= '
'.$formulaerrors.':'.$regs1[1]; + $errors['questiontext'] .= '
'.$formulaerrors.':'.$regs1[1]; } } } @@ -277,7 +277,7 @@ class qtype_calculatedmulti_edit_form extends question_edit_form { if (!isset($errors['answer['.$key.']'])) { $errors['answer['.$key.']'] = $formulaerrors.':'.$regs1[1]; } else { - $errors['answer['.$key.']'] .= '
'.$formulaerrors.':'.$regs1[1]; + $errors['answer['.$key.']'] .= '
'.$formulaerrors.':'.$regs1[1]; } } } diff --git a/question/type/calculatedmulti/questiontype.php b/question/type/calculatedmulti/questiontype.php index 963a95e..6224b1e 100644 --- a/question/type/calculatedmulti/questiontype.php +++ b/question/type/calculatedmulti/questiontype.php @@ -202,7 +202,7 @@ class qtype_calculatedmulti extends qtype_calculated { } else { $strheader .= $delimiter.$answer->answer; } - $delimiter = '
'; + $delimiter = '
'; } return $strheader; } diff --git a/question/type/calculatedsimple/edit_calculatedsimple_form.php b/question/type/calculatedsimple/edit_calculatedsimple_form.php index d9dae12..1ecd4da 100644 --- a/question/type/calculatedsimple/edit_calculatedsimple_form.php +++ b/question/type/calculatedsimple/edit_calculatedsimple_form.php @@ -422,7 +422,7 @@ class qtype_calculatedsimple_edit_form extends qtype_calculated_edit_form { $totalcomment = ''; foreach ($this->nonemptyanswer as $key => $answer) { - $totalcomment .= $comment->stranswers[$key].'
'; + $totalcomment .= $comment->stranswers[$key].'
'; } $this->formdata['answercomment['.$itemnumber.']'] = $totalcomment; diff --git a/question/type/calculatedsimple/questiontype.php b/question/type/calculatedsimple/questiontype.php index 8235bda..760221d 100644 --- a/question/type/calculatedsimple/questiontype.php +++ b/question/type/calculatedsimple/questiontype.php @@ -268,7 +268,7 @@ class qtype_calculatedsimple extends qtype_calculated { foreach ($answers as $key => $answer) { $strheader .= $delimiter.$answer->answer; - $delimiter = '


'; + $delimiter = '


'; } return $strheader; } diff --git a/repository/flickr_public/lib.php b/repository/flickr_public/lib.php index 1cfb42f..7e07296 100644 --- a/repository/flickr_public/lib.php +++ b/repository/flickr_public/lib.php @@ -385,7 +385,7 @@ class repository_flickr_public extends repository { $str .= ''; $str .= ''; $str .= ''; - $str .= '

'; + $str .= '

'; $str .= '

'; return $str; } diff --git a/repository/lib.php b/repository/lib.php index 5db4888..b25487c 100644 --- a/repository/lib.php +++ b/repository/lib.php @@ -1709,7 +1709,7 @@ abstract class repository { $str .= ''; $str .= ''; $str .= ''; - $str .= '

'; + $str .= '

'; return $str; } diff --git a/tag/edit_form.php b/tag/edit_form.php index f1e8286..2b7b6d5 100644 --- a/tag/edit_form.php +++ b/tag/edit_form.php @@ -52,7 +52,7 @@ class tag_edit_form extends moodleform { $mform->addElement('checkbox', 'tagtype', get_string('officialtag', 'tag')); } - $mform->addElement('html', '
'); + $mform->addElement('html', '
'); $mform->addElement('textarea', 'relatedtags', get_string('relatedtags','tag'), 'cols="50" rows="3"'); $mform->setType('relatedtags', PARAM_TAGLIST); $mform->addElement('html', '
'); diff --git a/tag/locallib.php b/tag/locallib.php index 7b7cd46..31c2de6 100644 --- a/tag/locallib.php +++ b/tag/locallib.php @@ -261,7 +261,7 @@ function tag_print_search_results($query, $page, $perpage, $return=false) { $output .= '
  • '; foreach (array_slice($tags, $i * $nr_of_lis_per_ul, $nr_of_lis_per_ul) as $tag) { $tag_link = ' '. tag_display_name($tag) .''; - $output .= '•'. $tag_link .'
    '; + $output .= '•'. $tag_link .'
    '; } $output .= '
    • '; } diff --git a/tag/manage.php b/tag/manage.php index e0edeb9..8d09772 100644 --- a/tag/manage.php +++ b/tag/manage.php @@ -282,7 +282,7 @@ if ($tagrecords = $DB->get_records_sql($query, $params, $table->get_page_start() echo ' '; echo ' '; echo ' '; - echo '

    '; + echo '

    '; echo '