[adminer-svn] SF.net SVN: adminer:[1460] branches/sqlite/adminer

[<jak...@us...>]

Revision: 1460
          http://adminer.svn.sourceforge.net/adminer/?rev=1460&view=rev
Author:   jakubvrana
Date:     2010-04-20 21:42:20 +0000 (Tue, 20 Apr 2010)

Log Message:
-----------
Introduce ini_bool function

Modified Paths:
--------------
    branches/sqlite/adminer/drivers/pgsql.inc.php
    branches/sqlite/adminer/include/auth.inc.php
    branches/sqlite/adminer/include/bootstrap.inc.php
    branches/sqlite/adminer/include/functions.inc.php
    branches/sqlite/adminer/sql.inc.php

Modified: branches/sqlite/adminer/drivers/pgsql.inc.php
===================================================================
--- branches/sqlite/adminer/drivers/pgsql.inc.php	2010-04-19 19:34:05 UTC (rev 1459)
+++ branches/sqlite/adminer/drivers/pgsql.inc.php	2010-04-20 21:42:20 UTC (rev 1460)
@@ -12,7 +12,7 @@
 			var $extension = "PgSQL", $_link, $_result, $_string, $_database = true, $server_info, $affected_rows, $error;
 			
 			function _error($errno, $error) {
-				if (ini_get("html_errors")) {
+				if (ini_bool("html_errors")) {
 					$error = html_entity_decode(strip_tags($error));
 				}
 				$error = ereg_replace('^[^:]*: ', '', $error);

Modified: branches/sqlite/adminer/include/auth.inc.php
===================================================================
--- branches/sqlite/adminer/include/auth.inc.php	2010-04-19 19:34:05 UTC (rev 1459)
+++ branches/sqlite/adminer/include/auth.inc.php	2010-04-20 21:42:20 UTC (rev 1460)
@@ -61,7 +61,7 @@
 	global $connection, $adminer, $token;
 	$session_name = session_name();
 	$error = "";
-	if (!$_COOKIE[$session_name] && $_GET[$session_name] && ini_get("session.use_only_cookies")) {
+	if (!$_COOKIE[$session_name] && $_GET[$session_name] && ini_bool("session.use_only_cookies")) {
 		$error = lang('Session support must be enabled.');
 	} elseif (isset($_GET["username"])) {
 		if (($_COOKIE[$session_name] || $_GET[$session_name]) && !$token) {

Modified: branches/sqlite/adminer/include/bootstrap.inc.php
===================================================================
--- branches/sqlite/adminer/include/bootstrap.inc.php	2010-04-19 19:34:05 UTC (rev 1459)
+++ branches/sqlite/adminer/include/bootstrap.inc.php	2010-04-20 21:42:20 UTC (rev 1460)
@@ -39,12 +39,14 @@
 	exit;
 }
 
+include "../adminer/include/functions.inc.php";
+
 if (!isset($_SERVER["REQUEST_URI"])) {
 	$_SERVER["REQUEST_URI"] = $_SERVER["ORIG_PATH_INFO"] . ($_SERVER["QUERY_STRING"] != "" ? "?$_SERVER[QUERY_STRING]" : ""); // IIS 5 compatibility
 }
 
 @ini_set("session.use_trans_sid", false); // protect links in export, @ - may be disabled
-if (!ini_get("session.auto_start")) {
+if (!ini_bool("session.auto_start")) {
 	session_name("adminer_sid"); // use specific session name to get own namespace
 	$params = array(0, preg_replace('~\\?.*~', '', $_SERVER["REQUEST_URI"]), "", $_SERVER["HTTPS"] && strcasecmp($_SERVER["HTTPS"], "off"));
 	if (version_compare(PHP_VERSION, '5.2.0') >= 0) {
@@ -75,7 +77,6 @@
 }
 @set_time_limit(0); // @ - can be disabled
 
-include "../adminer/include/functions.inc.php";
 include "../adminer/include/lang.inc.php";
 include "../adminer/lang/$LANG.inc.php";
 include "../adminer/include/pdo.inc.php";
@@ -103,7 +104,7 @@
 include "./include/export.inc.php";
 
 session_cache_limiter(""); // to allow restarting session
-if (!ini_get("session.use_cookies") || @ini_set("session.use_cookies", false) !== false) { // @ - may be disabled
+if (!ini_bool("session.use_cookies") || @ini_set("session.use_cookies", false) !== false) { // @ - may be disabled
 	session_write_close(); // improves concurrency if a user opens several pages at once, may be restarted later
 }
 

Modified: branches/sqlite/adminer/include/functions.inc.php
===================================================================
--- branches/sqlite/adminer/include/functions.inc.php	2010-04-19 19:34:05 UTC (rev 1459)
+++ branches/sqlite/adminer/include/functions.inc.php	2010-04-20 21:42:20 UTC (rev 1460)
@@ -115,6 +115,15 @@
 	return $return;
 }
 
+/** Get INI boolean value
+* @param string
+* @return bool
+*/
+function ini_bool($ini) {
+	$val = ini_get($ini);
+	return (eregi('^(on|true|yes)$', $val) || (int) $val); // boolean values set by php_value are strings
+}
+
 /** Get list of values from database
 * @param string
 * @param mixed
@@ -236,7 +245,7 @@
 * @return null
 */
 function restart_session() {
-	if (!ini_get("session.use_cookies")) {
+	if (!ini_bool("session.use_cookies")) {
 		session_start();
 	}
 }
@@ -502,7 +511,7 @@
 				$checked = (is_int($value) ? ($value >> $i) & 1 : in_array($val, explode(",", $value), true));
 				echo " <label><input type='checkbox' name='fields[$name][$i]' value='" . (1 << $i) . "'" . ($checked ? ' checked' : '') . "$onchange>" . h($val) . '</label>';
 			}
-		} elseif (ereg('binary|blob|bytea', $field["type"]) && ini_get("file_uploads")) {
+		} elseif (ereg('binary|blob|bytea', $field["type"]) && ini_bool("file_uploads")) {
 			echo "<input type='file' name='fields-$name'$onchange>";
 		} elseif (ereg('text|blob', $field["type"])) {
 			echo "<textarea cols='50' rows='" . ($driver != "sqlite" || ereg("\n", $value) ? 12 : 1) . "'$attrs>" . h($value) . '</textarea>';
@@ -544,7 +553,7 @@
 	if ($field["type"] == "set") {
 		return array_sum((array) $value);
 	}
-	if (ereg('binary|blob|bytea', $field["type"]) && ini_get("file_uploads")) {
+	if (ereg('binary|blob|bytea', $field["type"]) && ini_bool("file_uploads")) {
 		$file = get_file("fields-$idf");
 		if (!is_string($file)) {
 			return false; //! report errors

Modified: branches/sqlite/adminer/sql.inc.php
===================================================================
--- branches/sqlite/adminer/sql.inc.php	2010-04-19 19:34:05 UTC (rev 1459)
+++ branches/sqlite/adminer/sql.inc.php	2010-04-20 21:42:20 UTC (rev 1460)
@@ -29,7 +29,7 @@
 			$history[] = $query;
 		}
 		$space = "(\\s|/\\*.*\\*/|(#|-- )[^\n]*\n|--\n)";
-		if (!ini_get("session.use_cookies")) {
+		if (!ini_bool("session.use_cookies")) {
 			session_write_close();
 		}
 		$delimiter = ";";
@@ -145,7 +145,7 @@
 
 <p>
 <?php
-if (!ini_get("file_uploads")) {
+if (!ini_bool("file_uploads")) {
 	echo lang('File uploads are disabled.');
 } else { ?>
 <?php echo lang('File upload'); ?>: <input type="file" name="sql_file">


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.