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

check if $cfg['Server']['pmadb'] really exists and is selectable, minor tweaks and formating

Browse Source
This commit is contained in:
Sebastian Mendel
2006-02-21 15:31:37 +00:00
parent 5a0cc81aee
commit ac9d8b21a3
2 changed files with 90 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@@ -22,6 +22,9 @@ $Source$
merged libraries\tbl_move_copy.php in class PMA_Table merged libraries\tbl_move_copy.php in class PMA_Table
* libraries/Table.class.php: * libraries/Table.class.php:
minor fixes and improvements, formating, documentation minor fixes and improvements, formating, documentation
* libraries/relation.lib.php:
check if $cfg['Server']['pmadb'] really exists and is selectable,
minor tweaks and formating
2006-02-20 Marc Delisle <lem9@users.sourceforge.net> 2006-02-20 Marc Delisle <lem9@users.sourceforge.net>
### 2.8.0-rc1 released from QA_2_8 branch ### 2.8.0-rc1 released from QA_2_8 branch

154
libraries/relation.lib.php
View File

@@ -25,8 +25,8 @@ require_once './libraries/Table.class.php';
* *
* @author Mike Beck <mikebeck@users.sourceforge.net> * @author Mike Beck <mikebeck@users.sourceforge.net>
*/ */
function PMA_query_as_cu($sql, $show_error = TRUE, $options = 0) { function PMA_query_as_cu($sql, $show_error = true, $options = 0) {
global $err_url_0, $db, $controllink, $cfgRelation; global $db, $controllink, $cfgRelation;
// Comparing resource ids works on PHP 5 because, when no controluser // Comparing resource ids works on PHP 5 because, when no controluser
// is defined, connecting with the same user for controllink does // is defined, connecting with the same user for controllink does
@@ -49,7 +49,7 @@ require_once './libraries/Table.class.php';
if ($result) { if ($result) {
return $result; return $result;
} else { } else {
return FALSE; return false;
} }
} // end of the "PMA_query_as_cu()" function } // end of the "PMA_query_as_cu()" function
@@ -74,34 +74,35 @@ require_once './libraries/Table.class.php';
* *
* @author Mike Beck <mikebeck@users.sourceforge.net> * @author Mike Beck <mikebeck@users.sourceforge.net>
*/ */
function PMA_getRelationsParam($verbose = FALSE) function PMA_getRelationsParam($verbose = false)
{ {
global $cfg, $server, $err_url_0, $db, $table, $controllink; global $cfg, $server, $controllink, $cfgRelation;
global $cfgRelation;
$cfgRelation = array(); $cfgRelation = array();
$cfgRelation['relwork'] = FALSE; $cfgRelation['relwork'] = false;
$cfgRelation['displaywork'] = FALSE; $cfgRelation['displaywork'] = false;
$cfgRelation['bookmarkwork']= FALSE; $cfgRelation['bookmarkwork']= false;
$cfgRelation['pdfwork'] = FALSE; $cfgRelation['pdfwork'] = false;
$cfgRelation['commwork'] = FALSE; $cfgRelation['commwork'] = false;
$cfgRelation['mimework'] = FALSE; $cfgRelation['mimework'] = false;
$cfgRelation['historywork'] = FALSE; $cfgRelation['historywork'] = false;
$cfgRelation['allworks'] = FALSE; $cfgRelation['allworks'] = false;
// No server selected -> no bookmark table // No server selected -> no bookmark table
// we return the array with the FALSEs in it, // we return the array with the falses in it,
// to avoid some 'Unitialized string offset' errors later // to avoid some 'Unitialized string offset' errors later
if ($server == 0 if ($server == 0 || empty($cfg['Server']) || empty($cfg['Server']['pmadb'])
|| empty($cfg['Server']) || ! PMA_DBI_select_db($cfg['Server']['pmadb'], $controllink)) {
|| empty($cfg['Server']['pmadb'])) { if ($verbose == true) {
if ($verbose == TRUE) {
echo 'PMA Database ... ' echo 'PMA Database ... '
. '<font color="red"><b>' . $GLOBALS['strNotOK'] . '</b></font>' . '<font color="red"><b>' . $GLOBALS['strNotOK'] . '</b></font>'
. '[ <a href="Documentation.html#pmadb">' . $GLOBALS['strDocu'] . '</a> ]<br />' . "\n" . '[ <a href="Documentation.html#pmadb">' . $GLOBALS['strDocu']
. '</a> ]<br />' . "\n"
. $GLOBALS['strGeneralRelationFeat'] . $GLOBALS['strGeneralRelationFeat']
. ' <font color="green">' . $GLOBALS['strDisabled'] . '</font>' . "\n"; . ' <font color="green">' . $GLOBALS['strDisabled']
. '</font>' . "\n";
} }
$cfg['Server']['pmadb'] = false;
return $cfgRelation; return $cfgRelation;
} }
@@ -113,9 +114,8 @@ function PMA_getRelationsParam($verbose = FALSE)
// I was thinking of checking if they have all required columns but I // I was thinking of checking if they have all required columns but I
// fear it might be too slow // fear it might be too slow
PMA_DBI_select_db($cfgRelation['db'], $controllink);
$tab_query = 'SHOW TABLES FROM ' . PMA_backquote($cfgRelation['db']); $tab_query = 'SHOW TABLES FROM ' . PMA_backquote($cfgRelation['db']);
$tab_rs = PMA_query_as_cu($tab_query, FALSE, PMA_DBI_QUERY_STORE); $tab_rs = PMA_query_as_cu($tab_query, false, PMA_DBI_QUERY_STORE);
if ($tab_rs) { if ($tab_rs) {
while ($curr_table = @PMA_DBI_fetch_row($tab_rs)) { while ($curr_table = @PMA_DBI_fetch_row($tab_rs)) {
@@ -135,77 +135,79 @@ function PMA_getRelationsParam($verbose = FALSE)
$cfgRelation['history'] = $curr_table[0]; $cfgRelation['history'] = $curr_table[0];
} }
} // end while } // end while
PMA_DBI_free_result($tab_rs);
} else {
$cfg['Server']['pmadb'] = false;
} }
if (isset($cfgRelation['relation'])) { if (isset($cfgRelation['relation'])) {
$cfgRelation['relwork'] = TRUE; $cfgRelation['relwork'] = true;
if (isset($cfgRelation['table_info'])) { if (isset($cfgRelation['table_info'])) {
$cfgRelation['displaywork'] = TRUE; $cfgRelation['displaywork'] = true;
} }
} }
if (isset($cfgRelation['table_coords']) && isset($cfgRelation['pdf_pages'])) { if (isset($cfgRelation['table_coords']) && isset($cfgRelation['pdf_pages'])) {
$cfgRelation['pdfwork'] = TRUE; $cfgRelation['pdfwork'] = true;
} }
if (isset($cfgRelation['column_info'])) { if (isset($cfgRelation['column_info'])) {
$cfgRelation['commwork'] = TRUE; $cfgRelation['commwork'] = true;
if ($cfg['Server']['verbose_check']) { if ($cfg['Server']['verbose_check']) {
$mime_query = 'SHOW FIELDS FROM ' . PMA_backquote($cfgRelation['db']) . '.' . PMA_backquote($cfgRelation['column_info']); $mime_query = 'SHOW FIELDS FROM '
$mime_rs = PMA_query_as_cu($mime_query, FALSE); . PMA_backquote($cfgRelation['db']) . '.'
. PMA_backquote($cfgRelation['column_info']);
$mime_rs = PMA_query_as_cu($mime_query, false);
$mime_field_mimetype = FALSE; $mime_field_mimetype = false;
$mime_field_transformation = FALSE; $mime_field_transformation = false;
$mime_field_transformation_options = FALSE; $mime_field_transformation_options = false;
while ($curr_mime_field = @PMA_DBI_fetch_row($mime_rs)) { while ($curr_mime_field = @PMA_DBI_fetch_row($mime_rs)) {
if ($curr_mime_field[0] == 'mimetype') { if ($curr_mime_field[0] == 'mimetype') {
$mime_field_mimetype = TRUE; $mime_field_mimetype = true;
} elseif ($curr_mime_field[0] == 'transformation') { } elseif ($curr_mime_field[0] == 'transformation') {
$mime_field_transformation = TRUE; $mime_field_transformation = true;
} elseif ($curr_mime_field[0] == 'transformation_options') { } elseif ($curr_mime_field[0] == 'transformation_options') {
$mime_field_transformation_options = TRUE; $mime_field_transformation_options = true;
} }
} }
PMA_DBI_free_result($mime_rs); PMA_DBI_free_result($mime_rs);
if ($mime_field_mimetype == TRUE if ($mime_field_mimetype == true
&& $mime_field_transformation == TRUE && $mime_field_transformation == true
&& $mime_field_transformation_options == TRUE) { && $mime_field_transformation_options == true) {
$cfgRelation['mimework'] = TRUE; $cfgRelation['mimework'] = true;
} }
} else { } else {
$cfgRelation['mimework'] = TRUE; $cfgRelation['mimework'] = true;
} }
} }
if (isset($cfgRelation['history'])) { if (isset($cfgRelation['history'])) {
$cfgRelation['historywork'] = TRUE; $cfgRelation['historywork'] = true;
} }
if (isset($cfgRelation['bookmark'])) { if (isset($cfgRelation['bookmark'])) {
$cfgRelation['bookmarkwork'] = TRUE; $cfgRelation['bookmarkwork'] = true;
} }
if ($cfgRelation['relwork'] == TRUE && $cfgRelation['displaywork'] == TRUE if ($cfgRelation['relwork'] == true && $cfgRelation['displaywork'] == true
&& $cfgRelation['pdfwork'] == TRUE && $cfgRelation['commwork'] == TRUE && $cfgRelation['pdfwork'] == true && $cfgRelation['commwork'] == true
&& $cfgRelation['mimework'] == TRUE && $cfgRelation['historywork'] == TRUE && $cfgRelation['mimework'] == true && $cfgRelation['historywork'] == true
&& $cfgRelation['bookmarkwork'] == TRUE) { && $cfgRelation['bookmarkwork'] == true) {
$cfgRelation['allworks'] = TRUE; $cfgRelation['allworks'] = true;
}
if ($tab_rs) {
PMA_DBI_free_result($tab_rs);
} else {
$cfg['Server']['pmadb'] = FALSE;
} }
if ($verbose == TRUE) { if ($verbose == true) {
$shit = '<font color="red"><b>' . $GLOBALS['strNotOK'] . '</b></font> [ <a href="Documentation.html#%s">' . $GLOBALS['strDocu'] . '</a> ]'; $shit = '<font color="red"><b>' . $GLOBALS['strNotOK']
. '</b></font> [ <a href="Documentation.html#%s">'
. $GLOBALS['strDocu'] . '</a> ]';
$hit = '<font color="green"><b>' . $GLOBALS['strOK'] . '</b></font>'; $hit = '<font color="green"><b>' . $GLOBALS['strOK'] . '</b></font>';
$enabled = '<font color="green">' . $GLOBALS['strEnabled'] . '</font>'; $enabled = '<font color="green">' . $GLOBALS['strEnabled'] . '</font>';
$disabled = '<font color="red">' . $GLOBALS['strDisabled'] . '</font>'; $disabled = '<font color="red">' . $GLOBALS['strDisabled'] . '</font>';
echo '<table>' . "\n"; echo '<table>' . "\n";
echo ' <tr><th align="left">$cfg[\'Servers\'][$i][\'pmadb\'] ... </th><td align="right">' echo ' <tr><th align="left">$cfg[\'Servers\'][$i][\'pmadb\'] ... </th><td align="right">'
. (($cfg['Server']['pmadb'] == FALSE) ? sprintf($shit, 'pmadb') : $hit) . (($cfg['Server']['pmadb'] == false) ? sprintf($shit, 'pmadb') : $hit)
. '</td></tr>' . "\n"; . '</td></tr>' . "\n";
echo ' <tr><td>&nbsp;</td></tr>' . "\n"; echo ' <tr><td>&nbsp;</td></tr>' . "\n";
@@ -213,15 +215,15 @@ function PMA_getRelationsParam($verbose = FALSE)
. ((isset($cfgRelation['relation'])) ? $hit : sprintf($shit, 'relation')) . ((isset($cfgRelation['relation'])) ? $hit : sprintf($shit, 'relation'))
. '</td></tr>' . "\n"; . '</td></tr>' . "\n";
echo ' <tr><td colspan=2 align="center">'. $GLOBALS['strGeneralRelationFeat'] . ': ' echo ' <tr><td colspan=2 align="center">'. $GLOBALS['strGeneralRelationFeat'] . ': '
. (($cfgRelation['relwork'] == TRUE) ? $enabled : $disabled) . (($cfgRelation['relwork'] == true) ? $enabled : $disabled)
. '</td></tr>' . "\n"; . '</td></tr>' . "\n";
echo ' <tr><td>&nbsp;</td></tr>' . "\n"; echo ' <tr><td>&nbsp;</td></tr>' . "\n";
echo ' <tr><th align="left">$cfg[\'Servers\'][$i][\'table_info\'] ... </th><td align="right">' echo ' <tr><th align="left">$cfg[\'Servers\'][$i][\'table_info\'] ... </th><td align="right">'
. (($cfgRelation['displaywork'] == FALSE) ? sprintf($shit, 'table_info') : $hit) . (($cfgRelation['displaywork'] == false) ? sprintf($shit, 'table_info') : $hit)
. '</td></tr>' . "\n"; . '</td></tr>' . "\n";
echo ' <tr><td colspan=2 align="center">' . $GLOBALS['strDisplayFeat'] . ': ' echo ' <tr><td colspan=2 align="center">' . $GLOBALS['strDisplayFeat'] . ': '
. (($cfgRelation['displaywork'] == TRUE) ? $enabled : $disabled) . (($cfgRelation['displaywork'] == true) ? $enabled : $disabled)
. '</td></tr>' . "\n"; . '</td></tr>' . "\n";
echo ' <tr><td>&nbsp;</td></tr>' . "\n"; echo ' <tr><td>&nbsp;</td></tr>' . "\n";
@@ -232,7 +234,7 @@ function PMA_getRelationsParam($verbose = FALSE)
. ((isset($cfgRelation['pdf_pages'])) ? $hit : sprintf($shit, 'table_coords')) . ((isset($cfgRelation['pdf_pages'])) ? $hit : sprintf($shit, 'table_coords'))
. '</td></tr>' . "\n"; . '</td></tr>' . "\n";
echo ' <tr><td colspan=2 align="center">' . $GLOBALS['strCreatePdfFeat'] . ': ' echo ' <tr><td colspan=2 align="center">' . $GLOBALS['strCreatePdfFeat'] . ': '
. (($cfgRelation['pdfwork'] == TRUE) ? $enabled : $disabled) . (($cfgRelation['pdfwork'] == true) ? $enabled : $disabled)
. '</td></tr>' . "\n"; . '</td></tr>' . "\n";
echo ' <tr><td>&nbsp;</td></tr>' . "\n"; echo ' <tr><td>&nbsp;</td></tr>' . "\n";
@@ -240,16 +242,16 @@ function PMA_getRelationsParam($verbose = FALSE)
. ((isset($cfgRelation['column_info'])) ? $hit : sprintf($shit, 'col_com')) . ((isset($cfgRelation['column_info'])) ? $hit : sprintf($shit, 'col_com'))
. '</td></tr>' . "\n"; . '</td></tr>' . "\n";
echo ' <tr><td colspan=2 align="center">' . $GLOBALS['strColComFeat'] . ': ' echo ' <tr><td colspan=2 align="center">' . $GLOBALS['strColComFeat'] . ': '
. (($cfgRelation['commwork'] == TRUE) ? $enabled : $disabled) . (($cfgRelation['commwork'] == true) ? $enabled : $disabled)
. '</td></tr>' . "\n"; . '</td></tr>' . "\n";
echo ' <tr><td colspan=2 align="center">' . $GLOBALS['strBookmarkQuery'] . ': ' echo ' <tr><td colspan=2 align="center">' . $GLOBALS['strBookmarkQuery'] . ': '
. (($cfgRelation['bookmarkwork'] == TRUE) ? $enabled : $disabled) . (($cfgRelation['bookmarkwork'] == true) ? $enabled : $disabled)
. '</td></tr>' . "\n"; . '</td></tr>' . "\n";
echo ' <tr><th align="left">MIME ...</th><td align="right">' echo ' <tr><th align="left">MIME ...</th><td align="right">'
. (($cfgRelation['mimework'] == TRUE) ? $hit : sprintf($shit, 'col_com')) . (($cfgRelation['mimework'] == true) ? $hit : sprintf($shit, 'col_com'))
. '</td></tr>' . "\n"; . '</td></tr>' . "\n";
if (($cfgRelation['commwork'] == TRUE) && ($cfgRelation['mimework'] != TRUE)) { if (($cfgRelation['commwork'] == true) && ($cfgRelation['mimework'] != true)) {
echo '<tr><td colspan=2 align="left">' . $GLOBALS['strUpdComTab'] . '</td></tr>' . "\n"; echo '<tr><td colspan=2 align="left">' . $GLOBALS['strUpdComTab'] . '</td></tr>' . "\n";
} }
@@ -257,11 +259,11 @@ function PMA_getRelationsParam($verbose = FALSE)
. ((isset($cfgRelation['history'])) ? $hit : sprintf($shit, 'history')) . ((isset($cfgRelation['history'])) ? $hit : sprintf($shit, 'history'))
. '</td></tr>' . "\n"; . '</td></tr>' . "\n";
echo ' <tr><td colspan=2 align="center">' . $GLOBALS['strQuerySQLHistory'] . ': ' echo ' <tr><td colspan=2 align="center">' . $GLOBALS['strQuerySQLHistory'] . ': '
. (($cfgRelation['historywork'] == TRUE) ? $enabled : $disabled) . (($cfgRelation['historywork'] == true) ? $enabled : $disabled)
. '</td></tr>' . "\n"; . '</td></tr>' . "\n";
echo '</table>' . "\n"; echo '</table>' . "\n";
} // end if ($verbose == TRUE) { } // end if ($verbose == true) {
return $cfgRelation; return $cfgRelation;
} // end of the 'PMA_getRelationsParam()' function } // end of the 'PMA_getRelationsParam()' function
@@ -286,7 +288,7 @@ function PMA_getRelationsParam($verbose = FALSE)
* @author Mike Beck <mikebeck@users.sourceforge.net> and Marc Delisle * @author Mike Beck <mikebeck@users.sourceforge.net> and Marc Delisle
*/ */
function PMA_getForeigners($db, $table, $column = '', $source = 'both') { function PMA_getForeigners($db, $table, $column = '', $source = 'both') {
global $cfgRelation, $err_url_0; global $cfgRelation;
if ($cfgRelation['relwork'] && ($source == 'both' || $source == 'internal')) { if ($cfgRelation['relwork'] && ($source == 'both' || $source == 'internal')) {
$rel_query = ' $rel_query = '
@@ -366,7 +368,7 @@ function PMA_getForeigners($db, $table, $column = '', $source = 'both') {
if (PMA_MYSQL_INT_VERSION >= 50002 && $db == 'information_schema' if (PMA_MYSQL_INT_VERSION >= 50002 && $db == 'information_schema'
&& ($source == 'internal' || $source == 'both')) { && ($source == 'internal' || $source == 'both')) {
require_once('./libraries/information_schema_relations.lib.php'); require_once './libraries/information_schema_relations.lib.php';
if (!isset($foreign)) { if (!isset($foreign)) {
$foreign = array(); $foreign = array();
@@ -385,7 +387,7 @@ function PMA_getForeigners($db, $table, $column = '', $source = 'both') {
if (!empty($foreign) && is_array($foreign)) { if (!empty($foreign) && is_array($foreign)) {
return $foreign; return $foreign;
} else { } else {
return FALSE; return false;
} }
} // end of the 'PMA_getForeigners()' function } // end of the 'PMA_getForeigners()' function
@@ -441,7 +443,7 @@ function PMA_getDisplayField($db, $table) {
/** /**
* No Luck... * No Luck...
*/ */
return FALSE; return false;
} // end of the 'PMA_getDisplayField()' function } // end of the 'PMA_getDisplayField()' function
@@ -484,7 +486,7 @@ function PMA_getComments($db, $table = '') {
// pmadb internal column comments // pmadb internal column comments
// (this function can be called even if $cfgRelation['commwork'] is // (this function can be called even if $cfgRelation['commwork'] is
// FALSE, to get native column comments, so recheck here) // false, to get native column comments, so recheck here)
if ($cfgRelation['commwork']) { if ($cfgRelation['commwork']) {
$com_qry = ' $com_qry = '
SELECT column_name, SELECT column_name,
@@ -492,7 +494,7 @@ function PMA_getComments($db, $table = '') {
FROM ' . PMA_backquote($cfgRelation['db']) . '.' .PMA_backquote($cfgRelation['column_info']) . ' FROM ' . PMA_backquote($cfgRelation['db']) . '.' .PMA_backquote($cfgRelation['column_info']) . '
WHERE db_name = \'' . PMA_sqlAddslashes($db) . '\' WHERE db_name = \'' . PMA_sqlAddslashes($db) . '\'
AND table_name = \'' . PMA_sqlAddslashes($table) . '\''; AND table_name = \'' . PMA_sqlAddslashes($table) . '\'';
$com_rs = PMA_query_as_cu($com_qry, TRUE, PMA_DBI_QUERY_STORE); $com_rs = PMA_query_as_cu($com_qry, true, PMA_DBI_QUERY_STORE);
} }
} else { } else {
// pmadb internal db comments // pmadb internal db comments
@@ -502,7 +504,7 @@ function PMA_getComments($db, $table = '') {
WHERE db_name = \'' . PMA_sqlAddslashes($db) . '\' WHERE db_name = \'' . PMA_sqlAddslashes($db) . '\'
AND table_name = \'\' AND table_name = \'\'
AND column_name = \'(db_comment)\''; AND column_name = \'(db_comment)\'';
$com_rs = PMA_query_as_cu($com_qry, TRUE, PMA_DBI_QUERY_STORE); $com_rs = PMA_query_as_cu($com_qry, true, PMA_DBI_QUERY_STORE);
} }
@@ -537,7 +539,7 @@ function PMA_getComments($db, $table = '') {
if (isset($comment) && is_array($comment)) { if (isset($comment) && is_array($comment)) {
return $comment; return $comment;
} else { } else {
return FALSE; return false;
} }
} // end of the 'PMA_getComments()' function } // end of the 'PMA_getComments()' function
@@ -584,9 +586,9 @@ function PMA_setComment($db, $table, $col, $comment, $removekey = '', $mode='aut
// native mode is only for column comments so we need a table name // native mode is only for column comments so we need a table name
if ($mode == 'native' && isset($table) && strlen($table)) { if ($mode == 'native' && isset($table) && strlen($table)) {
$query = 'ALTER TABLE ' . PMA_backquote($table) . ' CHANGE ' $query = 'ALTER TABLE ' . PMA_backquote($table) . ' CHANGE '
. PMA_Table::generateAlter($col, $col, '', '', '', '', FALSE, '', FALSE, '', $comment, '', ''); . PMA_Table::generateAlter($col, $col, '', '', '', '', false, '', false, '', $comment, '', '');
PMA_DBI_try_query($query, null, PMA_DBI_QUERY_STORE); PMA_DBI_try_query($query, null, PMA_DBI_QUERY_STORE);
return TRUE; return true;
} }
// $mode == 'pmadb' section: // $mode == 'pmadb' section:
@@ -617,7 +619,7 @@ function PMA_setComment($db, $table, $col, $comment, $removekey = '', $mode='aut
WHERE ' . $cols['db_name'] . ' = \'' . PMA_sqlAddslashes($db) . '\' WHERE ' . $cols['db_name'] . ' = \'' . PMA_sqlAddslashes($db) . '\'
AND ' . $cols['table_name'] . ' = \'' . PMA_sqlAddslashes($table) . '\' AND ' . $cols['table_name'] . ' = \'' . PMA_sqlAddslashes($table) . '\'
AND ' . $cols['column_name'] . ' = \'' . PMA_sqlAddslashes($col) . '\''; AND ' . $cols['column_name'] . ' = \'' . PMA_sqlAddslashes($col) . '\'';
$test_rs = PMA_query_as_cu($test_qry, TRUE, PMA_DBI_QUERY_STORE); $test_rs = PMA_query_as_cu($test_qry, true, PMA_DBI_QUERY_STORE);
if ($test_rs && PMA_DBI_num_rows($test_rs) > 0) { if ($test_rs && PMA_DBI_num_rows($test_rs) > 0) {
$row = PMA_DBI_fetch_assoc($test_rs); $row = PMA_DBI_fetch_assoc($test_rs);