From 5754d4551a55927c5b468630602fb66122f87378 Mon Sep 17 00:00:00 2001
From: "shawn@snowbank.ca" <globasa@hendrix.asoshared.com>
Date: Tue, 3 Dec 2019 12:09:01 -0500
Subject: [PATCH] namespace WorldlandDict #12

---
 controllers/ToolController.php     |  2 +-
 controllers/WordListController.php |  2 +-
 index.php                          |  2 +-
 models/Request.php                 |  2 +-
 models/Word.php                    |  2 +-
 models/WordList.php                |  4 ++--
 src/App.php                        | 21 ++++++++++++++----
 src/config.php                     | 34 ------------------------------
 src/request.php                    |  6 ++----
 9 files changed, 26 insertions(+), 49 deletions(-)
 delete mode 100644 src/config.php

diff --git a/controllers/ToolController.php b/controllers/ToolController.php
index 0fd9539..aa22014 100644
--- a/controllers/ToolController.php
+++ b/controllers/ToolController.php
@@ -1,5 +1,5 @@
 <?php
-namespace GlobasaDictionary;
+namespace WorldlangDict;
 
 class ToolController {
     
diff --git a/controllers/WordListController.php b/controllers/WordListController.php
index ad5a906..880c4b1 100644
--- a/controllers/WordListController.php
+++ b/controllers/WordListController.php
@@ -1,5 +1,5 @@
 <?php
-namespace GlobasaDictionary;
+namespace WorldlangDict;
 
 class WordListController
 {
diff --git a/index.php b/index.php
index 68b750d..0f67d14 100644
--- a/index.php
+++ b/index.php
@@ -1,4 +1,4 @@
 <?php
-namespace GlobasaDictionary;
+namespace WorldlangDict;
 include_once 'src/config.php';
 processRequest($app);
\ No newline at end of file
diff --git a/models/Request.php b/models/Request.php
index b397fc6..8c123bd 100644
--- a/models/Request.php
+++ b/models/Request.php
@@ -1,5 +1,5 @@
 <?php
-namespace GlobasaDictionary;
+namespace WorldlangDict;
 
 /**
  * Calls the appropriate function based on the url.
diff --git a/models/Word.php b/models/Word.php
index 3db5f52..b80f99f 100644
--- a/models/Word.php
+++ b/models/Word.php
@@ -1,5 +1,5 @@
 <?php
-namespace GlobasaDictionary;
+namespace WorldlangDict;
 
 // A Globasa Word
 class Word
diff --git a/models/WordList.php b/models/WordList.php
index ab51d45..9c16bdf 100644
--- a/models/WordList.php
+++ b/models/WordList.php
@@ -1,5 +1,5 @@
 <?php
-namespace GlobasaDictionary;
+namespace WorldlangDict;
 
 class WordList {
     private $app, $listLang, $list;
@@ -36,7 +36,7 @@ public function get($word = null) {
         
         foreach($this->list as $wordIndex=>$entry) {
             // var_dump($entry->get());
-            if (is_a($entry, 'GlobasaDictionary\Word')) {
+            if (is_a($entry, 'WorldlangDict\Word')) {
                 if ($this->listLang != "glb") {
                     $result .='<h1>'.sprintf($this->app->getTrans('Entry for'),$wordIndex,$this->listLang).'</h1>';
                 }
diff --git a/src/App.php b/src/App.php
index ae5404c..7709d4a 100644
--- a/src/App.php
+++ b/src/App.php
@@ -1,18 +1,31 @@
 <?php
-namespace GlobasaDictionary;
+namespace WorldlangDict;
 
-class GlobasaApp {
+class WorldlangDictConfig {
     public $siteUri, $siteName, $template, $lang, $langCap, $defaultLang, $defaultLangCap, $auxLang, $auxLangCap, $templateFolder, $templatePath, $templateUri, $dictionaryFile, $languagesFile, $internationalizationFile, $dictionary, $languages, $trans, $startTime;
     
     function __construct() {
         $this->startTime = microtime(true);
     }
     
-    public function setLang($lang) {
-        $this->lang = $lang;
+    public function setLang($lang, $aux=null) {
+        $this->lang = strtolower($lang);
         $this->langCap = ucfirst($lang);
+        if (!is_null($aux)) {
+            $this->defaultLang = strtolower($aux);
+            $this->defaultLangCap = ucfirst($aux);
+        }
     }
     
+    public function setTemplate($name, $folder=null) {
+        $this->template = $name;
+        if (!is_null($folder)) {
+            $this->templatesFolder = $folder;
+        }
+        
+        $this->templatePath = "./".$this->templatesFolder.'/'.$this->template.'/';
+        $this->templateUri = $this->siteUri.$this->templatesFolder.'/'.$this->template.'/';
+    }
     public function setPageTitle($title) {
         $this->page->title = $title . ' - ' . $this->siteName;
     }
diff --git a/src/config.php b/src/config.php
deleted file mode 100644
index 6e231f2..0000000
--- a/src/config.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-namespace GlobasaDictionary;
-
-/* Source files */
-include_once './src/App.php';
-include_once './src/request.php';
-include_once './models/Word.php';
-include_once './models/WordList.php';
-include_once './controllers/ToolController.php';
-include_once './controllers/WordListController.php';
-
-/* App config */
-$app = new GlobasaApp();
-/* Site configurations (change these) */
-$app->siteUri = 'http://leksi.globasa.net/';
-$app->siteName = 'Globasa Dictionary';
-$app->template = 'photon';
-$app->lang = $app->defaultLang = "glb";
-$app->langCap = $app->defaultLangCap = "Glb";
-$app->auxLang = "eng";
-$app->auxLangCap = "Eng";
-
-/* App configurations (leave these alone) */
-$app->templatesFolder = 'templates';
-$app->templatePath = "./".$app->templatesFolder.'/'.$app->template.'/';
-$app->templateUri = $app->siteUri.$app->templatesFolder.'/'.$app->template.'/';
-
-$app->dictionaryFile = '/home/globasa/api.globasa.net/dictionary.yaml';
-$app->languagesFile = '/home/globasa/api.globasa.net/languages.yaml';
-$app->internationalizationFile = '/home/globasa/api.globasa.net/internationalization.yaml';
-
-$app->dictionary = yaml_parse_file($app->dictionaryFile);
-$app->languages = yaml_parse_file($app->languagesFile);
-$app->trans = yaml_parse_file($app->internationalizationFile);
\ No newline at end of file
diff --git a/src/request.php b/src/request.php
index e61c4c7..00906c1 100644
--- a/src/request.php
+++ b/src/request.php
@@ -1,5 +1,5 @@
 <?php
-namespace GlobasaDictionary;
+namespace WorldlangDict;
 
 /**
  * Calls the appropriate function based on the url.
@@ -78,9 +78,7 @@ function processOptions($app)
     foreach ($app->page->options as $option=>$value) {
         switch ($option) {
             case 'template':
-                $app->template = $value;
-                $app->templatePath = "./".$app->templatesFolder.'/'.$app->template.'/';
-                $app->templateUri = $app->siteUri.$app->templatesFolder.'/'.$app->template.'/';
+                $app->setTemplate($value);
             case 'full':
                 
         }