From def60af6e0d1fde4787ff0b8c6f48bc4a719ec5c Mon Sep 17 00:00:00 2001
From: Madhura Jayaratne <madhura.cj@gmail.com>
Date: Fri, 25 May 2012 22:38:48 +0530
Subject: [PATCH 01/29] Various coding style improvements

---
 libraries/common.lib.php | 74 +++++++++++++++++++++-------------------
 1 file changed, 38 insertions(+), 36 deletions(-)

diff --git a/libraries/common.lib.php b/libraries/common.lib.php
index db1d425950..f679748de4 100644
--- a/libraries/common.lib.php
+++ b/libraries/common.lib.php
@@ -361,7 +361,7 @@ function PMA_formatSql($parsed_sql, $unparsed_sql = '')
         return $formatted_sql;
     }
 
-    $formatted_sql        = '';
+    $formatted_sql = '';
 
     switch ($cfg['SQP']['fmtType']) {
     case 'none':
@@ -683,10 +683,10 @@ function PMA_mysqlDie(
     // modified to show the help on error-returns
     // (now error-messages-server)
     $error_msg .= '<p>' . "\n"
-            . '    <strong>' . __('MySQL said: ') . '</strong>'
-            . PMA_showMySQLDocu('Error-messages-server', 'Error-messages-server')
-            . "\n"
-            . '</p>' . "\n";
+        . '    <strong>' . __('MySQL said: ') . '</strong>'
+        . PMA_showMySQLDocu('Error-messages-server', 'Error-messages-server')
+        . "\n"
+        . '</p>' . "\n";
 
     // The error message will be displayed within a CODE segment.
     // To preserve original formatting, but allow wordwrapping,
@@ -812,7 +812,8 @@ function PMA_getTableList($db, $tables = null, $limit_offset = 0,
             $group_name_full = '';
             $parts_cnt = count($parts) - 1;
             while ($i < $parts_cnt
-                    && $i < $GLOBALS['cfg']['LeftFrameTableLevel']) {
+                && $i < $GLOBALS['cfg']['LeftFrameTableLevel']
+            ) {
                 $group_name = $parts[$i] . $sep;
                 $group_name_full .= $group_name;
 
@@ -1332,7 +1333,7 @@ function PMA_getMessage(
     }
 
     return $retval;
-    
+
 } // end of the 'PMA_getMessage()' function
 
 /**
@@ -1955,17 +1956,17 @@ function PMA_linkOrButton($url, $message, $tag_params = array(),
 function PMA_splitURLQuery($url)
 {
     // decode encoded url separators
-    $separator   = PMA_get_arg_separator();
+    $separator = PMA_get_arg_separator();
     // on most places separator is still hard coded ...
     if ($separator !== '&') {
         // ... so always replace & with $separator
-        $url         = str_replace(htmlentities('&'), $separator, $url);
-        $url         = str_replace('&', $separator, $url);
+        $url = str_replace(htmlentities('&'), $separator, $url);
+        $url = str_replace('&', $separator, $url);
     }
-    $url         = str_replace(htmlentities($separator), $separator, $url);
+    $url = str_replace(htmlentities($separator), $separator, $url);
     // end decode
 
-    $url_parts   = parse_url($url);
+    $url_parts = parse_url($url);
     return explode($separator, $url_parts['query']);
 }
 
@@ -2626,23 +2627,23 @@ function PMA_getCheckbox($html_field_name, $label, $checked, $onclick)
 function PMA_getRadioFields($html_field_name, $choices, $checked_choice = '',
     $line_break = true, $escape_label = true, $class=''
 ) {
-    
+
     $radio_html = '';
-    
+
     foreach ($choices as $choice_value => $choice_label) {
         if (! empty($class)) {
             $radio_html .= '<div class="' . $class . '">';
         }
         $html_field_id = $html_field_name . '_' . $choice_value;
         $radio_html .= '<input type="radio" name="' . $html_field_name . '" id="'
-                    . $html_field_id . '" value="' . htmlspecialchars($choice_value) . '"';
+            . $html_field_id . '" value="' . htmlspecialchars($choice_value) . '"';
         if ($choice_value == $checked_choice) {
             $radio_html .= ' checked="checked"';
         }
         $radio_html .= ' />' . "\n"
-                    . '<label for="' . $html_field_id . '">'
-                    . ($escape_label ? htmlspecialchars($choice_label)  : $choice_label)
-                    . '</label>';
+            . '<label for="' . $html_field_id . '">'
+            . ($escape_label ? htmlspecialchars($choice_label)  : $choice_label)
+            . '</label>';
         if ($line_break) {
             $radio_html .= '<br />';
         }
@@ -2651,9 +2652,9 @@ function PMA_getRadioFields($html_field_name, $choices, $checked_choice = '',
         }
         $radio_html .= "\n";
     }
-    
+
     return $radio_html;
-    
+
 }
 
 /**
@@ -2693,9 +2694,9 @@ function PMA_getDropdown($select_name, $choices, $active_choice, $id)
  *
  * @param string $id      the id of the <div> on which to apply the effect
  * @param string $message the message to show as a link
- * 
+ *
  * @return string         html div element
- * 
+ *
  */
 function PMA_getDivForSliderEffect($id, $message)
 {
@@ -2710,7 +2711,7 @@ function PMA_getDivForSliderEffect($id, $message)
      * method maybe by using an additional param, the id of the div to
      * append to
      */
-    
+
     return '<div id="' . $id . '"'
         . (($GLOBALS['cfg']['InitialSlidersState'] == 'closed')
             ? ' style="display: none; overflow:auto;"'
@@ -2999,7 +3000,9 @@ function PMA_extractColumnSpec($columnspec)
         // this would be a BINARY or VARBINARY column type;
         // by the way, a BLOB should not show the BINARY attribute
         // because this is not accepted in MySQL syntax.
-        if (preg_match('@binary@', $printtype) && ! preg_match('@binary[\(]@', $printtype)) {
+        if (preg_match('@binary@', $printtype)
+            && ! preg_match('@binary[\(]@', $printtype)
+        ) {
             $printtype = preg_replace('@binary@', '', $printtype);
             $binary = true;
         } else {
@@ -3126,7 +3129,7 @@ function PMA_duplicateFirstNewline($string)
 {
     $first_occurence = strpos($string, "\r\n");
     if ($first_occurence === 0) {
-        $string = "\n".$string;
+        $string = "\n" . $string;
     }
     return $string;
 }
@@ -3509,7 +3512,6 @@ function PMA_getGISDatatypes($upper_case = false)
             $gis_data_types[$i] = strtoupper($gis_data_types[$i]);
         }
     }
-
     return $gis_data_types;
 }
 
@@ -3522,7 +3524,7 @@ function PMA_getGISDatatypes($upper_case = false)
  */
 function PMA_createGISData($gis_string)
 {
-    $gis_string =  trim($gis_string);
+    $gis_string = trim($gis_string);
     $geom_types = '(POINT|MULTIPOINT|LINESTRING|MULTILINESTRING|'
         . 'POLYGON|MULTIPOLYGON|GEOMETRYCOLLECTION)';
     if (preg_match("/^'" . $geom_types . "\(.*\)',[0-9]*$/i", $gis_string)) {
@@ -3797,15 +3799,15 @@ function PMA_currentUserHasPrivilege($priv, $db = null, $tbl = null)
     $query = "SELECT `PRIVILEGE_TYPE` FROM `INFORMATION_SCHEMA`.`%s` "
            . "WHERE GRANTEE='%s' AND PRIVILEGE_TYPE='%s'";
     // Check global privileges first.
-    if (PMA_DBI_fetch_value(
+    $user_privileges = PMA_DBI_fetch_value(
         sprintf(
             $query,
             'USER_PRIVILEGES',
             $username,
             $priv
         )
-    )
-    ) {
+    );
+    if ($user_privileges) {
         return true;
     }
     // If a database name was provided and user does not have the
@@ -3814,7 +3816,7 @@ function PMA_currentUserHasPrivilege($priv, $db = null, $tbl = null)
         // need to escape wildcards in db and table names, see bug #3518484
         $db = str_replace(array('%', '_'), array('\%', '\_'), $db);
         $query .= " AND TABLE_SCHEMA='%s'";
-        if (PMA_DBI_fetch_value(
+        $schema_privileges = PMA_DBI_fetch_value(
             sprintf(
                 $query,
                 'SCHEMA_PRIVILEGES',
@@ -3822,8 +3824,8 @@ function PMA_currentUserHasPrivilege($priv, $db = null, $tbl = null)
                 $priv,
                 PMA_sqlAddSlashes($db)
             )
-        )
-        ) {
+        );
+        if ($schema_privileges) {
             return true;
         }
     } else {
@@ -3837,7 +3839,7 @@ function PMA_currentUserHasPrivilege($priv, $db = null, $tbl = null)
         // need to escape wildcards in db and table names, see bug #3518484
         $tbl = str_replace(array('%', '_'), array('\%', '\_'), $tbl);
         $query .= " AND TABLE_NAME='%s'";
-        if (PMA_DBI_fetch_value(
+        $table_privileges = PMA_DBI_fetch_value(
             sprintf(
                 $query,
                 'TABLE_PRIVILEGES',
@@ -3846,8 +3848,8 @@ function PMA_currentUserHasPrivilege($priv, $db = null, $tbl = null)
                 PMA_sqlAddSlashes($db),
                 PMA_sqlAddSlashes($tbl)
             )
-        )
-        ) {
+        );
+        if ($table_privileges) {
             return true;
         }
     }

From 1427b2f2de9084b52e2b92a82baa0713b035567e Mon Sep 17 00:00:00 2001
From: Madhura Jayaratne <madhura.cj@gmail.com>
Date: Fri, 25 May 2012 22:43:23 +0530
Subject: [PATCH 02/29] Fix function names: PMA_AddJSVar -> PMA_addJSVar

---
 libraries/core.lib.php |  2 +-
 main.php               |  2 +-
 server_status.php      | 16 ++++++++--------
 server_variables.php   |  6 +++---
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/libraries/core.lib.php b/libraries/core.lib.php
index 14ee4fe1a4..b024bf4de4 100644
--- a/libraries/core.lib.php
+++ b/libraries/core.lib.php
@@ -796,7 +796,7 @@ function PMA_AddJSCode($str)
  *
  * @return void
  */
-function PMA_AddJSVar($key, $value, $escape = true)
+function PMA_addJSVar($key, $value, $escape = true)
 {
     PMA_AddJsCode(PMA_getJsValue($key, $value, $escape));
 }
diff --git a/main.php b/main.php
index 9dc61bdf67..202eb86627 100644
--- a/main.php
+++ b/main.php
@@ -19,7 +19,7 @@ if ($GLOBALS['PMA_Config']->isGitRevision()) {
     if (isset($_REQUEST['git_revision']) && $GLOBALS['is_ajax_request'] == true) {
         PMA_printGitRevision();
     }
-    PMA_AddJSVar('is_git_revision', true);
+    PMA_addJSVar('is_git_revision', true);
 }
 
 // Handles some variables that may have been sent by the calling script
diff --git a/server_status.php b/server_status.php
index f068bbad87..ed1d4f136a 100644
--- a/server_status.php
+++ b/server_status.php
@@ -729,36 +729,36 @@ $server_db_isLocal = strtolower($cfg['Server']['host']) == 'localhost'
                               || $cfg['Server']['host'] == '127.0.0.1'
                               || $cfg['Server']['host'] == '::1';
 
-PMA_AddJSVar(
+PMA_addJSVar(
     'pma_token',
     $_SESSION[' PMA_token ']
 );
-PMA_AddJSVar(
+PMA_addJSVar(
     'url_query',
     str_replace('&amp;', '&', PMA_generate_common_url($db))
 );
-PMA_AddJSVar(
+PMA_addJSVar(
     'server_time_diff',
     'new Date().getTime() - ' . (microtime(true) * 1000),
     false
 );
-PMA_AddJSVar(
+PMA_addJSVar(
     'server_os',
     PHP_OS
 );
-PMA_AddJSVar(
+PMA_addJSVar(
     'is_superuser',
     PMA_isSuperuser()
 );
-PMA_AddJSVar(
+PMA_addJSVar(
     'server_db_isLocal',
     $server_db_isLocal
 );
-PMA_AddJSVar(
+PMA_addJSVar(
     'profiling_docu',
     PMA_showMySQLDocu('general-thread-states', 'general-thread-states')
 );
-PMA_AddJSVar(
+PMA_addJSVar(
     'explain_docu',
     PMA_showMySQLDocu('explain-output', 'explain-output')
 );
diff --git a/server_variables.php b/server_variables.php
index bde86d6ea9..ab023a97e6 100644
--- a/server_variables.php
+++ b/server_variables.php
@@ -9,9 +9,9 @@ require_once 'libraries/common.inc.php';
 
 $GLOBALS['js_include'][] = 'server_variables.js';
 
-PMA_AddJSVar('pma_token', $_SESSION[' PMA_token ']);
-PMA_AddJSVar('url_query', str_replace('&amp;', '&', PMA_generate_common_url($db)));
-PMA_AddJSVar('is_superuser', PMA_isSuperuser() ? true : false);
+PMA_addJSVar('pma_token', $_SESSION[' PMA_token ']);
+PMA_addJSVar('url_query', str_replace('&amp;', '&', PMA_generate_common_url($db)));
+PMA_addJSVar('is_superuser', PMA_isSuperuser() ? true : false);
 
 
 /**

From 8649b8263ca623534015b170e83d6c6c5eca0ecd Mon Sep 17 00:00:00 2001
From: Madhura Jayaratne <madhura.cj@gmail.com>
Date: Fri, 25 May 2012 22:45:21 +0530
Subject: [PATCH 03/29] Fix function names: PMA_AddJSCode -> PMA_addJSCode

---
 libraries/common.inc.php | 2 +-
 libraries/core.lib.php   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/libraries/common.inc.php b/libraries/common.inc.php
index f3b0b183bc..c3a0f6a2f8 100644
--- a/libraries/common.inc.php
+++ b/libraries/common.inc.php
@@ -571,7 +571,7 @@ $GLOBALS['js_include'][] = 'update-location.js';
 
 /**
  * holds an array of javascript code snippets to be included in the HTML header
- * Can be used with PMA_AddJSCode() to pass on js variables to the browser.
+ * Can be used with PMA_addJSCode() to pass on js variables to the browser.
  * @global array $js_script
  */
 $GLOBALS['js_script'] = array();
diff --git a/libraries/core.lib.php b/libraries/core.lib.php
index b024bf4de4..44cfc309e4 100644
--- a/libraries/core.lib.php
+++ b/libraries/core.lib.php
@@ -781,7 +781,7 @@ function PMA_includeJS($url, $ie_conditional = false)
  *
  * @return void
  */
-function PMA_AddJSCode($str)
+function PMA_addJSCode($str)
 {
     $GLOBALS['js_script'][] = $str;
 }
@@ -798,7 +798,7 @@ function PMA_AddJSCode($str)
  */
 function PMA_addJSVar($key, $value, $escape = true)
 {
-    PMA_AddJsCode(PMA_getJsValue($key, $value, $escape));
+    PMA_addJSCode(PMA_getJsValue($key, $value, $escape));
 }
 
 ?>

From cc79df9e8dfd7a51ee400360a2d05f1e7227a114 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <mcihar@suse.cz>
Date: Tue, 29 May 2012 16:37:29 +0200
Subject: [PATCH 04/29] Wrap some comments

---
 libraries/server_synchronize.lib.php | 29 ++++++++++++++++++----------
 1 file changed, 19 insertions(+), 10 deletions(-)

diff --git a/libraries/server_synchronize.lib.php b/libraries/server_synchronize.lib.php
index 1d17fbad41..a99dcf7944 100644
--- a/libraries/server_synchronize.lib.php
+++ b/libraries/server_synchronize.lib.php
@@ -1029,8 +1029,10 @@ function PMA_checkForeignKeys($src_db, $src_link, $trg_db, $trg_link,
  *                                       altered for the targert table
  * @param array  $matching_tables_fields name of the fields for the matching table
  * @param array  $criteria               criteria
- * @param array  &$matching_tables_keys  field names which is key in the source table
- * @param array  &$target_tables_keys    field names which is key in the target table
+ * @param array  &$matching_tables_keys  field names which is key in the source
+ *                                       table
+ * @param array  &$target_tables_keys    field names which is key in the target
+ *                                       table
  * @param int    $matching_table_index   number of the matching table
  * @param bool   $display                whether to display query
  *
@@ -1163,8 +1165,10 @@ function PMA_alterTargetTableStructure($trg_db, $trg_link, $matching_tables,
  * @param string $trg_db           name of target database
  * @param mixed  $trg_link         connection established with target server
  * @param array  $matching_tables  names of matching tables
- * @param array  $uncommon_columns array containing the names of the column which are to be dropped from the target table
- * @param int    $table_counter    index of the matching table as in $matchiing_tables array
+ * @param array  $uncommon_columns array containing the names of the column which
+ *                                 are to be dropped from the target table
+ * @param int    $table_counter    index of the matching table as in
+ *                                 $matchiing_tables array
  * @param bool   $display          whether to display query
  *
  * @return nothing
@@ -1214,9 +1218,11 @@ function PMA_removeColumnsFromTargetTable($trg_db, $trg_link, $matching_tables,
 }
 
 /**
- * PMA_indexesDiffInTables() compares the source table indexes with target table indexes and keep the indexes to be added in target table in $add_indexes_array
- * indexes to be altered in $alter_indexes_array and indexes to be removed from target table in $remove_indexes_array.
- * Only keyname and uniqueness characteristic of the indexes are altered.
+ * PMA_indexesDiffInTables() compares the source table indexes with target
+ * table indexes and keep the indexes to be added in target table in
+ * $add_indexes_array indexes to be altered in $alter_indexes_array and indexes
+ * to be removed from target table in $remove_indexes_array.  Only keyname and
+ * uniqueness characteristic of the indexes are altered.
  *
  * @param string $src_db                name of source database
  * @param string $trg_db                name of target database
@@ -1290,9 +1296,12 @@ function PMA_indexesDiffInTables($src_db, $trg_db, $src_link, $trg_link,
  * @param array  $matching_tables      matching tables name
  * @param array  $source_indexes       indexes of the source table
  * @param array  $target_indexes       indexes of the target table
- * @param array  $add_indexes_array    column names on which indexes are to be created in target table
- * @param array  $alter_indexes_array  column names for which indexes are to be altered
- * @param array  $remove_indexes_array key name of the indexes which are to be removed from the target table
+ * @param array  $add_indexes_array    column names on which indexes are to be
+ *                                     created in target table
+ * @param array  $alter_indexes_array  column names for which indexes are to be
+ *                                     altered
+ * @param array  $remove_indexes_array key name of the indexes which are to be
+ *                                     removed from the target table
  * @param int    $table_counter        number of the matching table
  * @param bool   $display              whether to display query
  *

From 624d0b2fc01e7c492595deb9420fbea2cff9b151 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <mcihar@suse.cz>
Date: Tue, 29 May 2012 16:43:11 +0200
Subject: [PATCH 05/29] Wrap some long lines

---
 libraries/server_synchronize.lib.php | 109 ++++++++++++++++++---------
 1 file changed, 74 insertions(+), 35 deletions(-)

diff --git a/libraries/server_synchronize.lib.php b/libraries/server_synchronize.lib.php
index a99dcf7944..446117c8e3 100644
--- a/libraries/server_synchronize.lib.php
+++ b/libraries/server_synchronize.lib.php
@@ -158,10 +158,12 @@ function PMA_dataDiffInTables($src_db, $trg_db, $src_link, $trg_link,
 
                 // Query the target server to see which rows already exist
                 $trg_select_query = "SELECT * FROM " . PMA_backquote($trg_db) . "."
-                    . PMA_backquote($matching_table[$matching_table_index]) . " WHERE ";
+                    . PMA_backquote($matching_table[$matching_table_index])
+                    . " WHERE ";
 
                 if (sizeof($is_key) == 1) {
-                    $trg_select_query .= PMA_backquote($is_key[0]). "='" . $source_result_set[$j] . "'";
+                    $trg_select_query .= PMA_backquote($is_key[0])
+                        . "='" . $source_result_set[$j] . "'";
                 } elseif (sizeof($is_key) > 1) {
                     for ($k=0; $k < sizeof($is_key); $k++) {
                         $trg_select_query .= PMA_backquote($is_key[$k])
@@ -176,8 +178,10 @@ function PMA_dataDiffInTables($src_db, $trg_db, $src_link, $trg_link,
                 if ($target_result_set) {
 
                     // Fetch the row from the source server to do a comparison
-                    $src_select_query = "SELECT * FROM " . PMA_backquote($src_db) . "."
-                        . PMA_backquote($matching_table[$matching_table_index]) . " WHERE ";
+                    $src_select_query = "SELECT * FROM "
+                        . PMA_backquote($src_db) . "."
+                        . PMA_backquote($matching_table[$matching_table_index])
+                        . " WHERE ";
 
                     if (sizeof($is_key) == 1) {
                         $src_select_query .= PMA_backquote($is_key[0])
@@ -195,9 +199,10 @@ function PMA_dataDiffInTables($src_db, $trg_db, $src_link, $trg_link,
                     $src_result_set = PMA_DBI_fetch_result($src_select_query, null, null, $src_link);
 
                     /**
-                    * Comparing each corresponding field of the source and target matching rows.
-                    * Placing the primary key, value of primary key, field to be updated, and the
-                    * new value of field to be updated in each row of the update array.
+                    * Comparing each corresponding field of the source and target
+                    * matching rows. Placing the primary key, value of primary
+                    * key, field to be updated, and the new value of field to
+                    * be updated in each row of the update array.
                     */
                     for ($m = 0; ($m < $fields_num[$matching_table_index]) && ($starting_index == 0) ; $m++) {
                         if (isset($src_result_set[0][$fld[$m]])) {
@@ -277,7 +282,8 @@ function PMA_dataDiffInTables($src_db, $trg_db, $src_link, $trg_link,
                     }
                 } else {
                     /**
-                     * Placing the primary key, and the value of primary key of the row that is to be inserted in the target table
+                     * Placing the primary key, and the value of primary key of the
+                     * row that is to be inserted in the target table
                      */
                     if (sizeof($is_key) == 1) {
                         if (isset($source_result_set[$j])) {
@@ -294,8 +300,10 @@ function PMA_dataDiffInTables($src_db, $trg_db, $src_link, $trg_link,
                 }
             } else {
                 /**
-                 * Placing the primary key, and the value of primary key of the row that is to be inserted in the target table
-                 * This condition is met when there is an additional column in the source table
+                 * Placing the primary key, and the value of primary key of the
+                 * row that is to be inserted in the target table. This
+                 * condition is met when there is an additional column in the
+                 * source table
                  */
                 if (sizeof($is_key) == 1) {
                     if (isset($source_result_set[$j])) {
@@ -405,7 +413,8 @@ function PMA_findDeleteRowsFromTargetTables(&$delete_array, $matching_table,
  */
 function PMA_dataDiffInUncommonTables($source_tables_uncommon, $src_db, $src_link, $index, &$row_count)
 {
-    $query = "SELECT COUNT(*) FROM " . PMA_backquote($src_db) . "." . PMA_backquote($source_tables_uncommon[$index]);
+    $query = "SELECT COUNT(*) FROM " . PMA_backquote($src_db) . "."
+        . PMA_backquote($source_tables_uncommon[$index]);
     $rows  = PMA_DBI_fetch_result($query, null, null, $src_link);
     $row_count[$index] = $rows[0];
 }
@@ -488,20 +497,32 @@ function PMA_updateTargetTables(
  * @param mixed  $trg_link                connection established with target server
  * @param array  $table_fields            field names of a table
  * @param array  &$array_insert
- * @param int    $matching_table_index    index of matching table in matching_table_array
- * @param array  $matching_tables_keys    field names that are keys in the matching table
+ * @param int    $matching_table_index    index of matching table in
+ *                                        matching_table_array
+ * @param array  $matching_tables_keys    field names that are keys in the matching
+ *                                        table
  * @param array  $source_columns          source column information
- * @param array  &$add_column_array       column names that are to be added in target table
- * @param array  $criteria                criteria like type, null, collation, default etc
- * @param array  $target_tables_keys      field names that are keys in the target table
- * @param array  $uncommon_tables         table names that are present in source db but not in targt db
+ * @param array  &$add_column_array       column names that are to be added in
+ *                                        target table
+ * @param array  $criteria                criteria like type, null, collation,
+ *                                        default etc
+ * @param array  $target_tables_keys      field names that are keys in the target
+ *                                        table
+ * @param array  $uncommon_tables         table names that are present in source db
+ *                                        but not in targt db
  * @param array  &$uncommon_tables_fields field names of the uncommon tables
- * @param array  $uncommon_cols           column names that are present in target table and not in source table
+ * @param array  $uncommon_cols           column names that are present in target
+ *                                        table and not in source table
  * @param array  &$alter_str_array        column names that are to be altered
- * @param array  &$source_indexes         column names on which indexes are made in source table
- * @param array  &$target_indexes         column names on which indexes are made in target table
- * @param array  &$add_indexes_array      column names on which index is to be added in target table
- * @param array  &$alter_indexes_array    column names whose indexes are to be altered. Only index name and uniqueness of an index can be changed
+ * @param array  &$source_indexes         column names on which indexes are made
+ *                                        in source table
+ * @param array  &$target_indexes         column names on which indexes are made
+ *                                        in target table
+ * @param array  &$add_indexes_array      column names on which index is to be
+ *                                        added in target table
+ * @param array  &$alter_indexes_array    column names whose indexes are to be
+ *                                        altered. Only index name and uniqueness
+ *                                        of an index can be changed
  * @param array  &$delete_array           rows that are to be deleted
  * @param array  &$update_array           rows that are to be updated in target
  * @param bool   $display                 whether to display query
@@ -713,10 +734,17 @@ function PMA_createTargetTables($src_db, $trg_db, $src_link, $trg_link,
 function PMA_populateTargetTables($src_db, $trg_db, $src_link, $trg_link,
     $uncommon_tables, $table_index, $uncommon_tables_fields, $display
 ) {
-    $display = false; // todo: maybe display some of the queries if they are not too numerous
-    $unbuffered_result = PMA_DBI_try_query('SELECT * FROM ' . PMA_backquote($src_db) . '.' . PMA_backquote($uncommon_tables[$table_index]), $src_link, PMA_DBI_QUERY_UNBUFFERED);
+    // @todo: maybe display some of the queries if they are not too numerous
+    $display = false;
+    $unbuffered_result = PMA_DBI_try_query(
+        'SELECT * FROM ' . PMA_backquote($src_db) . '.'
+        . PMA_backquote($uncommon_tables[$table_index]),
+        $src_link,
+        PMA_DBI_QUERY_UNBUFFERED
+    );
     if (false !== $unbuffered_result) {
-        $insert_query = 'INSERT INTO ' . PMA_backquote($trg_db) . '.' .PMA_backquote($uncommon_tables[$table_index]) . ' VALUES';
+        $insert_query = 'INSERT INTO ' . PMA_backquote($trg_db) . '.'
+            . PMA_backquote($uncommon_tables[$table_index]) . ' VALUES';
         while ($one_row = PMA_DBI_fetch_row($unbuffered_result)) {
             $insert_query .= '(';
             $key_of_last_value = count($one_row) - 1;
@@ -750,9 +778,8 @@ function PMA_populateTargetTables($src_db, $trg_db, $src_link, $trg_link,
  *
  * @return nothing
  */
-function PMA_deleteFromTargetTable($trg_db, $trg_link, $matching_tables, $table_index,
-    $target_tables_keys, $delete_array, $display
-) {
+function PMA_deleteFromTargetTable($trg_db, $trg_link, $matching_tables,
+$table_index, $target_tables_keys, $delete_array, $display) {
     for ($i = 0; $i < sizeof($delete_array[$table_index]); $i++) {
         if (isset($target_tables_keys[$table_index])) {
             $delete_query = 'DELETE FROM ' . PMA_backquote($trg_db) . '.' .PMA_backquote($matching_tables[$table_index]) . ' WHERE ';
@@ -776,7 +803,13 @@ function PMA_deleteFromTargetTable($trg_db, $trg_link, $matching_tables, $table_
 
                 if ($result_size > 0) {
                     for ($b = 0; $b < $result_size; $b++) {
-                        $drop_pk_query = "DELETE FROM " . PMA_backquote($pk_query_result[$b]['TABLE_SCHEMA']) . "." . PMA_backquote($pk_query_result[$b]['TABLE_NAME']) . " WHERE " . PMA_backquote($pk_query_result[$b]['COLUMN_NAME']) . " = " . $target_tables_keys[$table_index][$y] . ";";
+                        $drop_pk_query = "DELETE FROM "
+                            . PMA_backquote($pk_query_result[$b]['TABLE_SCHEMA'])
+                            . "."
+                            . PMA_backquote($pk_query_result[$b]['TABLE_NAME'])
+                            . " WHERE "
+                            . PMA_backquote($pk_query_result[$b]['COLUMN_NAME'])
+                            . " = " . $target_tables_keys[$table_index][$y] . ";";
                         PMA_DBI_try_query($drop_pk_query, $trg_link, 0);
                     }
                 }
@@ -1139,7 +1172,8 @@ function PMA_alterTargetTableStructure($trg_db, $trg_link, $matching_tables,
         }
     }
     $check = false;
-    $query = "ALTER TABLE " . PMA_backquote($trg_db) . '.' . PMA_backquote($matching_tables[$matching_table_index]);
+    $query = "ALTER TABLE " . PMA_backquote($trg_db) . '.'
+        . PMA_backquote($matching_tables[$matching_table_index]);
     for ($p = 0; $p < sizeof($matching_tables_keys[$matching_table_index]); $p++) {
         if ((isset($alter_str_array[$matching_table_index][$matching_tables_keys[$matching_table_index][$p]]['Key']))) {
             $check = true;
@@ -1177,7 +1211,8 @@ function PMA_removeColumnsFromTargetTable($trg_db, $trg_link, $matching_tables,
     $uncommon_columns, $table_counter, $display
 ) {
     if (isset($uncommon_columns[$table_counter])) {
-        $drop_query = "ALTER TABLE " . PMA_backquote($trg_db) . "." . PMA_backquote($matching_tables[$table_counter]);
+        $drop_query = "ALTER TABLE " . PMA_backquote($trg_db) . "."
+            . PMA_backquote($matching_tables[$table_counter]);
         for ($a = 0; $a < sizeof($uncommon_columns[$table_counter]); $a++) {
             //Checks if column to be removed is a foreign key in any table
             $pk_query = "SELECT * FROM information_schema.KEY_COLUMN_USAGE WHERE REFERENCED_TABLE_SCHEMA = '" . $trg_db . "'
@@ -1411,19 +1446,23 @@ function PMA_syncDisplayHeaderCompare($src_db, $trg_db)
 
     echo '<table class="data">';
     echo '<tr>';
-    echo '<th>' . __('Source database') . ':  ' . htmlspecialchars($src_db) . '<br />(';
+    echo '<th>' . __('Source database') . ':  '
+        . htmlspecialchars($src_db) . '<br />(';
     if ('cur' == $_SESSION['src_type']) {
         echo __('Current server');
     } else {
-        echo __('Remote server') . ' ' . htmlspecialchars($_SESSION['src_server']['host']);
+        echo __('Remote server') . ' '
+            . htmlspecialchars($_SESSION['src_server']['host']);
     }
     echo ')</th>';
     echo '<th>' . __('Difference') . '</th>';
-    echo '<th>' . __('Target database') . ':  '. htmlspecialchars($trg_db) . '<br />(';
+    echo '<th>' . __('Target database') . ':  '
+        . htmlspecialchars($trg_db) . '<br />(';
     if ('cur' == $_SESSION['trg_type']) {
         echo __('Current server');
     } else {
-        echo __('Remote server') . ' ' . htmlspecialchars($_SESSION['trg_server']['host']);
+        echo __('Remote server') . ' '
+            . htmlspecialchars($_SESSION['trg_server']['host']);
     }
     echo ')</th>';
     echo '</tr>';

From 00e21a04d9d3becd9bbd72194b2dc3a12b5822dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <mcihar@suse.cz>
Date: Tue, 29 May 2012 16:45:23 +0200
Subject: [PATCH 06/29] Wrap some more lines

---
 libraries/server_synchronize.lib.php | 50 ++++++++++++++++++----------
 1 file changed, 33 insertions(+), 17 deletions(-)

diff --git a/libraries/server_synchronize.lib.php b/libraries/server_synchronize.lib.php
index 446117c8e3..389ed150f0 100644
--- a/libraries/server_synchronize.lib.php
+++ b/libraries/server_synchronize.lib.php
@@ -26,7 +26,8 @@ if (! defined('PHPMYADMIN')) {
  * @return nothing
  */
 function PMA_getMatchingTables($trg_tables, $src_tables, &$matching_tables,
-&$uncommon_source_tables) {
+    &$uncommon_source_tables
+) {
     for ($k=0; $k< sizeof($src_tables); $k++) {
         $present_in_target = false;
         for ($l=0; $l < sizeof($trg_tables); $l++) {
@@ -54,7 +55,8 @@ function PMA_getMatchingTables($trg_tables, $src_tables, &$matching_tables,
  * @return nothing
  */
 function PMA_getNonMatchingTargetTables($trg_tables, $matching_tables,
-&$uncommon_target_tables) {
+    &$uncommon_target_tables
+) {
     for ($c=0; $c<sizeof($trg_tables); $c++) {
         $match = false;
         for ($d=0; $d < sizeof($matching_tables); $d++) {
@@ -423,17 +425,17 @@ function PMA_dataDiffInUncommonTables($source_tables_uncommon, $src_db, $src_lin
  * PMA_updateTargetTables() sets the updated field values to
  * target table rows using $update_array[$matching_table_index]
  *
- * @param array   $table                Matching tables' names
- * @param array   $update_array         A three dimensional array containing field
- *                                      value updates required for each matching
- *                                      table
- * @param string  $src_db               Name of source database
- * @param string  $trg_db               Name of target database
- * @param mixed   $trg_link             Connection established with target server
- * @param int     $matching_table_index index of matching table in
- *                                      matching_table_array
- * @param array   $matching_table_keys  matching keys for table
- * @param bool    $display              whether to display query
+ * @param array  $table                Matching tables' names
+ * @param array  $update_array         A three dimensional array containing field
+ *                                     value updates required for each matching
+ *                                     table
+ * @param string $src_db               Name of source database
+ * @param string $trg_db               Name of target database
+ * @param mixed  $trg_link             Connection established with target server
+ * @param int    $matching_table_index index of matching table in
+ *                                     matching_table_array
+ * @param array  $matching_table_keys  matching keys for table
+ * @param bool   $display              whether to display query
  *
  * @return nothing
  */
@@ -779,7 +781,8 @@ function PMA_populateTargetTables($src_db, $trg_db, $src_link, $trg_link,
  * @return nothing
  */
 function PMA_deleteFromTargetTable($trg_db, $trg_link, $matching_tables,
-$table_index, $target_tables_keys, $delete_array, $display) {
+    $table_index, $target_tables_keys, $delete_array, $display
+) {
     for ($i = 0; $i < sizeof($delete_array[$table_index]); $i++) {
         if (isset($target_tables_keys[$table_index])) {
             $delete_query = 'DELETE FROM ' . PMA_backquote($trg_db) . '.' .PMA_backquote($matching_tables[$table_index]) . ' WHERE ';
@@ -862,6 +865,8 @@ $table_index, $target_tables_keys, $delete_array, $display) {
  *                                     target table
  * @param array  &$target_tables_keys  field names which is key in the target table
  * @param int    $matching_table_index number of the matching table
+ *
+ * @return nothing
  */
 function PMA_structureDiffInTables($src_db, $trg_db, $src_link, $trg_link,
     $matching_tables, &$source_columns, &$target_columns, &$alter_str_array,
@@ -869,11 +874,22 @@ function PMA_structureDiffInTables($src_db, $trg_db, $src_link, $trg_link,
     $matching_table_index
 ) {
     //Gets column information for source and target table
-    $source_columns[$matching_table_index] = PMA_DBI_get_columns_full($src_db, $matching_tables[$matching_table_index], null, $src_link);
-    $target_columns[$matching_table_index] = PMA_DBI_get_columns_full($trg_db, $matching_tables[$matching_table_index], null, $trg_link);
+    $source_columns[$matching_table_index] = PMA_DBI_get_columns_full(
+        $src_db,
+        $matching_tables[$matching_table_index],
+        null,
+        $src_link
+    );
+    $target_columns[$matching_table_index] = PMA_DBI_get_columns_full(
+        $trg_db,
+        $matching_tables[$matching_table_index],
+        null,
+        $trg_link
+    );
     foreach ($source_columns[$matching_table_index] as $column_name => $each_column) {
         if (isset($target_columns[$matching_table_index][$column_name]['Field'])) {
-            //If column exists in target table then matches criteria like type, null, collation, key, default, comment of the column
+            //If column exists in target table then matches criteria like type,
+            // null, collation, key, default, comment of the column
             for ($i = 0; $i < sizeof($criteria); $i++) {
                 if ($source_columns[$matching_table_index][$column_name][$criteria[$i]] != $target_columns[$matching_table_index][$column_name][$criteria[$i]]) {
                     if (($criteria[$i] == 'Default') && ($source_columns[$matching_table_index][$column_name][$criteria[$i]] == '' )) {

From 7736cad4efa27ec764365b17e214e3cb9f0b2e1f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <mcihar@suse.cz>
Date: Tue, 29 May 2012 16:47:01 +0200
Subject: [PATCH 07/29] Use count instead of sizeof

---
 libraries/server_synchronize.lib.php | 180 +++++++++++++--------------
 1 file changed, 90 insertions(+), 90 deletions(-)

diff --git a/libraries/server_synchronize.lib.php b/libraries/server_synchronize.lib.php
index 389ed150f0..0507177ead 100644
--- a/libraries/server_synchronize.lib.php
+++ b/libraries/server_synchronize.lib.php
@@ -28,9 +28,9 @@ if (! defined('PHPMYADMIN')) {
 function PMA_getMatchingTables($trg_tables, $src_tables, &$matching_tables,
     &$uncommon_source_tables
 ) {
-    for ($k=0; $k< sizeof($src_tables); $k++) {
+    for ($k=0; $k< count($src_tables); $k++) {
         $present_in_target = false;
-        for ($l=0; $l < sizeof($trg_tables); $l++) {
+        for ($l=0; $l < count($trg_tables); $l++) {
             if ($src_tables[$k] === $trg_tables[$l]) {
                 $present_in_target = true;
                 $matching_tables[] = $src_tables[$k];
@@ -57,9 +57,9 @@ function PMA_getMatchingTables($trg_tables, $src_tables, &$matching_tables,
 function PMA_getNonMatchingTargetTables($trg_tables, $matching_tables,
     &$uncommon_target_tables
 ) {
-    for ($c=0; $c<sizeof($trg_tables); $c++) {
+    for ($c=0; $c<count($trg_tables); $c++) {
         $match = false;
-        for ($d=0; $d < sizeof($matching_tables); $d++) {
+        for ($d=0; $d < count($matching_tables); $d++) {
             if ($trg_tables[$c] === $matching_tables[$d]) {
                 $match=true;
             }
@@ -125,13 +125,13 @@ function PMA_dataDiffInTables($src_db, $trg_db, $src_link, $trg_link,
             }
         }
         $matching_tables_fields[$matching_table_index] = $fld;
-        $fields_num[$matching_table_index] = sizeof($fld);
+        $fields_num[$matching_table_index] = count($fld);
         $matching_tables_keys[$matching_table_index] = $is_key;
 
         $source_result_set = PMA_getColumnValues(
             $src_db, $matching_table[$matching_table_index], $is_key, $src_link
         );
-        $source_size = sizeof($source_result_set);
+        $source_size = count($source_result_set);
 
         $trg_fld_results = PMA_DBI_get_columns(
             $trg_db, $matching_table[$matching_table_index], null, true, $trg_link
@@ -163,14 +163,14 @@ function PMA_dataDiffInTables($src_db, $trg_db, $src_link, $trg_link,
                     . PMA_backquote($matching_table[$matching_table_index])
                     . " WHERE ";
 
-                if (sizeof($is_key) == 1) {
+                if (count($is_key) == 1) {
                     $trg_select_query .= PMA_backquote($is_key[0])
                         . "='" . $source_result_set[$j] . "'";
-                } elseif (sizeof($is_key) > 1) {
-                    for ($k=0; $k < sizeof($is_key); $k++) {
+                } elseif (count($is_key) > 1) {
+                    for ($k=0; $k < count($is_key); $k++) {
                         $trg_select_query .= PMA_backquote($is_key[$k])
                             . "='" . $source_result_set[$j][$is_key[$k]] . "'";
-                        if ($k < (sizeof($is_key)-1)) {
+                        if ($k < (count($is_key)-1)) {
                             $trg_select_query .= " AND ";
                         }
                     }
@@ -185,14 +185,14 @@ function PMA_dataDiffInTables($src_db, $trg_db, $src_link, $trg_link,
                         . PMA_backquote($matching_table[$matching_table_index])
                         . " WHERE ";
 
-                    if (sizeof($is_key) == 1) {
+                    if (count($is_key) == 1) {
                         $src_select_query .= PMA_backquote($is_key[0])
                             . "='" . $source_result_set[$j] . "'";
-                    } elseif (sizeof($is_key) > 1) {
-                        for ($k=0; $k< sizeof($is_key); $k++) {
+                    } elseif (count($is_key) > 1) {
+                        for ($k=0; $k< count($is_key); $k++) {
                             $src_select_query .= PMA_backquote($is_key[$k])
                                 . "='" . $source_result_set[$j][$is_key[$k]] . "'";
-                            if ($k < (sizeof($is_key) - 1)) {
+                            if ($k < (count($is_key) - 1)) {
                                 $src_select_query .= " AND ";
                             }
                         }
@@ -210,12 +210,12 @@ function PMA_dataDiffInTables($src_db, $trg_db, $src_link, $trg_link,
                         if (isset($src_result_set[0][$fld[$m]])) {
                             if (isset($target_result_set[0][$fld[$m]])) {
                                 if (($src_result_set[0][$fld[$m]] != $target_result_set[0][$fld[$m]]) && (! (in_array($fld[$m], $is_key)))) {
-                                    if (sizeof($is_key) == 1) {
+                                    if (count($is_key) == 1) {
                                         if ($source_result_set[$j]) {
                                             $update_array[$matching_table_index][$update_row][$is_key[0]] = $source_result_set[$j];
                                         }
-                                    } elseif (sizeof($is_key) > 1) {
-                                        for ($n=0; $n < sizeof($is_key); $n++) {
+                                    } elseif (count($is_key) > 1) {
+                                        for ($n=0; $n < count($is_key); $n++) {
                                             if (isset($src_result_set[0][$is_key[$n]])) {
                                                 $update_array[$matching_table_index][$update_row][$is_key[$n]] = $src_result_set[0][$is_key[$n]];
                                             }
@@ -233,12 +233,12 @@ function PMA_dataDiffInTables($src_db, $trg_db, $src_link, $trg_link,
                                     $update_row++;
                                 }
                             } else {
-                                if (sizeof($is_key) == 1) {
+                                if (count($is_key) == 1) {
                                     if ($source_result_set[$j]) {
                                         $update_array[$matching_table_index][$update_row][$is_key[0]] = $source_result_set[$j];
                                     }
-                                } elseif (sizeof($is_key) > 1) {
-                                    for ($n = 0; $n < sizeof($is_key); $n++) {
+                                } elseif (count($is_key) > 1) {
+                                    for ($n = 0; $n < count($is_key); $n++) {
                                         if (isset($src_result_set[0][$is_key[$n]])) {
                                             $update_array[$matching_table_index][$update_row][$is_key[$n]] = $src_result_set[0][$is_key[$n]];
                                         }
@@ -287,12 +287,12 @@ function PMA_dataDiffInTables($src_db, $trg_db, $src_link, $trg_link,
                      * Placing the primary key, and the value of primary key of the
                      * row that is to be inserted in the target table
                      */
-                    if (sizeof($is_key) == 1) {
+                    if (count($is_key) == 1) {
                         if (isset($source_result_set[$j])) {
                             $insert_array[$matching_table_index][$insert_row][$is_key[0]] = $source_result_set[$j];
                         }
-                    } elseif (sizeof($is_key) > 1) {
-                        for ($l = 0; $l < sizeof($is_key); $l++) {
+                    } elseif (count($is_key) > 1) {
+                        for ($l = 0; $l < count($is_key); $l++) {
                             if (isset($source_result_set[$j][$matching_tables_fields[$matching_table_index][$l]])) {
                                 $insert_array[$matching_table_index][$insert_row][$is_key[$l]] = $source_result_set[$j][$matching_tables_fields[$matching_table_index][$l]];
                             }
@@ -307,12 +307,12 @@ function PMA_dataDiffInTables($src_db, $trg_db, $src_link, $trg_link,
                  * condition is met when there is an additional column in the
                  * source table
                  */
-                if (sizeof($is_key) == 1) {
+                if (count($is_key) == 1) {
                     if (isset($source_result_set[$j])) {
                         $insert_array[$matching_table_index][$insert_row][$is_key[0]] = $source_result_set[$j];
                     }
-                } elseif (sizeof($is_key) > 1) {
-                    for ($l = 0; $l < sizeof($is_key); $l++) {
+                } elseif (count($is_key) > 1) {
+                    for ($l = 0; $l < count($is_key); $l++) {
                         if (isset($source_result_set[$j][$matching_tables_fields[$matching_table_index][$l]])) {
                             $insert_array[$matching_table_index][$insert_row][$is_key[$l]] = $source_result_set[$j][$matching_tables_fields[$matching_table_index][$l]];
                         }
@@ -349,7 +349,7 @@ function PMA_findDeleteRowsFromTargetTables(&$delete_array, $matching_table,
         $source_key_values = PMA_getColumnValues($src_db, $matching_table[$matching_table_index], $src_keys[$matching_table_index], $src_link);
     }
     $all_keys_match = 1;
-    for ($a = 0; $a < sizeof($trg_keys[$matching_table_index]); $a++) {
+    for ($a = 0; $a < count($trg_keys[$matching_table_index]); $a++) {
         if (isset($trg_keys[$matching_table_index][$a])) {
             if (! (in_array($trg_keys[$matching_table_index][$a], $src_keys[$matching_table_index]))) {
                 $all_keys_match = 0;
@@ -362,24 +362,24 @@ function PMA_findDeleteRowsFromTargetTables(&$delete_array, $matching_table,
         }
     }
     if (isset($trg_keys[$matching_table_index])) {
-        if ((sizeof($trg_keys[$matching_table_index]) == 1) && $all_keys_match) {
+        if ((count($trg_keys[$matching_table_index]) == 1) && $all_keys_match) {
             $row = 0;
             if (isset($target_key_values)) {
-                for ($i = 0; $i < sizeof($target_key_values); $i++) {
+                for ($i = 0; $i < count($target_key_values); $i++) {
                     if (! (in_array($target_key_values[$i], $source_key_values))) {
                         $delete_array[$matching_table_index][$row] = $target_key_values[$i];
                         $row++;
                     }
                 }
             }
-        } elseif ((sizeof($trg_keys[$matching_table_index]) > 1) && $all_keys_match) {
+        } elseif ((count($trg_keys[$matching_table_index]) > 1) && $all_keys_match) {
             $row = 0;
             if (isset($target_key_values)) {
-                for ($i = 0; $i < sizeof($target_key_values); $i++) {
+                for ($i = 0; $i < count($target_key_values); $i++) {
                     $is_present = false;
-                    for ($j = 0; $j < sizeof($source_key_values) && ($is_present == false) ; $j++) {
+                    for ($j = 0; $j < count($source_key_values) && ($is_present == false) ; $j++) {
                         $check = true;
-                        for ($k = 0; $k < sizeof($trg_keys[$matching_table_index]); $k++) {
+                        for ($k = 0; $k < count($trg_keys[$matching_table_index]); $k++) {
                             if ($target_key_values[$i][$trg_keys[$matching_table_index][$k]] != $source_key_values[$j][$trg_keys[$matching_table_index][$k]]) {
                                 $check = false;
                             }
@@ -389,7 +389,7 @@ function PMA_findDeleteRowsFromTargetTables(&$delete_array, $matching_table,
                         }
                     }
                     if (! ($is_present)) {
-                        for ($l = 0; $l < sizeof($trg_keys[$matching_table_index]); $l++) {
+                        for ($l = 0; $l < count($trg_keys[$matching_table_index]); $l++) {
                             $delete_array[$matching_table_index][$row][$trg_keys[$matching_table_index][$l]] = $target_key_values[$i][$trg_keys[$matching_table_index][$l]];
                         }
                         $row++;
@@ -444,12 +444,12 @@ function PMA_updateTargetTables(
     $trg_link, $matching_table_index, $matching_table_keys, $display
 ) {
     if (isset($update_array[$matching_table_index])) {
-        if (sizeof($update_array[$matching_table_index])) {
+        if (count($update_array[$matching_table_index])) {
 
-            for ($update_row = 0; $update_row < sizeof($update_array[$matching_table_index]); $update_row++) {
+            for ($update_row = 0; $update_row < count($update_array[$matching_table_index]); $update_row++) {
 
                 if (isset($update_array[$matching_table_index][$update_row])) {
-                    $update_fields_num = sizeof($update_array[$matching_table_index][$update_row])-sizeof($matching_table_keys[$matching_table_index]);
+                    $update_fields_num = count($update_array[$matching_table_index][$update_row])-count($matching_table_keys[$matching_table_index]);
                     if ($update_fields_num > 0) {
                         $query = "UPDATE " . PMA_backquote($trg_db) . "." .PMA_backquote($table[$matching_table_index]) . " SET ";
 
@@ -463,11 +463,11 @@ function PMA_updateTargetTables(
                         }
                         $query .= " WHERE ";
                         if (isset($matching_table_keys[$matching_table_index])) {
-                            for ($key = 0; $key < sizeof($matching_table_keys[$matching_table_index]); $key++) {
+                            for ($key = 0; $key < count($matching_table_keys[$matching_table_index]); $key++) {
                                 if (isset($matching_table_keys[$matching_table_index][$key])) {
                                     $query .= PMA_backquote($matching_table_keys[$matching_table_index][$key]) . "='" . $update_array[$matching_table_index][$update_row][$matching_table_keys[$matching_table_index][$key]] . "'";
                                 }
-                                if ($key < (sizeof($matching_table_keys[$matching_table_index]) - 1)) {
+                                if ($key < (count($matching_table_keys[$matching_table_index]) - 1)) {
                                     $query .= " AND ";
                                 }
                             }
@@ -539,16 +539,16 @@ function PMA_insertIntoTargetTable($matching_table, $src_db, $trg_db, $src_link,
     &$alter_indexes_array, &$delete_array, &$update_array, $display
 ) {
     if (isset($array_insert[$matching_table_index])) {
-        if (sizeof($array_insert[$matching_table_index])) {
-            for ($insert_row = 0; $insert_row< sizeof($array_insert[$matching_table_index]); $insert_row++) {
+        if (count($array_insert[$matching_table_index])) {
+            for ($insert_row = 0; $insert_row< count($array_insert[$matching_table_index]); $insert_row++) {
                 if (isset($array_insert[$matching_table_index][$insert_row][$matching_tables_keys[$matching_table_index][0]])) {
 
                     $select_query = "SELECT * FROM " . PMA_backquote($src_db) . "." . PMA_backquote($matching_table[$matching_table_index]) . " WHERE ";
-                    for ($i = 0; $i < sizeof($matching_tables_keys[$matching_table_index]); $i++) {
+                    for ($i = 0; $i < count($matching_tables_keys[$matching_table_index]); $i++) {
                         $select_query .= $matching_tables_keys[$matching_table_index][$i] . "='";
                         $select_query .= $array_insert[$matching_table_index][$insert_row][$matching_tables_keys[$matching_table_index][$i]] . "'" ;
 
-                        if ($i < (sizeof($matching_tables_keys[$matching_table_index]) - 1)) {
+                        if ($i < (count($matching_tables_keys[$matching_table_index]) - 1)) {
                             $select_query.= " AND ";
                         }
                     }
@@ -556,7 +556,7 @@ function PMA_insertIntoTargetTable($matching_table, $src_db, $trg_db, $src_link,
                     $result = PMA_DBI_fetch_result($select_query, null, null, $src_link);
                     $insert_query = "INSERT INTO " . PMA_backquote($trg_db) . "." . PMA_backquote($matching_table[$matching_table_index]) ." (";
 
-                    for ($field_index = 0; $field_index < sizeof($table_fields[$matching_table_index]); $field_index++) {
+                    for ($field_index = 0; $field_index < count($table_fields[$matching_table_index]); $field_index++) {
                         $insert_query .=  PMA_backquote($table_fields[$matching_table_index][$field_index]);
 
                         $is_fk_query = "SELECT * FROM  information_schema.KEY_COLUMN_USAGE WHERE TABLE_SCHEMA = '" . $trg_db ."'
@@ -564,8 +564,8 @@ function PMA_insertIntoTargetTable($matching_table, $src_db, $trg_db, $src_link,
                                          $table_fields[$matching_table_index][$field_index] . "' AND TABLE_NAME <> REFERENCED_TABLE_NAME;" ;
 
                         $is_fk_result = PMA_DBI_fetch_result($is_fk_query, null, null, $trg_link);
-                        if (sizeof($is_fk_result) > 0) {
-                            for ($j = 0; $j < sizeof($is_fk_result); $j++) {
+                        if (count($is_fk_result) > 0) {
+                            for ($j = 0; $j < count($is_fk_result); $j++) {
                                 $table_index = array_keys($matching_table, $is_fk_result[$j]['REFERENCED_TABLE_NAME']);
 
                                 if (isset($alter_str_array[$table_index[0]])) {
@@ -627,21 +627,21 @@ function PMA_insertIntoTargetTable($matching_table, $src_db, $trg_db, $src_link,
                                 }
                             }
                         }
-                        if ($field_index < sizeof($table_fields[$matching_table_index])-1) {
+                        if ($field_index < count($table_fields[$matching_table_index])-1) {
                             $insert_query .= ", ";
                         }
                     }
                     $insert_query .= ") VALUES(";
-                    if (sizeof($table_fields[$matching_table_index]) == 1) {
+                    if (count($table_fields[$matching_table_index]) == 1) {
                          $insert_query .= "'" . PMA_sqlAddSlashes($result[0]) . "'";
                     } else {
-                        for ($field_index = 0; $field_index < sizeof($table_fields[$matching_table_index]); $field_index++) {
+                        for ($field_index = 0; $field_index < count($table_fields[$matching_table_index]); $field_index++) {
                             if (isset($result[0][$table_fields[$matching_table_index][$field_index]])) {
                                 $insert_query .= "'" . PMA_sqlAddSlashes($result[0][$table_fields[$matching_table_index][$field_index]]) . "'";
                             } else {
                                 $insert_query .= "'NULL'";
                             }
-                            if ($field_index < (sizeof($table_fields[$matching_table_index])) - 1) {
+                            if ($field_index < (count($table_fields[$matching_table_index])) - 1) {
                                     $insert_query .= " ," ;
                             }
                         }
@@ -699,8 +699,8 @@ function PMA_createTargetTables($src_db, $trg_db, $src_link, $trg_link,
                         AND TABLE_NAME = '" . $uncommon_tables[$table_index] . "' AND TABLE_NAME <> REFERENCED_TABLE_NAME;" ;
 
         $is_fk_result = PMA_DBI_fetch_result($is_fk_query, null, null, $src_link);
-        if (sizeof($is_fk_result) > 0) {
-            for ($j = 0; $j < sizeof($is_fk_result); $j++) {
+        if (count($is_fk_result) > 0) {
+            for ($j = 0; $j < count($is_fk_result); $j++) {
                 if (in_array($is_fk_result[$j]['REFERENCED_TABLE_NAME'], $uncommon_tables)) {
                     $table_index = array_keys($uncommon_tables, $is_fk_result[$j]['REFERENCED_TABLE_NAME']);
                     PMA_createTargetTables($src_db, $trg_db, $trg_link, $src_link, $uncommon_tables, $table_index[0], $uncommon_tables_fields, $display);
@@ -783,18 +783,18 @@ function PMA_populateTargetTables($src_db, $trg_db, $src_link, $trg_link,
 function PMA_deleteFromTargetTable($trg_db, $trg_link, $matching_tables,
     $table_index, $target_tables_keys, $delete_array, $display
 ) {
-    for ($i = 0; $i < sizeof($delete_array[$table_index]); $i++) {
+    for ($i = 0; $i < count($delete_array[$table_index]); $i++) {
         if (isset($target_tables_keys[$table_index])) {
             $delete_query = 'DELETE FROM ' . PMA_backquote($trg_db) . '.' .PMA_backquote($matching_tables[$table_index]) . ' WHERE ';
-            for ($y = 0; $y < sizeof($target_tables_keys[$table_index]); $y++) {
+            for ($y = 0; $y < count($target_tables_keys[$table_index]); $y++) {
                 $delete_query .= PMA_backquote($target_tables_keys[$table_index][$y]) . " = '";
 
-                if (sizeof($target_tables_keys[$table_index]) == 1) {
+                if (count($target_tables_keys[$table_index]) == 1) {
                     $delete_query .= $delete_array[$table_index][$i] . "'";
-                } elseif (sizeof($target_tables_keys[$table_index]) > 1) {
+                } elseif (count($target_tables_keys[$table_index]) > 1) {
                     $delete_query .= $delete_array[$table_index][$i][$target_tables_keys[$table_index][$y]] . "'";
                 }
-                if ($y < (sizeof($target_tables_keys[$table_index]) - 1)) {
+                if ($y < (count($target_tables_keys[$table_index]) - 1)) {
                     $delete_query .= ' AND ';
                 }
                 $pk_query = "SELECT * FROM information_schema.KEY_COLUMN_USAGE WHERE REFERENCED_TABLE_SCHEMA = '" . $trg_db . "'
@@ -802,7 +802,7 @@ function PMA_deleteFromTargetTable($trg_db, $trg_link, $matching_tables,
                            . $target_tables_keys[$table_index][$y] . "' AND TABLE_NAME <> REFERENCED_TABLE_NAME;";
 
                 $pk_query_result = PMA_DBI_fetch_result($pk_query, null, null, $trg_link);
-                $result_size = sizeof($pk_query_result);
+                $result_size = count($pk_query_result);
 
                 if ($result_size > 0) {
                     for ($b = 0; $b < $result_size; $b++) {
@@ -890,7 +890,7 @@ function PMA_structureDiffInTables($src_db, $trg_db, $src_link, $trg_link,
         if (isset($target_columns[$matching_table_index][$column_name]['Field'])) {
             //If column exists in target table then matches criteria like type,
             // null, collation, key, default, comment of the column
-            for ($i = 0; $i < sizeof($criteria); $i++) {
+            for ($i = 0; $i < count($criteria); $i++) {
                 if ($source_columns[$matching_table_index][$column_name][$criteria[$i]] != $target_columns[$matching_table_index][$column_name][$criteria[$i]]) {
                     if (($criteria[$i] == 'Default') && ($source_columns[$matching_table_index][$column_name][$criteria[$i]] == '' )) {
                         $alter_str_array[$matching_table_index][$column_name][$criteria[$i]] = 'None';
@@ -956,7 +956,7 @@ function PMA_addColumnsInTargetTable($src_db, $trg_db, $src_link, $trg_link,
     $criteria, $matching_tables_keys, $target_tables_keys, $uncommon_tables,
     &$uncommon_tables_fields, $table_counter, $uncommon_cols, $display
 ) {
-    for ($i = 0; $i < sizeof($matching_tables_fields[$table_counter]); $i++) {
+    for ($i = 0; $i < count($matching_tables_fields[$table_counter]); $i++) {
         if (isset($add_column_array[$table_counter][$matching_tables_fields[$table_counter][$i]])) {
             $query = "ALTER TABLE " . PMA_backquote($trg_db) . '.' . PMA_backquote($matching_tables[$table_counter]). " ADD COLUMN " .
             PMA_backquote($add_column_array[$table_counter][$matching_tables_fields[$table_counter][$i]]) . " " . $source_columns[$table_counter][$matching_tables_fields[$table_counter][$i]]['Type'];
@@ -976,7 +976,7 @@ function PMA_addColumnsInTargetTable($src_db, $trg_db, $src_link, $trg_link,
                 $query .= " COMMENT " . $source_columns[$table_counter][$matching_tables_fields[$table_counter][$i]]['Comment'];
             }
             if ($source_columns[$table_counter][$matching_tables_fields[$table_counter][$i]]['Key'] == 'PRI' ) {
-                $trg_key_size = sizeof($target_tables_keys[$table_counter]);
+                $trg_key_size = count($target_tables_keys[$table_counter]);
                 if ($trg_key_size) {
                     $check = true;
                     for ($a = 0; ($a < $trg_key_size) && ($check); $a++) {
@@ -989,9 +989,9 @@ function PMA_addColumnsInTargetTable($src_db, $trg_db, $src_link, $trg_link,
                     }
                 }
                 $query .= " , ADD PRIMARY KEY (";
-                for ($t = 0; $t < sizeof($matching_tables_keys[$table_counter]); $t++) {
+                for ($t = 0; $t < count($matching_tables_keys[$table_counter]); $t++) {
                     $query .= PMA_backquote($matching_tables_keys[$table_counter][$t]);
-                    if ($t < (sizeof($matching_tables_keys[$table_counter]) - 1)) {
+                    if ($t < (count($matching_tables_keys[$table_counter]) - 1)) {
                         $query .= " , " ;
                     }
                 }
@@ -1053,8 +1053,8 @@ function PMA_checkForeignKeys($src_db, $src_link, $trg_db, $trg_link,
                     AND TABLE_NAME = '" . $referenced_table . "' AND TABLE_NAME <> REFERENCED_TABLE_NAME;";
 
     $is_fk_result = PMA_DBI_fetch_result($is_fk_query, null, null, $src_link);
-    if (sizeof($is_fk_result) > 0) {
-        for ($j = 0; $j < sizeof($is_fk_result); $j++) {
+    if (count($is_fk_result) > 0) {
+        for ($j = 0; $j < count($is_fk_result); $j++) {
             if (in_array($is_fk_result[$j]['REFERENCED_TABLE_NAME'], $uncommon_tables)) {
                 $table_index = array_keys($uncommon_tables, $is_fk_result[$j]['REFERENCED_TABLE_NAME']);
                 PMA_checkForeignKeys(
@@ -1096,7 +1096,7 @@ function PMA_alterTargetTableStructure($trg_db, $trg_link, $matching_tables,
     $found = false;
 
     //Checks if the criteria to be altered is primary key
-    for ($v = 0; $v < sizeof($matching_tables_fields[$matching_table_index]); $v++) {
+    for ($v = 0; $v < count($matching_tables_fields[$matching_table_index]); $v++) {
         if (isset($alter_str_array[$matching_table_index][$matching_tables_fields[$matching_table_index][$v]]['Key'])) {
             if ($alter_str_array[$matching_table_index][$matching_tables_fields[$matching_table_index][$v]]['Key'] == 'PRI' ) {
                 $check = false;
@@ -1107,13 +1107,13 @@ function PMA_alterTargetTableStructure($trg_db, $trg_link, $matching_tables,
     $pri_query = null;
     if (! $check) {
         $pri_query = "ALTER TABLE " . PMA_backquote($trg_db) . '.' . PMA_backquote($matching_tables[$matching_table_index]);
-        if (sizeof($target_tables_keys[$matching_table_index]) > 0) {
+        if (count($target_tables_keys[$matching_table_index]) > 0) {
             $pri_query .= "  DROP PRIMARY KEY ," ;
         }
         $pri_query .= "  ADD PRIMARY KEY (";
-        for ($z = 0; $z < sizeof($matching_tables_keys[$matching_table_index]); $z++) {
+        for ($z = 0; $z < count($matching_tables_keys[$matching_table_index]); $z++) {
             $pri_query .= PMA_backquote($matching_tables_keys[$matching_table_index][$z]);
-            if ($z < (sizeof($matching_tables_keys[$matching_table_index]) - 1)) {
+            if ($z < (count($matching_tables_keys[$matching_table_index]) - 1)) {
                 $pri_query .= " , " ;
             }
         }
@@ -1126,12 +1126,12 @@ function PMA_alterTargetTableStructure($trg_db, $trg_link, $matching_tables,
         }
         PMA_DBI_try_query($pri_query, $trg_link, 0);
     }
-    for ($t = 0; $t < sizeof($matching_tables_fields[$matching_table_index]); $t++) {
-        if ((isset($alter_str_array[$matching_table_index][$matching_tables_fields[$matching_table_index][$t]])) && (sizeof($alter_str_array[$matching_table_index][$matching_tables_fields[$matching_table_index][$t]]) > 0)) {
+    for ($t = 0; $t < count($matching_tables_fields[$matching_table_index]); $t++) {
+        if ((isset($alter_str_array[$matching_table_index][$matching_tables_fields[$matching_table_index][$t]])) && (count($alter_str_array[$matching_table_index][$matching_tables_fields[$matching_table_index][$t]]) > 0)) {
             $sql_query = 'ALTER TABLE ' . PMA_backquote($trg_db) . '.' . PMA_backquote($matching_tables[$matching_table_index]) . ' MODIFY ' .
             PMA_backquote($matching_tables_fields[$matching_table_index][$t]) . ' ' . $source_columns[$matching_table_index][$matching_tables_fields[$matching_table_index][$t]]['Type'];
             $found = false;
-            for ($i = 0; $i < sizeof($criteria); $i++) {
+            for ($i = 0; $i < count($criteria); $i++) {
                 if (isset($alter_str_array[$matching_table_index][$matching_tables_fields[$matching_table_index][$t]][$criteria[$i]]) && $criteria[$i] != 'Key') {
                     $found = true;
                     if (($criteria[$i] == 'Type') && (! isset($alter_str_array[$matching_table_index][$matching_tables_fields[$matching_table_index][$t]][$criteria[$i+1]]))) {
@@ -1190,12 +1190,12 @@ function PMA_alterTargetTableStructure($trg_db, $trg_link, $matching_tables,
     $check = false;
     $query = "ALTER TABLE " . PMA_backquote($trg_db) . '.'
         . PMA_backquote($matching_tables[$matching_table_index]);
-    for ($p = 0; $p < sizeof($matching_tables_keys[$matching_table_index]); $p++) {
+    for ($p = 0; $p < count($matching_tables_keys[$matching_table_index]); $p++) {
         if ((isset($alter_str_array[$matching_table_index][$matching_tables_keys[$matching_table_index][$p]]['Key']))) {
             $check = true;
             $query .= ' MODIFY ' . PMA_backquote($matching_tables_keys[$matching_table_index][$p]) . ' '
             . $source_columns[$matching_table_index][$matching_tables_fields[$matching_table_index][$p]]['Type'] . ' Not Null ';
-            if ($p < (sizeof($matching_tables_keys[$matching_table_index]) - 1)) {
+            if ($p < (count($matching_tables_keys[$matching_table_index]) - 1)) {
                 $query .= ', ';
             }
         }
@@ -1229,14 +1229,14 @@ function PMA_removeColumnsFromTargetTable($trg_db, $trg_link, $matching_tables,
     if (isset($uncommon_columns[$table_counter])) {
         $drop_query = "ALTER TABLE " . PMA_backquote($trg_db) . "."
             . PMA_backquote($matching_tables[$table_counter]);
-        for ($a = 0; $a < sizeof($uncommon_columns[$table_counter]); $a++) {
+        for ($a = 0; $a < count($uncommon_columns[$table_counter]); $a++) {
             //Checks if column to be removed is a foreign key in any table
             $pk_query = "SELECT * FROM information_schema.KEY_COLUMN_USAGE WHERE REFERENCED_TABLE_SCHEMA = '" . $trg_db . "'
                          AND REFERENCED_TABLE_NAME = '" . $matching_tables[$table_counter]."' AND REFERENCED_COLUMN_NAME = '"
                          . $uncommon_columns[$table_counter][$a] . "' AND TABLE_NAME <> REFERENCED_TABLE_NAME;";
 
             $pk_query_result = PMA_DBI_fetch_result($pk_query, null, null, $trg_link);
-            $result_size = sizeof($pk_query_result);
+            $result_size = count($pk_query_result);
 
             if ($result_size > 0) {
                 for ($b = 0; $b < $result_size; $b++) {
@@ -1251,11 +1251,11 @@ function PMA_removeColumnsFromTargetTable($trg_db, $trg_link, $matching_tables,
 
             $result = PMA_DBI_fetch_result($query, null, null, $trg_link);
 
-            if (sizeof($result) > 0) {
+            if (count($result) > 0) {
                 $drop_query .= " DROP FOREIGN KEY " . PMA_backquote($result[0]['CONSTRAINT_NAME']) . ",";
             }
             $drop_query .=  " DROP COLUMN " . PMA_backquote($uncommon_columns[$table_counter][$a]);
-            if ($a < (sizeof($uncommon_columns[$table_counter]) - 1)) {
+            if ($a < (count($uncommon_columns[$table_counter]) - 1)) {
                 $drop_query .= " , " ;
             }
         }
@@ -1298,14 +1298,14 @@ function PMA_indexesDiffInTables($src_db, $trg_db, $src_link, $trg_link,
     //Gets indexes information for source and target table
     $source_indexes[$table_counter] = PMA_DBI_get_table_indexes($src_db, $matching_tables[$table_counter], $src_link);
     $target_indexes[$table_counter] = PMA_DBI_get_table_indexes($trg_db, $matching_tables[$table_counter], $trg_link);
-    for ($a = 0; $a < sizeof($source_indexes[$table_counter]); $a++) {
+    for ($a = 0; $a < count($source_indexes[$table_counter]); $a++) {
         $found = false;
         $z = 0;
         //Compares key name and non_unique characteristic of source indexes with target indexes
         /*
          * @todo compare the length of each sub part
          */
-        while (($z <= sizeof($target_indexes[$table_counter])) && ($found == false)) {
+        while (($z <= count($target_indexes[$table_counter])) && ($found == false)) {
             if (isset($source_indexes[$table_counter][$a]) && isset($target_indexes[$table_counter][$z]) && $source_indexes[$table_counter][$a]['Key_name'] == $target_indexes[$table_counter][$z]['Key_name']) {
                 $found = true;
                 if (($source_indexes[$table_counter][$a]['Column_name'] != $target_indexes[$table_counter][$z]['Column_name']) || ($source_indexes[$table_counter][$a]['Non_unique'] != $target_indexes[$table_counter][$z]['Non_unique'])) {
@@ -1324,10 +1324,10 @@ function PMA_indexesDiffInTables($src_db, $trg_db, $src_link, $trg_link,
     }
 
     //Finds indexes that exist on target table but not on source table
-    for ($b = 0; $b < sizeof($target_indexes[$table_counter]); $b++) {
+    for ($b = 0; $b < count($target_indexes[$table_counter]); $b++) {
         $found = false;
         $c = 0;
-        while (($c <= sizeof($source_indexes[$table_counter])) && ($found == false)) {
+        while (($c <= count($source_indexes[$table_counter])) && ($found == false)) {
             if ($target_indexes[$table_counter][$b]['Column_name'] == $source_indexes[$table_counter][$c]['Column_name']) {
                 $found = true;
             }
@@ -1365,9 +1365,9 @@ function PMA_applyIndexesDiff($trg_db, $trg_link, $matching_tables, $source_inde
     //Adds indexes on target table
     if (isset($add_indexes_array[$table_counter])) {
         $sql = "ALTER TABLE " . PMA_backquote($trg_db) . "." . PMA_backquote($matching_tables[$table_counter]) . " ADD" ;
-        for ($a = 0; $a < sizeof($source_indexes[$table_counter]); $a++) {
+        for ($a = 0; $a < count($source_indexes[$table_counter]); $a++) {
             if (isset($add_indexes_array[$table_counter][$a])) {
-                for ($b = 0; $b < sizeof($source_indexes[$table_counter]); $b++) {
+                for ($b = 0; $b < count($source_indexes[$table_counter]); $b++) {
                     if ($source_indexes[$table_counter][$b]['Column_name'] == $add_indexes_array[$table_counter][$a]) {
                         if ($source_indexes[$table_counter][$b]['Non_unique'] == '0') {
                             $sql .= " UNIQUE ";
@@ -1386,11 +1386,11 @@ function PMA_applyIndexesDiff($trg_db, $trg_link, $matching_tables, $source_inde
 
     if (isset($alter_indexes_array[$table_counter])) {
         $query = "ALTER TABLE " . PMA_backquote($trg_db) . "." . PMA_backquote($matching_tables[$table_counter]);
-        for ($a = 0; $a < sizeof($alter_indexes_array[$table_counter]); $a++) {
+        for ($a = 0; $a < count($alter_indexes_array[$table_counter]); $a++) {
             if (isset($alter_indexes_array[$table_counter][$a])) {
                 $query .= ' DROP INDEX ' . PMA_backquote($alter_indexes_array[$table_counter][$a]) . " , ADD ";
                 $got_first_index_column = false;
-                for ($z = 0; $z < sizeof($source_indexes[$table_counter]); $z++) {
+                for ($z = 0; $z < count($source_indexes[$table_counter]); $z++) {
                     if ($source_indexes[$table_counter][$z]['Key_name'] == $alter_indexes_array[$table_counter][$a]) {
                         if (! $got_first_index_column) {
                             if ($source_indexes[$table_counter][$z]['Non_unique'] == '0') {
@@ -1416,11 +1416,11 @@ function PMA_applyIndexesDiff($trg_db, $trg_link, $matching_tables, $source_inde
     //Removes indexes from target table
     if (isset($remove_indexes_array[$table_counter])) {
         $drop_index_query = "ALTER TABLE " . PMA_backquote($trg_db) . "." . PMA_backquote($matching_tables[$table_counter]);
-        for ($a = 0; $a < sizeof($target_indexes[$table_counter]); $a++) {
+        for ($a = 0; $a < count($target_indexes[$table_counter]); $a++) {
             if (isset($remove_indexes_array[$table_counter][$a])) {
                 $drop_index_query .= " DROP INDEX " . PMA_backquote($remove_indexes_array[$table_counter][$a]);
             }
-            if ($a < (sizeof($remove_indexes_array[$table_counter]) - 1)) {
+            if ($a < (count($remove_indexes_array[$table_counter]) - 1)) {
                 $drop_index_query .= " , " ;
             }
         }
@@ -1543,9 +1543,9 @@ function PMA_syncDisplayDataCompare($rows)
 function PMA_getColumnValues($database, $table, $column, $link = null)
 {
     $query = 'SELECT ';
-    for ($i=0; $i< sizeof($column); $i++) {
+    for ($i=0; $i< count($column); $i++) {
         $query.= PMA_backquote($column[$i]);
-        if ($i < (sizeof($column)-1)) {
+        if ($i < (count($column)-1)) {
             $query.= ', ';
         }
     }

From d28ac79fc375a133149c009d19c97116b94423c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <mcihar@suse.cz>
Date: Tue, 29 May 2012 16:47:29 +0200
Subject: [PATCH 08/29] Coding style improvement

---
 libraries/server_synchronize.lib.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/server_synchronize.lib.php b/libraries/server_synchronize.lib.php
index 0507177ead..21d05fabb0 100644
--- a/libraries/server_synchronize.lib.php
+++ b/libraries/server_synchronize.lib.php
@@ -1543,7 +1543,7 @@ function PMA_syncDisplayDataCompare($rows)
 function PMA_getColumnValues($database, $table, $column, $link = null)
 {
     $query = 'SELECT ';
-    for ($i=0; $i< count($column); $i++) {
+    for ($i = 0; $i < count($column); $i++) {
         $query.= PMA_backquote($column[$i]);
         if ($i < (count($column)-1)) {
             $query.= ', ';

From 234e432323dbc677e2fd6243db3cf226be5d056e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <mcihar@suse.cz>
Date: Tue, 29 May 2012 16:48:16 +0200
Subject: [PATCH 09/29] Reformat comments

---
 libraries/server_synchronize.lib.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/libraries/server_synchronize.lib.php b/libraries/server_synchronize.lib.php
index 21d05fabb0..b3098ca781 100644
--- a/libraries/server_synchronize.lib.php
+++ b/libraries/server_synchronize.lib.php
@@ -1004,15 +1004,16 @@ function PMA_addColumnsInTargetTable($src_db, $trg_db, $src_link, $trg_link,
             }
             PMA_DBI_try_query($query, $trg_link, 0);
 
-            //Checks if column to be added is a foreign key or not
+            // Checks if column to be added is a foreign key or not
             $is_fk_query = "SELECT * FROM  information_schema.KEY_COLUMN_USAGE WHERE TABLE_SCHEMA = '" . $trg_db . "' AND TABLE_NAME = '"
             . $matching_tables[$table_counter] . "' AND COLUMN_NAME ='" . $add_column_array[$table_counter][$matching_tables_fields[$table_counter][$i]] .
             "' AND TABLE_NAME <> REFERENCED_TABLE_NAME;";
 
             $is_fk_result = PMA_DBI_fetch_result($is_fk_query, null, null, $src_link);
 
-            //If column is a foreign key then it is checked that referenced table exist in target db. If referenced table does not exist in target db then
-            //it is created first.
+            // If column is a foreign key then it is checked that referenced table
+            // exist in target db. If referenced table does not exist in target
+            // db then it is created first.
             if (isset($is_fk_result)) {
                 if (in_array($is_fk_result[0]['REFERENCED_TABLE_NAME'], $uncommon_tables)) {
                     $table_index = array_keys($uncommon_tables, $is_fk_result[0]['REFERENCED_TABLE_NAME']);

From 5139585b6cf959eba075d25cc4ca9970790a8dfc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <mcihar@suse.cz>
Date: Tue, 29 May 2012 16:51:56 +0200
Subject: [PATCH 10/29] Wrap some function calls

---
 libraries/server_synchronize.lib.php | 93 +++++++++++++++++++++-------
 1 file changed, 72 insertions(+), 21 deletions(-)

diff --git a/libraries/server_synchronize.lib.php b/libraries/server_synchronize.lib.php
index b3098ca781..c1349ef74c 100644
--- a/libraries/server_synchronize.lib.php
+++ b/libraries/server_synchronize.lib.php
@@ -176,7 +176,12 @@ function PMA_dataDiffInTables($src_db, $trg_db, $src_link, $trg_link,
                     }
                 }
 
-                $target_result_set = PMA_DBI_fetch_result($trg_select_query, null, null, $trg_link);
+                $target_result_set = PMA_DBI_fetch_result(
+                    $trg_select_query,
+                    null,
+                    null,
+                    $trg_link
+                );
                 if ($target_result_set) {
 
                     // Fetch the row from the source server to do a comparison
@@ -198,7 +203,12 @@ function PMA_dataDiffInTables($src_db, $trg_db, $src_link, $trg_link,
                         }
                     }
 
-                    $src_result_set = PMA_DBI_fetch_result($src_select_query, null, null, $src_link);
+                    $src_result_set = PMA_DBI_fetch_result(
+                        $src_select_query,
+                        null,
+                        null,
+                        $src_link
+                    );
 
                     /**
                     * Comparing each corresponding field of the source and target
@@ -570,29 +580,46 @@ function PMA_insertIntoTargetTable($matching_table, $src_db, $trg_db, $src_link,
 
                                 if (isset($alter_str_array[$table_index[0]])) {
                                     PMA_alterTargetTableStructure(
-                                        $trg_db, $trg_link, $matching_tables, $source_columns, $alter_str_array, $matching_tables_fields,
-                                        $criteria, $matching_tables_keys, $target_tables_keys, $table_index[0], $display
+                                        $trg_db, $trg_link, $matching_tables,
+                                        $source_columns, $alter_str_array,
+                                        $matching_tables_fields,
+                                        $criteria, $matching_tables_keys,
+                                        $target_tables_keys, $table_index[0],
+                                        $display
                                     );
                                     unset($alter_str_array[$table_index[0]]);
                                 }
                                 if (isset($uncommon_columns[$table_index[0]])) {
-                                    PMA_removeColumnsFromTargetTable($trg_db, $trg_link, $matching_tables, $uncommon_columns, $table_index[0], $display);
+                                    PMA_removeColumnsFromTargetTable(
+                                        $trg_db, $trg_link, $matching_tables,
+                                        $uncommon_columns, $table_index[0], $display
+                                    );
                                     unset($uncommon_columns[$table_index[0]]);
                                 }
                                 if (isset($add_column_array[$table_index[0]])) {
                                     PMA_findDeleteRowsFromTargetTables(
-                                        $delete_array, $matching_tables, $table_index[0], $target_tables_keys,
-                                        $matching_tables_keys, $trg_db, $trg_link, $src_db, $src_link
+                                        $delete_array, $matching_tables,
+                                        $table_index[0], $target_tables_keys,
+                                        $matching_tables_keys, $trg_db,
+                                        $trg_link, $src_db, $src_link
                                     );
 
                                     if (isset($delete_array[$table_index[0]])) {
-                                        PMA_deleteFromTargetTable($trg_db, $trg_link, $matching_tables, $table_index[0], $target_tables_keys, $delete_array, $display);
+                                        PMA_deleteFromTargetTable(
+                                            $trg_db, $trg_link, $matching_tables,
+                                            $table_index[0], $target_tables_keys,
+                                            $delete_array, $display
+                                        );
                                         unset($delete_array[$table_index[0]]);
                                     }
                                     PMA_addColumnsInTargetTable(
-                                        $src_db, $trg_db, $src_link, $trg_link, $matching_tables, $source_columns, $add_column_array,
-                                        $matching_tables_fields, $criteria, $matching_tables_keys, $target_tables_keys, $uncommon_tables,
-                                        $uncommon_tables_fields, $table_index[0], $uncommon_cols, $display
+                                        $src_db, $trg_db, $src_link, $trg_link,
+                                        $matching_tables, $source_columns,
+                                        $add_column_array, $matching_tables_fields,
+                                        $criteria, $matching_tables_keys,
+                                        $target_tables_keys, $uncommon_tables,
+                                        $uncommon_tables_fields, $table_index[0],
+                                        $uncommon_cols, $display
                                     );
                                     unset($add_column_array[$table_index[0]]);
                                 }
@@ -601,8 +628,11 @@ function PMA_insertIntoTargetTable($matching_table, $src_db, $trg_db, $src_link,
                                     || isset($alter_indexes_array[$table_index[0]])
                                 ) {
                                     PMA_applyIndexesDiff(
-                                        $trg_db, $trg_link, $matching_tables, $source_indexes, $target_indexes, $add_indexes_array,
-                                        $alter_indexes_array, $remove_indexes_array, $table_index[0], $display
+                                        $trg_db, $trg_link, $matching_tables,
+                                        $source_indexes, $target_indexes,
+                                        $add_indexes_array, $alter_indexes_array,
+                                        $remove_indexes_array, $table_index[0],
+                                        $display
                                     );
 
                                     unset($add_indexes_array[$table_index[0]]);
@@ -611,17 +641,26 @@ function PMA_insertIntoTargetTable($matching_table, $src_db, $trg_db, $src_link,
                                 }
                                 if (isset($update_array[$table_index[0]])) {
                                     PMA_updateTargetTables(
-                                        $matching_tables, $update_array, $src_db, $trg_db, $trg_link,
-                                        $table_index[0], $matching_table_keys, $display
+                                        $matching_tables, $update_array,
+                                        $src_db, $trg_db, $trg_link,
+                                        $table_index[0], $matching_table_keys,
+                                        $display
                                     );
                                     unset($update_array[$table_index[0]]);
                                 }
                                 if (isset($array_insert[$table_index[0]])) {
                                      PMA_insertIntoTargetTable(
-                                         $matching_table, $src_db, $trg_db, $src_link, $trg_link, $table_fields, $array_insert, $table_index[0],
-                                         $matching_tables_keys, $source_columns, $add_column_array, $criteria, $target_tables_keys, $uncommon_tables,
-                                         $uncommon_tables_fields, $uncommon_cols, $alter_str_array, $source_indexes, $target_indexes, $add_indexes_array,
-                                         $alter_indexes_array, $delete_array, $update_array, $display
+                                         $matching_table, $src_db, $trg_db,
+                                         $src_link, $trg_link, $table_fields,
+                                         $array_insert, $table_index[0],
+                                         $matching_tables_keys, $source_columns,
+                                         $add_column_array, $criteria,
+                                         $target_tables_keys, $uncommon_tables,
+                                         $uncommon_tables_fields, $uncommon_cols,
+                                         $alter_str_array, $source_indexes,
+                                         $target_indexes, $add_indexes_array,
+                                         $alter_indexes_array, $delete_array,
+                                         $update_array, $display
                                      );
                                      unset($array_insert[$table_index[0]]);
                                 }
@@ -677,7 +716,13 @@ function PMA_createTargetTables($src_db, $trg_db, $src_link, $trg_link,
     &$uncommon_tables, $table_index, &$uncommon_tables_fields, $display
 ) {
     if (isset($uncommon_tables[$table_index])) {
-        $fields_result = PMA_DBI_get_columns($src_db, $uncommon_tables[$table_index], null, true, $src_link);
+        $fields_result = PMA_DBI_get_columns(
+            $src_db,
+            $uncommon_tables[$table_index],
+            null,
+            true,
+            $src_link
+        );
         $fields = array();
         foreach ($fields_result as $each_field) {
             $field_name = $each_field['Field'];
@@ -685,7 +730,13 @@ function PMA_createTargetTables($src_db, $trg_db, $src_link, $trg_link,
         }
         $uncommon_tables_fields[$table_index] = $fields;
 
-        $Create_Query = PMA_DBI_fetch_value("SHOW CREATE TABLE " . PMA_backquote($src_db) . '.' . PMA_backquote($uncommon_tables[$table_index]), 0, 1, $src_link);
+        $Create_Query = PMA_DBI_fetch_value(
+            "SHOW CREATE TABLE " . PMA_backquote($src_db) . '.'
+            . PMA_backquote($uncommon_tables[$table_index]),
+            0,
+            1,
+            $src_link
+        );
 
         // Replace the src table name with a `dbname`.`tablename`
         $Create_Table_Query = preg_replace(

From 37c289adcaf07e549957b402713a6bcc7c470803 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <mcihar@suse.cz>
Date: Tue, 29 May 2012 17:01:37 +0200
Subject: [PATCH 11/29] Allow to specify file name to getImgPath

---
 libraries/Theme.class.php | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/libraries/Theme.class.php b/libraries/Theme.class.php
index d0eccf7828..818e1d1420 100644
--- a/libraries/Theme.class.php
+++ b/libraries/Theme.class.php
@@ -303,12 +303,18 @@ class PMA_Theme
     /**
      * Returns the path to images for the theme
      *
+     * @param string $file file name for image
+     *
      * @access public
      * @return string image path for this theme
      */
-    public function getImgPath()
+    public function getImgPath($file = null)
     {
-        return $this->img_path;
+        if (is_null($file) {
+            return $this->img_path;
+        } else {
+            return $this->img_path . $file;
+        }
     }
 
     /**

From 39df7de25b6e1e266e86727abcc7ce4630ffb56a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <mcihar@suse.cz>
Date: Tue, 29 May 2012 17:05:42 +0200
Subject: [PATCH 12/29] Whitespace cleanup

---
 libraries/config.default.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/libraries/config.default.php b/libraries/config.default.php
index ba0e9e1e35..5ec68f017d 100644
--- a/libraries/config.default.php
+++ b/libraries/config.default.php
@@ -518,9 +518,9 @@ $cfg['Servers'][$i]['tracking_add_drop_table'] = true;
 $cfg['Servers'][$i]['tracking_add_drop_database'] = true;
 
 /**
- * Enables caching of TABLE STATUS outputs for specific databases on this server 
- * (in some cases TABLE STATUS can be very slow, so you may want to cache it). 
- * APC is used (if the PHP extension is available, if not, this setting is ignored 
+ * Enables caching of TABLE STATUS outputs for specific databases on this server
+ * (in some cases TABLE STATUS can be very slow, so you may want to cache it).
+ * APC is used (if the PHP extension is available, if not, this setting is ignored
  * silently). You have to provide StatusCacheLifetime.
  * Takes effect only if DisableIS is true.
  *

From 4cf1d610cd494558ac5147671a90c25d4371d897 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <mcihar@suse.cz>
Date: Tue, 29 May 2012 17:06:46 +0200
Subject: [PATCH 13/29] Fallback to fallback theme for images not found in
 existing

---
 libraries/Theme.class.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/libraries/Theme.class.php b/libraries/Theme.class.php
index 818e1d1420..6435550324 100644
--- a/libraries/Theme.class.php
+++ b/libraries/Theme.class.php
@@ -313,7 +313,11 @@ class PMA_Theme
         if (is_null($file) {
             return $this->img_path;
         } else {
-            return $this->img_path . $file;
+            if (is_readable($this->img_path . $file)) {
+                return $this->img_path . $file;
+            } else {
+                return $GLOBALS['cfg']['ThemePath'] . '/' . PMA_Theme_Manager::FALLBACK_THEME . '/img/' . $file;
+            }
         }
     }
 

From e4f3bfd40482e4389ba34ad7052ac13149aac35d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <mcihar@suse.cz>
Date: Tue, 29 May 2012 17:07:45 +0200
Subject: [PATCH 14/29] Use new syntax for loading pmd images

---
 themes/pmahomme/css/pmd.css.php | 46 ++++++++++++++++-----------------
 1 file changed, 23 insertions(+), 23 deletions(-)

diff --git a/themes/pmahomme/css/pmd.css.php b/themes/pmahomme/css/pmd.css.php
index df192ffe5e..30c4736359 100644
--- a/themes/pmahomme/css/pmd.css.php
+++ b/themes/pmahomme/css/pmd.css.php
@@ -44,7 +44,7 @@ canvas.pmd * {
 }
 
 .tab_zag {
-    background-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>pmd/Header.png);
+    background-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath('pmd/Header.png'); ?>);
     background-repeat: repeat-x;
     text-align: center;
     cursor: move;
@@ -53,7 +53,7 @@ canvas.pmd * {
 }
 
 .tab_zag_2 {
-    background-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>pmd/Header_Linked.png);
+    background-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath('pmd/Header_Linked.png'); ?>);
     background-repeat: repeat-x;
     text-align: center;
     cursor: move;
@@ -108,7 +108,7 @@ canvas.pmd * {
     margin-left: 2px;
     text-align: left;
     background-color: #fff;
-    background-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>pmd/left_panel_butt.png);
+    background-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath('pmd/left_panel_butt.png'); ?>);
     border: #ccc solid 1px;
 }
 
@@ -142,7 +142,7 @@ canvas.pmd * {
     cursor: default;
     width: 1px;
     color: #000;
-    background-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>pmd/Header.png);
+    background-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath('pmd/Header.png'); ?>);
     background-repeat: repeat-x;
 }
 
@@ -150,7 +150,7 @@ canvas.pmd * {
     vertical-align: top;
     background-color: #0064ea;
     color: #fff;
-    background-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>pmd/small_tab.png);
+    background-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath('pmd/small_tab.png'); ?>);
     cursor: default;
     text-align: center;
     font-weight: bold;
@@ -174,7 +174,7 @@ canvas.pmd * {
 }
 
 .small_tab_pref {
-    background-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>pmd/Header.png);
+    background-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath('pmd/Header.png'); ?>);
     background-repeat: repeat-x;
     text-align: center;
     width: 1px;
@@ -226,35 +226,35 @@ canvas.pmd * {
 }
 
 .frams1 {
-    background: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>pmd/1.png) no-repeat right bottom;
+    background: url(<?php echo $_SESSION['PMA_Theme']->getImgPath('pmd/1.png'); ?>) no-repeat right bottom;
 }
 
 .frams2 {
-    background: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>pmd/2.png) no-repeat left bottom;
+    background: url(<?php echo $_SESSION['PMA_Theme']->getImgPath('pmd/2.png'); ?>) no-repeat left bottom;
 }
 
 .frams3 {
-    background: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>pmd/3.png) no-repeat left top;
+    background: url(<?php echo $_SESSION['PMA_Theme']->getImgPath('pmd/3.png'); ?>) no-repeat left top;
 }
 
 .frams4 {
-    background: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>pmd/4.png) no-repeat right top;
+    background: url(<?php echo $_SESSION['PMA_Theme']->getImgPath('pmd/4.png'); ?>) no-repeat right top;
 }
 
 .frams5 {
-    background: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>pmd/5.png) repeat-x center bottom;
+    background: url(<?php echo $_SESSION['PMA_Theme']->getImgPath('pmd/5.png'); ?>) repeat-x center bottom;
 }
 
 .frams6 {
-    background: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>pmd/6.png) repeat-y left;
+    background: url(<?php echo $_SESSION['PMA_Theme']->getImgPath('pmd/6.png'); ?>) repeat-y left;
 }
 
 .frams7 {
-    background: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>pmd/7.png) repeat-x top;
+    background: url(<?php echo $_SESSION['PMA_Theme']->getImgPath('pmd/7.png'); ?>) repeat-x top;
 }
 
 .frams8 {
-    background: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>pmd/8.png) repeat-y right;
+    background: url(<?php echo $_SESSION['PMA_Theme']->getImgPath('pmd/8.png'); ?>) repeat-y right;
 }
 
 #osn_tab {
@@ -270,7 +270,7 @@ canvas.pmd * {
     font-weight: bold;
     margin: 0;
     padding: 0;
-    background-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>pmd/top_panel.png);
+    background-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath('pmd/top_panel.png'); ?>);
     background-position: top;
     background-repeat: repeat-x;
     border-right: #999 solid 1px;
@@ -349,7 +349,7 @@ a.M_butt:hover {
 }
 
 #layer_menu_sizer {
-    background-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>pmd/resize.png);
+    background-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath('pmd/resize.png'); ?>);
     cursor: nw-resize;
     width: 16px;
     height: 16px;
@@ -375,7 +375,7 @@ a.trigger {
     top: 60px; right: 0;
     color: #fff;
     padding: 10px 40px 10px 15px;
-    background: #333 url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>pmd/plus.png) 85% 55% no-repeat;
+    background: #333 url(<?php echo $_SESSION['PMA_Theme']->getImgPath('pmd/plus.png'); ?>) 85% 55% no-repeat;
     border: 1px solid #444;
     display: block;
 }
@@ -386,18 +386,18 @@ a.trigger:hover {
     top: 60px; right: 0;
     color: #080808;
     padding: 10px 40px 10px 15px;
-    background: #fff696 url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>pmd/plus.png) 85% 55% no-repeat;
+    background: #fff696 url(<?php echo $_SESSION['PMA_Theme']->getImgPath('pmd/plus.png'); ?>) 85% 55% no-repeat;
     border: 1px solid #999;
     display: block;
 }
 
 a.active.trigger {
-    background: #222 url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>pmd/minus.png) 85% 55% no-repeat;
+    background: #222 url(<?php echo $_SESSION['PMA_Theme']->getImgPath('pmd/minus.png'); ?>) 85% 55% no-repeat;
     z-index: 999;
 }
 
 a.active.trigger:hover {
-    background: #fff696 url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>pmd/minus.png) 85% 55% no-repeat;
+    background: #fff696 url(<?php echo $_SESSION['PMA_Theme']->getImgPath('pmd/minus.png'); ?>) 85% 55% no-repeat;
     z-index: 999;
 }
 
@@ -414,7 +414,7 @@ h2.tiger {
 }
 
 h2.tiger a {
-    background-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>pmd/Header.png);
+    background-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath('pmd/Header.png'); ?>);
     text-align: center;
     text-decoration: none;
     color : #333;
@@ -423,11 +423,11 @@ h2.tiger a {
 
 h2.tiger a:hover {
     color: #000;
-    background-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>pmd/Header_Linked.png);
+    background-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath('pmd/Header_Linked.png'); ?>);
 }
 
 h2.active {
-    background-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>pmd/Header.png);
+    background-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath('pmd/Header.png'); ?>);
     background-repeat: repeat-x;
     padding: 1px;
     background-position: left bottom;

From 6b6020c5e88b9d9a00a69e8e34d3bbc0ed160fcc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <mcihar@suse.cz>
Date: Tue, 29 May 2012 17:10:25 +0200
Subject: [PATCH 15/29] Fix typo

---
 libraries/Theme.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/Theme.class.php b/libraries/Theme.class.php
index 6435550324..fc7490b673 100644
--- a/libraries/Theme.class.php
+++ b/libraries/Theme.class.php
@@ -310,7 +310,7 @@ class PMA_Theme
      */
     public function getImgPath($file = null)
     {
-        if (is_null($file) {
+        if (is_null($file)) {
             return $this->img_path;
         } else {
             if (is_readable($this->img_path . $file)) {

From 84871f3056cb05f3138436affd3e6c95ed2cff05 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <mcihar@suse.cz>
Date: Tue, 29 May 2012 17:13:45 +0200
Subject: [PATCH 16/29] Load remaining PMD images using new loader

---
 pmd_general.php | 54 ++++++++++++++++++++++++-------------------------
 1 file changed, 27 insertions(+), 27 deletions(-)

diff --git a/pmd_general.php b/pmd_general.php
index f9a8c45948..bdc52f376d 100644
--- a/pmd_general.php
+++ b/pmd_general.php
@@ -79,64 +79,64 @@ echo $script_tabs . $script_contr . $script_display_field;
     <a href="#"
         onclick="Show_left_menu(document.getElementById('key_Show_left_menu')); return false" class="M_butt first" target="_self">
         <img id='key_Show_left_menu' title="<?php echo __('Show/Hide left menu'); ?>"
-            alt="v" src="<?php echo $GLOBALS['pmaThemeImage'] ?>pmd/downarrow2_m.png" /></a>
+            alt="v" src="<?php echo $_SESSION['PMA_Theme']->getImgPath('pmd/downarrow2_m.png'); ?>" /></a>
     <a href="#" onclick="Save2(); return false"
         class="M_butt" target="_self"
     ><img title="<?php echo __('Save position') ?>"
-        src="<?php echo $GLOBALS['pmaThemeImage'] ?>pmd/save.png" alt=""
+        src="<?php echo $_SESSION['PMA_Theme']->getImgPath('pmd/save.png'); ?>" alt=""
     /></a><a href="#" onclick="Start_table_new(); return false"
         class="M_butt" target="_self"
-    ><img title="<?php echo __('Create table')?>" src="<?php echo $GLOBALS['pmaThemeImage'] ?>pmd/table.png" alt=""
+    ><img title="<?php echo __('Create table')?>" src="<?php echo $_SESSION['PMA_Theme']->getImgPath('pmd/table.png'); ?>" alt=""
     /></a><a href="#" onclick="Start_relation(); return false"
         class="M_butt" id="rel_button" target="_self"
-    ><img title="<?php echo __('Create relation') ?>" src="<?php echo $GLOBALS['pmaThemeImage'] ?>pmd/relation.png" alt=""
+    ><img title="<?php echo __('Create relation') ?>" src="<?php echo $_SESSION['PMA_Theme']->getImgPath('pmd/relation.png'); ?>" alt=""
     /></a><a href="#" onclick="Start_display_field(); return false"
         class="M_butt" id="display_field_button" target="_self"
-    ><img title="<?php echo __('Choose column to display') ?>" src="<?php echo $GLOBALS['pmaThemeImage'] ?>pmd/display_field.png" alt=""
+    ><img title="<?php echo __('Choose column to display') ?>" src="<?php echo $_SESSION['PMA_Theme']->getImgPath('pmd/display_field.png'); ?>" alt=""
     /></a><a href="#" onclick="location.reload(); return false"
         class="M_butt" target="_self"
-    ><img title="<?php echo __('Reload'); ?>" src="<?php echo $GLOBALS['pmaThemeImage'] ?>pmd/reload.png" alt=""
+    ><img title="<?php echo __('Reload'); ?>" src="<?php echo $_SESSION['PMA_Theme']->getImgPath('pmd/reload.png'); ?>" alt=""
     /></a><a href="Documentation.html#faq6_31" target="documentation"
         class="M_butt" target="_self"
-    ><img title="<?php echo __('Help'); ?>" src="<?php echo $GLOBALS['pmaThemeImage'] ?>pmd/help.png" alt=""
-    /></a><img class="M_bord" src="<?php echo $GLOBALS['pmaThemeImage'] ?>pmd/bord.png" alt=""
+    ><img title="<?php echo __('Help'); ?>" src="<?php echo $_SESSION['PMA_Theme']->getImgPath('pmd/help.png'); ?>" alt=""
+    /></a><img class="M_bord" src="<?php echo $_SESSION['PMA_Theme']->getImgPath('pmd/bord.png'); ?>" alt=""
     /><a href="#" onclick="Angular_direct(); return false"
         class="M_butt" id="angular_direct_button" target="_self"
     ><img title="<?php echo __('Angular links') . ' / ' . __('Direct links'); ?>"
-            src="<?php echo $GLOBALS['pmaThemeImage'] ?>pmd/ang_direct.png" alt=""
+            src="<?php echo $_SESSION['PMA_Theme']->getImgPath('pmd/ang_direct.png'); ?>" alt=""
     /></a><a href="#" onclick="Grid(); return false"
         class="M_butt" id="grid_button" target="_self"
-    ><img title="<?php echo __('Snap to grid') ?>" src="<?php echo $GLOBALS['pmaThemeImage'] ?>pmd/grid.png" alt=""
-    /></a><img class="M_bord" src="<?php echo $GLOBALS['pmaThemeImage'] ?>pmd/bord.png" alt=""
+    ><img title="<?php echo __('Snap to grid') ?>" src="<?php echo $_SESSION['PMA_Theme']->getImgPath('pmd/grid.png'); ?>" alt=""
+    /></a><img class="M_bord" src="<?php echo $_SESSION['PMA_Theme']->getImgPath('pmd/bord.png'); ?>" alt=""
     /><a href="#"
         onclick="Small_tab_all(document.getElementById('key_SB_all')); return false" class="M_butt" target="_self"
     ><img id='key_SB_all' title="<?php echo __('Small/Big All'); ?>" alt="v"
-            src="<?php echo $GLOBALS['pmaThemeImage'] ?>pmd/downarrow1.png"
+            src="<?php echo $_SESSION['PMA_Theme']->getImgPath('pmd/downarrow1.png'); ?>"
     /></a>
     <a href="#" onclick="Small_tab_invert(); return false" class="M_butt" target="_self" >
-    <img title="<?php echo __('Toggle small/big'); ?>" alt="key" src="<?php echo $GLOBALS['pmaThemeImage'] ?>pmd/bottom.png" />
+    <img title="<?php echo __('Toggle small/big'); ?>" alt="key" src="<?php echo $_SESSION['PMA_Theme']->getImgPath('pmd/bottom.png'); ?>" />
     </a>
     <a href="#" onclick="Relation_lines_invert(); return false" class="M_butt" target="_self" >
-    <img title="<?php echo __('Toggle relation lines'); ?>" alt="key" src="<?php echo $GLOBALS['pmaThemeImage'] ?>pmd/toggle_lines.png" />
+    <img title="<?php echo __('Toggle relation lines'); ?>" alt="key" src="<?php echo $_SESSION['PMA_Theme']->getImgPath('pmd/toggle_lines.png'); ?>" />
     </a>
-    <img class="M_bord" src="<?php echo $GLOBALS['pmaThemeImage'] ?>pmd/bord.png" alt="" />
+    <img class="M_bord" src="<?php echo $_SESSION['PMA_Theme']->getImgPath('pmd/bord.png'); ?>" alt="" />
     <a href="#" onclick="PDF_save(); return false"
         class="M_butt" target="_self"
-    ><img src="<?php echo $GLOBALS['pmaThemeImage'] ?>pmd/pdf.png" alt="key" width="20" height="20"
+    ><img src="<?php echo $_SESSION['PMA_Theme']->getImgPath('pmd/pdf.png'); ?>" alt="key" width="20" height="20"
             title="<?php echo __('Import/Export coordinates for PDF schema'); ?>" /></a
      >
 <?php
 if (isset($_REQUEST['query'])) {
     echo '<a href="#" onclick="build_query(\'SQL Query on Database\', 0)" onmousedown="return false;"
     class="M_butt" target="_self">';
-    echo '<img src="'. $GLOBALS['pmaThemeImage'] . 'pmd/query_builder.png" alt="key" width="20" height="20" title="';
+    echo '<img src="'. $_SESSION['PMA_Theme']->getImgPath('pmd/query_builder.png') . '" alt="key" width="20" height="20" title="';
     echo __('Build Query');
     echo '"/></a>';
 }
 ?>
     <a href="#"
         onclick="Top_menu_right(document.getElementById('key_Left_Right')); return false" class="M_butt last" target="_self">
-        <img src="<?php echo $GLOBALS['pmaThemeImage'] ?>pmd/2rightarrow_m.png" id="key_Left_Right" alt=">"
+        <img src="<?php echo $_SESSION['PMA_Theme']->getImgPath('pmd/2rightarrow_m.png'); ?>" id="key_Left_Right" alt=">"
             title="<?php echo __('Move Menu'); ?>" /></a>
 </div>
 
@@ -149,11 +149,11 @@ if (isset($_REQUEST['query'])) {
     <a href="#"
         onclick="Hide_tab_all(document.getElementById('key_HS_all')); return false" class="M_butt" target="_self">
     <img title="<?php echo __('Hide/Show all'); ?>" alt="v"
-        src="<?php echo $GLOBALS['pmaThemeImage'] ?>pmd/downarrow1.png" id='key_HS_all' /></a>
+        src="<?php echo $_SESSION['PMA_Theme']->getImgPath('pmd/downarrow1.png'); ?>" id='key_HS_all' /></a>
     <a href="#"
         onclick="No_have_constr(document.getElementById('key_HS')); return false" class="M_butt" target="_self">
     <img title="<?php echo __('Hide/Show Tables with no relation'); ?>" alt="v"
-        src="<?php echo $GLOBALS['pmaThemeImage'] ?>pmd/downarrow2.png" id='key_HS' /></a>
+        src="<?php echo $_SESSION['PMA_Theme']->getImgPath('pmd/downarrow2.png'); ?>" id='key_HS' /></a>
 </div>
 
 <div id="id_scroll_tab" class="scroll_tab">
@@ -166,7 +166,7 @@ for ($i = 0; $i < $name_cnt; $i++) {
             onmouseover="this.className='L_butt2_2'"
             onmouseout="this.className='L_butt2_1'">
             <img onclick="Start_tab_upd('<?php echo $GLOBALS['PMD_URL']["TABLE_NAME_SMALL"][$i]; ?>');"
-                src="<?php echo $GLOBALS['pmaThemeImage'] ?>pmd/exec.png" alt="" /></td>
+                src="<?php echo $_SESSION['PMA_Theme']->getImgPath('pmd/exec.png'); ?>" alt="" /></td>
         <td width="1px">
             <input onclick="VisibleTab(this,'<?php echo $GLOBALS['PMD_URL']["TABLE_NAME"][$i]; ?>')"
                 title="<?php echo __('Hide'); ?>"
@@ -247,7 +247,7 @@ if (! isset($tab_pos[$t_n]) || ! empty($tab_pos[$t_n]["V"])) {
     <td class="small_tab_pref" onmouseover="this.className='small_tab_pref2';"
         onmouseout="this.className='small_tab_pref';"
         onclick="Start_tab_upd('<?php echo $GLOBALS['PMD_URL']["TABLE_NAME_SMALL"][$i]; ?>');">
-        <img src="<?php echo $GLOBALS['pmaThemeImage'] ?>pmd/exec_small.png" alt="" /></td>
+        <img src="<?php echo $_SESSION['PMA_Theme']->getImgPath('pmd/exec_small.png'); ?>" alt="" /></td>
     <td id="id_zag_<?php echo $t_n_url ?>" class="tab_zag nowrap"
         onmousedown="cur_click=document.getElementById('<?php echo $t_n_url ?>');"/
         onmouseover="Table_onover('<?php echo $t_n_url ?>',0,<?php echo (isset($_REQUEST['query'])? 1 : 0 )?> )"
@@ -349,7 +349,7 @@ for ($j = 0, $id_cnt = count($tab_column[$t_n]["COLUMN_ID"]); $j < $id_cnt; $j++
        echo '<td class="small_tab_pref" onmouseover="this.className=\'small_tab_pref2\';"';
        echo 'onmouseout="this.className=\'small_tab_pref\';"';
        echo 'onclick="Click_option(\'pmd_optionse\',\''.urlencode($tab_column[$t_n]["COLUMN_NAME"][$j]).'\',\''.$GLOBALS['PMD_OUT']["TABLE_NAME_SMALL"][$i].'\')" >';
-       echo  '<img src="' . $GLOBALS['pmaThemeImage'] . 'pmd/exec_small.png" title="options" alt="" /></td> ';
+       echo  '<img src="' . $_SESSION['PMA_Theme']->getImgPath('pmd/exec_small.png') . '" title="options" alt="" /></td> ';
     }
     ?>
 </tr>
@@ -852,10 +852,10 @@ if (! empty($_REQUEST['query'])) {
 
 
 <!-- cache images -->
-<img src="<?php echo $GLOBALS['pmaThemeImage'] ?>pmd/2leftarrow_m.png" width="0" height="0" alt="" />
-<img src="<?php echo $GLOBALS['pmaThemeImage'] ?>pmd/rightarrow1.png" width="0" height="0" alt="" />
-<img src="<?php echo $GLOBALS['pmaThemeImage'] ?>pmd/rightarrow2.png" width="0" height="0" alt="" />
-<img src="<?php echo $GLOBALS['pmaThemeImage'] ?>pmd/uparrow2_m.png" width="0" height="0" alt="" />
+<img src="<?php echo $_SESSION['PMA_Theme']->getImgPath('pmd/2leftarrow_m.png'); ?>" width="0" height="0" alt="" />
+<img src="<?php echo $_SESSION['PMA_Theme']->getImgPath('pmd/rightarrow1.png'); ?>" width="0" height="0" alt="" />
+<img src="<?php echo $_SESSION['PMA_Theme']->getImgPath('pmd/rightarrow2.png'); ?>" width="0" height="0" alt="" />
+<img src="<?php echo $_SESSION['PMA_Theme']->getImgPath('pmd/uparrow2_m.png'); ?>" width="0" height="0" alt="" />
 <div id="PMA_disable_floating_menubar"></div>
 </body>
 </html>

From 47d42f95d8424aec4909aea56b634731fdc2f2fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <mcihar@suse.cz>
Date: Tue, 29 May 2012 17:15:08 +0200
Subject: [PATCH 17/29] Drop second set of PMD icons

---
 themes/original/img/pmd/1.png                | Bin 101 -> 0 bytes
 themes/original/img/pmd/2.png                | Bin 169 -> 0 bytes
 themes/original/img/pmd/2leftarrow.png       | Bin 702 -> 0 bytes
 themes/original/img/pmd/2leftarrow_m.png     | Bin 666 -> 0 bytes
 themes/original/img/pmd/2rightarrow.png      | Bin 737 -> 0 bytes
 themes/original/img/pmd/2rightarrow_m.png    | Bin 699 -> 0 bytes
 themes/original/img/pmd/3.png                | Bin 175 -> 0 bytes
 themes/original/img/pmd/4.png                | Bin 181 -> 0 bytes
 themes/original/img/pmd/5.png                | Bin 90 -> 0 bytes
 themes/original/img/pmd/6.png                | Bin 98 -> 0 bytes
 themes/original/img/pmd/7.png                | Bin 105 -> 0 bytes
 themes/original/img/pmd/8.png                | Bin 88 -> 0 bytes
 themes/original/img/pmd/FieldKey_small.png   | Bin 229 -> 0 bytes
 themes/original/img/pmd/Field_small.png      | Bin 275 -> 0 bytes
 themes/original/img/pmd/Field_small_char.png | Bin 154 -> 0 bytes
 themes/original/img/pmd/Field_small_date.png | Bin 156 -> 0 bytes
 themes/original/img/pmd/Field_small_int.png  | Bin 145 -> 0 bytes
 themes/original/img/pmd/Header.png           | Bin 125 -> 0 bytes
 themes/original/img/pmd/Header_Linked.png    | Bin 108 -> 0 bytes
 themes/original/img/pmd/and_icon.png         | Bin 792 -> 0 bytes
 themes/original/img/pmd/ang_direct.png       | Bin 679 -> 0 bytes
 themes/original/img/pmd/bord.png             | Bin 87 -> 0 bytes
 themes/original/img/pmd/bottom.png           | Bin 734 -> 0 bytes
 themes/original/img/pmd/def.png              | Bin 670 -> 0 bytes
 themes/original/img/pmd/display_field.png    | Bin 685 -> 0 bytes
 themes/original/img/pmd/downarrow1.png       | Bin 758 -> 0 bytes
 themes/original/img/pmd/downarrow2.png       | Bin 772 -> 0 bytes
 themes/original/img/pmd/downarrow2_m.png     | Bin 711 -> 0 bytes
 themes/original/img/pmd/exec.png             | Bin 796 -> 0 bytes
 themes/original/img/pmd/exec_small.png       | Bin 161 -> 0 bytes
 themes/original/img/pmd/favicon.ico          | Bin 1150 -> 0 bytes
 themes/original/img/pmd/grid.png             | Bin 688 -> 0 bytes
 themes/original/img/pmd/help.png             | Bin 714 -> 0 bytes
 themes/original/img/pmd/help_relation.png    | Bin 920 -> 0 bytes
 themes/original/img/pmd/left_panel_butt.png  | Bin 129 -> 0 bytes
 themes/original/img/pmd/left_panel_tab.png   | Bin 133 -> 0 bytes
 themes/original/img/pmd/minus.png            | Bin 1004 -> 0 bytes
 themes/original/img/pmd/or_icon.png          | Bin 611 -> 0 bytes
 themes/original/img/pmd/pdf.png              | Bin 905 -> 0 bytes
 themes/original/img/pmd/plus.png             | Bin 969 -> 0 bytes
 themes/original/img/pmd/query_builder.png    | Bin 685 -> 0 bytes
 themes/original/img/pmd/relation.png         | Bin 295 -> 0 bytes
 themes/original/img/pmd/reload.png           | Bin 874 -> 0 bytes
 themes/original/img/pmd/resize.png           | Bin 121 -> 0 bytes
 themes/original/img/pmd/rightarrow1.png      | Bin 746 -> 0 bytes
 themes/original/img/pmd/rightarrow2.png      | Bin 757 -> 0 bytes
 themes/original/img/pmd/save.png             | Bin 409 -> 0 bytes
 themes/original/img/pmd/small_tab.png        | Bin 180 -> 0 bytes
 themes/original/img/pmd/table.png            | Bin 163 -> 0 bytes
 themes/original/img/pmd/toggle_lines.png     | Bin 630 -> 0 bytes
 themes/original/img/pmd/top_panel.png        | Bin 173 -> 0 bytes
 themes/original/img/pmd/uparrow2_m.png       | Bin 729 -> 0 bytes
 52 files changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 themes/original/img/pmd/1.png
 delete mode 100644 themes/original/img/pmd/2.png
 delete mode 100644 themes/original/img/pmd/2leftarrow.png
 delete mode 100644 themes/original/img/pmd/2leftarrow_m.png
 delete mode 100644 themes/original/img/pmd/2rightarrow.png
 delete mode 100644 themes/original/img/pmd/2rightarrow_m.png
 delete mode 100644 themes/original/img/pmd/3.png
 delete mode 100644 themes/original/img/pmd/4.png
 delete mode 100644 themes/original/img/pmd/5.png
 delete mode 100644 themes/original/img/pmd/6.png
 delete mode 100644 themes/original/img/pmd/7.png
 delete mode 100644 themes/original/img/pmd/8.png
 delete mode 100644 themes/original/img/pmd/FieldKey_small.png
 delete mode 100644 themes/original/img/pmd/Field_small.png
 delete mode 100644 themes/original/img/pmd/Field_small_char.png
 delete mode 100644 themes/original/img/pmd/Field_small_date.png
 delete mode 100644 themes/original/img/pmd/Field_small_int.png
 delete mode 100644 themes/original/img/pmd/Header.png
 delete mode 100644 themes/original/img/pmd/Header_Linked.png
 delete mode 100644 themes/original/img/pmd/and_icon.png
 delete mode 100644 themes/original/img/pmd/ang_direct.png
 delete mode 100644 themes/original/img/pmd/bord.png
 delete mode 100644 themes/original/img/pmd/bottom.png
 delete mode 100644 themes/original/img/pmd/def.png
 delete mode 100644 themes/original/img/pmd/display_field.png
 delete mode 100644 themes/original/img/pmd/downarrow1.png
 delete mode 100644 themes/original/img/pmd/downarrow2.png
 delete mode 100644 themes/original/img/pmd/downarrow2_m.png
 delete mode 100644 themes/original/img/pmd/exec.png
 delete mode 100644 themes/original/img/pmd/exec_small.png
 delete mode 100644 themes/original/img/pmd/favicon.ico
 delete mode 100644 themes/original/img/pmd/grid.png
 delete mode 100644 themes/original/img/pmd/help.png
 delete mode 100644 themes/original/img/pmd/help_relation.png
 delete mode 100644 themes/original/img/pmd/left_panel_butt.png
 delete mode 100644 themes/original/img/pmd/left_panel_tab.png
 delete mode 100644 themes/original/img/pmd/minus.png
 delete mode 100644 themes/original/img/pmd/or_icon.png
 delete mode 100644 themes/original/img/pmd/pdf.png
 delete mode 100644 themes/original/img/pmd/plus.png
 delete mode 100644 themes/original/img/pmd/query_builder.png
 delete mode 100644 themes/original/img/pmd/relation.png
 delete mode 100644 themes/original/img/pmd/reload.png
 delete mode 100644 themes/original/img/pmd/resize.png
 delete mode 100644 themes/original/img/pmd/rightarrow1.png
 delete mode 100644 themes/original/img/pmd/rightarrow2.png
 delete mode 100644 themes/original/img/pmd/save.png
 delete mode 100644 themes/original/img/pmd/small_tab.png
 delete mode 100644 themes/original/img/pmd/table.png
 delete mode 100644 themes/original/img/pmd/toggle_lines.png
 delete mode 100644 themes/original/img/pmd/top_panel.png
 delete mode 100644 themes/original/img/pmd/uparrow2_m.png

diff --git a/themes/original/img/pmd/1.png b/themes/original/img/pmd/1.png
deleted file mode 100644
index 48b9d3f953072e34dc4ef4046b5306e8d1e33606..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 101
zcmeAS@N?(olHy`uVBq!ia0vp^AT}2V8<6ZZI=>f4>3F(0hDcmaPFP@;a71<En;(a>
z_Ha!U+43NSBlOCl23CWKZ`^8@O-xbxD$2yL<uuRU6?b>s2I^z*boFyt=akR{0C<fd
AeE<Le

diff --git a/themes/original/img/pmd/2.png b/themes/original/img/pmd/2.png
deleted file mode 100644
index 7545d86fef7ce0e094c29a11f7f3ed3f0593e167..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 169
zcmeAS@N?(olHy`uVBq!ia0vp^AT}2V8<6ZZI=>f46?nQhhDcmaPFP@;5L5Oi(X>Z6
zRr7wA|HFET=hx56>-O~Y{D1uR>Z=Q)MvBEZZdhhT+`N&U{&vrm!v_u==nq!p*;7&D
z-`m)Da8_fZBjb7}(Ol>IuTGxsl9Z4z0b-T{Ef*%QBU&P@Grc?%na{W|*anJU`}|X~
Q6KFSsr>mdKI;Vst0JudzlmGw#

diff --git a/themes/original/img/pmd/2leftarrow.png b/themes/original/img/pmd/2leftarrow.png
deleted file mode 100644
index c3565bcd5a87cbd89931990f5dbc5f8b92e024b7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 702
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GXl47-Ir_LR^8|R4_2gIAfG~(JXbZ
zQRW3811M&mx)aE-OIiwHdn8V<PTlOE*y5Me23CCDDC3lM+BV;mKC6_?Ad!r-K+-m4
zjdj{~o3w34nU{<*&l_i)0wR<2Bj#!QjIu5nWnDJOI%Ar3#w7E!Y33=T%yS@=eZ?r}
zI#9~4@H~htIB!z;*re!*Nzqf&q9<l$ug%L|TNFQVX#Vd~^VF^Fk4O6-kB&c{4bQyl
zA9*!A32c54-uWb|>v43)ow$yxDO290_T5gK_AY12gWLuG^QPV@TJpDS>95N9PwN&x
z>stS%cg?fjHP8FjzUbTdX~M=glh!|*w(Zk`-EUSL`nvkyt4*iAZ9DU2$C-CK&wMy?
z<>T>dpU&R;a_+(Z3lIKXdi3wggD<z9{d(~7=fjsjp1cO4pU>a^eEI&@s}H|kfB5z0
z<F9w0e}DS=`^)z~|NsBbbJkY{hObdckRLF-**G}3czE~(B_t)~6qJpvZEfuxyrL2l
zlTzv$I(qtM&Rl-u#+|#5AHRO{;lt<8U%u#>cbo<4zVGSc7$PCbdho7avw;NLgYS!F
zV?7&FZ~B)MEV}n!R`+AVF$=B9^Dj*md-Yj>p<%k_+1L&Sjs}bAO6mORUnCATzWG#i
zGk4>kyD5v6oul^dJ#AKe`h(+UPM*-%<NMN*<5e&H?A!cj&n>BgdxUb<iRg>&lsf<H
z$Oqd-?|EETHvCd3U_D^&`6&3obuSx+hK|mpfZI;y?w(@ybqV{Xti2_-#m?*1p6rM-
z-y-#oe#|Q`GCX_W!KA$gFaN~k7XH7Yd{}6YP?^`Hr>}3#Iw1J_!RO$v$nR@QCo%|V
h?p%1aMbqsM^WM;$ge7ZpSb$z-@O1TaS?83{1OU16YLWl|

diff --git a/themes/original/img/pmd/2leftarrow_m.png b/themes/original/img/pmd/2leftarrow_m.png
deleted file mode 100644
index 6ec8d81cb7dc40f3025fe533ba8deff70849fde0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 666
zcmeAS@N?(olHy`uVBq!ia0vp^A|TAc3?z4jzqMyzVAKil32_B-vuay`sBZGyhG`2b
zd#Be=T>xYNMJjrxK^R4C{XlkJV^?|i)SUYE-1-in;`*ucYbVXE=$&5B+*8&)1t?NC
zWgd_$?VJQO1c(}@Ed;5VJhytnEFf9cKNBd@I2|Miv;wHOe#(3xYMimCdFB$Jc-!0+
z5VCW@s;&jA`xdY3Te5D_@{LngZkoDs^VC(Fr?1{JbM3a->$cBXzhmx(o%1&CoWF6`
z(rx>eZQs9Q=fQP*k8V70eDlE*TMwVwcI4E~V`q0AKfC+HxxJ?@>_2_+@VP6;E?hfx
z<>uMzw=dtmf91}DTMwV!dHn3bvzJd^zIpcg?ejP9UcLM9=EJ9VA3uNi{N>}9ub;kt
z`~3CW*Y7{R{rLIg=db_&|G(Jhkq-<n!;&DsU<L*@4h}9J9zH<{Nl7^cWn*hwTYCqu
zsKmsil)8qFp1zqgm*2Q?=kDXzZ$5nZ{Q1k5&AyLfftufVx;TbNNKQT2ops1SqT!;x
zr|&AZRE{k3+W+5$*z&~I-ntQess2=4f;Ia;uaDZ%QCH&^e^^veIJ>oU*UMSKx(>%K
zze(OYH#+F=+fzXY7|OQSmtQTBc)hphECbt(T(ehkGoJ0c`g6j%Cbq}n$r>GrYhQ@n
zYi?UQdEEl*wLGcLX01FqZjRNJn`Ibn8F{0Mb}XGUOMR(>^L#(kY|96>A&)tv*3GqI
z`zG^YpSflO<IJaeJ5GMOQ$2gtE3<@#b5)-UJ_@$~{JDA!EAx^QXSS|2eEIvcjFQB>
xUuNHwJ{D@8zQCywH|5jiPN~BeIzGtT8~rXm%DCy+8KA!zJYD@<);T3K0RVE_XKnxh

diff --git a/themes/original/img/pmd/2rightarrow.png b/themes/original/img/pmd/2rightarrow.png
deleted file mode 100644
index 0a4e236de26be0e71e0676f01435505136a080f8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 737
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GXl47)t_tLR^8|R4_2gIAfG~(JXbZ
zQRW3811M&mx)aE-OIiwHdn8V<PTlOE*y5Me23CCDDC3lM+BV;mKC6_?Ad!r-K+-m4
zjdj{~o3w34nU{<*&l_i)0wR<2Bj#!QjIu5nWnDJOI%Ar3#w7E!Y33=T%yS@=eZ?r}
zI#9~4@H~htIB!z;*re!*Nzqf&q9<l$ug%L|TNFQVX#Vd~^VF^Fk6Zg64<PFJ<Js`c
ztNxK!!;`?~2jQJhqPiYOcif5VxSBHMO={om)ajqnroGFV@*roy|J()t^QPX(oB1Md
z_Pdg~FDvIity=i1Zt=68HBWojJnvikqHp7;{<Y60Y<x3m{j=$tpDft@X5p@vi}$=*
zd-%<!Q{Q%+dAAdUJ{-LC>ByCjCvJQ?ee?6V2mdbs(Zm0j9{#)Z=--VezivJIb?4c)
zC$E1zdHwU*+n>+h{(SlV*PD;O-hKZ4>Fe(=-~asl_3!`x{~eY4a)IG)R1)L|j0ZLj
z4lW)ZK0ygdNjU{&V{2Pmdk3$m#KfeOx`vLPzL_(Z-?(w-?&HU=-+cJ+`SX`AdgdKx
zfx2ILx;TbNNU|Qh?RD5eg!Mvgn%^b0XF*%GxMp*EIm)m3_1|8xa;k$MYp<f|_Y|X(
zJH!|nEVg()y~Uuwu({NNJLTH-%v1%&?`7YAY*>DE9!r$Lo7cP3{~ap&_fsV3vPVw&
zce~1^ryVy*w8fm7-TWf9NZ6h2=Fy#k3y&v%=Z*XO<;K5_%7=S%d)6^$9(|MJ*DK&v
z8Y{-|{;{f&QkXN>o?jgWM}GSHE9JM=a0))`P<pgcY*$i#V@1rOE@r*0F8<+K;nQXb
zdDkzQdSu1avrZlJP6dZ$w`qQPu>Sdry6!b^c^MTx$#gG^GC%e}e$%t8B~^x};(@+q
N@O1TaS?83{1OOL=eE$Fd

diff --git a/themes/original/img/pmd/2rightarrow_m.png b/themes/original/img/pmd/2rightarrow_m.png
deleted file mode 100644
index e5ff1f0b4d3a9496459154015c11799730c72661..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 699
zcmeAS@N?(olHy`uVBq!ia0vp^A|TAc3?z4jzqMyzU~~!a32_B-vuay`sBZGyhG`2b
zd#Be=T>xYNMJjrxK^R4C{XlkJV^?|i)SUYE-1-in;`*ucYbVXE=$&5B+*8&)1t?NC
zWgd_$?VJQO1c(}@Ed;5VJhytnEFf9cKNBd@I2|Miv;wHOe#(3xYMimCdFB$Jc-!0+
z5VCW@s;&jA`xdY3Te5D_@{LngZkoDs^VC(Fr?1{JbM3a->$cBXzhmx(o%4Wb<IedT
zcP-tvZ`t<!D|Q}Sx$EGnU5D1}IlOl7k#&2IZai>&^T884j-A<g?Ch@NXLp}CxA)YA
zeWxz$KYj7&g{#LdTswC0+L>#&F5kX?`ObqYcOKk)@Z{FRr+1$`zyI{bv)6B*zkc`p
z&AXRx-@khI;oZm2A3lBg@cGNfFJC`@{r2_yk8eMI{`mRp_n$xi|NlRHT0{*Pj)o;c
ze!&b3Y#bb1JUo1Y5|WZ~3d+XTwzl>TUQvmONhx&=9X)+BXD+{S<Idg3uit$5@cHwX
zFPnWI#R4^d^>lFzk&v8v@U`C|1BQl+>!;@~xE;{g;N|hm{{H`36{(~SGvl7zrFWNl
z)iBz!|MU9beLm@7f9(UOf{ANBSxmfk^Sl+qEcx*M&%ScfU+fIk8kioP{bs3s`{voq
zwbi#9S>B1i_Rwhz-8(~{RU?2u`lj!ZC)$B83ok{qw?r;-OTVyvY4X#rA}U92S?1e!
zeBR#W<hH<(O+U4qoqcXFC!^G#g0|(^Wg;Q^k2!?;{8lNYx;y?|)y}5!<!of?p50T*
z<mbNT6M66`XT{o22Unb%VYQ%PA-|WV=H3kc)XU9mPNqL}d<)*L+@ja;z^S7|s&nJZ
c9F9N7&6$?vs<*B&1f@a-Pgg&ebxsLQ0Kimsxc~qF

diff --git a/themes/original/img/pmd/3.png b/themes/original/img/pmd/3.png
deleted file mode 100644
index 46179111a3b991afc3b722273c1eaa2d077b2132..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 175
zcmeAS@N?(olHy`uVBq!ia0vp^AT}2V8<6ZZI=>f4m3g{2hDcmqdSN5)Ap?Qdhv!c)
z8^~L4VD=45WVMoN$++Y+g-x@R>jcZPjjE@;7$51suiIO`t6-1sNv`kzs@{Fu&FwbF
zY~K_6jjR4@e(V*wt+L`$8c#%0q?yyhPH`5QuvgD?Yz-XG)Mw>O6<rEyW4!I=vo+uc
Z!<rJU4bPUp&I7uD!PC{xWt~$(696aQLdXCB

diff --git a/themes/original/img/pmd/4.png b/themes/original/img/pmd/4.png
deleted file mode 100644
index 9b5345944d46af89ff6a5ae4f95fdbb4e48e7c05..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 181
zcmeAS@N?(olHy`uVBq!ia0vp^AT}2V8<6ZZI=>f4)p)u%hDcnVde)GSF;S%T;^zp4
z-dP<UE=xtSH!$7~@bg}NIr6}pgIr(46eebhaP=O^$PiKbDH;E>s3^W->ia%PF`=s=
zZ|W_iw@?56DeP^ji%pP$9slgNb){N-fA1BT{N=iMKqdP5=Xe1ti3QzaSA;(_8FNk9
fu}tiK_90=G3~@%McN}wo?qKkA^>bP0l+XkKem6r5

diff --git a/themes/original/img/pmd/5.png b/themes/original/img/pmd/5.png
deleted file mode 100644
index 51f536dcb55718123c2a919ec38fd1ba1945db3d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 90
zcmeAS@N?(olHy`uVBq!ia0vp^AT}2V8<6ZZI=>f4DSEm%hDcmaPFP@;5L5Oi(bSMD
nQbIx^sw41(%bKf)y%ZU=S()QQ1+U))DrWF>^>bP0l+XkKdfXR2

diff --git a/themes/original/img/pmd/6.png b/themes/original/img/pmd/6.png
deleted file mode 100644
index ed93cfee528ffea3c36cf41ddedcf63b90257862..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 98
zcmeAS@N?(olHy`uVBq!ia0vp^AT}2V8<6ZZI=>f4X?nUihDcmajw$=|u%1ol!K;~z
we@7KB<})@hxRa8QaO2z&2Nj7>57}0R$p2g_S9@Q)1!`jOboFyt=akR{00NdDDgXcg

diff --git a/themes/original/img/pmd/7.png b/themes/original/img/pmd/7.png
deleted file mode 100644
index 7c7530f14a4a496c46e1d98b2290bfbd68bb3d23..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 105
zcmeAS@N?(olHy`uVBq!ia0vp^AT}2V8<6ZZI=>f48F;!lhDcmajw$=|u%1ncLD;aX
zt;=cJ>h!*M%5I9v%*@Wrfoetu26t4hxiBV)Ffp8$VE?eFX^t>ZFN3G6pUXO@geCwA
C;2XUF

diff --git a/themes/original/img/pmd/8.png b/themes/original/img/pmd/8.png
deleted file mode 100644
index 451998d1e9f2cdc1383fb67e74f57e941b07d7f8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 88
zcmeAS@N?(olHy`uVBq!ia0vp^AT}2V8<6ZZI=>f4$$PpuhDcmaPHAXLJuV++Y+$g(
l-~odVk4sZv>y<zb2GbABiOn4|lYvSZJYD@<);T3K0RT~q7TW*-

diff --git a/themes/original/img/pmd/FieldKey_small.png b/themes/original/img/pmd/FieldKey_small.png
deleted file mode 100644
index 8a55b161cfef12f4d203d7eefd7e292d22cc7057..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 229
zcmeAS@N?(olHy`uVBq!ia0vp^AT}2VGmzZ%#=aj&xd!-zxB_Whpt`!??_cF#zm$Or
zczJmxBqUT-RSgXdZES4Z-Q81DQ}grlYinz7-Kv|o(R=|=5l=~wUoZo|fP%V#sk!xq
zmv16J*WUn&JA1k~hH%KT9_(anau8tIpwlGR#INo1f9Wg+hHI~N5^B|InZxUDf1L5a
zXIrgLz})jY#4RSpHRQ)7>wWO6V$6DPINiR(ooUG~CX=H;;}|?${an^LB{Ts5Yo9?u

diff --git a/themes/original/img/pmd/Field_small.png b/themes/original/img/pmd/Field_small.png
deleted file mode 100644
index 4d80059a38ce808a88586852c9b4752c1adf1b48..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 275
zcmV+u0qp*XP)<h;3K|Lk000e1NJLTq000UA000UI1^@s6jWW-@0002mNkl<Z7}K4P
zA!`D00L6b^85|5vYV(GO;S5H>C9BPS1gmvi-=XjakzrW(1DxfeOfZ-P<%-TE3&P4k
zE-eVpqHxHiz4jhI9`C__H5d*BWbbn;X?$b!RIB0j`zOFjZSsxL=X$M!q+qv`Z;X<#
z1@JZ=>#<rz^*RfQO{GFqF4O7t4ma2Wcxks;MG;GhZ5$IHkNkuoE!PDo0J+SyIXj)r
zPN8jM=kxsT_Y~)I-bbTn;0$~vXF4B~iCW#RUOi7h6KDXXv`<bD1gTIa4F(>7Kj8Zo
ZUI5d%OZ9PGK*j(7002ovPDHLkV1jpvaYz6F

diff --git a/themes/original/img/pmd/Field_small_char.png b/themes/original/img/pmd/Field_small_char.png
deleted file mode 100644
index dcaa1c61d2840e167dcfe99f864705123e8e9eaa..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 154
zcmeAS@N?(olHy`uVBq!ia0vp^AT}2V3y@T|W;X*;iJmTwAsp9J&l&O^G7w?DU|zH7
zpo9Mb9(AARPj<)(FuOV>W(0_SNILm%o4v}(h8ruk^gcg%m^&yleoC5<W8`Koqd7L!
zHt$>6FCMju_&<GjME%;t->)7?oJsfo|LNJ=yuS?bXVsPjO{i=DTE^h%>gTe~DWM4f
DNdh^>

diff --git a/themes/original/img/pmd/Field_small_date.png b/themes/original/img/pmd/Field_small_date.png
deleted file mode 100644
index 259a8d98a5710ce1279072930a8d0a344c255bc3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 156
zcmeAS@N?(olHy`uVBq!ia0vp^AT}2V8<6ZZI=>f4C40I!hDcoQJ-?Bc$xwjxV)|<*
z6&K+vMXGCEef-1O<|;TfC3kkzxXsIGzW73avPi`HnaYW~rwZTW&gs9t{|2kSfMBJI
zi^@8S>v`Uq?KiEIOOyKQgM2S_E`IgNIx2hdjlT2ZzmID@;|h2i3$%{G)78&qol`;+
E0F071<NyEw

diff --git a/themes/original/img/pmd/Field_small_int.png b/themes/original/img/pmd/Field_small_int.png
deleted file mode 100644
index 70f3f38d1ef49915c2eb4ac511e91a510914d1d4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 145
zcmeAS@N?(olHy`uVBq!ia0vp^AT}2V8<6ZZI=>f4MR>Y6hDcoAde)Jv#X!L2;&Tah
z(U?l+kN=(*yE)%6nc=$4%;dkhN$4J%r4PCnev-56ea~9_G+BA=*03+3N#?BOyWSRZ
tYF?dqut)n(*X}*hbDQnwJY@fO!aTfPQ#aGtWHHbV22WQ%mvv4FO#mU@HB0~i

diff --git a/themes/original/img/pmd/Header.png b/themes/original/img/pmd/Header.png
deleted file mode 100644
index 3e3e4e91877bdcc76eff036f94923966e22d2f7d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 125
zcmeAS@N?(olHy`uVBq!ia0vp^Vn8gx!VDyNCJ0o3H~~H(t~;Lny8ZwEjlciTe*Jsw
z!=H^0f3CdqWA>$Q@7$CR0o5pYx;TbNTux3nz$d{fn4_jrDCT%5N2J(^bG5r!{f3Q<
Yo8~gSyZ!Tz6i_XLr>mdKI;Vst0GS#uN&o-=

diff --git a/themes/original/img/pmd/Header_Linked.png b/themes/original/img/pmd/Header_Linked.png
deleted file mode 100644
index cb0a4b374b49a0c1cce274528e6c8e035aaf0037..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 108
zcmeAS@N?(olHy`uVBq!ia0vp^Vn8gx#0(^xFFd^gq<8{+LR|m<n)d(OwErKc{eM2~
zIoFNbKyhhL7sn8e>&XcU!Yxe>42QJ@A`X0zXR*65fr-IQF5+0PRLVJ^G6qjqKbLh*
G2~7a)1tX6D

diff --git a/themes/original/img/pmd/and_icon.png b/themes/original/img/pmd/and_icon.png
deleted file mode 100644
index 3767aba9b5565a3d04ae39b78c739432c673d255..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 792
zcmV+z1LypSP)<h;3K|Lk000e1NJLTq000mG000mO0{{R3C@l|D0005JP)t-s00000
z0000000000000010RR91000620RjO41po&L0RRyLA|wC@7zYg-2LK`rK0g3IKL8Od
z3=}R56)p?_HWo)z1`0S5Ek_I%YBCsVEh~pGEQe7&NHsl4H$F);Ku9n{QZYoVIz+8H
zMOZyXQ!q$hIZtdlQo1%%W-L^{V_1AQTbmzTe=A&@9$kz;UB540d@WvvTVRnkV7P^1
ziV|dxE@ZkXWrr(ex+rD8P-dW0X1+dV#A9Z~V`q&jYrjluz%Xp1IBle6ZNWQj$%}5l
zVs61ZaKcJ)kq>dgUva}ran6Qvv_y2pCw0Uwb;c)l#b0*DE_TK_cg9J0#dmqeU3tr3
zdd)g|%}RU5H+#l*d(51C$98<jetpF(f6I1(%Oru#c!IDagRvol(JO?+BZSZ-gwZ60
z(IknoABxS8ip`OW&5(`HACA+KkJgir$Q_Z;nUdKen8_TO)E%GQ9iQPHqu#Wm;~b{i
z8K~M9sNNZ=y%?$77pmN~tJ@Z=-M6vnA+q5XwB!}H;U%}>Cb-}fx#1MO;}gN<Aj|0-
z%<?MH>l@wnJ>B;`;q*S@@Ga)`JpBJQIyw~L0000PbW%=J00AH&cXxPsd7GQNyT8Ba
z=;-R|>hJIK^AOH*Y5)KL@<~KNR2Ufr!Ot!OQ4|N@-#O?0Ye$((hX^YYiBK%Mv-L2Z
z$!pl!*$OL*N=PF%(l$CpP4Dg8JHC$qKtwAv>lgtL0JCLxk1_i6ivSSF<%3}-f$PWT
zYSju<IXtPC!7sy}t?Hz>pBEp-zR%C&s>tJ1%*MWtZ5;hH+3&Ymcs4eM<X+@r8Ywi+
zur_Qns?@R`_Y`Z*<g_bZP5D=T*-h<Ot!=NM$<<Dz+o#L43PQcpu07l~S`Nxi_iduW
zEMwhQgruF<lOV14XHK&)3G2IY6tr_W5~YNh?;ipPfXS~*Mw;DJ0U!VnF^bk9Mgadr
W4_?5ldKKOP0000<MNUMnLSTX%7EwI_

diff --git a/themes/original/img/pmd/ang_direct.png b/themes/original/img/pmd/ang_direct.png
deleted file mode 100644
index 3bd28e812475521f5d89baaf9d092ffc642b6842..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 679
zcmeAS@N?(olHy`uVBq!ia0vp^A|TAc3?z4jzqMyzU~~-d32_B-Q&UroGR_!fUNlSH
zYm|8b$N-9%r|twY?2?v3*dB=!tW!7pC${({wSg6%H_A9=owm(4rOzs5Ge{)kEReKK
zS!12H-6n0DQRXG1%=5+>r+~;L{fK$mKBKHlMp>6lvd)-hoiWKgZJK$?DDxZ$WnVGM
zxek=FD?AS(3(lJqJ~k<OVp8<fwCIUh*=zH%*A~SOtQ-E@H2$}3`tQ*E-=XEdOU+Za
zwm%;2e>^(=cs4xqs(<9w@FcMLL3rnrsIJG+9e3h7uBJ?RliGJXZQ8q>DGzcM{Lh<u
zCvWD9lDRJ{=Rd7l_^NL4v(}Ywde%JcUGuze?Th}k&n9eqGim*^>6@P{-1Tzto>wal
zecgWQ-HtQwcAoig<jTj>H$R`f_2tg9Zx3Joc=Gzk>kq#^ef|Ca|9}4!qieuGG%N}7
z3ua*B;Narn;S-dQl$29YHnz64wRiA}N=!^jscY!y>6<xo`HdTQ?mm9}`pt(ApFe;3
z((~0X38?vrr;B5Vge2=hZ$G6#28IJw@>LnRuEJ+$1d8dEy!`8*Xw<#4vAa`%b3U8A
z&91dfKrIXk442k$9xr8O%BVYEcXyfV%jwn}7wpbG&o!CW-+xqybMo@*)6*o58{Unn
z`K~TBZ{G9Bo{fD`slF<4wmfgXXRZCZ@AZi@yGrgIy17uNX!q1iJ@2j!jW&wH{>KH*
z-`ODKq)=?L=D_1FsnZT=wL5r1*z*6)tu`wCZory<;<lGlq4`<M@3r@T?!GfIAbaP$
zWfI9hYW}~{mNffX@^yLPpZ!0rL|7C`-m37_-t7mumf-+@9B+))lN&eGKs--ZKbLh*
G2~7Zksz{3f

diff --git a/themes/original/img/pmd/bord.png b/themes/original/img/pmd/bord.png
deleted file mode 100644
index 351b9591b384e02de370cd382bcb055e7086598a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 87
zcmeAS@N?(olHy`uVBq!ia0vp^Oh7Ea$P6Ue(rmtir~sc3*9$l9{Qv(y>A^;Cpa_qr
ii(?4K_2hzt1Kf-b3M`D#M`V(L;tZayelF{r5}E*BlopNv

diff --git a/themes/original/img/pmd/bottom.png b/themes/original/img/pmd/bottom.png
deleted file mode 100644
index 97abfc9346c45b337d62b22726eba355e569f1ab..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 734
zcmV<40wMj0P)<h;3K|Lk000e1NJLTq000yK000yS0{{R3x>xN#0004NP)t-s0001G
zWo0sG%ra@wHf6msY0xrh(Pd?2H)XjpY0*AnrDbJhH)Xj<VURmzvrl1!PGW{KXv{Kc
z&oXGrJ7%^`WR5yyvodJRGHA^*Xv{ritUG46JZ82sY0@%j&ogMsGib^*XT&#VzA|dk
zGHTN_YRoli%rt4sHEGH+Y0fff&N6G%GHll}YSTV(&oXM$K5)-8apN>{<TP^SHFD%O
zcI!8G>o{}ZJAnT@f&V>%|3HKPM118$hWti`{6>fTNQeALi2O-_=1GV6N`K-?faFnw
z;8%&{T8iUah}>R?)nt_HW|r=3l;Cca+-{lZbfo-srTlrH<&3Q5jIi>MvFwts=90AX
zm9gfQweFX*<es|hp}Og#yy~dJ^{c_`x61Cg%<j3&@V?RV!PE1^)bY#N^Ud1y&fovf
z-~Q3v^wQz{)Zp~k<oes?_T1+7-skw?>G<R7_~h&O=Ir_C?)mHR`uF+$|NsBNJx0d>
z001#`QchC<1_%fW3=9qt7#SHJAR{w7Jv~1_N?KuIVq|`Rh>VVznWxy;+}-2j>+JCG
z^YirdjP*`p0002-Nkl<Z7#Wqp_ag#f90%a<5m6dMG(_3X%*skdM&7cw!#TWXJM;7B
zyZ6fYwdWx!S7k#>z-OcXs#^!fme=BPdma6%?aZ9LDaz;NN?#+DRCTOB7{(VqjOXos
z2Ngv!*PL_Uo%5U3s6;}Ayr-IgCsn;T9(0jVKXs~@fIH=IF)`{Vp?PWN9IyMp)dBRx
zM2LjI+{O`b59okCJsBp!H=ayx!lKX2#)Bl-<WxGn1=H>PLTcDUmbNToY!`TBjAdg^
zveb0tPc-cXnx^G@yb=|;yHV2HWTzjF=uoau$c@CjcKRc^{Go8r<CLg8-)loWmNS$p
Q-T(jq07*qoM6N<$f_buqJ^%m!

diff --git a/themes/original/img/pmd/def.png b/themes/original/img/pmd/def.png
deleted file mode 100644
index 33d559307062d02781e8d20cafad7317b011296a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 670
zcmeAS@N?(olHy`uVBq!ia0vp^A|TAc3?z4jzqMyzVDt*`32_B-Q&UroGR_!fUNlSH
zYm|8b$N-9%r|twY?2?v3*dB=!tW!7pC${({wSg6%H_A9=owm(4rOzs5Ge{)kEReKK
zS!12H-6n0DQRXG1%=5+>r+~;L{fK$mKBKHlMp>6lvd)-hoiWKgZJK$?DDxZ$WnVGM
zxek=FD?AS(3(lJqJ~k<OVp8<fwCIUh*=zH%*A~SOtQ-E@H2$}3`tQ*E-=XEdOU+Z4
zwm)t_)c(f<h&ujwHazpHf8^EhB(V8Gc;}O-uE)_Gcj7v(rc8O0+IKr`+Pj=74{{d#
z&zpKDZ{~}Vxi2f{KdoB$s&4VK)|GF%S3T)j^R#!(^S-q&`qw_2u<^~L_0OhnezI`a
z%f)+MtvK{``>A(3&b-@s=EIRIA5Y)>eD>CtD-XWhdG_t$%O6i(|9Ji3*Qc+)@6Vhl
z2@Flck|4ie1~v{3E*>5}K?zAoIR#~7Yg=1;2d}8a#H5tEhK`=TnKPH)xN+z1<HxVx
zeE9JB^Or9@U;UDRnlE{}IEF}EPEJq|HQ@I2;M%-^W8=wJ61yv<GPOS_9I*(UBfPn|
zxH#yJscS;gnp5{ABNHY_t~tsoI;Ggpx4p@P-_>n{#N;v`BOaBbFF!T0vYve`yg=d1
z{X+pfIvVeU1ZBBd9yT^M{u5hvDZ$b6_JIWx91J#W-)=IQk(+Dwjl+#ow@ws^nBaQ*
z;>nXI*;wAl$b9{&=r^hSYb$fOYF>vz`>J>iksm9$4V+@nFMlR1$;vX(PHNGcg7d|i
yuPRwtDkL>HHz>0TE3coirANfxT)9(`kD+L>sV?Kch`&JJF?hQAxvX<aXaWET89g8X

diff --git a/themes/original/img/pmd/display_field.png b/themes/original/img/pmd/display_field.png
deleted file mode 100644
index a7d7cb4eb6ae3f01f9f4213c3a96cbeb3a5580ff..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 685
zcmeAS@N?(olHy`uVBq!ia0vp^A|TAc3?z4jzqMyzVDt*`32_B-Q&UroGR_!fUNlSH
zYm|8b$N-9%r|twY?2?v3*dB=!tW!7pC${({wSg6%H_A9=owm(4rOzs5Ge{)kEReKK
zS!12H-6n0DQRXG1%=5+>r+~;L{fK$mKBKHlMp>6lvd)-hoiWKgZJK$?DDxZ$WnVGM
zxek=FD?AS(3(lJqJ~k<OVp8<fwCIUh*=zH%*A~SOtQ-E@H2$}3`tQ*E-=XEdOU+Z4
zwm)t_)c(f<h&ujwHazpHf8^EhB(V8Gc;}O-uE)_Gcj7v(rc8O0+IKr`+Pj=74{{d#
z&zpKDZ{~}Vxi2f{KdoB$s&4VK)|GF1);#T9^Sp2Ei~hCGCTx5&Y5lY5o1ZM)^>Xo^
zS1S&E-G1ubjx+Cep80U(%E!|;KcBtz<;sIEcb<KF`0~e-*FRo=`1R@Q@Bjb*f6dc7
z4-8Gik|4ie1~v{3E*>5}K?zAoIR#~7Yg=1;2d}8a#H5tEhK`=TnKPH)xN+z1<HxVx
zeE9JB^Or9@U;UDRnjd<)IEF}EPEJq|HQ@I2;M%-^W8=wJ61yv<GPOS_9I*(UBfP1o
zXw&4ormhJ|YfjyJIWu8`;F_bXqEm|fJiWcU``Lw7%60W57^=N}v1G}TA9wEjShD0u
zL~PuK1q&);YHR{{G^C#8Cu*>XiIj8pcb#NycBtnL&fKtINp3;_hs%X~_b&Oc>1gC6
z@v{gRYG*5JZcymnws`X7$-a5(dVA+KFSfHk;`wRazJdp<j_?XT3HZw0%4A>4=(ghZ
z&nq=bN{tGK+?}V$zN^%8wO!x9pwFzzShge~>51s%X%inkPg5~G!YG$vURZwmTQAVF
N44$rjF6*2UngE_EN&x@>

diff --git a/themes/original/img/pmd/downarrow1.png b/themes/original/img/pmd/downarrow1.png
deleted file mode 100644
index 80632dd56638450fbe9cad1b2ae2e23ef6cd1439..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 758
zcmV<S0tx+zP)<h;3K|Lk000e1NJLTq000yK000yS0{{R3x>xN#0004fP)t-s0001G
zWo0sG%ra@wHf6msY0xrh(Pd?2H)XjpY0*AnrDbJhH)Xj<VURmzvrl1!PGW{KXv{Kc
z&oXGrJ7%^`WR5yyvodJRGHA^*Xv{ritUG46JZ82sY0@%j&ogMsGib^*XT&#VzA|dk
zGHTN_YRoli%rt4sHEGH+Y0fff&N6G%GHll}YSTV(&oXM$K5)-8apN>{<TP^SHFD%O
zcI!8G>o{}ZJAnT@f&V~*|3rM{Muz-Ghx|x~{78uWNr2`_hxkf=;!1$zPm1<YgWy+*
z<XVd3TZr6Vh}C42>}8JIW|r=3l;CWj|8AAsZkgzAo9=X^{B@=Ld7tHeqvnjP<&3cM
zjjZR6t>}-f=8&=MlCS2KvF4Vw?w7OVoxuN|y6mC4>7%^rsKWKC!R@!o?zqhExy<mv
z)APjC@y6Ek%h~hI+Vsxf|Igt5(BS^j-SpJp^w{M3*yQ`!<M!L-_T1+7-skw?>G<U9
z`0Mcc^7Z@j_5A<;|M`b6$N&HUF?3Q+Qve1C2nq}g4iOj`86F@bGdn#!KR`-aVPRrq
zet?LKj+vRK*x20N<Kye>@bL5V^z@ANPGSH60QX5mK~xwSmBC$0!cZK*;oo_gx||yb
znW02P(M5RKP2c~z`#>rpNODQ)UOfMuxu$)AdLH;I#V?a|l&n2Rii6Hs(jA&lm!}ym
zODmjAuSc5Z>p5JefB}N(?JVZ)I}XRT$SW|w^zx<=IUh<<Mc%DJgC0z35m6`+8AlOV
zNTROipz`uw+Hi}7PCv7n)^4@kVFS>ho!G1K0?PW~UMU3@#HE^(JBTkp`8^n@l75+w
zdeCF@Xv(ESgU^D2d!m)klVIz?0FKkJ*(JzpP`{)Z7{GfM_iB-a%IB-xgQd0c)nHN}
oADdO_0L77t!a(hFUo`y75BxlAO^F|beE<Le07*qoM6N<$g3|JlzyJUM

diff --git a/themes/original/img/pmd/downarrow2.png b/themes/original/img/pmd/downarrow2.png
deleted file mode 100644
index 2c925e9dcc7d87a022369da2d607e4034c6103a7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 772
zcmV+f1N;1mP)<h;3K|Lk000e1NJLTq000yK000yS0{{R3x>xN#0004fP)t-s0001G
zWo2b$Win{YGHKB^WxX<K&@yS!Wo2bIWw|nG(LQ3OWo2bIWw}UUkUM3wPho^kVumtk
z%ra@uGHA*>X0}aajyhzsGHA>)Xw5Qc%sphRJ7%{$X0|eE(lTk!Gib^)Xv#Ea#5ZQX
zGHTK?YST1o%r$DvG-=B<Y05Hb&N6AvGHcW_Y}Ybs(>`&}GHTO4aL+Vx<1}*QG;-xN
za^yC4>o<1mICJ1Tfd4#!|3HKPM118&hWti{{78rVNQnGNfaXbu_)34`N`T}~iuO^1
z;8%&{T8iUah}>R?)nt_HWscismhNnn;BBD)Zk60_ndoz*{dcDPexv4ur{{{V^o*?K
zjjZR6t>})i@{g_Nkg@ENujZGt<eRwepu6m$y6L05>Zro?tHJ84!tS`t?zznH$JX-5
z*YwTW^v>Y_(BS^i;Q!L%{@UjH-RAe;>G|R5_~PpL<m>q4>-pyG`RDEV>F@gM@cQiW
z`tI}l^7Z@l_x%6={~yx)g#Z8mGIUZ-Qvd)42nY%c3=R<(85tfRBQrZaJwHH7T47;g
zWPX5%jE<R^r`Xus-Q(ly?C|jO^YrvCH;Byu009I^L_t&-(_>&D6|e|PN{O&CA`7w0
z>6*BC8tW+XB80hA9g|CHYAVy+wM1c}Y%1PmX+=PgRvoI%4HcDlEU2qX%gRctt*i4;
zVgidX>%^p00Y%fQ>*_M%^!UJnLKcZhN#%8Q6?JtfPL@XEU_lAz@aWjs(z?33Fjp%}
zGa0a;luclKU9oF+oxguwww1XoSWv{&HmI&H#|kJ`muqb-4Hjh8v3CfrtIGz8<=NRA
z2!I6{6<mCMqku-%<@@@&DDyzv$*JZS5|U6?R~QoFry&S&Cj%qDx=%!8YG!1FkER$0
z%%6<hO8Q;_0bYj6f*gntVPxVHmywkg;9+7UEyMx+xjnj5vH1f40000<MNUMnLSTY}
C<Bd%K

diff --git a/themes/original/img/pmd/downarrow2_m.png b/themes/original/img/pmd/downarrow2_m.png
deleted file mode 100644
index 461eeefb855e24d955361725efd858cca74c48d9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 711
zcmeAS@N?(olHy`uVBq!ia0vp^A|TAc3?z4jzqMyzVDt*`32_B-vuay`sBZGyhG`2b
zd#Be=T>xYNMJjrxK^R4C{XlkJV^?|i)SUYE-1-in;`*ucYbVXE=$&5B+*8&)1t?NC
zWgd_$?VJQO1c(}@Ed;5VJhytnEFf9cKNBd@I2|Miv;wHOe#(3xYMimCdFB$Jc-!0+
z5VCW@s;&jA`xdY3Te5D_@{LngZkoDs^VC(Fr?1{JbIrDyYq!l>yKVNm?Q_=en7d);
zJRsV*bN<F%3pVXqx^3UG?fX~kJh*Dtp^XQQZ$5Zp>)}(|kDlIf?99$%XLlVxyZgks
zy{9hhJ9T0I>5E6sUpac=>ah#gj$OQV>dMVC*KVD?e*5z6`&aHfxbyhgy(iBfJbU@<
z_1ouf-o1MF;mwCnZ$Er`_wn<GPhUQK{_^q5*H2%+eg69G>-Qhue*FCL^Vk3X|6k1V
z-VF>*!;&DsU<L*@4h}9J9zH<{Nl7^cWn*hwTYCqusKmsil)8qFp1zqgm*2Q?=kDXz
zZ$5nZ{Q1k5&AyLfftr7Nx;TbNNKQT2?R6-Cq2b~Gm~B_*gasRTuo!Yw{XhQF$-~Xk
zq&(Bw`uUqFUzonueh6=h|D`1M_adtwi~7kLA@yB`Z`biPJaexyj_nny+3MM))WG!U
z=&N&D&-X-g-Hr-4khIV5a@WH1sd2lL9hy$9>rH-jXX%3p>5>{dX8AfxzYKA&$vM3+
zdxF60b;j>?4QC%xR-T~H+&gXa^GWQ*`=>cIwB0N3D*0&fOzen3L(AfccZDaLZV%DF
zWxhaRiKo>J&q=}gp?@QzL=ql#ZZcb3DO?wRg^{(wyyx7Wt?W1VzLRE`;#m6r_+$NB
r%WiE~Yk1(&@y15TIr+B0kN*6vwUtWR@@uq#!NB0@>gTe~DWM4fM0|jT

diff --git a/themes/original/img/pmd/exec.png b/themes/original/img/pmd/exec.png
deleted file mode 100644
index d5eaa767bb778c2ed053b3227575c6f88e57c577..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 796
zcmV+%1LOROP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0008xNkl<ZILnQb
zOK4nm6o<e2oI5i&*J+(5F;^z7CJKr+XrzkI6e*-Du_9JPS`iAOC@O;3iVH<WOBb;e
zUAS-|HPqBrVvVNlq^;m0*3c3P6Vrq|oJl70$Yf@6Gxza#kxppQfIm2^bI!*(zr&HZ
zPA{CQw#^&zC-RE#<odsTsb$+Uueh#1^3&dUl652j>=|^L17E!AxuST|Fg_z8Xicx=
zN``WiQu9?idHJc|4s1KIE};9Dm19E*ZC7*2XELT>jg~OyD#)6G*Am5C_Nxuq+OI4*
zSO0iB@#en(okwb8!=~0o2iSwNY$}$Jq+qo`mI-aN81HCA{kuxI@4M~eNB5nr1LWO5
zRvt_=)(k5epcZ^KRhFh}i+{f7EDXOWskuYpTlAc225g-wVCX7J<2?`EutV4J<zt)^
zf^$M>1D<H#+xG#W*Yo#%_`SVjApLuHGB3JMSB2SI5%x#36Y<9mSOD_!yomD`kOfyL
z$nAGO0eE%5#r?ZxW!>2sy)`<wp-Dr;!sO$z&3a?!a{#g`2N`R|M;R4Rf%(?f#~=AT
z_0IKE{@k@CuSWGRbVEgQB+M&Qsku|DKFDT}d;hNLz{~9$N?9sUkV1?#wSK(gn{3as
z$Cu)Di0&|%%|N*f6}$P4*wg*H*RIgjlQC!XNP0|bFzXElg4@HMcXLD<(R9Ttx>Cob
zJccU(1<d5d^X0Ga->CuwzIbxZHcW~@1TetKNQ@RVl>(hNxZVQV!Xivu9s+7IfbWYz
zJ6%j!%??|prl&2r3U>nHTHLnUh=6EvmQdfBBjvMude#6J-fAi9sfq1&@9B3Z-bg&$
z^ux$LGgAQxRJTUNDZ*9(Hh5aFTpJ(g1?JcL587T!ZEoma6kH9&#{H?O*rNxZk9?K(
zLWgIZ@B;^52iCk&{|n%I!9v5yD_`nEp?lpkM-P>TKRsbt9c6d)aDHX7?-Eeve=2k>
a*3~~*%rVb)$|Gn10000<MNUMnLSTY&ZGe&h

diff --git a/themes/original/img/pmd/exec_small.png b/themes/original/img/pmd/exec_small.png
deleted file mode 100644
index d5162ea19ce79315df0cac8925493ac9bee630ec..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 161
zcmeAS@N?(olHy`uVBq!ia0vp@Ak4xHBpZ(Y^aoNx0X`wFK-yyFw}d<Y6(>AmnD(D<
z$Jg1j0)v5~EG0pH!3+m(JW{=BGZV<S@^o<w;kcfhkdPpdz`&fAY@nJWmBk}u$Xm#1
z%5c%oYn{U^OP5ARRS6B=WvmZsX4u5o`q-bb>G;XOc9QdZc*d#KKvNhzUHx3vIVCg!
E0PqPgvH$=8

diff --git a/themes/original/img/pmd/favicon.ico b/themes/original/img/pmd/favicon.ico
deleted file mode 100644
index 29c2595b1d53b36c607769e69479b23edbd27697..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1150
zcmcJNF-yci5QV=(iLiQj97IbMu8?##HWmt&cEW+Bg@vc3z4|}=2ZEiISXn5D90($a
zm5pF&tr*`J2bOSWA|m12*`4IQo$L-Y^t4)NoMn3yrhs{&lrlwL0rajtUhuV!hG`gc
zqI9ik3dt?3Kf^{pu-XYUCj*I7WzvT98Xg}4PZvFQkN4<0M?F@|=O+)-U&70MAeXL8
zw~qc4?u@xWrtj04l<eE9Qg5|c4Tjfg9>3AM&f|aT?Y?}UVR6|088pvft;!?T>nta<
zPOLBbuxWP{pVgomTz|IDj`zYzk1f+K!tx+ZoO6A-AFM~}>~CJ?5o5hkcmKGSc;2D#
psQUj{Q=b1tTlTuj;qXA{M4cPW-;E`)AR1z%h#!jit9TPRd;)f+aL)h$

diff --git a/themes/original/img/pmd/grid.png b/themes/original/img/pmd/grid.png
deleted file mode 100644
index 6aee6e5bf771c6e8c24eaca986603c5306072aeb..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 688
zcmeAS@N?(olHy`uVBq!ia0vp^A|TAc3?z4jzqMyzVDt*`32_B-Q&UroGR_!fUNlSH
zYm|8b$N-9%r|twY?2?v3*dB=!tW!7pC${({wSg6%H_A9=owm(4rOzs5Ge{)kEReKK
zS!12H-6n0DQRXG1%=5+>r+~;L{fK$mKBKHlMp>6lvd)-hoiWKgZJK$?DDxZ$WnVGM
zxek=FD?AS(3(lJqJ~k<OVp8<fwCIUh*=zH%*A~SOtQ-E@H2$}3`tQ*E-=XEdOU+Z4
zwm)t_)c(f<h&ujwHazpHf8^EhB(V8Gc;}O-uE)_Gcj7v(rc8O0+IKr`+Pj=74{{d#
z&zpKDZ{~}Vxi2f{KdoB$s&4VK?p05E);#T9^Sp2Ei~hCGCTx5&Y5lY5o1ZM)^>Xo^
zS1S&E-G1ubjx+Cep80U(%E!|;KcBtz<;sIEcb<KF`0~e-*FRo=`1R@Q@Bjb*A5ng>
z0T`NwB|(0{3~U@6Ts%B{f)bLFatg}E*0#3x4qj1-iAgDS4IMpwGiNTpapTV2$B$pX
z`S9WM=PzG+zWOBrH9zrmaSV~ToSdK_YQXL3!L@k-$HtSdBz9LyWomy=IARexM|e|F
z(Wc3FO<fa`)||Tca%RE=!8J!&MW+<|d3vArWm*`*@9MTeVscqYP*9MbgzB+ZpPE=%
z&pv)syzs#NLjgQG8t;VUM1?0y3r~}lc#)r|#Va;t3oj2BCrj58wp+KOXPs<dZS{Tg
zHu2WlHN8s?H0j*x^YioDX=b+5tc<Vk*B=4(le>TY`t_`7;`-G><}MSQuj-3%{kg&_
zv2fk<;Ln{MEKMBpyn$sqp6?X-x`&Br56={q8xxy4Cx-h(xpmE-J@JSDJ45Af^Z)#{
S|0e+b%i!ti=d#Wzp$PzDK24?o

diff --git a/themes/original/img/pmd/help.png b/themes/original/img/pmd/help.png
deleted file mode 100644
index fe200d8d3f631816f667bcb1970da8d57bb80152..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 714
zcmV;*0yX`KP)<h;3K|Lk000e1NJLTq000yK000yS0{{R3x>xN#00045P)t-s0001G
zWo0sG%ra@wHf6msY0xrh(Pd?2H)XjpY0*AnrDbJhH)Xj<VURmzvrl1!PGW{KXv{Kc
z&oXGrJ7%^`WR5yyvodJRGHA^*Xv{ritUG46JZ82sY0@%j&ogMsGib^*XT&#VzA|dk
zGHTN_YRoli%rt4sHEGH+Y0fff&N6G%GHll}YSTV(&oXM$K5)-8apN>{<TP^SHFD%O
zcI!8G>o{}ZJc0i`g8x8+|3rM{Mu+@Jhx|y0{7Hc3N`K-?faFnw;8u$DSBd0WisM^|
z++K*)W0LY@l<Z`b^<|FRW|j43mhNnn;BJ-NZkgzBneTF*^?9G=dZhJyqV0a8=6<I2
zjI8C2tmlrc=#Q=Dkg@ENujZGt<e|FhqP_K_yy~dJ^{m74wZ`hV%I>(#?zznHz0K~v
z&hWs{@5I#c%h~hI+Vs@m^xWq5;OF(`>-GQt|M>eMg#Z8mF?3Q+Qve1C2nq}g4iOj`
z86F@bGdn#!KR`-aVPRrqet?LKj+vRK*x20N<Kye>@bL5V^z@ANPGSH60PjgeK~xwS
zmBIZ=!cZ8%;op1CJLhmVf=WfDKZ1hp|8f!n6N;8H-PhU9w#;szo(KL)_+^ukG@0i@
z_%WI#VWO!k(wsBlELtuf#z42(eWri~g4N@*8LMhP538aD3#{&+B%~iio2#bDz<`;q
z+lnE}dP28|V=$1!w$%YJRAs3VD2yU!n-p0yoZOoRpkUg10^y8d%R3^V&^R1n0b6#M
zrU!+r`Vs=N?!e7Kx&jn@eizgA5=A}N`N@L?oZLo6=Rs}4?lsN90^ZltNl=y8{AFKw
wP|l9Noi4`IAIE*=0O3O7D3HGJ<-osu11)l8_4wA{p8x;=07*qoM6N<$g7frkd;kCd

diff --git a/themes/original/img/pmd/help_relation.png b/themes/original/img/pmd/help_relation.png
deleted file mode 100644
index 8856604feb2476a6dc99886a4954a3f2957799b2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 920
zcmV;J184k+P)<h;3K|Lk000e1NJLTq003kF003kN0{{R3M?7U_0002bP)t-s|NsB0
zs;b}L-<F}FLStifcX!0Z#K*_S;Nai@006D6t=QPuhK!8x@bH6)iKn=@cZG$$&d%Te
z|E<^8f|8Puu&})T{-FN;eEj@WtgKROY}MV}TY-Ur{rz_E@NVJZJYQdwmzT)M$nWp(
zuDiQo#l>se+gP-;aB_0E=K9<J|JeQi&Gr4p@cgmi`KjFao6`0G0RMLYi2sO)hyZv0
zcX$6kKmT}m|A&Xi$N!w1|LyJnQ&ay&M*q^%{{sX6U||3MKtRY+h^R7%&`5SW9yl2Q
z00M+bL_t(&-tC!rQxq`}#XBR157-q%Q4ml$R6Kwz3#eRP-~TiD$6QHfdNVWWNl{z#
zYHK)(%C9=<espJuf~AO(Cku;9%TLpvK`_38M5Kr)St%F<%2yYLP_mlGf%J*=Da1%2
zeQVAjYoq=l<7ewh-;nXf^UZNmW>=Y8Qu(Fm#mlW%ueWy+3j(uf1R!sA_x9hudw+14
z)j5i)7le$Cjz4_-v~)1CA?0={UY)!P*#}e*iB4FlPTmFMlLaINF}$mIrrAYApwFz7
zT*XI$d|@RB`N~SkdDk~qO3u4Pvdi?YtUiiD1VE>(R5$N(iv>h<#!7Yct{TWWE7i@r
zkhTvnx(N}8<6X9aNk!s#S3lcT@vbbpitoa^5Eb^%Nbv6vB@zfgW_uUkc`L1@ylVzz
zGP!W&_pZE^hr2KXnNBYqU0pZxt`?B$c74BY=3QnXdLY$bF%Z+ca>ueD5P;Y-V{VRi
zB+XNpgIF`8)!KC^Miyeuj711&Ff_J;2zpm21bssIS)~=k?_JgMYzt}RU4anOyGrvy
zc|pP6f;5Mi-eveoT9ih0A_P+JU6lbcEE0QWtb-sNQt7))$ZRX_=v~g4cwDlZce&X`
z^XXlW8uH_3(0x}E$jz<RLHAuvAa`18_r9yR>;lzWNlVDR)(^j`eHUnkk@z9M?S}Ht
zWb*f-c4iEKkke8An@(|A<6Y)PwTDn;yMWr65#|8}&K-9;UC*8wtuqOS+}vghI(=83
zUHMXh*Mov@7JQ9J3<yD~@EcQaQ-}zW^h^Oop!i1+IS2&bU$J%4`@tgu1pSAC82csr
u!pD0uG#`{mp+sN|8Z>Coph1Hkm;M7?gMcNc@(%d`0000<MNUMnLSTX{8qiSy

diff --git a/themes/original/img/pmd/left_panel_butt.png b/themes/original/img/pmd/left_panel_butt.png
deleted file mode 100644
index 98ead4e602c7523fa2e2801655c838fa9827e086..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 129
zcmeAS@N?(olHy`uVBq!ia0vp^Oh7Ea!VDzOwQX((Qn~>?A+G=b|Nry%@2}s#fBgLQ
z?fZ|<U%!3){Pq2(&u>3`eD&_bi#P9{y?XQH#p{R9UfzHD{2ALUkSYA0E{-7_*OL<x
e1X2$1N-_v6VdP$r5abM$V(@hJb6Mw<&;$V4S3Icz

diff --git a/themes/original/img/pmd/left_panel_tab.png b/themes/original/img/pmd/left_panel_tab.png
deleted file mode 100644
index 733588e3370bf9ff0fe412dbfa12ac435d1963da..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 133
zcmeAS@N?(olHy`uVBq!ia0vp^3P8-r!3HGvcdbbWQa+w8jv*Y^mmcKia&Qn~4R~)}
z{5<jMG(+wUdO=fEG`kKd&2je4i&v_e@gnV+cdNgs<(U%xWzi<lf;o;no0a|edQuMs
hSpK>d9RBAE<CRB(r}SE%Y5~n<@O1TaS?83{1OTzEE4lyx

diff --git a/themes/original/img/pmd/minus.png b/themes/original/img/pmd/minus.png
deleted file mode 100644
index 664956f3cef5b33fc857a6c908a521d670c7fa5d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1004
zcmV<I0~7p-P)<h;3K|Lk000e1NJLTq000yK000yS1^@s6jfou%000BCNkl<ZILo!v
zZ)jFk9KiAKx%WQzULT)l&m6Mc)|P*!qHSo7(JWNvi!3bP6zB*ckdzpS1+^D}vp=tb
zXheZzFOptZ3TjqRCXp{xQZooNr7fq%+}yK0f8BHMx%ZsYi$@2NWkLPmoHsxCaQOXx
z=Li3Bh<oIn0cdV$Nj656sbFxNkzH{8UxV*LbK7Ifcg$*Oe9}wJSY%lS3`CKRrwZlM
z*^5K_Hk`S<8;I`-9&B&!nY*%mcRFp?h~g+ZKaP?iATVAMQP)7^)sY*?pS^hCc+WN%
z{7dj~=ltGzD_Y-APF*9sI)pKRZDWi;8G}*=B_+c3aptyBtRyCej-6h;r4U{C6S#kA
zOV`5A=2J8BgG9L;!u7DxL|UK>C=F<hRtBj+g&|JU0xF{R(obKWdFU0W09d!druj7k
zer|}kSitgpj0_l_hzKhI#(+>U*?hoQJ_MyvmdDL2zhO;f7cc2ru>H1U0ergnz7=jb
z@vtrz5l#Xv14irGx&NJ`Waq9T%$6Cu5s-QDJ?i`RFcCNyrO_fmY3w>Oyt(xdIB@Gq
zimA1_Y^VspQdA0(2exfxVfPxEmmTEjv+HPByPmG+dja_7(1(<MK27L&1hGN{h54!0
z%pwL07aRcB*7JlgC<Ac>xE`YeuQF>+1GBp~@YLZG_@0B20cT%(fyp0#KzS}Y)+j9i
zjYKX0E?59sD_3by2DAZX*~ns%6WcdY$>;Dr2Y_Gpf5N$ek1@WB*40K;8)h(Cd($=4
z*b}ja>M`g@F<ydMTl#TpYNy9)PWO8J?nfwPWfi)G2@JMn-IxZYvd+a?pp-_%np_}g
z+4%vhcl2Rff>SR)$MBJT)HOBo^ntHQtyxESGp@c2aBR1dj^p#wV4-XsmBKH^S|DSM
zuoFDEW)%P@U)s$1J$w1ScQaRyeMKshrlox;GSnEYu@f$yoA~yL-=m2;2K)2nb6)p-
zvokE^h{71RzJc`84lW-#f|YWSfy7B?Xn1rjgI^rNb}dB0BbCnJ7Ym)wT&bMB1AG&l
zWgU$tEtk%z$t<!Wi9)buy4B(Xv5b&qLm~-ID$UHATAWhpjg7zN`|tXfKZ5$%9ZiQx
z`YS8N0%5sCEaPhTwE-cpJs&qyi=Xgda{TR0gQdQ|-8OGQVo6*5E>Tm{8(UT;Rtgoz
z2w`E_HkJ^GAh^W%SpUXr^0R-m4*~W<{fyT1<Hk>R;Mk35BZ=g&Dddlv5%pcqU3TIB
a5`O@wr^TIerJCFT0000<MNUMnLSTYPhTVez

diff --git a/themes/original/img/pmd/or_icon.png b/themes/original/img/pmd/or_icon.png
deleted file mode 100644
index 5a12061c481c31a5c5d582cb629371a4136f77c3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 611
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GXl47?lHjLR^8||Ns93Ni@L5z`(`?
z6*ClJFlJyd6k;%9V2Cqhh-YAkmSl{UVvJ#9m>bVKUrJ)WI@5d&rUhaQ#>U3GY9#k*
zFzz!l*ssKRAfEe>n&J^B=HoKF&*E8Mm}>nfWB*ab{-agyN0;=EKB=EctUps(erB@&
z%wqYO!}7C${Z|;vuQ1kMVLZPgd45In{EA`y703K5f%UgH&u@R0-vQ#k1G#^Pi2n{3
z{~aOz$6NeQfaaeNjX&WUe<C&hL~Hzwwfmc3_czJzZ?fILc$a_qk^k~z{uM_4Yp?p(
zQT=a1%YSE%|1Ki`UDW@3DF63j{vXWzKZW&wVf_F4s{c(g|NC42&(-@sSO5R&W&hW^
z{NLjFf6MyMsrz|>At6-~<Od8kHg-{|>bknRJqNB`yLt2W?S~H^{`&Rj&mURm<XWJr
ztDY{7Arg|T2Mzt190k}eyuUs7DN7EITePrr=82;b0YBd7>a6JKHSL_*QlM77eRr|(
zK6fSu9;U653@i+nwMsQ~&DmKd%sy-9dgkqC8%?FdzY^y!w-Kw|w=HdA_wnufB^%B^
zeK{%gQLeql{td<77s`huJv#ATw?F#(Hm^XHnc*RecBy(R8R!enJh4wFkK<O0<RnGI
z;E>cj8S!%UJL%E=ImIPByX6y?-?}>e@KU!~aq<3&ELrtG=FVv;nf={kN9`PMW=;d$
m%S>B)&oT%VcnGY}Wcb7E%~zP@R~zgEN)Vo|elF{r5}E*$H1KNx

diff --git a/themes/original/img/pmd/pdf.png b/themes/original/img/pmd/pdf.png
deleted file mode 100644
index 8c110d30b90e1ea8763800481d337c2f97ca6443..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 905
zcmV;419tq0P)<h;3K|Lk000e1NJLTq000yK000yS1^@s6jfou%00004XF*Lt006JZ
zHwB960009(Nkl<ZILpnHO>7ip7{`C_%<Sy!cH3>2?d}#RSg9=(vFIux5CXwKW6+CH
z4#pazrp8`KOuTd9X5s}B+yfqrCKxV$TqK$_u?aNo+7?KtZVGED{cfkbJ3BMmoevKU
z4WV1SaPYak`9J?(-sj_eh41@3%aEQa4N#t<MJH$N?bk<E59jBsmWNBWIlE%tHVXQU
zq0C8hE0d^Ia=QOk<fZ59zKl0&z0I*mIHWi%=oWwcEm11y1>u@k6<5D-Gjn?CKY{7~
zTPcJzaI`zs`O&E;2TykaVBML(s(6g#Os@QHkjpPDh1|J!2fuz}V9Oq+`^O^)G4M)P
zOXs<_>UgeMY-nc1$FBP9ZPmEY8>8n?GH%JKYsWwSzU3)H@y{m{@y-uV1h6YUg|f?X
z_AUU1<)W8dmI@99!{hBE4eV`e-ev}NpHHXLkxjt#XITv?@JY|hDu(T{P^_XGRSe4k
zz^;0fY=;%2%3^Vir9zcs`vjgGeJ|1dLA=(KUsJV6v?=7Wxay&)5{e|K53h@=BESc$
z;xRcdm|SgQG~a}*`H`~QeiX<*S#o<UBC%L>SSmPFt3DD?r^x`c9Xo&)4B!%=u}-41
z1=^DkYYY=q)s9*{6l<=`)Ur&m5<n;_0X0DCP#4AVzW_McbAYa0LH6uypf%?6Vk;yX
zBqExk)+pJVbUlGdoMcF#g$4C>>q<j+=SEh?@%?l>c8mVcZy>_X{3f8{mWJz9qtup2
z)_3m~v^B%N6YJJ%-{n{>gDgXHJ-m7Lg$<x>7Oh?3`LRvFq0CA1+@;))ajo?JnX|8M
z7_NRZ&h%^v!}d{RC>15HTpq*sVRFWzlE433G(4BDxre>4Z@ajx7Zx6!fBJTWm4Zpd
zE`w9XT`Oah4VHC-dk=Jm?@Z5xjp46^5OZ5Sy~M9W4-a1-wJz_7hgxC{LCO`6s^jx0
z&G&sKrVPe%`gE!~_-RVq9n54h#jSt=Aav=6(Vf5i>3rdM!FP7Vl}I!a1YosPAwRcP
zu9*7IN$2Lpq<sJO<FH!5jp*y^Qy)0{w-@C-M}(xb3w%j<=5)-R7)>bu%w)6KQZ}14
fp7e?T{g3@GgUV{V?*eQ=00000NkvXXu0mjfu&lUw

diff --git a/themes/original/img/pmd/plus.png b/themes/original/img/pmd/plus.png
deleted file mode 100644
index 11ef00239519326f3df0f83a1271b650371a8463..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 969
zcmV;)12+7LP)<h;3K|Lk000e1NJLTq000yK000yS1^@s6jfou%000A!Nkl<ZILoz^
zU5Hgx7>1v<_TFdjbDVQ#oF+|eLTCIzMya$vD5O6jN$R2~hw3U&L5K*t3eqA7x=AR)
zE`z9)sD!R6H8YeZE9l1*W>ipgCg;a9bI#f4?7hDAb#Zh+q%5fSV%;owc-Q*g?}h(Z
z<{I~5WhcFB7L*n?@<wxLm~-sl{J#d4-=ufbs#~64Ja^&7a$H;<S;Yg*+`FkpZRq&;
z$cG<4a%vagt_ghjlitB~i&yWOUk)nXjFS2bIB6jmLM>4+3y{2<Q&Sg@?mm8S@XQv5
z{}TA<XMNl5U9$A;Ii)j9wnp#@5Flz0QF2jo$*?A&J6y%sbTsk#$k4hI&*sOj0zSCs
zrn}ZJ>pfB`4l|Qa5ttaSAgZWBE|5DV_lk2$Q(DXo`>CZ}C*Jz$`&)UD6u@2vu31#s
znIt3BT$RAYh$^B=v*j6`XfRn#+YTLM0wOVI>nHJce8u3({^u@pEWmvq&0iB0Chlzd
zX)F<574eYf4SM3$ys-Lbo>{hsde$TpZMzl4`-rib^JH0lbN{D=K>Mha8uzDO$x|?R
zP^I2#&~Q+xWc2k6P;3~+Y931p9;_y$DKwjcnrh#Yj?U#HRF8!KaltP!MsWhU2uQ*}
z@-!O3jinU;#HN$=JzKCQWO(Wqei%KB#Uf(xcx;yS18tysDTvti=Q~Hy7TJ2+yH~`i
zySRw0ckBXS-^uqmaQYj{Q2`N96x7GFPZl3cIM<%0mylXE!}cS0)5;xvoom^A^E;fY
z4fFb;r?5nf*GDPZ2oVrb2q6rDKW2exW`Arsk413KkUPh(7Y;L%LY{d5(!9oZXNQPP
zJ8J=#+$lt1AvNXfx7jJ5tJ*KJESYxBkmrhX5cq@uKx3TGaFP=lh)e;i1)M0NLKqY%
z#L<`gH{=sn1pBeQH@wo7=*zX%B+dox&2V5eB(@bY=cuMtyjQ$}S0OSn<&I9$q<Z^-
z$J3+jy}G2|2WsCg?djZ5v~w0Unl&=#5iw*=s5YxKS}ACNc#l`17<SOr(M>CAyt?m+
z+6R|8vp^2u>krKA?MW*4l*8+K#Ti<8M&<++i+b>?#6dz=ay{ia6>4_!jjuLMzx4O@
z^%~K}mGgFVn94Ss?Q~Aa#bJykumQ#za??CfWo-M`PiDLSQ6B>Iy~n)1V)>z1OKUB`
rLPax2cDk+?4<1t4&*0Tv_`m2+)E(fv(RjDu00000NkvXXu0mjfi&53y

diff --git a/themes/original/img/pmd/query_builder.png b/themes/original/img/pmd/query_builder.png
deleted file mode 100644
index 13262f92bb7ac3659730ec23a5915574f0c8caa1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 685
zcmeAS@N?(olHy`uVBq!ia0vp^A|TAc3?z4jzqMyzVDt*`32_B-Q&UroGR_!fUNlSH
zYm|8b$N-9%r|twY?2?v3*dB=!tW!7pC${({wSg6%H_A9=owm(4rOzs5Ge{)kEReKK
zS!12H-6n0DQRXG1%=5+>r+~;L{fK$mKBKHlMp>6lvd)-hoiWKgZJK$?DDxZ$WnVGM
zxek=FD?AS(3(lJqJ~k<OVp8<fwCIUh*=zH%*A~SOtQ-E@H2$}3`tQ*E-=XEdOU+Z4
zwm)t_)c(f<h&ujwHazpHf8^EhB(V8Gc;}O-uE)_Gcj7v(rc8O0+IKr`+Pj=74{{d#
z&zpKDZ{~}Vxi2f{KdoB$s&4VK)|GF1);#T9^Sp2Ei~hCGCTx5&Y5lY5o1ZM)^>Xo^
zS1S&E-G1ubjx+Cep80U(%E!|;KcBtz<;sIEcb<KF`0~e-*FRo=`1R@Q@Bjb*f6dc7
z4-8Gik|4ie1~v{3E*>5}K?zAoIR#~7Yg=1;2d}8a#H5tEhK`=TnKPH)xN+z1<HxVx
zeE9JB^Or9@U;UDRnjd<)IEF}EPEJq|HQ@I2;M%-^W8=wJ61yv<GPOS_9I*(UBfP1o
zXw&4ormhJ|YfjyJIWu8`;F_bXqEm|fJWsPWZP~IVgx}R|gT&;rlAxeGAqn+kuRb-g
zvYvhX=yCC5M~gG}4+Ze(XuK1W6J@?MPg>$dexeqy*pw~2JY0-iEYH|(-Hx7hvVpbL
z_s!e4#fmph-SXhlIkD*Nizh6Xa+8yvKUi^|zi`r?)%r3!v<jVBEJOY}Ej-{K+aUO=
z%Fc9thlfJPhl>KK?bY+V1J7$K960UZ*&wSqL!$ENlGG(Xc1n8k6fzuEH2e8ACrJ|M
OSq4v6KbLh*2~7Y!jZ9wv

diff --git a/themes/original/img/pmd/relation.png b/themes/original/img/pmd/relation.png
deleted file mode 100644
index ecc49fac5a6c878600ef94d5f6ab68a5a1d117e6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 295
zcmeAS@N?(olHy`uVBq!ia0vp^A|TAc3?z4jzqJQa;Q>A&u0WcBL6m`upMgP~K~$cB
zL5qP)g@Hi`ETY1|r3e-@W5}G%z;%v+VGjetMTX*43=Gd07|t<du4Sm(#gKW3fnf^+
z!zl)?n+y!c7`Uzh75H2)d=4~Nx+KUin1PLrorjlKR8&h#%ih7+J18_FAtfvO%I$|Q
z8{AF+En`UWba4!kxV-klNxlXH4%fh2tByv_S^NI~{>y8(#7aiayTihCas6ZCF!r@)
z&iKCA!pM*pYh*UjRCDQut3uP0I!|3(;?ZXGW7m!4FZvfhG&@$n-0^Wwncz#&S($QL
g*<a;~&ehhuV%FQrTBOaC9RTvMr>mdKI;Vst0HvE;`v3p{

diff --git a/themes/original/img/pmd/reload.png b/themes/original/img/pmd/reload.png
deleted file mode 100644
index 63f0b6c92bdf34915b64e60f81886f3c25524ca1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 874
zcmV-w1C{)VP)<h;3K|Lk000e1NJLTq000yK000yS0{{R3x>xN#0005kP)t-s0000|
zQc`7QWl~a7SXfwNV`F7yWin{YGHKB^W4BULQZi}KGHKCeWo0*IxiV?dK4PV1Wo15L
zqc>%^UteEHVURmzvqoKpPho^kVumtk%ra@uGHA*>X0=UZjyhzsGHA>)Xw5Qc%sphR
zI$xzbX16?MwmW05GHKE>Y0oog$}?!nG-t#&X1+3N(lTn(G-}K>YRoig%Qb1rGHK2-
zY0ffh)G}<>GHTO4anCYp(>`#|G;!lJa^y5}<u!8THg@YbcI!BE;5&f-Jc0i}ga1T)
z<wl15NQeALi2O-_=1PC!N`T}~iuO^1;8%&{Sdsc#isM^|++K*)WR&b>j@xFI?rEI*
zY?R<^nCont@NSjdZkgzDpYwU2<$9+0e4*ujqvnC7=7X&Ggr??-tm=%c<&CW8j;-jB
zvFwts=9jbNnziSezW$uH=$*j-p}Og#x80+;;iJ6jq`c{+zU`>O^|8wMvc>4M%JQ|z
z?YGMAxXkXk%<#I<_`=ln#MJS|)9lI9<;v9N%hl=2+4IfX^v>M$)ZX&c;Plqu^4Q|?
z+2r=z=Jwv__u=XI<m>q4?E2;C@9FIE>+t&R@b~WU^z!xl_W1nw`ThF){{8;`|NsAt
z!ca#5002C6QchC<000321_lTS3kwVk4iOj`85$lQAR{C*J3T!=KuTI+VPa%vet?FE
zjE<R^r`Xus-Q(ly?C|jO^Yrw?)=1O<009O`L_t&-8I{4yPQpL{K+!wXu`gPAbS0>O
z8e^gxxBmYZxH2Xf6F@;q1Z;=Crd8q(=sECLf?sZAi(;ME90(4A)3(!5t2|w7D?st1
zJsRBg9nA94TfP~vfY$i>p;LXC#y_t!oq+{h4ew>%>RP%qQBrOU5}a^YRVO~S(pvX}
zHYkV!M~|A<ty>&9^O^ENf$ixY@h2u4kj|715@e|jn`wDFfLaIv5{i5^XY8+XK#R(N
z1!d3Ag6`#+3%u;Jj|2&MqQa+%@#<-6D)p6v0FEziJg^Ln)X(qh0t+Zj5d=yqWo;+%
zE^kmk9T#QTcgYsJI7w>|90=75t;VF4-Z%WmH`h{kdvJTl1poj507*qoM6N<$f`7ls
ADgXcg

diff --git a/themes/original/img/pmd/resize.png b/themes/original/img/pmd/resize.png
deleted file mode 100644
index 3c0492a3f4d828f9c1758881fa6b4e2e0fadabb5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 121
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!60wlNoGJgf696VhdLp07OCrD^~_zwiq|BMZQ
z;9<}qj-`bfH%@G5blUxKN26e`TQI}s*(K%+ZucJL?Xk#Eds8-9o^J*NLz$dbbjzop
RD?qatJYD@<);T3K0RZ6+Djom;

diff --git a/themes/original/img/pmd/rightarrow1.png b/themes/original/img/pmd/rightarrow1.png
deleted file mode 100644
index 6d4f63b0946bba9110306342556d8dfaf9a5bab2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 746
zcmeAS@N?(olHy`uVBq!ia0vp^A|TAc3?z4jzqMyzU@Q#q32_B-Q^CL}<BU<}MYGhs
zMwu6Y44{~K>P{fTE@>%*?U6XaI(4&uVvAo=8(8sqql{D5Y1@2L`m9nmgG4gU0!iDH
zHP&g{ZPK<GWnMDMJa3$F3W!Y7kC><JGs?PTly%u8>x^mE8I#P@rkSUVGS7if_7$U?
z>p&^H!t)@q;JiuUW0RsMCPhz8i=LR3y*4j<ZBhKdy5YY~<A2+x{|?Rn9a{do)I4=*
z`{M>g?SDLgsN;`k!!ytJA71s3yc(VaHa`gOd=l05IJ)CbT*uXvDQ{ByZl_Iqmow!-
z&Vv8B3;yR#y^}ZdMe&lqmGht0Eq>Oz@=ed0r@d>Q_pN;~VdI-An_f@d@_zc}C-V;c
zU$FPnf<yln9Qwa-*UO~`zpOa)b=8qC+fTjQapv95Garsz`FQ%~=d-uIoO|&9(xZP@
z9(=j+<kzidzwSKy_Tc5uhcACTdHv({hhJ|#{`&Ow_y7O@-^SkQ1_ruONswPK0|Ofe
z2Nw?ypP+=Kq@04Xv9+zOy@OX&Vq#KCT|-At-^`iIZ``<Z_wnP`Z$5nZ{Q1ilJ@byU
zK;7RwT^vIsE+;1_h;HEU_UhbVq{O}P^vhWl71FOYJ}I^A42ivTN=y6nW}B@piHmZy
z_OUKq`ts${rAHHQ-3bV+oc`v{oja>mUAc2dMqgEJgT!V(A2orHkWkgMv?H%SHnO(r
z1SKgqEZDG0>)h2#9x^%_55+j2I6Ev@I+G_N;FKPVTG-TtR6TAn5yMgrUoStu6RTI9
z+Puwh8XNbfR~DAm*0<S0L!aKZwvyy%V3icT^S5!qs#P2wyR<($+&Q^YOh8U9E{I8m
z$%IAmT}r}}@bBGSY)u;WzJ`1=>?L<j{ZiZ1T+1_+)lxw5(1|1Jddk|m2M!<ci0WWw
ZsO7PFHG}cLE-(ZbJYD@<);T3K0RSfca1#Ik

diff --git a/themes/original/img/pmd/rightarrow2.png b/themes/original/img/pmd/rightarrow2.png
deleted file mode 100644
index 5cecf9eeb30d96cb21df57e9a2fb651c77bcd156..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 757
zcmeAS@N?(olHy`uVBq!ia0vp^A|TAc3?z4jzqMyzU@Qsn32_B-Q^CL}<BU<}MYGhs
zMwu6Y44{~K>P{fTE@>%*?U6XaI(4&uVvAo=8(8sqql{D5Y1@2L`m9nmgG4gU0!iDH
zHP&g{ZPK<GWnMDMJa3$F3W!Y7kC><JGs?PTly%u8>x^mE8I#P@rkSUVGS7if_7$U?
z>p&^H!t)@q;JiuUW0RsMCPhz8i=LR3y*4j<ZBhKdq4~c{%~Q9wKW^=RJb<X<k7vU(
zulh$`4Nn4_AB1;4iRyYB-Ek+b<7&#3H>rKMQ>TAQoAxee%7dH*|8p1o&zpKDZ{~}<
z+3!l`zO0=8v})n2y2a0W);#T9^Sp2Ei@uGY`qw_2u<^~L_0OhnezIWqn}xexF5dHM
z?cq0@PJP>P=G{&Z`f%{lrz2NBp1ASp^v%!b9{j%mL=XR8did|sqklJ^{JQn**PUnI
zp1l6?<n_;IZ+||2`}5`dUvEDCdiVMFr?0=ieE;+F*T4V&|94dG%LRtJQAv<rFarY{
z2L~4q51*ifq@<jJvaz+Tt-XU+RAORMN?k)oPv6X$%WvGcbNBJ%*Ka<2`26|H7d`Wi
zvq0VdJY5_^BrYc>D2Q(0@b>E5V5G#o@$}1C7CWV0YkX2_*%|WoF}L=k$H8;9x+E^j
z(R!B}`tjq@s~=e%Z`}z9to*&@)hn+B38gh{-9o|<J(22KntONcvf0O@A+`88yO_wP
zj_!W{b?fwc^;fR@W+=qY?Pby8=H{**5-!e~5*9xDWCQEcHGi0!Z9lJCU0b_)wei{1
zgH1}yu3fukDX>w;J2`WM!s@=Yv1Tqh*N<IuV9+_S;=zm1SlNeDBj&z;`gFw^=0f%5
zv&wUFJUl$IJUX_wDIA&0)AQ$*T;f9qfoBUfk1>8$SKdBp-|YGGXD{5Oz^>#XG4scf
j)Rd*H6*D9}xeFP-zO;#B+^XRK3<(BLS3j3^P6<r_{1=3@

diff --git a/themes/original/img/pmd/save.png b/themes/original/img/pmd/save.png
deleted file mode 100644
index 3e65b6ab42d13436756a4919c9d3431604db476a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 409
zcmV;K0cQS*P)<h;3K|Lk000e1NJLTq000yK000yS0{{R3x>xN#00021P)t-s0000J
z6B8Uqh#q*OA4#eoSg;>_upn!_AZ@%LbiE*my&+`EA%n^xj>;l;*CT7#BxCC&aOEU{
z<s^vYDuwMTlI=Es?lz9@IChsrhwns{?@E5}QjqXcoA6eUvsS6IU!(D4lJRSy@_4E9
zc(U_=ru2oe^pUyslfw0ww)URM&7Z;cpw0HBzxS%w+^ov?tkL(g$N0F>_`2ix_4W1m
z+pzfD$N1yA`|ROKkSKcq0004WQchC<K<3zH0001-Nkl<Z7}KTDu?hk~420o-WkC^a
z6tod+Eo^-MSFsa8!RkOxH=Butdz{uz`7tCR@K+LW0D1}n-~t(_^T%QaKt5G~2|(+R
zBf1fNu(FGW_G#vb6gD<%GZp>J%n?a=h0pd9>r0I&QGBHV5lfT8!sH{$I)LfRy>BR)
zxTPca!go`oEnpMHfUfIvpN;cW8Xm&N`~^7CZvHQCfIwTU7xW;E00000NkvXXu0mjf
DC85Fs

diff --git a/themes/original/img/pmd/small_tab.png b/themes/original/img/pmd/small_tab.png
deleted file mode 100644
index bfa1b5937c2d14ad9b30b2a0b63fb20fa8ea616c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 180
zcmeAS@N?(olHy`uVBq!ia0vp^q9Dw{3?%2B3|#`Gj01c^T)TGtUwZ3*#_|6dYyLA#
z|H-iCf7RCiL5uz~^!#L)^gm<ce}>9W43$3_Qa&-Hykdxc#Sr{zOTwWjpmrNi7sn8Z
z%Xd$l6g{B8;czftp<8PDztz6;+!ruCx0t|m;9=v7mj!qI%NAtRuHAYz>h{{b;ft;+
e{9k)G+0Cw{M3}8wHYprv4uhwwpUXO@geCx!7E3q)

diff --git a/themes/original/img/pmd/table.png b/themes/original/img/pmd/table.png
deleted file mode 100644
index caf214d23f6d4ce1a709b231842b09f52dfc7004..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 163
zcmeAS@N?(olHy`uVBq!ia0vp^A|TAd3?%E9GuQzsxd5LKS0IfJCf`&{IW>R&{Qv*|
zFHcF&2THS*1o;Is@C%rkTkmBRe+v}R^K@|x;kcfhpultLpaa9f5++0Kbf$w}6by_v
rFJ8=iYRO)WBfJUAJTy2Y9u=4~oR2nYX|%X#1G37~)z4*}Q$iB}GK(uH

diff --git a/themes/original/img/pmd/toggle_lines.png b/themes/original/img/pmd/toggle_lines.png
deleted file mode 100644
index 9ab3764a6088fb3932dffa2cda193b506cf48e33..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 630
zcmeAS@N?(olHy`uVBq!ia0vp^A|TAc3?z4jzqJQajKx9jP7LeL$-D%z?E-v4TvJn1
zjWW&{WnMH(-D{M20muM~n5XUpGVGF;Lf9UO6RcA=`zN;eCAEPSpEt@lWu3OoH>J-i
zWiv=5<1CQ0O<7}|w%sOen^EQ^qs;Th8K;2AB>jka+CHPKOGa6jO|s6IW}Pv~JZ+kJ
z$|&<32xVU}%DE1dvMW3fA`8x&6h1a7dSX)a)U@b{S=npzvey>H53C#h+cf^SZTj!f
z{NJJFze~+ix3)hX?SDKv{&+S#^QwR3)$k;+`9XN+lc=u8(H(c<I<BTnd6U|AJ8jy#
zoGA}-7W~hfdM9t@i;}r7E9XD0TKKAN@w3*IZ+g}|?OpS{Z|#fzwa+GOd^2hNv+0|k
zEZp^S@t#*J4t?Ez>fMer?{=Q~aOBFz(>Fh#z4hhJvu_Vy{&@2G$LkNjK7IZD|NsA%
zK(E7~U@Zyq3ubV5b|VeMN%D4gVd!9$^#F1>3p^r=85p>QL70(Y)*K0-AbW|YuPgg)
z9xfgOiQ54(FMvWzJY5_^BrYc>EMS{((X6P<_{t=AvEZ@}-_s{N{0lBRbZAzlq%CW5
z@M=)=@wujGXl%^EGHG&*=z^vw!H*x~1O&vFGK-pYZ);;NW?r!%xuaCeMdRw7J1klm
zkJIOJu|5-97T}m1eLEyNIyze+H7}K8^NDl!?#X2>n=2O*aPA~G-yD%dzR-_+O-%Zx
yEz?76oewuCTnU!F`I&3iyM6oK{pt$gjAbxV)|X6JHhnVCy$qhNelF{r5}E)^d>l^z

diff --git a/themes/original/img/pmd/top_panel.png b/themes/original/img/pmd/top_panel.png
deleted file mode 100644
index 6d8302f97798e51cc17801e5a0813df3142ff08d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 173
zcmV;e08;;nP)<h;3K|Lk000e1NJLTq00062000~a0{{R3e6*hZ0000>P)t-su&}WI
z|Ns5{{rvs?`uqF%`TF+v`1AGl@$>cX^7HNR@#^mI=<M$1>g?p`>*40<-{t4s<L2Ap
z<k;Wh*4^RM+uzdJ-O$+F(b?U^ae<Bi0013HL_t&t*QLS%4FCWL10b&NpV<&HkZ3F&
b&Fg>z6#oExpKn8n00000NkvXXu0mjf<bPg)

diff --git a/themes/original/img/pmd/uparrow2_m.png b/themes/original/img/pmd/uparrow2_m.png
deleted file mode 100644
index 2c3b9352e642c25be5f8ff0f59fc562b9721f862..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 729
zcmeAS@N?(olHy`uVBq!ia0vp^A|TAc3?z4jzqMyzV2lay32_B-vuay`sBZGyhG`2b
zd#Be=T>xYNMJjrxK^R4C{XlkJV^?|i)SUYE-1-in;`*ucYbVXE=$&5B+*8&)1t?NC
zWgd_$?VJQO1c(}@Ed;5VJhytnEFf9cKNBd@I2|Miv;wHOe#(3xYMimCdFB$Jc-!0+
z5VCW@s;&jA`xdY3Te5D_@{LngZkoDs^VC(Fr?1{JbIrDyYq!k;q3yHRZJ)D#$J`A&
z=WX0Mf8(yD+x9KnzJJBegDZC(T(#@a+Pz2C?LE5j!12uoPi#AKYR9oNJCB{+b^Pq^
z6X*7xy08z3PG8u6`r^?GSC3t|cI@J{;}@@=zIyZQ_1l+k-@kn4!Ie7?uHJok^TCr_
z51-zB^8EhO7Z0AjeDd<m(^qewy?*=r^}FY9-o1SL{?)q=Z$5l__wn<G&tE=&{r2_y
zj~_pO{r>ak&)>iQ|NqxKl6M~%zJ?`1e!&b3Y#bb1JUo1Y5|WZ~3d+XTwzl>TUQvmO
zNhx&=9X)+BXD+{S<Idg3uit$5@cHwXFPnWI#R4_|_H=O!k&v8vFxKyogM`Dy-)DK&
zI&8ei!pSPs%(>xz><-4mvn3W!<hbfopRxQcM<H_+-=C=;PPfbp@qD{OK=04Rt<TFZ
zZTjIOyTJ1GS+~`#`@g7Xa5*sF`%))(Wa1Zo<D5iC=F1mj_yj%j>w|9|S?Iu?Jlp+-
zL~ZyTHbxDO+RJVsx6`^g?R>;VDxR@CeO(Zd&v2EI`BZ4U=idj$k@kyR92~DsSzdGR
z@d+)FtJ@YRXu9hDUNgUMjnmzf1q;r7Dm>tQwN@|U*-BR4Df7&J`(*#s&40i9%EHEF
zd2=tNXKnA?EXDJH&(~BUrtnl>VW5?Oo=a1n`>iu#=RV5YuV0pV;?doUGl0Rs;OXk;
Jvd$@?2>`Lfj<)~+


From ee10ee14eb5702c01a6a5814d1cb877167615b3e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <mcihar@suse.cz>
Date: Tue, 29 May 2012 17:15:40 +0200
Subject: [PATCH 18/29] Point to new fallback theme

---
 Documentation.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Documentation.html b/Documentation.html
index 307a24a41c..10d16f876d 100644
--- a/Documentation.html
+++ b/Documentation.html
@@ -4433,7 +4433,7 @@ chmod o+rwx tmp
     <a href="#faq6_31">6.31 How do I create a relation in designer?</a></h4>
 
     <p>To select relation, click:<br />
-    <img src="themes/original/img/pmd/help_relation.png" width="100" height="100" alt="[relation icon]" /><br />
+    <img src="themes/pmahomme/img/pmd/help_relation.png" width="100" height="100" alt="[relation icon]" /><br />
     The display column is shown in pink. To set/unset a column as the display column, click the "Choose column to display" icon, then click on the appropriate column name.</p>
 
 <h4 id="faq6_32">

From c509c43fc7f91f71de3101fb9ec90bfc65caf56c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <mcihar@suse.cz>
Date: Tue, 29 May 2012 17:16:22 +0200
Subject: [PATCH 19/29] pmahomme is now the fallback theme

---
 Documentation.html | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Documentation.html b/Documentation.html
index 10d16f876d..42b906ef49 100644
--- a/Documentation.html
+++ b/Documentation.html
@@ -3298,9 +3298,9 @@ RewriteRule .* - [F]
     <a href="#cfg_ThemeDefault" class="configrule">$cfg['ThemeDefault']</a>.<br />
     <br />
     Under <a href="#cfg_ThemePath" class="configrule">$cfg['ThemePath']</a>, you
-    should not delete the directory &quot;original&quot; or its underlying
+    should not delete the directory &quot;pmahomme&quot; or its underlying
     structure, because this is the system theme used by phpMyAdmin.
-    &quot;original&quot; contains all images and styles, for backwards
+    &quot;pmahomme&quot; contains all images and styles, for backwards
     compatibility and for all themes that would not include images or css-files.
     <br /><br />
 
@@ -3313,7 +3313,7 @@ RewriteRule .* - [F]
 <ul><li>make a new subdirectory (for example &quot;your_theme_name&quot;) under
         <a href="#cfg_ThemePath" class="configrule">$cfg['ThemePath']</a>
         (by default <code>themes</code>)</li>
-    <li>copy the files and directories from &quot;original&quot; to
+    <li>copy the files and directories from &quot;pmahomme&quot; to
         &quot;your_theme_name&quot;</li>
     <li>edit the css-files in &quot;your_theme_name/css&quot;</li>
     <li>put your new images in &quot;your_theme_name/img&quot;</li>
@@ -3333,7 +3333,7 @@ RewriteRule .* - [F]
 
 <p> If you do not want to use your own symbols and buttons, remove the
     directory &quot;img&quot; in &quot;your_theme_name&quot;. phpMyAdmin will
-    use the default icons and buttons (from the system-theme &quot;original&quot;).
+    use the default icons and buttons (from the system-theme &quot;pmahomme&quot;).
 </p>
 
 <h4 id="faqmissingparameters">

From c79566ed60d4950202fb2060e118cf43669c8feb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <mcihar@suse.cz>
Date: Tue, 29 May 2012 17:17:00 +0200
Subject: [PATCH 20/29] Document new behaviour

---
 libraries/Theme.class.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/libraries/Theme.class.php b/libraries/Theme.class.php
index fc7490b673..f301f766b0 100644
--- a/libraries/Theme.class.php
+++ b/libraries/Theme.class.php
@@ -301,7 +301,9 @@ class PMA_Theme
     }
 
     /**
-     * Returns the path to images for the theme
+     * Returns the path to image for the theme.
+     * If filename is given, it possibly fallbacks to fallback
+     * theme for it if image does not exist.
      *
      * @param string $file file name for image
      *

From cf40a064e9118a79c890f43c1b627dd5df6f5f35 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <mcihar@suse.cz>
Date: Tue, 29 May 2012 17:17:53 +0200
Subject: [PATCH 21/29] Better naming for function

---
 libraries/Theme.class.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/libraries/Theme.class.php b/libraries/Theme.class.php
index f301f766b0..03556b28e6 100644
--- a/libraries/Theme.class.php
+++ b/libraries/Theme.class.php
@@ -336,7 +336,7 @@ class PMA_Theme
      *
      * @see    PMA_SQP_buildCssData()
      */
-    public function SQP_buildCssRule($classname, $property, $value)
+    public function buildSQPCssRule($classname, $property, $value)
     {
         $str     = '.' . $classname . ' {';
         if ($value != '') {
@@ -359,17 +359,17 @@ class PMA_Theme
      *
      * @see    PMA_SQP_buildCssRule()
      */
-    public function SQP_buildCssData()
+    public function buildSQPCssData()
     {
         global $cfg;
 
         $css_string     = '';
         foreach ($cfg['SQP']['fmtColor'] AS $key => $col) {
-            $css_string .= $this->SQP_buildCssRule('syntax_' . $key, 'color', $col);
+            $css_string .= $this->buildSQPCssRule('syntax_' . $key, 'color', $col);
         }
 
         for ($i = 0; $i < 8; $i++) {
-            $css_string .= $this->SQP_buildCssRule(
+            $css_string .= $this->buildSQPCssRule(
                 'syntax_indent' . $i, 'margin-left',
                 ($i * $cfg['SQP']['fmtInd']) . $cfg['SQP']['fmtIndUnit']
             );
@@ -388,7 +388,7 @@ class PMA_Theme
     {
         $success = true;
 
-        echo $this->SQP_buildCssData();
+        echo $this->buildSQPCssData();
 
         if ($GLOBALS['text_dir'] === 'ltr') {
             $right = 'right';

From bae0dba5f47879c443d5ce7699896263d3dd974d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <mcihar@suse.cz>
Date: Tue, 29 May 2012 17:19:41 +0200
Subject: [PATCH 22/29] Concatenate fallback path only once

---
 libraries/Theme.class.php | 32 ++++++++++++++++++++------------
 1 file changed, 20 insertions(+), 12 deletions(-)

diff --git a/libraries/Theme.class.php b/libraries/Theme.class.php
index 03556b28e6..4a1cb5a0bf 100644
--- a/libraries/Theme.class.php
+++ b/libraries/Theme.class.php
@@ -148,22 +148,30 @@ class PMA_Theme
      */
     public function checkImgPath()
     {
+        // try current theme first
         if (is_dir($this->getPath() . '/img/')) {
             $this->setImgPath($this->getPath() . '/img/');
             return true;
-        } elseif (is_dir($GLOBALS['cfg']['ThemePath'] . '/' . PMA_Theme_Manager::FALLBACK_THEME . '/img/')) {
-            $this->setImgPath($GLOBALS['cfg']['ThemePath'] . '/' . PMA_Theme_Manager::FALLBACK_THEME . '/img/');
-            return true;
-        } else {
-            trigger_error(
-                sprintf(
-                    __('No valid image path for theme %s found!'),
-                    $this->getName()
-                ),
-                E_USER_ERROR
-            );
-            return false;
         }
+
+        // try fallback theme
+        $fallback = $GLOBALS['cfg']['ThemePath'] . '/'
+            . PMA_Theme_Manager::FALLBACK_THEME
+            . '/img/';
+        if (is_dir($fallback)) {
+            $this->setImgPath($fallback);
+            return true;
+        }
+
+        // we failed
+        trigger_error(
+            sprintf(
+                __('No valid image path for theme %s found!'),
+                $this->getName()
+            ),
+            E_USER_ERROR
+        );
+        return false;
     }
 
     /**

From f71adf5c9be9acf0b4e9158ed4e1caa3767a3318 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <mcihar@suse.cz>
Date: Tue, 29 May 2012 17:20:06 +0200
Subject: [PATCH 23/29] Wrap long line

---
 libraries/Theme.class.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/libraries/Theme.class.php b/libraries/Theme.class.php
index 4a1cb5a0bf..625623bae5 100644
--- a/libraries/Theme.class.php
+++ b/libraries/Theme.class.php
@@ -326,7 +326,8 @@ class PMA_Theme
             if (is_readable($this->img_path . $file)) {
                 return $this->img_path . $file;
             } else {
-                return $GLOBALS['cfg']['ThemePath'] . '/' . PMA_Theme_Manager::FALLBACK_THEME . '/img/' . $file;
+                return $GLOBALS['cfg']['ThemePath'] . '/'
+                    . PMA_Theme_Manager::FALLBACK_THEME . '/img/' . $file;
             }
         }
     }

From d026770686e5721100bbcc86377047682aef0fed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <mcihar@suse.cz>
Date: Tue, 29 May 2012 17:20:16 +0200
Subject: [PATCH 24/29] Wrap long line

---
 libraries/Theme.class.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/libraries/Theme.class.php b/libraries/Theme.class.php
index 625623bae5..bc810349fe 100644
--- a/libraries/Theme.class.php
+++ b/libraries/Theme.class.php
@@ -409,7 +409,8 @@ class PMA_Theme
 
         foreach ($this->_cssFiles as $file) {
             $path = $this->getPath() . "/css/$file.css.php";
-            $fallback = "./themes/" . PMA_Theme_Manager::FALLBACK_THEME .  "/css/$file.css.php";
+            $fallback = "./themes/"
+                . PMA_Theme_Manager::FALLBACK_THEME .  "/css/$file.css.php";
 
             if (is_readable($path)) {
                 echo "\n/* FILE: $file.css.php */\n";

From cac03907effe581d14c16aca43fea9b081aef1cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <mcihar@suse.cz>
Date: Tue, 29 May 2012 17:21:24 +0200
Subject: [PATCH 25/29] Wrap long lines

---
 libraries/Theme.class.php | 61 +++++++++++++++++++++++++++------------
 1 file changed, 42 insertions(+), 19 deletions(-)

diff --git a/libraries/Theme.class.php b/libraries/Theme.class.php
index bc810349fe..cdb91b5334 100644
--- a/libraries/Theme.class.php
+++ b/libraries/Theme.class.php
@@ -503,21 +503,33 @@ class PMA_Theme
     {
         $result = array();
         // Opera 9.5+, IE 9
-        $result[] = 'background-image: url(./themes/svg_gradient.php?from=' . $start_color . '&to=' . $end_color . ');';
+        $result[] = 'background-image: url(./themes/svg_gradient.php?from='
+            . $start_color . '&to=' . $end_color . ');';
         $result[] = 'background-size: 100% 100%;';
         // Safari 4-5, Chrome 1-9
-        $result[] = 'background: -webkit-gradient(linear, left top, left bottom, from(#' . $start_color . '), to(#' . $end_color . '));';
+        $result[] = 'background: '
+            . '-webkit-gradient(linear, left top, left bottom, from(#'
+            . $start_color . '), to(#' . $end_color . '));';
         // Safari 5.1, Chrome 10+
-        $result[] = 'background: -webkit-linear-gradient(top, #' . $start_color . ', #' . $end_color . ');';
+        $result[] = 'background: -webkit-linear-gradient(top, #'
+            . $start_color . ', #' . $end_color . ');';
         // Firefox 3.6+
-        $result[] = 'background: -moz-linear-gradient(top, #' . $start_color . ', #' . $end_color . ');';
+        $result[] = 'background: -moz-linear-gradient(top, #'
+            . $start_color . ', #' . $end_color . ');';
         // IE 10
-        $result[] = 'background: -ms-linear-gradient(top, #' . $start_color . ', #' . $end_color . ');';
+        $result[] = 'background: -ms-linear-gradient(top, #'
+            . $start_color . ', #' . $end_color . ');';
         // Opera 11.10
-        $result[] = 'background: -o-linear-gradient(top, #' . $start_color . ', #' . $end_color . ');';
+        $result[] = 'background: -o-linear-gradient(top, #'
+            . $start_color . ', #' . $end_color . ');';
         // IE 6-8
-        if (PMA_USR_BROWSER_AGENT == 'IE' && PMA_USR_BROWSER_VER >= 6 && PMA_USR_BROWSER_VER <= 8) {
-            $result[] = 'filter: progid:DXImageTransform.Microsoft.gradient(startColorstr="#' . $start_color . '", endColorstr="#' . $end_color . '");';
+        if (PMA_USR_BROWSER_AGENT == 'IE'
+            && PMA_USR_BROWSER_VER >= 6
+            && PMA_USR_BROWSER_VER <= 8
+        ) {
+            $result[] = 'filter: '
+                . 'progid:DXImageTransform.Microsoft.gradient(startColorstr="#'
+                . $start_color . '", endColorstr="#' . $end_color . '");';
         }
         return implode("\n", $result);
     }
@@ -534,37 +546,48 @@ class PMA_Theme
         }
 
         $result[] = 'span.cm-keyword, span.cm-statement-verb {';
-        $result[] = '    color: ' . $GLOBALS['cfg']['SQP']['fmtColor']['alpha_reservedWord'] . ';';
+        $result[] = '    color: '
+            . $GLOBALS['cfg']['SQP']['fmtColor']['alpha_reservedWord'] . ';';
         $result[] = '}';
         $result[] = 'span.cm-variable {';
-        $result[] = '    color: ' . $GLOBALS['cfg']['SQP']['fmtColor']['alpha_identifier'] . ';';
+        $result[] = '    color: '
+            . $GLOBALS['cfg']['SQP']['fmtColor']['alpha_identifier'] . ';';
         $result[] = '}';
         $result[] = 'span.cm-comment {';
-        $result[] = '    color: ' . $GLOBALS['cfg']['SQP']['fmtColor']['comment'] . ';';
+        $result[] = '    color: '
+            . $GLOBALS['cfg']['SQP']['fmtColor']['comment'] . ';';
         $result[] = '}';
         $result[] = 'span.cm-mysql-string {';
-        $result[] = '    color: ' . $GLOBALS['cfg']['SQP']['fmtColor']['quote'] . ';';
+        $result[] = '    color: '
+            . $GLOBALS['cfg']['SQP']['fmtColor']['quote'] . ';';
         $result[] = '}';
         $result[] = 'span.cm-operator {';
-        $result[] = '    color: ' . $GLOBALS['cfg']['SQP']['fmtColor']['punct'] . ';';
+        $result[] = '    color: '
+            . $GLOBALS['cfg']['SQP']['fmtColor']['punct'] . ';';
         $result[] = '}';
         $result[] = 'span.cm-mysql-word {';
-        $result[] = '    color: ' . $GLOBALS['cfg']['SQP']['fmtColor']['alpha_identifier'] . ';';
+        $result[] = '    color: '
+            . $GLOBALS['cfg']['SQP']['fmtColor']['alpha_identifier'] . ';';
         $result[] = '}';
         $result[] = 'span.cm-builtin {';
-        $result[] = '    color: ' . $GLOBALS['cfg']['SQP']['fmtColor']['alpha_functionName'] . ';';
+        $result[] = '    color: '
+            . $GLOBALS['cfg']['SQP']['fmtColor']['alpha_functionName'] . ';';
         $result[] = '}';
         $result[] = 'span.cm-variable-2 {';
-        $result[] = '    color: ' . $GLOBALS['cfg']['SQP']['fmtColor']['alpha_columnType'] . ';';
+        $result[] = '    color: '
+            . $GLOBALS['cfg']['SQP']['fmtColor']['alpha_columnType'] . ';';
         $result[] = '}';
         $result[] = 'span.cm-variable-3 {';
-        $result[] = '    color: ' . $GLOBALS['cfg']['SQP']['fmtColor']['alpha_columnAttrib'] . ';';
+        $result[] = '    color: '
+            . $GLOBALS['cfg']['SQP']['fmtColor']['alpha_columnAttrib'] . ';';
         $result[] = '}';
         $result[] = 'span.cm-separator {';
-        $result[] = '    color: ' . $GLOBALS['cfg']['SQP']['fmtColor']['punct'] . ';';
+        $result[] = '    color: '
+            . $GLOBALS['cfg']['SQP']['fmtColor']['punct'] . ';';
         $result[] = '}';
         $result[] = 'span.cm-number {';
-        $result[] = '    color: ' . $GLOBALS['cfg']['SQP']['fmtColor']['digit_integer'] . ';';
+        $result[] = '    color: '
+            . $GLOBALS['cfg']['SQP']['fmtColor']['digit_integer'] . ';';
         $result[] = '}';
 
         return implode("\n", $result);

From 2cd51494d17f9128091f4eb7804b4e44749f7e12 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <mcihar@suse.cz>
Date: Tue, 29 May 2012 17:27:43 +0200
Subject: [PATCH 26/29] Add file level comment

---
 tbl_printview.php | 47 ++++++++++++++++++++++++-----------------------
 1 file changed, 24 insertions(+), 23 deletions(-)

diff --git a/tbl_printview.php b/tbl_printview.php
index 8db2904e39..a147257e4a 100644
--- a/tbl_printview.php
+++ b/tbl_printview.php
@@ -1,6 +1,7 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
+ * Print view for table
  *
  * @package PhpMyAdmin
  */
@@ -187,9 +188,9 @@ foreach ($the_tables as $key => $table) {
     ?>
     </td>
     <td><?php echo $type; ?><bdo dir="ltr"></bdo></td>
-    <td><?php 
-    echo (($row['Null'] == '' || $row['Null'] == 'NO') 
-        ? __('No') 
+    <td><?php
+    echo (($row['Null'] == '' || $row['Null'] == 'NO')
+        ? __('No')
         : __('Yes')); ?>&nbsp;</td>
     <td><?php
     if (isset($row['Default'])) {
@@ -199,7 +200,7 @@ foreach ($the_tables as $key => $table) {
         if ($have_rel) {
             echo '    <td>';
             if (isset($res_rel[$field_name])) {
-                echo htmlspecialchars($res_rel[$field_name]['foreign_table'] 
+                echo htmlspecialchars($res_rel[$field_name]['foreign_table']
                     . ' -> ' . $res_rel[$field_name]['foreign_field']);
             }
             echo '&nbsp;</td>' . "\n";
@@ -215,7 +216,7 @@ foreach ($the_tables as $key => $table) {
 
             echo '    <td>';
             if (isset($mime_map[$field_name])) {
-                echo htmlspecialchars(str_replace('_', '/', 
+                echo htmlspecialchars(str_replace('_', '/',
                     $mime_map[$field_name]['mimetype']));
             }
             echo '&nbsp;</td>' . "\n";
@@ -240,7 +241,7 @@ foreach ($the_tables as $key => $table) {
          */
         if ($cfg['ShowStats']) {
             $nonisam     = false;
-            if (isset($showtable['Type']) 
+            if (isset($showtable['Type'])
                 && !preg_match('@ISAM|HEAP@i', $showtable['Type'])) {
                 $nonisam = true;
             }
@@ -249,34 +250,34 @@ foreach ($the_tables as $key => $table) {
 
                 $mergetable = PMA_Table::isMerge($db, $table);
 
-                list($data_size, $data_unit) 
+                list($data_size, $data_unit)
                     = PMA_formatByteDown($showtable['Data_length']);
                 if ($mergetable == false) {
-                    list($index_size, $index_unit) 
+                    list($index_size, $index_unit)
                         = PMA_formatByteDown($showtable['Index_length']);
                 }
                 if (isset($showtable['Data_free']) && $showtable['Data_free'] > 0) {
-                    list($free_size, $free_unit) 
+                    list($free_size, $free_unit)
                         = PMA_formatByteDown($showtable['Data_free']);
-                    list($effect_size, $effect_unit) 
+                    list($effect_size, $effect_unit)
                         = PMA_formatByteDown(
-                            $showtable['Data_length'] 
-                            + $showtable['Index_length'] 
+                            $showtable['Data_length']
+                            + $showtable['Index_length']
                             - $showtable['Data_free']);
                 } else {
                     unset($free_size);
                     unset($free_unit);
-                    list($effect_size, $effect_unit) 
-                        = PMA_formatByteDown($showtable['Data_length'] 
+                    list($effect_size, $effect_unit)
+                        = PMA_formatByteDown($showtable['Data_length']
                             + $showtable['Index_length']);
                 }
-                list($tot_size, $tot_unit) 
-                    = PMA_formatByteDown($showtable['Data_length'] 
+                list($tot_size, $tot_unit)
+                    = PMA_formatByteDown($showtable['Data_length']
                         + $showtable['Index_length']);
                 if ($num_rows > 0) {
-                    list($avg_size, $avg_unit) 
-                        = PMA_formatByteDown(($showtable['Data_length'] 
-                                + $showtable['Index_length']) 
+                    list($avg_size, $avg_unit)
+                        = PMA_formatByteDown(($showtable['Data_length']
+                                + $showtable['Index_length'])
                             / $showtable['Rows'], 6, 1);
                 }
 
@@ -380,19 +381,19 @@ foreach ($the_tables as $key => $table) {
             </tr>
                     <?php
                 }
-                if (isset($showtable['Avg_row_length']) 
+                if (isset($showtable['Avg_row_length'])
                     && $showtable['Avg_row_length'] > 0) {
                     ?>
             <tr>
                 <td><?php echo __('Row length'); ?>&nbsp;&oslash;</td>
                 <td>
-                    <?php echo PMA_formatNumber($showtable['Avg_row_length'], 0) 
+                    <?php echo PMA_formatNumber($showtable['Avg_row_length'], 0)
                         . "\n"; ?>
                 </td>
             </tr>
                     <?php
                 }
-                if (isset($showtable['Data_length']) 
+                if (isset($showtable['Data_length'])
                     && $showtable['Rows'] > 0
                     && $mergetable == false) {
                     ?>
@@ -409,7 +410,7 @@ foreach ($the_tables as $key => $table) {
             <tr>
                 <td><?php echo __('Next autoindex'); ?></td>
                 <td class="right">
-                    <?php echo PMA_formatNumber($showtable['Auto_increment'], 0) 
+                    <?php echo PMA_formatNumber($showtable['Auto_increment'], 0)
                     . "\n"; ?>
                 </td>
             </tr>

From 33bfd831ce1386212ff741f76f79be5ca63640a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <mcihar@suse.cz>
Date: Tue, 29 May 2012 17:29:14 +0200
Subject: [PATCH 27/29] Wrap some long lines

---
 tbl_printview.php | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/tbl_printview.php b/tbl_printview.php
index a147257e4a..8671b6764f 100644
--- a/tbl_printview.php
+++ b/tbl_printview.php
@@ -69,7 +69,8 @@ if ($multi_tables) {
         $tbl_list .= (empty($tbl_list) ? '' : ', ')
                   . PMA_backquote($table);
     }
-    echo '<strong>'.  __('Showing tables') . ': ' . htmlspecialchars($tbl_list) . '</strong>' . "\n";
+    echo '<strong>'.  __('Showing tables') . ': '
+        . htmlspecialchars($tbl_list) . '</strong>' . "\n";
     echo '<hr />' . "\n";
 } // end if
 
@@ -122,7 +123,8 @@ foreach ($the_tables as $key => $table) {
      * Displays the comments of the table if MySQL >= 3.23
      */
     if (!empty($show_comment)) {
-        echo __('Table comments') . ': ' . htmlspecialchars($show_comment) . '<br /><br />';
+        echo __('Table comments') . ': '
+            . htmlspecialchars($show_comment) . '<br /><br />';
     }
 
     /**
@@ -174,7 +176,10 @@ foreach ($the_tables as $key => $table) {
          * but based on SHOW CREATE TABLE because information_schema
          * cannot be trusted in this case (MySQL bug)
          */
-        if (!empty($analyzed_sql[0]['create_table_fields'][$field_name]['type']) && $analyzed_sql[0]['create_table_fields'][$field_name]['type'] == 'TIMESTAMP' && $analyzed_sql[0]['create_table_fields'][$field_name]['timestamp_not_null']) {
+        if (!empty($analyzed_sql[0]['create_table_fields'][$field_name]['type'])
+            && $analyzed_sql[0]['create_table_fields'][$field_name]['type'] == 'TIMESTAMP'
+            && $analyzed_sql[0]['create_table_fields'][$field_name]['timestamp_not_null']
+        ) {
             $row['Null'] = '';
         }
 
@@ -192,10 +197,12 @@ foreach ($the_tables as $key => $table) {
     echo (($row['Null'] == '' || $row['Null'] == 'NO')
         ? __('No')
         : __('Yes')); ?>&nbsp;</td>
-    <td><?php
+    <td>
+    <?php
     if (isset($row['Default'])) {
         echo $row['Default'];
-    } ?>&nbsp;</td>
+    }
+    ?>&nbsp;</td>
     <?php
         if ($have_rel) {
             echo '    <td>';

From 9945415ef2778526c12632ca6b29eca33120a74f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <mcihar@suse.cz>
Date: Tue, 29 May 2012 17:33:06 +0200
Subject: [PATCH 28/29] Some coding style improvements

---
 tbl_printview.php | 26 ++++++++++++++++----------
 1 file changed, 16 insertions(+), 10 deletions(-)

diff --git a/tbl_printview.php b/tbl_printview.php
index 8671b6764f..68764443ae 100644
--- a/tbl_printview.php
+++ b/tbl_printview.php
@@ -389,7 +389,8 @@ foreach ($the_tables as $key => $table) {
                     <?php
                 }
                 if (isset($showtable['Avg_row_length'])
-                    && $showtable['Avg_row_length'] > 0) {
+                    && $showtable['Avg_row_length'] > 0
+                ) {
                     ?>
             <tr>
                 <td><?php echo __('Row length'); ?>&nbsp;&oslash;</td>
@@ -402,7 +403,8 @@ foreach ($the_tables as $key => $table) {
                 }
                 if (isset($showtable['Data_length'])
                     && $showtable['Rows'] > 0
-                    && $mergetable == false) {
+                    && $mergetable == false
+                ) {
                     ?>
             <tr>
                 <td><?php echo __('Row size'); ?>&nbsp;&oslash;</td>
@@ -417,8 +419,9 @@ foreach ($the_tables as $key => $table) {
             <tr>
                 <td><?php echo __('Next autoindex'); ?></td>
                 <td class="right">
-                    <?php echo PMA_formatNumber($showtable['Auto_increment'], 0)
-                    . "\n"; ?>
+                    <?php
+                    echo PMA_formatNumber($showtable['Auto_increment'], 0);
+                    ?>
                 </td>
             </tr>
                     <?php
@@ -428,8 +431,9 @@ foreach ($the_tables as $key => $table) {
             <tr>
                 <td><?php echo __('Creation'); ?></td>
                 <td class="right">
-                    <?php echo PMA_localisedDate(strtotime(
-                        $showtable['Create_time'])) . "\n"; ?>
+                    <?php
+                    echo PMA_localisedDate(strtotime($showtable['Create_time']));
+                    ?>
                 </td>
             </tr>
                     <?php
@@ -439,8 +443,9 @@ foreach ($the_tables as $key => $table) {
             <tr>
                 <td><?php echo __('Last update'); ?></td>
                 <td class="right">
-                    <?php echo PMA_localisedDate(strtotime(
-                        $showtable['Update_time'])) . "\n"; ?>
+                    <?php
+                    echo PMA_localisedDate(strtotime($showtable['Update_time']));
+                    ?>
                 </td>
             </tr>
                     <?php
@@ -450,8 +455,9 @@ foreach ($the_tables as $key => $table) {
             <tr>
                 <td><?php echo __('Last check'); ?></td>
                 <td class="right">
-                    <?php echo PMA_localisedDate(strtotime(
-                        $showtable['Check_time'])) . "\n"; ?>
+                    <?php
+                    echo PMA_localisedDate(strtotime($showtable['Check_time']));
+                    ?>
                 </td>
             </tr>
                     <?php

From 15b60bd2d4651672ae999754a413f4c6a1c57dc4 Mon Sep 17 00:00:00 2001
From: Madhura Jayaratne <madhura.cj@gmail.com>
Date: Tue, 29 May 2012 21:43:04 +0530
Subject: [PATCH 29/29] Revert to avoid notices on undefined variables

---
 libraries/tbl_properties.inc.php | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/libraries/tbl_properties.inc.php b/libraries/tbl_properties.inc.php
index 525f4a4b4a..dadf08f4c5 100644
--- a/libraries/tbl_properties.inc.php
+++ b/libraries/tbl_properties.inc.php
@@ -639,16 +639,12 @@ for ($i = 0; $i < $num_fields; $i++) {
             . '"></option>';
         if (is_array($available_mime['transformation'])) {
             foreach ($available_mime['transformation'] as $mimekey => $transform) {
-                $match = preg_match(
-                    '@' . preg_quote(
-                        $available_mime['transformation_file'][$mimekey]
-                    )
-                    . '3?@i',
-                    $mime_map[$row['Field']]['transformation']
-                );
                 $checked = isset($row['Field'])
                     && isset($mime_map[$row['Field']]['transformation'])
-                    && $match
+                    && preg_match(
+                        '@' . preg_quote($available_mime['transformation_file'][$mimekey]) . '3?@i',
+                        $mime_map[$row['Field']]['transformation']
+                    )
                     ? 'selected '
                     : '';
                 $tooltip = PMA_getTransformationDescription(