Skip to content

Commit

Permalink
remove global variable definitions and remove php notices and formatting
Browse files Browse the repository at this point in the history
  • Loading branch information
@thilinaa
thilinaa committed Aug 5, 2012
1 parent 33ef49f commit 829b7a7
Show file tree
Hide file tree
Showing 2 changed files with 59 additions and 31 deletions.
35 changes: 32 additions & 3 deletions libraries/operations.lib.php
View file
Expand Up @@ -1408,7 +1408,7 @@ function PMA_getQueryAndResultForReorderingTable()
*/
function PMA_getTableAltersArray($is_myisam_or_aria, $is_isam, $pack_keys,
$checksum, $is_aria, $page_checksum, $delay_key_write, $is_innodb,
$is_pbxt, $row_format, $tbl_storage_engine, $transactional
$is_pbxt, $row_format, $tbl_storage_engine, $transactional, $tbl_collation
) {
$common_functions = PMA_CommonFunctions::getInstance();
$table_alters = array();
Expand Down Expand Up @@ -1439,7 +1439,6 @@ function PMA_getTableAltersArray($is_myisam_or_aria, $is_isam, $pack_keys,
$table_alters[] = 'pack_keys = ' . $_REQUEST['new_pack_keys'];
}

$checksum = empty($checksum) ? '0' : '1';
$_REQUEST['new_checksum'] = empty($_REQUEST['new_checksum']) ? '0' : '1';
if ($is_myisam_or_aria
&& $_REQUEST['new_checksum'] !== $checksum
Expand All @@ -1461,7 +1460,6 @@ function PMA_getTableAltersArray($is_myisam_or_aria, $is_isam, $pack_keys,
$table_alters[] = 'PAGE_CHECKSUM = ' . $_REQUEST['new_page_checksum'];
}

$delay_key_write = empty($delay_key_write) ? '0' : '1';
$_REQUEST['new_delay_key_write'] =
empty($_REQUEST['new_delay_key_write']) ? '0' : '1';
if ($is_myisam_or_aria
Expand Down Expand Up @@ -1494,5 +1492,36 @@ function PMA_getTableAltersArray($is_myisam_or_aria, $is_isam, $pack_keys,
return $table_alters;
}

/**
* set initial value of the set of variables, based on the current table engine
*
* @param string $tbl_storage_engine table storage engine
*
* @return array ($is_myisam_or_aria, $is_innodb, $is_isam,
$is_berkeleydb, $is_aria, $is_pbxt)
*/
function PMA_setGlobalVariablesForEngine($tbl_storage_engine)
{
$is_myisam_or_aria = $is_isam = $is_innodb = $is_berkeleydb
= $is_aria = $is_pbxt = false;
$upper_tbl_storage_engine = strtoupper($tbl_storage_engine);

//Options that apply to MYISAM usually apply to ARIA
$is_myisam_or_aria = ($upper_tbl_storage_engine == 'MYISAM'
|| $upper_tbl_storage_engine == 'ARIA'
|| $upper_tbl_storage_engine == 'MARIA'
);
$is_aria = ($upper_tbl_storage_engine == 'ARIA');

$is_isam = ($upper_tbl_storage_engine == 'ISAM');
$is_innodb = ($upper_tbl_storage_engine == 'INNODB');
$is_berkeleydb = ($upper_tbl_storage_engine == 'BERKELEYDB');
$is_pbxt = ($upper_tbl_storage_engine == 'PBXT');

return array(
$is_myisam_or_aria, $is_innodb, $is_isam,
$is_berkeleydb, $is_aria, $is_pbxt
);
}

?>
55 changes: 27 additions & 28 deletions tbl_operations.php
View file
Expand Up @@ -48,21 +48,24 @@
/**
* Gets tables informations
*/

require 'libraries/tbl_info.inc.php';

// define some globals here, for improved syntax in the conditionals
// define some variables here, for improved syntax in the conditionals
$is_myisam_or_aria = $is_isam = $is_innodb = $is_berkeleydb = $is_aria = $is_pbxt = false;
// set initial value of these globals, based on the current table engine
PMA_set_global_variables_for_engine($tbl_storage_engine);
// set initial value of these variables, based on the current table engine
list($is_myisam_or_aria, $is_innodb, $is_isam,
$is_berkeleydb, $is_aria, $is_pbxt
) = PMA_setGlobalVariablesForEngine($tbl_storage_engine);

if ($is_aria) {
// the value for transactional can be implicit
// (no create option found, in this case it means 1)
// or explicit (option found with a value of 0 or 1)
// ($transactional may have been set by libraries/tbl_info.inc.php,
// from the $create_options)
$transactional = (isset($transactional) && $transactional == '0') ? '0' : '1';
$transactional = (isset($transactional) && $transactional == '0')
? '0'
: '1';
$page_checksum = (isset($page_checksum)) ? $page_checksum : '';
}

Expand Down Expand Up @@ -104,21 +107,34 @@
}

if (! empty($_REQUEST['new_tbl_storage_engine'])
&& strtolower($_REQUEST['new_tbl_storage_engine']) !== strtolower($tbl_storage_engine)
&& strtolower($_REQUEST['new_tbl_storage_engine'])
!== strtolower($tbl_storage_engine)
) {
$tbl_storage_engine = $_REQUEST['new_tbl_storage_engine'];
// reset the globals for the new engine
PMA_set_global_variables_for_engine($tbl_storage_engine);
list($is_myisam_or_aria, $is_innodb, $is_isam,
$is_berkeleydb, $is_aria, $is_pbxt
) = PMA_setGlobalVariablesForEngine($tbl_storage_engine);

if ($is_aria) {
$transactional = (isset($transactional) && $transactional == '0') ? '0' : '1';
$transactional =
(isset($transactional) && $transactional == '0')
? '0'
: '1';
$page_checksum = (isset($page_checksum)) ? $page_checksum : '';
}
}

$table_alters = PMA_getTableAltersArray(
$is_myisam_or_aria, $is_isam, $pack_keys, $checksum, $is_aria,
$page_checksum, $delay_key_write, $is_innodb, $is_pbxt, $row_format,
$tbl_storage_engine, $transactional
$is_myisam_or_aria, $is_isam, $pack_keys,
(empty($checksum) ? '0' : '1'),
$is_aria,
((isset($page_checksum)) ? $page_checksum : ''),
(empty($delay_key_write) ? '0' : '1'),
$is_innodb, $is_pbxt, $row_format,
$tbl_storage_engine,
((isset($transactional) && $transactional == '0') ? '0' : '1'),
$tbl_collation
);

if (count($table_alters) > 0) {
Expand Down Expand Up @@ -337,21 +353,4 @@

} // end if (!empty($cfg['Server']['relation']))

function PMA_set_global_variables_for_engine($tbl_storage_engine)
{
global $is_myisam_or_aria, $is_innodb, $is_isam, $is_berkeleydb, $is_aria, $is_pbxt;

$is_myisam_or_aria = $is_isam = $is_innodb = $is_berkeleydb = $is_aria = $is_pbxt = false;
$upper_tbl_storage_engine = strtoupper($tbl_storage_engine);

//Options that apply to MYISAM usually apply to ARIA
$is_myisam_or_aria = ($upper_tbl_storage_engine == 'MYISAM' || $upper_tbl_storage_engine == 'ARIA' || $upper_tbl_storage_engine == 'MARIA');
$is_aria = ($upper_tbl_storage_engine == 'ARIA');

$is_isam = ($upper_tbl_storage_engine == 'ISAM');
$is_innodb = ($upper_tbl_storage_engine == 'INNODB');
$is_berkeleydb = ($upper_tbl_storage_engine == 'BERKELEYDB');
$is_pbxt = ($upper_tbl_storage_engine == 'PBXT');
}

?>

0 comments on commit 829b7a7

Please sign in to comment.