Added ROUTE::OPTIONAL_SECURED

Nette/Application/IRouter.php

@@ -23,6 +23,9 @@ interface IRouter
 	/** HTTPS route */
 	const SECURED = 2;
 
+	/** HTTP & HTTPS route, depends if secured http request */
+	const OPTIONAL_SECURED = 4;
+
 	/**
 	 * Maps HTTP request to a Request object.
 	 * @return Request|NULL

Nette/Application/MicroPresenter.php

@@ -116,7 +116,7 @@ public function createTemplate($class = NULL, $latteFactory = NULL)
 		$template->baseUrl = rtrim($url->getBaseUrl(), '/');
 		$template->basePath = rtrim($url->getBasePath(), '/');
 
-		$template->registerHelperLoader('Nette\Templating\Helpers::loader');
+		$template->registerHelperLoader('Nette\Latte\Runtime\Filters::loader');
 		$template->setCacheStorage($context->getService('nette.templateCacheStorage'));
 		$template->onPrepareFilters[] = function($template) use ($latteFactory) {
 			$template->registerFilter($latteFactory ? $latteFactory() : new Nette\Latte\Engine);

Nette/Application/Routers/Route.php

@@ -105,6 +105,8 @@ class Route extends Nette\Object implements Application\IRouter
 	/** @var int */
 	private $flags;
 
+	/** @var bool */
+	private $httpRequestSecured = false;
 
 	/**
 	 * @param  string  URL mask, e.g. '<presenter>/<action>/<id \d{1,3}>'
@@ -251,13 +253,15 @@ public function match(Nette\Http\IRequest $httpRequest)
 			unset($params[self::PRESENTER_KEY]);
 		}
 
+		$this->httpRequestSecured = $httpRequest->isSecured();
+
 		return new Application\Request(
 			$presenter,
 			$httpRequest->getMethod(),
 			$params,
 			$httpRequest->getPost(),
 			$httpRequest->getFiles(),
-			array(Application\Request::SECURED => $httpRequest->isSecured())
+			array(Application\Request::SECURED => $this->httpRequestSecured)
 		);
 	}
 
@@ -404,7 +408,7 @@ public function constructUrl(Application\Request $appRequest, Nette\Http\Url $re
 			return NULL; // TODO: implement counterpart in match() ?
 		}
 
-		$url = ($this->flags & self::SECURED ? 'https:' : 'http:') . $url;
+		$url = ((($this->flags & self::SECURED) || (($this->flags & self::OPTIONAL_SECURED) && $this->httpRequestSecured)) ? 'https:' : 'http:') . $url;
 
 		// build query string
 		if ($this->xlat) {

Nette/Application/Routers/SimpleRouter.php

@@ -33,6 +33,8 @@ class SimpleRouter extends Nette\Object implements Application\IRouter
 	/** @var int */
 	private $flags;
 
+	/** @var bool */
+	private $httpRequestSecured = false;
 
 	/**
 	 * @param  array   default values
@@ -81,6 +83,8 @@ public function match(Nette\Http\IRequest $httpRequest)
 		$presenter = $this->module . $params[self::PRESENTER_KEY];
 		unset($params[self::PRESENTER_KEY]);
 
+		$this->httpRequestSecured = $httpRequest->isSecured();
+
 		return new Application\Request(
 			$presenter,
 			$httpRequest->getMethod(),
@@ -118,7 +122,8 @@ public function constructUrl(Application\Request $appRequest, Nette\Http\Url $re
 			}
 		}
 
-		$url = ($this->flags & self::SECURED ? 'https://' : 'http://') . $refUrl->getAuthority() . $refUrl->getPath();
+		$url = ((($this->flags & self::SECURED) || (($this->flags & self::OPTIONAL_SECURED) && $this->httpRequestSecured)) ? 'https://' : 'http://') . $refUrl->getAuthority() . $refUrl->getPath();
+
 		$sep = ini_get('arg_separator.input');
 		$query = http_build_query($params, '', $sep ? $sep[0] : '&');
 		if ($query != '') { // intentionally ==

Nette/Application/UI/Control.php

@@ -59,7 +59,7 @@ protected function createTemplate($class = NULL)
 		$template = $class ? new $class : new Nette\Templating\FileTemplate;
 		$presenter = $this->getPresenter(FALSE);
 		$template->onPrepareFilters[] = $this->templatePrepareFilters;
-		$template->registerHelperLoader('Nette\Templating\Helpers::loader');
+		$template->registerHelperLoader('Nette\Latte\Runtime\Filters::loader');
 
 		// default parameters
 		$template->control = $template->_control = $this;

Nette/DI/Extensions/ConstantsExtension.php → Nette/Bridges/DI/ConstantsExtension.php

@@ -5,7 +5,7 @@
  * Copyright (c) 2004 David Grudl (http://davidgrudl.com)
  */
 
-namespace Nette\DI\Extensions;
+namespace Nette\Bridges\DI;
 
 use Nette;
 

Nette/DI/Extensions/NetteExtension.php → Nette/Bridges/DI/NetteExtension.php

@@ -5,7 +5,7 @@
  * Copyright (c) 2004 David Grudl (http://davidgrudl.com)
  */
 
-namespace Nette\DI\Extensions;
+namespace Nette\Bridges\DI;
 
 use Nette,
 	Nette\DI\ContainerBuilder,
@@ -171,7 +171,7 @@ private function setupSession(ContainerBuilder $container, array $config)
 
 		if ($container->parameters['debugMode'] && $config['debugger']) {
 			$session->addSetup('Nette\Diagnostics\Debugger::getBar()->addPanel(?)', array(
-				new Nette\DI\Statement('Nette\Http\Diagnostics\SessionPanel')
+				new Nette\DI\Statement('Nette\Bridges\Tracy\HttpSessionPanel')
 			));
 		}
 
@@ -194,7 +194,7 @@ private function setupSecurity(ContainerBuilder $container, array $config)
 
 		if ($container->parameters['debugMode'] && $config['debugger']) {
 			$user->addSetup('Nette\Diagnostics\Debugger::getBar()->addPanel(?)', array(
-				new Nette\DI\Statement('Nette\Security\Diagnostics\UserPanel')
+				new Nette\DI\Statement('Nette\Bridges\Tracy\SecurityUserPanel')
 			));
 		}
 
@@ -232,7 +232,7 @@ private function setupApplication(ContainerBuilder $container, array $config)
 			->addSetup('$errorPresenter', array($config['errorPresenter']));
 
 		if ($config['debugger']) {
-			$application->addSetup('Nette\Application\Diagnostics\RoutingPanel::initializePanel');
+			$application->addSetup('Nette\Bridges\Tracy\RoutingPanel::initializePanel');
 		}
 
 		$presenterFactory = $container->addDefinition($this->prefix('presenterFactory'))
@@ -258,7 +258,7 @@ private function setupRouting(ContainerBuilder $container, array $config)
 
 		if ($container->parameters['debugMode'] && $config['debugger']) {
 			$container->getDefinition('application')->addSetup('Nette\Diagnostics\Debugger::getBar()->addPanel(?)', array(
-				new Nette\DI\Statement('Nette\Application\Diagnostics\RoutingPanel')
+				new Nette\DI\Statement('Nette\Bridges\Tracy\RoutingPanel')
 			));
 		}
 	}
@@ -293,7 +293,7 @@ private function setupLatte(ContainerBuilder $container, array $config)
 		$container->addDefinition($this->prefix('template'))
 			->setClass('Nette\Templating\FileTemplate')
 			->addSetup('registerFilter', array($latte))
-			->addSetup('registerHelperLoader', array('Nette\Templating\Helpers::loader'))
+			->addSetup('registerHelperLoader', array('Nette\Latte\Runtime\Filters::loader'))
 			->setAutowired(FALSE);
 
 		foreach ($config['macros'] as $macro) {
@@ -336,7 +336,7 @@ private function setupDatabase(ContainerBuilder $container, array $config)
 				->setClass('Nette\Database\Connection', array($info['dsn'], $info['user'], $info['password'], $info['options']))
 				->setAutowired($info['autowired'])
 				->addSetup('Nette\Diagnostics\Debugger::getBlueScreen()->addPanel(?)', array(
-					'Nette\Database\Diagnostics\ConnectionPanel::renderException'
+					'Nette\Bridges\Tracy\DatabaseConnectionPanel::renderException'
 				));
 
 			if (!$info['reflection']) {
@@ -386,7 +386,7 @@ public function afterCompile(Nette\PhpGenerator\ClassType $class)
 
 		if ($container->parameters['debugMode']) {
 			if ($config['container']['debugger']) {
-				$config['debugger']['bar'][] = 'Nette\DI\Diagnostics\ContainerPanel';
+				$config['debugger']['bar'][] = 'Nette\Bridges\Tracy\DIContainerPanel';
 			}
 
 			foreach ((array) $config['debugger']['bar'] as $item) {

Nette/DI/Extensions/PhpExtension.php → Nette/Bridges/DI/PhpExtension.php

@@ -5,7 +5,7 @@
  * Copyright (c) 2004 David Grudl (http://davidgrudl.com)
  */
 
-namespace Nette\DI\Extensions;
+namespace Nette\Bridges\DI;
 
 use Nette;
 

Nette/Latte/Macros/CacheMacro.php → Nette/Bridges/Latte/CacheMacro.php

@@ -5,7 +5,7 @@
  * Copyright (c) 2004 David Grudl (http://davidgrudl.com)
  */
 
-namespace Nette\Latte\Macros;
+namespace Nette\Bridges\Latte;
 
 use Nette,
 	Nette\Latte;
@@ -39,7 +39,7 @@ public function initialize()
 	public function finalize()
 	{
 		if ($this->used) {
-			return array('Nette\Latte\Macros\CacheMacro::initRuntime($template, $_g);');
+			return array('Nette\Bridges\Latte\CacheMacro::initRuntime($template, $_g);');
 		}
 	}
 
@@ -53,7 +53,7 @@ public function nodeOpened(Latte\MacroNode $node)
 		$this->used = TRUE;
 		$node->isEmpty = FALSE;
 		$node->openingCode = Latte\PhpWriter::using($node)
-			->write('<?php if (Nette\Latte\Macros\CacheMacro::createCache($netteCacheStorage, %var, $_g->caches, %node.array?)) { ?>',
+			->write('<?php if (Nette\Bridges\Latte\CacheMacro::createCache($netteCacheStorage, %var, $_g->caches, %node.array?)) { ?>',
 				Nette\Utils\Random::generate()
 			);
 	}

Nette/Latte/Macros/FormMacros.php → Nette/Bridges/Latte/FormMacros.php

@@ -5,13 +5,14 @@
  * Copyright (c) 2004 David Grudl (http://davidgrudl.com)
  */
 
-namespace Nette\Latte\Macros;
+namespace Nette\Bridges\Latte;
 
 use Nette,
 	Nette\Latte,
 	Nette\Latte\MacroNode,
 	Nette\Latte\PhpWriter,
 	Nette\Latte\CompileException,
+	Nette\Latte\Macros\MacroSet,
 	Nette\Forms\Form;
 
 
@@ -32,7 +33,7 @@ class FormMacros extends MacroSet
 	public static function install(Latte\Compiler $compiler)
 	{
 		$me = new static($compiler);
-		$me->addMacro('form', array($me, 'macroForm'), 'Nette\Latte\Macros\FormMacros::renderFormEnd($_form)');
+		$me->addMacro('form', array($me, 'macroForm'), 'Nette\Bridges\Latte\FormMacros::renderFormEnd($_form)');
 		$me->addMacro('formContainer', array($me, 'macroFormContainer'), '$_form = array_pop($_formStack)');
 		$me->addMacro('label', array($me, 'macroLabel'), array($me, 'macroLabelEnd'));
 		$me->addMacro('input', array($me, 'macroInput'), NULL, array($me, 'macroInputAttr'));
@@ -58,7 +59,7 @@ public function macroForm(MacroNode $node, PhpWriter $writer)
 		}
 		$node->tokenizer->reset();
 		return $writer->write(
-			'Nette\Latte\Macros\FormMacros::renderFormBegin($form = $_form = '
+			'Nette\Bridges\Latte\FormMacros::renderFormBegin($form = $_form = '
 			. ($name[0] === '$' ? 'is_object(%node.word) ? %node.word : ' : '')
 			. '$_control[%node.word], %node.array)'
 		);
@@ -157,7 +158,7 @@ public function macroNameAttr(MacroNode $node, PhpWriter $writer)
 
 		if ($tagName === 'form') {
 			return $writer->write(
-				'Nette\Latte\Macros\FormMacros::renderFormBegin($form = $_form = '
+				'Nette\Bridges\Latte\FormMacros::renderFormBegin($form = $_form = '
 					. ($name[0] === '$' ? 'is_object(%0.word) ? %0.word : ' : '')
 					. '$_control[%0.word], %1.var, FALSE)',
 				$name,
@@ -193,7 +194,7 @@ public function macroNameEnd(MacroNode $node, PhpWriter $writer)
 	{
 		preg_match('#^(.*? n:\w+>)(.*)(<[^?].*)\z#s', $node->content, $parts);
 		if (strtolower($node->htmlNode->name) === 'form') {
-			$node->content = $parts[1] . $parts[2] . '<?php Nette\Latte\Macros\FormMacros::renderFormEnd($_form, FALSE) ?>' . $parts[3];
+			$node->content = $parts[1] . $parts[2] . '<?php Nette\Bridges\Latte\FormMacros::renderFormEnd($_form, FALSE) ?>' . $parts[3];
 		} else { // select, textarea
 			$node->content = $parts[1] . '<?php echo $_input->getControl()->getHtml() ?>' . $parts[3];
 		}

Nette/DI/Diagnostics/ContainerPanel.php → Nette/Bridges/Tracy/DIContainerPanel.php

@@ -5,7 +5,7 @@
  * Copyright (c) 2004 David Grudl (http://davidgrudl.com)
  */
 
-namespace Nette\DI\Diagnostics;
+namespace Nette\Bridges\Tracy;
 
 use Nette,
 	Nette\DI\Container;
@@ -16,7 +16,7 @@
  *
  * @author     Patrik Votoček
  */
-class ContainerPanel extends Nette\Object implements Nette\Diagnostics\IBarPanel
+class DIContainerPanel extends Nette\Object implements Nette\Diagnostics\IBarPanel
 {
 	/** @var Nette\DI\Container */
 	private $container;
@@ -35,7 +35,7 @@ public function __construct(Container $container)
 	public function getTab()
 	{
 		ob_start();
-		require __DIR__ . '/templates/ContainerPanel.tab.phtml';
+		require __DIR__ . '/templates/DIContainerPanel.tab.phtml';
 		return ob_get_clean();
 	}
 
@@ -66,7 +66,7 @@ public function getPanel()
 		}
 
 		ob_start();
-		require __DIR__ . '/templates/ContainerPanel.panel.phtml';
+		require __DIR__ . '/templates/DIContainerPanel.panel.phtml';
 		return ob_get_clean();
 	}
 

Nette/Database/Diagnostics/ConnectionPanel.php → Nette/Bridges/Tracy/DatabaseConnectionPanel.php

@@ -5,7 +5,7 @@
  * Copyright (c) 2004 David Grudl (http://davidgrudl.com)
  */
 
-namespace Nette\Database\Diagnostics;
+namespace Nette\Bridges\Tracy;
 
 use Nette,
 	Nette\Database\Helpers;
@@ -16,7 +16,7 @@
  *
  * @author     David Grudl
  */
-class ConnectionPanel extends Nette\Object implements Nette\Diagnostics\IBarPanel
+class DatabaseConnectionPanel extends Nette\Object implements Nette\Diagnostics\IBarPanel
 {
 	/** @var int */
 	public $maxQueries = 100;

Nette/Http/Diagnostics/SessionPanel.php → Nette/Bridges/Tracy/HttpSessionPanel.php

@@ -5,7 +5,7 @@
  * Copyright (c) 2004 David Grudl (http://davidgrudl.com)
  */
 
-namespace Nette\Http\Diagnostics;
+namespace Nette\Bridges\Tracy;
 
 use Nette;
 
@@ -15,7 +15,7 @@
  *
  * @author     David Grudl
  */
-class SessionPanel extends Nette\Object implements Nette\Diagnostics\IBarPanel
+class HttpSessionPanel extends Nette\Object implements Nette\Diagnostics\IBarPanel
 {
 
 	/**
@@ -25,7 +25,7 @@ class SessionPanel extends Nette\Object implements Nette\Diagnostics\IBarPanel
 	public function getTab()
 	{
 		ob_start();
-		require __DIR__ . '/templates/SessionPanel.tab.phtml';
+		require __DIR__ . '/templates/HttpSessionPanel.tab.phtml';
 		return ob_get_clean();
 	}
 
@@ -37,7 +37,7 @@ public function getTab()
 	public function getPanel()
 	{
 		ob_start();
-		require __DIR__ . '/templates/SessionPanel.panel.phtml';
+		require __DIR__ . '/templates/HttpSessionPanel.panel.phtml';
 		return ob_get_clean();
 	}
 

Nette/Application/Diagnostics/RoutingPanel.php → Nette/Bridges/Tracy/RoutingPanel.php

@@ -5,7 +5,7 @@
  * Copyright (c) 2004 David Grudl (http://davidgrudl.com)
  */
 
-namespace Nette\Application\Diagnostics;
+namespace Nette\Bridges\Tracy;
 
 use Nette,
 	Nette\Application\Routers,

Nette/Security/Diagnostics/UserPanel.php → Nette/Bridges/Tracy/SecurityUserPanel.php

@@ -5,7 +5,7 @@
  * Copyright (c) 2004 David Grudl (http://davidgrudl.com)
  */
 
-namespace Nette\Security\Diagnostics;
+namespace Nette\Bridges\Tracy;
 
 use Nette;
 
@@ -15,7 +15,7 @@
  *
  * @author     David Grudl
  */
-class UserPanel extends Nette\Object implements Nette\Diagnostics\IBarPanel
+class SecurityUserPanel extends Nette\Object implements Nette\Diagnostics\IBarPanel
 {
 	/** @var Nette\Security\User */
 	private $user;
@@ -34,7 +34,7 @@ public function __construct(Nette\Security\User $user)
 	public function getTab()
 	{
 		ob_start();
-		require __DIR__ . '/templates/UserPanel.tab.phtml';
+		require __DIR__ . '/templates/SecurityUserPanel.tab.phtml';
 		return ob_get_clean();
 	}
 
@@ -46,7 +46,7 @@ public function getTab()
 	public function getPanel()
 	{
 		ob_start();
-		require __DIR__ . '/templates/UserPanel.panel.phtml';
+		require __DIR__ . '/templates/SecurityUserPanel.panel.phtml';
 		return ob_get_clean();
 	}