james/fembooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Regex for PDO DSN

Browse Source 
Old regex matched ADOdb URI. Also, this regex allows the user, pass, host and database information
to appear in any order.
This commit is contained in:
Justin Brewer 2012-03-02 10:17:13 -06:00
parent 3fc4060ef6
commit 9ac45f5363
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
contrib/admin/main.php
View File

@ -139,12 +139,12 @@ class AdminPage extends Extension {
private function dbdump(Page $page) { private function dbdump(Page $page) {
$matches = array(); $matches = array();
preg_match("#(\w+)://(\w+):(\w+)@([\w\.\-]+)/([\w_]+)(\?.*)?#", DATABASE_DSN, $matches); preg_match("#^(?P<proto>\w+)\:(?:user=(?P<user>\w+)(?:;|$)|password=(?P<password>\w+)(?:;|$)|host=(?P<host>[\w\.\-]+)(?:;|$)|dbname=(?P<dbname>[\w_]+)(?:;|$))+#", DATABASE_DSN, $matches);
$software = $matches[1]; $software = $matches['proto'];
$username = $matches[2]; $username = $matches['user'];
$password = $matches[3]; $password = $matches['password'];
$hostname = $matches[4]; $hostname = $matches['host'];
$database = $matches[5]; $database = $matches['dbname'];
// TODO: Support more than just MySQL.. // TODO: Support more than just MySQL..
switch($software) { switch($software) {