diff --git a/Core/Distrib.php b/Core/Distrib.php index b864e86..bb74cf4 100644 --- a/Core/Distrib.php +++ b/Core/Distrib.php @@ -26,4 +26,3 @@ define("BAIKAL_VERSION", "0.3.0"); define("BAIKAL_HOMEPAGE", "http://baikal-server.com"); -define("PROJECT_PACKAGE", "regular"); diff --git a/Core/Frameworks/Baikal/Model/Config/Distrib.php b/Core/Frameworks/Baikal/Model/Config/Distrib.php index 7859546..25113b6 100644 --- a/Core/Frameworks/Baikal/Model/Config/Distrib.php +++ b/Core/Frameworks/Baikal/Model/Config/Distrib.php @@ -37,17 +37,12 @@ class Distrib extends \Baikal\Model\Config { "type" => "string", "comment" => "The URL to the project homepage", ), - "PROJECT_PACKAGE" => array( - "type" => "string", - "comment" => "The type of the current package (one of 'flat', 'regular')" - ), ); # Default values protected $aData = array( "BAIKAL_VERSION" => "", "BAIKAL_HOMEPAGE" => "", - "PROJECT_PACKAGE" => "", ); public function formMorphologyForThisModelInstance() { @@ -58,4 +53,4 @@ class Distrib extends \Baikal\Model\Config { public function label() { return "Baïkal distribution info"; } -} \ No newline at end of file +} diff --git a/Core/Frameworks/BaikalAdmin/Controller/Dashboard.php b/Core/Frameworks/BaikalAdmin/Controller/Dashboard.php index 08076bf..acc12e6 100644 --- a/Core/Frameworks/BaikalAdmin/Controller/Dashboard.php +++ b/Core/Frameworks/BaikalAdmin/Controller/Dashboard.php @@ -34,7 +34,6 @@ class Dashboard extends \Flake\Core\Controller { public function render() { $oView = new \BaikalAdmin\View\Dashboard(); $oView->setData("BAIKAL_VERSION", BAIKAL_VERSION); - $oView->setData("PROJECT_PACKAGE", PROJECT_PACKAGE); # Services status $oView->setData("BAIKAL_CAL_ENABLED", BAIKAL_CAL_ENABLED); @@ -60,4 +59,4 @@ class Dashboard extends \Flake\Core\Controller { return $oView->render(); } -} \ No newline at end of file +} diff --git a/Core/Frameworks/BaikalAdmin/Resources/Templates/Dashboard.html b/Core/Frameworks/BaikalAdmin/Resources/Templates/Dashboard.html index afe3376..11acf8d 100644 --- a/Core/Frameworks/BaikalAdmin/Resources/Templates/Dashboard.html +++ b/Core/Frameworks/BaikalAdmin/Resources/Templates/Dashboard.html @@ -15,7 +15,7 @@

Version

This systems runs
- Baïkal {{ BAIKAL_VERSION }}, {{ PROJECT_PACKAGE }} package
+ Baïkal {{ BAIKAL_VERSION }} {{ url }}

@@ -111,4 +111,4 @@ -{% endautoescape %} \ No newline at end of file +{% endautoescape %} diff --git a/Core/Frameworks/Flake/Framework.php b/Core/Frameworks/Flake/Framework.php index a96bca2..98781f5 100644 --- a/Core/Frameworks/Flake/Framework.php +++ b/Core/Frameworks/Flake/Framework.php @@ -154,13 +154,7 @@ class Framework extends \Flake\Core\Framework { require_once(PROJECT_PATH_CORE . "Distrib.php"); - if(PROJECT_PACKAGE === "regular") { - define("PROJECT_PATH_DOCUMENTROOT", PROJECT_PATH_ROOT . "html/"); - } elseif(PROJECT_PACKAGE === "flat") { - define("PROJECT_PATH_DOCUMENTROOT", PROJECT_PATH_ROOT); - } else { - throw new \Exception("Unrecognized PROJECT_PACKAGE value."); - } + define("PROJECT_PATH_DOCUMENTROOT", PROJECT_PATH_ROOT . "html/"); # Determine PROJECT_BASEURI $sScript = substr($_SERVER["SCRIPT_FILENAME"], strlen($_SERVER["DOCUMENT_ROOT"]));