Skip to content

Commit 80b8d17

Browse files
committed
added ability to set socket for db connection
1 parent 6f60890 commit 80b8d17

File tree

2 files changed

+14
-19
lines changed

2 files changed

+14
-19
lines changed

phpminiadmin.php

Lines changed: 13 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php
22
/*
33
PHP Mini MySQL Admin
4-
(c) 2004-2017 Oleg Savchuk <osalabs@gmail.com> http://osalabs.com
4+
(c) 2004-2019 Oleg Savchuk <osalabs@gmail.com> http://osalabs.com
55
66
Light standalone PHP script for quick and easy access MySQL databases.
77
http://phpminiadmin.sourceforge.net
@@ -19,6 +19,7 @@
1919
'db'=>"", #optional, default DB
2020
'host'=>"",#optional
2121
'port'=>"",#optional
22+
'socket'=>"",#optional
2223
'chset'=>"utf8",#optional, default charset
2324
);
2425
$IS_COUNT=false; #set to true if you want to see Total records when pagination occurs (SLOWS down all select queries!)
@@ -27,7 +28,7 @@
2728
if (function_exists('date_default_timezone_set')) date_default_timezone_set('UTC');#required by PHP 5.1+
2829

2930
//constants
30-
$VERSION='1.9.170730';
31+
$VERSION='1.9.190822';
3132
$MAX_ROWS_PER_PAGE=50; #max number of rows in select per one page
3233
$D="\r\n"; #default delimiter for export
3334
$BOM=chr(239).chr(187).chr(191);
@@ -293,7 +294,7 @@ function print_header(){
293294
tr.h{background-color:#99C}
294295
tr.s{background-color:#FF9}
295296
.err{color:#F33;font-weight:bold;text-align:center}
296-
.frm{width:400px;border:1px solid #999;background-color:#eee;text-align:left}
297+
.frm{width:450px;border:1px solid #999;background-color:#eee;text-align:left}
297298
.frm label .l{width:100px;float:left}
298299
.dot{border-bottom:1px dotted #000}
299300
.ajax{text-decoration:none;border-bottom: 1px dashed}
@@ -539,7 +540,7 @@ function print_cfg(){
539540
<div style="text-align:right"><a href="#" class="ajax" onclick="cfg_toggle()">advanced settings</a></div>
540541
<div id="cfg-adv" style="display:none;">
541542
<label><div class="l">DB name:</div><input type="text" name="v[db]" value="<?php eo($DB['db'])?>"></label><br>
542-
<label><div class="l">MySQL host:</div><input type="text" name="v[host]" value="<?php eo($DB['host'])?>"></label> <label>port: <input type="text" name="v[port]" value="<?php eo($DB['port'])?>" size="4"></label><br>
543+
<label><div class="l">MySQL host:</div><input type="text" name="v[host]" value="<?php eo($DB['host'])?>"></label> <label>port: <input type="text" name="v[port]" value="<?php eo($DB['port'])?>" size="4"></label> <label>socket: <input type="text" name="v[socket]" value="<?php eo($DB['socket'])?>" size="4"></label><br>
543544
<label><div class="l">Charset:</div><select name="v[chset]"><option value="">- default -</option><?php echo chset_select($DB['chset'])?></select></label><br>
544545
<br><label for ="rmb"><input type="checkbox" name="rmb" id="rmb" value="1" checked> Remember in cookies for 30 days or until Logoff</label>
545546
</div>
@@ -558,24 +559,15 @@ function print_cfg(){
558559
function db_connect($nodie=0){
559560
global $dbh,$DB,$err_msg;
560561

561-
if ($DB['port']) {
562-
$dbh=mysqli_connect($DB['host'],$DB['user'],$DB['pwd'],'',(int)$DB['port']);
563-
} else {
564-
$dbh=mysqli_connect($DB['host'],$DB['user'],$DB['pwd']);
565-
}
562+
$po=$DB['port'];if(!$po) $po=ini_get("mysqli.default_port");
563+
$so=$DB['socket'];if(!$so) $so=ini_get("mysqli.default_socket");
564+
$dbh=mysqli_connect($DB['host'],$DB['user'],$DB['pwd'],$DB['db'],$po,$so);
565+
566566
if (!$dbh) {
567567
$err_msg='Cannot connect to the database because: '.mysqli_connect_error();
568568
if (!$nodie) die($err_msg);
569-
}
570-
571-
if ($dbh && $DB['db']) {
572-
$res=mysqli_select_db($dbh, $DB['db']);
573-
if (!$res) {
574-
$err_msg='Cannot select db because: '.mysqli_error($dbh);
575-
if (!$nodie) die($err_msg);
576-
}else{
577-
if ($DB['chset']) db_query("SET NAMES ".$DB['chset']);
578-
}
569+
}else{
570+
if ($DB['chset']) db_query("SET NAMES ".$DB['chset']);
579571
}
580572

581573
return $dbh;
@@ -766,13 +758,15 @@ function savecfg(){
766758
newcookie("conn[pwd]", $v['pwd'],$tm);
767759
newcookie("conn[host]",$v['host'],$tm);
768760
newcookie("conn[port]",$v['port'],$tm);
761+
newcookie("conn[socket]",$v['socket'],$tm);
769762
newcookie("conn[chset]",$v['chset'],$tm);
770763
}else{
771764
newcookie("conn[db]", FALSE,-1);
772765
newcookie("conn[user]",FALSE,-1);
773766
newcookie("conn[pwd]", FALSE,-1);
774767
newcookie("conn[host]",FALSE,-1);
775768
newcookie("conn[port]",FALSE,-1);
769+
newcookie("conn[socket]",FALSE,-1);
776770
newcookie("conn[chset]",FALSE,-1);
777771
}
778772
}

samples/phpminiconfig.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
'db'=>'', #optional, default DB
1010
'host'=>'',#optional
1111
'port'=>'',#optional
12+
'socket'=>'',#optional
1213
'chset'=>'utf8',#optional, default charset
1314
);
1415

0 commit comments

Comments
 (0)