namespace WorldlandDict #12

Globasa-Team · Dec 3, 2019 · 5754d45 · 5754d45
1 parent 6f75798
commit 5754d45
Show file tree

Hide file tree

Showing 9 changed files with 26 additions and 49 deletions.
diff --git 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
@@ -1,5 +1,5 @@
 <?php
-namespace GlobasaDictionary;
+namespace WorldlangDict;
 
 class WordListController
 {

diff --git a/index.php b/index.php
@@ -1,4 +1,4 @@
 <?php
-namespace GlobasaDictionary;
+namespace WorldlangDict;
 include_once 'src/config.php';
 processRequest($app);
diff --git 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
@@ -1,5 +1,5 @@
 <?php
-namespace GlobasaDictionary;
+namespace WorldlangDict;
 
 // A Globasa Word
 class Word

diff --git 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
@@ -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
diff --git 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':
 
         }