From e5e355d06890b324df2ded707ca491f9539dd171 Mon Sep 17 00:00:00 2001
From: Frédéric Guillot <fred@kanboard.net>
Date: Wed, 25 Jun 2014 10:07:06 -0300
Subject: Merge pull-request #140 (several small fixes)

---
 app/Schema/Mysql.php  | 5 +++--
 app/Schema/Sqlite.php | 7 ++++---
 2 files changed, 7 insertions(+), 5 deletions(-)

(limited to 'app/Schema')

diff --git a/app/Schema/Mysql.php b/app/Schema/Mysql.php
index ddb2acee..7ff130cf 100644
--- a/app/Schema/Mysql.php
+++ b/app/Schema/Mysql.php
@@ -2,11 +2,12 @@
 
 namespace Schema;
 
+use Core\Security;
 const VERSION = 19;
 
 function version_19($pdo)
 {
-    $pdo->exec("ALTER TABLE config ADD COLUMN api_token VARCHAR(255) DEFAULT '".\Core\Security::generateToken()."'");
+    $pdo->exec("ALTER TABLE config ADD COLUMN api_token VARCHAR(255) DEFAULT '".Security::generateToken()."'");
 }
 
 function version_18($pdo)
@@ -268,6 +269,6 @@ function version_1($pdo)
     $pdo->exec("
         INSERT INTO config
         (webhooks_token)
-        VALUES ('".\Core\Security::generateToken()."')
+        VALUES ('".Security::generateToken()."')
     ");
 }
diff --git a/app/Schema/Sqlite.php b/app/Schema/Sqlite.php
index 438769f0..8f8e498a 100644
--- a/app/Schema/Sqlite.php
+++ b/app/Schema/Sqlite.php
@@ -1,12 +1,13 @@
 <?php
 
 namespace Schema;
+use Core\Security;
 
 const VERSION = 19;
 
 function version_19($pdo)
 {
-    $pdo->exec("ALTER TABLE config ADD COLUMN api_token TEXT DEFAULT '".\Core\Security::generateToken()."'");
+    $pdo->exec("ALTER TABLE config ADD COLUMN api_token TEXT DEFAULT '".Security::generateToken()."'");
 }
 
 function version_18($pdo)
@@ -214,7 +215,7 @@ function version_3($pdo)
 
         foreach ($results as &$result) {
             $rq = $pdo->prepare('UPDATE projects SET token=? WHERE id=?');
-            $rq->execute(array(\Core\Security::generateToken(), $result['id']));
+            $rq->execute(array(Security::generateToken(), $result['id']));
         }
     }
 }
@@ -289,6 +290,6 @@ function version_1($pdo)
     $pdo->exec("
         INSERT INTO config
         (language, webhooks_token)
-        VALUES ('en_US', '".\Core\Security::generateToken()."')
+        VALUES ('en_US', '".Security::generateToken()."')
     ");
 }
-- 
cgit v1.2.3