From 007456de6156490a0009fcb26bbaf4ea6c4c0365 Mon Sep 17 00:00:00 2001 From: toyomoyo Date: Thu, 8 Feb 2007 07:12:53 +0000 Subject: [PATCH] MDL-8425, fixing xhtml strict issues --- .../delete_field/delete_field.class.php | 14 +++++------ .../delete_index/delete_index.class.php | 14 +++++------ .../actions/delete_key/delete_key.class.php | 14 +++++------ .../delete_sentence/delete_sentence.class.php | 14 +++++------ .../delete_statement.class.php | 14 +++++------ .../delete_table/delete_table.class.php | 14 +++++------ .../delete_xml_file/delete_xml_file.class.php | 14 +++++------ .../actions/edit_field/edit_field.class.php | 11 ++++---- .../actions/edit_index/edit_index.class.php | 11 ++++---- .../xmldb/actions/edit_key/edit_key.class.php | 11 ++++---- .../edit_sentence/edit_sentence.class.php | 7 +++--- .../edit_statement/edit_statement.class.php | 13 +++++----- .../actions/edit_table/edit_table.class.php | 25 ++++++++++--------- .../edit_xml_file/edit_xml_file.class.php | 21 ++++++++-------- .../actions/main_view/main_view.class.php | 8 +++--- .../new_statement/new_statement.class.php | 5 ++-- .../new_table_from_mysql.class.php | 5 ++-- .../revert_changes/revert_changes.class.php | 14 +++++------ admin/xmldb/actions/test/test.class.php | 2 +- .../view_reserved_words.class.php | 6 ++--- .../view_structure_php.class.php | 9 ++++--- .../view_structure_sql.class.php | 4 +-- .../view_table_php/view_table_php.class.php | 9 ++++--- .../view_table_sql/view_table_sql.class.php | 4 +-- theme/standard/styles_layout.css | 5 ++-- 25 files changed, 140 insertions(+), 128 deletions(-) diff --git a/admin/xmldb/actions/delete_field/delete_field.class.php b/admin/xmldb/actions/delete_field/delete_field.class.php index 5ceadfc5f9..3bdee9aa40 100644 --- a/admin/xmldb/actions/delete_field/delete_field.class.php +++ b/admin/xmldb/actions/delete_field/delete_field.class.php @@ -72,17 +72,17 @@ class delete_field extends XMLDBAction { /// If not confirmed, show confirmation box if (!$confirmed) { - $o = ''; + $o = '
'; $o.= '
'; - $o.= '

' . $this->str['confirmdeletefield'] . '

' . $fieldparam . '

'; - $o.= ' '; diff --git a/admin/xmldb/actions/delete_index/delete_index.class.php b/admin/xmldb/actions/delete_index/delete_index.class.php index f04eec5e2b..182e1ad58b 100644 --- a/admin/xmldb/actions/delete_index/delete_index.class.php +++ b/admin/xmldb/actions/delete_index/delete_index.class.php @@ -72,17 +72,17 @@ class delete_index extends XMLDBAction { /// If not confirmed, show confirmation box if (!$confirmed) { - $o = '
'; + $o.= '

' . $this->str['confirmdeletefield'] . '

' . $fieldparam . '

'; + $o.= ' '; $o.= '
'; $o.= '
'; - $o.= '
'; - $o.= '
'; + $o.= '
'; + $o.= '
'; $o.= ' 		'; $o.= '
'; - $o.= '
'; - $o.= '
'; + $o.= '
'; + $o.= '
'; $o.= '
'; $o.= '
'; + $o = '
'; $o.= '
'; - $o.= '

' . $this->str['confirmdeleteindex'] . '

' . $indexparam . '

'; - $o.= ' '; diff --git a/admin/xmldb/actions/delete_key/delete_key.class.php b/admin/xmldb/actions/delete_key/delete_key.class.php index 0e6cb5cc19..dc340ca2f2 100644 --- a/admin/xmldb/actions/delete_key/delete_key.class.php +++ b/admin/xmldb/actions/delete_key/delete_key.class.php @@ -72,17 +72,17 @@ class delete_key extends XMLDBAction { /// If not confirmed, show confirmation box if (!$confirmed) { - $o = '
'; + $o.= '

' . $this->str['confirmdeleteindex'] . '

' . $indexparam . '

'; + $o.= ' '; $o.= '
'; $o.= '
'; - $o.= '
'; - $o.= '
'; + $o.= '
'; + $o.= '
'; $o.= ' 		'; $o.= '
'; - $o.= '
'; - $o.= '
'; + $o.= '
'; + $o.= '
'; $o.= '
'; $o.= '
'; + $o = '
'; $o.= '
'; - $o.= '

' . $this->str['confirmdeletekey'] . '

' . $keyparam . '

'; - $o.= ' '; diff --git a/admin/xmldb/actions/delete_sentence/delete_sentence.class.php b/admin/xmldb/actions/delete_sentence/delete_sentence.class.php index e3c88a78c2..7208ca0132 100644 --- a/admin/xmldb/actions/delete_sentence/delete_sentence.class.php +++ b/admin/xmldb/actions/delete_sentence/delete_sentence.class.php @@ -72,17 +72,17 @@ class delete_sentence extends XMLDBAction { /// If not confirmed, show confirmation box if (!$confirmed) { - $o = '
'; + $o.= '

' . $this->str['confirmdeletekey'] . '

' . $keyparam . '

'; + $o.= ' '; $o.= '
'; $o.= '
'; - $o.= '
'; - $o.= '
'; + $o.= '
'; + $o.= '
'; $o.= ' 		'; $o.= '
'; - $o.= '
'; - $o.= '
'; + $o.= '
'; + $o.= '
'; $o.= '
'; $o.= '
'; + $o = '
'; $o.= '
'; - $o.= '

' . $this->str['confirmdeletesentence'] . '

'; - $o.= ' '; diff --git a/admin/xmldb/actions/delete_statement/delete_statement.class.php b/admin/xmldb/actions/delete_statement/delete_statement.class.php index ab902dd39b..bb7c74fc5d 100644 --- a/admin/xmldb/actions/delete_statement/delete_statement.class.php +++ b/admin/xmldb/actions/delete_statement/delete_statement.class.php @@ -71,17 +71,17 @@ class delete_statement extends XMLDBAction { /// If not confirmed, show confirmation box if (!$confirmed) { - $o = '
'; + $o.= '

' . $this->str['confirmdeletesentence'] . '

'; + $o.= ' '; $o.= '
'; $o.= '
'; - $o.= '
'; - $o.= '
'; + $o.= '
'; + $o.= '
'; $o.= ' 		'; $o.= '
'; - $o.= '
'; - $o.= '
'; + $o.= '
'; + $o.= '
'; $o.= '
'; $o.= '
'; + $o = '
'; $o.= '
'; - $o.= '

' . $this->str['confirmdeletestatement'] . '

' . $statementparam . '

'; - $o.= ' '; diff --git a/admin/xmldb/actions/delete_table/delete_table.class.php b/admin/xmldb/actions/delete_table/delete_table.class.php index ee67c05ecd..3b1811c940 100644 --- a/admin/xmldb/actions/delete_table/delete_table.class.php +++ b/admin/xmldb/actions/delete_table/delete_table.class.php @@ -71,17 +71,17 @@ class delete_table extends XMLDBAction { /// If not confirmed, show confirmation box if (!$confirmed) { - $o = '
'; + $o.= '

' . $this->str['confirmdeletestatement'] . '

' . $statementparam . '

'; + $o.= ' '; $o.= '
'; $o.= '
'; - $o.= '
'; - $o.= '
'; + $o.= '
'; + $o.= '
'; $o.= ' 		'; $o.= '
'; - $o.= '
'; - $o.= '
'; + $o.= '
'; + $o.= '
'; $o.= '
'; $o.= '
'; + $o = '
'; $o.= '
'; - $o.= '

' . $this->str['confirmdeletetable'] . '

' . $tableparam . '

'; - $o.= ' '; diff --git a/admin/xmldb/actions/delete_xml_file/delete_xml_file.class.php b/admin/xmldb/actions/delete_xml_file/delete_xml_file.class.php index c3b1037618..1eb2ea8191 100644 --- a/admin/xmldb/actions/delete_xml_file/delete_xml_file.class.php +++ b/admin/xmldb/actions/delete_xml_file/delete_xml_file.class.php @@ -70,17 +70,17 @@ class delete_xml_file extends XMLDBAction { /// If not confirmed, show confirmation box if (!$confirmed) { - $o = '
'; + $o.= '

' . $this->str['confirmdeletetable'] . '

' . $tableparam . '

'; + $o.= ' '; $o.= '
'; $o.= '
'; - $o.= '
'; - $o.= '
'; + $o.= '
'; + $o.= '
'; $o.= ' 		'; $o.= '
'; - $o.= '
'; - $o.= '
'; + $o.= '
'; + $o.= '
'; $o.= '
'; $o.= '
'; + $o = '
'; $o.= '
'; - $o.= '

' . $this->str['confirmdeletexmlfile'] . '

' . $dirpath . '/install.php

'; - $o.= ' '; diff --git a/admin/xmldb/actions/edit_field/edit_field.class.php b/admin/xmldb/actions/edit_field/edit_field.class.php index bd833613cc..f82d08dd7b 100644 --- a/admin/xmldb/actions/edit_field/edit_field.class.php +++ b/admin/xmldb/actions/edit_field/edit_field.class.php @@ -99,12 +99,13 @@ class edit_field extends XMLDBAction { /// Add the main form $o = ''; + $o.= '
'; $o.= ' '; $o.= ' '; $o.= ' '; $o.= ' '; $o.= ' '; - $o.= '
'; + $o.= '

' . $this->str['confirmdeletexmlfile'] . '

' . $dirpath . '/install.php

'; + $o.= ' '; $o.= '
'; $o.= '
'; - $o.= '
'; - $o.= '
'; + $o.= '
'; + $o.= '
'; $o.= ' 		'; $o.= '
'; - $o.= '
'; - $o.= '
'; + $o.= '
'; + $o.= '
'; $o.= '
'; $o.= '
'; + $o.= '
'; /// XMLDB field name /// If the field has dependencies, we cannot change its name $disabled = ''; @@ -170,18 +171,18 @@ class edit_field extends XMLDBAction { /// Change button $o.= ' '; $o.= '
 
'; - $o.= ''; + $o.= ''; /// Calculate the buttons - $b = '

'; + $b = '

'; /// The view original XML button if ($table->getField($fieldparam)) { - $b .= ' [' . $this->str['vieworiginal'] . ']'; + $b .= ' [' . $this->str['vieworiginal'] . ']'; } else { $b .= ' [' . $this->str['vieworiginal'] . ']'; } /// The view edited XML button if ($field->hasChanged()) { - $b .= ' [' . $this->str['viewedited'] . ']'; + $b .= ' [' . $this->str['viewedited'] . ']'; } else { $b .= ' [' . $this->str['viewedited'] . ']'; } diff --git a/admin/xmldb/actions/edit_index/edit_index.class.php b/admin/xmldb/actions/edit_index/edit_index.class.php index 4aaaf8b9fc..e761f67ae2 100644 --- a/admin/xmldb/actions/edit_index/edit_index.class.php +++ b/admin/xmldb/actions/edit_index/edit_index.class.php @@ -99,12 +99,13 @@ class edit_index extends XMLDBAction { /// Add the main form $o = '

'; + $o.= '
'; $o.= ' '; $o.= ' '; $o.= ' '; $o.= ' '; $o.= ' '; - $o.= ' '; + $o.= '
'; /// XMLDB index name /// If the index has dependencies, we cannot change its name $disabled = ''; @@ -125,18 +126,18 @@ class edit_index extends XMLDBAction { /// Change button $o.= ' '; $o.= '
 
'; - $o.= ''; + $o.= '
'; /// Calculate the buttons - $b = '

'; + $b = '

'; /// The view original XML button if ($table->getIndex($indexparam)) { - $b .= ' [' . $this->str['vieworiginal'] . ']'; + $b .= ' [' . $this->str['vieworiginal'] . ']'; } else { $b .= ' [' . $this->str['vieworiginal'] . ']'; } /// The view edited XML button if ($index->hasChanged()) { - $b .= ' [' . $this->str['viewedited'] . ']'; + $b .= ' [' . $this->str['viewedited'] . ']'; } else { $b .= ' [' . $this->str['viewedited'] . ']'; } diff --git a/admin/xmldb/actions/edit_key/edit_key.class.php b/admin/xmldb/actions/edit_key/edit_key.class.php index 24d316386a..5cd2f2385d 100644 --- a/admin/xmldb/actions/edit_key/edit_key.class.php +++ b/admin/xmldb/actions/edit_key/edit_key.class.php @@ -99,12 +99,13 @@ class edit_key extends XMLDBAction { /// Add the main form $o = '

'; + $o.= '
'; $o.= ' '; $o.= ' '; $o.= ' '; $o.= ' '; $o.= ' '; - $o.= ' '; + $o.= '
'; /// XMLDB key name /// If the key has dependencies, we cannot change its name $disabled = ''; @@ -137,18 +138,18 @@ class edit_key extends XMLDBAction { /// Change button $o.= ' '; $o.= '
 
'; - $o.= ''; + $o.= '
'; /// Calculate the buttons - $b = '

'; + $b = '

'; /// The view original XML button if ($table->getKey($keyparam)) { - $b .= ' [' . $this->str['vieworiginal'] . ']'; + $b .= ' [' . $this->str['vieworiginal'] . ']'; } else { $b .= ' [' . $this->str['vieworiginal'] . ']'; } /// The view edited XML button if ($key->hasChanged()) { - $b .= ' [' . $this->str['viewedited'] . ']'; + $b .= ' [' . $this->str['viewedited'] . ']'; } else { $b .= ' [' . $this->str['viewedited'] . ']'; } diff --git a/admin/xmldb/actions/edit_sentence/edit_sentence.class.php b/admin/xmldb/actions/edit_sentence/edit_sentence.class.php index 300f192f90..2a3f437676 100644 --- a/admin/xmldb/actions/edit_sentence/edit_sentence.class.php +++ b/admin/xmldb/actions/edit_sentence/edit_sentence.class.php @@ -115,12 +115,13 @@ class edit_sentence extends XMLDBAction { /// Add the main form $o = '

'; + $o.= '
'; $o.= ' '; $o.= ' '; $o.= ' '; $o.= ' '; $o.= ' '; - $o.= ' '; + $o.= '
'; /// The fields box $o.= ' '; $o.= ' '; @@ -130,9 +131,9 @@ class edit_sentence extends XMLDBAction { /// The submit button $o.= ' '; $o.= '
INSERT INTO ' . s($statement->getTable()) . '
'; - $o.= ''; + $o.= '
'; /// Calculate the buttons - $b = '

'; + $b = '

'; /// The back to edit statement button $b .= ' [' . $this->str['back'] . ']'; $b .= '

'; diff --git a/admin/xmldb/actions/edit_statement/edit_statement.class.php b/admin/xmldb/actions/edit_statement/edit_statement.class.php index f109b69883..6cf274d27c 100644 --- a/admin/xmldb/actions/edit_statement/edit_statement.class.php +++ b/admin/xmldb/actions/edit_statement/edit_statement.class.php @@ -103,27 +103,28 @@ class edit_statement extends XMLDBAction { /// Add the main form $o = '
'; + $o.= '
'; $o.= ' '; $o.= ' '; $o.= ' '; $o.= ' '; - $o.= ' '; + $o.= '
'; $o.= ' '; $o.= ' '; $o.= ' '; $o.= '
Name:' . s($statement->getName()) .'
 
'; - $o.= ''; + $o.= '
'; /// Calculate the buttons - $b = '

'; + $b = '

'; /// The view original XML button if ($origstructure->getStatement($statementparam)) { - $b .= ' [' . $this->str['vieworiginal'] . ']'; + $b .= ' [' . $this->str['vieworiginal'] . ']'; } else { $b .= ' [' . $this->str['vieworiginal'] . ']'; } /// The view edited XML button if ($statement->hasChanged()) { - $b .= ' [' . $this->str['viewedited'] . ']'; + $b .= ' [' . $this->str['viewedited'] . ']'; } else { $b .= ' [' . $this->str['viewedited'] . ']'; } @@ -141,7 +142,7 @@ class edit_statement extends XMLDBAction { $sentences =& $statement->getSentences(); if (!empty($sentences)) { $o .= '

' . $this->str['sentences'] . '

'; - $o .= ''; + $o .= '
'; $row = 0; foreach ($sentences as $key => $sentence) { /// Prepend some SQL diff --git a/admin/xmldb/actions/edit_table/edit_table.class.php b/admin/xmldb/actions/edit_table/edit_table.class.php index f386e460e8..8c010efd9f 100644 --- a/admin/xmldb/actions/edit_table/edit_table.class.php +++ b/admin/xmldb/actions/edit_table/edit_table.class.php @@ -103,11 +103,12 @@ class edit_table extends XMLDBAction { /// Add the main form $o = ''; + $o.= '
'; $o.= ' '; $o.= ' '; $o.= ' '; $o.= ' '; - $o.= '
'; + $o.= '
'; /// If the table is being used, we cannot rename it if ($structure->getTableUses($table->getName())) { $o.= ' '; @@ -117,18 +118,18 @@ class edit_table extends XMLDBAction { $o.= ' '; $o.= ' '; $o.= '
Name:' . s($table->getName()) .'
 
'; - $o.= ''; + $o.= ''; /// Calculate the buttons - $b = '

'; + $b = '

'; /// The view original XML button if ($origstructure->getTable($tableparam)) { - $b .= ' [' . $this->str['vieworiginal'] . ']'; + $b .= ' [' . $this->str['vieworiginal'] . ']'; } else { $b .= ' [' . $this->str['vieworiginal'] . ']'; } /// The view edited XML button if ($table->hasChanged()) { - $b .= ' [' . $this->str['viewedited'] . ']'; + $b .= ' [' . $this->str['viewedited'] . ']'; } else { $b .= ' [' . $this->str['viewedited'] . ']'; } @@ -141,7 +142,7 @@ class edit_table extends XMLDBAction { /// The back to edit xml file button $b .= ' [' . $this->str['back'] . ']'; $b .= '

'; - $b .= '

'; + $b .= '

'; /// The view sql code button $b .= '[' .$this->str['viewsqlcode'] . ']'; /// The view php code button @@ -170,7 +171,7 @@ class edit_table extends XMLDBAction { $fields =& $table->getFields(); if (!empty($fields)) { $o .= '

' . $this->str['fields'] . '

'; - $o .= ''; + $o .= '
'; $row = 0; foreach ($fields as $field) { /// Calculate buttons @@ -210,7 +211,7 @@ class edit_table extends XMLDBAction { /// The readable info $r = ''; /// Print table row - $o .= ''; + $o .= ''; $row = ($row + 1) % 2; } $o .= '
' . $field->readableInfo() . '
' . $field->getName() . '' . $b . $r . '
' . $field->getName() . '' . $b . $r . '
'; @@ -219,7 +220,7 @@ class edit_table extends XMLDBAction { $keys =& $table->getKeys(); if (!empty($keys)) { $o .= '

' . $this->str['keys'] . '

'; - $o .= ''; + $o .= '
'; $row = 0; foreach ($keys as $key) { /// Calculate buttons @@ -254,7 +255,7 @@ class edit_table extends XMLDBAction { /// The readable info $r = ''; /// Print table row - $o .= ''; + $o .= ''; $row = ($row + 1) % 2; } $o .= '
' . $key->readableInfo() . '
' . $key->getName() . '' . $b . $r .'
' . $key->getName() . '' . $b . $r .'
'; @@ -263,7 +264,7 @@ class edit_table extends XMLDBAction { $indexes =& $table->getIndexes(); if (!empty($indexes)) { $o .= '

' . $this->str['indexes'] . '

'; - $o .= ''; + $o .= '
'; $row = 0; foreach ($indexes as $index) { /// Calculate buttons @@ -290,7 +291,7 @@ class edit_table extends XMLDBAction { /// The readable info $r = ''; /// Print table row - $o .= ''; + $o .= ''; $row = ($row + 1) % 2; } $o .= '
' . $index->readableInfo() . '
' . $index->getName() . '' . $b . $r .'
' . $index->getName() . '' . $b . $r .'
'; diff --git a/admin/xmldb/actions/edit_xml_file/edit_xml_file.class.php b/admin/xmldb/actions/edit_xml_file/edit_xml_file.class.php index 1dfba4904f..734c6725dc 100644 --- a/admin/xmldb/actions/edit_xml_file/edit_xml_file.class.php +++ b/admin/xmldb/actions/edit_xml_file/edit_xml_file.class.php @@ -101,25 +101,26 @@ class edit_xml_file extends XMLDBAction { $structure =& $editeddir->xml_file->getStructure(); /// Add the main form $o = '
'; + $o .= '
'; $o.= ' '; $o.= ' '; $o.= ' '; $o.= ' '; $o.= ' '; - $o.= ' '; + $o.= '
'; $o.= ' '; $o.= ' '; $o.= ' '; $o.= ' '; $o.= '
Path:' . s($structure->getPath()) . '
Version:' . s($structure->getVersion()) . '
 
'; - $o.= ''; + $o.= '
'; /// Calculate the buttons - $b = '

'; + $b = '

'; /// The view original XML button - $b .= ' [' . $this->str['vieworiginal'] . ']'; + $b .= ' [' . $this->str['vieworiginal'] . ']'; /// The view edited XML button if ($structure->hasChanged()) { - $b .= ' [' . $this->str['viewedited'] . ']'; + $b .= ' [' . $this->str['viewedited'] . ']'; } else { $b .= ' [' . $this->str['viewedited'] . ']'; } @@ -136,7 +137,7 @@ class edit_xml_file extends XMLDBAction { /// The back to main menu button $b .= ' [' . $this->str['backtomainview'] . ']'; $b .= '

'; - $b .= '

'; + $b .= '

'; /// The view sql code button $b .= '[' .$this->str['viewsqlcode'] . ']'; /// The view php code button @@ -158,7 +159,7 @@ class edit_xml_file extends XMLDBAction { $tables =& $structure->getTables(); if ($tables) { $o .= '

' . $this->str['tables'] . '

'; - $o .= ''; + $o .= '
'; $row = 0; foreach ($tables as $table) { /// Calculate buttons @@ -194,7 +195,7 @@ class edit_xml_file extends XMLDBAction { } $b .= ''; /// Print table row - $o .= ''; + $o .= ''; $row = ($row + 1) % 2; } $o .= '
' . $table->getName() . '' . $b . '
' . $table->getName() . '' . $b . '
'; @@ -203,7 +204,7 @@ class edit_xml_file extends XMLDBAction { $statements =& $structure->getStatements(); if ($statements) { $o .= '

' . $this->str['statements'] . '

'; - $o .= ''; + $o .= '
'; $row = 0; foreach ($statements as $statement) { /// Calculate buttons @@ -229,7 +230,7 @@ class edit_xml_file extends XMLDBAction { $b .= '[' . $this->str['delete'] . ']'; $b .= ''; /// Print statement row - $o .= ''; + $o .= ''; $row = ($row + 1) % 2; } $o .= '
' . $statement->getName() . '' . $b . '
' . $statement->getName() . '' . $b . '
'; diff --git a/admin/xmldb/actions/main_view/main_view.class.php b/admin/xmldb/actions/main_view/main_view.class.php index 3f0d941ce6..5a9115d557 100644 --- a/admin/xmldb/actions/main_view/main_view.class.php +++ b/admin/xmldb/actions/main_view/main_view.class.php @@ -72,14 +72,14 @@ class main_view extends XMLDBAction { if (isset($SESSION->lastused)) { if ($lastused = $SESSION->lastused) { /// Print link - $o .= '

' . $this->str['gotolastused'] . '

'; + $o .= '

' . $this->str['gotolastused'] . '

'; } } else { $lastused = NULL; } /// Calculate the buttons - $b = '

'; + $b = '

'; /// The reserved_words button $b .= ' [' . $this->str['reservedwords'] . ']'; /// The test button @@ -94,7 +94,7 @@ class main_view extends XMLDBAction { $result = $this->launch('get_db_directories'); /// Display list of DB directories if everything is ok if ($result && !empty($XMLDB->dbdirs)) { - $o .= ''; + $o .= '
'; $row = 0; foreach ($XMLDB->dbdirs as $key => $dbdir) { /// Detect if this is the lastused dir @@ -199,7 +199,7 @@ class main_view extends XMLDBAction { if ($dbdir->path_exists && file_exists($key . '/install.xml') && is_readable($key . '/install.xml')) { - $elementtext = '' . $elementtext . ''; + $elementtext = '' . $elementtext . ''; } else { $elementtext = $elementtext . ''; } diff --git a/admin/xmldb/actions/new_statement/new_statement.class.php b/admin/xmldb/actions/new_statement/new_statement.class.php index b6a72b265e..5e19b5eceb 100644 --- a/admin/xmldb/actions/new_statement/new_statement.class.php +++ b/admin/xmldb/actions/new_statement/new_statement.class.php @@ -103,15 +103,16 @@ class new_statement extends XMLDBAction { } /// Now build the form $o = ''; + $o .= '
'; $o.= ' '; $o.= ' '; $o.= ' '; - $o.= '
'; + $o.= '
'; $o.= ' '; $o.= ' '; $o.= ' '; $o.= '
' . choose_from_menu($typeoptions, 'type', '', 'choose', '', 0, true) . '' .choose_from_menu($selecttables, 'table', '', 'choose', '', 0, true) . '
[' . $this->str['back'] . ']
'; - $o.= ''; + $o.= ''; $this->output = $o; diff --git a/admin/xmldb/actions/new_table_from_mysql/new_table_from_mysql.class.php b/admin/xmldb/actions/new_table_from_mysql/new_table_from_mysql.class.php index 4fd62e84b5..5d04809122 100644 --- a/admin/xmldb/actions/new_table_from_mysql/new_table_from_mysql.class.php +++ b/admin/xmldb/actions/new_table_from_mysql/new_table_from_mysql.class.php @@ -107,15 +107,16 @@ class new_table_from_mysql extends XMLDBAction { } /// Now build the form $o = '

'; + $o .= '
'; $o.= ' '; $o.= ' '; $o.= ' '; - $o.= ' '; + $o.= '
'; $o.= ' '; $o.= ' '; $o.= ' '; $o.= '
' . choose_from_menu($selecttables, 'table', '', 'choose', '', 0, true) . '' .choose_from_menu($aftertables, 'after', '', 'choose', '', 0, true) . '
[' . $this->str['back'] . ']
'; - $o.= ''; + $o.= '
'; $this->output = $o; diff --git a/admin/xmldb/actions/revert_changes/revert_changes.class.php b/admin/xmldb/actions/revert_changes/revert_changes.class.php index 1c7d74c469..0e9c8c6d9b 100644 --- a/admin/xmldb/actions/revert_changes/revert_changes.class.php +++ b/admin/xmldb/actions/revert_changes/revert_changes.class.php @@ -70,17 +70,17 @@ class revert_changes extends XMLDBAction { /// If not confirmed, show confirmation box if (!$confirmed) { - $o = ''; + $o = '
'; $o.= '
'; - $o.= '

' . $this->str['confirmrevertchanges'] . '

' . $dirpath . '

'; - $o.= ' '; diff --git a/admin/xmldb/actions/test/test.class.php b/admin/xmldb/actions/test/test.class.php index 752394fdea..02321fead9 100644 --- a/admin/xmldb/actions/test/test.class.php +++ b/admin/xmldb/actions/test/test.class.php @@ -67,7 +67,7 @@ class test extends XMLDBAction { $tests = array(); /// The back to edit table button - $b = '

'; + $b = '

'; $b .= '[' . $this->str['back'] . ']'; $b .= '

'; $o = $b; diff --git a/admin/xmldb/actions/view_reserved_words/view_reserved_words.class.php b/admin/xmldb/actions/view_reserved_words/view_reserved_words.class.php index 496af0794f..ba68520b3f 100644 --- a/admin/xmldb/actions/view_reserved_words/view_reserved_words.class.php +++ b/admin/xmldb/actions/view_reserved_words/view_reserved_words.class.php @@ -116,14 +116,14 @@ class view_reserved_words extends XMLDBAction { sort($wronguses); /// The back to edit table button - $b = '

'; + $b = '

'; $b .= '[' . $this->str['back'] . ']'; $b .= '

'; $o = $b; /// The list of currently wrong field names if ($wronguses) { - $o.= '
'; + $o.= '

' . $this->str['confirmrevertchanges'] . '

' . $dirpath . '

'; + $o.= ' '; $o.= '
'; $o.= '
'; - $o.= '
'; - $o.= '
'; + $o.= '
'; + $o.= '
'; $o.= ' 		'; $o.= '
'; - $o.= '
'; - $o.= '
'; + $o.= '
'; + $o.= '
'; $o.= '
'; $o.= '
'; + $o.= '
'; $o.= ' '; $o.= '
' . $this->str['wrongreservedwords'] . '
'; $o.= '
  • ' . implode('
  • ', $wronguses) . '
'; @@ -132,7 +132,7 @@ class view_reserved_words extends XMLDBAction { } /// The textarea showing all the reserved words - $o.= ' '; + $o.= '
'; $o.= ' '; $o.= '
' . $this->str['listreservedwords'].'