From 9b67b8b8e6559d78a3a00fe086879b5e428b4cda Mon Sep 17 00:00:00 2001
From: Jacek Kowalski <Jacek@jacekk.info>
Date: Sun, 04 Nov 2012 17:32:42 +0000
Subject: [PATCH] Poprawka błędu dotyczącego użycia BotSession - niepoprawne ustawianie nazwy klasy (bez pośrednictwa metody setClass()).
---
class/BotSession.php | 49 ++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 44 insertions(+), 5 deletions(-)
diff --git a/class/BotSession.php b/class/BotSession.php
index a70734e..36cd174 100644
--- a/class/BotSession.php
+++ b/class/BotSession.php
@@ -7,12 +7,12 @@
/**
* Nazwa modułu, którego zmienne klasa przetwarza
- * @var string max. 40 znak�w
+ * @var string max. 40 znaków
*/
- var $class;
+ protected $class = '';
+ protected $class_empty = TRUE;
private $user;
-
/**
* Inicjuje klasę w zależności od użytkownika
@@ -21,10 +21,14 @@
$this->user = sha1($user);
$this->user_struct = parse_url($user);
- $this->class = '';
+ $this->class_empty = FALSE;
}
private function init() {
+ if(strlen($this->class) == 0 && !$this->class_empty) {
+ throw new Exception('Przed użyciem $msg->session należy ustawić nazwę modułu za pomocą metody setClass - patrz "Poradnik tworzenia modułów", dział "Klasa BotMessage", rozdział "Pole $session".');
+ }
+
if($this->PDO) {
return NULL;
}
@@ -33,6 +37,30 @@
$this->PDO = new PDO('sqlite:'.BOT_TOPDIR.'/database/'.sha1($this->user).'.sqlite');
$this->PDO->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
$this->PDO->setAttribute(PDO::ATTR_ORACLE_NULLS, PDO::NULL_TO_STRING);
+
+ $st = $this->PDO->query('SELECT value FROM data WHERE class=\'\' AND name=\'_version\'');
+ $row = $st->fetch(PDO::FETCH_ASSOC);
+ if(is_array($row)) {
+ $version = (int)$row['value'];
+ }
+ else
+ {
+ $version = 0;
+ }
+ $st->closeCursor();
+
+ if($version < 1) {
+ $this->PDO->query('UPDATE data SET class=\'kino\' WHERE class=\'\' AND name=\'kino\'');
+ $this->PDO->query('INSERT OR REPLACE INTO data (class, name, value) VALUES (\'\', \'_version\', 1)');
+ $version = 1;
+ }
+
+ if($version < 3) {
+ $this->PDO->query('DELETE FROM data WHERE class IS NULL AND name=\'user_struct\'');
+ $this->PDO->query('INSERT OR REPLACE INTO data (class, name, value) VALUES (\'\', \'_version\', 3)');
+ $version = 3;
+ }
+
return;
}
@@ -54,9 +82,14 @@
);
$files = glob(BOT_TOPDIR.'/db/*/'.$this->user_struct['user'].'.ggdb');
+ if(!$files) {
+ return;
+ }
$this->PDO->beginTransaction();
$st = $this->PDO->prepare('INSERT OR REPLACE INTO data (class, name, value) VALUES (?, ?, ?)');
+
+ $st->execute(array('', '_version', 2));
foreach($files as $file) {
$data = unserialize(file_get_contents($file));
@@ -72,7 +105,9 @@
}
}
catch(Exception $e) {
- @unlink(BOT_TOPDIR.'/database/'.sha1($this->user).'.sqlite');
+ if(file_exists(BOT_TOPDIR.'/database/'.sha1($this->user).'.sqlite')) {
+ @unlink(BOT_TOPDIR.'/database/'.sha1($this->user).'.sqlite');
+ }
throw $e;
}
}
@@ -140,6 +175,10 @@
return $return;
}
+ function setClass($class) {
+ $this->class = $class;
+ }
+
function truncate() {
$this->init();
--
Gitblit v1.9.1