From 2d2c20686449da539df78698b8ba23862d5a6029 Mon Sep 17 00:00:00 2001
From: Laurent Giovannoni <laurent.giovannoni@maarch.org>
Date: Fri, 10 Jul 2015 16:27:44 +0000
Subject: [PATCH] FEAT #2681
---
core/trunk/core/class/ServiceControler.php | 9 ---------
core/trunk/core/class/class_resource.php | 5 +++--
core/trunk/core/class/docservers_controler.php | 3 ++-
3 files changed, 5 insertions(+), 12 deletions(-)
diff --git a/core/trunk/core/class/ServiceControler.php b/core/trunk/core/class/ServiceControler.php
index 982d1d05b0a..5dbd662d7aa 100644
--- a/core/trunk/core/class/ServiceControler.php
+++ b/core/trunk/core/class/ServiceControler.php
@@ -76,15 +76,6 @@ class ServiceControler
self::$db=$db;
}
-
- /**
- * Close the database connexion
- */
- public function disconnect()
- {
- self::$db->disconnect();
- }
-
public function loadEnabledServices()
{
$_SESSION['enabled_services'] = array();
diff --git a/core/trunk/core/class/class_resource.php b/core/trunk/core/class/class_resource.php
index e2a6d27e106..4e51075bafe 100644
--- a/core/trunk/core/class/class_resource.php
+++ b/core/trunk/core/class/class_resource.php
@@ -136,6 +136,7 @@
$tmp = str_replace('#',DIRECTORY_SEPARATOR,$tmp);
$filetmp .= $tmp;
$filetmp .= $filename;
+ $db = new Database();
require_once 'core/class/docservers_controler.php';
require_once 'core/class/docserver_types_controler.php';
require_once 'core/docservers_tools.php';
@@ -149,11 +150,11 @@
array_push($data, array('column' => "filesize", 'value' => $filesize, 'type' => "int"));
array_push($data, array('column' => "path", 'value' => $path, 'type' => "string"));
array_push($data, array('column' => "filename", 'value' => $filename, 'type' => "string"));
- array_push($data, array('column' => 'creation_date', 'value' => $this->current_datetime(), 'type' => "function"));
+ array_push($data, array('column' => 'creation_date', 'value' => $db->current_datetime(), 'type' => "function"));
if(!$this->check_basic_fields($data))
{
$_SESSION['error'] = $this->error;
- functions::xecho($this->error);exit;
+ functions::xecho($this->error);
return false;
}
else
diff --git a/core/trunk/core/class/docservers_controler.php b/core/trunk/core/class/docservers_controler.php
index fa0f8893965..275f1ea95e1 100644
--- a/core/trunk/core/class/docservers_controler.php
+++ b/core/trunk/core/class/docservers_controler.php
@@ -423,9 +423,10 @@ class docservers_controler
private function insert($docserver)
{
$request = new request();
+ $db = new Database();
//Giving automatised values
$docserver->enabled = 'Y';
- $docserver->creation_date = $request->current_datetime();
+ $docserver->creation_date = $db->current_datetime();
//Inserting object
$result = $this->advanced_insert($docserver);
return $result;
--
GitLab