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

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
Atul Pratap Singh 2012-07-18 18:04:35 +00:00
commit 5f0e341182
79 changed files with 34453 additions and 34612 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
build.xml
View File

@ -24,6 +24,12 @@
</exec>
</target>
<target name="phpunit-nocoverage" description="Run unit tests using PHPUnit and generates junit.xml">
<exec executable="phpunit">
<arg line="--configuration phpunit.xml.nocoverage"/>
</exec>
</target>
<target name="pdepend" description="Generate jdepend.xml and software metrics charts using PHP_Depend">
<exec executable="pdepend">
<arg line="--jdepend-xml=${basedir}/build/logs/jdepend.xml

46
phpunit.xml.nocoverage Normal file
View File

@ -0,0 +1,46 @@
<?xml version="1.0" encoding="UTF-8"?>
<phpunit bootstrap="test/bootstrap-dist.php"
backupGlobals="false"
backupStaticAttributes="false"
strict="true"
verbose="true">
<selenium>
<browser name="Firefox on localhost"
browser="*firefox"
host="127.0.0.1"
port="4444"
timeout="30000"/>
</selenium>
<php>
<const name="TESTSUITE_SERVER" value="localhost"/>
<const name="TESTSUITE_USER" value="root"/>
<const name="TESTSUITE_PASSWORD" value=""/>
<const name="TESTSUITE_DATABASE" value="test"/>
<const name="TESTSUITE_PHPMYADMIN_HOST" value="http://localhost" />
<const name="TESTSUITE_PHPMYADMIN_URL" value="/phpmyadmin" />
</php>
<testsuites>
<testsuite name="Classes">
<directory suffix="_test.php">test/classes</directory>
</testsuite>
<testsuite name="Unit">
<file>test/Environment_test.php</file>
<directory suffix="_test.php">test/libraries/core</directory>
<directory suffix="_test.php">test/libraries/common</directory>
<directory suffix="_test.php">test/libraries/rte</directory>
<directory suffix="_test.php">test/libraries</directory>
</testsuite>
<!--<testsuite name="Selenium">-->
<!--<directory suffix="Test.php">test/selenium</directory>-->
<!--</testsuite>-->
</testsuites>
<logging>
<log type="junit" target="build/logs/junit.xml" logIncompleteSkipped="false"/>
</logging>
</phpunit>

994
po/af.po
View File

File diff suppressed because it is too large Load Diff

998
po/ar.po
View File

File diff suppressed because it is too large Load Diff

996
po/az.po
View File

File diff suppressed because it is too large Load Diff

996
po/be.po
View File

File diff suppressed because it is too large Load Diff

1000
po/be@latin.po
View File

File diff suppressed because it is too large Load Diff

982
po/bg.po
View File

File diff suppressed because it is too large Load Diff

982
po/bn.po
View File

File diff suppressed because it is too large Load Diff

982
po/br.po
View File

File diff suppressed because it is too large Load Diff

996
po/bs.po
View File

File diff suppressed because it is too large Load Diff

1036
po/ca.po
View File

File diff suppressed because it is too large Load Diff

982
po/ckb.po
View File

File diff suppressed because it is too large Load Diff

1008
po/cs.po
View File

File diff suppressed because it is too large Load Diff

990
po/cy.po
View File

File diff suppressed because it is too large Load Diff

1045
po/da.po
View File

File diff suppressed because it is too large Load Diff

978
po/de.po
View File

File diff suppressed because it is too large Load Diff

982
po/el.po
View File

File diff suppressed because it is too large Load Diff

978
po/en_GB.po
View File

File diff suppressed because it is too large Load Diff

993
po/es.po
View File

File diff suppressed because it is too large Load Diff

982
po/et.po
View File

File diff suppressed because it is too large Load Diff

982
po/eu.po
View File

File diff suppressed because it is too large Load Diff

1130
po/fa.po
View File

File diff suppressed because it is too large Load Diff

982
po/fi.po
View File

File diff suppressed because it is too large Load Diff

978
po/fr.po
View File

File diff suppressed because it is too large Load Diff

1000
po/gl.po
View File

File diff suppressed because it is too large Load Diff

982
po/he.po
View File

File diff suppressed because it is too large Load Diff

1026
po/hi.po
View File

File diff suppressed because it is too large Load Diff

996
po/hr.po
View File

File diff suppressed because it is too large Load Diff

982
po/hu.po
View File

File diff suppressed because it is too large Load Diff

972
po/hy.po
View File

File diff suppressed because it is too large Load Diff

978
po/id.po
View File

File diff suppressed because it is too large Load Diff

982
po/it.po
View File

File diff suppressed because it is too large Load Diff

978
po/ja.po
View File

File diff suppressed because it is too large Load Diff

988
po/ka.po
View File

File diff suppressed because it is too large Load Diff

982
po/kk.po
View File

File diff suppressed because it is too large Load Diff

998
po/ko.po
View File

File diff suppressed because it is too large Load Diff

990
po/lt.po
View File

File diff suppressed because it is too large Load Diff

996
po/lv.po
View File

File diff suppressed because it is too large Load Diff

996
po/mk.po
View File

File diff suppressed because it is too large Load Diff

978
po/ml.po
View File

File diff suppressed because it is too large Load Diff

996
po/mn.po
View File

File diff suppressed because it is too large Load Diff

994
po/ms.po
View File

File diff suppressed because it is too large Load Diff

1071
po/nb.po
View File

File diff suppressed because it is too large Load Diff

982
po/nl.po
View File

File diff suppressed because it is too large Load Diff

970
po/phpmyadmin.pot
View File

File diff suppressed because it is too large Load Diff

992
po/pl.po
View File

File diff suppressed because it is too large Load Diff

982
po/pt.po
View File

File diff suppressed because it is too large Load Diff

1004
po/pt_BR.po
View File

File diff suppressed because it is too large Load Diff

990
po/ro.po
View File

File diff suppressed because it is too large Load Diff

982
po/ru.po
View File

File diff suppressed because it is too large Load Diff

978
po/si.po
View File

File diff suppressed because it is too large Load Diff

997
po/sk.po
View File

File diff suppressed because it is too large Load Diff

986
po/sl.po
View File

File diff suppressed because it is too large Load Diff

996
po/sq.po
View File

File diff suppressed because it is too large Load Diff

1000
po/sr.po
View File

File diff suppressed because it is too large Load Diff

996
po/sr@latin.po
View File

File diff suppressed because it is too large Load Diff

978
po/sv.po
View File

File diff suppressed because it is too large Load Diff

982
po/ta.po
View File

File diff suppressed because it is too large Load Diff

988
po/te.po
View File

File diff suppressed because it is too large Load Diff

978
po/th.po
View File

File diff suppressed because it is too large Load Diff

970
po/tk.po
View File

File diff suppressed because it is too large Load Diff

974
po/tr.po
View File

File diff suppressed because it is too large Load Diff

992
po/tt.po
View File

File diff suppressed because it is too large Load Diff

988
po/ug.po
View File

File diff suppressed because it is too large Load Diff

986
po/uk.po
View File

File diff suppressed because it is too large Load Diff

992
po/ur.po
View File

File diff suppressed because it is too large Load Diff

996
po/uz.po
View File

File diff suppressed because it is too large Load Diff

998
po/uz@latin.po
View File

File diff suppressed because it is too large Load Diff

978
po/zh_CN.po
View File

File diff suppressed because it is too large Load Diff

982
po/zh_TW.po
View File

File diff suppressed because it is too large Load Diff

152
test/classes/PMA_DisplayResults_test.php
View File

@ -39,6 +39,8 @@ class PMA_DisplayResults_test extends PHPUnit_Framework_TestCase
'PMA_DisplayResults',
array('as', '','','')
);
$SESSION[' PMA_Token '] = 'token';
$GLOBALS['lang'] = 'en';
}
@ -86,7 +88,7 @@ class PMA_DisplayResults_test extends PHPUnit_Framework_TestCase
*/
public function testSetDisplayModeCase1($the_disp_mode, $the_total, $output)
{
if (!isset($GLOBALS['fields_meta'])) {
$fields_meta = array();
$fields_meta[0] = new stdClass();
@ -94,7 +96,7 @@ class PMA_DisplayResults_test extends PHPUnit_Framework_TestCase
} else {
$fields_meta = $GLOBALS['fields_meta'];
}
$this->object->setProperties(
null, $fields_meta, true, null, null,
null, null, null, null, null, null,
@ -102,11 +104,11 @@ class PMA_DisplayResults_test extends PHPUnit_Framework_TestCase
);
$this->assertEquals(
$output,
$this->_callPrivateFunction(
'_setDisplayMode',
array(&$the_disp_mode, &$the_total)
),
$output
)
);
}
@ -163,7 +165,7 @@ class PMA_DisplayResults_test extends PHPUnit_Framework_TestCase
*/
public function testSetDisplayModeCase2($the_disp_mode, $the_total, $output)
{
if (!isset($GLOBALS['fields_meta'])) {
$fields_meta = array();
$fields_meta[0] = new stdClass();
@ -171,21 +173,21 @@ class PMA_DisplayResults_test extends PHPUnit_Framework_TestCase
} else {
$fields_meta = $GLOBALS['fields_meta'];
}
$this->object->setProperties(
1, $fields_meta, false, null, null,
false, null, null, null, null, null,
false, false, true, null, null, null
);
$this->object->__set('_sql_query', 'SELECT * FROM `pma_bookmark` WHERE 1');
$this->assertEquals(
$output,
$this->_callPrivateFunction(
'_setDisplayMode',
array(&$the_disp_mode, &$the_total)
),
$output
)
);
}
@ -242,7 +244,7 @@ class PMA_DisplayResults_test extends PHPUnit_Framework_TestCase
*/
public function testSetDisplayModeCase3($the_disp_mode, $the_total, $output)
{
if (!isset($GLOBALS['fields_meta'])) {
$fields_meta = array();
$fields_meta[0] = new stdClass();
@ -250,7 +252,7 @@ class PMA_DisplayResults_test extends PHPUnit_Framework_TestCase
} else {
$fields_meta = $GLOBALS['fields_meta'];
}
$this->object->setProperties(
1, $fields_meta, false, null, null,
false, null, null, null, null, null,
@ -258,11 +260,11 @@ class PMA_DisplayResults_test extends PHPUnit_Framework_TestCase
);
$this->assertEquals(
$output,
$this->_callPrivateFunction(
'_setDisplayMode',
array(&$the_disp_mode, &$the_total)
),
$output
)
);
}
@ -340,11 +342,11 @@ class PMA_DisplayResults_test extends PHPUnit_Framework_TestCase
$_SESSION[' PMA_token '] = 'token';
$this->assertEquals(
$output,
$this->_callPrivateFunction(
'_getTableNavigationButton',
array(&$caption, $title, $pos, $html_sql_query)
),
$output
)
);
}
@ -359,7 +361,7 @@ class PMA_DisplayResults_test extends PHPUnit_Framework_TestCase
'Submit',
1,
'SELECT * FROM `pma_bookmark` WHERE 1',
'<td><form action="sql.php" method="post" ><input type="hidden" name="db" value="as" /><input type="hidden" name="token" value="token" /><input type="hidden" name="sql_query" value="SELECT * FROM `pma_bookmark` WHERE 1" /><input type="hidden" name="pos" value="1" /><input type="hidden" name="goto" value="" /><input type="submit" name="navig" class="ajax" value="btn" title="Submit" /></form></td>'
'<td><form action="sql.php" method="post" ><input type="hidden" name="db" value="as" /><input type="hidden" name="lang" value="en" /><input type="hidden" name="token" value="token" /><input type="hidden" name="sql_query" value="SELECT * FROM `pma_bookmark` WHERE 1" /><input type="hidden" name="pos" value="1" /><input type="hidden" name="goto" value="" /><input type="submit" name="navig" class="ajax" value="btn" title="Submit" /></form></td>'
)
);
}
@ -389,6 +391,7 @@ class PMA_DisplayResults_test extends PHPUnit_Framework_TestCase
$_SESSION['tmp_user_values']['disp_direction'] = '1';
$this->assertEquals(
$output,
str_word_count(
$this->_callPrivateFunction(
'_getTableNavigation',
@ -396,8 +399,7 @@ class PMA_DisplayResults_test extends PHPUnit_Framework_TestCase
$pos_next, $pos_prev, $id_for_direction_dropdown, $is_innodb
)
)
),
$output
)
);
}
@ -412,7 +414,7 @@ class PMA_DisplayResults_test extends PHPUnit_Framework_TestCase
41,
'123',
false,
'309'
'330'
)
);
}
@ -454,21 +456,21 @@ class PMA_DisplayResults_test extends PHPUnit_Framework_TestCase
$grid_edit_class, $not_null_class, $relation_class,
$hide_class, $field_type_class, $row_no, $output
) {
$GLOBALS['cfg']['BrowsePointerEnable'] = true;
$GLOBALS['cfg']['BrowseMarkerEnable'] = true;
$_SESSION['tmp_user_values']['disp_direction']
= PMA_DisplayResults::DISP_DIR_VERTICAL;
$this->assertEquals(
$output,
$this->_callPrivateFunction(
'_getResettedClassForInlineEdit',
array(
$grid_edit_class, $not_null_class, $relation_class,
$hide_class, $field_type_class, $row_no
)
),
$output
)
);
}
@ -478,11 +480,11 @@ class PMA_DisplayResults_test extends PHPUnit_Framework_TestCase
public function testGetClassForDateTimeRelatedFieldsCase1()
{
$this->assertEquals(
'datetimefield',
$this->_callPrivateFunction(
'_getClassForDateTimeRelatedFields',
array(PMA_DisplayResults::DATETIME_FIELD)
),
'datetimefield'
)
);
}
@ -492,11 +494,11 @@ class PMA_DisplayResults_test extends PHPUnit_Framework_TestCase
public function testGetClassForDateTimeRelatedFieldsCase2()
{
$this->assertEquals(
'datefield',
$this->_callPrivateFunction(
'_getClassForDateTimeRelatedFields',
array(PMA_DisplayResults::DATE_FIELD)
),
'datefield'
)
);
}
@ -506,11 +508,11 @@ class PMA_DisplayResults_test extends PHPUnit_Framework_TestCase
public function testGetClassForDateTimeRelatedFieldsCase3()
{
$this->assertEquals(
'',
$this->_callPrivateFunction(
'_getClassForDateTimeRelatedFields',
array(PMA_DisplayResults::STRING_FIELD)
),
''
)
);
}
@ -542,7 +544,7 @@ class PMA_DisplayResults_test extends PHPUnit_Framework_TestCase
public function testGetOperationLinksForVerticleTableCase1(
$operation, $output
) {
$vertical_display = array(
'row_delete' => array(),
'textbtn' => '<th rowspan="4" class="vmiddle">\n \n </th>\n',
@ -556,15 +558,15 @@ class PMA_DisplayResults_test extends PHPUnit_Framework_TestCase
'<td class="even row_1 vpointer vmarker center" >\n<a href="sql.php?db=Data&amp;table=cars&amp;sql_query=DELETE+FROM+%60Data%60.%60cars%60+WHERE+%60cars%60.%60id%60+%3D+9&amp;message_to_show=The+row+has+been+deleted&amp;goto=sql.php%3Fdb%3DData%26table%3Dcars%26sql_query%3DSELECT%2B%252A%2BFROM%2B%2560cars%2560%26message_to_show%3DThe%2Brow%2Bhas%2Bbeen%2Bdeleted%26goto%3Dtbl_structure.php%26token%3D466f137b5f4556e43103245a086fc001&amp;token=466f137b5f4556e43103245a086fc001" onclick="return confirmLink(this'
)
);
$this->object->__set('_vertical_display', $vertical_display);
$this->assertEquals(
$output,
$this->_callPrivateFunction(
'_getOperationLinksForVerticleTable',
array($operation)
),
$output
)
);
}
@ -576,7 +578,7 @@ class PMA_DisplayResults_test extends PHPUnit_Framework_TestCase
public function dataProviderForTestGetOperationLinksForVerticleTableCase2()
{
return array(
array(
array(
'copy',
'<tr>
<td class="odd row_0 vpointer vmarker center" ><span class="nowrap">\n<a href="tbl_change.php?db=Data&amp;table=cars&amp;where_clause=%60cars%60.%60id%60+%3D+3&amp;clause_is_unique=1&amp;sql_query=SELECT+%2A+FROM+%60cars%60&amp;goto=sql.php&amp;default_action=insert&amp;token=466f137b5f4556e43103245a086fc001" ><span class="nowrap"><img src="themes/dot.gif" title="Copy" alt="Copy" class="icon ic_b_insrow" /> Copy</span></a>\n<input type="hidden" class="where_clause" value="%60cars%60.%60id%60+%3D+3" /></spa<td class="even row_1 vpointer vmarker center" ><span class="nowrap">\n<a href="tbl_change.php?db=Data&amp;table=cars&amp;where_clause=%60cars%60.%60id%60+%3D+9&amp;clause_is_unique=1&amp;sql_query=SELECT+%2A+FROM+%60cars%60&amp;goto=sql.php&amp;default_action=insert&amp;token=466f137b5f4556e43103245a086fc001" ><span class="nowrap"><img src="themes/dot.gif" title="Copy" alt="Copy" class="icon ic_b_insrow" /> Copy</span></a>\n<input type="hidden" class="where_clause" value="%60cars%60.%60id%60+%3D+9" /></sp</tr>
@ -596,7 +598,7 @@ class PMA_DisplayResults_test extends PHPUnit_Framework_TestCase
public function testGetOperationLinksForVerticleTableCase2(
$operation, $output
) {
$vertical_display = array(
'row_delete' => array(),
'textbtn' => '<th rowspan="4" class="vmiddle">\n \n </th>\n',
@ -610,15 +612,15 @@ class PMA_DisplayResults_test extends PHPUnit_Framework_TestCase
'<td class="even row_1 vpointer vmarker center" >\n<a href="sql.php?db=Data&amp;table=cars&amp;sql_query=DELETE+FROM+%60Data%60.%60cars%60+WHERE+%60cars%60.%60id%60+%3D+9&amp;message_to_show=The+row+has+been+deleted&amp;goto=sql.php%3Fdb%3DData%26table%3Dcars%26sql_query%3DSELECT%2B%252A%2BFROM%2B%2560cars%2560%26message_to_show%3DThe%2Brow%2Bhas%2Bbeen%2Bdeleted%26goto%3Dtbl_structure.php%26token%3D466f137b5f4556e43103245a086fc001&amp;token=466f137b5f4556e43103245a086fc001" onclick="return confirmLink(this'
)
);
$this->object->__set('_vertical_display', $vertical_display);
$this->assertEquals(
$output,
$this->_callPrivateFunction(
'_getOperationLinksForVerticleTable',
array($operation)
),
$output
)
);
}
@ -651,7 +653,7 @@ class PMA_DisplayResults_test extends PHPUnit_Framework_TestCase
public function testGetOperationLinksForVerticleTableCase3(
$operation, $output
) {
$vertical_display = array(
'row_delete' => array(),
'textbtn' => '<th rowspan="4" class="vmiddle">\n \n </th>\n',
@ -665,15 +667,15 @@ class PMA_DisplayResults_test extends PHPUnit_Framework_TestCase
'<td class="even row_1 vpointer vmarker center" >\n<a href="sql.php?db=Data&amp;table=cars&amp;sql_query=DELETE+FROM+%60Data%60.%60cars%60+WHERE+%60cars%60.%60id%60+%3D+9&amp;message_to_show=The+row+has+been+deleted&amp;goto=sql.php%3Fdb%3DData%26table%3Dcars%26sql_query%3DSELECT%2B%252A%2BFROM%2B%2560cars%2560%26message_to_show%3DThe%2Brow%2Bhas%2Bbeen%2Bdeleted%26goto%3Dtbl_structure.php%26token%3D466f137b5f4556e43103245a086fc001&amp;token=466f137b5f4556e43103245a086fc001" onclick="return confirmLink(this'
)
);
$this->object->__set('_vertical_display', $vertical_display);
$this->assertEquals(
$output,
$this->_callPrivateFunction(
'_getOperationLinksForVerticleTable',
array($operation)
),
$output
)
);
}
@ -704,23 +706,23 @@ class PMA_DisplayResults_test extends PHPUnit_Framework_TestCase
public function testGetCheckBoxesForMultipleRowOperations(
$dir, $output
) {
$vertical_display = array(
'row_delete' => array(
'<td class="odd row_0 vpointer vmarker" class="center"><input type="checkbox" id="id_rows_to_delete0[%_PMA_CHECKBOX_DIR_%]" name="rows_to_delete[0]" class="multi_checkbox" value="%60cars%60.%60id%60+%3D+3" /><input type="hidden" class="condition_array" value="{&quot;`cars`.`id`&quot;:&quot;= 3&quot;}" /> </td>',
'<td class="even row_1 vpointer vmarker" class="center"><input type="checkbox" id="id_rows_to_delete1[%_PMA_CHECKBOX_DIR_%]" name="rows_to_delete[1]" class="multi_checkbox" value="%60cars%60.%60id%60+%3D+9" /><input type="hidden" class="condition_array" value="{&quot;`cars`.`id`&quot;:&quot;= 9&quot;}" /> </td>'
)
);
$this->object->__set('_vertical_display', $vertical_display);
$_SESSION['tmp_user_values']['repeat_cells'] = 0;
$this->assertEquals(
$output,
$this->_callPrivateFunction(
'_getCheckBoxesForMultipleRowOperations',
array($dir)
),
$output
)
);
}
@ -731,8 +733,8 @@ class PMA_DisplayResults_test extends PHPUnit_Framework_TestCase
{
$_SESSION['tmp_user_values']['max_rows'] = PMA_DisplayResults::ALL_ROWS;
$this->assertEquals(
$this->_callPrivateFunction('_getOffsets', array()),
array(0, 0)
array(0, 0),
$this->_callPrivateFunction('_getOffsets', array())
);
}
@ -744,8 +746,8 @@ class PMA_DisplayResults_test extends PHPUnit_Framework_TestCase
$_SESSION['tmp_user_values']['max_rows'] = 5;
$_SESSION['tmp_user_values']['pos'] = 4;
$this->assertEquals(
$this->_callPrivateFunction('_getOffsets', array()),
array(9, 0)
array(9, 0),
$this->_callPrivateFunction('_getOffsets', array())
);
}
@ -772,10 +774,10 @@ class PMA_DisplayResults_test extends PHPUnit_Framework_TestCase
public function testGetSortParamsCase1($order_by_clause, $output)
{
$this->assertEquals(
$output,
$this->_callPrivateFunction(
'_getSortParams', array($order_by_clause)
),
$output
)
);
}
@ -809,10 +811,10 @@ class PMA_DisplayResults_test extends PHPUnit_Framework_TestCase
public function testGetSortParamsCase2($order_by_clause, $output)
{
$this->assertEquals(
$output,
$this->_callPrivateFunction(
'_getSortParams', array($order_by_clause)
),
$output
)
);
}
@ -869,14 +871,14 @@ class PMA_DisplayResults_test extends PHPUnit_Framework_TestCase
$del_query, $id_suffix, $class, $output
) {
$this->assertEquals(
$output,
$this->_callPrivateFunction(
'_getCheckboxForMultiRowSubmissions',
array(
$del_url, $is_display, $row_no, $where_clause_html,
$condition_array, $del_query, $id_suffix, $class
)
),
$output
)
);
}
@ -921,13 +923,13 @@ class PMA_DisplayResults_test extends PHPUnit_Framework_TestCase
$GLOBALS['cfg']['LinkLengthLimit'] = 1000;
$this->assertEquals(
$output,
$this->_callPrivateFunction(
'_getEditLink',
array(
$edit_url, $class, $edit_str, $where_clause, $where_clause_html
)
),
$output
)
);
}
@ -973,13 +975,13 @@ class PMA_DisplayResults_test extends PHPUnit_Framework_TestCase
$GLOBALS['cfg']['LinkLengthLimit'] = 1000;
$this->assertEquals(
$output,
$this->_callPrivateFunction(
'_getCopyLink',
array(
$copy_url, $copy_str, $where_clause, $where_clause_html, $class
)
),
$output
)
);
}
@ -1022,13 +1024,13 @@ class PMA_DisplayResults_test extends PHPUnit_Framework_TestCase
$GLOBALS['cfg']['LinkLengthLimit'] = 1000;
$this->assertEquals(
$output,
$this->_callPrivateFunction(
'_getDeleteLink',
array(
$del_url, $del_str, $js_conf, $class
)
),
$output
)
);
}
@ -1110,6 +1112,7 @@ class PMA_DisplayResults_test extends PHPUnit_Framework_TestCase
) {
$this->assertEquals(
$output,
$this->_callPrivateFunction(
'_getCheckboxAndLinks',
array(
@ -1118,8 +1121,7 @@ class PMA_DisplayResults_test extends PHPUnit_Framework_TestCase
$id_suffix, $edit_url, $copy_url, $class, $edit_str,
$copy_str, $del_str, $js_conf
)
),
$output
)
);
}
@ -1201,6 +1203,7 @@ class PMA_DisplayResults_test extends PHPUnit_Framework_TestCase
) {
$this->assertEquals(
$output,
$this->_callPrivateFunction(
'_getCheckboxAndLinks',
array(
@ -1209,8 +1212,7 @@ class PMA_DisplayResults_test extends PHPUnit_Framework_TestCase
$id_suffix, $edit_url, $copy_url, $class, $edit_str,
$copy_str, $del_str, $js_conf
)
),
$output
)
);
}
@ -1286,6 +1288,7 @@ class PMA_DisplayResults_test extends PHPUnit_Framework_TestCase
) {
$this->assertEquals(
$output,
$this->_callPrivateFunction(
'_getCheckboxAndLinks',
array(
@ -1294,8 +1297,7 @@ class PMA_DisplayResults_test extends PHPUnit_Framework_TestCase
$id_suffix, $edit_url, $copy_url, $class, $edit_str,
$copy_str, $del_str, $js_conf
)
),
$output
)
);
}
@ -1305,11 +1307,11 @@ class PMA_DisplayResults_test extends PHPUnit_Framework_TestCase
public function testMimeDefaultFunction()
{
$this->assertEquals(
"A 'quote' is &lt;b&gt;bold&lt;/b&gt;",
$this->_callPrivateFunction(
'_mimeDefaultFunction',
array("A 'quote' is <b>bold</b>")
),
"A 'quote' is &lt;b&gt;bold&lt;/b&gt;"
)
);
}
@ -1383,6 +1385,7 @@ class PMA_DisplayResults_test extends PHPUnit_Framework_TestCase
$edit_anchor_class, $edit_str, $copy_str, $del_str, $js_conf, $output
) {
$this->assertEquals(
$output,
$this->_callPrivateFunction(
'_getPlacedLinks',
array(
@ -1391,8 +1394,7 @@ class PMA_DisplayResults_test extends PHPUnit_Framework_TestCase
$dir_letter, $edit_url, $copy_url, $edit_anchor_class,
$edit_str, $copy_str, $del_str, $js_conf
)
),
$output
)
);
}

46
test/classes/PMA_Error_test.php
View File

@ -29,7 +29,10 @@ class PMA_Error_test extends PHPUnit_Framework_TestCase
*/
protected function setUp()
{
$this->object = $this->getMockForAbstractClass('PMA_Error', array('2', 'Compile Error', 'error.txt', 15));
$this->object = $this->getMockForAbstractClass(
'PMA_Error',
array('2', 'Compile Error', 'error.txt', 15)
);
}
/**
@ -47,7 +50,8 @@ class PMA_Error_test extends PHPUnit_Framework_TestCase
/**
* Test for setBacktrace
*/
public function testSetBacktrace(){
public function testSetBacktrace()
{
$this->object->setBacktrace(array('bt1','bt2'));
$this->assertEquals(array('bt1','bt2'), $this->object->getBacktrace());
}
@ -55,7 +59,8 @@ class PMA_Error_test extends PHPUnit_Framework_TestCase
/**
* Test for setLine
*/
public function testSetLine(){
public function testSetLine()
{
$this->object->setLine(15);
$this->assertEquals(15, $this->object->getLine());
}
@ -63,43 +68,58 @@ class PMA_Error_test extends PHPUnit_Framework_TestCase
/**
* Test for setFile
*/
public function testSetFile(){
public function testSetFile()
{
$this->object->setFile('./pma.txt');
$this->assertEquals('./../../../../..', $this->object->getFile());
$this->assertStringStartsWith('./../../', $this->object->getFile());
}
/**
* Test for getHash
*/
public function testGetHash(){
$this->assertEquals(1, preg_match('/^([a-z0-9]*)$/', $this->object->getHash()));
public function testGetHash()
{
$this->assertEquals(
1,
preg_match('/^([a-z0-9]*)$/', $this->object->getHash())
);
}
/**
* Test for getBacktraceDisplay
*/
public function testGetBacktraceDisplay(){
$this->assertTrue((strpos($this->object->getBacktraceDisplay(),'/usr/share/php/PHPUnit/Framework/TestCase.php#751: PHPUnit_Framework_TestResult->run(object)<br />') !== false));
public function testGetBacktraceDisplay()
{
$this->assertContains(
'PHPUnit/Framework/TestCase.php#751: PHPUnit_Framework_TestResult->run(object)<br />',
$this->object->getBacktraceDisplay()
);
}
/**
* Test for getDisplay
*/
public function testGetDisplay(){
$this->assertTrue((strpos($this->object->getDisplay(),'<div class="error"><strong>Warning</strong>') !== false));
public function testGetDisplay()
{
$this->assertContains(
'<div class="error"><strong>Warning</strong>',
$this->object->getDisplay()
);
}
/**
* Test for getHtmlTitle
*/
public function testGetHtmlTitle(){
public function testGetHtmlTitle()
{
$this->assertEquals('Warning: Compile Error', $this->object->getHtmlTitle());
}
/**
* Test for getTitle
*/
public function testGetTitle(){
public function testGetTitle()
{
$this->assertEquals('Warning: Compile Error', $this->object->getTitle());
}
}

11
test/classes/PMA_PDF_test.php
View File

@ -12,13 +12,16 @@
require_once 'libraries/CommonFunctions.class.php';
require_once 'libraries/PDF.class.php';
require_once 'libraries/php-gettext/gettext.inc';
if (!defined('PMA_VERSION')) {
define('PMA_VERSION', 'TEST');
}
require_once 'libraries/core.lib.php';
require_once 'libraries/Config.class.php';
class PMA_PDF_test extends PHPUnit_Framework_TestCase
{
public function setup()
{
$GLOBALS['PMA_Config'] = new PMA_Config();
$GLOBALS['PMA_Config']->enableBc();
}
/**
* @group large
*/

139
test/classes/gis/PMA_GIS_Geometrycollection_test.php
View File

@ -49,15 +49,19 @@ class PMA_GIS_Geometrycollection_test extends PHPUnit_Framework_TestCase
}
/**
* Test for scaleRow
*
* @param type $spatial
* @param string $spatial string to parse
* @param array $output expected parsed output
*
* @return void
*
* @dataProvider providerForScaleRow
*/
public function testScaleRow($spatial, $output)
{
$this->assertEquals($this->object->scaleRow($spatial), $output);
$this->assertEquals($output, $this->object->scaleRow($spatial));
}
public function providerForScaleRow()
@ -77,18 +81,24 @@ class PMA_GIS_Geometrycollection_test extends PHPUnit_Framework_TestCase
}
/**
* Test for generateWkt
*
* @param type $gis_data
* @param type $index
* @param string $empty
* @param type $output
* @param array $gis_data array of GIS data
* @param integer $index index in $gis_data
* @param string $empty empty parameter
* @param string $output expected output
*
* @return void
*
* @dataProvider providerForGenerateWkt
*/
public function testGenerateWkt($gis_data, $index, $empty, $output)
{
$this->assertEquals($this->object->generateWkt($gis_data, $index, $empty = ''), $output);
$this->assertEquals(
$output,
$this->object->generateWkt($gis_data, $index, $empty = '')
);
}
public function providerForGenerateWkt()
@ -116,15 +126,19 @@ class PMA_GIS_Geometrycollection_test extends PHPUnit_Framework_TestCase
}
/**
* @param $value
* @param $output
* Test for generateParams
*
* @param string $value string to parse
* @param array $output expected parsed output
*
* @return void
*
* @dataProvider providerForGenerateParams
*/
public function testGenerateParams($value, $output)
{
$this->assertEquals($this->object->generateParams($value), $output);
$this->assertEquals($output, $this->object->generateParams($value));
}
public function providerForGenerateParams()
@ -158,21 +172,28 @@ class PMA_GIS_Geometrycollection_test extends PHPUnit_Framework_TestCase
}
/**
* Test for prepareRowAsPng
*
* @param type $spatial
* @param type $label
* @param type $line_color
* @param type $scale_data
* @param type $image
* @param type $output
* @param string $spatial string to parse
* @param string $label field label
* @param string $line_color line color
* @param array $scale_data scaling parameters
* @param resource $image initial image
* @param string $output expected output
*
* @return void
*
* @dataProvider providerForPrepareRowAsPng
*/
public function testPrepareRowAsPng($spatial, $label, $line_color, $scale_data, $image, $output)
{
public function testPrepareRowAsPng(
$spatial, $label, $line_color, $scale_data, $image, $output
) {
$return = $this->object->prepareRowAsPng($spatial, $label, $line_color, $scale_data, $image);
$this->assertTrue(true);
$return = $this->object->prepareRowAsPng(
$spatial, $label, $line_color, $scale_data, $image
);
$this->assertEquals(120, imagesx($return));
$this->assertEquals(150, imagesy($return));
}
public function providerForPrepareRowAsPng()
@ -196,19 +217,25 @@ class PMA_GIS_Geometrycollection_test extends PHPUnit_Framework_TestCase
}
/**
* Test for prepareRowAsPdf
*
* @param type $spatial
* @param type $label
* @param type $line_color
* @param type $scale_data
* @param type $pdf
* @param string $spatial string to parse
* @param string $label field label
* @param string $line_color line color
* @param array $scale_data scaling parameters
* @param string $pdf expected output
*
* @return void
*
* @dataProvider providerForPrepareRowAsPdf
*/
public function testPrepareRowAsPdf($spatial, $label, $line_color, $scale_data, $pdf)
{
public function testPrepareRowAsPdf(
$spatial, $label, $line_color, $scale_data, $pdf
) {
$return = $this->object->prepareRowAsPdf($spatial, $label, $line_color, $scale_data, $pdf);
$return = $this->object->prepareRowAsPdf(
$spatial, $label, $line_color, $scale_data, $pdf
);
$this->assertTrue($return instanceof TCPDF);
}
@ -232,21 +259,32 @@ class PMA_GIS_Geometrycollection_test extends PHPUnit_Framework_TestCase
}
/**
* Test for prepareRowAsSvg
*
* @param type $spatial
* @param type $label
* @param type $line_color
* @param type $scale_data
* @param type $output
* @param string $spatial string to parse
* @param string $label field label
* @param string $line_color line color
* @param array $scale_data scaling parameters
* @param string $output expected output
*
* @return void
*
* @dataProvider providerForPrepareRowAsSvg
*/
public function testPrepareRowAsSvg($spatial, $label, $line_color, $scale_data, $output)
{
public function testPrepareRowAsSvg(
$spatial, $label, $line_color, $scale_data, $output
) {
$string = $this->object->prepareRowAsSvg($spatial, $label, $line_color, $scale_data);
$string = $this->object->prepareRowAsSvg(
$spatial, $label, $line_color, $scale_data
);
$this->assertEquals(1, preg_match($output, $string));
// $this->assertEquals($this->object->prepareRowAsSvg($spatial, $label, $line_color, $scale_data) , $output);
$this->assertRegExp(
$output,
$this->object->prepareRowAsSvg(
$spatial, $label, $line_color, $scale_data
)
);
}
public function providerForPrepareRowAsSvg()
@ -269,20 +307,29 @@ class PMA_GIS_Geometrycollection_test extends PHPUnit_Framework_TestCase
}
/**
* Test for prepareRowAsOl
*
* @param type $spatial
* @param type $srid
* @param type $label
* @param type $line_color
* @param type $scale_data
* @param type $output
* @param string $spatial string to parse
* @param integer $srid SRID
* @param string $label field label
* @param string $line_color line color
* @param array $scale_data scaling parameters
* @param string $output expected output
*
* @return void
*
* @dataProvider providerForPrepareRowAsOl
*/
public function testPrepareRowAsOl($spatial, $srid, $label, $line_color, $scale_data, $output)
{
public function testPrepareRowAsOl(
$spatial, $srid, $label, $line_color, $scale_data, $output
) {
$this->assertEquals($this->object->prepareRowAsOl($spatial, $srid, $label, $line_color, $scale_data), $output);
$this->assertEquals(
$output,
$this->object->prepareRowAsOl(
$spatial, $srid, $label, $line_color, $scale_data
)
);
}
public function providerForPrepareRowAsOl()

30
test/libraries/common/PMA_expandUserString_test.php
View File

@ -12,22 +12,25 @@
*/
require_once 'libraries/core.lib.php';
require_once 'libraries/CommonFunctions.class.php';
if (!defined('PMA_VERSION')) {
define('PMA_VERSION', 'TEST');
}
require_once 'libraries/Config.class.php';
/**
* Test for PMA_CommonFunctions::expandUserString function.
*
* @package PhpMyAdmin-test
*/
class PMA_expandUserString_test extends PHPUnit_Framework_TestCase
{
/**
* Setup variables needed by test.
*
* @return void
*/
public function setup()
{
$GLOBALS['PMA_Config'] = new PMA_Config();
$GLOBALS['PMA_Config']->enableBc();
$GLOBALS['cfg'] = array(
'Server' => array(
'host' => 'host&',
@ -40,10 +43,16 @@ class PMA_expandUserString_test extends PHPUnit_Framework_TestCase
/**
* Test case for expanding strings
*
* @param string $in string to evaluate
* @param string $out expected output
*
* @return void
*
* @dataProvider provider
*/
public function testExpand($in, $out)
{
$out = str_replace('PMA_VERSION', PMA_VERSION, $out);
$this->assertEquals(
$out, PMA_CommonFunctions::getInstance()->expandUserString($in)
);
@ -52,14 +61,21 @@ class PMA_expandUserString_test extends PHPUnit_Framework_TestCase
/**
* Test case for expanding strings with escaping
*
* @param string $in string to evaluate
* @param string $out expected output
*
* @return void
*
* @dataProvider provider
*/
public function testExpandEscape($in, $out)
{
$out = str_replace('PMA_VERSION', PMA_VERSION, $out);
$this->assertEquals(
htmlspecialchars($out),
PMA_CommonFunctions::getInstance()
->expandUserString($in, 'htmlspecialchars')
PMA_CommonFunctions::getInstance()->expandUserString(
$in, 'htmlspecialchars'
)
);
}
@ -76,7 +92,7 @@ class PMA_expandUserString_test extends PHPUnit_Framework_TestCase
array('@DATABASE@', 'database'),
array('@TABLE@', 'table'),
array('@IGNORE@', '@IGNORE@'),
array('@PHPMYADMIN@', 'phpMyAdmin ' . PMA_VERSION),
array('@PHPMYADMIN@', 'phpMyAdmin PMA_VERSION'),
);
}
}

7
test/libraries/core/PMA_headerLocation_test_disabled.php → test/libraries/core/PMA_headerLocation_test.php
View File

@ -20,6 +20,7 @@ require_once 'libraries/url_generating.lib.php';
require_once 'libraries/Theme.class.php';
require_once 'libraries/Table.class.php';
require_once 'libraries/php-gettext/gettext.inc';
require_once 'libraries/Response.class.php';
/**
* Test function sending headers.
@ -286,10 +287,10 @@ class PMA_headerLocation_test extends PHPUnit_Framework_TestCase
$url = './navigation.php?'.PMA_generate_common_url($GLOBALS['db'], '', '&');
$write = '<script type="text/javascript">' . PHP_EOL .
'//<![CDATA[' . PHP_EOL .
'if (typeof(window.parent) != \'undefined\'' . PHP_EOL .
' && typeof(window.parent.frame_navigation) != \'undefined\'' . PHP_EOL .
'if (typeof(window.parent) != "undefined"' . PHP_EOL .
' && typeof(window.parent.frame_navigation) != "undefined"' . PHP_EOL .
' && window.parent.goTo) {' . PHP_EOL .
' window.parent.goTo(\'' . $url . '\');' . PHP_EOL .
' window.parent.goTo("' . $url . '");' . PHP_EOL .
'}' . PHP_EOL .
'//]]>' . PHP_EOL .
'</script>' . PHP_EOL;

68
themes/original/css/common.css.php
View File

@ -475,7 +475,7 @@ div.error {
h1.success,
div.success {
border-color: #00FF00;
background-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_success.png);
background-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath('s_success.png');?>);
background-repeat: no-repeat;
<?php if ($GLOBALS['text_dir'] === 'ltr') { ?>
background-position: 5px 50%;
@ -496,7 +496,7 @@ div.success {
h1.notice,
div.notice {
border-color: #FFD700;
background-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_notice.png);
background-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath('s_notice.png');?>);
background-repeat: no-repeat;
<?php if ($GLOBALS['text_dir'] === 'ltr') { ?>
background-position: 5px 50%;
@ -518,7 +518,7 @@ div.notice {
h1.error,
div.error {
border-color: #ff0000;
background-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_error.png);
background-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath('s_error.png');?>);
background-repeat: no-repeat;
<?php if ($GLOBALS['text_dir'] === 'ltr') { ?>
background-position: 5px 50%;
@ -542,7 +542,7 @@ fieldset.confirmation legend {
border-left: 0.1em solid #FF0000;
border-right: 0.1em solid #FF0000;
font-weight: bold;
background-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_really.png);
background-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath('s_really.png');?>);
background-repeat: no-repeat;
<?php if ($GLOBALS['text_dir'] === 'ltr') { ?>
background-position: 5px 50%;
@ -830,7 +830,7 @@ ul#topmenu > li.active {
/* disabled tabs */
ul#topmenu span.tab,
a.error {
cursor: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>error.ico), default;
cursor: url(<?php echo $_SESSION['PMA_Theme']->getImgPath('error.ico');?>), default;
}
/* end topmenu */
@ -1244,7 +1244,7 @@ div#queryboxcontainer div#bookmarkoptions {
/* main page */
#maincontainer {
background-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>logo_right.png);
background-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath('logo_right.png');?>);
background-position: <?php echo $right; ?> bottom;
background-repeat: no-repeat;
}
@ -1268,83 +1268,83 @@ div#queryboxcontainer div#bookmarkoptions {
/* iconic view for ul items */
li#li_create_database {
list-style-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>b_newdb.png);
list-style-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath('b_newdb.png');?>);
}
li#li_select_lang {
list-style-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_lang.png);
list-style-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath('s_lang.png');?>);
}
li#li_select_mysql_collation {
list-style-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_asci.png);
list-style-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath('s_asci.png');?>);
}
li#li_select_theme {
list-style-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_theme.png);
list-style-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath('s_theme.png');?>);
}
li#li_user_info {
/* list-style-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_rights.png); */
/* list-style-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath('s_rights.png');?>); */
}
li#li_mysql_status {
list-style-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_status.png);
list-style-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath('s_status.png');?>);
}
li#li_mysql_variables {
list-style-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_vars.png);
list-style-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath('s_vars.png');?>);
}
li#li_mysql_processes {
list-style-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_process.png);
list-style-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath('s_process.png');?>);
}
li#li_mysql_collations {
list-style-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_asci.png);
list-style-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath('s_asci.png');?>);
}
li#li_mysql_engines {
list-style-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>b_engine.png);
list-style-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath('b_engine.png');?>);
}
li#li_mysql_binlogs {
list-style-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_tbl.png);
list-style-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath('s_tbl.png');?>);
}
li#li_mysql_databases {
list-style-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_db.png);
list-style-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath('s_db.png');?>);
}
li#li_export {
list-style-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>b_export.png);
list-style-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath('b_export.png');?>);
}
li#li_import {
list-style-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>b_import.png);
list-style-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath('b_import.png');?>);
}
li#li_change_password {
list-style-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_passwd.png);
list-style-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath('s_passwd.png');?>);
}
li#li_log_out {
list-style-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_loggoff.png);
list-style-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath('s_loggoff.png');?>);
}
li#li_mysql_privilegs {
list-style-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_rights.png);
list-style-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath('s_rights.png');?>);
}
li#li_switch_dbstats {
list-style-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>b_dbstatistics.png);
list-style-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath('b_dbstatistics.png');?>);
}
li#li_flush_privileges {
list-style-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_reload.png);
list-style-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath('s_reload.png');?>);
}
li#li_user_preferences {
list-style-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>b_tblops.png);
list-style-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath('b_tblops.png');?>);
}
/* END iconic view for ul items */
@ -1476,7 +1476,7 @@ textarea#partitiondefinition {
}
#li_select_server {
list-style-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_host.png);
list-style-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath('s_host.png');?>);
}
#list_server {
@ -1563,7 +1563,7 @@ input[type=text].invalid_value,
display: block;
left: 0;
right: 0;
background-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>ajax_clock_small.gif);
background-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath('ajax_clock_small.gif');?>);
background-repeat: no-repeat;
background-position: 2%;
}
@ -2165,7 +2165,7 @@ fieldset .disabled-field td {
}
.cPointer {
background: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>col_pointer.png);
background: url(<?php echo $_SESSION['PMA_Theme']->getImgPath('col_pointer.png');?>);
height: 20px;
margin-left: -5px; /* must be minus half of its width */
margin-top: -10px;
@ -2199,7 +2199,7 @@ fieldset .disabled-field td {
width: 100%;
}
.cHide {
background: #D3DCE3 url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>col_hide.png);
background: #D3DCE3 url(<?php echo $_SESSION['PMA_Theme']->getImgPath('col_hide.png');?>);
color: #CCC;
cursor: pointer;
height: 16px;
@ -2220,7 +2220,7 @@ fieldset .disabled-field td {
}
.coldrop {
background: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>col_drop.png);
background: url(<?php echo $_SESSION['PMA_Theme']->getImgPath('col_drop.png');?>);
cursor: pointer;
height: 16px;
margin-left: 0.5em;
@ -2344,12 +2344,12 @@ fieldset .disabled-field td {
}
.cEdit .edit_box_posting {
background: #FFF url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>ajax_clock_small.gif) no-repeat right center;
background: #FFF url(<?php echo $_SESSION['PMA_Theme']->getImgPath('ajax_clock_small.gif');?>) no-repeat right center;
padding-right: 1.5em;
}
.cEdit .edit_area_loading {
background: #FFF url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>ajax_clock_small.gif) no-repeat center;
background: #FFF url(<?php echo $_SESSION['PMA_Theme']->getImgPath('ajax_clock_small.gif');?>) no-repeat center;
height: 10em;
}
@ -2360,7 +2360,7 @@ fieldset .disabled-field td {
}
.saving_edited_data {
background: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>ajax_clock_small.gif) no-repeat left;
background: url(<?php echo $_SESSION['PMA_Theme']->getImgPath('ajax_clock_small.gif');?>) no-repeat left;
padding-left: 20px;
}

66
themes/pmahomme/css/common.css.php
View File

@ -709,7 +709,7 @@ div.error {
h1.success,
div.success {
border-color: #a2d246;
background-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_success.png);
background-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath('s_success.png');?>);
background-repeat: no-repeat;
<?php if ($GLOBALS['text_dir'] === 'ltr') { ?>
background-position: 5px 50%;
@ -729,7 +729,7 @@ div.success {
h1.notice,
div.notice {
border-color: #3a6c7e;
background-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_notice.png);
background-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath('s_notice.png');?>);
background-repeat: no-repeat;
<?php if ($GLOBALS['text_dir'] === 'ltr') { ?>
background-position: 5px 50%;
@ -751,7 +751,7 @@ div.notice {
h1.error,
div.error {
border-color: #333;
background-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_error.png);
background-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath('s_error.png');?>);
background-repeat: no-repeat;
<?php if ($GLOBALS['text_dir'] === 'ltr') { ?>
background-position: 5px 50%;
@ -1076,7 +1076,7 @@ ul#topmenu > li.active {
/* disabled tabs */
ul#topmenu span.tab,
a.error {
cursor: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>error.ico), default;
cursor: url(<?php echo $_SESSION['PMA_Theme']->getImgPath('error.ico');?>), default;
color: #ccc;
}
/* end topmenu */
@ -1610,7 +1610,7 @@ div#queryboxcontainer div#bookmarkoptions {
/* main page */
#maincontainer {
/* background-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>logo_right.png); */
/* background-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath('logo_right.png');?>); */
/* background-position: <?php echo $right; ?> bottom; */
/* background-repeat: no-repeat; */
}
@ -1634,83 +1634,83 @@ div#queryboxcontainer div#bookmarkoptions {
/* iconic view for ul items */
li#li_create_database {
list-style-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>b_newdb.png);
list-style-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath('b_newdb.png');?>);
}
li#li_select_lang {
list-style-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_lang.png);
list-style-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath('s_lang.png');?>);
}
li#li_select_mysql_collation {
list-style-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_asci.png);
list-style-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath('s_asci.png');?>);
}
li#li_select_theme {
list-style-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_theme.png);
list-style-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath('s_theme.png');?>);
}
li#li_user_info {
/* list-style-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_rights.png); */
/* list-style-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath('s_rights.png');?>); */
}
li#li_mysql_status {
list-style-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_status.png);
list-style-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath('s_status.png');?>);
}
li#li_mysql_variables {
list-style-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_vars.png);
list-style-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath('s_vars.png');?>);
}
li#li_mysql_processes {
list-style-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_process.png);
list-style-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath('s_process.png');?>);
}
li#li_mysql_collations {
list-style-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_asci.png);
list-style-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath('s_asci.png');?>);
}
li#li_mysql_engines {
list-style-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>b_engine.png);
list-style-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath('b_engine.png');?>);
}
li#li_mysql_binlogs {
list-style-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_tbl.png);
list-style-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath('s_tbl.png');?>);
}
li#li_mysql_databases {
list-style-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_db.png);
list-style-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath('s_db.png');?>);
}
li#li_export {
list-style-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>b_export.png);
list-style-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath('b_export.png');?>);
}
li#li_import {
list-style-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>b_import.png);
list-style-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath('b_import.png');?>);
}
li#li_change_password {
list-style-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_passwd.png);
list-style-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath('s_passwd.png');?>);
}
li#li_log_out {
list-style-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_loggoff.png);
list-style-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath('s_loggoff.png');?>);
}
li#li_mysql_privilegs {
list-style-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_rights.png);
list-style-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath('s_rights.png');?>);
}
li#li_switch_dbstats {
list-style-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>b_dbstatistics.png);
list-style-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath('b_dbstatistics.png');?>);
}
li#li_flush_privileges {
list-style-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_reload.png);
list-style-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath('s_reload.png');?>);
}
li#li_user_preferences {
list-style-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>b_tblops.png);
list-style-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath('b_tblops.png');?>);
}
/* END iconic view for ul items */
@ -1858,7 +1858,7 @@ textarea#partitiondefinition {
}
#li_select_server {
list-style-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_host.png);
list-style-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath('s_host.png');?>);
}
#list_server {
@ -1945,7 +1945,7 @@ input[type=text].invalid_value,
display: inline;
left: 0;
right: 0;
background-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>ajax_clock_small.gif);
background-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath('ajax_clock_small.gif');?>);
background-repeat: no-repeat;
background-position: 2%;
border: 1px solid #e2b709;
@ -2630,7 +2630,7 @@ fieldset .disabled-field td {
}
.cPointer {
background: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>col_pointer.png);
background: url(<?php echo $_SESSION['PMA_Theme']->getImgPath('col_pointer.png');?>);
height: 20px;
margin-left: -5px; /* must be minus half of its width */
margin-top: -10px;
@ -2660,7 +2660,7 @@ fieldset .disabled-field td {
}
.cHide {
background: #EEE url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>col_hide.png);
background: #EEE url(<?php echo $_SESSION['PMA_Theme']->getImgPath('col_hide.png');?>);
color: #CCC;
cursor: pointer;
height: 16px;
@ -2681,7 +2681,7 @@ fieldset .disabled-field td {
}
.coldrop {
background: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>col_drop.png);
background: url(<?php echo $_SESSION['PMA_Theme']->getImgPath('col_drop.png');?>);
cursor: pointer;
height: 16px;
margin-left: .3em;
@ -2820,12 +2820,12 @@ fieldset .disabled-field td {
}
.cEdit .edit_box_posting {
background: #FFF url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>ajax_clock_small.gif) no-repeat right center;
background: #FFF url(<?php echo $_SESSION['PMA_Theme']->getImgPath('ajax_clock_small.gif');?>) no-repeat right center;
padding-right: 1.5em;
}
.cEdit .edit_area_loading {
background: #FFF url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>ajax_clock_small.gif) no-repeat center;
background: #FFF url(<?php echo $_SESSION['PMA_Theme']->getImgPath('ajax_clock_small.gif');?>) no-repeat center;
height: 10em;
}
@ -2836,7 +2836,7 @@ fieldset .disabled-field td {
}
.saving_edited_data {
background: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>ajax_clock_small.gif) no-repeat left;
background: url(<?php echo $_SESSION['PMA_Theme']->getImgPath('ajax_clock_small.gif');?>) no-repeat left;
padding-left: 20px;
}