X-Git-Url: https://mop.ddnsfree.com/gitweb/?a=blobdiff_plain;f=web%2Fadmin.php;h=c3428e663353048111eda4bc3a5147a016bfbc74;hb=e05f4fd4c244ac0a8db49584315212231e03bf80;hp=58686fd5da17ea73a531e7d7d203b9dbe8ca6255;hpb=fd0382ef2ff8216bc3880fc61cf0178d9f0f75e9;p=brisk.git
diff --git a/web/admin.php b/web/admin.php
index 58686fd..c3428e6 100644
--- a/web/admin.php
+++ b/web/admin.php
@@ -2,7 +2,7 @@
/*
* brisk - admin.php
*
- * Copyright (C) 2006-2011 Matteo Nastasi
+ * Copyright (C) 2011-2015 Matteo Nastasi
* mailto: nastasi@alternativeoutput.it
* matteo.nastasi@milug.org
* web: http://www.alternativeoutput.it
@@ -23,7 +23,7 @@
*/
$G_base = "";
-
+
require_once("Obj/brisk.phh");
require_once("Obj/dbase_pgsql.phh");
@@ -43,19 +43,16 @@ class ImpPoints
var $nplayers;
var $logins;
var $pts;
-
+
function ImpPoints($s)
{
- // error_log($s, 0);
$arr = explode('|', $s);
- // error_log("TTOK: ".count($arr), 0);
if (count($arr) != 20) {
- error_log("COUNT: ".count($arr));
return FALSE;
}
-
+
$this->time = $arr[0];
$this->usess = $arr[1];
$this->isauth = $arr[2];
@@ -65,7 +62,7 @@ class ImpPoints
$this->ttok = $arr[6];
$this->tidx = $arr[7];
$this->nplayers = $arr[8];
-
+
$this->logins = array();
$this->pts = array();
@@ -83,7 +80,7 @@ function main()
{
GLOBAL $cont, $G_dbpfx, $G_alarm_passwd, $F_pass_private, $F_ACT, $F_filename;
-
+
if (FALSE && $F_pass_private != $G_alarm_passwd) {
$cont .= sprintf("Wrong password, operation aborted.
\n");
return;
@@ -92,16 +89,20 @@ function main()
if ($F_ACT == "append") {
do {
/*
- if ($F_pass_private != $G_alarm_passwd) {
- $cont .= sprintf("Wrong password, operation aborted.
\n");
- break;
- }*/
+ if ($F_pass_private != $G_alarm_passwd) {
+ $cont .= sprintf("Wrong password, operation aborted.
\n");
+ break;
+ }*/
$cont .= sprintf("FILENAME: %s
\n", $F_filename);
if (($olddb = new LoginDBOld($F_filename)) == FALSE) {
$cont .= sprintf("Loading failed.
\n");
break;
}
- $newdb = new BriskDB();
+
+ if (($newdb = BriskDB::create()) == FALSE) {
+ $cont .= sprintf("Database connection failed.
\n");
+ break;
+ }
$newdb->users_load();
if ($newdb->addusers_from_olddb($olddb, $cont) == FALSE) {
$cont .= sprintf("Insert failed.
\n");
@@ -117,13 +118,17 @@ function main()
}
$cont .= sprintf("FILENAME: %s
\n", $F_filename);
-
+
if (!($fp = @fopen($F_filename, "r"))) {
$cont .= sprintf("Open file [%s] failed.
\n", $F_filename);
break;
}
- $newdb = new BriskDB();
+ if (($newdb = BriskDB::create()) == FALSE) {
+ $cont .= sprintf("Database connection failed.
\n");
+ break;
+ }
+
$newdb->users_load();
$dbconn = $newdb->getdbconn();
for ($pts_n = 0 ; !feof($fp) ; $pts_n++) {
@@ -141,7 +146,7 @@ function main()
// else {
// $cont .= sprintf("ttok: %s
\n", $pts->ttok);
// }
-
+
/*
* matches management
*/
@@ -156,7 +161,7 @@ function main()
eschtml($bf), eschtml($mtc_sql));
break;
}
-
+
}
$mtc_obj = pg_fetch_object($mtc_pg,0);
// $cont .= sprintf("MTC: %s
\n", esclfhtml(print_r($mtc_obj, TRUE)));
@@ -196,7 +201,7 @@ function main()
continue;
}
$usr_obj = pg_fetch_object($usr_pg,0);
-
+
/* put points */
$pts_sql = sprintf("INSERT INTO %sbin5_points (gcode, ucode, pts)
VALUES (%d, %d, %d) RETURNING *;",
@@ -207,9 +212,9 @@ function main()
eschtml($bf), eschtml($gam_sql), $i);
break;
}
-
+
}
-
+
}
fclose($fp);
} while (0);
@@ -224,7 +229,6 @@ function save_rej($s)
fwrite($fp, sprintf("%s\n", $s));
fclose($fp);
-
}
main();
@@ -237,7 +241,7 @@ main();