Merge branch 'master' of github.com:phpmyadmin/phpmyadmin

db_tracking.php

@@ -68,7 +68,7 @@ $all_tables_result = PMA_queryAsControlUser($all_tables_query);
 
 // If a HEAD version exists
 if ($GLOBALS['dbi']->numRows($all_tables_result) > 0) {
-?>
+    ?>
     <div id="tracked_tables">
     <h3><?php echo __('Tracked tables');?></h3>
 
@@ -151,7 +151,7 @@ if ($GLOBALS['dbi']->numRows($all_tables_result) > 0) {
     </tbody>
     </table>
     </div>
-<?php
+    <?php
 }
 
 $sep = $GLOBALS['cfg']['NavigationTreeTableSeparator'];
@@ -189,7 +189,7 @@ foreach ($table_list as $key => $value) {
 
 // If untracked tables exist
 if (isset($my_tables)) {
-?>
+    ?>
     <h3><?php echo __('Untracked tables');?></h3>
 
     <table id="noversions" class="data">
@@ -200,7 +200,7 @@ if (isset($my_tables)) {
     </tr>
     </thead>
     <tbody>
-<?php
+    <?php
     // Print out list of untracked tables
 
     $style = 'odd';
@@ -211,12 +211,12 @@ if (isset($my_tables)) {
                 . '&amp;table=' . htmlspecialchars($tablename) .'">';
             $my_link .= PMA_Util::getIcon('eye.png', __('Track table'));
             $my_link .= '</a>';
-        ?>
+            ?>
             <tr class="noclick <?php echo $style;?>">
             <td><?php echo htmlspecialchars($tablename);?></td>
             <td><?php echo $my_link;?></td>
             </tr>
-        <?php
+            <?php
             if ($style == 'even') {
                 $style = 'odd';
             } else {
@@ -227,8 +227,7 @@ if (isset($my_tables)) {
     ?>
     </tbody>
     </table>
-
-<?php
+    <?php
 }
 // If available print out database log
 if (count($data['ddlog']) > 0) {

libraries/config/FormDisplay.tpl.php

@@ -389,7 +389,7 @@ function PMA_displayFieldsetBottom()
     echo '<tr>';
     echo '<td colspan="' . $colspan . '" class="lastrow">';
     echo '<input type="submit" name="submit_save" value="'
-        . __('Save') . '" class="green" />';
+        . __('Apply') . '" class="green" />';
     echo '<input type="button" name="submit_reset" value="'
         . __('Reset') . '" />';
     echo '</td>';

libraries/config/config_functions.lib.php

@@ -36,7 +36,7 @@ function PMA_lang($lang_key, $args = null)
  * Returns translated field name/description or comment
  *
  * @param string $canonical_path
- * @param string $type  'name', 'desc' or 'cmt'
+ * @param string $type           'name', 'desc' or 'cmt'
  * @param mixed  $default
  *
  * @return string

libraries/insert_edit.lib.php

@@ -2156,7 +2156,7 @@ function PMA_getCurrentValueAsAnArrayForMultipleEdit($multi_edit_colummns,
             return $multi_edit_funcs[$key] . '(' . $current_value . ",'"
                    . PMA_Util::sqlAddSlashes($multi_edit_salt[$key]) . "')";
         } else {
-        return $multi_edit_funcs[$key] . '(' . $current_value . ')';
+            return $multi_edit_funcs[$key] . '(' . $current_value . ')';
         }
     } else {
         return $multi_edit_funcs[$key] . '()';
@@ -2345,10 +2345,10 @@ function PMA_getCurrentValueForDifferentTypes($possibly_uploaded_val, $key,
  * Check whether inline edited value can be truncated or not,
  * and add additional parameters for extra_data array  if needed
  *
- * @param string $db               Database name
- * @param string $table            Table name
- * @param string $column_name      Column name
- * @param array  &$extra_data      Extra data for ajax response
+ * @param string $db          Database name
+ * @param string $table       Table name
+ * @param string $column_name Column name
+ * @param array  &$extra_data Extra data for ajax response
  *
  * @return void
  */

libraries/ip_allow_deny.lib.php

@@ -159,8 +159,8 @@ function PMA_ipv4MaskTest($testRange, $ipToTest)
  * Does not match:
  * xxxx:xxxx:xxxx:xxxx:xxxx:xxxx:xxxx:xx[yyy-zzz]  (range, partial octets not supported)
  *
- * @param string $test_range  string of IP range to match
- * @param string $ip_to_test  string of IP to test against range
+ * @param string $test_range string of IP range to match
+ * @param string $ip_to_test string of IP to test against range
  *
  * @return boolean    whether the IP mask matches
  *

libraries/schema/Dia_Relation_Schema.class.php

@@ -14,8 +14,9 @@ require_once 'Export_Relation_Schema.class.php';
  * This Class inherits the XMLwriter class and
  * helps in developing structure of DIA Schema Export
  *
- * @access public
- * @see http://php.net/manual/en/book.xmlwriter.php
+ * @package PhpMyAdmin
+ * @access  public
+ * @see     http://php.net/manual/en/book.xmlwriter.php
  */
 class PMA_DIA extends XMLWriter
 {
@@ -192,8 +193,9 @@ class PMA_DIA extends XMLWriter
  * This class preserves the table co-ordinates,fields
  * and helps in drawing/generating the Tables in dia XML document.
  *
- * @name Table_Stats
- * @see PMA_DIA
+ * @package PhpMyAdmin
+ * @name    Table_Stats
+ * @see     PMA_DIA
  */
 class Table_Stats
 {
@@ -472,8 +474,9 @@ class Table_Stats
  * master table's master field to foreign table's foreign key
  * in dia XML document.
  *
- * @name Relation_Stats
- * @see PMA_DIA
+ * @package PhpMyAdmin
+ * @name    Relation_Stats
+ * @see     PMA_DIA
  */
 class Relation_Stats
 {
@@ -682,7 +685,8 @@ class Relation_Stats
  * inherits Export_Relation_Schema class has common functionality added
  * to this class
  *
- * @name Dia_Relation_Schema
+ * @package PhpMyAdmin
+ * @name    Dia_Relation_Schema
  */
 class PMA_Dia_Relation_Schema extends PMA_Export_Relation_Schema
 {

libraries/schema/Eps_Relation_Schema.class.php

@@ -14,8 +14,9 @@ require_once 'Export_Relation_Schema.class.php';
  * This Class is EPS Library and
  * helps in developing structure of EPS Schema Export
  *
- * @access public
- * @see http://php.net/manual/en/book.xmlwriter.php
+ * @package PhpMyAdmin
+ * @access  public
+ * @see     http://php.net/manual/en/book.xmlwriter.php
  */
 
 class PMA_EPS
@@ -369,8 +370,9 @@ class PMA_EPS
  * This class preserves the table co-ordinates,fields
  * and helps in drawing/generating the Tables in EPS.
  *
- * @name Table_Stats
- * @see PMA_EPS
+ * @package PhpMyAdmin
+ * @name    Table_Stats
+ * @see     PMA_EPS
  */
 class Table_Stats
 {
@@ -606,8 +608,9 @@ class Table_Stats
  * master table's master field to foreign table's foreign key
  * in EPS document.
  *
- * @name Relation_Stats
- * @see PMA_EPS
+ * @package PhpMyAdmin
+ * @name    Relation_Stats
+ * @see     PMA_EPS
  */
 class Relation_Stats
 {
@@ -798,7 +801,8 @@ class Relation_Stats
  * This class inherits Export_Relation_Schema class has common functionality added
  * to this class
  *
- * @name Eps_Relation_Schema
+ * @package PhpMyAdmin
+ * @name    Eps_Relation_Schema
  */
 class PMA_Eps_Relation_Schema extends PMA_Export_Relation_Schema
 {

libraries/schema/Export_Relation_Schema.class.php

@@ -12,6 +12,8 @@ if (! defined('PHPMYADMIN')) {
  * This class is inherited by all schema classes
  * It contains those methods which are common in them
  * it works like factory pattern
+ *
+ * @package PhpMyAdmin
  */
 class PMA_Export_Relation_Schema
 {

libraries/schema/Svg_Relation_Schema.class.php

@@ -14,8 +14,9 @@ require_once 'Export_Relation_Schema.class.php';
  * This Class inherits the XMLwriter class and
  * helps in developing structure of SVG Schema Export
  *
- * @access public
- * @see http://php.net/manual/en/book.xmlwriter.php
+ * @package PhpMyAdmin
+ * @access  public
+ * @see     http://php.net/manual/en/book.xmlwriter.php
  */
 class PMA_SVG extends XMLWriter
 {
@@ -334,8 +335,9 @@ class PMA_SVG extends XMLWriter
  * This class preserves the table co-ordinates,fields
  * and helps in drawing/generating the Tables in SVG XML document.
  *
- * @name Table_Stats
- * @see PMA_SVG
+ * @package PhpMyAdmin
+ * @name    Table_Stats
+ * @see     PMA_SVG
  */
 class Table_Stats
 {
@@ -473,6 +475,7 @@ class Table_Stats
      * Returns title of the current table,
      * title can have the dimensions/co-ordinates of the table
      *
+     * @return string title of the current table
      * @access private
      */
     private function _getTitle()
@@ -587,8 +590,9 @@ class Table_Stats
  * master table's master field to foreign table's foreign key
  * in SVG XML document.
  *
- * @name Relation_Stats
- * @see PMA_SVG::printElementLine
+ * @package PhpMyAdmin
+ * @name    Relation_Stats
+ * @see     PMA_SVG::printElementLine
  */
 class Relation_Stats
 {
@@ -768,6 +772,7 @@ class Relation_Stats
  * inherits Export_Relation_Schema class has common functionality added
  * to this class
  *
+ * @package PhpMyAdmin
  * @name Svg_Relation_Schema
  */
 class PMA_Svg_Relation_Schema extends PMA_Export_Relation_Schema

libraries/sql.lib.php

@@ -379,12 +379,12 @@ function PMA_resultSetContainsUniqueKey($db, $table, $fields_meta)
  * During grid edit, if we have a relational field, returns the html for the
  * dropdown
  *
- * @param string  $db                       current database
- * @param string  $table                    current table
- * @param string  $column                   current column
- * @param string  $curr_value               current selected value
+ * @param string $db         current database
+ * @param string $table      current table
+ * @param string $column     current column
+ * @param string $curr_value current selected value
  *
- * @return string $dropdown                 html for the dropdown
+ * @return string $dropdown html for the dropdown
  */
 function PMA_getHtmlForRelationalColumnDropdown($db, $table, $column, $curr_value)
 {
@@ -431,11 +431,11 @@ function PMA_getHtmlForRelationalColumnDropdown($db, $table, $column, $curr_valu
 /**
  * Get the HTML for the header of the page in print view
  *
- * @param string  $db                       current database
- * @param string  $sql_query                current sql query
- * @param int     $num_rows                 the number of rows in result
+ * @param string $db        current database
+ * @param string $sql_query current sql query
+ * @param int    $num_rows  the number of rows in result
  *
- * @return string $header                   html for the header
+ * @return string $header html for the header
  */
 function PMA_getHtmlForPrintViewHeader($db, $sql_query, $num_rows)
 {
@@ -476,11 +476,11 @@ function PMA_getHtmlForPrintViewHeader($db, $sql_query, $num_rows)
 /**
  * Get the HTML for the profiling table and accompanying chart
  *
- * @param string    $url_query            the url query
- * @param string    $pma_token            the pma token
- * @param array     $profiling_results    array containing the profiling info
+ * @param string $url_query         the url query
+ * @param string $pma_token         the pma token
+ * @param array  $profiling_results array containing the profiling info
  *
- * @return string   $profiling_table      html for the profiling table and chart
+ * @return string $profiling_table html for the profiling table and chart
  */
 function PMA_getHtmlForProfilingChart($url_query, $pma_token, $profiling_results)
 {
@@ -606,12 +606,12 @@ EOT;
  * During grid edit, if we have a enum field, returns the html for the
  * dropdown
  *
- * @param string  $db                       current database
- * @param string  $table                    current table
- * @param string  $column                   current column
- * @param string  $curr_value               currently selected value
+ * @param string $db         current database
+ * @param string $table      current table
+ * @param string $column     current column
+ * @param string $curr_value currently selected value
  *
- * @return string $dropdown                 html for the dropdown
+ * @return string $dropdown html for the dropdown
  */
 function PMA_getHtmlForEnumColumnDropdown($db, $table, $column, $curr_value)
 {
@@ -627,12 +627,12 @@ function PMA_getHtmlForEnumColumnDropdown($db, $table, $column, $curr_value)
  * During grid edit, if we have a set field, returns the html for the
  * dropdown
  *
- * @param string  $db                       current database
- * @param string  $table                    current table
- * @param string  $column                   current column
- * @param string  $curr_value               currently selected value
+ * @param string $db         current database
+ * @param string $table      current table
+ * @param string $column     current column
+ * @param string $curr_value currently selected value
  *
- * @return string $dropdown                 html for the set column
+ * @return string $dropdown html for the set column
  */
 function PMA_getHtmlForSetColumn($db, $table, $column, $curr_value)
 {
@@ -657,11 +657,11 @@ function PMA_getHtmlForSetColumn($db, $table, $column, $curr_value)
 /**
  * Get all the values for a enum column or set column in a table
  *
- * @param string  $db             current database
- * @param string  $table          current table
- * @param string  $column         current column
+ * @param string $db     current database
+ * @param string $table  current table
+ * @param string $column current column
  *
- * @return array  $values         array containing the value list for the column
+ * @return array $values array containing the value list for the column
  */
 function PMA_getValuesForColumn($db, $table, $column)
 {
@@ -679,10 +679,10 @@ function PMA_getValuesForColumn($db, $table, $column)
 /**
  * Get HTML for options list
  *
- * @param array   $values           set of values
- * @param array   $selected_values  currently selected values
+ * @param array $values          set of values
+ * @param array $selected_values currently selected values
  *
- * @return string $options          HTML for options list
+ * @return string $options HTML for options list
  */
 function PMA_getHtmlForOptionsList($values, $selected_values)
 {

server_engines.php

@@ -29,8 +29,6 @@ exit;
 /**
  * setup HTML for server Engines information
  *
- * @param null
- *
  * @return string
  */
 function PMA_getServerEnginesHtml()
@@ -42,19 +40,17 @@ function PMA_getServerEnginesHtml()
     if (empty($_REQUEST['engine'])
         || ! PMA_StorageEngine::isValid($_REQUEST['engine'])
     ) {
-        $html .= PMA_getAllServerEnginesHtml();    
+        $html .= PMA_getAllServerEnginesHtml();
     } else {
         $html .= PMA_getSpecifiedServerEnginesHtml();
     }
-    
+
     return $html;
 }
 
 /**
  * setup HTML for server all Engines information
  *
- * @param null
- *
  * @return string
  */
 function PMA_getAllServerEnginesHtml()
@@ -101,15 +97,13 @@ function PMA_getAllServerEnginesHtml()
     unset($odd_row, $engine, $details);
     $html .= '</tbody>' . "\n"
         . '</table>' . "\n";
-    
+
     return $html;
 }
 
 /**
  * setup HTML for a given Storage Engine
  *
- * @param null
- *
  * @return string
  */
 function PMA_getSpecifiedServerEnginesHtml()
@@ -117,7 +111,7 @@ function PMA_getSpecifiedServerEnginesHtml()
     /**
      * Displays details about a given Storage Engine
      */
-    $html = ''; 
+    $html = '';
     $engine_plugin = PMA_StorageEngine::getEngine($_REQUEST['engine']);
     $html .= '<h2>' . "\n"
         . PMA_Util::getImage('b_engine.png')
@@ -167,7 +161,7 @@ function PMA_getSpecifiedServerEnginesHtml()
            . '</p>' . "\n"
            . $engine_plugin->getHtmlVariables();
     }
-    
+
     return $html;
 }
 

test/classes/plugin/transformations/Text_Plain_Append_test.php

@@ -0,0 +1,83 @@
+<?php
+/**
+ * Tests for Text_Plain_Append class
+ *
+ * @package PhpMyAdmin-test
+ */
+
+/*
+ * Include to test.
+ */
+
+require_once 'libraries/plugins/transformations/Text_Plain_Append.class.php';
+
+/**
+ * Tests for Text_Plain_Append class
+ *
+ * @package PhpMyAdmin-test
+ */
+class Text_Plain_Append_Test extends PHPUnit_Framework_TestCase
+{
+   /**
+     * Test for getInfo
+     *
+     * @return void
+     *
+     * @group medium
+     */
+    public function testGetInfo()
+    {
+        $info = 'Appends text to a string. The only option is the text to be appended'
+            . ' (enclosed in single quotes, default empty string).';     
+        $this->assertEquals(
+            $info,
+            Text_Plain_Append::getInfo()
+        );  
+    
+    }
+
+    /**
+     * Test for getName
+     *
+     * @return void
+     *
+     * @group medium
+     */
+    public function testGetName()
+    {       
+        $this->assertEquals(
+            "Append",
+            Text_Plain_Append::getName()
+        );    
+    }
+
+    /**
+     * Test for getMIMEType
+     *
+     * @return void
+     *
+     * @group medium
+     */
+    public function testGetMIMEType()
+    {       
+        $this->assertEquals(
+            "Text",
+            Text_Plain_Append::getMIMEType()
+        );    
+    }
+
+    /**
+     * Test for getMIMESubtype
+     *
+     * @return void
+     *
+     * @group medium
+     */
+    public function testGetMIMESubtype()
+    {       
+        $this->assertEquals(
+            "Plain",
+            Text_Plain_Append::getMIMESubtype()
+        );    
+    }
+}