Skip to content

Commit

Permalink
The '' is now required
Browse files Browse the repository at this point in the history
  • Loading branch information
Loïc Chapeaux committed Mar 16, 2002
1 parent 65b3f3c commit 99bfd93
Show file tree
Hide file tree
Showing 41 changed files with 74 additions and 27 deletions.
5 changes: 5 additions & 0 deletions ChangeLog
Expand Up @@ -5,6 +5,11 @@ phpMyAdmin - Changelog
$Id$
$Source$

2002-03-16 Lo�c Chapeaux <lolo@phpheaven.net>
* header.inc.php3, line 76; main.php3, lines 13-24; lang/*;
libraries/common.lib.php3, lines 146-150 & 367-387: the
"$cfgPmaAbsoluteUri" is now required.

2002-03-14 Steve Alberty <alberty@neptunelabs.de>
* main.php3: fix warning with undefined $cfgPmaAbsoluteUri

Expand Down
7 changes: 4 additions & 3 deletions header.inc.php3
Expand Up @@ -59,20 +59,21 @@ if (!empty($cfgPmaAbsoluteUri)) {
<!--
body {font-family: <?php echo $right_font_family; ?>; font-size: <?php echo $font_size; ?>; color: #000000}
pre, tt {font-size: <?php echo $font_size; ?>}
th {font-family: <?php echo $right_font_family; ?>; font-size: <?php echo $font_size; ?>; font-weight: bold; background-color: <?php echo $cfgThBgcolor;?>}
th {font-family: <?php echo $right_font_family; ?>; font-size: <?php echo $font_size; ?>; font-weight: bold; background-color: <?php echo $cfgThBgcolor; ?>}
td {font-family: <?php echo $right_font_family; ?>; font-size: <?php echo $font_size; ?>}
form {font-family: <?php echo $right_font_family; ?>; font-size: <?php echo $font_size; ?>}
input {font-family: <?php echo $right_font_family; ?>; font-size: <?php echo $font_size; ?>; color: #000000}
select {font-family: <?php echo $right_font_family; ?>; font-size: <?php echo $font_size; ?>; color: #000000}
textarea {font-family: <?php echo $right_font_family; ?>; font-size: <?php echo $font_size; ?>; color: #000000}
h1 {font-family: <?php echo $right_font_family; ?>; font-size: <?php echo $font_bigger; ?>; font-weight: bold}
A:link {font-family: <?php echo $right_font_family; ?>; font-size: <?php echo $font_size; ?>; text-decoration: none; color: #0000ff}
A:visited {font-family: <?php echo $right_font_family; ?>; font-size: <?php echo $font_size; ?>; text-decoration: none; color: #0000ff}
A:link {font-family: <?php echo $right_font_family; ?>; font-size: <?php echo $font_size; ?>; text-decoration: none; color: #0000FF}
A:visited {font-family: <?php echo $right_font_family; ?>; font-size: <?php echo $font_size; ?>; text-decoration: none; color: #0000FF}
A:hover {font-family: <?php echo $right_font_family; ?>; font-size: <?php echo $font_size; ?>; text-decoration: underline; color: #FF0000}
A:link.nav {font-family: <?php echo $right_font_family; ?>; color: #000000}
A:visited.nav {font-family: <?php echo $right_font_family; ?>; color: #000000}
A:hover.nav {font-family: <?php echo $right_font_family; ?>; color: #FF0000}
.nav {font-family: <?php echo $right_font_family; ?>; color: #000000}
.warning {font-family: <?php echo $right_font_family; ?>; font-size: <?php echo $font_size; ?>; font-weight: bold; color: #FF0000}
//-->
</style>

Expand Down
1 change: 1 addition & 0 deletions lang/arabic.inc.php3
Expand Up @@ -345,6 +345,7 @@ $strCookiesRequired = 'Cookies must be enabled past this point.';
$strLogin = 'Login';
$strLogPassword = 'Password:';
$strLogUsername = 'Username:';
$strPmaUriError = 'The <tt>$cfgPmaAbsoluteUri</tt> directive MUST be set in your configuration file!';
$strRowsModeVertical = 'vertical'; //to translate
$strRowsModeHorizontal = 'horizontal'; //to translate
$strRowsModeOptions = ' in %s mode and repeat headers after %s cells'; //to translate
Expand Down
1 change: 1 addition & 0 deletions lang/brazilian_portuguese.inc.php3
Expand Up @@ -348,4 +348,5 @@ $strZip = '"compactado com zip"';

// To translate
$strChangePassword = 'Change password'; //to translate
$strPmaUriError = 'The <tt>$cfgPmaAbsoluteUri</tt> directive MUST be set in your configuration file!';
?>
1 change: 1 addition & 0 deletions lang/bulgarian-koi8.inc.php3
Expand Up @@ -348,4 +348,5 @@ $strZip = '"zip-
// To translate
$strChangePassword = 'Change password';
$strDatabaseWildcard = 'Database (wildcards allowed):'; //to translate
$strPmaUriError = 'The <tt>$cfgPmaAbsoluteUri</tt> directive MUST be set in your configuration file!';
?>
1 change: 1 addition & 0 deletions lang/bulgarian-win1251.inc.php3
Expand Up @@ -348,4 +348,5 @@ $strZip = '"zip-
// To translate
$strChangePassword = 'Change password';
$strDatabaseWildcard = 'Database (wildcards allowed):'; //to translate
$strPmaUriError = 'The <tt>$cfgPmaAbsoluteUri</tt> directive MUST be set in your configuration file!';
?>
1 change: 1 addition & 0 deletions lang/catala.inc.php3
Expand Up @@ -347,4 +347,5 @@ $strYes = 'Si';
$strZip = '"comprimit amb zip"';

// To translate
$strPmaUriError = 'The <tt>$cfgPmaAbsoluteUri</tt> directive MUST be set in your configuration file!';
?>
1 change: 1 addition & 0 deletions lang/chinese_big5.inc.php3
Expand Up @@ -349,4 +349,5 @@ $strYes = '
$strZip = '"zipped"';

// To translate
$strPmaUriError = 'The <tt>$cfgPmaAbsoluteUri</tt> directive MUST be set in your configuration file!';
?>
1 change: 1 addition & 0 deletions lang/chinese_gb.inc.php3
Expand Up @@ -308,6 +308,7 @@ $strNoModification = 'No change';
$strNoQuery = 'No SQL query!'; //to translate
$strPartialText = 'Partial Texts';//to translate
$strPmaDocumentation = 'phpMyAdmin Documentation';//to translate
$strPmaUriError = 'The <tt>$cfgPmaAbsoluteUri</tt> directive MUST be set in your configuration file!';
$strPrimaryKeyHasBeenDropped = 'The primary key has been dropped';//to translate
$strQueryOnDb = 'SQL-query on database <b>%s</b>:';
$strRowSize = ' Row size '; //to translate
Expand Down
1 change: 1 addition & 0 deletions lang/czech-iso.inc.php3
Expand Up @@ -347,4 +347,5 @@ $strYes = 'Ano';
$strZip = '"zazipováno"';

// To translate
$strPmaUriError = 'The <tt>$cfgPmaAbsoluteUri</tt> directive MUST be set in your configuration file!';
?>
1 change: 1 addition & 0 deletions lang/czech-win1250.inc.php3
Expand Up @@ -347,4 +347,5 @@ $strYes = 'Ano';
$strZip = '"zazipováno"';

// To translate
$strPmaUriError = 'The <tt>$cfgPmaAbsoluteUri</tt> directive MUST be set in your configuration file!';
?>
3 changes: 2 additions & 1 deletion lang/danish.inc.php3
Expand Up @@ -341,10 +341,11 @@ $strAddToIndex = 'Add to index &nbsp;%s&nbsp;column(s)';
$strCantRenameIdxToPrimary = 'Can\'t rename index to PRIMARY!';
$strChangePassword = 'Change password';
$strCreateIndex = 'Create an index on&nbsp;%s&nbsp;columns';
$strDatabaseWildcard = 'Database (wildcards allowed):'; //to translate
$strNoIndexPartsDefined = 'No index parts defined!';
$strPmaUriError = 'The <tt>$cfgPmaAbsoluteUri</tt> directive MUST be set in your configuration file!';
$strPrimaryKeyWarning = '("PRIMARY" <b>must</b> be the name of and <b>only of</b> a primary key!)';
$strSelectADb = 'Please select a database';
$strSelectAll = 'Select All'; //to translate
$strUnselectAll = 'Unselect All'; //to translate
$strDatabaseWildcard = 'Database (wildcards allowed):'; //to translate
?>
1 change: 1 addition & 0 deletions lang/dutch.inc.php3
Expand Up @@ -310,6 +310,7 @@ $strMySQLServerProcess = 'MySQL %pma_s1% running on %pma_s2% as %pma_s3%';
$strNoDropDatabases = '"DROP DATABASE" statements zijn niet mogelijk.'; //to translate
$strNoFrames = 'phpMyAdmin is more friendly with a <b>frames-capable</b> browser.';
$strNoQuery = 'No SQL query!'; //to translate
$strPmaUriError = 'The <tt>$cfgPmaAbsoluteUri</tt> directive MUST be set in your configuration file!';
$strPrimaryKeyHasBeenDropped = 'The primary key has been dropped';//to translate
$strRowsModeHorizontal = 'horizontal'; //to translate
$strRowsModeOptions = 'in %s mode and repeat headers after %s cells'; //to translate
Expand Down
1 change: 1 addition & 0 deletions lang/english.inc.php3
Expand Up @@ -224,6 +224,7 @@ $strPasswordEmpty = 'The password is empty!';
$strPasswordNotSame = 'The passwords aren\'t the same!';
$strPHPVersion = 'PHP Version';
$strPmaDocumentation = 'phpMyAdmin documentation';
$strPmaUriError = 'The <tt>$cfgPmaAbsoluteUri</tt> directive MUST be set in your configuration file!';
$strPos1 = 'Begin';
$strPrevious = 'Previous';
$strPrimary = 'Primary';
Expand Down
4 changes: 3 additions & 1 deletion lang/estonian.inc.php3
Expand Up @@ -203,7 +203,7 @@ $strNoModification = 'Ei muudetud';
$strNone = 'Ühtegi';
$strNoPassword = 'Ühtegi parooli';
$strNoPrivileges = 'Ühtegi privileegi';
$strNoQuery = 'Ühtegi SQL päringut!'; //to translate
$strNoQuery = 'Ühtegi SQL päringut!';
$strNoRights = 'Teil pole piisavalt õigusi, et hetkel siin olla!';
$strNoTablesFound = 'Andmebaasist ei leitud tabeleid.';
$strNotNumber = 'See pole number!';
Expand Down Expand Up @@ -346,4 +346,6 @@ $strYes = 'Jah';

$strZip = '"zipitud"';

// To translate
$strPmaUriError = 'The <tt>$cfgPmaAbsoluteUri</tt> directive MUST be set in your configuration file!';
?>
1 change: 1 addition & 0 deletions lang/finnish.inc.php3
Expand Up @@ -352,4 +352,5 @@ $strZip = '"zip-pakattu"';

// To translate
$strChangePassword = 'Vaihda salasanaa';
$strPmaUriError = 'The <tt>$cfgPmaAbsoluteUri</tt> directive MUST be set in your configuration file!';
?>
1 change: 1 addition & 0 deletions lang/french.inc.php3
Expand Up @@ -224,6 +224,7 @@ $strPasswordEmpty = 'Le mot de passe est vide';
$strPasswordNotSame = 'Les mots de passe doivent être identiques';
$strPHPVersion = 'Version de PHP';
$strPmaDocumentation = 'Documentation de phpMyAdmin';
$strPmaUriError = 'Le paramètre <tt>$cfgPmaAbsoluteUri</tt> DOIT être renseigné dans votre fichier de configuration !';
$strPos1 = 'Début';
$strPrevious = 'Précédent';
$strPrimary = 'Primaire';
Expand Down
1 change: 1 addition & 0 deletions lang/galician.inc.php3
Expand Up @@ -351,4 +351,5 @@ $strCardinality = 'Cardinality';
$strLogin = 'Login';
$strLogPassword = 'Password:';
$strLogUsername = 'Username:';
$strPmaUriError = 'The <tt>$cfgPmaAbsoluteUri</tt> directive MUST be set in your configuration file!';
?>
1 change: 1 addition & 0 deletions lang/german.inc.php3
Expand Up @@ -347,4 +347,5 @@ $strYes = 'Ja';
$strZip = '"Zip komprimiert"';

// To translate
$strPmaUriError = 'The <tt>$cfgPmaAbsoluteUri</tt> directive MUST be set in your configuration file!';
?>
3 changes: 2 additions & 1 deletion lang/greek.inc.php3
Expand Up @@ -297,6 +297,7 @@ $strChangePassword = 'Change password';
$strCookiesRequired = 'Cookies must be enabled past this point.';
$strCopyTable = 'Copy table to (database<b>.</b>table):';
$strDatabaseHasBeenDropped = 'Database %s has been dropped.'; //to translate
$strDatabaseWildcard = 'Database (wildcards allowed):'; //to translate
$strDeleteUserMessage = 'You have deleted the user %s.';//to translate
$strFieldHasBeenDropped = 'Field %s has been dropped';//to translate
$strFieldsEnclosedBy = 'Fields enclosed by';//to translate
Expand All @@ -314,6 +315,7 @@ $strMoveTableOK = 'Table %s has been moved to %s.';
$strMySQLServerProcess = 'MySQL %pma_s1% running on %pma_s2% as %pma_s3%';
$strNoFrames = 'phpMyAdmin is more friendly with a <b>frames-capable</b> browser.';
$strNoQuery = 'No SQL query!'; //to translate
$strPmaUriError = 'The <tt>$cfgPmaAbsoluteUri</tt> directive MUST be set in your configuration file!';
$strPrimaryKeyHasBeenDropped = 'The primary key has been dropped';//to translate
$strRowsModeHorizontal = 'horizontal'; //to translate
$strRowsModeOptions = 'in %s mode and repeat headers after %s cells'; //to translate
Expand Down Expand Up @@ -348,5 +350,4 @@ $strNoIndexPartsDefined = 'No index parts defined!';
$strNoIndex = 'No index defined!';
$strPrimaryKeyName = 'The name of the primary key must be... PRIMARY!';
$strPrimaryKeyWarning = '("PRIMARY" <b>must</b> be the name of and <b>only of</b> a primary key!)';
$strDatabaseWildcard = 'Database (wildcards allowed):'; //to translate
?>
1 change: 1 addition & 0 deletions lang/hebrew.inc.php3
Expand Up @@ -347,4 +347,5 @@ $strZip = '"Zipped"';

// To translate
$strChangePassword = 'Change password';
$strPmaUriError = 'The <tt>$cfgPmaAbsoluteUri</tt> directive MUST be set in your configuration file!';
?>
1 change: 1 addition & 0 deletions lang/hungarian.inc.php3
Expand Up @@ -348,4 +348,5 @@ $strYes = 'Igen';
$strZip = '"zippel tömörítve"';

// To translate
$strPmaUriError = 'The <tt>$cfgPmaAbsoluteUri</tt> directive MUST be set in your configuration file!';
?>
1 change: 1 addition & 0 deletions lang/italian.inc.php3
Expand Up @@ -350,4 +350,5 @@ $strZip = '"compresso con zip"';


// To translate
$strPmaUriError = 'The <tt>$cfgPmaAbsoluteUri</tt> directive MUST be set in your configuration file!';
?>
1 change: 1 addition & 0 deletions lang/japanese-euc.inc.php3
Expand Up @@ -352,4 +352,5 @@ $strKanjiEncodConvert = '
$strXkana = '全角カナへ変換する'; // convert to X208-kana

// To translate
$strPmaUriError = 'The <tt>$cfgPmaAbsoluteUri</tt> directive MUST be set in your configuration file!';
?>
1 change: 1 addition & 0 deletions lang/japanese-sjis.inc.php3
Expand Up @@ -352,4 +352,5 @@ $strKanjiEncodConvert = '
$strXkana = '全角カナへ変換する'; // convert to X208-kana

// To translate
$strPmaUriError = 'The <tt>$cfgPmaAbsoluteUri</tt> directive MUST be set in your configuration file!';
?>
3 changes: 2 additions & 1 deletion lang/korean.inc.php3
Expand Up @@ -273,6 +273,7 @@ $strCookiesRequired = 'Cookies must be enabled past this point.';
$strCopyTable = 'Copy table to (database<b>.</b>table):';
$strDatabaseHasBeenDropped = 'Database %s has been dropped.'; //to translate
$strDatabasesStats = 'Databases statistics';//to translate
$strDatabaseWildcard = 'Database (wildcards allowed):'; //to translate
$strDeletedRows = 'Deleted rows:';
$strDeleteUserMessage = 'You have deleted the user %s.';//to translate
$strDisplayOrder = 'Display order:';
Expand Down Expand Up @@ -307,6 +308,7 @@ $strNoModification = 'No change'; // To translate
$strNoQuery = 'No SQL query!'; //to translate
$strPartialText = 'Partial Texts';//to translate
$strPmaDocumentation = 'phpMyAdmin Documentation';//to translate
$strPmaUriError = 'The <tt>$cfgPmaAbsoluteUri</tt> directive MUST be set in your configuration file!';
$strPrimaryKeyHasBeenDropped = 'The primary key has been dropped';//to translate
$strQueryOnDb = 'SQL-query on database <b>%s</b>:';
$strRowSize = ' Row size '; //to translate
Expand Down Expand Up @@ -351,5 +353,4 @@ $strNoIndexPartsDefined = 'No index parts defined!';
$strNoIndex = 'No index defined!';
$strPrimaryKeyName = 'The name of the primary key must be... PRIMARY!';
$strPrimaryKeyWarning = '("PRIMARY" <b>must</b> be the name of and <b>only of</b> a primary key!)';
$strDatabaseWildcard = 'Database (wildcards allowed):'; //to translate
?>
1 change: 1 addition & 0 deletions lang/norwegian.inc.php3
Expand Up @@ -346,4 +346,5 @@ $strYes = 'Ja';
$strZip = '"komprimert (zip)"';

// To translate
$strPmaUriError = 'The <tt>$cfgPmaAbsoluteUri</tt> directive MUST be set in your configuration file!';
?>
1 change: 1 addition & 0 deletions lang/polish.inc.php3
Expand Up @@ -347,4 +347,5 @@ $strYes = 'Tak';
$strZip = '".zip"';

// To translate
$strPmaUriError = 'The <tt>$cfgPmaAbsoluteUri</tt> directive MUST be set in your configuration file!';
?>
1 change: 1 addition & 0 deletions lang/portuguese.inc.php3
Expand Up @@ -346,5 +346,6 @@ $strBzip = '"bzipped"'; //to translate
$strChangePassword = 'Change password';
$strGzip = '"gzipped"'; //to translate
$strHomepageSourceforge = 'Sourceforge phpMyAdmin Download Page'; //to translate
$strPmaUriError = 'The <tt>$cfgPmaAbsoluteUri</tt> directive MUST be set in your configuration file!';
$strZip = '"zipped"'; //to translate
?>
1 change: 1 addition & 0 deletions lang/romanian.inc.php3
Expand Up @@ -348,4 +348,5 @@ $strZip = '"zipped"';

// To translate
$strDatabaseWildcard = 'Database (wildcards allowed):'; //to translate
$strPmaUriError = 'The <tt>$cfgPmaAbsoluteUri</tt> directive MUST be set in your configuration file!';
?>
1 change: 1 addition & 0 deletions lang/russian-koi8.inc.php3
Expand Up @@ -347,4 +347,5 @@ $strZip = '
// To translate
$strChangePassword = 'Change password';
$strDatabaseWildcard = 'Database (wildcards allowed):'; //to translate
$strPmaUriError = 'The <tt>$cfgPmaAbsoluteUri</tt> directive MUST be set in your configuration file!';
?>
1 change: 1 addition & 0 deletions lang/russian-win1251.inc.php3
Expand Up @@ -347,4 +347,5 @@ $strZip = '
// To translate
$strChangePassword = 'Change password';
$strDatabaseWildcard = 'Database (wildcards allowed):'; //to translate
$strPmaUriError = 'The <tt>$cfgPmaAbsoluteUri</tt> directive MUST be set in your configuration file!';
?>
1 change: 1 addition & 0 deletions lang/slovak-iso.inc.php3
Expand Up @@ -350,4 +350,5 @@ $strZip = '"zo zipovan


// To translate
$strPmaUriError = 'The <tt>$cfgPmaAbsoluteUri</tt> directive MUST be set in your configuration file!';
?>
1 change: 1 addition & 0 deletions lang/slovak-win1250.inc.php3
Expand Up @@ -347,4 +347,5 @@ $strZip = '"zozipovan
// To translate
$strChangePassword = 'Change password';
$strDatabaseWildcard = 'Database (wildcards allowed):'; //to translate
$strPmaUriError = 'The <tt>$cfgPmaAbsoluteUri</tt> directive MUST be set in your configuration file!';
?>
2 changes: 1 addition & 1 deletion lang/spanish.inc.php3
Expand Up @@ -345,5 +345,5 @@ $strZip = '"comprimido con zip"';

// To translate
$strFlushTable = 'Flush the table ("FLUSH")';//to translate

$strPmaUriError = 'The <tt>$cfgPmaAbsoluteUri</tt> directive MUST be set in your configuration file!';
?>
1 change: 1 addition & 0 deletions lang/swedish.inc.php3
Expand Up @@ -347,4 +347,5 @@ $strYes = 'Ja';
$strZip = '"zippad"';

// To translate
$strPmaUriError = 'The <tt>$cfgPmaAbsoluteUri</tt> directive MUST be set in your configuration file!';
?>
3 changes: 2 additions & 1 deletion lang/thai.inc.php3
Expand Up @@ -273,6 +273,7 @@ $strCookiesRequired = 'Cookies must be enabled past this point.';
$strCopyTable = 'Copy table to (database<b>.</b>table):';
$strDatabaseHasBeenDropped = 'Database %s has been dropped.'; //to translate
$strDatabasesStats = 'Databases statistics';//to translate
$strDatabaseWildcard = 'Database (wildcards allowed):'; //to translate
$strDeletedRows = 'Deleted rows:';
$strDeleteUserMessage = 'You have deleted the user %s.';//to translate
$strDisplayOrder = 'Display order:';
Expand Down Expand Up @@ -308,6 +309,7 @@ $strNoModification = 'No change'; // To translate
$strNoQuery = 'No SQL query!'; //to translate
$strPartialText = 'Partial Texts';//to translate
$strPmaDocumentation = 'phpMyAdmin Documentation';//to translate
$strPmaUriError = 'The <tt>$cfgPmaAbsoluteUri</tt> directive MUST be set in your configuration file!';
$strPrimaryKeyHasBeenDropped = 'The primary key has been dropped';//to translate
$strQueryOnDb = 'SQL-query on database <b>%s</b>:';
$strRowSize = ' Row size '; //to translate
Expand Down Expand Up @@ -352,5 +354,4 @@ $strNoIndexPartsDefined = 'No index parts defined!';
$strNoIndex = 'No index defined!';
$strPrimaryKeyName = 'The name of the primary key must be... PRIMARY!';
$strPrimaryKeyWarning = '("PRIMARY" <b>must</b> be the name of and <b>only of</b> a primary key!)';
$strDatabaseWildcard = 'Database (wildcards allowed):'; //to translate
?>
1 change: 1 addition & 0 deletions lang/turkish.inc.php3
Expand Up @@ -347,4 +347,5 @@ $strYes = 'Evet';
$strZip = '"ziplenmiş"';

// To translate
$strPmaUriError = 'The <tt>$cfgPmaAbsoluteUri</tt> directive MUST be set in your configuration file!';
?>
1 change: 1 addition & 0 deletions lang/ukrainian-win1251.inc.php3
Expand Up @@ -347,4 +347,5 @@ $strYes = '
$strZip = 'запакувати в "zip"';

// To translate
$strPmaUriError = 'The <tt>$cfgPmaAbsoluteUri</tt> directive MUST be set in your configuration file!';
?>
26 changes: 20 additions & 6 deletions libraries/common.lib.php3
Expand Up @@ -143,12 +143,6 @@ if (!defined('PMA_COMMON_LIB_INCLUDED')){
$cfgLeftFrameLight = TRUE;
}

// Adds a trailing slash et the end of the phpMyAdmin uri if it does not
// exist
if ($cfgPmaAbsoluteUri != '' && substr($cfgPmaAbsoluteUri, -1) != '/') {
$cfgPmaAbsoluteUri .= '/';
}

// Gets some constants
include('./libraries/defines.lib.php3');

Expand Down Expand Up @@ -370,6 +364,26 @@ if (!defined('PMA_COMMON_LIB_INCLUDED')){
} // end of the 'PMA_setFontSizes()' function


/**
* $cfgPmaAbsoluteUri is a required directive else cookies won't be set
* properly and, depending on browsers, inserting or updating a record
* record might fail
*/
if (empty($cfgPmaAbsoluteUri)) {
if (empty($GLOBALS['is_header_sent'])) {
include('./header.inc.php3');
}
echo '<p class="warning">'. $strPmaUriError . '</p>' . "\n";
include('./footer.inc.php3');
exit();
}
// Adds a trailing slash et the end of the phpMyAdmin uri if it does not
// exist
else if (substr($cfgPmaAbsoluteUri, -1) != '/') {
$cfgPmaAbsoluteUri .= '/';
}


/**
* Use mysql_connect() or mysql_pconnect()?
*/
Expand Down
14 changes: 2 additions & 12 deletions main.php3
Expand Up @@ -10,18 +10,8 @@ require('./libraries/common.lib.php3');
// Puts the language to use in a cookie that will expire in 30 days
if (!isset($pma_uri_parts)) {
$pma_uri_parts = parse_url($cfgPmaAbsoluteUri);
if (isset($pma_uri_parts['path'])) {
$cookie_path = substr($pma_uri_parts['path'], 0, strrpos($pma_uri_parts['path'], '/'));
}
else {
$cookie_path = '';
}
if (isset($pma_uri_parts['scheme'])) {
$is_https = ($pma_uri_parts['scheme'] == 'https') ? 1 : 0;
}
else {
$is_https = 0;
}
$cookie_path = substr($pma_uri_parts['path'], 0, strrpos($pma_uri_parts['path'], '/'));
$is_https = ($pma_uri_parts['scheme'] == 'https') ? 1 : 0;
}
setcookie('lang', $lang, time() + 60*60*24*30, $cookie_path, '', $is_https);
// Defines the "item" image depending on text direction
Expand Down

0 comments on commit 99bfd93

Please sign in to comment.