gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Marc Delisle 2012-04-24 08:07:54 -04:00
commit 485bb0f410
8 changed files with 338 additions and 97 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
file_echo.php
View File

@ -62,7 +62,9 @@ if (isset($_REQUEST['filename']) && isset($_REQUEST['image'])) {
/* For monitor chart config import */
} else if (isset($_REQUEST['import'])) {
header('Content-type: text/plain');
if(!file_exists($_FILES['file']['tmp_name'])) exit();
if (!file_exists($_FILES['file']['tmp_name'])) {
exit();
}
echo file_get_contents($_FILES['file']['tmp_name']);
}
?>

294
js/functions.js
View File

@ -916,151 +916,347 @@ function pdfPaperSize(format, axis)
{
switch (format.toUpperCase()) {
case '4A0':
if (axis == 'x') return 4767.87; else return 6740.79;
if (axis == 'x') {
return 4767.87;
} else {
return 6740.79;
}
break;
case '2A0':
if (axis == 'x') return 3370.39; else return 4767.87;
if (axis == 'x') {
return 3370.39;
} else {
return 4767.87;
}
break;
case 'A0':
if (axis == 'x') return 2383.94; else return 3370.39;
if (axis == 'x') {
return 2383.94;
} else {
return 3370.39;
}
break;
case 'A1':
if (axis == 'x') return 1683.78; else return 2383.94;
if (axis == 'x') {
return 1683.78;
} else {
return 2383.94;
}
break;
case 'A2':
if (axis == 'x') return 1190.55; else return 1683.78;
if (axis == 'x') {
return 1190.55;
} else {
return 1683.78;
}
break;
case 'A3':
if (axis == 'x') return 841.89; else return 1190.55;
if (axis == 'x') {
return 841.89;
} else {
return 1190.55;
}
break;
case 'A4':
if (axis == 'x') return 595.28; else return 841.89;
if (axis == 'x') {
return 595.28;
} else {
return 841.89;
}
break;
case 'A5':
if (axis == 'x') return 419.53; else return 595.28;
if (axis == 'x') {
return 419.53;
} else {
return 595.28;
}
break;
case 'A6':
if (axis == 'x') return 297.64; else return 419.53;
if (axis == 'x') {
return 297.64;
} else {
return 419.53;
}
break;
case 'A7':
if (axis == 'x') return 209.76; else return 297.64;
if (axis == 'x') {
return 209.76;
} else {
return 297.64;
}
break;
case 'A8':
if (axis == 'x') return 147.40; else return 209.76;
if (axis == 'x') {
return 147.40;
} else {
return 209.76;
}
break;
case 'A9':
if (axis == 'x') return 104.88; else return 147.40;
if (axis == 'x') {
return 104.88;
} else {
return 147.40;
}
break;
case 'A10':
if (axis == 'x') return 73.70; else return 104.88;
if (axis == 'x') {
return 73.70;
} else {
return 104.88;
}
break;
case 'B0':
if (axis == 'x') return 2834.65; else return 4008.19;
if (axis == 'x') {
return 2834.65;
} else {
return 4008.19;
}
break;
case 'B1':
if (axis == 'x') return 2004.09; else return 2834.65;
if (axis == 'x') {
return 2004.09;
} else {
return 2834.65;
}
break;
case 'B2':
if (axis == 'x') return 1417.32; else return 2004.09;
if (axis == 'x') {
return 1417.32;
} else {
return 2004.09;
}
break;
case 'B3':
if (axis == 'x') return 1000.63; else return 1417.32;
if (axis == 'x') {
return 1000.63;
} else {
return 1417.32;
}
break;
case 'B4':
if (axis == 'x') return 708.66; else return 1000.63;
if (axis == 'x') {
return 708.66;
} else {
return 1000.63;
}
break;
case 'B5':
if (axis == 'x') return 498.90; else return 708.66;
if (axis == 'x') {
return 498.90;
} else {
return 708.66;
}
break;
case 'B6':
if (axis == 'x') return 354.33; else return 498.90;
if (axis == 'x') {
return 354.33;
} else {
return 498.90;
}
break;
case 'B7':
if (axis == 'x') return 249.45; else return 354.33;
if (axis == 'x') {
return 249.45;
} else {
return 354.33;
}
break;
case 'B8':
if (axis == 'x') return 175.75; else return 249.45;
if (axis == 'x') {
return 175.75;
} else {
return 249.45;
}
break;
case 'B9':
if (axis == 'x') return 124.72; else return 175.75;
if (axis == 'x') {
return 124.72;
} else {
return 175.75;
}
break;
case 'B10':
if (axis == 'x') return 87.87; else return 124.72;
if (axis == 'x') {
return 87.87;
} else {
return 124.72;
}
break;
case 'C0':
if (axis == 'x') return 2599.37; else return 3676.54;
if (axis == 'x') {
return 2599.37;
} else {
return 3676.54;
}
break;
case 'C1':
if (axis == 'x') return 1836.85; else return 2599.37;
if (axis == 'x') {
return 1836.85;
} else {
return 2599.37;
}
break;
case 'C2':
if (axis == 'x') return 1298.27; else return 1836.85;
if (axis == 'x') {
return 1298.27;
} else {
return 1836.85;
}
break;
case 'C3':
if (axis == 'x') return 918.43; else return 1298.27;
if (axis == 'x') {
return 918.43;
} else {
return 1298.27;
}
break;
case 'C4':
if (axis == 'x') return 649.13; else return 918.43;
if (axis == 'x') {
return 649.13;
} else {
return 918.43;
}
break;
case 'C5':
if (axis == 'x') return 459.21; else return 649.13;
if (axis == 'x') {
return 459.21;
} else {
return 649.13;
}
break;
case 'C6':
if (axis == 'x') return 323.15; else return 459.21;
if (axis == 'x') {
return 323.15;
} else {
return 459.21;
}
break;
case 'C7':
if (axis == 'x') return 229.61; else return 323.15;
if (axis == 'x') {
return 229.61;
} else {
return 323.15;
}
break;
case 'C8':
if (axis == 'x') return 161.57; else return 229.61;
if (axis == 'x') {
return 161.57;
} else {
return 229.61;
}
break;
case 'C9':
if (axis == 'x') return 113.39; else return 161.57;
if (axis == 'x') {
return 113.39;
} else {
return 161.57;
}
break;
case 'C10':
if (axis == 'x') return 79.37; else return 113.39;
if (axis == 'x') {
return 79.37;
} else {
return 113.39;
}
break;
case 'RA0':
if (axis == 'x') return 2437.80; else return 3458.27;
if (axis == 'x') {
return 2437.80;
} else {
return 3458.27;
}
break;
case 'RA1':
if (axis == 'x') return 1729.13; else return 2437.80;
if (axis == 'x') {
return 1729.13;
} else {
return 2437.80;
}
break;
case 'RA2':
if (axis == 'x') return 1218.90; else return 1729.13;
if (axis == 'x') {
return 1218.90;
} else {
return 1729.13;
}
break;
case 'RA3':
if (axis == 'x') return 864.57; else return 1218.90;
if (axis == 'x') {
return 864.57;
} else {
return 1218.90;
}
break;
case 'RA4':
if (axis == 'x') return 609.45; else return 864.57;
if (axis == 'x') {
return 609.45;
} else {
return 864.57;
}
break;
case 'SRA0':
if (axis == 'x') return 2551.18; else return 3628.35;
if (axis == 'x') {
return 2551.18;
} else {
return 3628.35;
}
break;
case 'SRA1':
if (axis == 'x') return 1814.17; else return 2551.18;
if (axis == 'x') {
return 1814.17;
} else {
return 2551.18;
}
break;
case 'SRA2':
if (axis == 'x') return 1275.59; else return 1814.17;
if (axis == 'x') {
return 1275.59;
} else {
return 1814.17;
}
break;
case 'SRA3':
if (axis == 'x') return 907.09; else return 1275.59;
if (axis == 'x') {
return 907.09;
} else {
return 1275.59;
}
break;
case 'SRA4':
if (axis == 'x') return 637.80; else return 907.09;
if (axis == 'x') {
return 637.80;
} else {
return 907.09;
}
break;
case 'LETTER':
if (axis == 'x') return 612.00; else return 792.00;
if (axis == 'x') {
return 612.00;
} else {
return 792.00;
}
break;
case 'LEGAL':
if (axis == 'x') return 612.00; else return 1008.00;
if (axis == 'x') {
return 612.00;
} else {
return 1008.00;
}
break;
case 'EXECUTIVE':
if (axis == 'x') return 521.86; else return 756.00;
if (axis == 'x') {
return 521.86;
} else {
return 756.00;
}
break;
case 'FOLIO':
if (axis == 'x') return 612.00; else return 936.00;
if (axis == 'x') {
return 612.00;
} else {
return 936.00;
}
break;
} // end switch

4
libraries/File.class.php
View File

@ -394,7 +394,9 @@ class PMA_File
*/
function setLocalSelectedFile($name)
{
if (empty($GLOBALS['cfg']['UploadDir'])) return false;
if (empty($GLOBALS['cfg']['UploadDir'])) {
return false;
}
$this->setName(PMA_userDir($GLOBALS['cfg']['UploadDir']) . PMA_securePath($name));
if (! $this->isReadable()) {

6
libraries/config/FormDisplay.tpl.php
View File

@ -48,9 +48,9 @@ function display_tabs_top($tabs)
{
?>
<ul class="tabs">
<?php foreach ($tabs as $tab_id => $tab_name): ?>
<?php foreach ($tabs as $tab_id => $tab_name) { ?>
<li><a href="#<?php echo $tab_id ?>"><?php echo htmlspecialchars($tab_name); ?></a></li>
<?php endforeach; ?>
<?php } ?>
</ul>
<br clear="right" />
<div class="tabs_contents">
@ -293,7 +293,7 @@ function display_input($path, $name, $description = '', $type, $value, $value_is
if ($is_setup_script && isset($opts['userprefs_allow'])) {
?>
<td class="userprefs-allow" title="<?php echo __('Allow users to customize this value') ?>">
<input type="checkbox" name="<?php echo $path ?>-userprefs-allow" <?php if ($opts['userprefs_allow']) echo 'checked="checked"' ?> />
<input type="checkbox" name="<?php echo $path ?>-userprefs-allow" <?php if ($opts['userprefs_allow']) { echo 'checked="checked"'; }; ?> />
</td>
<?php
} else if ($is_setup_script) {

76
libraries/export/codegen.php
View File

@ -156,8 +156,9 @@ if (isset($plugin_list)) {
function getPureType()
{
$pos=strpos($this->type, "(");
if ($pos > 0)
if ($pos > 0) {
return substr($this->type, 0, $pos);
}
return $this->type;
}
function isNotNull()
@ -170,32 +171,65 @@ if (isset($plugin_list)) {
}
function getDotNetPrimitiveType()
{
if (strpos($this->type, "int") === 0) return "int";
if (strpos($this->type, "long") === 0) return "long";
if (strpos($this->type, "char") === 0) return "string";
if (strpos($this->type, "varchar") === 0) return "string";
if (strpos($this->type, "text") === 0) return "string";
if (strpos($this->type, "longtext") === 0) return "string";
if (strpos($this->type, "tinyint") === 0) return "bool";
if (strpos($this->type, "datetime") === 0) return "DateTime";
if (strpos($this->type, "int") === 0) {
return "int";
}
if (strpos($this->type, "long") === 0) {
return "long";
}
if (strpos($this->type, "char") === 0) {
return "string";
}
if (strpos($this->type, "varchar") === 0) {
return "string";
}
if (strpos($this->type, "text") === 0) {
return "string";
}
if (strpos($this->type, "longtext") === 0) {
return "string";
}
if (strpos($this->type, "tinyint") === 0) {
return "bool";
}
if (strpos($this->type, "datetime") === 0) {
return "DateTime";
}
return "unknown";
}
function getDotNetObjectType()
{
if (strpos($this->type, "int") === 0) return "Int32";
if (strpos($this->type, "long") === 0) return "Long";
if (strpos($this->type, "char") === 0) return "String";
if (strpos($this->type, "varchar") === 0) return "String";
if (strpos($this->type, "text") === 0) return "String";
if (strpos($this->type, "longtext") === 0) return "String";
if (strpos($this->type, "tinyint") === 0) return "Boolean";
if (strpos($this->type, "datetime") === 0) return "DateTime";
if (strpos($this->type, "int") === 0) {
return "Int32";
}
if (strpos($this->type, "long") === 0) {
return "Long";
}
if (strpos($this->type, "char") === 0) {
return "String";
}
if (strpos($this->type, "varchar") === 0) {
return "String";
}
if (strpos($this->type, "text") === 0) {
return "String";
}
if (strpos($this->type, "longtext") === 0) {
return "String";
}
if (strpos($this->type, "tinyint") === 0) {
return "Boolean";
}
if (strpos($this->type, "datetime") === 0) {
return "DateTime";
}
return "Unknown";
}
function getIndexName()
{
if (strlen($this->key)>0)
if (strlen($this->key) > 0) {
return "index=\"" . htmlspecialchars($this->name, ENT_COMPAT, 'UTF-8') . "\"";
}
return "";
}
function isPK()
@ -241,10 +275,10 @@ if (isset($plugin_list)) {
function handleNHibernateCSBody($db, $table, $crlf)
{
$lines=array();
$result=PMA_DBI_query(sprintf('DESC %s.%s', PMA_backquote($db), PMA_backquote($table)));
$lines = array();
$result = PMA_DBI_query(sprintf('DESC %s.%s', PMA_backquote($db), PMA_backquote($table)));
if ($result) {
$tableProperties=array();
$tableProperties = array();
while ($row = PMA_DBI_fetch_row($result)) {
$tableProperties[] = new TableProperty($row);
}

18
test/libraries/common/PMA_whichCrlf_test.php
View File

@ -24,15 +24,17 @@ class PMA_whichCrlf_test extends PHPUnit_Framework_TestCase
public function testWhichCrlf()
{
$runkit = function_exists('runkit_constant_redefine');
if ($runkit && defined('PMA_USR_OS'))
if ($runkit && defined('PMA_USR_OS')) {
$pma_usr_os = PMA_USR_OS;
}
if (defined('PMA_USR_OS') && !$runkit) {
if (PMA_USR_OS == 'Win')
if (PMA_USR_OS == 'Win') {
$this->assertEquals("\r\n", PMA_whichCrlf());
else
} else {
$this->assertEquals("\n", PMA_whichCrlf());
}
$this->markTestIncomplete('Cannot redefine constant');
@ -43,19 +45,21 @@ class PMA_whichCrlf_test extends PHPUnit_Framework_TestCase
$this->assertEquals("\n", PMA_whichCrlf());
}
if ($runkit)
if ($runkit) {
runkit_constant_redefine('PMA_USR_OS', 'Win');
else
} else {
define('PMA_USR_OS', 'Win');
}
$this->assertEquals("\r\n", PMA_whichCrlf());
}
if ($runkit) {
if (isset($pma_usr_os))
if (isset($pma_usr_os)) {
runkit_constant_redefine('PMA_USR_OS', 'Win');
else
} else {
runkit_constant_remove('PMA_USR_OS');
}
}
}

30
test/libraries/core/PMA_headerLocation_test_disabled.php
View File

@ -39,13 +39,14 @@ class PMA_headerLocation_test extends PHPUnit_Framework_TestCase
{
parent::__construct();
$this->runkitExt = false;
if (function_exists("runkit_constant_redefine"))
if (function_exists("runkit_constant_redefine")) {
$this->runkitExt = true;
}
$this->apdExt = false;
if (function_exists("rename_function"))
if (function_exists("rename_function")) {
$this->apdExt = true;
}
if ($this->apdExt && !$GLOBALS['test_header']) {
@ -69,8 +70,9 @@ class PMA_headerLocation_test extends PHPUnit_Framework_TestCase
);
foreach ($substs as $func => $ren_func) {
if (function_exists("__overridden__"))
if (function_exists("__overridden__")) {
rename_function("__overridden__", str_replace(array('.', ' '), array('', ''), microtime()));
}
override_function($func, $args[$func], $substs[$func]);
rename_function("__overridden__", str_replace(array('.', ' '), array('', ''), microtime()));
}
@ -130,22 +132,22 @@ class PMA_headerLocation_test extends PHPUnit_Framework_TestCase
// cleaning constants
if ($this->runkitExt) {
if ($this->oldIISvalue != 'non-defined')
if ($this->oldIISvalue != 'non-defined') {
runkit_constant_redefine('PMA_IS_IIS', $this->oldIISvalue);
elseif (defined('PMA_IS_IIS')) {
} elseif (defined('PMA_IS_IIS')) {
runkit_constant_remove('PMA_IS_IIS');
}
if ($this->oldSIDvalue != 'non-defined')
if ($this->oldSIDvalue != 'non-defined') {
runkit_constant_redefine('SID', $this->oldSIDvalue);
elseif (defined('SID')) {
} elseif (defined('SID')) {
runkit_constant_remove('SID');
}
}
if ($this->apdExt)
if ($this->apdExt) {
unset($GLOBALS['header']);
}
}
@ -232,13 +234,13 @@ class PMA_headerLocation_test extends PHPUnit_Framework_TestCase
public function testSendHeaderLocationIisLongUri()
{
if (defined('PMA_IS_IIS') && $this->runkitExt)
if (defined('PMA_IS_IIS') && $this->runkitExt) {
runkit_constant_redefine('PMA_IS_IIS', true);
elseif (!defined('PMA_IS_IIS'))
} elseif (!defined('PMA_IS_IIS')) {
define('PMA_IS_IIS', true);
else
} else {
$this->markTestSkipped('Cannot redefine constant/function - missing APD or/and runkit extension');
}
// over 600 chars
$testUri = 'http://testurl.com/test.php?testlonguri=over600chars&test=test&test=test&test=test&test=test&test=test&test=test&test=test&test=test&test=test&test=test&test=test&test=test&test=test&test=test&test=test&test=test&test=test&test=test&test=test&test=test&test=test&test=test&test=test&test=test&test=test&test=test&test=test&test=test&test=test&test=test&test=test&test=test&test=test&test=test&test=test&test=test&test=test&test=test&test=test&test=test&test=test&test=test&test=test&test=test&test=test&test=test&test=test&test=test&test=test&test=test&test=test&test=test&test=test&test=test&test=test&test=test&test=test';

3
test/libraries/select_lang/PMA_langList_test.php
View File

@ -31,8 +31,9 @@ class PMA_langList_test extends PHPUnit_Framework_TestCase
$expected = array('en' => PMA_langDetails('en'));
$handle = @opendir($GLOBALS['lang_path']);
if ($handle === false)
if ($handle === false) {
$this->markTestSkipped("Cannot open file with locales");
}
while (false !== ($file = readdir($handle))) {
if ($file != "." && $file != ".." && file_exists($GLOBALS['lang_path'] . '/' . $file . '/LC_MESSAGES/phpmyadmin.mo')) {