partkeepr

commit f2c246653768e0df5bbda25356900dabe3734cee
parent 45b66cf7b9f11aaaa440df4ad230669029b2de6e
Author: Timo A. Hummel <felicitus@felicitus.org>
Date:   Fri,  6 Nov 2015 23:29:27 +0100

Migrated MOTD support, related to #459

Diffstat:
M
app/config/parameters.php.dist
 | 
5
+++++
M
src/PartKeepr/FrontendBundle/Controller/IndexController.php
 | 
17
++++-------------

2 files changed, 9 insertions(+), 13 deletions(-)
diff --git a/app/config/parameters.php.dist b/app/config/parameters.php.dist
@@ -91,3 +91,7 @@ $container->setParameter('partkeepr.frontend.auto_login.password', 'admin');
  */
 $container->setParameter('partkeepr.category.path_separator', ' ➤ ');
 
+/**
+ * Specifies a message of the day
+ */
+$container->setParameter('partkeepr.frontend.motd', "This is a MOTD");+
\ No newline at end of file
diff --git a/src/PartKeepr/FrontendBundle/Controller/IndexController.php b/src/PartKeepr/FrontendBundle/Controller/IndexController.php
@@ -28,8 +28,8 @@ class IndexController extends Controller
         $aParameters["php_version"] = phpversion();
         $aParameters["auto_start_session"] = true;
 
-        $maxPostSize = PartKeepr::getBytesFromHumanReadable(ini_get("post_max_size"));
-        $maxFileSize = PartKeepr::getBytesFromHumanReadable(ini_get("upload_max_filesize"));
+        $maxPostSize = $this->get("partkeepr_systemservice")->format_bytes(ini_get("post_max_size"));
+        $maxFileSize = $this->get("partkeepr_systemservice")->format_bytes(ini_get("upload_max_filesize"));
 
         $aParameters["maxUploadSize"] = min($maxPostSize, $maxFileSize);
 
@@ -43,8 +43,8 @@ class IndexController extends Controller
             $aParameters["autoLoginPassword"] = $this->getParameter("partkeepr.frontend.auto_login.password");
         }
 
-        if (Configuration::getOption("partkeepr.frontend.motd", false) !== false) {
-            $aParameters["motd"] = Configuration::getOption("partkeepr.frontend.motd");
+        if ($this->getParameterWithDefault("partkeepr.frontend.motd", false) !== false) {
+            $aParameters["motd"] = $this->getParameterWithDefault("partkeepr.frontend.motd", false);
         }
 
         $aParameters["max_users"] = $this->getParameter("max_users");
@@ -53,17 +53,8 @@ class IndexController extends Controller
         $aParameters["tip_of_the_day_uri"] = $this->getParameter("partkeepr.tip_of_the_day_uri");
 
         $renderParams = array();
-        $renderParams["debug_all"] = Configuration::getOption("partkeepr.frontend.debug_all", false);
-        $renderParams["debug"] = Configuration::getOption("partkeepr.frontend.debug", false);
         $renderParams["parameters"] = $aParameters;
 
-        if (isset($_SERVER['HTTPS'])) {
-            $renderParams["https"] = true;
-        } else {
-            $renderParams["https"] = false;
-        }
-
-
         return $this->render('PartKeeprFrontendBundle::index.html.twig', $renderParams);
     }