From 3e52d937afa10b887b072da56c92595646c8efe2 Mon Sep 17 00:00:00 2001
From: dignajar <dignajar@gmail.com>
Date: Tue, 14 Jul 2015 20:57:18 -0300
Subject: [PATCH] Plugin configuration

---
 admin/controllers/edit-user.php      |  2 +-
 kernel/abstract/dbjson.class.php     | 14 --------------
 kernel/abstract/plugin.class.php     |  3 ++-
 kernel/boot/rules/70.build_pages.php |  2 +-
 kernel/boot/rules/70.build_posts.php |  2 +-
 kernel/boot/rules/80.plugins.php     |  2 +-
 kernel/dbusers.class.php             |  8 ++++----
 kernel/login.class.php               |  2 +-
 8 files changed, 11 insertions(+), 24 deletions(-)

diff --git a/admin/controllers/edit-user.php b/admin/controllers/edit-user.php
index a035e315..a697d575 100644
--- a/admin/controllers/edit-user.php
+++ b/admin/controllers/edit-user.php
@@ -51,7 +51,7 @@ if($Login->role()!=='admin') {
 	$layout['parameters'] = $Login->username();
 }
 
-$_user = $dbUsers->get($layout['parameters']);
+$_user = $dbUsers->getDb($layout['parameters']);
 
 // If the user doesn't exist, redirect to the users list.
 if($_user===false) {
diff --git a/kernel/abstract/dbjson.class.php b/kernel/abstract/dbjson.class.php
index 1977cfa6..ea81db76 100644
--- a/kernel/abstract/dbjson.class.php
+++ b/kernel/abstract/dbjson.class.php
@@ -36,20 +36,6 @@ class dbJSON
 		}
 	}
 
-	// Get database.
-	public function get()
-	{
-		return $this->db;
-	}
-
-	// Set and save database.
-	public function set($db)
-	{
-		$this->db = $db;
-
-		return $this->save();
-	}
-
 	// Returns the amount of database items.
 	public function count()
 	{
diff --git a/kernel/abstract/plugin.class.php b/kernel/abstract/plugin.class.php
index b60ccd5f..83686978 100644
--- a/kernel/abstract/plugin.class.php
+++ b/kernel/abstract/plugin.class.php
@@ -144,7 +144,8 @@ class Plugin {
 
 		// Create database
 		$Tmp = new dbJSON($this->filenameDb);
-		$Tmp->set($this->dbFields);
+		$Tmp->db = $this->dbFields;
+		$Tmp->save();
 
 		return true;
 	}
diff --git a/kernel/boot/rules/70.build_pages.php b/kernel/boot/rules/70.build_pages.php
index 062abe87..5484e33f 100644
--- a/kernel/boot/rules/70.build_pages.php
+++ b/kernel/boot/rules/70.build_pages.php
@@ -69,7 +69,7 @@ function build_page($key)
 	// Parse username for the page.
 	if( $dbUsers->userExists( $Page->username() ) )
 	{
-		$user = $dbUsers->get( $Page->username() );
+		$user = $dbUsers->getDb( $Page->username() );
 
 		$Page->setField('authorFirstName', $user['firstName'], false);
 		
diff --git a/kernel/boot/rules/70.build_posts.php b/kernel/boot/rules/70.build_posts.php
index 7f30b9b8..351e9852 100644
--- a/kernel/boot/rules/70.build_posts.php
+++ b/kernel/boot/rules/70.build_posts.php
@@ -57,7 +57,7 @@ function buildPost($key)
 	// Parse username for the post.
 	if( $dbUsers->userExists( $Post->username() ) )
 	{
-		$user = $dbUsers->get( $Post->username() );
+		$user = $dbUsers->getDb( $Post->username() );
 
 		$Post->setField('authorFirstName', $user['firstName'], false);
 		
diff --git a/kernel/boot/rules/80.plugins.php b/kernel/boot/rules/80.plugins.php
index 47e68897..8a3ed06e 100644
--- a/kernel/boot/rules/80.plugins.php
+++ b/kernel/boot/rules/80.plugins.php
@@ -62,7 +62,7 @@ function build_plugins()
 			$database = new dbJSON($languageFilename, false);
 		}
 
-		$databaseArray = $database->get();
+		$databaseArray = $database->db;
 		$Plugin->setData( $databaseArray['plugin-data'] );
 
 		// Add words to language dictionary.
diff --git a/kernel/dbusers.class.php b/kernel/dbusers.class.php
index 5fa2310b..0178ab1b 100644
--- a/kernel/dbusers.class.php
+++ b/kernel/dbusers.class.php
@@ -19,7 +19,7 @@ class dbUsers extends dbJSON
 	}
 
 	// Return an array with the username databases
-	public function get($username)
+	public function getDb($username)
 	{
 		if($this->userExists($username))
 		{
@@ -57,7 +57,7 @@ class dbUsers extends dbJSON
 	{
 		$dataForDb = array();
 
-		$user = $this->get($args['username']);
+		$user = $this->getDb($args['username']);
 
 		if($user===false)
 		{
@@ -70,10 +70,10 @@ class dbUsers extends dbJSON
 		{
 			if( isset($this->dbFields[$field]) )
 			{
-				// Sanitize if will be saved on database.
+				// Sanitize.
 				$tmpValue = Sanitize::html($value);
 
-				// Set type
+				// Set type.
 				settype($tmpValue, gettype($this->dbFields[$field]['value']));
 
 				$user[$field] = $tmpValue;
diff --git a/kernel/login.class.php b/kernel/login.class.php
index f6ec2e05..d9ad1a11 100644
--- a/kernel/login.class.php
+++ b/kernel/login.class.php
@@ -60,7 +60,7 @@ class Login {
 			return false;
 		}
 
-		$user = $this->dbUsers->get($username);
+		$user = $this->dbUsers->getDb($username);
 		if($user==false) {
 			Log::set(__METHOD__.LOG_SEP.'Username not exist: '.$username);
 			return false;