projects
/
PHP-P10.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of ssh://git.pk910.de:16110/PHP-P10
[PHP-P10.git]
/
BotLoader
/
saxdb.class.php
diff --git
a/BotLoader/saxdb.class.php
b/BotLoader/saxdb.class.php
index 15b36c2669a4a97f40021705c6e2e021d7ad5b4a..f6885a89335a8e4f4bbbc712896342c5a285c352 100644
(file)
--- a/
BotLoader/saxdb.class.php
+++ b/
BotLoader/saxdb.class.php
@@
-1,12
+1,10
@@
<?php
<?php
-/********************************* PHP-P10 ******************************
- * P10 uplink class by pk910 (c)2011 pk910 *
- ************************************************************************
- * Version 2 (OOP) *
+/******************************* PHP-P10 v2 *****************************
+ * Copyright (C) 2011-2012 Philipp Kreil (pk910) *
* *
* *
- *
PHP-P10 is free software; you can redistribute it and/or modify
*
+ *
This program is free software: you can redistribute it and/or modify
*
* it under the terms of the GNU General Public License as published by *
* it under the terms of the GNU General Public License as published by *
- * the Free Software Foundation
; either version 2
of the License, or *
+ * the Free Software Foundation
, either version 3
of the License, or *
* (at your option) any later version. *
* *
* This program is distributed in the hope that it will be useful, *
* (at your option) any later version. *
* *
* This program is distributed in the hope that it will be useful, *
@@
-15,11
+13,10
@@
* GNU General Public License for more details. *
* *
* You should have received a copy of the GNU General Public License *
* GNU General Public License for more details. *
* *
* You should have received a copy of the GNU General Public License *
- * along with PHP-P10; if not, write to the Free Software Foundation, *
- * Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
+ * along with this program. If not, see <http://www.gnu.org/licenses/>. *
* *
************************************************************************
* *
************************************************************************
- *
+ *
* BotLoader/saxdb.class.php
*
* Simple PHP P10 database.
* BotLoader/saxdb.class.php
*
* Simple PHP P10 database.
@@
-33,7
+30,7
@@
class saxdb {
const PARSER_EXPECT_VALUE = 0x0008;
const PARSER_STRING_LIST = 0x0010;
private $database = array();
const PARSER_EXPECT_VALUE = 0x0008;
const PARSER_STRING_LIST = 0x0010;
private $database = array();
-
+
public function loadDB($name) {
if(file_exists($name)) {
$fp = fopen($name, "r");
public function loadDB($name) {
if(file_exists($name)) {
$fp = fopen($name, "r");
@@
-42,14
+39,14
@@
class saxdb {
$this->database = $this->parseDB($db);
}
}
$this->database = $this->parseDB($db);
}
}
-
+
public function writeDB($name) {
$fp = fopen($name, "w");
$db = $this->serializeDB($this->database);
fwrite($fp, $db);
fclose($fp);
}
public function writeDB($name) {
$fp = fopen($name, "w");
$db = $this->serializeDB($this->database);
fwrite($fp, $db);
fclose($fp);
}
-
+
public function getSection($name) {
if(array_key_exists($name, $this->database)) {
return $this->database[$name];
public function getSection($name) {
if(array_key_exists($name, $this->database)) {
return $this->database[$name];
@@
-57,11
+54,11
@@
class saxdb {
return array();
}
}
return array();
}
}
-
+
public function setSection($name, $value) {
$this->database[$name] = $value;
}
public function setSection($name, $value) {
$this->database[$name] = $value;
}
-
+
private function parseDB($db) {
$parserflags = 0;
$openblocks = 0;
private function parseDB($db) {
$parserflags = 0;
$openblocks = 0;
@@
-151,14
+148,18
@@
class saxdb {
}
return $output;
}
}
return $output;
}
-
- private function serializeDB($db, $dbstring = "") {
+
+ private function serializeDB($db) {
+ $dbstring = "";
foreach($db as $name => $value) {
foreach($db as $name => $value) {
- if(!is_array($value) && !is_string($value) && !is_numeric($value)) continue;
+ if(!is_array($value) && !is_string($value) && !is_numeric($value)) {
+ echo"invalid type ".gettype($value)."\n";
+ continue;
+ }
$dbstring .= "\"".str_replace("\"","\\\"", $name)."\"";
if(is_array($value)) {
$dbstring .= "{";
$dbstring .= "\"".str_replace("\"","\\\"", $name)."\"";
if(is_array($value)) {
$dbstring .= "{";
- $dbstring .= $this->serializeDB($value
, $dbstring
);
+ $dbstring .= $this->serializeDB($value);
$dbstring .= "}";
} else {
$dbstring .= "\"".str_replace("\"","\\\"", $value)."\"";
$dbstring .= "}";
} else {
$dbstring .= "\"".str_replace("\"","\\\"", $value)."\"";
@@
-166,7
+167,7
@@
class saxdb {
}
return $dbstring;
}
}
return $dbstring;
}
-
+
}
?>
\ No newline at end of file
}
?>
\ No newline at end of file