[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA2-65-gcc9f99d - Git

12 Jan 2011

The branch, master has been updated
       via  cc9f99d303d2103775dcd44094351fbc9b33242e (commit)
      from  89552c74c4fe7585e595d30c6b3553c21b89ae61 (commit)
- Log -----------------------------------------------------------------
commit cc9f99d303d2103775dcd44094351fbc9b33242e
Author: Marc Delisle marc@infomarc.info
Date:   Wed Jan 12 08:40:54 2011 -0500
Typo "choosen" -> "chosen"
-----------------------------------------------------------------------
Summary of changes:
 libraries/schema/Export_Relation_Schema.class.php |    2 +-
 libraries/schema/User_Schema.class.php            |   36 ++++++++++----------
 libraries/select_lang.lib.php                     |    2 +-
 schema_edit.php                                   |    4 +-
 4 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/libraries/schema/Export_Relation_Schema.class.php b/libraries/schema/Export_Relation_Schema.class.php
index 4179dd0..2d23c5b 100644
--- a/libraries/schema/Export_Relation_Schema.class.php
+++ b/libraries/schema/Export_Relation_Schema.class.php
@@ -182,7 +182,7 @@ class PMA_Export_Relation_Schema
     /**
      * Displays an error message
      *
-     * @param integer pageNumber ID of the page choosen
+     * @param integer pageNumber ID of the chosen page
      * @param string type Schema Type
      * @param string error_message the error mesage
      * @global array    the PMA configuration array
diff --git a/libraries/schema/User_Schema.class.php b/libraries/schema/User_Schema.class.php
index e69daa0..bcb92da 100644
--- a/libraries/schema/User_Schema.class.php
+++ b/libraries/schema/User_Schema.class.php
@@ -18,7 +18,7 @@
 class PMA_User_Schema
 {
-    public $choosenPage;
+    public $chosenPage;
     public $autoLayoutForeign;
     public $autoLayoutInternal;
     public $pageNumber;
@@ -47,11 +47,11 @@ class PMA_User_Schema
         if (isset($this->action)) {
             switch ($this->action) {
             case 'selectpage':
-                $this->choosenPage = $_REQUEST['chpage'];
+                $this->chosenPage = $_REQUEST['chpage'];
                 if ($action_choose=="1") {
-                    $this->deleteCoordinates($db, $cfgRelation, $this->choosenPage, $query_default_option);
-                    $this->deletePages($db, $cfgRelation, $this->choosenPage, $query_default_option);
-                    $this->choosenPage = 0;
+                    $this->deleteCoordinates($db, $cfgRelation, $this->chosenPage, $query_default_option);
+                    $this->deletePages($db, $cfgRelation, $this->chosenPage, $query_default_option);
+                    $this->chosenPage = 0;
                 }
                 break;
             case 'createpage':
@@ -61,12 +61,12 @@ class PMA_User_Schema
                 $this->processRelations($db, $this->pageNumber,$cfgRelation,$query_default_option);
                 break;
             case 'edcoord':
-                $this->choosenPage = $_POST['chpage'];
+                $this->chosenPage = $_POST['chpage'];
                 $this->c_table_rows = $_POST['c_table_rows'];
                 $this->_editCoordinates($db, $cfgRelation,$query_default_option);
                 break;
             case 'deleteCrap':
-                $this->_deleteTableRows($delrow,$cfgRelation,$db,$this->choosenPage);
+                $this->_deleteTableRows($delrow,$cfgRelation,$db,$this->chosenPage);
                 break;
             case 'process_export':
                 $this->_processExportSchema();
@@ -155,7 +155,7 @@ class PMA_User_Schema
             while ($curr_page = PMA_DBI_fetch_assoc($page_rs)) {
                    echo "\n" . '        '
                         . '<option value="' . $curr_page['page_nr'] . '"';
-                    if (isset($this->choosenPage) && $this->choosenPage == $curr_page['page_nr']) {
+                    if (isset($this->chosenPage) && $this->chosenPage == $curr_page['page_nr']) {
                         echo ' selected="selected"';
                     }
                     echo '>' . $curr_page['page_nr'] . ': ' . htmlspecialchars($curr_page['page_descr']) . '</option>';
@@ -205,14 +205,14 @@ class PMA_User_Schema
          * show the tables involved
          */
-        if (isset($this->choosenPage) && $this->choosenPage > 0) {
+        if (isset($this->chosenPage) && $this->chosenPage > 0) {
             echo "\n";
             ?>
             <h2><?php echo __('Select Tables') ;?></h2>
             <?php
             $page_query = 'SELECT * FROM ' . PMA_backquote($GLOBALS['cfgRelation']['db']) . '.' . PMA_backquote($cfgRelation['table_coords'])
                         . ' WHERE db_name = '' . PMA_sqlAddslashes($db) . '''
-                        . ' AND pdf_page_number = '' . PMA_sqlAddslashes($this->choosenPage) . ''';
+                        . ' AND pdf_page_number = '' . PMA_sqlAddslashes($this->chosenPage) . ''';
             $page_rs    = PMA_query_as_controluser($page_query, FALSE, $query_default_option);
             $array_sh_page = array();
             while ($temp_sh_page = @PMA_DBI_fetch_assoc($page_rs)) {
@@ -230,7 +230,7 @@ class PMA_User_Schema
<form method="post" action="schema_edit.php" name="edcoord">
             <?php echo PMA_generate_common_hidden_inputs($db, $table); ?>
-            <input type="hidden" name="chpage" value="<?php echo htmlspecialchars($this->choosenPage); ?>" />
+            <input type="hidden" name="chpage" value="<?php echo htmlspecialchars($this->chosenPage); ?>" />
             <input type="hidden" name="do" value="edcoord" />
             <table border="0">
             <tr>
@@ -318,7 +318,7 @@ class PMA_User_Schema
                 echo "\n" . '</form>' . "\n\n";
         } // end if
-        $this->_deleteTables($db, $this->choosenPage, isset($tabExist));
+        $this->_deleteTables($db, $this->chosenPage, isset($tabExist));
     }
/**
@@ -369,7 +369,7 @@ class PMA_User_Schema
                     ?>
             </select><br />
             <?php } else { ?>
-            <input type="hidden" name="pdf_page_number" value="<?php echo htmlspecialchars($this->choosenPage); ?>" />
+            <input type="hidden" name="pdf_page_number" value="<?php echo htmlspecialchars($this->chosenPage); ?>" />
             <?php } ?>
             <input type="hidden" name="do" value="process_export" />
             <input type="hidden" name="chpage" value="<?php echo $chpage; ?>" />
@@ -708,7 +708,7 @@ class PMA_User_Schema
             $this->addRelationCoordinates($all_tables,$pageNumber,$db, $cfgRelation,$query_default_option);
         }
-        $this->choosenPage = $pageNumber;
+        $this->chosenPage = $pageNumber;
     }
/**
@@ -793,7 +793,7 @@ class PMA_User_Schema
                 $test_query = 'SELECT * FROM ' . PMA_backquote($GLOBALS['cfgRelation']['db']) . '.' . PMA_backquote($cfgRelation['table_coords'])
                             .   ' WHERE db_name = '' .  PMA_sqlAddslashes($db) . '''
                             .   ' AND   table_name = '' . PMA_sqlAddslashes($arrvalue['name']) . '''
-                            .   ' AND   pdf_page_number = '' . PMA_sqlAddslashes($this->choosenPage) . ''';
+                            .   ' AND   pdf_page_number = '' . PMA_sqlAddslashes($this->chosenPage) . ''';
                 $test_rs    = PMA_query_as_controluser($test_query, FALSE, $query_default_option);
                 //echo $test_query;
                 if ($test_rs && PMA_DBI_num_rows($test_rs) > 0) {
@@ -801,18 +801,18 @@ class PMA_User_Schema
                         $ch_query = 'DELETE FROM ' . PMA_backquote($GLOBALS['cfgRelation']['db']) . '.' . PMA_backquote($cfgRelation['table_coords'])
                                   .   ' WHERE db_name = '' . PMA_sqlAddslashes($db) . '''
                                   .   ' AND   table_name = '' . PMA_sqlAddslashes($arrvalue['name']) . '''
-                                  .   ' AND   pdf_page_number = '' . PMA_sqlAddslashes($this->choosenPage) . ''';
+                                  .   ' AND   pdf_page_number = '' . PMA_sqlAddslashes($this->chosenPage) . ''';
                     } else {
                         $ch_query = 'UPDATE ' . PMA_backquote($GLOBALS['cfgRelation']['db']) . '.' . PMA_backquote($cfgRelation['table_coords']) . ' '
                                   . 'SET x = ' . $arrvalue['x'] . ', y= ' . $arrvalue['y']
                                   .   ' WHERE db_name = '' . PMA_sqlAddslashes($db) . '''
                                   .   ' AND   table_name = '' . PMA_sqlAddslashes($arrvalue['name']) . '''
-                                  .   ' AND   pdf_page_number = '' . PMA_sqlAddslashes($this->choosenPage) . ''';
+                                  .   ' AND   pdf_page_number = '' . PMA_sqlAddslashes($this->chosenPage) . ''';
                     }
                 } else {
                     $ch_query     = 'INSERT INTO ' . PMA_backquote($GLOBALS['cfgRelation']['db']) . '.' . PMA_backquote($cfgRelation['table_coords']) . ' '
                                   . '(db_name, table_name, pdf_page_number, x, y) '
-                                  . 'VALUES ('' . PMA_sqlAddslashes($db) . '', '' . PMA_sqlAddslashes($arrvalue['name']) . '', '' . PMA_sqlAddslashes($this->choosenPage) . '',' . $arrvalue['x'] . ',' . $arrvalue['y'] . ')';
+                                  . 'VALUES ('' . PMA_sqlAddslashes($db) . '', '' . PMA_sqlAddslashes($arrvalue['name']) . '', '' . PMA_sqlAddslashes($this->chosenPage) . '',' . $arrvalue['x'] . ',' . $arrvalue['y'] . ')';
                 }
                 //echo $ch_query;
                 PMA_query_as_controluser($ch_query, FALSE, $query_default_option);
diff --git a/libraries/select_lang.lib.php b/libraries/select_lang.lib.php
index 3ed35e4..407da6f 100644
--- a/libraries/select_lang.lib.php
+++ b/libraries/select_lang.lib.php
@@ -452,7 +452,7 @@ if (! PMA_langCheck()) {
             . __FILE__ . '#' . $line . ', check hard coded fall back language.',
             E_USER_WARNING);
         // stop execution
-        // and tell the user that his choosen language is invalid
+        // and tell the user that his chosen language is invalid
         PMA_fatalError('Could not load any language, please check your language settings and folder.');
     }
 }
diff --git a/schema_edit.php b/schema_edit.php
index 8494959..bf97b24 100644
--- a/schema_edit.php
+++ b/schema_edit.php
@@ -111,8 +111,8 @@ if ($cfgRelation['pdfwork']) {
if (isset($_REQUEST['do'])
     && ($_REQUEST['do'] == 'edcoord'
-       || ($_REQUEST['do']== 'selectpage' && isset($user_schema->choosenPage) && $user_schema->choosenPage != 0)
-       || ($_REQUEST['do'] == 'createpage' && isset($user_schema->choosenPage) && $user_schema->choosenPage != 0))) {
+       || ($_REQUEST['do']== 'selectpage' && isset($user_schema->chosenPage) && $user_schema->chosenPage != 0)
+       || ($_REQUEST['do'] == 'createpage' && isset($user_schema->chosenPage) && $user_schema->chosenPage != 0))) {
/** 
        * show Export schema generation options
hooks/post-receive
-- 
phpMyAdmin


    