From 7ebb5418b26e60749af1c43a1f8794ab114087fe Mon Sep 17 00:00:00 2001
From: Dhananjay Nakrani <dhananjaynakrani@gmail.com>
Date: Mon, 5 Oct 2015 17:02:47 -0700
Subject: [PATCH] Rename name=>db_name and path=>data_folder.

---
 server/awfy-server.config | 4 ++--
 server/awfy.py            | 4 ++--
 website/internals.php     | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/server/awfy-server.config b/server/awfy-server.config
index a144a41..35d6282 100644
--- a/server/awfy-server.config
+++ b/server/awfy-server.config
@@ -2,9 +2,9 @@
 host = localhost
 user = ???
 pass = ???
-name = ???
+db_name = ???
 
 [general]
-path = /home/awfy
+data_folder = /home/awfy
 machine_timeout = 480 ; 8 hours (480 minutes)
 
diff --git a/server/awfy.py b/server/awfy.py
index a804b9c..308b121 100644
--- a/server/awfy.py
+++ b/server/awfy.py
@@ -59,7 +59,7 @@ def Startup():
     host = config.get('mysql', 'host')
     user = config.get('mysql', 'user')
     pw = config.get('mysql', 'pass')
-    name = config.get('mysql', 'name')
+    name = config.get('mysql', 'db_name')
 
     db = DB(host, user, pw, name)
     c = db.cursor()
@@ -67,7 +67,7 @@ def Startup():
     row = c.fetchone()
     version = int(row[0])
 
-    path = config.get('general', 'path')
+    path = config.get('general', 'data_folder')
 
 Startup()
 
diff --git a/website/internals.php b/website/internals.php
index a3ad88f..10a4d0c 100755
--- a/website/internals.php
+++ b/website/internals.php
@@ -27,8 +27,8 @@ class Config {
         $this->mysql_host     = $config_array["mysql"]["host"];
         $this->mysql_username = $config_array["mysql"]["user"];
         $this->mysql_password = $config_array["mysql"]["pass"];
-        $this->mysql_db_name  = $config_array["mysql"]["name"];
-        $this->data_folder    = $config_array["general"]["path"];
+        $this->mysql_db_name  = $config_array["mysql"]["db_name"];
+        $this->data_folder    = $config_array["general"]["data_folder"];
     }
 }