Page MenuHomeDevCentral
Files F12944353

No OneTemporary
Actions

View Options

diff --git a/workspaces/src/includes/objects/Disclaimer.php b/workspaces/src/Engines/Content/Disclaimer.php
similarity index 96%
rename from workspaces/src/includes/objects/Disclaimer.php
rename to workspaces/src/Engines/Content/Disclaimer.php
index 04f1298..ecc460a 100644
--- a/workspaces/src/includes/objects/Disclaimer.php
+++ b/workspaces/src/Engines/Content/Disclaimer.php
@@ -1,61 +1,65 @@
<?php
/**
* _, __, _, _ __, _ _, _, _
* / \ |_) (_ | | \ | /_\ |\ |
* \ / |_) , ) | |_/ | | | | \|
* ~ ~ ~ ~ ~ ~ ~ ~ ~ ~
*
* Disclaimer class
*
* @package ObsidianWorkspaces
* @subpackage Model
* @author Sébastien Santoro aka Dereckson <dereckson@espace-win.org>
* @license http://www.opensource.org/licenses/bsd-license.php BSD
* @filesource
*
*/
+namespace Waystone\Workspaces\Engines\Content;
+
use Waystone\Workspaces\Engines\I18n\Language;
use Waystone\Workspaces\Engines\I18n\TextFileMessage;
/**
* Disclaimer class
*/
class Disclaimer {
+
public $id;
public $title;
public $text;
public function __construct ($id) {
$this->id = $id;
}
public static function get ($id) {
global $Config;
$instance = new Disclaimer($id);
try {
$message = new TextFileMessage(
$Config['Content']['Disclaimers'],
$id
);
$data = (string)$message;
$pos = strpos($data, "\n");
if ($pos !== false) {
$instance->title = substr($data, 0, $pos);
$instance->text = trim(substr($data, $pos));
} else {
$instance->title = ucfirst($id);
$instance->text = $data;
}
} catch (Exception $ex) {
$instance->title = ucfirst($id);
$instance->text = Language::get('NoSuchDisclaimer');
}
return $instance;
}
-}
\ No newline at end of file
+
+}
diff --git a/workspaces/src/controllers/home.php b/workspaces/src/controllers/home.php
index a97dbdb..aa30c50 100644
--- a/workspaces/src/controllers/home.php
+++ b/workspaces/src/controllers/home.php
@@ -1,87 +1,88 @@
<?php
/**
* _, __, _, _ __, _ _, _, _
* / \ |_) (_ | | \ | /_\ |\ |
* \ / |_) , ) | |_/ | | | | \|
* ~ ~ ~ ~ ~ ~ ~ ~ ~ ~
*
* Controller for homepage content
*
* @package ObsidianWorkspaces
* @subpackage Controllers
* @author Sébastien Santoro aka Dereckson <dereckson@espace-win.org>
* @license http://www.opensource.org/licenses/bsd-license.php BSD
* @filesource
*
*/
+use Waystone\Workspaces\Engines\Content\Disclaimer;
use Waystone\Workspaces\Engines\Controller\Controller;
use Waystone\Workspaces\Engines\I18n\Language;
/**
* Homepage controller
*/
class HomepageController extends Controller {
/**
* Handles controller request
*/
public function handleRequest () {
$smarty = $this->context->templateEngine;
$workspace = $this->context->workspace;
if ($workspace == null) {
//We need a list of workspaces to allow user
//to select the one he wishes to access.
//The header has already grabbed it for us.
if (array_key_exists('workspaces', $smarty->tpl_vars)) {
$workspaces = $smarty->tpl_vars['workspaces']->value;
} else {
$workspaces = $this->context->user->get_workspaces();
$smarty->assign('workspaces', $workspaces);
}
switch (count($workspaces)) {
case 0:
//No workspace error message
$smarty->assign('PAGE_TITLE', Language::get("Home"));
$template = "home_noworkspace.tpl";
break;
case 1:
//Autoselect workspace
$this->context->workspace = $workspaces[0];
$workspace = $workspaces[0];
$this->context->workspace->loadConfiguration($this->context);
break;
default:
//Select workspace template
$smarty->assign('PAGE_TITLE', Language::get("PickWorkspace"));
$template = "home_pickworkspace.tpl";
}
}
if ($workspace != null) {
$smarty->assign('PAGE_TITLE', $workspace->name);
$template = "home_workspace.tpl";
if (count($workspace->configuration->disclaimers)) {
$disclaimers = [];
foreach ($workspace->configuration->disclaimers as $disclaimer) {
$disclaimers[] = Disclaimer::get($disclaimer);
}
$smarty->assign('disclaimers', $disclaimers);
}
}
//Serves header
HeaderController::run($this->context);
//Serves relevant template
$smarty->display($template);
//Serves footer
FooterController::run($this->context);
}
}

File Metadata

Mime Type
text/x-diff
Expires
Tue, Nov 18, 17:16 (23 h, 54 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
3174509
Default Alt Text
(5 KB)

Event Timeline

Nasqueron DevCentral · If it had been much bigger the moon would have had a core of ice. · Powered by Phabricator