Browse Source

Feature #272 - Installation scripts: Corrections on some html-tags.

Ivan Tcholakov 15 years ago
parent
commit
408203a850

+ 12 - 12
main/install/compare_db.php

@@ -197,12 +197,12 @@ foreach($bases_new as $num_base=>$base)
 		echo "<h3>This database has been removed!</h3>";
 	}
 	echo "<h3>Differences between each table</h3>" .
-			"- fields display under each table's name, <br>" .
-			"- new tables are surrounded by '**', <br/>" .
-			"- removed tables are surrounded by '---',<br/>" .
-			"- new fields are surrounded by '++',<br/>" .
-			"- removed fields are surrounded by '--',<br/>" .
-			"- modified fields are surrounded by '~+~',<br/>";
+			"- fields display under each table's name, <br />" .
+			"- new tables are surrounded by '**', <br />" .
+			"- removed tables are surrounded by '---',<br />" .
+			"- new fields are surrounded by '++',<br />" .
+			"- removed fields are surrounded by '--',<br />" .
+			"- modified fields are surrounded by '~+~',<br />";
 	echo '<pre>'.print_r($modif_tables,true).'</pre>';
 	$all_db_changes[$base] = $modif_tables;
 }
@@ -224,7 +224,7 @@ foreach($all_db_changes as $base => $changes){
 			foreach($myold as $myname){
 				//column lost, display DROP command
 				$myname = str_replace('--','',$myname);
-				echo "ALTER TABLE ".$mytable." DROP ".$myname."<br/>";
+				echo "ALTER TABLE ".$mytable." DROP ".$myname."<br />";
 			}
 			foreach($mychanged as $myname=>$myprop){
 				//field changed, display SET command
@@ -234,12 +234,12 @@ foreach($all_db_changes as $base => $changes){
 					$myprop = str_replace('~+~','',$myprop);
 					$myprops_string .= $myprop." ";
 				}
-				echo "ALTER TABLE ".$mytable." CHANGE $myname $myname $myprops_string<br/>";
+				echo "ALTER TABLE ".$mytable." CHANGE $myname $myname $myprops_string<br />";
 			}
 			foreach($mynew as $myname){
 				//column created, display ADD command
 				$myname = str_replace('++','',$myname);
-				echo "ALTER TABLE ".$mytable." ADD $myname...<br/>";
+				echo "ALTER TABLE ".$mytable." ADD $myname...<br />";
 			}
 		}else{
 			//we have a table-level difference
@@ -248,15 +248,15 @@ foreach($all_db_changes as $base => $changes){
 				case '**':
 					//new table, display CREATE TABLE command
 					$table = str_replace('**','',$table);
-					echo "CREATE TABLE ".$table."();<br/>";
+					echo "CREATE TABLE ".$table."();<br />";
 					break;
 				case '--':
 					//dropped table, display DROP TABLE command
 					$table = str_replace('---','',$table);
-					echo "DROP TABLE ".$table."();<br/>";
+					echo "DROP TABLE ".$table."();<br />";
 					break;
 				default:
-					echo "Unknown table problem: ".$table."<br/>";
+					echo "Unknown table problem: ".$table."<br />";
 					break;
 			}
 		}

+ 1 - 1
main/install/index.php

@@ -577,7 +577,7 @@ if ($_POST['step2']) {
 	<?php echo get_lang('AllowSelfReg').' : '.($allowSelfReg ? get_lang('Yes') : get_lang('No')); ?><br />
 	<?php echo get_lang('EncryptMethodUserPass').' : ';
   	echo $encryptPassForm;
-	?><br /><br/>
+	?><br /><br />
 
 	<?php echo get_lang('AdminEmail').' : '.$emailForm; ?><br />
 	<?php

+ 5 - 5
main/install/update-db-1.6.x-1.8.0.inc.php

@@ -60,7 +60,7 @@ if (defined('DOKEOS_INSTALL') || defined('DOKEOS_COURSE_UPDATE'))
 	//check if the current Dokeos install is elligible for update
 	if (empty ($updateFromConfigFile) || !file_exists($_POST['updatePath'].$updateFromConfigFile) || !in_array(get_config_param('clarolineVersion'), $update_from_version_6))
 	{
-		echo '<b>'.get_lang('Error').' !</b> Dokeos '.implode('|', $updateFromVersion).' '.get_lang('HasNotBeenFound').'.<br><br>
+		echo '<strong>'.get_lang('Error').' !</strong> Dokeos '.implode('|', $updateFromVersion).' '.get_lang('HasNotBeenFound').'.<br /><br />
 								'.get_lang('PleasGoBackToStep1').'.
 							    <p><button type="submit" class="back" name="step1" value="&lt; '.get_lang('Back').'">'.get_lang('Back').'</button></p>
 							    </td></tr></table></form></body></html>';
@@ -98,12 +98,12 @@ if (defined('DOKEOS_INSTALL') || defined('DOKEOS_COURSE_UPDATE'))
 		//$no = mysql_errno();
 		//$msg = mysql_error();
 
-		//echo '<hr>['.$no.'] - '.$msg.'<hr>';
+		//echo '<hr />['.$no.'] - '.$msg.'<hr />';
 		echo					get_lang('DBServerDoesntWorkOrLoginPassIsWrong').'.<br /><br />
 								'.get_lang('PleaseCheckTheseValues').' :<br /><br />
-							    <b>'.get_lang('DBHost').'</b> : '.$dbHostForm.'<br />
-								<b>'.get_lang('DBLogin').'</b> : '.$dbUsernameForm.'<br />
-								<b>'.get_lang('DBPassword').'</b> : '.$dbPassForm.'<br /><br />
+							    <strong>'.get_lang('DBHost').'</strong> : '.$dbHostForm.'<br />
+								<strong>'.get_lang('DBLogin').'</strong> : '.$dbUsernameForm.'<br />
+								<strong>'.get_lang('DBPassword').'</strong> : '.$dbPassForm.'<br /><br />
 								'.get_lang('PleaseGoBackToStep').' '. (defined('DOKEOS_INSTALL') ? '3' : '1').'.
 							    <p><button type="submit" class="back" name="step'. (defined('DOKEOS_INSTALL') ? '3' : '1').'" value="&lt; '.get_lang('Back').'">'.get_lang('Back').'</button></p>
 							    </td></tr></table></form></body></html>';

+ 5 - 5
main/install/update-db-1.8.0-1.8.2.inc.php

@@ -60,7 +60,7 @@ if (defined('DOKEOS_INSTALL') || defined('DOKEOS_COURSE_UPDATE'))
 	//check if the current Dokeos install is elligible for update
 	if (!file_exists('../inc/conf/configuration.php'))
 	{
-		echo '<b>'.get_lang('Error').' !</b> Dokeos '.implode('|', $updateFromVersion).' '.get_lang('HasNotBeenFound').'.<br><br>
+		echo '<strong>'.get_lang('Error').' !</strong> Dokeos '.implode('|', $updateFromVersion).' '.get_lang('HasNotBeenFound').'.<br /><br />
 								'.get_lang('PleasGoBackToStep1').'.
 							    <p><button type="submit" class="back" name="step1" value="&lt; '.get_lang('Back').'">'.get_lang('Back').'</button></p>
 							    </td></tr></table></form></body></html>';
@@ -98,12 +98,12 @@ if (defined('DOKEOS_INSTALL') || defined('DOKEOS_COURSE_UPDATE'))
 		//$no = mysql_errno();
 		//$msg = mysql_error();
 
-		//echo '<hr>['.$no.'] - '.$msg.'<hr>';
+		//echo '<hr />['.$no.'] - '.$msg.'<hr />';
 		echo					get_lang('DBServerDoesntWorkOrLoginPassIsWrong').'.<br /><br />
 								'.get_lang('PleaseCheckTheseValues').' :<br /><br />
-							    <b>'.get_lang('DBHost').'</b> : '.$dbHostForm.'<br />
-								<b>'.get_lang('DBLogin').'</b> : '.$dbUsernameForm.'<br />
-								<b>'.get_lang('DBPassword').'</b> : '.$dbPassForm.'<br /><br />
+							    <strong>'.get_lang('DBHost').'</strong> : '.$dbHostForm.'<br />
+								<strong>'.get_lang('DBLogin').'</strong> : '.$dbUsernameForm.'<br />
+								<strong>'.get_lang('DBPassword').'</strong> : '.$dbPassForm.'<br /><br />
 								'.get_lang('PleaseGoBackToStep').' '. (defined('DOKEOS_INSTALL') ? '3' : '1').'.
 							    <p><button type="submit" class="back" name="step'. (defined('DOKEOS_INSTALL') ? '3' : '1').'" value="&lt; '.get_lang('Back').'">'.get_lang('Back').'</button></p>
 							    </td></tr></table></form></body></html>';

+ 5 - 5
main/install/update-db-1.8.2-1.8.3.inc.php

@@ -60,7 +60,7 @@ if (defined('DOKEOS_INSTALL') || defined('DOKEOS_COURSE_UPDATE'))
 	//check if the current Dokeos install is elligible for update
 	if (!file_exists('../inc/conf/configuration.php'))
 	{
-		echo '<b>'.get_lang('Error').' !</b> Dokeos '.implode('|', $updateFromVersion).' '.get_lang('HasNotBeenFound').'.<br><br>
+		echo '<strong>'.get_lang('Error').' !</strong> Dokeos '.implode('|', $updateFromVersion).' '.get_lang('HasNotBeenFound').'.<br /><br />
 								'.get_lang('PleasGoBackToStep1').'.
 							    <p><button type="submit" class="back" name="step1" value="&lt; '.get_lang('Back').'">'.get_lang('Back').'</button></p>
 							    </td></tr></table></form></body></html>';
@@ -98,12 +98,12 @@ if (defined('DOKEOS_INSTALL') || defined('DOKEOS_COURSE_UPDATE'))
 		//$no = mysql_errno();
 		//$msg = mysql_error();
 
-		//echo '<hr>['.$no.'] - '.$msg.'<hr>';
+		//echo '<hr />['.$no.'] - '.$msg.'<hr />';
 		echo					get_lang('DBServerDoesntWorkOrLoginPassIsWrong').'.<br /><br />' .
 				'				'.get_lang('PleaseCheckTheseValues').' :<br /><br />
-							    <b>'.get_lang('DBHost').'</b> : '.$dbHostForm.'<br />
-								<b>'.get_lang('DBLogin').'</b> : '.$dbUsernameForm.'<br />
-								<b>'.get_lang('DBPassword').'</b> : '.$dbPassForm.'<br /><br />
+							    <strong>'.get_lang('DBHost').'</strong> : '.$dbHostForm.'<br />
+								<strong>'.get_lang('DBLogin').'</strong> : '.$dbUsernameForm.'<br />
+								<strong>'.get_lang('DBPassword').'</strong> : '.$dbPassForm.'<br /><br />
 								'.get_lang('PleaseGoBackToStep').' '. (defined('DOKEOS_INSTALL') ? '3' : '1').'.
 							    <p><button type="submit" class="back" name="step'. (defined('DOKEOS_INSTALL') ? '3' : '1').'" value="&lt; '.get_lang('Back').'">'.get_lang('Back').'</button></p>
 							    </td></tr></table></form></body></html>';

+ 5 - 5
main/install/update-db-1.8.3-1.8.4.inc.php

@@ -60,7 +60,7 @@ if (defined('DOKEOS_INSTALL') || defined('DOKEOS_COURSE_UPDATE'))
 	//check if the current Dokeos install is elligible for update
 	if (!file_exists('../inc/conf/configuration.php'))
 	{
-		echo '<b>'.get_lang('Error').' !</b> Dokeos '.implode('|', $updateFromVersion).' '.get_lang('HasNotBeenFound').'.<br><br>
+		echo '<strong>'.get_lang('Error').' !</strong> Dokeos '.implode('|', $updateFromVersion).' '.get_lang('HasNotBeenFound').'.<br /><br />
 								'.get_lang('PleasGoBackToStep1').'.
 							    <p><button type="submit" class="back" name="step1" value="&lt; '.get_lang('Back').'">'.get_lang('Back').'</button></p>
 							    </td></tr></table></form></body></html>';
@@ -98,12 +98,12 @@ if (defined('DOKEOS_INSTALL') || defined('DOKEOS_COURSE_UPDATE'))
 		//$no = mysql_errno();
 		//$msg = mysql_error();
 
-		//echo '<hr>['.$no.'] - '.$msg.'<hr>';
+		//echo '<hr />['.$no.'] - '.$msg.'<hr />';
 		echo					get_lang('DBServerDoesntWorkOrLoginPassIsWrong').'.<br /><br />' .
 				'				'.get_lang('PleaseCheckTheseValues').' :<br /><br />
-							    <b>'.get_lang('DBHost').'</b> : '.$dbHostForm.'<br />
-								<b>'.get_lang('DBLogin').'</b> : '.$dbUsernameForm.'<br />
-								<b>'.get_lang('DBPassword').'</b> : '.$dbPassForm.'<br /><br />
+							    <strong>'.get_lang('DBHost').'</strong> : '.$dbHostForm.'<br />
+								<strong>'.get_lang('DBLogin').'</strong> : '.$dbUsernameForm.'<br />
+								<strong>'.get_lang('DBPassword').'</strong> : '.$dbPassForm.'<br /><br />
 								'.get_lang('PleaseGoBackToStep').' '. (defined('DOKEOS_INSTALL') ? '3' : '1').'.
 							    <p><button type="submit" class="back" name="step'. (defined('DOKEOS_INSTALL') ? '3' : '1').'" value="&lt; '.get_lang('Back').'">'.get_lang('Back').'</button></p>
 							    </td></tr></table></form></body></html>';

+ 5 - 5
main/install/update-db-1.8.4-1.8.5.inc.php

@@ -42,7 +42,7 @@ if (defined('DOKEOS_INSTALL') || defined('DOKEOS_COURSE_UPDATE'))
 	//check if the current Dokeos install is elligible for update
 	if (!file_exists('../inc/conf/configuration.php'))
 	{
-		echo '<b>'.get_lang('Error').' !</b> Dokeos '.implode('|', $updateFromVersion).' '.get_lang('HasNotBeenFound').'.<br><br>
+		echo '<strong>'.get_lang('Error').' !</strong> Dokeos '.implode('|', $updateFromVersion).' '.get_lang('HasNotBeenFound').'.<br /><br />
 								'.get_lang('PleasGoBackToStep1').'.
 							    <p><button type="submit" class="back" name="step1" value="&lt; '.get_lang('Back').'">'.get_lang('Back').'</button></p>
 							    </td></tr></table></form></body></html>';
@@ -80,12 +80,12 @@ if (defined('DOKEOS_INSTALL') || defined('DOKEOS_COURSE_UPDATE'))
 		//$no = mysql_errno();
 		//$msg = mysql_error();
 
-		//echo '<hr>['.$no.'] - '.$msg.'<hr>';
+		//echo '<hr />['.$no.'] - '.$msg.'<hr />';
 		echo					get_lang('DBServerDoesntWorkOrLoginPassIsWrong').'.<br /><br />' .
 				'				'.get_lang('PleaseCheckTheseValues').' :<br /><br />
-							    <b>'.get_lang('DBHost').'</b> : '.$dbHostForm.'<br />
-								<b>'.get_lang('DBLogin').'</b> : '.$dbUsernameForm.'<br />
-								<b>'.get_lang('DBPassword').'</b> : '.$dbPassForm.'<br /><br />
+							    <strong>'.get_lang('DBHost').'</strong> : '.$dbHostForm.'<br />
+								<strong>'.get_lang('DBLogin').'</strong> : '.$dbUsernameForm.'<br />
+								<strong>'.get_lang('DBPassword').'</strong> : '.$dbPassForm.'<br /><br />
 								'.get_lang('PleaseGoBackToStep').' '. (defined('DOKEOS_INSTALL') ? '3' : '1').'.
 							    <p><button type="submit" class="back" name="step'. (defined('DOKEOS_INSTALL') ? '3' : '1').'" value="&lt; '.get_lang('Back').'">'.get_lang('Back').'</button></p>
 							    </td></tr></table></form></body></html>';

+ 71 - 71
main/install/update-db-1.8.5-1.8.6.inc.php

@@ -42,7 +42,7 @@ if (defined('DOKEOS_INSTALL') || defined('DOKEOS_COURSE_UPDATE'))
 	//check if the current Dokeos install is elligible for update
 	if (!file_exists('../inc/conf/configuration.php'))
 	{
-		echo '<b>'.get_lang('Error').' !</b> Dokeos '.implode('|', $updateFromVersion).' '.get_lang('HasNotBeenFound').'.<br><br>
+		echo '<strong>'.get_lang('Error').' !</strong> Dokeos '.implode('|', $updateFromVersion).' '.get_lang('HasNotBeenFound').'.<br /><br />
 								'.get_lang('PleasGoBackToStep1').'.
 							    <p><button type="submit" class="back" name="step1" value="&lt; '.get_lang('Back').'">'.get_lang('Back').'</button></p>
 							    </td></tr></table></form></body></html>';
@@ -80,12 +80,12 @@ if (defined('DOKEOS_INSTALL') || defined('DOKEOS_COURSE_UPDATE'))
 		//$no = mysql_errno();
 		//$msg = mysql_error();
 
-		//echo '<hr>['.$no.'] - '.$msg.'<hr>';
+		//echo '<hr />['.$no.'] - '.$msg.'<hr />';
 		echo					get_lang('DBServerDoesntWorkOrLoginPassIsWrong').'.<br /><br />' .
 				'				'.get_lang('PleaseCheckTheseValues').' :<br /><br />
-							    <b>'.get_lang('DBHost').'</b> : '.$dbHostForm.'<br />
-								<b>'.get_lang('DBLogin').'</b> : '.$dbUsernameForm.'<br />
-								<b>'.get_lang('DBPassword').'</b> : '.$dbPassForm.'<br /><br />
+							    <strong>'.get_lang('DBHost').'</strong> : '.$dbHostForm.'<br />
+								<strong>'.get_lang('DBLogin').'</strong> : '.$dbUsernameForm.'<br />
+								<strong>'.get_lang('DBPassword').'</strong> : '.$dbPassForm.'<br /><br />
 								'.get_lang('PleaseGoBackToStep').' '. (defined('DOKEOS_INSTALL') ? '3' : '1').'.
 							    <p><button type="submit" class="back" name="step'. (defined('DOKEOS_INSTALL') ? '3' : '1').'" value="&lt; '.get_lang('Back').'">'.get_lang('Back').'</button></p>
 							    </td></tr></table></form></body></html>';
@@ -251,8 +251,8 @@ if (defined('DOKEOS_INSTALL') || defined('DOKEOS_COURSE_UPDATE'))
 					<tbody>
 					<tr>
 					<td style="vertical-align: middle; width: 50%;" colspan="1" rowspan="1">
-						<h1>TITULUS 1<br>
-						<span class="gris_title">TITULUS 2</span><br>
+						<h1>TITULUS 1<br />
+						<span class="gris_title">TITULUS 2</span><br />
 						</h1>
 					</td>
 					<td style="width: 50%;">
@@ -260,8 +260,8 @@ if (defined('DOKEOS_INSTALL') || defined('DOKEOS_COURSE_UPDATE'))
 					</tr>
 					</tbody>
 					</table>
-					<p><br>
-					<br>
+					<p><br />
+					<br />
 					</p>
 					</body>
 		\');';
@@ -302,15 +302,15 @@ if (defined('DOKEOS_INSTALL') || defined('DOKEOS_COURSE_UPDATE'))
 						</td>
 						<td style="background: transparent url({IMG_DIR}postit.png ) repeat scroll center top; -moz-background-clip: initial; -moz-background-origin: initial; -moz-background-inline-policy: initial; width: 33%; text-align: center; vertical-align: bottom;">
 						<h3>Ut enim ad minima</h3>
-						Veniam, quis nostrum exercitationem ullam corporis suscipit laboriosam, nisi ut aliquid ex ea commodi consequatur.<br>
+						Veniam, quis nostrum exercitationem ullam corporis suscipit laboriosam, nisi ut aliquid ex ea commodi consequatur.<br />
 						<h3>
-						<img style="width: 180px; height: 144px;" alt="trainer" src="{COURSE_DIR}images/trainer/trainer_smile.png "><br></h3>
+						<img style="width: 180px; height: 144px;" alt="trainer" src="{COURSE_DIR}images/trainer/trainer_smile.png "><br /></h3>
 						</td>
 						</tr>
 						</tbody>
 						</table>
-						<p><br>
-						<br>
+						<p><br />
+						<br />
 						</p>
 						</body>
 		\');';
@@ -341,7 +341,7 @@ if (defined('DOKEOS_INSTALL') || defined('DOKEOS_COURSE_UPDATE'))
 							<td style="width: 25%;"></td>
 							<td style="background: transparent url({IMG_DIR}faded_grey.png ) repeat scroll center top; -moz-background-clip: initial; -moz-background-origin: initial; -moz-background-inline-policy: initial; vertical-align: top; width: 33%; text-align: right; font-weight: bold;" colspan="1" rowspan="1">
 							<span class="text">
-							<br>
+							<br />
 							Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Duis pellentesque.</span>
 							</td>
 							<td style="width: 25%; font-weight: bold;">
@@ -349,8 +349,8 @@ if (defined('DOKEOS_INSTALL') || defined('DOKEOS_COURSE_UPDATE'))
 							</tr>
 							</tbody>
 							</table>
-							<p><br>
-							<br>
+							<p><br />
+							<br />
 							</p>
 						</body>
 		\');
@@ -367,7 +367,7 @@ if (defined('DOKEOS_INSTALL') || defined('DOKEOS_COURSE_UPDATE'))
 						<tbody>
 						<tr>
 						<td style="width: 66%;"></td>
-						<td style="vertical-align: bottom; width: 33%;" colspan="1" rowspan="4">&nbsp;<img style="width: 180px; height: 248px;" alt="trainer" src="{COURSE_DIR}images/trainer/trainer_reads.png "><br>
+						<td style="vertical-align: bottom; width: 33%;" colspan="1" rowspan="4">&nbsp;<img style="width: 180px; height: 248px;" alt="trainer" src="{COURSE_DIR}images/trainer/trainer_reads.png "><br />
 						</td>
 						</tr>
 						<tr align="right">
@@ -378,7 +378,7 @@ if (defined('DOKEOS_INSTALL') || defined('DOKEOS_COURSE_UPDATE'))
 						<tr align="right">
 						<td style="background: transparent url({IMG_DIR}faded_grey.png ) repeat scroll center top; -moz-background-clip: initial; -moz-background-origin: initial; -moz-background-inline-policy: initial; vertical-align: top; width: 66%;">
 						Vivamus
-						a quam.&nbsp;<br>
+						a quam.&nbsp;<br />
 						</td>
 						</tr>
 						<tr align="right">
@@ -388,8 +388,8 @@ if (defined('DOKEOS_INSTALL') || defined('DOKEOS_COURSE_UPDATE'))
 						</tr>
 						</tbody>
 						</table>
-					<p><br>
-					<br>
+					<p><br />
+					<br />
 					</p>
 					</body>
 		\');';
@@ -406,7 +406,7 @@ if (defined('DOKEOS_INSTALL') || defined('DOKEOS_COURSE_UPDATE'))
 						<tbody>
 						<tr>
 						<td></td>
-						<td style="vertical-align: top;" colspan="1" rowspan="4">&nbsp;<img style="width: 180px; height: 294px;" alt="Trainer" src="{COURSE_DIR}images/trainer/trainer_join_hands.png "><br>
+						<td style="vertical-align: top;" colspan="1" rowspan="4">&nbsp;<img style="width: 180px; height: 294px;" alt="Trainer" src="{COURSE_DIR}images/trainer/trainer_join_hands.png "><br />
 						</td>
 						<td></td>
 						</tr>
@@ -421,11 +421,11 @@ if (defined('DOKEOS_INSTALL') || defined('DOKEOS_COURSE_UPDATE'))
 						<tr>
 						<td style="background: transparent url({IMG_DIR}faded_grey.png ) repeat scroll center top; -moz-background-clip: initial; -moz-background-origin: initial; -moz-background-inline-policy: initial; vertical-align: top; width: 33%; text-align: right;">
 						Vivamus
-						a quam.&nbsp;<br>
+						a quam.&nbsp;<br />
 						</td>
 						<td style="background: transparent url({IMG_DIR}faded_grey.png ) repeat scroll center top; -moz-background-clip: initial; -moz-background-origin: initial; -moz-background-inline-policy: initial; vertical-align: top; width: 33%; text-align: left;">
 						Etiam
-						lacinia stibulum ante.<br>
+						lacinia stibulum ante.<br />
 						</td>
 						</tr>
 						<tr>
@@ -434,13 +434,13 @@ if (defined('DOKEOS_INSTALL') || defined('DOKEOS_COURSE_UPDATE'))
 						a est stibulum ante ipsum.</td>
 						<td style="background: transparent url({IMG_DIR}faded_grey.png ) repeat scroll center top; -moz-background-clip: initial; -moz-background-origin: initial; -moz-background-inline-policy: initial; vertical-align: top; width: 33%; text-align: left;">
 						Consectetuer
-						adipiscing elit. <br>
+						adipiscing elit. <br />
 						</td>
 						</tr>
 						</tbody>
 						</table>
-					<p><br>
-					<br>
+					<p><br />
+					<br />
 					</p>
 					</body>
 
@@ -456,7 +456,7 @@ if (defined('DOKEOS_INSTALL') || defined('DOKEOS_COURSE_UPDATE'))
 						<table style="background: transparent url({IMG_DIR}faded_blue_horizontal.png ) repeat scroll 0% 50%; -moz-background-clip: initial; -moz-background-origin: initial; -moz-background-inline-policy: initial; text-align: left; width: 720px; height: 400px;" border="0" cellpadding="15" cellspacing="6">
 						<tbody>
 						<tr>
-						<td style="vertical-align: bottom; width: 50%;" colspan="1" rowspan="4"><img style="width: 300px; height: 199px;" alt="trainer" src="{COURSE_DIR}images/trainer/trainer_points_right.png"><br>
+						<td style="vertical-align: bottom; width: 50%;" colspan="1" rowspan="4"><img style="width: 300px; height: 199px;" alt="trainer" src="{COURSE_DIR}images/trainer/trainer_points_right.png"><br />
 						</td>
 						<td style="width: 50%;"></td>
 						</tr>
@@ -468,19 +468,19 @@ if (defined('DOKEOS_INSTALL') || defined('DOKEOS_COURSE_UPDATE'))
 						<tr>
 						<td style="background: transparent url({IMG_DIR}faded_grey.png ) repeat scroll center top; -moz-background-clip: initial; -moz-background-origin: initial; -moz-background-inline-policy: initial; vertical-align: top; text-align: left; width: 50%;">
 						Etiam
-						lacinia.<br>
+						lacinia.<br />
 						</td>
 						</tr>
 						<tr>
 						<td style="background: transparent url({IMG_DIR}faded_grey.png ) repeat scroll center top; -moz-background-clip: initial; -moz-background-origin: initial; -moz-background-inline-policy: initial; vertical-align: top; text-align: left; width: 50%;">
 						Consectetuer
-						adipiscing elit. <br>
+						adipiscing elit. <br />
 						</td>
 						</tr>
 						</tbody>
 						</table>
-					<p><br>
-					<br>
+					<p><br />
+					<br />
 					</p>
 					</body>
 		\');';
@@ -497,7 +497,7 @@ if (defined('DOKEOS_INSTALL') || defined('DOKEOS_COURSE_UPDATE'))
 		            	<table style="background: transparent url({IMG_DIR}faded_blue_horizontal.png ) repeat scroll 0% 50%; -moz-background-clip: initial; -moz-background-origin: initial; -moz-background-inline-policy: initial; text-align: left; width: 720px; height: 400px;" border="0" cellpadding="15" cellspacing="6">
 						<tr>
 							<td style="height: 10%; width: 33%;"></td>
-							<td style="vertical-align: top; width: 33%;" colspan="1" rowspan="2">&nbsp;<img style="width: 180px; height: 271px;" alt="trainer" src="{COURSE_DIR}images/trainer/trainer_standing.png "><br>
+							<td style="vertical-align: top; width: 33%;" colspan="1" rowspan="2">&nbsp;<img style="width: 180px; height: 271px;" alt="trainer" src="{COURSE_DIR}images/trainer/trainer_standing.png "><br />
 							</td>
 							<td style="height: 10%; width: 33%;"></td>
 						</tr>
@@ -525,7 +525,7 @@ if (defined('DOKEOS_INSTALL') || defined('DOKEOS_COURSE_UPDATE'))
 							<tbody>
 							<tr>
 							<td style="background: transparent url({IMG_DIR}faded_grey.png ) repeat scroll center top; -moz-background-clip: initial; -moz-background-origin: initial; -moz-background-inline-policy: initial; vertical-align: top; text-align: left; height: 33%; width: 33%;">
-							<br>
+							<br />
 							Etiam
 							lacinia stibulum ante.
 							Convallis
@@ -541,8 +541,8 @@ if (defined('DOKEOS_INSTALL') || defined('DOKEOS_COURSE_UPDATE'))
 							</tr>
 							</tbody>
 							</table>
-							<p><br>
-							<br>
+							<p><br />
+							<br />
 							</p>
 							</body>
 		\');
@@ -559,19 +559,19 @@ if (defined('DOKEOS_INSTALL') || defined('DOKEOS_COURSE_UPDATE'))
 								<tbody>
 								<tr>
 								<td style="width: 50%; vertical-align: top;">
-									<img style="width: 48px; height: 49px; float: left;" alt="01" src="{COURSE_DIR}images/small/01.png " hspace="5"><br>Lorem ipsum dolor sit amet<br><br><br>
+									<img style="width: 48px; height: 49px; float: left;" alt="01" src="{COURSE_DIR}images/small/01.png " hspace="5"><br />Lorem ipsum dolor sit amet<br /><br /><br />
 									<img style="width: 48px; height: 49px; float: left;" alt="02" src="{COURSE_DIR}images/small/02.png " hspace="5">
-									<br>Ut enim ad minim veniam<br><br><br>
-									<img style="width: 48px; height: 49px; float: left;" alt="03" src="{COURSE_DIR}images/small/03.png " hspace="5">Duis aute irure dolor in reprehenderit<br><br><br>
+									<br />Ut enim ad minim veniam<br /><br /><br />
+									<img style="width: 48px; height: 49px; float: left;" alt="03" src="{COURSE_DIR}images/small/03.png " hspace="5">Duis aute irure dolor in reprehenderit<br /><br /><br />
 									<img style="width: 48px; height: 49px; float: left;" alt="04" src="{COURSE_DIR}images/small/04.png " hspace="5">Neque porro quisquam est</td>
 
 								<td style="vertical-align: top; width: 50%; text-align: right;" colspan="1" rowspan="1">
-									<img style="width: 300px; height: 291px;" alt="Gearbox" src="{COURSE_DIR}images/diagrams/gearbox.jpg "><br></td>
+									<img style="width: 300px; height: 291px;" alt="Gearbox" src="{COURSE_DIR}images/diagrams/gearbox.jpg "><br /></td>
 								</tr><tr></tr>
 								</tbody>
 								</table>
-								<p><br>
-								<br>
+								<p><br />
+								<br />
 								</p>
 							</body>
 		\');
@@ -590,7 +590,7 @@ if (defined('DOKEOS_INSTALL') || defined('DOKEOS_COURSE_UPDATE'))
 							<tbody>
 							<tr>
 							<td style="vertical-align: bottom; width: 33%;" colspan="1" rowspan="2">
-							<img style="width: 180px; height: 271px;" alt="trainer" src="{COURSE_DIR}images/trainer/trainer_chair.png "><br>
+							<img style="width: 180px; height: 271px;" alt="trainer" src="{COURSE_DIR}images/trainer/trainer_chair.png "><br />
 							</td>
 							<td style="height: 10%; width: 66%;"></td>
 							</tr>
@@ -612,8 +612,8 @@ if (defined('DOKEOS_INSTALL') || defined('DOKEOS_COURSE_UPDATE'))
 							</tr>
 							</tbody>
 							</table>
-						<p><br>
-						<br>
+						<p><br />
+						<br />
 						</p>
 						</body>
 		\');';
@@ -678,8 +678,8 @@ if (defined('DOKEOS_INSTALL') || defined('DOKEOS_COURSE_UPDATE'))
 						</tr>
 						</tbody>
 						</table>
-						<p><br>
-						<br>
+						<p><br />
+						<br />
 						</p>
 						</body>
 		\');';
@@ -697,7 +697,7 @@ if (defined('DOKEOS_INSTALL') || defined('DOKEOS_COURSE_UPDATE'))
 						<tbody>
 						<tr>
 						<td style="width: 33%;" colspan="1" rowspan="4">
-							<img style="width: 120px; height: 348px;" alt="learner wonders" src="{COURSE_DIR}images/silhouette.png "><br>
+							<img style="width: 120px; height: 348px;" alt="learner wonders" src="{COURSE_DIR}images/silhouette.png "><br />
 						</td>
 						<td style="width: 66%;"></td>
 						</tr>
@@ -709,19 +709,19 @@ if (defined('DOKEOS_INSTALL') || defined('DOKEOS_COURSE_UPDATE'))
 						<tr align="center">
 						<td style="background: transparent url({IMG_DIR}faded_grey.png ) repeat scroll center top; -moz-background-clip: initial; -moz-background-origin: initial; -moz-background-inline-policy: initial; vertical-align: top; width: 66%;">
 						Etiam
-						lacinia stibulum ante.<br>
+						lacinia stibulum ante.<br />
 						</td>
 						</tr>
 						<tr align="center">
 						<td style="background: transparent url({IMG_DIR}faded_grey.png ) repeat scroll center top; -moz-background-clip: initial; -moz-background-origin: initial; -moz-background-inline-policy: initial; vertical-align: top; width: 66%;">
 						Consectetuer
-						adipiscing elit. <br>
+						adipiscing elit. <br />
 						</td>
 						</tr>
 						</tbody>
 						</table>
-					<p><br>
-					<br>
+					<p><br />
+					<br />
 					</p>
 					</body>
 		\');
@@ -759,7 +759,7 @@ if (defined('DOKEOS_INSTALL') || defined('DOKEOS_COURSE_UPDATE'))
 								<li>consectetur</li>
 								<li>adipisicing elit</li>
 							</ul>
-							<br>
+							<br />
 							</td>
 							<td>
 								<img style="width: 32px; height: 32px;" alt="arrow" src="{COURSE_DIR}images/small/arrow.png ">
@@ -782,13 +782,13 @@ if (defined('DOKEOS_INSTALL') || defined('DOKEOS_COURSE_UPDATE'))
 									<li>quisquam est</li>
 									<li>qui dolorem&nbsp;&nbsp;</li>
 								</ul>
-								<br><br>
+								<br /><br />
 							</td>
 						</tr>
 						</tbody>
 						</table>
-					<p><br>
-					<br>
+					<p><br />
+					<br />
 					</p>
 					</body>
 		\');
@@ -807,7 +807,7 @@ if (defined('DOKEOS_INSTALL') || defined('DOKEOS_COURSE_UPDATE'))
 						<tr>
 						<td style="vertical-align: bottom; width: 33%;" colspan="1" rowspan="2">
 							<img style="width: 180px; height: 169px;" alt="trainer" src="{COURSE_DIR}images/trainer/trainer_staring.png ">
-						<br>
+						<br />
 						</td>
 						<td style="height: 10%; width: 66%;"></td>
 						</tr>
@@ -818,12 +818,12 @@ if (defined('DOKEOS_INSTALL') || defined('DOKEOS_COURSE_UPDATE'))
 								<li>sed do eiusmod tempor incididunt</li>
 								<li>ut labore et dolore magna aliqua</li>
 								<li>quis nostrud exercitation ullamco</li>
-							</ul><br></td>
+							</ul><br /></td>
 						</tr>
 						</tbody>
 						</table>
-					<p><br>
-					<br>
+					<p><br />
+					<br />
 					</p>
 					</body>
 		\');';
@@ -891,7 +891,7 @@ if (defined('DOKEOS_INSTALL') || defined('DOKEOS_COURSE_UPDATE'))
 						</tr>
 						</tbody>
 						</table>
-						<br>
+						<br />
 						</body>
 		\');';
 		$res = mysql_query($sql);
@@ -911,21 +911,21 @@ if (defined('DOKEOS_INSTALL') || defined('DOKEOS_COURSE_UPDATE'))
 								<embed  type="application/x-shockwave-flash" pluginspage="http://www.macromedia.com/go/getflashplayer" width="300" height="20" bgcolor="#FFFFFF" src="{REL_PATH}main/inc/lib/mediaplayer/player.swf" allowfullscreen="false" allowscriptaccess="always" flashvars="file={COURSE_DIR}audio/ListeningComprehension.mp3&amp;autostart=true"></embed>
 		                    </span></div>
 
-							<br>
+							<br />
 							</td>
-							<td colspan="1" rowspan="3"><br>
-								<img style="width: 300px; height: 341px; float: right;" alt="image" src="{COURSE_DIR}images/diagrams/head_olfactory_nerve.png "><br></td>
+							<td colspan="1" rowspan="3"><br />
+								<img style="width: 300px; height: 341px; float: right;" alt="image" src="{COURSE_DIR}images/diagrams/head_olfactory_nerve.png "><br /></td>
 							</tr>
 							<tr>
 							<td colspan="1" rowspan="1">
-								<img style="width: 180px; height: 271px;" alt="trainer" src="{COURSE_DIR}images/trainer/trainer_glasses.png"><br></td>
+								<img style="width: 180px; height: 271px;" alt="trainer" src="{COURSE_DIR}images/trainer/trainer_glasses.png"><br /></td>
 							</tr>
 							<tr>
 							</tr>
 							</tbody>
 							</table>
-							<p><br>
-							<br>
+							<p><br />
+							<br />
 							</p>
 							</body>
 		\');';
@@ -967,7 +967,7 @@ if (defined('DOKEOS_INSTALL') || defined('DOKEOS_COURSE_UPDATE'))
 
 					</td>
 					<td style="background: transparent url({IMG_DIR}faded_grey.png) repeat scroll center top; -moz-background-clip: initial; -moz-background-origin: initial; -moz-background-inline-policy: initial; vertical-align: top; width: 50%;">
-					<h3><br>
+					<h3><br />
 					</h3>
 					<h3>Lorem ipsum dolor sit amet</h3>
 						<ul>
@@ -985,8 +985,8 @@ if (defined('DOKEOS_INSTALL') || defined('DOKEOS_COURSE_UPDATE'))
 					</tr>
 					</tbody>
 					</table>
-					<p><br>
-					<br>
+					<p><br />
+					<br />
 					</p>
 					 <style type="text/css">body{}</style><!-- to fix a strange bug appearing with firefox when editing this template -->
 					</body>
@@ -1009,8 +1009,8 @@ if (defined('DOKEOS_INSTALL') || defined('DOKEOS_COURSE_UPDATE'))
 							</tr>
 						</tbody>
 						</table>
-						<p><br>
-						<br>
+						<p><br />
+						<br />
 						</p>
 					</center>
 					</body>

+ 5 - 5
main/install/update-db-1.8.6-1.8.6.1.inc.php

@@ -42,7 +42,7 @@ if (defined('DOKEOS_INSTALL') || defined('DOKEOS_COURSE_UPDATE'))
 	//check if the current Dokeos install is elligible for update
 	if (!file_exists('../inc/conf/configuration.php'))
 	{
-		echo '<b>'.get_lang('Error').' !</b> Dokeos '.implode('|', $updateFromVersion).' '.get_lang('HasNotBeenFound').'.<br><br>
+		echo '<strong>'.get_lang('Error').' !</strong> Dokeos '.implode('|', $updateFromVersion).' '.get_lang('HasNotBeenFound').'.<br /><br />
 								'.get_lang('PleasGoBackToStep1').'.
 							    <p><button type="submit" class="back" name="step1" value="&lt; '.get_lang('Back').'">'.get_lang('Back').'</button></p>
 							    </td></tr></table></form></body></html>';
@@ -80,12 +80,12 @@ if (defined('DOKEOS_INSTALL') || defined('DOKEOS_COURSE_UPDATE'))
 		//$no = mysql_errno();
 		//$msg = mysql_error();
 
-		//echo '<hr>['.$no.'] - '.$msg.'<hr>';
+		//echo '<hr />['.$no.'] - '.$msg.'<hr />';
 		echo					get_lang('DBServerDoesntWorkOrLoginPassIsWrong').'.<br /><br />' .
 				'				'.get_lang('PleaseCheckTheseValues').' :<br /><br />
-							    <b>'.get_lang('DBHost').'</b> : '.$dbHostForm.'<br />
-								<b>'.get_lang('DBLogin').'</b> : '.$dbUsernameForm.'<br />
-								<b>'.get_lang('DBPassword').'</b> : '.$dbPassForm.'<br /><br />
+							    <strong>'.get_lang('DBHost').'</strong> : '.$dbHostForm.'<br />
+								<strong>'.get_lang('DBLogin').'</strong> : '.$dbUsernameForm.'<br />
+								<strong>'.get_lang('DBPassword').'</strong> : '.$dbPassForm.'<br /><br />
 								'.get_lang('PleaseGoBackToStep').' '. (defined('DOKEOS_INSTALL') ? '3' : '1').'.
 							    <p><button type="submit" class="back" name="step'. (defined('DOKEOS_INSTALL') ? '3' : '1').'" value="&lt; '.get_lang('Back').'">'.get_lang('Back').'</button></p>
 							    </td></tr></table></form></body></html>';

+ 5 - 5
main/install/update-db-1.8.6.1-1.8.6.2.inc.php

@@ -42,7 +42,7 @@ if (defined('DOKEOS_INSTALL') || defined('DOKEOS_COURSE_UPDATE'))
 	//check if the current Dokeos install is elligible for update
 	if (!file_exists('../inc/conf/configuration.php'))
 	{
-		echo '<b>'.get_lang('Error').' !</b> Dokeos '.implode('|', $updateFromVersion).' '.get_lang('HasNotBeenFound').'.<br><br>
+		echo '<strong>'.get_lang('Error').' !</strong> Dokeos '.implode('|', $updateFromVersion).' '.get_lang('HasNotBeenFound').'.<br /><br />
 								'.get_lang('PleasGoBackToStep1').'.
 							    <p><button type="submit" class="back" name="step1" value="&lt; '.get_lang('Back').'">'.get_lang('Back').'</button></p>
 							    </td></tr></table></form></body></html>';
@@ -80,12 +80,12 @@ if (defined('DOKEOS_INSTALL') || defined('DOKEOS_COURSE_UPDATE'))
 		//$no = mysql_errno();
 		//$msg = mysql_error();
 
-		//echo '<hr>['.$no.'] - '.$msg.'<hr>';
+		//echo '<hr />['.$no.'] - '.$msg.'<hr />';
 		echo					get_lang('DBServerDoesntWorkOrLoginPassIsWrong').'.<br /><br />' .
 				'				'.get_lang('PleaseCheckTheseValues').' :<br /><br />
-							    <b>'.get_lang('DBHost').'</b> : '.$dbHostForm.'<br />
-								<b>'.get_lang('DBLogin').'</b> : '.$dbUsernameForm.'<br />
-								<b>'.get_lang('DBPassword').'</b> : '.$dbPassForm.'<br /><br />
+							    <strong>'.get_lang('DBHost').'</strong> : '.$dbHostForm.'<br />
+								<strong>'.get_lang('DBLogin').'</strong> : '.$dbUsernameForm.'<br />
+								<strong>'.get_lang('DBPassword').'</strong> : '.$dbPassForm.'<br /><br />
 								'.get_lang('PleaseGoBackToStep').' '. (defined('DOKEOS_INSTALL') ? '3' : '1').'.
 							    <p><button type="submit" class="back" name="step'. (defined('DOKEOS_INSTALL') ? '3' : '1').'" value="&lt; '.get_lang('Back').'">'.get_lang('Back').'</button></p>
 							    </td></tr></table></form></body></html>';

+ 5 - 5
main/install/update-db-1.8.6.2-1.8.7.inc.php

@@ -42,7 +42,7 @@ if (defined('DOKEOS_INSTALL') || defined('DOKEOS_COURSE_UPDATE'))
     //check if the current Dokeos install is elligible for update
     if (!file_exists('../inc/conf/configuration.php'))
     {
-        echo '<b>'.get_lang('Error').' !</b> Dokeos '.implode('|', $updateFromVersion).' '.get_lang('HasNotBeenFound').'.<br><br>
+        echo '<strong>'.get_lang('Error').' !</strong> Dokeos '.implode('|', $updateFromVersion).' '.get_lang('HasNotBeenFound').'.<br /><br />
                                 '.get_lang('PleasGoBackToStep1').'.
                                 <p><button type="submit" class="back" name="step1" value="&lt; '.get_lang('Back').'">'.get_lang('Back').'</button></p>
                                 </td></tr></table></form></body></html>';
@@ -80,12 +80,12 @@ if (defined('DOKEOS_INSTALL') || defined('DOKEOS_COURSE_UPDATE'))
         //$no = mysql_errno();
         //$msg = mysql_error();
 
-        //echo '<hr>['.$no.'] - '.$msg.'<hr>';
+        //echo '<hr />['.$no.'] - '.$msg.'<hr />';
         echo                    get_lang('DBServerDoesntWorkOrLoginPassIsWrong').'.<br /><br />' .
                 '               '.get_lang('PleaseCheckTheseValues').' :<br /><br />
-                                <b>'.get_lang('DBHost').'</b> : '.$dbHostForm.'<br />
-                                <b>'.get_lang('DBLogin').'</b> : '.$dbUsernameForm.'<br />
-                                <b>'.get_lang('DBPassword').'</b> : '.$dbPassForm.'<br /><br />
+                                <strong>'.get_lang('DBHost').'</strong> : '.$dbHostForm.'<br />
+                                <strong>'.get_lang('DBLogin').'</strong> : '.$dbUsernameForm.'<br />
+                                <strong>'.get_lang('DBPassword').'</strong> : '.$dbPassForm.'<br /><br />
                                 '.get_lang('PleaseGoBackToStep').' '. (defined('DOKEOS_INSTALL') ? '3' : '1').'.
                                 <p><button type="submit" class="back" name="step'. (defined('DOKEOS_INSTALL') ? '3' : '1').'" value="&lt; '.get_lang('Back').'">'.get_lang('Back').'</button></p>
                                 </td></tr></table></form></body></html>';

+ 22 - 22
main/install/update-db-scorm-1.6.x-1.8.0.inc.php

@@ -183,7 +183,7 @@ foreach($courses_id_full_table_prefix_list as $course_code => $db)
                 $row['display_order'].", " .
                 "123456" .
                 ")";
-        //echo $ins_lp_sql."<br/>\n";
+        //echo $ins_lp_sql."<br />\n";
         $ins_res = Database::query($ins_lp_sql,__FILE__,__LINE__);
         $in_id = Database::insert_id();
         //echo "&nbsp;&nbsp;Inserted item $in_id<br />\n";
@@ -455,7 +455,7 @@ foreach($courses_id_full_table_prefix_list as $course_code => $db)
         if(empty($my_new_lp_item_id)){
             //this can be ignored safely as it just means a user used a learnpath_item
             //before it was removed from items - maybe fix that in Dokeos?
-            //echo "Somehow we miss lp_items[".$learnpath_id."][".$row['learnpath_item_id']."] here...<br/>";
+            //echo "Somehow we miss lp_items[".$learnpath_id."][".$row['learnpath_item_id']."] here...<br />";
             $incoherences ++;
         }else{
             $start_time = 0;
@@ -532,7 +532,7 @@ foreach($courses_id_full_table_prefix_list as $course_code => $db)
             //make sure there is a way of retrieving which links were updated (to revert)
             fwrite($fh,$sql_tool_upd." AND link ='$link'");
             fwrite($fh_revert,"UPDATE $tbl_tool SET link='$link' WHERE id=".$row_tool['id']." AND link ='newscorm/lp_controller.php?action=view&lp_id=$new_lp_id';\n");
-            //echo $sql_tool_upd." (and link='$link')<br/>\n";
+            //echo $sql_tool_upd." (and link='$link')<br />\n";
             $res_tool_upd = Database::query($sql_tool_upd,__FILE__,__LINE__);
         }
     }
@@ -555,11 +555,11 @@ foreach($courses_id_full_table_prefix_list as $course_code => $db)
                 //make sure there is a way of retrieving which links were updated (to revert)
                 fwrite($fh,$sql_tool_upd." AND link ='$link'");
                 fwrite($fh_revert,"INSERT INTO $tbl_tool (link) VALUES ('$link');\n");
-                //echo $sql_tool_upd." (and link='$link')<br/>\n";
+                //echo $sql_tool_upd." (and link='$link')<br />\n";
                 $res_tool_upd = Database::query($sql_tool_upd,__FILE__,__LINE__);
             }
         }else{
-            //echo "No scorm link found in tool link $link<br/>";
+            //echo "No scorm link found in tool link $link<br />";
         }
         //flush();
     }
@@ -586,9 +586,9 @@ foreach($courses_id_full_table_prefix_list as $course_code => $db)
             }
         }
         if($intrp != $row_i['intro_text']){
-            //echo "<pre>Replacing ".$row_i['intro_text']."\n by \n ".$intro."</pre><br/>\n";
+            //echo "<pre>Replacing ".$row_i['intro_text']."\n by \n ".$intro."</pre><br />\n";
             $sql_upd = "update $tbl_intro set intro_text = '".mysql_real_escape_string($intro)."' WHERE id = 'course_homepage' AND intro_text = '".mysql_real_escape_string($row_i['intro_text'])."'";
-            //echo $sql_upd."<br/>\n";
+            //echo $sql_upd."<br />\n";
             fwrite($fh,"$sql_upd\n");
             fwrite($fh_revert,"UPDATE $tbl_intro set intro_text = '".$row_i['intro_text']."' WHERE id = 'course_homepage' AND intro_text = '$intro';\n");
             fwrite($fh_res,"$intro\n");
@@ -686,7 +686,7 @@ while($course_row = Database::fetch_array($res_crs)){
             //it is a main directory that should be taken as path
             $courses_dir = $sys_course_path.''.$courses_dir_list[$my_course_code].'/scorm'.$tmp_path;
             if(!is_dir($courses_dir)){
-                //echo "Scormdocument path $my_content_id: $tmp_path doesn't exist in ".$sys_course_path.$courses_dir_list[$my_course_code]."/scorm, skipping<br/>\n";
+                //echo "Scormdocument path $my_content_id: $tmp_path doesn't exist in ".$sys_course_path.$courses_dir_list[$my_course_code]."/scorm, skipping<br />\n";
                 continue;
                 //avoid if contentTitle is not the name of an existing directory
             }elseif(!is_file($courses_dir."/imsmanifest.xml")){
@@ -701,7 +701,7 @@ while($course_row = Database::fetch_array($res_crs)){
                             if(is_file($courses_dir."/".$entry."/imsmanifest.xml")){
                                 if($loglevel>2){error_log(".  .. and found $courses_dir/$entry/imsmanifest.xml!",0);}
                                 if(!in_array($tmp_path."/".$entry."/imsmanifest.xml",$scormdocuments_lps)){
-                                    if($loglevel>2){error_log("  Recording.<br/>",0);}
+                                    if($loglevel>2){error_log("  Recording.<br />",0);}
                                     $scormdocuments_lps[] = $tmp_path."/".$entry;
                                 }
                             }
@@ -764,7 +764,7 @@ while($course_row = Database::fetch_array($res_crs)){
                                 //echo "found $courses_dir/$entry/imsmanifest.xml!<br />";
                                 if($loglevel>2){error_log(".  .. and found $courses_dir/$entry/imsmanifest.xml!",0);}
                                 if(!in_array($entry."/imsmanifest.xml",$scormdocuments_lps)){
-                                    if($loglevel>2){error_log("  Recording.<br/>",0);}
+                                    if($loglevel>2){error_log("  Recording.<br />",0);}
                                     //echo "Recording $entry<br />";
                                     $scormdocuments_lps[] = $entry;
                                 }
@@ -946,7 +946,7 @@ foreach($scorms as $my_course_code => $paths_list )
                         $my_student.", " .
                         "1" .
                         ")";
-                    //echo "$ins_sql<br/>";
+                    //echo "$ins_sql<br />";
                     $ins_res = Database::query($ins_sql,__FILE__,__LINE__);
                     $view_insert_id = Database::insert_id();
                 }
@@ -965,10 +965,10 @@ foreach($scorms as $my_course_code => $paths_list )
                             "0, $my_time, $my_score," .
                             "'$my_status'" .
                             ")";
-                    //echo "$ins_sql<br/>";
+                    //echo "$ins_sql<br />";
                     $ins_res = Database::query($ins_sql,__FILE__,__LINE__);
                 }else{
-                    //echo "  Didn't find corresponding item for $my_identifier in new tables<br/>\n";
+                    //echo "  Didn't find corresponding item for $my_identifier in new tables<br />\n";
                 }
             }
         }
@@ -1028,7 +1028,7 @@ foreach($scorms as $my_course_code => $paths_list )
             if($loglevel>1){error_log("!!! imsmanifest file not found at ".$scorm_lp_paths[$my_content_id]['ims'].' for old lp '.$my_content_id.' and new '.$lp_ids[$my_content_id],0);}
             $manifest = false;
         }else{
-            //echo "Parsing ".$scorm_lp_paths[$my_content_id]['ims']."<br>\n";
+            //echo "Parsing ".$scorm_lp_paths[$my_content_id]['ims']."<br />\n";
             //parse manifest file
             $manifest = $oScorm->parse_manifest($scorm_lp_paths[$my_content_id]['ims']);
             //the title is already escaped in the method
@@ -1251,7 +1251,7 @@ foreach($scorms as $my_course_code => $paths_list )
                             $update_prereq.
                             "display_order = $dsp " .
                             "WHERE lp_id = ".$in_id." AND id = ".$new_id;
-                    //echo "$sql2<br>\n";
+                    //echo "$sql2<br />\n";
                     $res2 = Database::query($sql2,__FILE__,__LINE__);
                     $previous = $new_id;
                 }
@@ -1278,7 +1278,7 @@ foreach($scorms as $my_course_code => $paths_list )
         $out = array();
         $enc_path = str_replace('/','%2F',$my_path);
         $enc_path = str_replace(' ','\+',$enc_path);
-        //echo "Looking for path ".$enc_path."<br>\n";
+        //echo "Looking for path ".$enc_path."<br />\n";
         $pattern = '@claroline/scorm/scormdocument\.php([^\s"\']*)openDir='.$enc_path.'([\\"\'\s&]*)@';
         if(preg_match_all($pattern,$intro,$out,PREG_SET_ORDER)){
             foreach($out as $results){
@@ -1286,8 +1286,8 @@ foreach($scorms as $my_course_code => $paths_list )
                 //$intro = preg_replace('/scorm\/scormdocument\.php([^\s"\']*)openDir='.$enc_path.'([\\"\'\s&])/','newscorm/lp_controller.php'.$results[1].'action=view&lp_id='.$lp_ids[$my_content_id],$intro);
                 $intro = preg_replace('@claroline/scorm/scormdocument\.php([^\s"\']*)openDir='.$enc_path.'([^\s"\']*)@','main/newscorm/lp_controller.php'.$results[1].'action=view&lp_id='.$lp_ids[$my_content_id],$intro);
             }
-        }else{
-            //echo "No scorm link found in intro text<br/>";
+        } else {
+            //echo "No scorm link found in intro text<br />";
         }
         $pattern = '@claroline/scorm/showinframes\.php([^\s"\']*)file=([^\s"\'&]*)'.$enc_path.'@';
         if(preg_match_all($pattern,$intro,$out,PREG_SET_ORDER)){
@@ -1296,13 +1296,13 @@ foreach($scorms as $my_course_code => $paths_list )
                 //$intro = preg_replace('/scorm\/showinframes\.php([^\s"\']*)file=([^\s"\']*)'.$enc_path.'/','newscorm/lp_controller.php'.$results[1].'action=view&lp_id='.$lp_ids[$my_content_id],$intro);
                 $intro = preg_replace('@claroline/scorm/showinframes\.php([^\s"\']*)file=([^\s"\'&]*)'.$enc_path.'([^\s"\']*)@','main/newscorm/lp_controller.php'.$results[1].'action=view&lp_id='.$lp_ids[$my_content_id],$intro);
             }
-        }else{
-            //echo "No scorm link found in intro text<br/>";
+        } else {
+            //echo "No scorm link found in intro text<br />";
         }
         if($intro != $row_i['intro_text']){
-            //echo "<pre>Replacing ".$row_i['intro_text']."\n by \n ".$intro."</pre><br/>\n";
+            //echo "<pre>Replacing ".$row_i['intro_text']."\n by \n ".$intro."</pre><br />\n";
             $sql_upd = "update $tbl_intro set intro_text = '".mysql_real_escape_string($intro)."' WHERE id = 'course_homepage' AND intro_text = '".mysql_real_escape_string($row_i['intro_text'])."'";
-            //echo $sql_upd."<br/>\n";
+            //echo $sql_upd."<br />\n";
             fwrite($fh,$sql_upd."\n");
             fwrite($fh_revert,"UPDATE $tbl_intro set intro_text = '".$row_i['intro_text']."' WHERE id = 'course_homepage' AND intro_text = '$intro';\n");
             fwrite($fh_res,$intro."\n");

+ 2 - 2
main/install/update_courses.php

@@ -141,7 +141,7 @@ if($_POST['step2'])
 	<br /><br />
 
 	<?php if($nbr_courses > MAX_COURSE_TRANSFER): ?>
-	<font color="red"><b>Warning:</b> You have more than <?php echo MAX_COURSE_TRANSFER; ?> courses on your Dokeos platform ! Only <?php echo MAX_COURSE_TRANSFER; ?> courses have been updated. To update the other courses, <a href="update_courses.php?update_path=<?php echo urlencode($updatePath); ?>"><font color="red">click here</font></a>.</font>
+	<font color="red"><strong>Warning:</strong> You have more than <?php echo MAX_COURSE_TRANSFER; ?> courses on your Dokeos platform ! Only <?php echo MAX_COURSE_TRANSFER; ?> courses have been updated. To update the other courses, <a href="update_courses.php?update_path=<?php echo urlencode($updatePath); ?>"><font color="red">click here</font></a>.</font>
 	<?php else: ?>
 	<br /><br />
 	<?php endif; ?>
@@ -169,7 +169,7 @@ else
 
 		Please enter the path where the older version of Dokeos is installed (<?php echo implode('&nbsp;|&nbsp;',$update_from_version); ?>). The courses will be moved from that location to the Dokeos path.
 		<br /><br />
-		<b>Notice:</b> Please run this update script only if you've just updated (incompletely) Dokeos <?php echo implode('&nbsp;|&nbsp;',$update_from_version); ?> to Dokeos <?php echo $dokeos_version; ?>!
+		<strong>Notice:</strong> Please run this update script only if you've just updated (incompletely) Dokeos <?php echo implode('&nbsp;|&nbsp;',$update_from_version); ?> to Dokeos <?php echo $dokeos_version; ?>!
 		<br /><br />
 	<?php
 	if($badUpdatePath)

+ 11 - 11
main/install/update_db.inc.php

@@ -53,7 +53,7 @@ if (defined('DOKEOS_INSTALL') || defined('DOKEOS_COURSE_UPDATE'))
 	//check if the current Dokeos install is elligible for update
 	if (empty ($updateFromConfigFile) || !file_exists($_POST['updatePath'].$updateFromConfigFile) || !in_array(get_config_param('clarolineVersion'), $update_from_version))
 	{
-		echo '<b>'.get_lang('Error').' !</b> Dokeos '.implode('|', $updateFromVersion).' '.get_lang('HasNotBeenFound').'.<br><br>
+		echo '<strong>'.get_lang('Error').' !</strong> Dokeos '.implode('|', $updateFromVersion).' '.get_lang('HasNotBeenFound').'.<br /><br />
 								'.get_lang('PleasGoBackToStep1').'.
 							    <p><button type="submit" class="back" name="step1" value="&lt; '.get_lang('Back').'">'.get_lang('Back').'</button></p>
 							    </td></tr></table></form></body></html>';
@@ -89,12 +89,12 @@ if (defined('DOKEOS_INSTALL') || defined('DOKEOS_COURSE_UPDATE'))
 		$no = mysql_errno();
 		$msg = mysql_error();
 
-		echo '<hr>['.$no.'] - '.$msg.'<hr>
-								'.get_lang('DBServerDoesntWorkOrLoginPassIsWrong').'.<br><br>
-								'.get_lang('PleaseCheckTheseValues').' :<br><br>
-							    <b>'.get_lang('DBHost').'</b> : '.$dbHostForm.'<br>
-								<b>'.get_lang('DBLogin').'</b> : '.$dbUsernameForm.'<br>
-								<b>'.get_lang('DBPassword').'</b> : '.$dbPassForm.'<br><br>
+		echo '<hr />['.$no.'] - '.$msg.'<hr />
+								'.get_lang('DBServerDoesntWorkOrLoginPassIsWrong').'.<br /><br />
+								'.get_lang('PleaseCheckTheseValues').' :<br /><br />
+							    <strong>'.get_lang('DBHost').'</strong> : '.$dbHostForm.'<br />
+								<strong>'.get_lang('DBLogin').'</strong> : '.$dbUsernameForm.'<br />
+								<strong>'.get_lang('DBPassword').'</strong> : '.$dbPassForm.'<br /><br />
 								'.get_lang('PleaseGoBackToStep').' '. (defined('DOKEOS_INSTALL') ? '3' : '1').'.
 							    <p><buton class="back" type="submit" name="step'. (defined('DOKEOS_INSTALL') ? '3' : '1').'" value="&lt; '.get_lang('Back').'">'.get_lang('Back').'</button></p>
 							    </td></tr></table></form></body></html>';
@@ -140,7 +140,7 @@ if (defined('DOKEOS_INSTALL') || defined('DOKEOS_COURSE_UPDATE'))
 			mysql_select_db($dbNameForm);
 			foreach($m_q_list as $query){
 				if($only_test){
-					echo "mysql_query($dbNameForm,$query)<br/>";
+					echo "mysql_query($dbNameForm,$query)<br />";
 				}else{
 					$res = mysql_query($query);
 				}
@@ -164,7 +164,7 @@ if (defined('DOKEOS_INSTALL') || defined('DOKEOS_COURSE_UPDATE'))
 			mysql_select_db($dbStatsForm);
 			foreach($s_q_list as $query){
 				if($only_test){
-					echo "mysql_query($dbStatsForm,$query)<br/>";
+					echo "mysql_query($dbStatsForm,$query)<br />";
 				}else{
 					$res = mysql_query($query);
 				}
@@ -182,7 +182,7 @@ if (defined('DOKEOS_INSTALL') || defined('DOKEOS_COURSE_UPDATE'))
 			mysql_select_db($dbUserForm);
 			foreach($u_q_list as $query){
 				if($only_test){
-					echo "mysql_query($dbUserForm,$query)<br/>";
+					echo "mysql_query($dbUserForm,$query)<br />";
 				}else{
 					$res = mysql_query($query);
 				}
@@ -255,7 +255,7 @@ if (defined('DOKEOS_INSTALL') || defined('DOKEOS_COURSE_UPDATE'))
 				{
 					if($only_test)
 					{
-						echo "mysql_query(".$row['db_name'].",$query)<br/>";
+						echo "mysql_query(".$row['db_name'].",$query)<br />";
 					}else{
 						$res = mysql_query($query);
 					}

+ 2 - 2
main/install/upgrade.php

@@ -134,7 +134,7 @@ class Page_Requirements extends HTML_QuickForm_Page
 		}
 		else
 		{
-			return '<li><b>'.$extentionName.'</b> <font color="red">is missing (Dokeos can work without)</font> (<a href="http://www.php.net/'.$extentionName.'" target="_blank">'.$extentionName.'</a>)</li>';
+			return '<li><strong>'.$extentionName.'</strong> <font color="red">is missing (Dokeos can work without)</font> (<a href="http://www.php.net/'.$extentionName.'" target="_blank">'.$extentionName.'</a>)</li>';
 		}
 	}
 	function get_not_writable_folders()
@@ -179,7 +179,7 @@ class Page_Requirements extends HTML_QuickForm_Page
 			$info[] = get_lang("WarningExistingDokeosInstallationDetected");
 			$info[] = '</div>';
 		}
-		$info[] = '<b>'.get_lang("ReadThoroughly").'</b>';
+		$info[] = '<strong>'.get_lang("ReadThoroughly").'</strong>';
 		$info[] = '<br />';
 		$info[] = get_lang("DokeosNeedFollowingOnServer");
 		$info[] = "<ul>";