Index is now the front end controller

Author: iMattPro

event/listener.php

@@ -133,7 +133,7 @@ public function show_page_links()
 	public function viewonline_page($event)
 	{
 		// Are any users on app.php?
-		if ($event['on_page'][1] === 'app')
+		if ($event['on_page'][1] === 'index')
 		{
 			// Load our language file
 			$this->lang->add_lang('pages_common', 'phpbb/pages');
@@ -144,7 +144,7 @@ public function viewonline_page($event)
 			// If any of our pages are being viewed, update the event vars with our routes and titles
 			foreach ($page_routes as $page_id => $page_data)
 			{
-				if ($event['row']['session_page'] === 'app.' . $this->php_ext . '/' . $page_data['route'])
+				if ($event['row']['session_page'] === 'index.' . $this->php_ext . '/' . $page_data['route'])
 				{
 					$event['location'] = $this->lang->lang('PAGES_VIEWONLINE', $page_data['title']);
 					$event['location_url'] = $this->helper->route('phpbb_pages_dynamic_route_' . $page_id);

tests/event/event_listener_viewonline_test.php

@@ -57,39 +57,39 @@ public static function viewonline_page_data()
 				'$location_url',
 				'$location',
 			),
-			// test when on_page is app and session_page is NOT for pages
+			// test when on_page is index and session_page is NOT for pages
 			array(
 				array(
-					1 => 'app',
+					1 => 'index',
 				),
 				array(
-					'session_page' => 'app.' . $phpEx . '/help/faq'
+					'session_page' => 'index.' . $phpEx . '/help/faq'
 				),
 				'$location_url',
 				'$location',
 				'$location_url',
 				'$location',
 			),
-			// test when on_page is app and session_page is for pages
+			// test when on_page is index and session_page is for pages
 			array(
 				array(
-					1 => 'app',
+					1 => 'index',
 				),
 				array(
-					'session_page' => 'app.' . $phpEx . '/test'
+					'session_page' => 'index.' . $phpEx . '/test'
 				),
 				'$location_url',
 				'$location',
 				'phpbb_pages_dynamic_route_1#a:0:{}',
 				$lang->lang('PAGES_VIEWONLINE', '$location'),
 			),
-			// test when on_page is app and session_page is for non-existent pages
+			// test when on_page is index and session_page is for non-existent pages
 			array(
 				array(
-					1 => 'app',
+					1 => 'index',
 				),
 				array(
-					'session_page' => 'app.' . $phpEx . '/foobar'
+					'session_page' => 'index.' . $phpEx . '/foobar'
 				),
 				'$location_url',
 				'$location',

tests/functional/cron_reparser_test.php

@@ -33,14 +33,14 @@ public function test_cron_reparser()
 		$route = $this->create_page($page_title, $page_content);
 
 		// Go to the test page
-		$crawler = self::request('GET', "app.php/$route?sid=$this->sid");
+		$crawler = self::request('GET', "index.php/$route?sid=$this->sid");
 		$this->assertStringContainsString($page_title, $crawler->filter('h2')->text());
 
 		// Assert no reparsers have run yet
 		$this->assertEmpty($this->get_reparser_resume());
 
 		// Run the cron task to reparse pages
-		self::request('GET', "app.php/cron/cron.task.text_reparser.phpbb_pages", [], false);
+		self::request('GET', "index.php/cron/cron.task.text_reparser.phpbb_pages", [], false);
 
 		// Try to ensure that the cron can actually run before we start to wait for it
 		sleep(1);

tests/functional/main_controller_test.php

@@ -37,7 +37,7 @@ public function test_display()
 		]);
 
 		// Load the page
-		$crawler = self::request('GET', "app.php/{$route}?sid={$this->sid}");
+		$crawler = self::request('GET', "index.php/{$route}?sid={$this->sid}");
 
 		// Assert the expected page exists
 		self::assertStringContainsString($page_title, $crawler->filter('#page-body')->text());
@@ -78,7 +78,7 @@ public function test_display()
 	public function test_display_legacy($route)
 	{
 		// Load the page
-		$crawler = self::request('GET', "app.php/page/{$route}?sid={$this->sid}");
+		$crawler = self::request('GET', "index.php/page/{$route}?sid={$this->sid}");
 
 		// Assert the expected page exists
 		self::assertStringContainsString('Front End Test Page', $crawler->filter('#page-body')->text());

tests/functional/viewonline_test.php

@@ -31,7 +31,7 @@ public function test_viewonline_setup()
 		$route = $this->create_page($page_title, $page_content);
 
 		// Send the admin to the test page
-		$crawler = self::request('GET', "app.php/{$route}?sid={$this->sid}");
+		$crawler = self::request('GET', "index.php/{$route}?sid={$this->sid}");
 		self::assertStringContainsString($page_title, $crawler->filter('h2')->text());
 
 		return $page_title;