jenkins-bot has submitted this change and it was merged.
Change subject: Centralize db credentials config file
......................................................................
Centralize db credentials config file
Add login.php which can directly parse from my.replica.cnf
Change-Id: I6e7e5e53ee3b8254f13066e11bde90fdc951bc44
---
M hat-web-tool/delete.php
M hat-web-tool/projects.php
A login.php
3 files changed, 14 insertions(+), 7 deletions(-)
Approvals:
MarcoAurelio: Looks good to me, approved
jenkins-bot: Verified
diff --git a/hat-web-tool/delete.php b/hat-web-tool/delete.php
index 924bb4b..4ce0411 100644
--- a/hat-web-tool/delete.php
+++ b/hat-web-tool/delete.php
@@ -12,16 +12,16 @@
);
</script>
<?php
-
+$loginData = require_once __DIR__ . '/../login.php';
function titleLink ($title)
{
return str_replace('%2F', '/', urlencode(str_replace(' ', '_', $title)));
}
function get_post($var) { return mysql_real_escape_string($_POST[$var]); }
+ global $loginData;
- require_once 'login.php';
+ $db_server = mysql_connect("metawiki.labsdb", $loginData['user'],
$loginData['password']);
- $db_server = mysql_connect("metawiki.labsdb", $db_username, $db_password);
if (!$db_server) die ("Unable to connect to MySQL: " . mysql_error());
mysql_select_db("meta_p", $db_server) or die ("Unable to select database:
" . mysql_error());
@@ -62,7 +62,7 @@
{
$row = mysql_fetch_row($result);
- $db_server_temp = mysql_connect($row[2], $db_username, $db_password);
+ $db_server_temp = mysql_connect($row[2], $loginData['user'],
$loginData['password']);
if (!$db_server_temp) die ("Unable to connect to MySQL: " .
mysql_error());
mysql_select_db($row[0]."_p", $db_server_temp) or die ("Unable to
select database: " . mysql_error());
diff --git a/hat-web-tool/projects.php b/hat-web-tool/projects.php
index aad1881..85d39c6 100644
--- a/hat-web-tool/projects.php
+++ b/hat-web-tool/projects.php
@@ -22,8 +22,8 @@
</thead>
<tbody>
<?php
- require_once 'login.php';
- $db_server = mysql_connect("metawiki.labsdb", $db_username,
$db_password);
+ $loginData = require_once __DIR__ . '/../login.php';
+ $db_server = mysql_connect("metawiki.labsdb", $loginData['user'],
$loginData['password']);
if (!$db_server) die ("Unable to connect to MySQL: " . mysql_error());
mysql_select_db("meta_p", $db_server) or die ("Unable to select
database: " . mysql_error());
@@ -39,7 +39,7 @@
{
$row = mysql_fetch_row($result);
- $db_server_temp = mysql_connect($row[2], $db_username,
$db_password);
+ $db_server_temp = mysql_connect($row[2], $loginData['user'],
$loginData['password']);
if (!$db_server_temp) die ("Unable to connect to MySQL: " .
mysql_error());
mysql_select_db($row[0]."_p", $db_server_temp) or die ("Unable
to select database: " . mysql_error());
diff --git a/login.php b/login.php
new file mode 100644
index 0000000..69b84e8
--- /dev/null
+++ b/login.php
@@ -0,0 +1,7 @@
+<?php
+$data = parse_ini_file( '../replica.my.cnf' );
+if ( !$data || !$data['user'] || !$data['password'] ) {
+ throw new Exception( "Login data not found!" );
+}
+
+return $data;
--
To view, visit https://gerrit.wikimedia.org/r/276205
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6e7e5e53ee3b8254f13066e11bde90fdc951bc44
Gerrit-PatchSet: 2
Gerrit-Project: labs/tools/stewardbots
Gerrit-Branch: master
Gerrit-Owner: Glaisher <[email protected]>
Gerrit-Reviewer: Ajraddatz <[email protected]>
Gerrit-Reviewer: Barras <[email protected]>
Gerrit-Reviewer: DerHexer <[email protected]>
Gerrit-Reviewer: Hoo man <[email protected]>
Gerrit-Reviewer: MF-Warburg <[email protected]>
Gerrit-Reviewer: MarcoAurelio <[email protected]>
Gerrit-Reviewer: Mardetanha <[email protected]>
Gerrit-Reviewer: Matanya <[email protected]>
Gerrit-Reviewer: SPQRobin <[email protected]>
Gerrit-Reviewer: Shanmugamp7 <[email protected]>
Gerrit-Reviewer: Snowolf <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
