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

Fixing more incorrect br-tags.

Browse Source
skala
Ivan Tcholakov 16 years ago
parent 90932bbfbe
commit a02e387db0
5 changed files with 71 additions and 71 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. 34
      main/gradebook/docs/example_csv.html
  2. 10
      main/gradebook/docs/example_xml.html
  3. 2
      main/inc/lib/fckeditor/editor/plugins/fckEmbedMovies/fck_embedmovies.html
  4. 88
      main/inc/lib/phpmailer/test/phpmailerTest.php
  5. 8
      main/wiki/wiki.inc.php

34
main/gradebook/docs/example_csv.html
Unescape View File

@ -4,33 +4,33 @@
</HEAD>
<BODY>
<h1>CSV example for certificate importation</h1>
This is an example file and this data can't be imported on your platform. The user id must correspond to users existing on your platform.</br>
This is an example file and this data can't be imported on your platform. The user id must correspond to users existing on your platform.<br />
The mandatory fields are emphasized. The other fields can be omitted. The separator is always the ";". If you want to overwrite the scores, you must choose the "Overwrite score" option.</br>
The mandatory fields are emphasized. The other fields can be omitted. The separator is always the ";". If you want to overwrite the scores, you must choose the "Overwrite score" option.<br />
<h2>Complete CSV score importation file</h2>
<b>username</b>;official_code;<b>lastname</b>;<b>firstname</b>;<b>score</b>;date</br>
<b>bgate</b>;bgate;Gate;Bill;<b>2</b>;02/25/09 12:24 PM</br>
<b>ltorvald</b>;ltorvald;Torvald;Linus;<b>10</b>;02/25/09 12:24 PM</br>
<b>jsmith</b>;;<b>Smith</b>;<b>John</b>;<b>3</b>;</br>
</br></br>
<b>username</b>;official_code;<b>lastname</b>;<b>firstname</b>;<b>score</b>;date<br />
<b>bgate</b>;bgate;Gate;Bill;<b>2</b>;02/25/09 12:24 PM<br />
<b>ltorvald</b>;ltorvald;Torvald;Linus;<b>10</b>;02/25/09 12:24 PM<br />
<b>jsmith</b>;;<b>Smith</b>;<b>John</b>;<b>3</b>;<br />
<br /><br />
<h2>Minimal CSV score importation file</h2>
This is possible to use a minimal file if you choose the "Ingnore error option" :
</br></br>
username;score</br>
bgate;2</br>
ltorvald;10</br>
jsmith;3</br>
<br /><br />
username;score<br />
bgate;2<br />
ltorvald;10<br />
jsmith;3<br />
<h2>Presence score importation file</h2>
For the presence this is the same file except the score fied which is "0" for absent and "1" for present :
</br></br>
<b>username</b>;official_code;<b>lastname</b>;<b>firstname</b>;<b>score</b>;date</br>
<b>bgate</b>;bgate;Gate;Bill;<b>0</b>;02/25/09 12:24 PM</br>
<b>ltorvald</b>;ltorvald;Torvald;Linus;<b>1</b>;02/25/09 12:24 PM</br>
<b>jsmith</b>;;<b>Smith</b>;<b>John</b>;<b>0</b>;</br>
<br /><br />
<b>username</b>;official_code;<b>lastname</b>;<b>firstname</b>;<b>score</b>;date<br />
<b>bgate</b>;bgate;Gate;Bill;<b>0</b>;02/25/09 12:24 PM<br />
<b>ltorvald</b>;ltorvald;Torvald;Linus;<b>1</b>;02/25/09 12:24 PM<br />
<b>jsmith</b>;;<b>Smith</b>;<b>John</b>;<b>0</b>;<br />

10
main/gradebook/docs/example_xml.html
Unescape View File

@ -18,9 +18,9 @@
</head>
<BODY>
<h1>XML example for certificate importation</h1>
This is an example file and this data can't be imported on your platform. The user id must correspond to users existing on your platform.</br>
This is an example file and this data can't be imported on your platform. The user id must correspond to users existing on your platform.<br />
The date and offical_code fiels aren't mandatory and can be omitted without any error. If you want to overwrite the scores, you must choose the "Overwrite score" option.</br>
The date and offical_code fiels aren't mandatory and can be omitted without any error. If you want to overwrite the scores, you must choose the "Overwrite score" option.<br />
<h2>Complete XML score importation file</h2>
<p class="PreformattedText">&lt;?xml version="1.0" encoding="ISO-8859-1"?&gt;</p>
@ -53,7 +53,7 @@ The date and offical_code fiels aren't mandatory and can be omitted without any
<h2>Minimal XML score importation file</h2>
This is possible to use a minimal file if you choose the "Ingnore error option" :
</br></br>
<br /><br />
<p class="PreformattedText">&lt;?xml version="1.0" encoding="ISO-8859-1"?&gt;</p>
<p class="PreformattedText"> &lt;XMLResults&gt;</p>
<p class="PreformattedText">&lt;Result&gt;</p>
@ -72,7 +72,7 @@ This is possible to use a minimal file if you choose the "Ingnore error option"
<h2>Complete XML presence importation file</h2>
For the presence this is the same file except the score fied which is "0" for absent and "1" for present :
</br></br>
<br /><br />
<p class="PreformattedText">&lt;?xml version="1.0" encoding="ISO-8859-1"?&gt;</p>
<p class="PreformattedText"> &lt;XMLResults&gt;</p>
<p class="PreformattedText">&lt;Result&gt;</p>
@ -101,7 +101,7 @@ For the presence this is the same file except the score fied which is "0" for ab
<p class="PreformattedText"> &lt;/Result&gt;</p>
<p class="PreformattedText">&lt;/XMLResults&gt;</p>
</br></br>
<br /><br />
You could also use a minimal XML file for the presence.
</BODY>

2
main/inc/lib/fckeditor/editor/plugins/fckEmbedMovies/fck_embedmovies.html
Unescape View File

@ -44,7 +44,7 @@ document.write( FCKTools.GetStyleHtml( GetCommonDialogCss() ) ) ;
<tr>
</table>
</br>
<br />
<table cellspacing="0" cellpadding="0" border="0">
<tr>

88
main/inc/lib/phpmailer/test/phpmailerTest.php
Unescape View File

@ -38,20 +38,20 @@ class phpmailerTest extends PHPUnit_Framework_TestCase {
* @type string
*/
var $Host = "";
/**
* Holds the change log.
* @private
* @type string array
*/
var $ChangeLog = array();
/**
* Holds the note log.
* @private
* @type string array
*/
var $NoteLog = array();
var $NoteLog = array();
/**
* Run before each test is started.
@ -97,14 +97,14 @@ class phpmailerTest extends PHPUnit_Framework_TestCase {
$this->Mail->Mailer = "mail";
$this->Sender = "unit_test@phpmailer.sf.net";
}
if (array_key_exists('mail_to', $_REQUEST)) {
$this->SetAddress($_REQUEST['mail_to'], 'Test User', 'to');
}
if (array_key_exists('mail_cc', $_REQUEST) and strlen($_REQUEST['mail_cc']) > 0) {
$this->SetAddress($_REQUEST['mail_cc'], 'Carbon User', 'cc');
}
}
}
/**
* Run after each test is completed.
@ -124,8 +124,8 @@ class phpmailerTest extends PHPUnit_Framework_TestCase {
*/
function BuildBody() {
$this->CheckChanges();
// Determine line endings for message
// Determine line endings for message
if($this->Mail->ContentType == "text/html" || strlen($this->Mail->AltBody) > 0)
{
$eol = "<br/>";
@ -140,18 +140,18 @@ class phpmailerTest extends PHPUnit_Framework_TestCase {
$bullet_start = "";
$bullet_end = "";
}
$ReportBody = "";
$ReportBody .= "---------------------" . $eol;
$ReportBody .= "Unit Test Information" . $eol;
$ReportBody .= "---------------------" . $eol;
$ReportBody .= "phpmailer version: " . PHPMailer::VERSION . $eol;
$ReportBody .= "Content Type: " . $this->Mail->ContentType . $eol;
if(strlen($this->Mail->Host) > 0)
$ReportBody .= "Host: " . $this->Mail->Host . $eol;
// If attachments then create an attachment list
$attachments = $this->Mail->GetAttachments();
if(count($attachments) > 0)
@ -165,7 +165,7 @@ class phpmailerTest extends PHPUnit_Framework_TestCase {
}
$ReportBody .= $bullet_end . $eol;
}
// If there are changes then list them
if(count($this->ChangeLog) > 0)
{
@ -175,12 +175,12 @@ class phpmailerTest extends PHPUnit_Framework_TestCase {
$ReportBody .= $bullet_start;
for($i = 0; $i < count($this->ChangeLog); $i++)
{
$ReportBody .= $bullet . $this->ChangeLog[$i][0] . " was changed to [" .
$ReportBody .= $bullet . $this->ChangeLog[$i][0] . " was changed to [" .
$this->ChangeLog[$i][1] . "]" . $eol;
}
$ReportBody .= $bullet_end . $eol . $eol;
}
// If there are notes then list them
if(count($this->NoteLog) > 0)
{
@ -194,11 +194,11 @@ class phpmailerTest extends PHPUnit_Framework_TestCase {
}
$ReportBody .= $bullet_end;
}
// Re-attach the original body
$this->Mail->Body .= $eol . $eol . $ReportBody;
}
/**
* Check which default settings have been changed for the report.
* @private
@ -224,7 +224,7 @@ class phpmailerTest extends PHPUnit_Framework_TestCase {
if($this->Mail->SMTPAuth)
$this->AddChange("SMTPAuth", "true");
}
/**
* Adds a change entry.
* @private
@ -235,7 +235,7 @@ class phpmailerTest extends PHPUnit_Framework_TestCase {
$this->ChangeLog[$cur][0] = $sName;
$this->ChangeLog[$cur][1] = $sNewValue;
}
/**
* Adds a simple note to the message.
* @public
@ -289,7 +289,7 @@ class phpmailerTest extends PHPUnit_Framework_TestCase {
* Try a plain message.
*/
function test_Low_Priority() {
$this->Mail->Priority = 5;
$this->Mail->Body = "Here is the main body. There should be " .
"a reply to address in this message.";
@ -331,11 +331,11 @@ class phpmailerTest extends PHPUnit_Framework_TestCase {
$this->Mail->Body = "Here is the text body";
$this->Mail->Subject .= ": Plain + StringAttachment";
$sAttachment = "These characters are the content of the " .
"string attachment.\nThis might be taken from a ".
"database or some other such thing. ";
$this->Mail->AddStringAttachment($sAttachment, "string_attach.txt");
$this->BuildBody();
@ -365,11 +365,11 @@ class phpmailerTest extends PHPUnit_Framework_TestCase {
* Try a plain message.
*/
function test_Html() {
$this->Mail->IsHTML(true);
$this->Mail->Subject .= ": HTML only";
$this->Mail->Body = "This is a <b>test message</b> written in HTML. </br>" .
$this->Mail->Body = "This is a <b>test message</b> written in HTML. <br />" .
"Go to <a href=\"http://phpmailer.sourceforge.net/\">" .
"http://phpmailer.sourceforge.net/</a> for new versions of " .
"phpmailer. <p/> Thank you!";
@ -386,7 +386,7 @@ class phpmailerTest extends PHPUnit_Framework_TestCase {
$this->Mail->Body = "This is the <b>HTML</b> part of the email.";
$this->Mail->Subject .= ": HTML + Attachment";
$this->Mail->IsHTML(true);
if(!$this->Mail->AddAttachment(__FILE__, "test_attach.txt"))
{
$this->assertTrue(false, $this->Mail->ErrorInfo);
@ -406,7 +406,7 @@ class phpmailerTest extends PHPUnit_Framework_TestCase {
"Here is an image!</a>";
$this->Mail->Subject .= ": Embedded Image";
$this->Mail->IsHTML(true);
if(!$this->Mail->AddEmbeddedImage("test.png", "my-attach", "test.png",
"base64", "image/png"))
{
@ -431,7 +431,7 @@ class phpmailerTest extends PHPUnit_Framework_TestCase {
"Here is an image!</a>";
$this->Mail->Subject .= ": Embedded Image + Attachment";
$this->Mail->IsHTML(true);
if(!$this->Mail->AddEmbeddedImage("test.png", "my-attach", "test.png",
"base64", "image/png"))
{
@ -444,7 +444,7 @@ class phpmailerTest extends PHPUnit_Framework_TestCase {
$this->assertTrue(false, $this->Mail->ErrorInfo);
return;
}
$this->BuildBody();
$this->assertTrue($this->Mail->Send(), $this->Mail->ErrorInfo);
}
@ -475,7 +475,7 @@ class phpmailerTest extends PHPUnit_Framework_TestCase {
$this->Mail->AltBody = "This is the text part of the email.";
$this->Mail->Subject .= ": AltBody + Attachment";
$this->Mail->IsHTML(true);
if(!$this->Mail->AddAttachment(__FILE__, "test_attach.txt"))
{
$this->assertTrue(false, $this->Mail->ErrorInfo);
@ -489,7 +489,7 @@ class phpmailerTest extends PHPUnit_Framework_TestCase {
} else {
$this->assertTrue(false, 'Could not write local file - check permissions');
}
}
}
function test_MultipleSend() {
$this->Mail->Body = "Sending two messages without keepalive";
@ -498,7 +498,7 @@ class phpmailerTest extends PHPUnit_Framework_TestCase {
$this->Mail->Subject = $subject . ": SMTP 1";
$this->assertTrue($this->Mail->Send(), $this->Mail->ErrorInfo);
$this->Mail->Subject = $subject . ": SMTP 2";
$this->assertTrue($this->Mail->Send(), $this->Mail->ErrorInfo);
}
@ -531,26 +531,26 @@ class phpmailerTest extends PHPUnit_Framework_TestCase {
$this->Mail->SMTPKeepAlive = true;
$this->Mail->Subject = $subject . ": SMTP keep-alive 1";
$this->assertTrue($this->Mail->Send(), $this->Mail->ErrorInfo);
$this->Mail->Subject = $subject . ": SMTP keep-alive 2";
$this->assertTrue($this->Mail->Send(), $this->Mail->ErrorInfo);
$this->Mail->SmtpClose();
}
/**
* Tests this denial of service attack:
* Tests this denial of service attack:
* http://www.cybsec.com/vuln/PHPMailer-DOS.pdf
*/
function test_DenialOfServiceAttack() {
$this->Mail->Body = "This should no longer cause a denial of service.";
$this->BuildBody();
$this->Mail->Subject = str_repeat("A", 998);
$this->assertTrue($this->Mail->Send(), $this->Mail->ErrorInfo);
}
function test_Error() {
$this->Mail->Subject .= ": This should be sent";
$this->Mail->Subject .= ": This should be sent";
$this->BuildBody();
$this->Mail->ClearAllRecipients(); // no addresses should cause an error
$this->assertTrue($this->Mail->IsError() == false, "Error found");
@ -560,7 +560,7 @@ class phpmailerTest extends PHPUnit_Framework_TestCase {
$this->Mail->AddAddress($_REQUEST['mail_to']);
$this->assertTrue($this->Mail->Send(), "Send failed");
}
function test_Addressing() {
$this->assertFalse($this->Mail->AddAddress('a@example..com'), 'Invalid address accepted');
$this->assertTrue($this->Mail->AddAddress('a@example.com'), 'Addressing failed');
@ -607,11 +607,11 @@ class phpmailerTest extends PHPUnit_Framework_TestCase {
*/
function test_Encodings() {
$this->Mail->Charset = 'iso-8859-1';
$this->assertEquals('=A1Hola!_Se=F1or!', $this->Mail->EncodeQ('¡Hola! Señor!', 'text'), 'Q Encoding (text) failed');
$this->assertEquals('=A1Hola!_Se=F1or!', $this->Mail->EncodeQ('¡Hola! Señor!', 'comment'), 'Q Encoding (comment) failed');
$this->assertEquals('=A1Hola!_Se=F1or!', $this->Mail->EncodeQ('¡Hola! Señor!', 'phrase'), 'Q Encoding (phrase) failed');
$this->assertEquals('=A1Hola!_Se=F1or!', $this->Mail->EncodeQ('<EFBFBD>Hola! Se<EFBFBD>or!', 'text'), 'Q Encoding (text) failed');
$this->assertEquals('=A1Hola!_Se=F1or!', $this->Mail->EncodeQ('<EFBFBD>Hola! Se<EFBFBD>or!', 'comment'), 'Q Encoding (comment) failed');
$this->assertEquals('=A1Hola!_Se=F1or!', $this->Mail->EncodeQ('<EFBFBD>Hola! Se<EFBFBD>or!', 'phrase'), 'Q Encoding (phrase) failed');
}
/**
* Signing tests
*/
@ -639,8 +639,8 @@ class phpmailerTest extends PHPUnit_Framework_TestCase {
$this->assertTrue($this->Mail->set('Timeout', 11), 'Valid property set failed');
$this->Mail->getFile(__FILE__);
}
}
}
/**
* This is a sample form for setting appropriate test values through a browser
* These values can also be set using a file called testbootstrap.php (not in svn) in the same folder as this script

8
main/wiki/wiki.inc.php
Unescape View File

@ -275,7 +275,7 @@ function save_wiki() {
$_clean['progress'] = Database::escape_string($_POST['progress']);
$_clean['version'] = intval($_POST['version']) + 1 ;
$_clean['linksto'] = links_to($_clean['content']); //and check links content
$dtime = date( "Y-m-d H:i:s" );
$session_id = api_get_session_id();
@ -1832,9 +1832,9 @@ function auto_add_page_users($assignment_type)
$link2teacher=$_POST['title']= $title_orig."_uass".api_get_user_id();
//first: teacher name, photo, and assignment description (original content)
// $content_orig_A='<div align="center" style="background-color: #F5F8FB; border:double">'.$photo.'</br>'.api_get_person_name($userinfo['firstname'], $userinfo['lastname']).'</br>('.get_lang('Teacher').')</div><br/><div>';
// $content_orig_A='<div align="center" style="background-color: #F5F8FB; border:double">'.$photo.'<br />'.api_get_person_name($userinfo['firstname'], $userinfo['lastname']).'<br />('.get_lang('Teacher').')</div><br/><div>';
$content_orig_A='<div align="center" style="background-color: #F5F8FB; border:solid; border-color: #E6E6E6"><table border="0"><tr><td style="font-size:24px">'.get_lang('AssignmentDesc').'</td></tr><tr><td>'.$photo.'</br>'.api_get_person_name($userinfo['firstname'], $userinfo['lastname']).'</td></tr></table></div>';
$content_orig_A='<div align="center" style="background-color: #F5F8FB; border:solid; border-color: #E6E6E6"><table border="0"><tr><td style="font-size:24px">'.get_lang('AssignmentDesc').'</td></tr><tr><td>'.$photo.'<br />'.api_get_person_name($userinfo['firstname'], $userinfo['lastname']).'</td></tr></table></div>';
$content_orig_B='<br/><div align="center" style="font-size:24px">'.get_lang('AssignmentDescription').': '.$title_orig.'</div><br/>'.$_POST['content'];
@ -1877,7 +1877,7 @@ function auto_add_page_users($assignment_type)
{
$_POST['title']= $title_orig;
$_POST['comment']=get_lang('AssignmentFirstComToStudent');
$_POST['content']='<div align="center" style="background-color: #F5F8FB; border:solid; border-color: #E6E6E6"><table border="0"><tr><td style="font-size:24px">'.get_lang('AssignmentWork').'</td></tr><tr><td>'.$photo.'</br>'.$name.'</td></tr></table></div>[['.$link2teacher.' | '.get_lang('AssignmentLinktoTeacherPage').']] '; //If $content_orig_B is added here, the task written by the professor was copied to the page of each student. TODO: config options
$_POST['content']='<div align="center" style="background-color: #F5F8FB; border:solid; border-color: #E6E6E6"><table border="0"><tr><td style="font-size:24px">'.get_lang('AssignmentWork').'</td></tr><tr><td>'.$photo.'<br />'.$name.'</td></tr></table></div>[['.$link2teacher.' | '.get_lang('AssignmentLinktoTeacherPage').']] '; //If $content_orig_B is added here, the task written by the professor was copied to the page of each student. TODO: config options
//AssignmentLinktoTeacherPage
$all_students_pages[] = '<li>'.strtoupper($o_user_to_add['lastname']).', '.$o_user_to_add['firstname'].' [['.$_POST['title']."_uass".$assig_user_id.' | '.$photo.']] '.$status_in_group.'</li>'; //don't change this line without guaranteeing that users will be ordered by last names in the following format (surname, name)

Write Preview
Loading…
Cancel
Save