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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Weblate 2017-07-18 09:45:27 +02:00
commit 41e8a3db43
20 changed files with 45 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
js/get_image.js.php
View File

@ -32,7 +32,7 @@ if (!defined('TESTSUITE')) {
}
// Get the data for the sprites, if it's available
$sprites = $_SESSION['PMA_Theme']->getSpriteData();
$sprites = $GLOBALS['PMA_Theme']->getSpriteData();
// We only need the keys from the array of sprites data,
// since they contain the (partial) class names
@ -130,7 +130,7 @@ function PMA_getImage(image, alternate, attributes) {
retval.isSprite = false;
retval.attr(
'src',
"<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>" + image
"<?php echo $GLOBALS['PMA_Theme']->getImgPath(); ?>" + image
);
}
// set all other attrubutes

2
js/messages.php
View File

@ -706,7 +706,7 @@ $js_messages['phpErrorsBeingSubmitted'] = '<div class="error">'
)
. '<br/>'
. '<img src="'
. ($_SESSION['PMA_Theme']->getImgPath('ajax_clock_small.gif'))
. ($GLOBALS['PMA_Theme']->getImgPath('ajax_clock_small.gif'))
. '" width="16" height="16" alt="ajax clock"/>'
. '</div>';

4
libraries/classes/Config.php
View File

@ -1252,8 +1252,8 @@ class Config
$this->source_mtime +
$this->default_source_mtime +
$this->get('user_preferences_mtime') +
$_SESSION['PMA_Theme']->mtime_info +
$_SESSION['PMA_Theme']->filesize_info);
$GLOBALS['PMA_Theme']->mtime_info +
$GLOBALS['PMA_Theme']->filesize_info);
}
/**

4
libraries/classes/Header.php
View File

@ -187,8 +187,8 @@ class Header
// Append the theme id to this url to invalidate
// the cache on a theme change. Though this might be
// unavailable for fatal errors.
if (isset($_SESSION['PMA_Theme'])) {
$theme_id = urlencode($_SESSION['PMA_Theme']->getId());
if (isset($GLOBALS['PMA_Theme'])) {
$theme_id = urlencode($GLOBALS['PMA_Theme']->getId());
} else {
$theme_id = 'default';
}

14
libraries/classes/ThemeManager.php
View File

@ -498,32 +498,32 @@ class ThemeManager
/**
* the theme object
*
* @global Theme $_SESSION['PMA_Theme']
* @global Theme $GLOBALS['PMA_Theme']
*/
$_SESSION['PMA_Theme'] = $tmanager->theme;
$GLOBALS['PMA_Theme'] = $tmanager->theme;
// BC
/**
* the active theme
* @global string $GLOBALS['theme']
*/
$GLOBALS['theme'] = $_SESSION['PMA_Theme']->getName();
$GLOBALS['theme'] = $GLOBALS['PMA_Theme']->getName();
/**
* the theme path
* @global string $GLOBALS['pmaThemePath']
*/
$GLOBALS['pmaThemePath'] = $_SESSION['PMA_Theme']->getPath();
$GLOBALS['pmaThemePath'] = $GLOBALS['PMA_Theme']->getPath();
/**
* the theme image path
* @global string $GLOBALS['pmaThemeImage']
*/
$GLOBALS['pmaThemeImage'] = $_SESSION['PMA_Theme']->getImgPath();
$GLOBALS['pmaThemeImage'] = $GLOBALS['PMA_Theme']->getImgPath();
/**
* load layout file if exists
*/
if (@file_exists($_SESSION['PMA_Theme']->getLayoutFile())) {
include $_SESSION['PMA_Theme']->getLayoutFile();
if (@file_exists($GLOBALS['PMA_Theme']->getLayoutFile())) {
include $GLOBALS['PMA_Theme']->getLayoutFile();
}
}
}

4
libraries/classes/Util.php
View File

@ -130,8 +130,8 @@ class Util
if (! isset($sprites)) {
$sprites = array();
// Try to load the list of sprites
if (isset($_SESSION['PMA_Theme'])) {
$sprites = $_SESSION['PMA_Theme']->getSpriteData();
if (isset($GLOBALS['PMA_Theme'])) {
$sprites = $GLOBALS['PMA_Theme']->getSpriteData();
}
}

8
templates/database/designer/database_tables.phtml
View File

@ -33,7 +33,7 @@
</td>
<td class="small_tab_pref small_tab_pref_1"
table_name_small="<?= htmlspecialchars($GLOBALS['PMD_URL']["TABLE_NAME_SMALL"][$i]); ?>">
<img src="<?= $_SESSION['PMA_Theme']->getImgPath('pmd/exec_small.png'); ?>"
<img src="<?= $GLOBALS['PMA_Theme']->getImgPath('pmd/exec_small.png'); ?>"
title="<?= __('See table structure'); ?>" />
</td>
<td id="id_zag_<?= htmlspecialchars($t_n_url); ?>"
@ -89,7 +89,7 @@
<td width="10px" colspan="3" id="<?= $t_n_url; ?>.<?= urlencode($tab_column[$t_n]["COLUMN_NAME"][$j]); ?>">
<div class="nowrap">
<?php if (isset($tables_pk_or_unique_keys[$t_n . "." . $tab_column[$t_n]["COLUMN_NAME"][$j]])) : ?>
<img src="<?= $_SESSION['PMA_Theme']->getImgPath('pmd/FieldKey_small.png'); ?>" alt="*" />
<img src="<?= $GLOBALS['PMA_Theme']->getImgPath('pmd/FieldKey_small.png'); ?>" alt="*" />
<?php else :
$type = 'pmd/Field_small';
if (strstr($tab_column[$t_n]["TYPE"][$j], 'char')
@ -109,7 +109,7 @@
$type .= '_date';
}
?>
<img src="<?= $_SESSION['PMA_Theme']->getImgPath($type); ?>.png" alt="*" />
<img src="<?= $GLOBALS['PMA_Theme']->getImgPath($type); ?>.png" alt="*" />
<?php endif; ?>
<?= htmlspecialchars(
$tab_column[$t_n]["COLUMN_NAME"][$j] . " : "
@ -121,7 +121,7 @@
<?php if (isset($_REQUEST['query'])) : ?>
<td class="small_tab_pref small_tab_pref_click_opt"
Click_option_param="pmd_optionse,<?= urlencode($tab_column[$t_n]['COLUMN_NAME'][$j]); ?>,<?= $GLOBALS['PMD_OUT']['TABLE_NAME_SMALL'][$i]; ?>" >
<img src="<?= $_SESSION['PMA_Theme']->getImgPath('pmd/exec_small.png'); ?>" title="options" />
<img src="<?= $GLOBALS['PMA_Theme']->getImgPath('pmd/exec_small.png'); ?>" title="options" />
</td>
<?php endif; ?>
</tr>

2
templates/database/designer/side_menu.phtml
View File

@ -1,7 +1,7 @@
<?php
function getImg($path)
{
return $_SESSION['PMA_Theme']->getImgPath($path);
return $GLOBALS['PMA_Theme']->getImgPath($path);
}
?>
<?php if (!$visualBuilder) : ?>

18
templates/database/designer/table_list.phtml
View File

@ -4,17 +4,17 @@
<img title="<?= __('Hide/Show all'); ?>"
alt="v"
id="key_HS_all"
src="<?= $_SESSION['PMA_Theme']->getImgPath('pmd/downarrow1.png'); ?>"
data-down="<?= $_SESSION['PMA_Theme']->getImgPath('pmd/downarrow1.png'); ?>"
data-right="<?= $_SESSION['PMA_Theme']->getImgPath('pmd/rightarrow1.png'); ?>" />
src="<?= $GLOBALS['PMA_Theme']->getImgPath('pmd/downarrow1.png'); ?>"
data-down="<?= $GLOBALS['PMA_Theme']->getImgPath('pmd/downarrow1.png'); ?>"
data-right="<?= $GLOBALS['PMA_Theme']->getImgPath('pmd/rightarrow1.png'); ?>" />
</a>
<a href="#" class="M_butt" target="_self" >
<img alt="v"
id="key_HS"
title="<?= __('Hide/Show Tables with no relationship'); ?>"
src="<?= $_SESSION['PMA_Theme']->getImgPath('pmd/downarrow2.png'); ?>"
data-down="<?= $_SESSION['PMA_Theme']->getImgPath('pmd/downarrow2.png'); ?>"
data-right="<?= $_SESSION['PMA_Theme']->getImgPath('pmd/rightarrow2.png'); ?>" />
src="<?= $GLOBALS['PMA_Theme']->getImgPath('pmd/downarrow2.png'); ?>"
data-down="<?= $GLOBALS['PMA_Theme']->getImgPath('pmd/downarrow2.png'); ?>"
data-right="<?= $GLOBALS['PMA_Theme']->getImgPath('pmd/rightarrow2.png'); ?>" />
</a>
</div>
<div id="id_scroll_tab" class="scroll_tab">
@ -31,7 +31,7 @@
<img alt=""
table_name="<?= htmlspecialchars($GLOBALS['PMD_URL']['TABLE_NAME_SMALL'][$i]); ?>"
class="scroll_tab_struct"
src="<?= $_SESSION['PMA_Theme']->getImgPath('pmd/exec.png'); ?>"/>
src="<?= $GLOBALS['PMA_Theme']->getImgPath('pmd/exec.png'); ?>"/>
</td>
<td width="1px">
<input class="scroll_tab_checkbox"
@ -57,8 +57,8 @@
<div id="layer_menu_sizer">
<div class="floatleft">
<img class="icon"
data-right="<?= $_SESSION['PMA_Theme']->getImgPath('pmd/resizeright.png'); ?>"
src="<?= $_SESSION['PMA_Theme']->getImgPath('pmd/resize.png'); ?>"/>
data-right="<?= $GLOBALS['PMA_Theme']->getImgPath('pmd/resizeright.png'); ?>"
src="<?= $GLOBALS['PMA_Theme']->getImgPath('pmd/resize.png'); ?>"/>
</div>
</div>
</div>

2
test/bootstrap-dist.php
View File

@ -84,7 +84,7 @@ session_start();
// Standard environment for tests
$_SESSION[' PMA_token '] = 'token';
$_SESSION['PMA_Theme'] = PhpMyAdmin\Theme::load('./themes/pmahomme');
$GLOBALS['PMA_Theme'] = PhpMyAdmin\Theme::load('./themes/pmahomme');
$_SESSION['tmpval']['pftext'] = 'F';
$GLOBALS['lang'] = 'en';
$GLOBALS['cell_align_left'] = 'left';

4
test/classes/ConfigTest.php
View File

@ -839,8 +839,8 @@ class ConfigTest extends PMATestCase
'default_source_mtime'
) +
$this->object->get('user_preferences_mtime') +
$_SESSION['PMA_Theme']->mtime_info +
$_SESSION['PMA_Theme']->filesize_info
$GLOBALS['PMA_Theme']->mtime_info +
$GLOBALS['PMA_Theme']->filesize_info
);
$this->object->set('fontsize', 10);

2
test/classes/HeaderTest.php
View File

@ -35,7 +35,7 @@ class HeaderTest extends PMATestCase
}
$GLOBALS['server'] = 0;
$GLOBALS['message'] = 'phpmyadminmessage';
$GLOBALS['pmaThemePath'] = $_SESSION['PMA_Theme']->getPath();
$GLOBALS['pmaThemePath'] = $GLOBALS['PMA_Theme']->getPath();
$GLOBALS['PMA_PHP_SELF'] = Core::getenv('PHP_SELF');
$GLOBALS['server'] = 'server';
$GLOBALS['db'] = 'pma_test';

2
test/classes/MenuTest.php
View File

@ -37,7 +37,7 @@ class MenuTest extends PMATestCase
$GLOBALS['cfg']['Server']['DisableIS'] = false;
$GLOBALS['server'] = 0;
$GLOBALS['cfg']['Server']['verbose'] = 'verbose host';
$GLOBALS['pmaThemePath'] = $_SESSION['PMA_Theme']->getPath();
$GLOBALS['pmaThemePath'] = $GLOBALS['PMA_Theme']->getPath();
$GLOBALS['PMA_PHP_SELF'] = Core::getenv('PHP_SELF');
$GLOBALS['server'] = 'server';
$GLOBALS['db'] = 'pma_test';

6
test/classes/ThemeTest.php
View File

@ -35,8 +35,8 @@ class ThemeTest extends PMATestCase
protected function setUp()
{
$this->object = new Theme();
$this->backup = $_SESSION['PMA_Theme'];
$_SESSION['PMA_Theme'] = $this->object;
$this->backup = $GLOBALS['PMA_Theme'];
$GLOBALS['PMA_Theme'] = $this->object;
$GLOBALS['PMA_Config'] = new PhpMyAdmin\Config();
$GLOBALS['PMA_Config']->enableBc();
$GLOBALS['text_dir'] = 'ltr';
@ -53,7 +53,7 @@ class ThemeTest extends PMATestCase
*/
protected function tearDown()
{
$_SESSION['PMA_Theme'] = $this->backup;
$GLOBALS['PMA_Theme'] = $this->backup;
}
/**

2
test/classes/config/FormDisplayTest.php
View File

@ -34,7 +34,7 @@ class FormDisplayTest extends PMATestCase
*/
function setup()
{
$GLOBALS['pmaThemePath'] = $_SESSION['PMA_Theme']->getPath();
$GLOBALS['pmaThemePath'] = $GLOBALS['PMA_Theme']->getPath();
$GLOBALS['PMA_Config'] = new Config();
$GLOBALS['PMA_Config']->enableBc();
$GLOBALS['server'] = 0;

2
test/classes/config/FormTest.php
View File

@ -32,7 +32,7 @@ class FormTest extends PMATestCase
*/
function setup()
{
$GLOBALS['pmaThemePath'] = $_SESSION['PMA_Theme']->getPath();
$GLOBALS['pmaThemePath'] = $GLOBALS['PMA_Theme']->getPath();
$GLOBALS['PMA_Config'] = new Config();
$GLOBALS['PMA_Config']->enableBc();
$GLOBALS['server'] = 0;

2
test/classes/navigation/NodeDatabaseChildTest.php
View File

@ -34,7 +34,7 @@ class NodeDatabaseChildTest extends PMATestCase
*/
protected function setUp()
{
$GLOBALS['pmaThemePath'] = $_SESSION['PMA_Theme']->getPath();
$GLOBALS['pmaThemePath'] = $GLOBALS['PMA_Theme']->getPath();
$GLOBALS['cfg']['DefaultTabDatabase'] = 'structure';
$GLOBALS['server'] = 1;
$GLOBALS['cfg']['ServerDefault'] = 1;

2
test/libraries/PMA_relation_test.php
View File

@ -43,7 +43,7 @@ class PMA_Relation_Test extends PHPUnit_Framework_TestCase
$_SESSION['relation'][$GLOBALS['server']] = "PMA_relation";
$_SESSION['relation'] = array();
$GLOBALS['pmaThemePath'] = $_SESSION['PMA_Theme']->getPath();
$GLOBALS['pmaThemePath'] = $GLOBALS['PMA_Theme']->getPath();
$GLOBALS['cfg']['ServerDefault'] = 0;
include_once 'libraries/relation.lib.php';

4
test/libraries/common/PMA_checkParameters_test.php
View File

@ -41,7 +41,7 @@ class PMA_CheckParameters_Test extends PHPUnit_Framework_TestCase
function testCheckParameterMissing()
{
$GLOBALS['PMA_PHP_SELF'] = Core::getenv('PHP_SELF');
$GLOBALS['pmaThemePath'] = $_SESSION['PMA_Theme']->getPath();
$GLOBALS['pmaThemePath'] = $GLOBALS['PMA_Theme']->getPath();
$this->expectOutputRegex("/Missing parameter: field/");
@ -58,7 +58,7 @@ class PMA_CheckParameters_Test extends PHPUnit_Framework_TestCase
function testCheckParameter()
{
$GLOBALS['PMA_PHP_SELF'] = Core::getenv('PHP_SELF');
$GLOBALS['pmaThemePath'] = $_SESSION['PMA_Theme']->getPath();
$GLOBALS['pmaThemePath'] = $GLOBALS['PMA_Theme']->getPath();
$GLOBALS['db'] = "dbDatabase";
$GLOBALS['table'] = "tblTable";
$GLOBALS['field'] = "test_field";

2
test/libraries/rte/PMA_RTN_getEditorForm_test.php
View File

@ -40,7 +40,7 @@ class PMA_RTN_GetEditorForm_Test extends PHPUnit_Framework_TestCase
$cfg['ServerDefault'] = 1;
$GLOBALS['PMA_Types'] = new TypesMySQL();
$GLOBALS['pmaThemePath'] = $_SESSION['PMA_Theme']->getPath();
$GLOBALS['pmaThemePath'] = $GLOBALS['PMA_Theme']->getPath();
}