From 1a628d39f724fa447c55143cdaa0b44d0c5bfcdd Mon Sep 17 00:00:00 2001
From: Dmitriy Simushev <simushevds@ossg.ru>
Date: Tue, 3 Jun 2014 14:39:47 +0000
Subject: [PATCH] Replace "index.php" files with a controller.

---
 src/mibew/.htaccess                           |  9 ++-
 src/mibew/index.php                           | 18 -----
 .../Mibew/Controller/HomeController.php       | 71 +++++++++++++++++++
 .../Controller/Operator/ProfileController.php |  2 +-
 src/mibew/libs/routing.yml                    | 12 ++++
 src/mibew/operator/index.php                  | 48 -------------
 .../server_side/_menu.handlebars              |  2 +-
 7 files changed, 92 insertions(+), 70 deletions(-)
 delete mode 100644 src/mibew/index.php
 create mode 100644 src/mibew/libs/classes/Mibew/Controller/HomeController.php
 delete mode 100644 src/mibew/operator/index.php

diff --git a/src/mibew/.htaccess b/src/mibew/.htaccess
index dc803fcb..a37136a0 100644
--- a/src/mibew/.htaccess
+++ b/src/mibew/.htaccess
@@ -24,13 +24,18 @@ Options +FollowSymLinks
     php_flag session.auto_start			off
 </IfModule>
 
+# Do not allow apache to automatically add trailing slashes for existing
+# directories. They should be processed by the application.
+<IfModule mod_dir.c>
+   DirectorySlash Off
+</IfModule>
+
 # Redirect requests to the front controller
 <IfModule mod_rewrite.c>
     RewriteEngine On
 
-    # Alter only requests for files and directories that do not exist
+    # Alter only requests for files that do not exist
     RewriteCond %{REQUEST_FILENAME} !-f
-    RewriteCond %{REQUEST_FILENAME} !-d
     # Rewrite all requests to front controller
     RewriteRule ^(.*)$ app.php [QSA,L]
 </IfModule>
diff --git a/src/mibew/index.php b/src/mibew/index.php
deleted file mode 100644
index 99526a3c..00000000
--- a/src/mibew/index.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-/*
- * Copyright 2005-2014 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-header("Location: operator/index.php");
diff --git a/src/mibew/libs/classes/Mibew/Controller/HomeController.php b/src/mibew/libs/classes/Mibew/Controller/HomeController.php
new file mode 100644
index 00000000..76194ca3
--- /dev/null
+++ b/src/mibew/libs/classes/Mibew/Controller/HomeController.php
@@ -0,0 +1,71 @@
+<?php
+/*
+ * Copyright 2005-2014 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+namespace Mibew\Controller;
+
+use Mibew\Settings;
+use Symfony\Component\HttpFoundation\Request;
+
+/**
+ * Generates content for home pages.
+ */
+class HomeController extends AbstractController
+{
+    /**
+     * Redirects client's browser to operator's home page.
+     *
+     * @param Request $request Incoming request.
+     * @return \Symfony\Component\HttpFoundation\RedirectResponse
+     */
+    public function redirectAction(Request $request)
+    {
+        return $this->redirect($this->generateUrl('home_operator'));
+    }
+
+    /**
+     * Renders operator's home page.
+     *
+     * @param Request $request Incoming request
+     * @return string Rendered page content.
+     */
+    public function dashboardAction(Request $request)
+    {
+        $operator = $this->getOperator();
+        $base_url = $request->getBaseUrl();
+
+        $is_online = is_operator_online($operator['operatorid']);
+
+        $page = array(
+            'version' => MIBEW_VERSION,
+            'localeLinks' => get_locale_links(),
+            'needUpdate' => Settings::get('dbversion') != DB_VERSION,
+            'needChangePassword' => check_password_hash($operator['vclogin'], '', $operator['vcpassword']),
+            'profilePage' => $base_url . '/operator/operator/' . $operator['operatorid'] . '/edit',
+            'updateWizard' => $base_url . '/install/',
+            'newFeatures' => Settings::get('featuresversion') != FEATURES_VERSION,
+            'featuresPage' => $base_url . '/operator/settings/features',
+            'isOnline' => $is_online,
+            'warnOffline' => true,
+            'title' => getlocal('topMenu.admin'),
+            'menuid' => 'main',
+        );
+
+        $page = array_merge($page, prepare_menu($operator));
+
+        return $this->render('index', $page);
+    }
+}
diff --git a/src/mibew/libs/classes/Mibew/Controller/Operator/ProfileController.php b/src/mibew/libs/classes/Mibew/Controller/Operator/ProfileController.php
index 9e5e1308..00b7f23f 100644
--- a/src/mibew/libs/classes/Mibew/Controller/Operator/ProfileController.php
+++ b/src/mibew/libs/classes/Mibew/Controller/Operator/ProfileController.php
@@ -218,7 +218,7 @@ class ProfileController extends AbstractController
 
             // Redirect the admin to the home page if needed.
             if ($to_dashboard) {
-                return $this->redirect($request->getBasePath() . '/operator/index.php');
+                return $this->redirect($this->generateUrl('home_operator'));
             }
         }
 
diff --git a/src/mibew/libs/routing.yml b/src/mibew/libs/routing.yml
index f93fdcae..80511ce5 100644
--- a/src/mibew/libs/routing.yml
+++ b/src/mibew/libs/routing.yml
@@ -304,6 +304,18 @@ history_user_track:
         _controller: Mibew\Controller\HistoryController::userTrackAction
         _access_check: Mibew\AccessControl\Check\LoggedInCheck
 
+## Home
+home:
+    path: /
+    defaults:
+        _controller: Mibew\Controller\HomeController::redirectAction
+
+home_operator:
+    path: /operator
+    defaults:
+        _controller: Mibew\Controller\HomeController::dashboardAction
+        _access_check: Mibew\AccessControl\Check\LoggedInCheck
+
 ## Invitations
 invite:
     path: /operator/invite
diff --git a/src/mibew/operator/index.php b/src/mibew/operator/index.php
deleted file mode 100644
index e4c4867a..00000000
--- a/src/mibew/operator/index.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php
-/*
- * Copyright 2005-2014 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-// Import namespaces and classes of the core
-use Mibew\Settings;
-use Mibew\Style\PageStyle;
-
-// Initialize libraries
-require_once(dirname(dirname(__FILE__)) . '/libs/init.php');
-
-$operator = check_login();
-force_password($operator);
-
-$is_online = is_operator_online($operator['operatorid']);
-
-$page = array(
-    'version' => MIBEW_VERSION,
-    'localeLinks' => get_locale_links(),
-    'needUpdate' => Settings::get('dbversion') != DB_VERSION,
-    'needChangePassword' => check_password_hash($operator['vclogin'], '', $operator['vcpassword']),
-    'profilePage' => MIBEW_WEB_ROOT . "/operator/operator/" . $operator['operatorid'] . '/edit',
-    'updateWizard' => MIBEW_WEB_ROOT . "/install/",
-    'newFeatures' => Settings::get('featuresversion') != FEATURES_VERSION,
-    'featuresPage' => MIBEW_WEB_ROOT . "/operator/settings/features",
-    'isOnline' => $is_online,
-    'warnOffline' => true,
-    'title' => getlocal("topMenu.admin"),
-    'menuid' => "main",
-);
-
-$page = array_merge($page, prepare_menu($operator));
-
-$page_style = new PageStyle(PageStyle::getCurrentStyle());
-$page_style->render('index', $page);
diff --git a/src/mibew/styles/pages/default/templates_src/server_side/_menu.handlebars b/src/mibew/styles/pages/default/templates_src/server_side/_menu.handlebars
index 1d7a397d..3bdc4b7e 100644
--- a/src/mibew/styles/pages/default/templates_src/server_side/_menu.handlebars
+++ b/src/mibew/styles/pages/default/templates_src/server_side/_menu.handlebars
@@ -12,7 +12,7 @@
         <li>
             <h2>{{l10n "right.main"}}</h2>
             <ul class="submenu">
-                <li{{#ifEqual menuid "main"}} class="active"{{/ifEqual}}><a href="{{mibewRoot}}/operator/index.php">{{l10n "topMenu.main"}}</a></li>
+                <li{{#ifEqual menuid "main"}} class="active"{{/ifEqual}}><a href="{{mibewRoot}}/operator">{{l10n "topMenu.main"}}</a></li>
                 <li{{#ifEqual menuid "users"}} class="active"{{/ifEqual}}><a href="{{mibewRoot}}/operator/users">{{l10n "topMenu.users"}}</a> <span class="small">(<a class="inner" href="{{mibewRoot}}/operator/users?nomenu">{{l10n "topMenu.users.nomenu"}}</a>)</span></li>
                 <li{{#ifEqual menuid "history"}} class="active"{{/ifEqual}}><a href="{{mibewRoot}}/operator/history">{{l10n "page_analysis.search.title"}}</a></li>
                 {{#if showstat}}