From 408203a850e4f3995a3b35fdf87d754a4274af14 Mon Sep 17 00:00:00 2001 From: Ivan Tcholakov Date: Thu, 11 Feb 2010 13:35:11 +0200 Subject: [PATCH] Feature #272 - Installation scripts: Corrections on some html-tags. --- main/install/compare_db.php | 24 +-- main/install/index.php | 2 +- main/install/update-db-1.6.x-1.8.0.inc.php | 10 +- main/install/update-db-1.8.0-1.8.2.inc.php | 10 +- main/install/update-db-1.8.2-1.8.3.inc.php | 10 +- main/install/update-db-1.8.3-1.8.4.inc.php | 10 +- main/install/update-db-1.8.4-1.8.5.inc.php | 10 +- main/install/update-db-1.8.5-1.8.6.inc.php | 142 +++++++++--------- main/install/update-db-1.8.6-1.8.6.1.inc.php | 10 +- .../install/update-db-1.8.6.1-1.8.6.2.inc.php | 10 +- main/install/update-db-1.8.6.2-1.8.7.inc.php | 10 +- .../update-db-scorm-1.6.x-1.8.0.inc.php | 44 +++--- main/install/update_courses.php | 4 +- main/install/update_db.inc.php | 22 +-- main/install/upgrade.php | 4 +- 15 files changed, 161 insertions(+), 161 deletions(-) diff --git a/main/install/compare_db.php b/main/install/compare_db.php index 13c40af671..f1403c4f8f 100755 --- a/main/install/compare_db.php +++ b/main/install/compare_db.php @@ -197,12 +197,12 @@ foreach($bases_new as $num_base=>$base) echo "

This database has been removed!

"; } echo "

Differences between each table

" . - "- fields display under each table's name,
" . - "- new tables are surrounded by '**',
" . - "- removed tables are surrounded by '---',
" . - "- new fields are surrounded by '++',
" . - "- removed fields are surrounded by '--',
" . - "- modified fields are surrounded by '~+~',
"; + "- fields display under each table's name,
" . + "- new tables are surrounded by '**',
" . + "- removed tables are surrounded by '---',
" . + "- new fields are surrounded by '++',
" . + "- removed fields are surrounded by '--',
" . + "- modified fields are surrounded by '~+~',
"; echo '
'.print_r($modif_tables,true).'
'; $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."
"; + echo "ALTER TABLE ".$mytable." DROP ".$myname."
"; } 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
"; + echo "ALTER TABLE ".$mytable." CHANGE $myname $myname $myprops_string
"; } foreach($mynew as $myname){ //column created, display ADD command $myname = str_replace('++','',$myname); - echo "ALTER TABLE ".$mytable." ADD $myname...
"; + echo "ALTER TABLE ".$mytable." ADD $myname...
"; } }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."();
"; + echo "CREATE TABLE ".$table."();
"; break; case '--': //dropped table, display DROP TABLE command $table = str_replace('---','',$table); - echo "DROP TABLE ".$table."();
"; + echo "DROP TABLE ".$table."();
"; break; default: - echo "Unknown table problem: ".$table."
"; + echo "Unknown table problem: ".$table."
"; break; } } diff --git a/main/install/index.php b/main/install/index.php index 9238968712..bf9bf0ce72 100755 --- a/main/install/index.php +++ b/main/install/index.php @@ -577,7 +577,7 @@ if ($_POST['step2']) {


+ ?>


'.get_lang('Error').' ! Dokeos '.implode('|', $updateFromVersion).' '.get_lang('HasNotBeenFound').'.

+ echo ''.get_lang('Error').' ! Dokeos '.implode('|', $updateFromVersion).' '.get_lang('HasNotBeenFound').'.

'.get_lang('PleasGoBackToStep1').'.

'; @@ -98,12 +98,12 @@ if (defined('DOKEOS_INSTALL') || defined('DOKEOS_COURSE_UPDATE')) //$no = mysql_errno(); //$msg = mysql_error(); - //echo '
['.$no.'] - '.$msg.'
'; + //echo '
['.$no.'] - '.$msg.'
'; echo get_lang('DBServerDoesntWorkOrLoginPassIsWrong').'.

'.get_lang('PleaseCheckTheseValues').' :

- '.get_lang('DBHost').' : '.$dbHostForm.'
- '.get_lang('DBLogin').' : '.$dbUsernameForm.'
- '.get_lang('DBPassword').' : '.$dbPassForm.'

+ '.get_lang('DBHost').' : '.$dbHostForm.'
+ '.get_lang('DBLogin').' : '.$dbUsernameForm.'
+ '.get_lang('DBPassword').' : '.$dbPassForm.'

'.get_lang('PleaseGoBackToStep').' '. (defined('DOKEOS_INSTALL') ? '3' : '1').'.

'; diff --git a/main/install/update-db-1.8.0-1.8.2.inc.php b/main/install/update-db-1.8.0-1.8.2.inc.php index fbf445e8a8..c8afb4f789 100755 --- a/main/install/update-db-1.8.0-1.8.2.inc.php +++ b/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 ''.get_lang('Error').' ! Dokeos '.implode('|', $updateFromVersion).' '.get_lang('HasNotBeenFound').'.

+ echo ''.get_lang('Error').' ! Dokeos '.implode('|', $updateFromVersion).' '.get_lang('HasNotBeenFound').'.

'.get_lang('PleasGoBackToStep1').'.

'; @@ -98,12 +98,12 @@ if (defined('DOKEOS_INSTALL') || defined('DOKEOS_COURSE_UPDATE')) //$no = mysql_errno(); //$msg = mysql_error(); - //echo '
['.$no.'] - '.$msg.'
'; + //echo '
['.$no.'] - '.$msg.'
'; echo get_lang('DBServerDoesntWorkOrLoginPassIsWrong').'.

'.get_lang('PleaseCheckTheseValues').' :

- '.get_lang('DBHost').' : '.$dbHostForm.'
- '.get_lang('DBLogin').' : '.$dbUsernameForm.'
- '.get_lang('DBPassword').' : '.$dbPassForm.'

+ '.get_lang('DBHost').' : '.$dbHostForm.'
+ '.get_lang('DBLogin').' : '.$dbUsernameForm.'
+ '.get_lang('DBPassword').' : '.$dbPassForm.'

'.get_lang('PleaseGoBackToStep').' '. (defined('DOKEOS_INSTALL') ? '3' : '1').'.

'; diff --git a/main/install/update-db-1.8.2-1.8.3.inc.php b/main/install/update-db-1.8.2-1.8.3.inc.php index 0a01c8cb41..d5f3d62f09 100755 --- a/main/install/update-db-1.8.2-1.8.3.inc.php +++ b/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 ''.get_lang('Error').' ! Dokeos '.implode('|', $updateFromVersion).' '.get_lang('HasNotBeenFound').'.

+ echo ''.get_lang('Error').' ! Dokeos '.implode('|', $updateFromVersion).' '.get_lang('HasNotBeenFound').'.

'.get_lang('PleasGoBackToStep1').'.

'; @@ -98,12 +98,12 @@ if (defined('DOKEOS_INSTALL') || defined('DOKEOS_COURSE_UPDATE')) //$no = mysql_errno(); //$msg = mysql_error(); - //echo '
['.$no.'] - '.$msg.'
'; + //echo '
['.$no.'] - '.$msg.'
'; echo get_lang('DBServerDoesntWorkOrLoginPassIsWrong').'.

' . ' '.get_lang('PleaseCheckTheseValues').' :

- '.get_lang('DBHost').' : '.$dbHostForm.'
- '.get_lang('DBLogin').' : '.$dbUsernameForm.'
- '.get_lang('DBPassword').' : '.$dbPassForm.'

+ '.get_lang('DBHost').' : '.$dbHostForm.'
+ '.get_lang('DBLogin').' : '.$dbUsernameForm.'
+ '.get_lang('DBPassword').' : '.$dbPassForm.'

'.get_lang('PleaseGoBackToStep').' '. (defined('DOKEOS_INSTALL') ? '3' : '1').'.

'; diff --git a/main/install/update-db-1.8.3-1.8.4.inc.php b/main/install/update-db-1.8.3-1.8.4.inc.php index d36d4bef37..dc2a713c19 100755 --- a/main/install/update-db-1.8.3-1.8.4.inc.php +++ b/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 ''.get_lang('Error').' ! Dokeos '.implode('|', $updateFromVersion).' '.get_lang('HasNotBeenFound').'.

+ echo ''.get_lang('Error').' ! Dokeos '.implode('|', $updateFromVersion).' '.get_lang('HasNotBeenFound').'.

'.get_lang('PleasGoBackToStep1').'.

'; @@ -98,12 +98,12 @@ if (defined('DOKEOS_INSTALL') || defined('DOKEOS_COURSE_UPDATE')) //$no = mysql_errno(); //$msg = mysql_error(); - //echo '
['.$no.'] - '.$msg.'
'; + //echo '
['.$no.'] - '.$msg.'
'; echo get_lang('DBServerDoesntWorkOrLoginPassIsWrong').'.

' . ' '.get_lang('PleaseCheckTheseValues').' :

- '.get_lang('DBHost').' : '.$dbHostForm.'
- '.get_lang('DBLogin').' : '.$dbUsernameForm.'
- '.get_lang('DBPassword').' : '.$dbPassForm.'

+ '.get_lang('DBHost').' : '.$dbHostForm.'
+ '.get_lang('DBLogin').' : '.$dbUsernameForm.'
+ '.get_lang('DBPassword').' : '.$dbPassForm.'

'.get_lang('PleaseGoBackToStep').' '. (defined('DOKEOS_INSTALL') ? '3' : '1').'.

'; diff --git a/main/install/update-db-1.8.4-1.8.5.inc.php b/main/install/update-db-1.8.4-1.8.5.inc.php index 2c657973ce..0b6a94e069 100755 --- a/main/install/update-db-1.8.4-1.8.5.inc.php +++ b/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 ''.get_lang('Error').' ! Dokeos '.implode('|', $updateFromVersion).' '.get_lang('HasNotBeenFound').'.

+ echo ''.get_lang('Error').' ! Dokeos '.implode('|', $updateFromVersion).' '.get_lang('HasNotBeenFound').'.

'.get_lang('PleasGoBackToStep1').'.

'; @@ -80,12 +80,12 @@ if (defined('DOKEOS_INSTALL') || defined('DOKEOS_COURSE_UPDATE')) //$no = mysql_errno(); //$msg = mysql_error(); - //echo '
['.$no.'] - '.$msg.'
'; + //echo '
['.$no.'] - '.$msg.'
'; echo get_lang('DBServerDoesntWorkOrLoginPassIsWrong').'.

' . ' '.get_lang('PleaseCheckTheseValues').' :

- '.get_lang('DBHost').' : '.$dbHostForm.'
- '.get_lang('DBLogin').' : '.$dbUsernameForm.'
- '.get_lang('DBPassword').' : '.$dbPassForm.'

+ '.get_lang('DBHost').' : '.$dbHostForm.'
+ '.get_lang('DBLogin').' : '.$dbUsernameForm.'
+ '.get_lang('DBPassword').' : '.$dbPassForm.'

'.get_lang('PleaseGoBackToStep').' '. (defined('DOKEOS_INSTALL') ? '3' : '1').'.

'; diff --git a/main/install/update-db-1.8.5-1.8.6.inc.php b/main/install/update-db-1.8.5-1.8.6.inc.php index 6fa2183c5b..04c78fc557 100755 --- a/main/install/update-db-1.8.5-1.8.6.inc.php +++ b/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 ''.get_lang('Error').' ! Dokeos '.implode('|', $updateFromVersion).' '.get_lang('HasNotBeenFound').'.

+ echo ''.get_lang('Error').' ! Dokeos '.implode('|', $updateFromVersion).' '.get_lang('HasNotBeenFound').'.

'.get_lang('PleasGoBackToStep1').'.

'; @@ -80,12 +80,12 @@ if (defined('DOKEOS_INSTALL') || defined('DOKEOS_COURSE_UPDATE')) //$no = mysql_errno(); //$msg = mysql_error(); - //echo '
['.$no.'] - '.$msg.'
'; + //echo '
['.$no.'] - '.$msg.'
'; echo get_lang('DBServerDoesntWorkOrLoginPassIsWrong').'.

' . ' '.get_lang('PleaseCheckTheseValues').' :

- '.get_lang('DBHost').' : '.$dbHostForm.'
- '.get_lang('DBLogin').' : '.$dbUsernameForm.'
- '.get_lang('DBPassword').' : '.$dbPassForm.'

+ '.get_lang('DBHost').' : '.$dbHostForm.'
+ '.get_lang('DBLogin').' : '.$dbUsernameForm.'
+ '.get_lang('DBPassword').' : '.$dbPassForm.'

'.get_lang('PleaseGoBackToStep').' '. (defined('DOKEOS_INSTALL') ? '3' : '1').'.

'; @@ -251,8 +251,8 @@ if (defined('DOKEOS_INSTALL') || defined('DOKEOS_COURSE_UPDATE')) -

TITULUS 1
- TITULUS 2
+

TITULUS 1
+ TITULUS 2

@@ -260,8 +260,8 @@ if (defined('DOKEOS_INSTALL') || defined('DOKEOS_COURSE_UPDATE')) -


-
+


+

\');'; @@ -302,15 +302,15 @@ if (defined('DOKEOS_INSTALL') || defined('DOKEOS_COURSE_UPDATE'))

Ut enim ad minima

- Veniam, quis nostrum exercitationem ullam corporis suscipit laboriosam, nisi ut aliquid ex ea commodi consequatur.
+ Veniam, quis nostrum exercitationem ullam corporis suscipit laboriosam, nisi ut aliquid ex ea commodi consequatur.

- trainer

+ trainer
-


-
+


+

\');'; @@ -341,7 +341,7 @@ if (defined('DOKEOS_INSTALL') || defined('DOKEOS_COURSE_UPDATE')) -
+
Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Duis pellentesque. @@ -349,8 +349,8 @@ if (defined('DOKEOS_INSTALL') || defined('DOKEOS_COURSE_UPDATE')) -


-
+


+

\'); @@ -367,7 +367,7 @@ if (defined('DOKEOS_INSTALL') || defined('DOKEOS_COURSE_UPDATE')) -  trainer
+  trainer
@@ -378,7 +378,7 @@ if (defined('DOKEOS_INSTALL') || defined('DOKEOS_COURSE_UPDATE')) Vivamus - a quam. 
+ a quam. 
@@ -388,8 +388,8 @@ if (defined('DOKEOS_INSTALL') || defined('DOKEOS_COURSE_UPDATE')) -


-
+


+

\');'; @@ -406,7 +406,7 @@ if (defined('DOKEOS_INSTALL') || defined('DOKEOS_COURSE_UPDATE')) -  Trainer
+  Trainer
@@ -421,11 +421,11 @@ if (defined('DOKEOS_INSTALL') || defined('DOKEOS_COURSE_UPDATE')) Vivamus - a quam. 
+ a quam. 
Etiam - lacinia stibulum ante.
+ lacinia stibulum ante.
@@ -434,13 +434,13 @@ if (defined('DOKEOS_INSTALL') || defined('DOKEOS_COURSE_UPDATE')) a est stibulum ante ipsum. Consectetuer - adipiscing elit.
+ adipiscing elit.
-


-
+


+

@@ -456,7 +456,7 @@ if (defined('DOKEOS_INSTALL') || defined('DOKEOS_COURSE_UPDATE')) - @@ -468,19 +468,19 @@ if (defined('DOKEOS_INSTALL') || defined('DOKEOS_COURSE_UPDATE'))
trainer
+ 		trainer
Etiam - lacinia.
+ lacinia.
Consectetuer - adipiscing elit.
+ adipiscing elit.
-


-
+


+

\');'; @@ -497,7 +497,7 @@ if (defined('DOKEOS_INSTALL') || defined('DOKEOS_COURSE_UPDATE')) - @@ -525,7 +525,7 @@ if (defined('DOKEOS_INSTALL') || defined('DOKEOS_COURSE_UPDATE'))
 trainer
+ 		 trainer
-
+
Etiam lacinia stibulum ante. Convallis @@ -541,8 +541,8 @@ if (defined('DOKEOS_INSTALL') || defined('DOKEOS_COURSE_UPDATE'))
-


-
+


+

\'); @@ -559,19 +559,19 @@ if (defined('DOKEOS_INSTALL') || defined('DOKEOS_COURSE_UPDATE')) - 01
Lorem ipsum dolor sit amet


+ 01
Lorem ipsum dolor sit amet


02 -
Ut enim ad minim veniam


- 03Duis aute irure dolor in reprehenderit


+
Ut enim ad minim veniam


+ 03Duis aute irure dolor in reprehenderit


04Neque porro quisquam est - Gearbox
+ Gearbox
-


-
+


+

\'); @@ -590,7 +590,7 @@ if (defined('DOKEOS_INSTALL') || defined('DOKEOS_COURSE_UPDATE')) - trainer
+ trainer
@@ -612,8 +612,8 @@ if (defined('DOKEOS_INSTALL') || defined('DOKEOS_COURSE_UPDATE')) -


-
+


+

\');'; @@ -678,8 +678,8 @@ if (defined('DOKEOS_INSTALL') || defined('DOKEOS_COURSE_UPDATE')) -


-
+


+

\');'; @@ -697,7 +697,7 @@ if (defined('DOKEOS_INSTALL') || defined('DOKEOS_COURSE_UPDATE')) - learner wonders
+ learner wonders
@@ -709,19 +709,19 @@ if (defined('DOKEOS_INSTALL') || defined('DOKEOS_COURSE_UPDATE')) Etiam - lacinia stibulum ante.
+ lacinia stibulum ante.
Consectetuer - adipiscing elit.
+ adipiscing elit.
-


-
+


+

\'); @@ -759,7 +759,7 @@ if (defined('DOKEOS_INSTALL') || defined('DOKEOS_COURSE_UPDATE'))
  • consectetur
  • adipisicing elit
    • -
    +
    arrow @@ -782,13 +782,13 @@ if (defined('DOKEOS_INSTALL') || defined('DOKEOS_COURSE_UPDATE'))
  • quisquam est
  • qui dolorem  
    • -

    +

    -


    -
    +


    +

    \'); @@ -807,7 +807,7 @@ if (defined('DOKEOS_INSTALL') || defined('DOKEOS_COURSE_UPDATE')) trainer -
    +
    @@ -818,12 +818,12 @@ if (defined('DOKEOS_INSTALL') || defined('DOKEOS_COURSE_UPDATE'))
  • sed do eiusmod tempor incididunt
  • ut labore et dolore magna aliqua
  • quis nostrud exercitation ullamco
    • -
    +
    -


    -
    +


    +

    \');'; @@ -891,7 +891,7 @@ if (defined('DOKEOS_INSTALL') || defined('DOKEOS_COURSE_UPDATE')) -
    +
    \');'; $res = mysql_query($sql); @@ -911,21 +911,21 @@ if (defined('DOKEOS_INSTALL') || defined('DOKEOS_COURSE_UPDATE')) -
    +
    -
    - image
    +
    + image
    - trainer
    + trainer
    -


    -
    +


    +

    \');'; @@ -967,7 +967,7 @@ if (defined('DOKEOS_INSTALL') || defined('DOKEOS_COURSE_UPDATE')) -


    +


    Lorem ipsum dolor sit amet