summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJean-Michel Vourgère2019-10-20 20:47:32 +0000
committerRobert Treat2019-10-31 20:00:17 +0000
commit80e18adc0b288f471e3284be53e1b8368811f877 (patch)
tree932e8cf2014870f9fd1afd3d1e75491c3ca453d8
parent3c887d8cb2078b428095809ced9a8f47735349cb (diff)
codespell assisted typo cleaning
-rw-r--r--TODO4
-rw-r--r--TRANSLATORS4
-rw-r--r--all_db.php2
-rw-r--r--classes/Misc.php12
-rw-r--r--classes/database/Postgres.php16
-rw-r--r--classes/database/Postgres80.php2
-rw-r--r--classes/database/Postgres83.php4
-rw-r--r--conf/config.inc.php-dist2
-rw-r--r--dbexport.php2
-rw-r--r--display.php4
-rw-r--r--fulltext.php4
-rw-r--r--functions.php2
-rw-r--r--js/ac_insert_row.js4
-rw-r--r--plugins/GuiControl/plugin.php4
-rw-r--r--plugins/Report/plugin.php4
-rw-r--r--schemas.php2
-rw-r--r--tables.php8
-rw-r--r--tests/selenium/README8
-rw-r--r--tests/selenium/src/01-roles.php2
-rw-r--r--tests/selenium/src/04-database.php2
-rw-r--r--tests/selenium/src/06-schema.php2
-rw-r--r--tests/selenium/src/08-domaine.php2
-rw-r--r--tests/selenium/src/10-table.php2
-rw-r--r--tests/selenium/src/99-cleantests.php2
-rw-r--r--tests/simpletests/testcase/Common/ImportTest.php4
-rw-r--r--tests/simpletests/testcase/Databases/DatabaseTest.php8
-rw-r--r--tests/simpletests/testcase/Databases/HelpTest.php2
-rw-r--r--tests/simpletests/testcase/Databases/VariablesTest.php2
-rw-r--r--tests/simpletests/testcase/Public/SetPrecondition.php4
-rw-r--r--tests/simpletests/testcase/Schemas/DomainTest.php6
-rw-r--r--tests/simpletests/testcase/Schemas/FunctionTest.php10
-rw-r--r--tests/simpletests/testcase/Schemas/TableTest.php2
-rw-r--r--tests/simpletests/testcase/Schemas/ViewTest.php2
-rw-r--r--tests/simpletests/testcase/Server/GroupsTest.php6
-rw-r--r--tests/simpletests/testcase/Tables/ColumnTest.php2
-rw-r--r--tests/simpletests/testcase/testphpPgAdminMain.php2
-rw-r--r--themes/global.css2
-rw-r--r--triggers.php2
-rw-r--r--views.php2
-rw-r--r--xloadtree/xloadtree2.js2
40 files changed, 79 insertions, 79 deletions
diff --git a/TODO b/TODO
index dae0774c..e4d5d175 100644
--- a/TODO
+++ b/TODO
@@ -120,7 +120,7 @@ Indexes
Types
-----
-* Suppres psuedo-type options in type list for creating composite types. (done ?)
+* Suppress pseudo-type options in type list for creating composite types. (done ?)
Operators
@@ -190,7 +190,7 @@ Full Text Search (8.3)
Miscellaneous
-------------
-* Audit for PHP 5.3.x compatability
+* Audit for PHP 5.3.x compatibility
* Support 8.1 standard compliant strings (E'')
* Support per-database connection limits per 8.1
* Put a 'What's blocking this query' on Processes view
diff --git a/TRANSLATORS b/TRANSLATORS
index d763c301..013ee3d4 100644
--- a/TRANSLATORS
+++ b/TRANSLATORS
@@ -22,10 +22,10 @@ To Create a new translation:
3. Update the comment at the top of the file. Put yourself as the language
maintainer. Edit the 'applang' variable and put your language's name in it,
in your language.
- Edit the 'applocale' and put your language code according to the standart:
+ Edit the 'applocale' and put your language code according to the standard:
http://www.ietf.org/rfc/rfc1766.txt
- Basicaly, you just need to put your language code [1] and optionnaly country
+ Basically, you just need to put your language code [1] and optionally country
code [2] separated by a '-'. As instance for french canadian, it is: fr-CA
[1]: http://www.w3.org/WAI/ER/IG/ert/iso639.htm
[2]: http://www.iso.org/iso/country_codes/iso_3166_code_lists/country_names_and_code_elements.htm
diff --git a/all_db.php b/all_db.php
index 181263ec..3c6ca115 100644
--- a/all_db.php
+++ b/all_db.php
@@ -185,7 +185,7 @@
while (!$templatedbs->EOF) {
$dbname = htmlspecialchars($templatedbs->fields['datname']);
if ($dbname != 'template1') {
- // filter out for $conf[show_system] users so we dont get duplicates
+ // filter out for $conf[show_system] users so we don't get duplicates
echo "\t\t\t\t<option value=\"{$dbname}\"",
($dbname == $_POST['formTemplate']) ? ' selected="selected"' : '', ">{$dbname}</option>\n";
}
diff --git a/classes/Misc.php b/classes/Misc.php
index 9939502e..e2553e55 100644
--- a/classes/Misc.php
+++ b/classes/Misc.php
@@ -626,7 +626,7 @@
* ...
* ),
* 'content' => The link text
- * 'fields' => (optionnal) the data from which content and attr's values are obtained
+ * 'fields' => (optional) the data from which content and attr's values are obtained
* );
* the special attribute 'href' might be a string or an array. If href is an array it
* will be generated by getActionUrl. See getActionUrl comment for array format.
@@ -1336,7 +1336,7 @@
echo "<div class=\"topbar\"><table style=\"width: 100%\"><tr><td>";
if ($server_info && isset($server_info['platform']) && isset($server_info['username'])) {
- /* top left informations when connected */
+ /* top left information when connected */
echo sprintf($lang['strtopbar'],
'<span class="platform">'.htmlspecialchars($server_info['platform']).'</span>',
'<span class="host">'.htmlspecialchars((empty($server_info['host'])) ? 'localhost':$server_info['host']).'</span>',
@@ -1345,7 +1345,7 @@
echo "</td>";
- /* top right informations when connected */
+ /* top right information when connected */
$toplinks = array (
'sql' => array (
@@ -1668,7 +1668,7 @@
* @param $navlinks - An array with the the attributes and values that will be shown. See printLinksList for array format.
* @param $place - Place where the $navlinks are displayed. Like 'display-browse', where 'display' is the file (display.php)
* @param $env - Associative array of defined variables in the scope of the caller.
- * Allows to give some environnement details to plugins.
+ * Allows to give some environment details to plugins.
* and 'browse' is the place inside that code (doBrowse).
*/
function printNavLinks($navlinks, $place, $env = array()) {
@@ -1788,7 +1788,7 @@
}
/**
- * Converts a PHP.INI size variable to bytes. Taken from publically available
+ * Converts a PHP.INI size variable to bytes. Taken from publicly available
* function by Chris DeRose, here: http://www.php.net/manual/en/configuration.directives.php#ini.file-uploads
* @param $strIniSize The PHP.INI variable
* @return size in bytes, false on failure
@@ -2551,7 +2551,7 @@
/**
* returns an array representing FKs definition for a table, sorted by fields
* or by constraint.
- * @param $table The table to retrieve FK contraints from
+ * @param $table The table to retrieve FK constraints from
* @returns the array of FK definition:
* array(
* 'byconstr' => array(
diff --git a/classes/database/Postgres.php b/classes/database/Postgres.php
index 17eef2bd..0984cc66 100644
--- a/classes/database/Postgres.php
+++ b/classes/database/Postgres.php
@@ -831,7 +831,7 @@ class Postgres extends ADODB_base {
return $this->selectSet($sql);
}
- // Schema functons
+ // Schema functions
/**
* Return all schemas in the current database.
@@ -1732,7 +1732,7 @@ class Postgres extends ADODB_base {
/**
* Creates a new table in the database copying attribs and other properties from another table
* @param $name The name of the table
- * @param $like an array giving the schema ans the name of the table from which attribs are copying from:
+ * @param $like an array giving the schema and the name of the table from which attribs are copying from:
* array(
* 'table' => table name,
* 'schema' => the schema name,
@@ -2366,7 +2366,7 @@ class Postgres extends ADODB_base {
/**
* Returns all available autovacuum per table information.
- * @param $table if given, return autovacuum info for the given table or return all informations for all table
+ * @param $table if given, return autovacuum info for the given table or return all information for all table
*
* @return A recordset
*/
@@ -2402,7 +2402,7 @@ class Postgres extends ADODB_base {
/* tmp var to parse the results */
$_autovacs = $this->selectSet($sql);
- /* result aray to return as RS */
+ /* result array to return as RS */
$autovacs = array();
while (!$_autovacs->EOF) {
$_ = array(
@@ -2928,7 +2928,7 @@ class Postgres extends ADODB_base {
* @param $restartvalue The sequence current value
* @param $cachevalue The sequence cache value
* @param $cycledvalue Sequence can cycle ?
- * @param $startvalue The sequence start value when issueing a restart
+ * @param $startvalue The sequence start value when issuing a restart
* @return 0 success
*/
function alterSequenceProps($seqrs, $increment, $minvalue, $maxvalue,
@@ -2967,7 +2967,7 @@ class Postgres extends ADODB_base {
* @param $restartvalue The starting value
* @param $cachevalue The cache value
* @param $cycledvalue True if cycled, false otherwise
- * @param $startvalue The sequence start value when issueing a restart
+ * @param $startvalue The sequence start value when issuing a restart
* @return 0 success
* @return -3 rename error
* @return -4 comment error
@@ -3033,7 +3033,7 @@ class Postgres extends ADODB_base {
* @param $restartvalue The starting value
* @param $cachevalue The cache value
* @param $cycledvalue True if cycled, false otherwise
- * @param $startvalue The sequence start value when issueing a restart
+ * @param $startvalue The sequence start value when issuing a restart
* @return 0 success
* @return -1 transaction error
* @return -2 get existing sequence error
@@ -3746,7 +3746,7 @@ class Postgres extends ADODB_base {
* @param $del_action The action for deletes (eg. RESTRICT)
* @param $match The match type (eg. MATCH FULL)
* @param $deferrable The deferrability (eg. NOT DEFERRABLE)
- * @param $intially The initial deferrability (eg. INITIALLY IMMEDIATE)
+ * @param $initially The initial deferrability (eg. INITIALLY IMMEDIATE)
* @param $name (optional) The name to give the key, otherwise default name is assigned
* @return 0 success
* @return -1 no fields given
diff --git a/classes/database/Postgres80.php b/classes/database/Postgres80.php
index db6cf098..a824dddd 100644
--- a/classes/database/Postgres80.php
+++ b/classes/database/Postgres80.php
@@ -240,7 +240,7 @@ class Postgres80 extends Postgres81 {
* @param $restartvalue The starting value
* @param $cachevalue The cache value
* @param $cycledvalue True if cycled, false otherwise
- * @param $startvalue The sequence start value when issueing a restart
+ * @param $startvalue The sequence start value when issuing a restart
* @return 0 success
* @return -3 rename error
* @return -4 comment error
diff --git a/classes/database/Postgres83.php b/classes/database/Postgres83.php
index fc14e76e..4b903dcd 100644
--- a/classes/database/Postgres83.php
+++ b/classes/database/Postgres83.php
@@ -56,7 +56,7 @@ class Postgres83 extends Postgres84 {
return $this->help_page;
}
- // Databse functions
+ // Database functions
/**
* Return all database available on the server
@@ -278,7 +278,7 @@ class Postgres83 extends Postgres84 {
* @param $restartvalue The sequence current value
* @param $cachevalue The sequence cache value
* @param $cycledvalue Sequence can cycle ?
- * @param $startvalue The sequence start value when issueing a restart (ignored)
+ * @param $startvalue The sequence start value when issuing a restart (ignored)
* @return 0 success
*/
function alterSequenceProps($seqrs, $increment, $minvalue, $maxvalue,
diff --git a/conf/config.inc.php-dist b/conf/config.inc.php-dist
index ba927d40..917ab958 100644
--- a/conf/config.inc.php-dist
+++ b/conf/config.inc.php-dist
@@ -53,7 +53,7 @@
*/
//$conf['srv_groups'][0]['desc'] = 'group one';
- /* Add here servers indexes belonging to the group '0' seperated by comma */
+ /* Add here servers indexes belonging to the group '0' separated by comma */
//$conf['srv_groups'][0]['servers'] = '0,1,2';
/* A server can belong to multi groups. Here server 1 is referenced in both
diff --git a/dbexport.php b/dbexport.php
index d7320817..5b35bc2d 100644
--- a/dbexport.php
+++ b/dbexport.php
@@ -92,7 +92,7 @@
$f_object = $_REQUEST[$_REQUEST['subject']];
$data->fieldClean($f_object);
- // Starting in 8.2, -n and -t are orthagonal, so we now schema qualify
+ // Starting in 8.2, -n and -t are orthogonal, so we now schema qualify
// the table name in the -t argument and quote both identifiers
if ( ((float) $version[1]) >= 8.2 ) {
$cmd .= " -t " . $misc->escapeShellArg("\"{$f_schema}\".\"{$f_object}\"");
diff --git a/display.php b/display.php
index 52c8240d..6aac3f38 100644
--- a/display.php
+++ b/display.php
@@ -402,8 +402,8 @@
if (is_object($rs) && $rs->recordCount() > 0) {
/* we are browsing a referenced table here
* we should show OID if show_oids is true
- * so we give true to withOid in functions bellow
- * as 3rd paramter */
+ * so we give true to withOid in functions below
+ * as 3rd parameter */
echo "<table><tr>";
printTableHeaderCells($rs, false, true);
diff --git a/fulltext.php b/fulltext.php
index da8b92b0..4f54bca6 100644
--- a/fulltext.php
+++ b/fulltext.php
@@ -279,7 +279,7 @@
}
/**
- * Display a form to permit editing FTS configuration properies.
+ * Display a form to permit editing FTS configuration properties.
*/
function doAlterConfig($msg = '') {
global $data, $misc, $lang;
@@ -689,7 +689,7 @@
}
/**
- * Display a form to permit editing FTS dictionary properies.
+ * Display a form to permit editing FTS dictionary properties.
*/
function doAlterDict($msg = '') {
global $data, $misc, $lang;
diff --git a/functions.php b/functions.php
index 365c0d95..2b74042c 100644
--- a/functions.php
+++ b/functions.php
@@ -528,7 +528,7 @@
if($types->fields['typname'] == $_POST['formReturns']) {
$szSelected = " selected=\"selected\"";
}
- /* this variable is include in the JS code bellow, so we need to ENT_QUOTES */
+ /* this variable is include in the JS code below, so we need to ENT_QUOTES */
$szTypes .= "<option value=\"". htmlspecialchars($types->fields['typname'], ENT_QUOTES) ."\"{$szSelected}>";
$szTypes .= htmlspecialchars($types->fields['typname'], ENT_QUOTES) ."</option>";
$types->moveNext();
diff --git a/js/ac_insert_row.js b/js/ac_insert_row.js
index 1101a99d..deee0f95 100644
--- a/js/ac_insert_row.js
+++ b/js/ac_insert_row.js
@@ -185,7 +185,7 @@ with(jQuery('tr.acline')) {
jQuery('#fkprev').live('click', function () {
jQuery.ppa.o -= 11;
/* get the field that is the previous html elt from the #fklist
- * and trigger its focus to refresh the list AND actualy
+ * and trigger its focus to refresh the list AND actually
* focus back on the field */
jQuery('#fklist').prev().focus();
});
@@ -193,7 +193,7 @@ jQuery('#fkprev').live('click', function () {
jQuery('#fknext').live('click', function () {
jQuery.ppa.o += 11;
/* get the field that is the previous html elt from the #fklist
- * and trigger its focus to refresh the list AND actualy
+ * and trigger its focus to refresh the list AND actually
* focus back on the field*/
jQuery('#fklist').prev().focus();
});
diff --git a/plugins/GuiControl/plugin.php b/plugins/GuiControl/plugin.php
index 44669362..dc6f8754 100644
--- a/plugins/GuiControl/plugin.php
+++ b/plugins/GuiControl/plugin.php
@@ -21,7 +21,7 @@ class GuiControl extends Plugin {
/**
* This method returns the functions that will hook in the phpPgAdmin core.
- * To do include a function just put in the $hooks array the follwing code:
+ * To do include a function just put in the $hooks array the following code:
* 'hook' => array('function1', 'function2').
*
* Example:
@@ -47,7 +47,7 @@ class GuiControl extends Plugin {
/**
* This method returns the functions that will be used as actions.
- * To do include a function that will be used as action, just put in the $actions array the follwing code:
+ * To do include a function that will be used as action, just put in the $actions array the following code:
*
* $actions = array(
* 'show_page',
diff --git a/plugins/Report/plugin.php b/plugins/Report/plugin.php
index b37d8161..5c6c4df6 100644
--- a/plugins/Report/plugin.php
+++ b/plugins/Report/plugin.php
@@ -59,7 +59,7 @@ class Report extends Plugin {
/**
* This method returns the functions that will hook in the phpPgAdmin core.
- * To do include a function just put in the $hooks array the follwing code:
+ * To do include a function just put in the $hooks array the following code:
* 'hook' => array('function1', 'function2').
*
* Example:
@@ -82,7 +82,7 @@ class Report extends Plugin {
/**
* This method returns the functions that will be used as actions.
- * To do include a function that will be used as action, just put in the $actions array the follwing code:
+ * To do include a function that will be used as action, just put in the $actions array the following code:
*
* $actions = array(
* 'show_page',
diff --git a/schemas.php b/schemas.php
index a5ac8381..ebfff74b 100644
--- a/schemas.php
+++ b/schemas.php
@@ -180,7 +180,7 @@
}
/**
- * Display a form to permit editing schema properies.
+ * Display a form to permit editing schema properties.
* TODO: permit changing owner
*/
function doAlter($msg = '') {
diff --git a/tables.php b/tables.php
index c92225cf..a2c189e4 100644
--- a/tables.php
+++ b/tables.php
@@ -604,7 +604,7 @@
echo "<p>", sprintf($lang['strconfemptytable'], $misc->printVal($a['table'])), "</p>\n";
printf('<input type="hidden" name="table[]" value="%s" />', htmlspecialchars($a['table']));
}
- } // END mutli empty
+ } // END multi empty
else {
$misc->printTrail('table');
$misc->printTitle($lang['strempty'],'pg.table.empty');
@@ -613,7 +613,7 @@
echo "<form action=\"tables.php\" method=\"post\">\n";
echo "<input type=\"hidden\" name=\"table\" value=\"", htmlspecialchars($_REQUEST['table']), "\" />\n";
- } // END not mutli empty
+ } // END not multi empty
echo "<input type=\"hidden\" name=\"action\" value=\"empty\" />\n";
echo $misc->form;
@@ -633,14 +633,14 @@
}
}
doDefault($msg);
- } // END mutli empty
+ } // END multi empty
else {
$status = $data->emptyTable($_POST['table']);
if ($status == 0)
doDefault($lang['strtableemptied']);
else
doDefault($lang['strtableemptiedbad']);
- } // END not mutli empty
+ } // END not multi empty
} // END do Empty
}
diff --git a/tests/selenium/README b/tests/selenium/README
index 87a0dc67..a0dd36e5 100644
--- a/tests/selenium/README
+++ b/tests/selenium/README
@@ -1,7 +1,7 @@
HowTo run the tests
~~~~~~~~~~~~~~~~~~~
-1. Create & configure your ./tests/selenium/config.test.php (See sample one in ./tests/selenium/config.inc.php-dist)
+1. Create & configure your ./tests/selenium/config.test.php (See sample one in ./tests/selenium/config.test.php-dist)
2. Make sure "$conf['show_system']" is set to "true" in your "./conf/config.inc.php"
3. Open your browser and go to http://$webUrl/
Where $webUrl is the value set in your ./tests/selenium/config.inc.php
@@ -13,9 +13,9 @@ Enjoy the tests.
HowTo write new tests
~~~~~~~~~~~~~~~~~~~~~
-Normaly, the selenium's statis HTML tests files cannot behave differently in regard to the PG backend where the tests are run on. In order to address
+Normally, the selenium's statis HTML tests files cannot behave differently in regard to the PG backend where the tests are run on. In order to address
this issue we are using PHP scripts that connect to each backends using the PPA database classes and allow you to use their methods,
-and especialy the $data->has*() ones, throught the $data variable like in any other ppa script.
+and especially the $data->has*() ones, throught the $data variable like in any other ppa script.
TestSuite.php is the test suite script that build the list of tests groups (top left frame).
@@ -45,4 +45,4 @@ When executed from TestSuite.php, test-builders should:
server.
- Each selenium actions are mapped (or should be) as methods. As instance, if you want to use the clickAndWait action, you should call the
clickAndWait($locator) method. For the assertText, assertText($selector, $value), etc...
- - Use the addComment method to show comments anywhere in the tests page. Usefull to explain whatthe next tests are going to do.
+ - Use the addComment method to show comments anywhere in the tests page. Useful to explain whatthe next tests are going to do.
diff --git a/tests/selenium/src/01-roles.php b/tests/selenium/src/01-roles.php
index e15f1897..725993c7 100644
--- a/tests/selenium/src/01-roles.php
+++ b/tests/selenium/src/01-roles.php
@@ -12,7 +12,7 @@
* 4/ logout & login as admin_user
* 5/ create user role/user with altered name, pass and props
* 6/ alter user back to the normal value
- * NB: droping role tests are in the cleantests.php tests
+ * NB: dropping role tests are in the cleantests.php tests
*/
$t = new TestBuilder($test_title,
'Create test admin role, test user role and tests Roles (or user/groups) features.'
diff --git a/tests/selenium/src/04-database.php b/tests/selenium/src/04-database.php
index 0b1fe8f3..81662a0d 100644
--- a/tests/selenium/src/04-database.php
+++ b/tests/selenium/src/04-database.php
@@ -9,7 +9,7 @@
* 1/ create test database with altered name and owner
* 2/ alter its owner
* 3/ alter its name, owner and comment back to normal
- * NB: droping database is in the cleantests.php tests
+ * NB: dropping database is in the cleantests.php tests
*/
$t = new TestBuilder($test_title,
'Create and Alter database.'
diff --git a/tests/selenium/src/06-schema.php b/tests/selenium/src/06-schema.php
index de161625..346318f8 100644
--- a/tests/selenium/src/06-schema.php
+++ b/tests/selenium/src/06-schema.php
@@ -8,7 +8,7 @@
/*
* 1/ create test schema
* 2/ alter its name, owner and comment
- * NB: droping the schema is in the cleantests.php tests
+ * NB: dropping the schema is in the cleantests.php tests
*/
$t = new TestBuilder($test_title,
'Create and Alter schema.'
diff --git a/tests/selenium/src/08-domaine.php b/tests/selenium/src/08-domaine.php
index 5d9a65fe..a309dbaf 100644
--- a/tests/selenium/src/08-domaine.php
+++ b/tests/selenium/src/08-domaine.php
@@ -11,7 +11,7 @@
* 3/ drop unwanted check constraint on domain
* 4/ alter domain giving owner to super_user
* 5/ alter back the owner to admin_user
- * NB: droping domain is in the cleantests.php tests
+ * NB: dropping domain is in the cleantests.php tests
*/
$t = new TestBuilder($test_title,
'Create and Alter a domain.'
diff --git a/tests/selenium/src/10-table.php b/tests/selenium/src/10-table.php
index dc680bfc..b33d586f 100644
--- a/tests/selenium/src/10-table.php
+++ b/tests/selenium/src/10-table.php
@@ -11,7 +11,7 @@
* 3/ create table like student in test_schema
* 4/ alter each param one by one on test_toalter
* 5/ alter back test_toalter in one step
- * NB: droping a table is in the cleantests.php tests
+ * NB: dropping a table is in the cleantests.php tests
*/
$t = new TestBuilder($test_title,
'Create tables, make some alterations...'
diff --git a/tests/selenium/src/99-cleantests.php b/tests/selenium/src/99-cleantests.php
index a23b5a42..9c96409a 100644
--- a/tests/selenium/src/99-cleantests.php
+++ b/tests/selenium/src/99-cleantests.php
@@ -10,7 +10,7 @@
* 2/ logout / login as admin_user and drop user role/user
* 3/ try to drop himself -> fail
* 4/ drop domain -> fail table promo depend on it
- * 5/ drop domain with cascade, test if promo.year disapeared
+ * 5/ drop domain with cascade, test if promo.year disappeared
* 6/ drop table student with cascade using the action button
* 7/ drop table promo using the button from tblproperties
* 8/ drop test database
diff --git a/tests/simpletests/testcase/Common/ImportTest.php b/tests/simpletests/testcase/Common/ImportTest.php
index c3a6fbcc..4601405e 100644
--- a/tests/simpletests/testcase/Common/ImportTest.php
+++ b/tests/simpletests/testcase/Common/ImportTest.php
@@ -15,7 +15,7 @@ if(is_dir('../Public'))
/**
* This class is to test the import function.
- * It includes importing for XML format data and incorect text format data.
+ * It includes importing for XML format data and incorrect text format data.
*
* This part test cases cannot pass because simpletest does not support upload file.
*/
@@ -84,7 +84,7 @@ class ImportTest extends PreconditionSet
/*
* TestCaseID: CID02
- * Test to import incorect text format data into the table.
+ * Test to import incorrect text format data into the table.
*
* This test case will failed because SimpleTest1.0 doesn't support upload file.
*/
diff --git a/tests/simpletests/testcase/Databases/DatabaseTest.php b/tests/simpletests/testcase/Databases/DatabaseTest.php
index 05150a47..ec4d36b1 100644
--- a/tests/simpletests/testcase/Databases/DatabaseTest.php
+++ b/tests/simpletests/testcase/Databases/DatabaseTest.php
@@ -80,7 +80,7 @@ class DatabaseTest extends PreconditionSet
// Verify weather the database has been created.
// Because the phpPgAdmin cannot drop the currently open database.
// this test case may be failed
- // when runing the testcase second time without removing the databases.
+ // when running the testcase second time without removing the databases.
$this->assertWantedText($lang['strdatabasecreated']);
// Release the resource.
@@ -128,7 +128,7 @@ class DatabaseTest extends PreconditionSet
// Verify weather the database has been created.
// Because the phpPgAdmin cannot drop the currently open database,
// this test case may be failed
- // when runing the testcase second time without removing the databases.
+ // when running the testcase second time without removing the databases.
$this->assertWantedText($lang['strdatabasecreated']);
// Release the resource.
@@ -144,7 +144,7 @@ class DatabaseTest extends PreconditionSet
* TestCaseId: DDD001
* This test is used to drop a defined database.
*
- * This test is faild, because the PostgreSQL cannot support deleteing
+ * This test is failed, because the PostgreSQL cannot support deleting
* an open database currently.
*/
function testDropDatabase()
@@ -164,7 +164,7 @@ class DatabaseTest extends PreconditionSet
// Click the submit button "Drop" next page.
$this->assertTrue($this->clickSubmit($lang['strdrop']));
- // Verify weather the database has been droped.
+ // Verify weather the database has been dropped.
// There is an issue about PostgreSQL. So let me difine the displayed text.
$this->assertWantedText($lang['strdatabasedropped']);
diff --git a/tests/simpletests/testcase/Databases/HelpTest.php b/tests/simpletests/testcase/Databases/HelpTest.php
index 7392b3b8..94df70b2 100644
--- a/tests/simpletests/testcase/Databases/HelpTest.php
+++ b/tests/simpletests/testcase/Databases/HelpTest.php
@@ -72,7 +72,7 @@ class HelpTest extends PreconditionSet
$this->assertTrue($this->get("$webUrl/help.php?help=pg.column.add"));
// Comment this for avoiding error by Xdebug.
- // Becase we cannot assert something about the content of the page via
+ // Because we cannot assert something about the content of the page via
// hyperlink outside
// $this->assertWantedPattern('/"Schemas"/');
diff --git a/tests/simpletests/testcase/Databases/VariablesTest.php b/tests/simpletests/testcase/Databases/VariablesTest.php
index cb4ea7de..bc52637c 100644
--- a/tests/simpletests/testcase/Databases/VariablesTest.php
+++ b/tests/simpletests/testcase/Databases/VariablesTest.php
@@ -48,7 +48,7 @@ class VariablesTest extends PreconditionSet
/**
* TestCaseId: DVA001
- * This test is used to display the list of Prcesses.
+ * This test is used to display the list of Processes.
*/
function testVariablesList()
{
diff --git a/tests/simpletests/testcase/Public/SetPrecondition.php b/tests/simpletests/testcase/Public/SetPrecondition.php
index a7477a9b..cc95db0b 100644
--- a/tests/simpletests/testcase/Public/SetPrecondition.php
+++ b/tests/simpletests/testcase/Public/SetPrecondition.php
@@ -79,7 +79,7 @@ class PreconditionSet extends WebTestCase
/**
* Drop a exist database by the specify database name.
*
- * @param string $databaseName The specify database name which be droped.
+ * @param string $databaseName The specify database name which be dropped.
*
* @access public
*/
@@ -185,7 +185,7 @@ class PreconditionSet extends WebTestCase
global $SUPER_USER_NAME;
global $SUPER_USER_PASSWORD;
- // Login and trun to the page which list all the
+ // Login and turn to the page which list all the
// table in the database.
$this->login($SUPER_USER_NAME, $SUPER_USER_PASSWORD,
"$webUrl/login.php");
diff --git a/tests/simpletests/testcase/Schemas/DomainTest.php b/tests/simpletests/testcase/Schemas/DomainTest.php
index 4fb1c2e5..a7fba9c8 100644
--- a/tests/simpletests/testcase/Schemas/DomainTest.php
+++ b/tests/simpletests/testcase/Schemas/DomainTest.php
@@ -100,7 +100,7 @@ class DomainTest extends PreconditionSet
// Click the "Alter" button to alter the domain.
$this->assertTrue($this->clickSubmit($lang['stralter']));
- // Verify whether the domian is altered successfully.
+ // Verify whether the domain is altered successfully.
$this->assertTrue($this->assertWantedText($lang['strdomainaltered']));
return TRUE;
@@ -156,7 +156,7 @@ class DomainTest extends PreconditionSet
'schema' => 'public&'))
);
- // Display the specfied damain.
+ // Display the specified damain.
$this->assertTrue($this->clickLink('spikedomain'));
// Drop the constraint.
@@ -208,7 +208,7 @@ class DomainTest extends PreconditionSet
// Click the "Drop" button to drop the domain.
$this->assertTrue($this->clickSubmit($lang['strdrop']));
- // Verify whether the domain is droped successfully.
+ // Verify whether the domain is dropped successfully.
$this->assertTrue($this->assertWantedText($lang['strdomaindropped']));
return TRUE;
diff --git a/tests/simpletests/testcase/Schemas/FunctionTest.php b/tests/simpletests/testcase/Schemas/FunctionTest.php
index 2cdc970c..3fda701e 100644
--- a/tests/simpletests/testcase/Schemas/FunctionTest.php
+++ b/tests/simpletests/testcase/Schemas/FunctionTest.php
@@ -151,7 +151,7 @@ class FunctionTest extends PreconditionSet
$this->assertTrue($this->setField('formProperties[1]', 'RETURNS NULL ON NULL INPUT'));
$this->assertTrue($this->setField('formProperties[2]', 'SECURITY DEFINER'));
- // Click the "Create" button to create the C fucntion.
+ // Click the "Create" button to create the C function.
$this->assertTrue($this->clickSubmit($lang['strcreate']));
// Verify whether the function is created successfully.
$this->assertTrue($this->assertWantedText($lang['strfunctioncreated']));
@@ -177,7 +177,7 @@ class FunctionTest extends PreconditionSet
'subject' => 'schema'))
);
- // Alter the definiton of "cfunction".
+ // Alter the definition of "cfunction".
$this->assertTrue($this->clickLink('cfunction (text)'));
$this->assertTrue($this->clickLink($lang['stralter']));
@@ -186,7 +186,7 @@ class FunctionTest extends PreconditionSet
$this->assertTrue($this->setField('formProperties[1]', 'CALLED ON NULL INPUT'));
$this->assertTrue($this->setField('formProperties[2]', 'SECURITY INVOKER'));
- // Click the "Create" button to alter the fucntion.
+ // Click the "Create" button to alter the function.
$this->assertTrue($this->clickSubmit($lang['stralter']));
// Verify whether the function is updated successfully.
$this->assertTrue($this->assertWantedText($lang['strfunctionupdated']));
@@ -212,7 +212,7 @@ class FunctionTest extends PreconditionSet
'subject' => 'schema'))
);
- // Drop the fucntion "sqlplfunction".
+ // Drop the function "sqlplfunction".
$this->assertTrue($this->clickLink('sqlplfunction (double precision[], double precision)'));
$this->assertTrue($this->clickLink($lang['strdrop']));
$this->assertTrue($this->setField('cascade', TRUE));
@@ -222,7 +222,7 @@ class FunctionTest extends PreconditionSet
// Verify whether the function is dropped successfully.
$this->assertTrue($this->assertWantedText($lang['strfunctiondropped']));
- // Drop the fucntion "cfunction".
+ // Drop the function "cfunction".
$this->assertTrue($this->clickLink('cfunction (text)'));
$this->assertTrue($this->clickLink($lang['strdrop']));
$this->assertTrue($this->setField('cascade', TRUE));
diff --git a/tests/simpletests/testcase/Schemas/TableTest.php b/tests/simpletests/testcase/Schemas/TableTest.php
index 7671779a..2b445e4d 100644
--- a/tests/simpletests/testcase/Schemas/TableTest.php
+++ b/tests/simpletests/testcase/Schemas/TableTest.php
@@ -311,7 +311,7 @@ class TableTest extends PreconditionSet
/**
* TestCaseID: HER01
* Edit a row.
- * XXX Fail cause we have no index on viewtest, created by $this->createable
+ * XXX Fail cause we have no index on viewtest, created by $this->createTable
* see Public/SetPrecondition.php
*/
function testEditRow()
diff --git a/tests/simpletests/testcase/Schemas/ViewTest.php b/tests/simpletests/testcase/Schemas/ViewTest.php
index db1bf017..dffc2afe 100644
--- a/tests/simpletests/testcase/Schemas/ViewTest.php
+++ b/tests/simpletests/testcase/Schemas/ViewTest.php
@@ -284,7 +284,7 @@ class ViewTest extends PreconditionSet
/**
* TestCaseID: HAD01
- * Alter the definiton of an existing view.
+ * Alter the definition of an existing view.
*/
function testAlterDefinition()
{
diff --git a/tests/simpletests/testcase/Server/GroupsTest.php b/tests/simpletests/testcase/Server/GroupsTest.php
index e03a897c..8b56d166 100644
--- a/tests/simpletests/testcase/Server/GroupsTest.php
+++ b/tests/simpletests/testcase/Server/GroupsTest.php
@@ -70,7 +70,7 @@ class GroupsTest extends PreconditionSet
/*
* TestCaseID: SAG01
- * Test to add users to the gruop.
+ * Test to add users to the group.
*/
function testAddUser()
{
@@ -94,7 +94,7 @@ class GroupsTest extends PreconditionSet
$this->assertTrue($this->setField('user', $POWER_USER_NAME));
$this->assertTrue($this->clickSubmit($lang['straddmember']));
- // Verify the group's memebers.
+ // Verify the group's members.
$this->assertWantedText($SUPER_USER_NAME);
$this->assertWantedText($POWER_USER_NAME);
$this->assertWantedText($NORMAL_USER_NAME);
@@ -115,7 +115,7 @@ class GroupsTest extends PreconditionSet
global $NORMAL_USER_NAME;
global $lang, $SERVER;
- // Turn to the gruop properties page.
+ // Turn to the group properties page.
$this->assertTrue($this->get("$webUrl/groups.php", array('server' => $SERVER)));
$this->assertTrue($this->get("$webUrl/groups.php",
array('action' => 'properties',
diff --git a/tests/simpletests/testcase/Tables/ColumnTest.php b/tests/simpletests/testcase/Tables/ColumnTest.php
index b71e5370..af492de8 100644
--- a/tests/simpletests/testcase/Tables/ColumnTest.php
+++ b/tests/simpletests/testcase/Tables/ColumnTest.php
@@ -274,7 +274,7 @@ class ColumnTest extends PreconditionSet{
/**
* TestCaseID: TDC02
- * Drop a column wich "CASCADE" checked
+ * Drop a column which "CASCADE" checked
*/
function testDropColumnWithCascade()
{
diff --git a/tests/simpletests/testcase/testphpPgAdminMain.php b/tests/simpletests/testcase/testphpPgAdminMain.php
index 49988799..e57cfac5 100644
--- a/tests/simpletests/testcase/testphpPgAdminMain.php
+++ b/tests/simpletests/testcase/testphpPgAdminMain.php
@@ -7,7 +7,7 @@
*/
// Import necessary library files to setup the testcase.
-// And for web testcase, the library web_tester.php shoule be included.
+// And for web testcase, the library web_tester.php should be included.
require_once("$PHP_SIMPLETEST_HOME/web_tester.php");
require_once("$PHP_SIMPLETEST_HOME/reporter.php");
diff --git a/themes/global.css b/themes/global.css
index 6e62f0f5..3ed18bce 100644
--- a/themes/global.css
+++ b/themes/global.css
@@ -1,5 +1,5 @@
/**
- * This is hte mandatory CSS file to include on top of every CSS theme file
+ * This is the mandatory CSS file to include on top of every CSS theme file
**/
img { border: none; }
diff --git a/triggers.php b/triggers.php
index 339e4ae4..94e86797 100644
--- a/triggers.php
+++ b/triggers.php
@@ -193,7 +193,7 @@
$sel2 = new XHTML_Select('formEvent');
$sel2->set_data($data->triggerEvents);
- /* Populate occurences */
+ /* Populate occurrences */
$sel3 = new XHTML_Select('formFrequency');
$sel3->set_data($data->triggerFrequency);
diff --git a/views.php b/views.php
index b60b0947..361b9364 100644
--- a/views.php
+++ b/views.php
@@ -514,7 +514,7 @@
}
//if linkfields has no length then either _POST['formLink'] was not set, or there were no join conditions
- //just select from all seleted tables - a cartesian join do a
+ //just select from all selected tables - a cartesian join do a
if (!strlen($linkFields) ) {
foreach ($_POST['formTables'] as $curTable) {
$arrTmp = unserialize($curTable);
diff --git a/xloadtree/xloadtree2.js b/xloadtree/xloadtree2.js
index b36eed7e..3dffadf2 100644
--- a/xloadtree/xloadtree2.js
+++ b/xloadtree/xloadtree2.js
@@ -49,7 +49,7 @@
| Created 2003-??-?? | All changes are in the log above. | Updated 2004-06-06 |
|-----------------------------------------------------------------------------|
| Note local changes have been made to allow Icons to have different links |
-| than thier text label counterparts. Thanks to JGuillaume de Rorthais |
+| than their text label counterparts. Thanks to JGuillaume de Rorthais |
\----------------------------------------------------------------------------*/
webFXTreeConfig.loadingText = "Loading...";