mirror/php-adminer
1
0
Fork 0
mirror of https://github.com/vrana/adminer.git synced 2025-08-16 19:44:00 +02:00
Code Issues Releases Wiki Activity

Merge branch 'master' into ajax

Browse Source
This commit is contained in:
Jakub Vrana
2010-10-19 01:45:48 +02:00
parent c313dd83a2 1b66afcb82
commit dfa1a98829
20 changed files with 30 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
adminer/include/bootstrap.inc.php
View File

@@ -43,6 +43,7 @@ if (function_exists("set_magic_quotes_runtime")) {
set_magic_quotes_runtime(false);
}
@set_time_limit(0); // @ - can be disabled
@ini_set("zend.ze1_compatibility_mode", false); // @ - deprecated
include "../adminer/include/lang.inc.php";
include "../adminer/lang/$LANG.inc.php";
@@ -77,4 +78,3 @@ if (!ini_bool("session.use_cookies") || @ini_set("session.use_cookies", false) !
}
$on_actions = array("RESTRICT", "CASCADE", "SET NULL", "NO ACTION"); ///< @var array used in foreign_keys()
$confirm = " onclick=\"return confirm('" . lang('Are you sure?') . "');\""; ///< @var string

2
adminer/include/connect.inc.php
View File

@@ -39,7 +39,7 @@ function connect_error() {
echo "\n";
}
echo "</table>\n";
echo "<p><input type='submit' name='drop' value='" . lang('Drop') . "' onclick=\"return confirm('" . lang('Are you sure?') . " (' + formChecked(this, /db/) + ')');\">\n";
echo "<p><input type='submit' name='drop' value='" . lang('Drop') . "'" . confirm("formChecked(this, /db/)") . ">\n";
echo "</form>\n";
}
}

8
adminer/include/functions.inc.php
View File

@@ -135,6 +135,14 @@ function html_select($name, $options, $value = "", $onchange = true) {
return $return;
}
/** Get onclick confirmation
* @param string JavaScript expression
* @return string
*/
function confirm($count = "") {
return " onclick=\"return confirm('" . lang('Are you sure?') . ($count ? " (' + $count + ')" : "") . "');\"";
}
/** Get INI boolean value
* @param string
* @return bool

2
adminer/include/version.inc.php
View File

@@ -1,2 +1,2 @@
<?php
$VERSION = "3.0.1-dev";
$VERSION = "3.0.2-dev";