Merge remote-tracking branch 'origin/master'
This commit is contained in:
Weblate
commit
599effd165
@ -220,10 +220,6 @@ class URL
|
||||
$params['collation_connection'] = $GLOBALS['collation_connection'];
|
||||
}
|
||||
|
||||
if (isset($_SESSION[' PMA_token '])) {
|
||||
$params['token'] = $_SESSION[' PMA_token '];
|
||||
}
|
||||
|
||||
if (empty($params)) {
|
||||
return '';
|
||||
}
|
||||
|
||||
@ -171,7 +171,7 @@ class AdvisorTest extends PMATestCase
|
||||
'name' => 'Variable',
|
||||
'issue' => 'issue',
|
||||
'recommendation' => 'Recommend <a href="server_variables.php?' .
|
||||
'lang=en&token=token&filter=status_var">status_var</a>'
|
||||
'lang=en&filter=status_var">status_var</a>'
|
||||
),
|
||||
null,
|
||||
),
|
||||
|
||||
@ -164,23 +164,23 @@ class DbSearchTest extends PMATestCase
|
||||
. 'href="sql.php?db=pma&table'
|
||||
. '=table1&goto=db_sql.php&pos=0&is_js_confirmed=0&'
|
||||
. 'sql_query=column1&server=0&lang=en&'
|
||||
. 'collation_connection=utf-8&token=token" '
|
||||
. 'collation_connection=utf-8" '
|
||||
. 'onclick="loadResult(\'sql.php?db=pma&table=table1&goto='
|
||||
. 'db_sql.php&pos=0&is_js_confirmed=0&sql_query=column1'
|
||||
. '&server=0&lang=en&collation_connection=utf-8'
|
||||
. '&token=token\',\'table1\',\'?db=pma'
|
||||
. '\',\'table1\',\'?db=pma'
|
||||
. '&table=table1&server=0&lang=en'
|
||||
. '&collation_connection=utf-8&token=token\');'
|
||||
. '&collation_connection=utf-8\');'
|
||||
. 'return false;" >Browse</a></td><td>'
|
||||
. '<a name="delete_search" class="ajax" href'
|
||||
. '="sql.php?db=pma&table=table1&goto=db_sql.php&pos=0'
|
||||
. '&is_js_confirmed=0&sql_query=column2&server=0&'
|
||||
. 'lang=en&collation_connection=utf-8&token=token"'
|
||||
. 'lang=en&collation_connection=utf-8"'
|
||||
. ' onclick="deleteResult(\'sql.php?db=pma'
|
||||
. '&table=table1&goto=db_sql.php&pos=0&is_js_'
|
||||
. 'confirmed=0&sql_query=column2&server=0&lang=en'
|
||||
. '&collation_connection=utf-8&'
|
||||
. 'token=token\' , \'Delete the matches for the table1 table?\');'
|
||||
. '&collation_connection=utf-8'
|
||||
. '\' , \'Delete the matches for the table1 table?\');'
|
||||
. 'return false;">Delete</a></td></tr>'
|
||||
)
|
||||
);
|
||||
|
||||
@ -357,8 +357,7 @@ class DisplayResultsTest extends PMATestCase
|
||||
. 'The+row+has+been+deleted&goto=sql.php%3Fdb%3Ddata%26table%3D'
|
||||
. 'new%26sql_query%3DSELECT%2B%252A%2BFROM%2B%2560new%2560%26message'
|
||||
. '_to_show%3DThe%2Brow%2Bhas%2Bbeen%2Bdeleted%26goto%3Dtbl_'
|
||||
. 'structure.php%26token%3Dd1aecb47ef7c081e068e7008b38a5d76&'
|
||||
. 'token=d1aecb47ef7c081e068e7008b38a5d76',
|
||||
. 'structure.php',
|
||||
array(
|
||||
'edit_lnk' => 'ur',
|
||||
'del_lnk' => 'dr',
|
||||
@ -428,7 +427,7 @@ class DisplayResultsTest extends PMATestCase
|
||||
'tbl_change.php?db=Data&table=customer&where_clause=%60'
|
||||
. 'customer%60.%60id%60+%3D+1&clause_is_unique=1&sql_query='
|
||||
. 'SELECT+%2A+FROM+%60customer%60&goto=sql.php&default_'
|
||||
. 'action=update&token=bbd5003198a3bd856b21d9607d6c6a1e',
|
||||
. 'action=update',
|
||||
'odd edit_row_anchor',
|
||||
'<span class="nowrap"><img src="themes/dot.gif" title="Edit" alt='
|
||||
. '"Edit" class="icon ic_b_edit" /> Edit</span>',
|
||||
@ -439,7 +438,7 @@ class DisplayResultsTest extends PMATestCase
|
||||
. '<a href="tbl_change.php?db=Data&table=customer&where_'
|
||||
. 'clause=%60customer%60.%60id%60+%3D+1&clause_is_unique=1&'
|
||||
. 'sql_query=SELECT+%2A+FROM+%60customer%60&goto=sql.php&'
|
||||
. 'default_action=update&token=bbd5003198a3bd856b21d9607d6c6a1e"'
|
||||
. 'default_action=update"'
|
||||
. ' ><span class="nowrap"><img src="themes/dot.gif" title="Edit" '
|
||||
. 'alt="Edit" class="icon ic_b_edit" /> Edit</span></a>' . "\n"
|
||||
. '<input type="hidden" class="where_clause" value ="%60customer'
|
||||
@ -491,7 +490,7 @@ class DisplayResultsTest extends PMATestCase
|
||||
'tbl_change.php?db=Data&table=customer&where_clause=%60cust'
|
||||
. 'omer%60.%60id%60+%3D+1&clause_is_unique=1&sql_query='
|
||||
. 'SELECT+%2A+FROM+%60customer%60&goto=sql.php&default_'
|
||||
. 'action=insert&token=f597309d3a066c3c81a6cb015a79636d',
|
||||
. 'action=insert',
|
||||
'<span class="nowrap"><img src="themes/dot.gif" title="Copy" alt'
|
||||
. '="Copy" class="icon ic_b_insrow" /> Copy</span>',
|
||||
'`customer`.`id` = 1',
|
||||
@ -502,7 +501,7 @@ class DisplayResultsTest extends PMATestCase
|
||||
. '<a href="tbl_change.php?db=Data&table=customer&where_'
|
||||
. 'clause=%60customer%60.%60id%60+%3D+1&clause_is_unique=1&'
|
||||
. 'sql_query=SELECT+%2A+FROM+%60customer%60&goto=sql.php&'
|
||||
. 'default_action=insert&token=f597309d3a066c3c81a6cb015a79636d"'
|
||||
. 'default_action=insert"'
|
||||
. ' ><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="%60customer%60'
|
||||
@ -556,8 +555,7 @@ class DisplayResultsTest extends PMATestCase
|
||||
. 'message_to_show=The+row+has+been+deleted&goto=sql.php%3Fdb'
|
||||
. '%3DData%26table%3Dcustomer%26sql_query%3DSELECT%2B%252A%2BFROM'
|
||||
. '%2B%2560customer%2560%26message_to_show%3DThe%2Brow%2Bhas%2Bbeen'
|
||||
. '%2Bdeleted%26goto%3Dtbl_structure.php%26token%3Df597309d3a066c3'
|
||||
. 'c81a6cb015a79636d&token=f597309d3a066c3c81a6cb015a79636d',
|
||||
. '%2Bdeleted%26goto%3Dtbl_structure.php',
|
||||
'<span class="nowrap"><img src="themes/dot.gif" title="Delete" '
|
||||
. 'alt="Delete" class="icon ic_b_drop" /> Delete</span>',
|
||||
'DELETE FROM `Data`.`customer` WHERE `customer`.`id` = 1',
|
||||
@ -568,8 +566,7 @@ class DisplayResultsTest extends PMATestCase
|
||||
. '+1&message_to_show=The+row+has+been+deleted&goto=sql.php'
|
||||
. '%3Fdb%3DData%26table%3Dcustomer%26sql_query%3DSELECT%2B%252A%2B'
|
||||
. 'FROM%2B%2560customer%2560%26message_to_show%3DThe%2Brow%2Bhas%2B'
|
||||
. 'been%2Bdeleted%26goto%3Dtbl_structure.php%26token%3Df597309d3a06'
|
||||
. '6c3c81a6cb015a79636d&token=f597309d3a066c3c81a6cb015a79636d" '
|
||||
. 'been%2Bdeleted%26goto%3Dtbl_structure.php" '
|
||||
. 'class="delete_row requireConfirm"><span class="nowrap"><img src="themes/dot.'
|
||||
. 'gif" title="Delete" alt="Delete" class="icon ic_b_drop" /> '
|
||||
. 'Delete</span></a>' . "\n"
|
||||
@ -624,8 +621,7 @@ class DisplayResultsTest extends PMATestCase
|
||||
. 'The+row+has+been+deleted&goto=sql.php%3Fdb%3Ddata%26table%3D'
|
||||
. 'new%26sql_query%3DSELECT%2B%252A%2BFROM%2B%2560new%2560%26'
|
||||
. 'message_to_show%3DThe%2Brow%2Bhas%2Bbeen%2Bdeleted%26goto%3D'
|
||||
. 'tbl_structure.php%26token%3Dae4c6d18375f446dfa068420c1f6a4e8'
|
||||
. '&token=ae4c6d18375f446dfa068420c1f6a4e8',
|
||||
. 'tbl_structure.php',
|
||||
array(
|
||||
'edit_lnk' => 'ur',
|
||||
'del_lnk' => 'dr',
|
||||
@ -643,12 +639,10 @@ class DisplayResultsTest extends PMATestCase
|
||||
),
|
||||
'tbl_change.php?db=data&table=new&where_clause=%60new%60.'
|
||||
. '%60id%60+%3D+1&clause_is_unique=1&sql_query=SELECT+%2A+'
|
||||
. 'FROM+%60new%60&goto=sql.php&default_action=update&'
|
||||
. 'token=ae4c6d18375f446dfa068420c1f6a4e8',
|
||||
. 'FROM+%60new%60&goto=sql.php&default_action=update',
|
||||
'tbl_change.php?db=data&table=new&where_clause=%60new%60.'
|
||||
. '%60id%60+%3D+1&clause_is_unique=1&sql_query=SELECT+%2A+'
|
||||
. 'FROM+%60new%60&goto=sql.php&default_action=insert&'
|
||||
. 'token=ae4c6d18375f446dfa068420c1f6a4e8',
|
||||
. 'FROM+%60new%60&goto=sql.php&default_action=insert',
|
||||
'edit_row_anchor',
|
||||
'<span class="nowrap"><img src="themes/dot.gif" title="Edit" '
|
||||
. 'alt="Edit" class="icon ic_b_edit" /> Edit</span>',
|
||||
@ -666,7 +660,7 @@ class DisplayResultsTest extends PMATestCase
|
||||
. '<a href="tbl_change.php?db=data&table=new&where_'
|
||||
. 'clause=%60new%60.%60id%60+%3D+1&clause_is_unique=1&'
|
||||
. 'sql_query=SELECT+%2A+FROM+%60new%60&goto=sql.php&default'
|
||||
. '_action=update&token=ae4c6d18375f446dfa068420c1f6a4e8" >'
|
||||
. '_action=update" >'
|
||||
. '<span class="nowrap"><img src="themes/dot.gif" title="Edit" '
|
||||
. 'alt="Edit" class="icon ic_b_edit" /> Edit</span></a>' . "\n"
|
||||
. '<input type="hidden" class="where_clause" value ="%60new%60.%60'
|
||||
@ -675,7 +669,7 @@ class DisplayResultsTest extends PMATestCase
|
||||
. '<a href="tbl_change.php?db=data&table=new&where_clause'
|
||||
. '=%60new%60.%60id%60+%3D+1&clause_is_unique=1&sql_query='
|
||||
. 'SELECT+%2A+FROM+%60new%60&goto=sql.php&default_action='
|
||||
. 'insert&token=ae4c6d18375f446dfa068420c1f6a4e8" ><span class'
|
||||
. 'insert" ><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="%60new%60.%60id'
|
||||
@ -685,8 +679,7 @@ class DisplayResultsTest extends PMATestCase
|
||||
. 'message_to_show=The+row+has+been+deleted&goto=sql.php%3F'
|
||||
. 'db%3Ddata%26table%3Dnew%26sql_query%3DSELECT%2B%252A%2BFROM%2B'
|
||||
. '%2560new%2560%26message_to_show%3DThe%2Brow%2Bhas%2Bbeen%2B'
|
||||
. 'deleted%26goto%3Dtbl_structure.php%26token%3Dae4c6d18375f446d'
|
||||
. 'fa068420c1f6a4e8&token=ae4c6d18375f446dfa068420c1f6a4e8" '
|
||||
. 'deleted%26goto%3Dtbl_structure.php" '
|
||||
. 'class="delete_row requireConfirm"><span class="nowrap"><img src="themes/dot.'
|
||||
. 'gif" title="Delete" alt="Delete" class="icon ic_b_drop" /> '
|
||||
. 'Delete</span></a>' . "\n"
|
||||
@ -700,8 +693,7 @@ class DisplayResultsTest extends PMATestCase
|
||||
. 'The+row+has+been+deleted&goto=sql.php%3Fdb%3Ddata%26table%3D'
|
||||
. 'new%26sql_query%3DSELECT%2B%252A%2BFROM%2B%2560new%2560%26message'
|
||||
. '_to_show%3DThe%2Brow%2Bhas%2Bbeen%2Bdeleted%26goto%3Dtbl_'
|
||||
. 'structure.php%26token%3Dae4c6d18375f446dfa068420c1f6a4e8&'
|
||||
. 'token=ae4c6d18375f446dfa068420c1f6a4e8',
|
||||
. 'structure.php',
|
||||
array(
|
||||
'edit_lnk' => 'ur',
|
||||
'del_lnk' => 'dr',
|
||||
@ -719,12 +711,10 @@ class DisplayResultsTest extends PMATestCase
|
||||
),
|
||||
'tbl_change.php?db=data&table=new&where_clause=%60new%60.'
|
||||
. '%60id%60+%3D+1&clause_is_unique=1&sql_query=SELECT+%2A+'
|
||||
. 'FROM+%60new%60&goto=sql.php&default_action=update&'
|
||||
. 'token=ae4c6d18375f446dfa068420c1f6a4e8',
|
||||
. 'FROM+%60new%60&goto=sql.php&default_action=update',
|
||||
'tbl_change.php?db=data&table=new&where_clause=%60new%60.'
|
||||
. '%60id%60+%3D+1&clause_is_unique=1&sql_query=SELECT+%2A+'
|
||||
. 'FROM+%60new%60&goto=sql.php&default_action=insert&'
|
||||
. 'token=ae4c6d18375f446dfa068420c1f6a4e8',
|
||||
. 'FROM+%60new%60&goto=sql.php&default_action=insert',
|
||||
'edit_row_anchor',
|
||||
'<span class="nowrap"><img src="themes/dot.gif" title="Edit" '
|
||||
. 'alt="Edit" class="icon ic_b_edit" /> Edit</span>',
|
||||
@ -739,8 +729,7 @@ class DisplayResultsTest extends PMATestCase
|
||||
. 'message_to_show=The+row+has+been+deleted&goto=sql.php%3Fdb'
|
||||
. '%3Ddata%26table%3Dnew%26sql_query%3DSELECT%2B%252A%2BFROM%2B%25'
|
||||
. '60new%2560%26message_to_show%3DThe%2Brow%2Bhas%2Bbeen%2Bdeleted'
|
||||
. '%26goto%3Dtbl_structure.php%26token%3Dae4c6d18375f446dfa068420c'
|
||||
. '1f6a4e8&token=ae4c6d18375f446dfa068420c1f6a4e8" class="delete'
|
||||
. '%26goto%3Dtbl_structure.php" class="delete'
|
||||
. '_row requireConfirm"><span class="nowrap"><img src="themes/dot.gif" title='
|
||||
. '"Delete" alt="Delete" class="icon ic_b_drop" /> Delete</span></a>'
|
||||
. "\n" . '<div class="hide">DELETE FROM `data`.`new` WHERE `new`.'
|
||||
@ -748,7 +737,7 @@ class DisplayResultsTest extends PMATestCase
|
||||
. "\n" . '<a href="tbl_change.php?db=data&table=new&where_'
|
||||
. 'clause=%60new%60.%60id%60+%3D+1&clause_is_unique=1&sql_'
|
||||
. 'query=SELECT+%2A+FROM+%60new%60&goto=sql.php&default_'
|
||||
. 'action=insert&token=ae4c6d18375f446dfa068420c1f6a4e8" ><span '
|
||||
. 'action=insert" ><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="%60new%60.%60id'
|
||||
@ -757,7 +746,7 @@ class DisplayResultsTest extends PMATestCase
|
||||
. '<a href="tbl_change.php?db=data&table=new&where_clause'
|
||||
. '=%60new%60.%60id%60+%3D+1&clause_is_unique=1&sql_query='
|
||||
. 'SELECT+%2A+FROM+%60new%60&goto=sql.php&default_action='
|
||||
. 'update&token=ae4c6d18375f446dfa068420c1f6a4e8" ><span class='
|
||||
. 'update" ><span class='
|
||||
. '"nowrap"><img src="themes/dot.gif" title="Edit" alt="Edit" class'
|
||||
. '="icon ic_b_edit" /> Edit</span></a>' . "\n"
|
||||
. '<input type="hidden" class="where_clause" value ="%60new%60.%60'
|
||||
@ -774,8 +763,7 @@ class DisplayResultsTest extends PMATestCase
|
||||
. 'row+has+been+deleted&goto=sql.php%3Fdb%3Ddata%26table%3Dnew'
|
||||
. '%26sql_query%3DSELECT%2B%252A%2BFROM%2B%2560new%2560%26message_'
|
||||
. 'to_show%3DThe%2Brow%2Bhas%2Bbeen%2Bdeleted%26goto%3Dtbl_structure'
|
||||
. '.php%26token%3Dae4c6d18375f446dfa068420c1f6a4e8&token='
|
||||
. 'ae4c6d18375f446dfa068420c1f6a4e8',
|
||||
. '.php',
|
||||
array(
|
||||
'edit_lnk' => 'ur',
|
||||
'del_lnk' => 'dr',
|
||||
@ -793,12 +781,10 @@ class DisplayResultsTest extends PMATestCase
|
||||
),
|
||||
'tbl_change.php?db=data&table=new&where_clause=%60new%60.%60'
|
||||
. 'id%60+%3D+1&clause_is_unique=1&sql_query=SELECT+%2A+FROM+'
|
||||
. '%60new%60&goto=sql.php&default_action=update&token='
|
||||
. 'ae4c6d18375f446dfa068420c1f6a4e8',
|
||||
. '%60new%60&goto=sql.php&default_action=update',
|
||||
'tbl_change.php?db=data&table=new&where_clause=%60new%60.%60'
|
||||
. 'id%60+%3D+1&clause_is_unique=1&sql_query=SELECT+%2A+FROM+'
|
||||
. '%60new%60&goto=sql.php&default_action=insert&token='
|
||||
. 'ae4c6d18375f446dfa068420c1f6a4e8',
|
||||
. '%60new%60&goto=sql.php&default_action=insert',
|
||||
'edit_row_anchor',
|
||||
'<span class="nowrap"><img src="themes/dot.gif" title="Edit" '
|
||||
. 'alt="Edit" class="icon ic_b_edit" /> Edit</span>',
|
||||
@ -874,8 +860,7 @@ class DisplayResultsTest extends PMATestCase
|
||||
. 'row+has+been+deleted&goto=sql.php%3Fdb%3Ddata%26table%3Dnew'
|
||||
. '%26sql_query%3DSELECT%2B%252A%2BFROM%2B%2560new%2560%26message_'
|
||||
. 'to_show%3DThe%2Brow%2Bhas%2Bbeen%2Bdeleted%26goto%3Dtbl_structure'
|
||||
. '.php%26token%3Dae4c6d18375f446dfa068420c1f6a4e8&token='
|
||||
. 'ae4c6d18375f446dfa068420c1f6a4e8',
|
||||
. '.php',
|
||||
array(
|
||||
'edit_lnk' => 'ur',
|
||||
'del_lnk' => 'dr',
|
||||
@ -893,12 +878,10 @@ class DisplayResultsTest extends PMATestCase
|
||||
),
|
||||
'tbl_change.php?db=data&table=new&where_clause=%60new%60.%60'
|
||||
. 'id%60+%3D+1&clause_is_unique=1&sql_query=SELECT+%2A+FROM+'
|
||||
. '%60new%60&goto=sql.php&default_action=update&token='
|
||||
. 'ae4c6d18375f446dfa068420c1f6a4e8',
|
||||
. '%60new%60&goto=sql.php&default_action=update',
|
||||
'tbl_change.php?db=data&table=new&where_clause=%60new%60.%60'
|
||||
. 'id%60+%3D+1&clause_is_unique=1&sql_query=SELECT+%2A+FROM+'
|
||||
. '%60new%60&goto=sql.php&default_action=insert&token='
|
||||
. 'ae4c6d18375f446dfa068420c1f6a4e8',
|
||||
. '%60new%60&goto=sql.php&default_action=insert',
|
||||
'edit_row_anchor',
|
||||
'<span class="nowrap"><img src="themes/dot.gif" title="Edit" '
|
||||
. 'alt="Edit" class="icon ic_b_edit" /> Edit</span>',
|
||||
@ -980,7 +963,6 @@ class DisplayResultsTest extends PMATestCase
|
||||
'db_routines.php?item_name=circumference&db=data'
|
||||
. '&item_type=FUNCTION&server=0&lang=en'
|
||||
. '&collation_connection=utf-8'
|
||||
. '&token=token'
|
||||
),
|
||||
array(
|
||||
'information_schema',
|
||||
@ -995,7 +977,6 @@ class DisplayResultsTest extends PMATestCase
|
||||
'db_routines.php?item_name=area&db=data'
|
||||
. '&item_type=PROCEDURE&server=0&lang=en'
|
||||
. '&collation_connection=utf-8'
|
||||
. '&token=token'
|
||||
),
|
||||
array(
|
||||
'information_schema',
|
||||
@ -1010,7 +991,6 @@ class DisplayResultsTest extends PMATestCase
|
||||
. 'rmation_schema%60.%60CHARACTER_SETS%60&db=information_schema'
|
||||
. '&test_name=value&server=0&lang=en'
|
||||
. '&collation_connection=utf-8'
|
||||
. '&token=token'
|
||||
)
|
||||
);
|
||||
}
|
||||
@ -1340,7 +1320,7 @@ class DisplayResultsTest extends PMATestCase
|
||||
null,
|
||||
'<a href="tbl_get_field.php?db=foo&table=bar&server=0'
|
||||
. '&lang=en&collation_connection=utf-8'
|
||||
. '&token=token" class="disableAjax">1001</a>'
|
||||
. '" class="disableAjax">1001</a>'
|
||||
),
|
||||
array(
|
||||
true,
|
||||
@ -1355,7 +1335,7 @@ class DisplayResultsTest extends PMATestCase
|
||||
null,
|
||||
'<a href="tbl_get_field.php?db=foo&table=bar&server=0'
|
||||
. '&lang=en&collation_connection=utf-8'
|
||||
. '&token=token" class="disableAjax">0x123456</a>'
|
||||
. '" class="disableAjax">0x123456</a>'
|
||||
),
|
||||
array(
|
||||
true,
|
||||
@ -1370,7 +1350,7 @@ class DisplayResultsTest extends PMATestCase
|
||||
null,
|
||||
'<a href="tbl_get_field.php?db=foo&table=bar&server=0'
|
||||
. '&lang=en&collation_connection=utf-8'
|
||||
. '&token=token" class="disableAjax">[BLOB - 4 B]</a>'
|
||||
. '" class="disableAjax">[BLOB - 4 B]</a>'
|
||||
),
|
||||
array(
|
||||
false,
|
||||
@ -1493,7 +1473,7 @@ class DisplayResultsTest extends PMATestCase
|
||||
'<td class="left hex"><a href="tbl_get_field.php?'
|
||||
. 'db=foo&table=tbl&server=0&lang=en'
|
||||
. '&collation_connection=utf-8'
|
||||
. '&token=token" '
|
||||
. '" '
|
||||
. 'class="disableAjax">[BLOB - 4 B]</a></td>'
|
||||
),
|
||||
array(
|
||||
|
||||
@ -157,7 +157,7 @@ class FooterTest extends PMATestCase
|
||||
$this->assertEquals(
|
||||
'<div id="selflink" class="print_ignore"><a href="index.php?db=&'
|
||||
. 'table=&server=1&target=&lang=en&collation_connection='
|
||||
. 'utf8_general_ci&token=token" title="Open new phpMyAdmin window" '
|
||||
. 'utf8_general_ci" title="Open new phpMyAdmin window" '
|
||||
. 'target="_blank">Open new phpMyAdmin window</a></div>',
|
||||
$this->_callPrivateFunction(
|
||||
'_getSelfLink',
|
||||
@ -182,7 +182,7 @@ class FooterTest extends PMATestCase
|
||||
$this->assertEquals(
|
||||
'<div id="selflink" class="print_ignore"><a href="index.php?db=&'
|
||||
. 'table=&server=1&target=&lang=en&collation_connection='
|
||||
. 'utf8_general_ci&token=token" title="Open new phpMyAdmin window" '
|
||||
. 'utf8_general_ci" title="Open new phpMyAdmin window" '
|
||||
. 'target="_blank"><img src="themes/dot.gif" title="Open new '
|
||||
. 'phpMyAdmin window" alt="Open new phpMyAdmin window" '
|
||||
. 'class="icon ic_window-new" /></a></div>',
|
||||
|
||||
@ -127,12 +127,12 @@ class ThemeManagerTest extends PMATestCase
|
||||
'<div class="theme_preview"><h2>Original (2.9) </h2><p><a class='
|
||||
. '"take_theme" name="original" href="index.php?set_theme=original'
|
||||
. '&server=99&lang=en&collation_connection=utf8_general_ci'
|
||||
. '&token=token"><img src="./themes/original/screen.png" border="1" '
|
||||
. '"><img src="./themes/original/screen.png" border="1" '
|
||||
. 'alt="Original" title="Original" /><br />[ <strong>take it</strong> ]'
|
||||
. '</a></p></div><div class="theme_preview"><h2>pmahomme (1.1) </h2><p>'
|
||||
. '<a class="take_theme" name="pmahomme" href="index.php?set_theme='
|
||||
. 'pmahomme&server=99&lang=en&collation_connection=utf8_'
|
||||
. 'general_ci&token=token"><img src="./themes/pmahomme/screen.png" '
|
||||
. 'general_ci"><img src="./themes/pmahomme/screen.png" '
|
||||
. 'border="1" alt="pmahomme" title="pmahomme" /><br />[ <strong>take it'
|
||||
. '</strong> ]</a></p></div>',
|
||||
$tm->getPrintPreviews()
|
||||
|
||||
@ -293,7 +293,7 @@ class ThemeTest extends PMATestCase
|
||||
'<div class="theme_preview"><h2> (0.0.0.0) </h2><p><a class="take_'
|
||||
. 'theme" name="" href="index.php?set_theme=&server=99&lang=en'
|
||||
. '&collation_connection=utf-8'
|
||||
. '&token=token">No preview available.[ <strong>take it</strong> ]'
|
||||
. '">No preview available.[ <strong>take it</strong> ]'
|
||||
. '</a></p></div>'
|
||||
);
|
||||
}
|
||||
|
||||
@ -44,8 +44,7 @@ class URLTest extends PHPUnit_Framework_TestCase
|
||||
$separator = URL::getArgSeparator();
|
||||
$expected = 'server=x' . htmlentities($separator)
|
||||
. 'lang=en' . htmlentities($separator)
|
||||
. 'collation_connection=x' . htmlentities($separator)
|
||||
. 'token=token'
|
||||
. 'collation_connection=x'
|
||||
;
|
||||
|
||||
$expected = '?db=db'
|
||||
@ -68,8 +67,7 @@ class URLTest extends PHPUnit_Framework_TestCase
|
||||
$separator = URL::getArgSeparator();
|
||||
$expected = 'server=x' . htmlentities($separator)
|
||||
. 'lang=en' . htmlentities($separator)
|
||||
. 'collation_connection=x' . htmlentities($separator)
|
||||
. 'token=token'
|
||||
. 'collation_connection=x'
|
||||
;
|
||||
|
||||
$expected = '?db=db'
|
||||
@ -93,8 +91,7 @@ class URLTest extends PHPUnit_Framework_TestCase
|
||||
$separator = URL::getArgSeparator();
|
||||
$expected = 'server=x' . $separator
|
||||
. 'lang=en' . $separator
|
||||
. 'collation_connection=x' . $separator
|
||||
. 'token=token'
|
||||
. 'collation_connection=x'
|
||||
;
|
||||
|
||||
$expected = '#ABC#db=db' . $separator . 'table=table' . $separator
|
||||
@ -121,8 +118,7 @@ class URLTest extends PHPUnit_Framework_TestCase
|
||||
$separator = URL::getArgSeparator();
|
||||
$expected = '?server=x' . htmlentities($separator)
|
||||
. 'lang=en' . htmlentities($separator)
|
||||
. 'collation_connection=x' . htmlentities($separator)
|
||||
. 'token=token'
|
||||
. 'collation_connection=x'
|
||||
;
|
||||
$this->assertEquals($expected, URL::getCommon());
|
||||
}
|
||||
|
||||
@ -57,7 +57,7 @@ class PageSettingsTest extends PMATestCase
|
||||
'<div id="page_settings_modal">'
|
||||
. '<div class="page_settings">'
|
||||
. '<form method="post" '
|
||||
. 'action="phpunit?db=db&table=&server=1&target=&lang=en&token=token" '
|
||||
. 'action="phpunit?db=db&table=&server=1&target=&lang=en" '
|
||||
. 'class="config-form disableAjax">',
|
||||
$html
|
||||
);
|
||||
|
||||
@ -138,7 +138,7 @@ class AuthenticationConfigTest extends PMATestCase
|
||||
|
||||
$this->assertContains(
|
||||
'<a href="index.php?server=0&lang=en'
|
||||
. '&collation_connection=utf-8&token=token" '
|
||||
. '&collation_connection=utf-8" '
|
||||
. 'class="button disableAjax">Retry to connect</a>',
|
||||
$html
|
||||
);
|
||||
|
||||
@ -813,7 +813,7 @@ class AuthenticationCookieTest extends PMATestCase
|
||||
$mockResponse->expects($this->once())
|
||||
->method('header')
|
||||
->with(
|
||||
$this->stringContains('&server=2&lang=en&collation_connection=utf-8&token=token')
|
||||
$this->stringContains('&server=2&lang=en&collation_connection=utf-8')
|
||||
);
|
||||
|
||||
$mockResponse->expects($this->any())
|
||||
|
||||
@ -86,17 +86,17 @@ class PMA_Form_Processing_Test extends PHPUnit_Framework_TestCase
|
||||
);
|
||||
|
||||
$this->assertContains(
|
||||
'<a href="?lang=en&token=token&page=&mode=revert">',
|
||||
'<a href="?lang=en&page=&mode=revert">',
|
||||
$result
|
||||
);
|
||||
|
||||
$this->assertContains(
|
||||
'<a class="btn" href="index.php?lang=en&token=token">',
|
||||
'<a class="btn" href="index.php?lang=en">',
|
||||
$result
|
||||
);
|
||||
|
||||
$this->assertContains(
|
||||
'<a class="btn" href="?lang=en&token=token&page=&mode=edit">',
|
||||
'<a class="btn" href="?lang=en&page=&mode=edit">',
|
||||
$result
|
||||
);
|
||||
|
||||
@ -119,7 +119,7 @@ class PMA_Form_Processing_Test extends PHPUnit_Framework_TestCase
|
||||
PMA_Process_formset($formDisplay);
|
||||
|
||||
$this->assertEquals(
|
||||
array('HTTP/1.1 303 See Other', 'Location: index.php?lang=en&token=token'),
|
||||
array('HTTP/1.1 303 See Other', 'Location: index.php?lang=en'),
|
||||
$GLOBALS['header']
|
||||
);
|
||||
|
||||
|
||||
@ -300,7 +300,7 @@ class PMA_InsertEditTest extends PHPUnit_Framework_TestCase
|
||||
|
||||
$this->assertEquals(
|
||||
' : <a href="tbl_change.php?ShowFunctionFields=1&ShowFieldTypesIn'
|
||||
. 'DataEditView=1&goto=sql.php&lang=en&token=token">'
|
||||
. 'DataEditView=1&goto=sql.php&lang=en">'
|
||||
. 'Function</a>',
|
||||
$result
|
||||
);
|
||||
@ -310,7 +310,7 @@ class PMA_InsertEditTest extends PHPUnit_Framework_TestCase
|
||||
|
||||
$this->assertEquals(
|
||||
'<th><a href="tbl_change.php?ShowFunctionFields=0&ShowFieldTypesIn'
|
||||
. 'DataEditView=1&goto=sql.php&lang=en&token=token" title='
|
||||
. 'DataEditView=1&goto=sql.php&lang=en" title='
|
||||
. '"Hide">Function</a></th>',
|
||||
$result
|
||||
);
|
||||
@ -320,7 +320,7 @@ class PMA_InsertEditTest extends PHPUnit_Framework_TestCase
|
||||
|
||||
$this->assertEquals(
|
||||
' : <a href="tbl_change.php?ShowFunctionFields=1&ShowFieldTypesIn'
|
||||
. 'DataEditView=1&goto=sql.php&lang=en&token=token">'
|
||||
. 'DataEditView=1&goto=sql.php&lang=en">'
|
||||
. 'Type</a>',
|
||||
$result
|
||||
);
|
||||
@ -330,7 +330,7 @@ class PMA_InsertEditTest extends PHPUnit_Framework_TestCase
|
||||
|
||||
$this->assertEquals(
|
||||
'<th><a href="tbl_change.php?ShowFunctionFields=1&ShowFieldTypesIn'
|
||||
. 'DataEditView=0&goto=sql.php&lang=en&token=token" title='
|
||||
. 'DataEditView=0&goto=sql.php&lang=en" title='
|
||||
. '"Hide">Type</a></th>',
|
||||
$result
|
||||
);
|
||||
@ -731,7 +731,7 @@ class PMA_InsertEditTest extends PHPUnit_Framework_TestCase
|
||||
$this->assertContains(
|
||||
'<a class="ajax browse_foreign" href="browse_'
|
||||
. 'foreigners.php?db=db&table=tbl&field=f&rownumber=8'
|
||||
. '&data=abc&server=1&lang=en&token=token">',
|
||||
. '&data=abc&server=1&lang=en">',
|
||||
$result
|
||||
);
|
||||
|
||||
@ -1954,7 +1954,7 @@ class PMA_InsertEditTest extends PHPUnit_Framework_TestCase
|
||||
{
|
||||
$GLOBALS['cfg']['ServerDefault'] = 1;
|
||||
$this->assertEquals(
|
||||
'tbl_change.php?lang=en&token=token',
|
||||
'tbl_change.php?lang=en',
|
||||
PMA_getErrorUrl(array())
|
||||
);
|
||||
|
||||
@ -2255,7 +2255,7 @@ class PMA_InsertEditTest extends PHPUnit_Framework_TestCase
|
||||
$this->assertEquals(
|
||||
'<a href="sql.php?db=information_schema&table=TABLES&pos=0&'
|
||||
. 'sql_query=SELECT+%2A+FROM+%60information_schema%60.%60TABLES%60+WHERE'
|
||||
. '+%60f%60%3D1&lang=en&token=token" title="a>">b<</a>',
|
||||
. '+%60f%60%3D1&lang=en" title="a>">b<</a>',
|
||||
$result
|
||||
);
|
||||
|
||||
@ -2265,7 +2265,7 @@ class PMA_InsertEditTest extends PHPUnit_Framework_TestCase
|
||||
$this->assertEquals(
|
||||
'<a href="sql.php?db=information_schema&table=TABLES&pos=0&'
|
||||
. 'sql_query=SELECT+%2A+FROM+%60information_schema%60.%60TABLES%60+WHERE'
|
||||
. '+%60f%60%3D1&lang=en&token=token" title="b<">a></a>',
|
||||
. '+%60f%60%3D1&lang=en" title="b<">a></a>',
|
||||
$result
|
||||
);
|
||||
}
|
||||
|
||||
@ -2138,13 +2138,13 @@ class PMA_ServerPrivileges_Test extends PHPUnit_Framework_TestCase
|
||||
$this->assertContains(
|
||||
'<td><a class="ajax" href="server_privileges.php?initial=-&'
|
||||
. 'server=1&lang=en&collation_connection='
|
||||
. 'collation_connection&token=token">-</a></td>',
|
||||
. 'collation_connection">-</a></td>',
|
||||
$actual
|
||||
);
|
||||
$this->assertContains(
|
||||
'<td><a class="ajax" href="server_privileges.php?initial=%22&'
|
||||
. 'server=1&lang=en&collation_connection='
|
||||
. 'collation_connection&token=token">"</a>',
|
||||
. 'collation_connection">"</a>',
|
||||
$actual
|
||||
);
|
||||
$this->assertContains('Show all', $actual);
|
||||
|
||||
@ -377,8 +377,7 @@ class PMA_User_Preferences_Test extends PHPUnit_Framework_TestCase
|
||||
);
|
||||
|
||||
$this->assertContains(
|
||||
'Location: /phpmyadmin/file.html?a=b&saved=1&server=0&' .
|
||||
'token=token#h+ash',
|
||||
'Location: /phpmyadmin/file.html?a=b&saved=1&server=0#h+ash',
|
||||
$GLOBALS['header'][0]
|
||||
);
|
||||
|
||||
|
||||
@ -58,7 +58,7 @@ class PMA_GetDbLink_Test extends PHPUnit_Framework_TestCase
|
||||
$GLOBALS['cfg']['DefaultTabDatabase'], 'database'
|
||||
)
|
||||
. '?db=' . $database
|
||||
. '&server=99&lang=en&token=token" '
|
||||
. '&server=99&lang=en" '
|
||||
. 'title="Jump to database "'
|
||||
. htmlspecialchars($database) . '".">'
|
||||
. htmlspecialchars($database) . '</a>',
|
||||
@ -80,7 +80,7 @@ class PMA_GetDbLink_Test extends PHPUnit_Framework_TestCase
|
||||
$GLOBALS['cfg']['DefaultTabDatabase'], 'database'
|
||||
)
|
||||
. '?db=' . $database
|
||||
. '&server=99&lang=en&token=token" title="Jump to database "'
|
||||
. '&server=99&lang=en" title="Jump to database "'
|
||||
. htmlspecialchars($database) . '".">'
|
||||
. htmlspecialchars($database) . '</a>',
|
||||
PMA\libraries\Util::getDbLink($database)
|
||||
@ -103,7 +103,7 @@ class PMA_GetDbLink_Test extends PHPUnit_Framework_TestCase
|
||||
)
|
||||
. '?db='
|
||||
. htmlspecialchars(urlencode($database))
|
||||
. '&server=99&lang=en&token=token" title="Jump to database "'
|
||||
. '&server=99&lang=en" title="Jump to database "'
|
||||
. htmlspecialchars($database) . '".">'
|
||||
. htmlspecialchars($database) . '</a>',
|
||||
PMA\libraries\Util::getDbLink($database)
|
||||
|
||||
@ -51,18 +51,18 @@ class PMA_ShowMessage_Test extends PHPUnit_Framework_TestCase
|
||||
|
||||
$this->expectOutputString(
|
||||
"<div class=\"result_query\" align=\"\">
|
||||
<div class=\"notice\">msg</div><code class=\"sql\"><span class=\"syntax\"><span class=\"inner_sql\"><a href=\"./url.php?url=http%3A%2F%2Fdev.mysql.com%2Fdoc%2Frefman%2F5.0%2Fen%2Fselect.html&server=server&lang=en&token=647a62ad301bf9025e3b13bc7caa02cb\" target=\"mysql_doc\"><span class=\"syntax_alpha syntax_alpha_reservedWord\">SELECT</span></a> <span class=\"syntax_punct\">*</span> <br /><span class=\"syntax_alpha syntax_alpha_reservedWord\">FROM</span> <span class=\"syntax_alpha syntax_alpha_identifier\">tblPatient</span></span></span></code><div class=\"tools\"><form action=\"sql.php\" method=\"post\"><input type=\"hidden\" name=\"db\" value=\"db\" /><input type=\"hidden\" name=\"table\" value=\"tbl\" /><input type=\"hidden\" name=\"server\" value=\"server\" /><input type=\"hidden\" name=\"lang\" value=\"en\" /><input type=\"hidden\" name=\"token\" value=\"647a62ad301bf9025e3b13bc7caa02cb\" /><input type=\"hidden\" name=\"sql_query\" value=\"SELECT * FROM tblPatient \" /></form><script type=\"text/javascript\">
|
||||
<div class=\"notice\">msg</div><code class=\"sql\"><span class=\"syntax\"><span class=\"inner_sql\"><a href=\"./url.php?url=http%3A%2F%2Fdev.mysql.com%2Fdoc%2Frefman%2F5.0%2Fen%2Fselect.html&server=server&lang=en\" target=\"mysql_doc\"><span class=\"syntax_alpha syntax_alpha_reservedWord\">SELECT</span></a> <span class=\"syntax_punct\">*</span> <br /><span class=\"syntax_alpha syntax_alpha_reservedWord\">FROM</span> <span class=\"syntax_alpha syntax_alpha_identifier\">tblPatient</span></span></span></code><div class=\"tools\"><form action=\"sql.php\" method=\"post\"><input type=\"hidden\" name=\"db\" value=\"db\" /><input type=\"hidden\" name=\"table\" value=\"tbl\" /><input type=\"hidden\" name=\"server\" value=\"server\" /><input type=\"hidden\" name=\"lang\" value=\"en\" /><input type=\"hidden\" name=\"token\" value=\"647a62ad301bf9025e3b13bc7caa02cb\" /><input type=\"hidden\" name=\"sql_query\" value=\"SELECT * FROM tblPatient \" /></form><script type=\"text/javascript\">
|
||||
//<![CDATA[
|
||||
$('.tools form').last().after('[<a href=\"#\" title=\"Inline edit of this query\" class=\"inline_edit_sql\">Inline</a>]');
|
||||
//]]>
|
||||
</script> [
|
||||
<a href=\"tbl_sql.php?db=db&table=tbl&sql_query=SELECT+%2A+FROM+tblPatient+&show_query=1&server=server&lang=en&token=647a62ad301bf9025e3b13bc7caa02cb#querybox\" >Edit</a>
|
||||
<a href=\"tbl_sql.php?db=db&table=tbl&sql_query=SELECT+%2A+FROM+tblPatient+&show_query=1&server=server&lang=en#querybox\" >Edit</a>
|
||||
] [
|
||||
<a href=\"import.php?db=db&table=tbl&sql_query=EXPLAIN+SELECT+%2A+FROM+tblPatient+&server=server&lang=en&token=647a62ad301bf9025e3b13bc7caa02cb\" >Explain SQL</a>
|
||||
<a href=\"import.php?db=db&table=tbl&sql_query=EXPLAIN+SELECT+%2A+FROM+tblPatient+&server=server&lang=en\" >Explain SQL</a>
|
||||
] [
|
||||
<a href=\"import.php?db=db&table=tbl&sql_query=SELECT+%2A+FROM+tblPatient+&show_query=1&show_as_php=1&server=server&lang=en&token=647a62ad301bf9025e3b13bc7caa02cb\" >Create PHP code</a>
|
||||
<a href=\"import.php?db=db&table=tbl&sql_query=SELECT+%2A+FROM+tblPatient+&show_query=1&show_as_php=1&server=server&lang=en\" >Create PHP code</a>
|
||||
] [
|
||||
<a href=\"import.php?db=db&table=tbl&sql_query=SELECT+%2A+FROM+tblPatient+&show_query=1&server=server&lang=en&token=647a62ad301bf9025e3b13bc7caa02cb\" >Refresh</a>
|
||||
<a href=\"import.php?db=db&table=tbl&sql_query=SELECT+%2A+FROM+tblPatient+&show_query=1&server=server&lang=en\" >Refresh</a>
|
||||
]</div></div>"
|
||||
);
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user
