Merge with master

9 files changed, 116 insertions, 123 deletions

diff --git a/plugins/CoreUpdater/Controller.php b/plugins/CoreUpdater/Controller.php
index aab7177dc4..7aa65bc2b4 100644
--- a/plugins/CoreUpdater/Controller.php
+++ b/plugins/CoreUpdater/Controller.php
@@ -163,7 +163,7 @@ class Piwik_CoreUpdater_Controller extends Piwik_Controller
         /*
          * Make sure the execute bit is set for this shell script
          */
-        if (!Piwik_ArchiveProcessing::isBrowserTriggerArchivingEnabled()) {
+        if (!Piwik_ArchiveProcessor_Rules::isBrowserTriggerEnabled()) {
             @chmod($this->pathRootExtractedPiwik . '/misc/cron/archive.sh', 0755);
         }
 
@@ -234,34 +234,35 @@ class Piwik_CoreUpdater_Controller extends Piwik_Controller
 
         Piwik::setMaxExecutionTime(0);
 
+        $cli = Piwik_Common::isPhpCliMode() ? '_cli' : '';
+        $welcomeTemplate = '@CoreUpdater/runUpdaterAndExit_welcome' . $cli;
+        $doneTemplate = '@CoreUpdater/runUpdaterAndExit_done' . $cli;
+        $viewWelcome = new Piwik_View($welcomeTemplate);
+        $viewDone = new Piwik_View($doneTemplate);
+
         $sqlQueries = $updater->getSqlQueriesToExecute();
         if (Piwik_Common::isPhpCliMode()) {
-            $view = new Piwik_View('@CoreUpdater/runUpdaterAndExit_cli_welcome', array(), false);
-            $this->doWelcomeUpdates($view, $componentsWithUpdateFile);
-            echo $view->render();
+            $this->doWelcomeUpdates($viewWelcome, $componentsWithUpdateFile);
+            echo $viewWelcome->render();
 
             if (!$this->coreError && Piwik::getModule() == 'CoreUpdater') {
-                $view = new Piwik_View('@CoreUpdater/runUpdaterAndExit_cli_done', array(), false);
-                $this->doExecuteUpdates($view, $updater, $componentsWithUpdateFile);
-                echo $view->render();
+                $this->doExecuteUpdates($viewDone, $updater, $componentsWithUpdateFile);
+                echo $viewDone->render();
             }
         } else {
             if (Piwik_Common::getRequestVar('updateCorePlugins', 0, 'integer') == 1) {
                 $this->warningMessages = array();
-                $view = new Piwik_View('@CoreUpdater/runUpdaterAndExit_done');
-                $this->doExecuteUpdates($view, $updater, $componentsWithUpdateFile);
+                $this->doExecuteUpdates($viewDone, $updater, $componentsWithUpdateFile);
 
                 if (count($sqlQueries) == 1 && !$this->coreError) {
                     Piwik::redirectToModule('CoreHome');
                 }
-
-                echo $view->render();
+                echo $viewDone->render();
             } else {
-                $view = new Piwik_View('@CoreUpdater/runUpdaterAndExit_welcome');
-                $view->queries = $sqlQueries;
-                $view->isMajor = $updater->hasMajorDbUpdate();
-                $this->doWelcomeUpdates($view, $componentsWithUpdateFile);
-                echo $view->render();
+                $viewWelcome->queries = $sqlQueries;
+                $viewWelcome->isMajor = $updater->hasMajorDbUpdate();
+                $this->doWelcomeUpdates($viewWelcome, $componentsWithUpdateFile);
+                echo $viewWelcome->render();
             }
         }
         exit;
diff --git a/plugins/CoreUpdater/CoreUpdater.php b/plugins/CoreUpdater/CoreUpdater.php
index 652aeaa20e..34726e0612 100644
--- a/plugins/CoreUpdater/CoreUpdater.php
+++ b/plugins/CoreUpdater/CoreUpdater.php
@@ -34,7 +34,7 @@ class Piwik_CoreUpdater extends Piwik_Plugin
         return $hooks;
     }
 
-    public static function getComponentUpdates($updater)
+    public static function getComponentUpdates(Piwik_Updater $updater)
     {
         $updater->addComponentToCheck('core', Piwik_Version::VERSION);
         $plugins = Piwik_PluginsManager::getInstance()->getLoadedPlugins();
diff --git a/plugins/CoreUpdater/templates/newVersionAvailable.twig b/plugins/CoreUpdater/templates/newVersionAvailable.twig
index e87362fe07..00f2d14b3b 100644
--- a/plugins/CoreUpdater/templates/newVersionAvailable.twig
+++ b/plugins/CoreUpdater/templates/newVersionAvailable.twig
@@ -20,7 +20,7 @@
     <input type="submit" class="submit" value="{{ 'CoreUpdater_UpdateAutomatically'|translate }}"/>
     {% endif %}
     <a style="margin-left:50px" class="submit button"
-       href="{$piwik_latest_version_url}?cb={{ piwik_new_version }}">{{ 'CoreUpdater_DownloadX'|translate(piwik_new_version) }}</a><br/>
+       href="{{ piwik_latest_version_url }}?cb={{ piwik_new_version }}">{{ 'CoreUpdater_DownloadX'|translate(piwik_new_version) }}</a><br/>
     {% if can_auto_update %}
 </form>
 {% endif %}
diff --git a/plugins/CoreUpdater/templates/runUpdaterAndExit_cli_done.tpl b/plugins/CoreUpdater/templates/runUpdaterAndExit_cli_done.tpl
deleted file mode 100644
index 099960be4d..0000000000
--- a/plugins/CoreUpdater/templates/runUpdaterAndExit_cli_done.tpl
+++ /dev/null
@@ -1,64 +0,0 @@
-{textformat}
-    {assign var='helpMessage' value='CoreUpdater_HelpMessageContent'|translate:'[':']':"\n\n* "|unescape}
-
-    {if $coreError}
-        [X] {'CoreUpdater_CriticalErrorDuringTheUpgradeProcess'|translate|unescape}
-
-        {foreach from=$errorMessages item=message}
-            * {$message}
-
-        {/foreach}
-
-        {'CoreUpdater_HelpMessageIntroductionWhenError'|translate|unescape}
-
-        * {$helpMessage}
-
-
-        {'CoreUpdater_ErrorDIYHelp'|translate}
-
-        * {'CoreUpdater_ErrorDIYHelp_1'|translate}
-
-        * {'CoreUpdater_ErrorDIYHelp_2'|translate}
-
-        * {'CoreUpdater_ErrorDIYHelp_3'|translate}
-
-        * {'CoreUpdater_ErrorDIYHelp_4'|translate}
-
-        * {'CoreUpdater_ErrorDIYHelp_5'|translate}
-
-    {else}
-        {if count($warningMessages) > 0}
-            [!] {'CoreUpdater_WarningMessages'|translate|unescape}
-
-            {foreach from=$warningMessages item=message}
-                * {$message}
-
-            {/foreach}
-        {/if}
-
-        {if count($errorMessages) > 0}
-            [X] {'CoreUpdater_ErrorDuringPluginsUpdates'|translate|unescape}
-
-            {foreach from=$errorMessages item=message}
-                * {$message}
-
-            {/foreach}
-
-            {if isset($deactivatedPlugins) && count($deactivatedPlugins) > 0}
-                {assign var=listOfDeactivatedPlugins value=$deactivatedPlugins|@implode:', '}
-                [!] {'CoreUpdater_WeAutomaticallyDeactivatedTheFollowingPlugins'|translate:$listOfDeactivatedPlugins|unescape}
-
-            {/if}
-        {/if}
-        {if count($errorMessages) > 0 || count($warningMessages) > 0}
-            {'CoreUpdater_HelpMessageIntroductionWhenWarning'|translate|unescape}
-
-            * {$helpMessage}
-        {else}
-            {'CoreUpdater_PiwikHasBeenSuccessfullyUpgraded'|translate|unescape}
-
-        {/if}
-    {/if}
-{/textformat}
-
-
diff --git a/plugins/CoreUpdater/templates/runUpdaterAndExit_cli_welcome.tpl b/plugins/CoreUpdater/templates/runUpdaterAndExit_cli_welcome.tpl
deleted file mode 100644
index b3802e024a..0000000000
--- a/plugins/CoreUpdater/templates/runUpdaterAndExit_cli_welcome.tpl
+++ /dev/null
@@ -1,38 +0,0 @@
-{assign var='helpMessage' value='CoreUpdater_HelpMessageContent'|translate:'[':']':"\n\n* "|unescape}
-{textformat}
-    *** {'CoreUpdater_UpdateTitle'|translate|unescape} ***
-
-    {if $coreError}
-        [X] {'CoreUpdater_CriticalErrorDuringTheUpgradeProcess'|translate|unescape}
-
-        {foreach from=$errorMessages item=message}
-            * {$message}
-
-        {/foreach}
-
-        {'CoreUpdater_HelpMessageIntroductionWhenError'|translate|unescape}
-
-        * {$helpMessage}
-
-    {else}
-        {if $coreToUpdate || count($pluginNamesToUpdate) > 0}
-            {'CoreUpdater_DatabaseUpgradeRequired'|translate|unescape}
-
-            {'CoreUpdater_YourDatabaseIsOutOfDate'|translate|unescape}
-
-            {if $coreToUpdate}
-                {'CoreUpdater_PiwikWillBeUpgradedFromVersionXToVersionY'|translate:$current_piwik_version:$new_piwik_version|unescape}
-
-            {/if}
-            {if count($pluginNamesToUpdate) > 0}
-                {assign var=listOfPlugins value=$pluginNamesToUpdate|@implode:', '}
-                {'CoreUpdater_TheFollowingPluginsWillBeUpgradedX'|translate:$listOfPlugins|unescape}
-
-            {/if}
-            {'CoreUpdater_TheUpgradeProcessMayTakeAWhilePleaseBePatient'|translate|unescape}
-
-        {/if}
-    {/if}
-{/textformat}
-
-
diff --git a/plugins/CoreUpdater/templates/runUpdaterAndExit_done.twig b/plugins/CoreUpdater/templates/runUpdaterAndExit_done.twig
index 917ddaaeba..190852d609 100644
--- a/plugins/CoreUpdater/templates/runUpdaterAndExit_done.twig
+++ b/plugins/CoreUpdater/templates/runUpdaterAndExit_done.twig
@@ -24,7 +24,7 @@
     <ul>
         <li>{{ 'CoreUpdater_ErrorDIYHelp_1'|translate }}</li>
         <li>{{ 'CoreUpdater_ErrorDIYHelp_2'|translate }}</li>
-        <li>{{ 'CoreUpdater_ErrorDIYHelp_3'|translate }}</li>
+        <li>{{ 'CoreUpdater_ErrorDIYHelp_3'|translate }} <a href='https://piwik.org/faq/how-to-update/#faq_179' target='_blank'>(see FAQ)</a></li>
         <li>{{ 'CoreUpdater_ErrorDIYHelp_4'|translate }}</li>
         <li>{{ 'CoreUpdater_ErrorDIYHelp_5'|translate }}</li>
     </ul>
@@ -68,11 +68,11 @@
     {% else %}
         <p class="success">{{ 'CoreUpdater_PiwikHasBeenSuccessfullyUpgraded'|translate }}</p>
         <div id="donate-form-container">
-            {% include "@CoreHome/_donate.tpl" %}
+            {% include "@CoreHome/_donate.twig" %}
         </div>
     {% endif %}
     <form action="index.php">
         <input type="submit" class="submit" value="{{ 'CoreUpdater_ContinueToPiwik'|translate }}"/>
     </form>
 {% endif %}
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/plugins/CoreUpdater/templates/runUpdaterAndExit_done_cli.twig b/plugins/CoreUpdater/templates/runUpdaterAndExit_done_cli.twig
new file mode 100644
index 0000000000..9d1a5ae357
--- /dev/null
+++ b/plugins/CoreUpdater/templates/runUpdaterAndExit_done_cli.twig
@@ -0,0 +1,55 @@
+{% autoescape false %}
+{% set helpMessage %}{{- 'CoreUpdater_HelpMessageContent'|translate('[',']',"\n\n    *") }}{% endset %}
+{% if coreError %}
+    [X] {{ 'CoreUpdater_CriticalErrorDuringTheUpgradeProcess'|translate }}
+
+    {%  for message in errorMessages %}
+    * {{  message }}
+    {%  endfor %}
+
+    {{ 'CoreUpdater_HelpMessageIntroductionWhenError'|translate }}
+
+    * {{ helpMessage }}
+
+    {{ 'CoreUpdater_ErrorDIYHelp'|translate }}
+    * {{ 'CoreUpdater_ErrorDIYHelp_1'|translate }}
+    * {{ 'CoreUpdater_ErrorDIYHelp_2'|translate }}
+    * {{ 'CoreUpdater_ErrorDIYHelp_3'|translate }}
+    * {{ 'CoreUpdater_ErrorDIYHelp_4'|translate }}
+    * {{ 'CoreUpdater_ErrorDIYHelp_5'|translate }}
+
+{% else %}
+{% if warningMessages|length > 0 %}
+    [!] {{ 'CoreUpdater_WarningMessages'|translate }}
+
+    {% for message in warningMessages -%}
+    * {{ message }}
+    {%- endfor %}
+{%- endif %}
+{% if errorMessages|length > 0 -%}
+
+    [X] {{ 'CoreUpdater_ErrorDuringPluginsUpdates'|translate }}
+
+    {% for message in errorMessages %}
+    * {{ message }}
+    {% endfor %}
+
+    {% if deactivatedPlugins|length > 0 -%}
+    {%  set listOfDeactivatedPlugins %}{{ deactivatedPlugins|implode(', ') }}{% endset %}
+
+    [!] {{ 'CoreUpdater_WeAutomaticallyDeactivatedTheFollowingPlugins'|translate(listOfDeactivatedPlugins) }}
+    {% endif %}
+
+{% endif %}
+
+{% if errorMessages|length > 0 or warningMessages|length > 0 %}
+    {{ 'CoreUpdater_HelpMessageIntroductionWhenWarning'|translate }}
+
+    * {{ helpMessage }}
+{% else %}
+    {{ 'CoreUpdater_PiwikHasBeenSuccessfullyUpgraded'|translate }}
+{% endif %}
+
+{% endif %}
+{% endautoescape %}
+
diff --git a/plugins/CoreUpdater/templates/runUpdaterAndExit_welcome.twig b/plugins/CoreUpdater/templates/runUpdaterAndExit_welcome.twig
index 7867245c3d..243650b99e 100644
--- a/plugins/CoreUpdater/templates/runUpdaterAndExit_welcome.twig
+++ b/plugins/CoreUpdater/templates/runUpdaterAndExit_welcome.twig
@@ -1,6 +1,7 @@
 {% extends '@CoreUpdater/layout.twig' %}
 
 {% block content %}
+{% spaceless %}
 <span style="float:right">{{ postEvent('template_topBar')|raw }}</span>
 {% set helpMessage %}
     {{ 'CoreUpdater_HelpMessageContent'|translate('<a target="_blank" href="?module=Proxy&action=redirect&url=http://piwik.org/faq/">','</a>','</li><li>')|raw }}
@@ -98,4 +99,5 @@
 
 {% include "@Installation/_integrityDetails.twig" %}
 
+{% endspaceless %}
 {% endblock %}
\ No newline at end of file
diff --git a/plugins/CoreUpdater/templates/runUpdaterAndExit_welcome_cli.twig b/plugins/CoreUpdater/templates/runUpdaterAndExit_welcome_cli.twig
new file mode 100644
index 0000000000..7ab452913e
--- /dev/null
+++ b/plugins/CoreUpdater/templates/runUpdaterAndExit_welcome_cli.twig
@@ -0,0 +1,37 @@
+{% autoescape false %}
+{% set helpMessage %}
+{{- 'CoreUpdater_HelpMessageContent'|translate('[',']','\n\n    *') }}
+{% endset %}
+
+*** {{ 'CoreUpdater_UpdateTitle'|translate }} ***
+{% if coreError %}
+
+    [X] {{ 'CoreUpdater_CriticalErrorDuringTheUpgradeProcess'|translate }}
+
+    {% for message in errorMessages %}
+        {{- message }}
+    {%  endfor %}
+
+    {{ 'CoreUpdater_HelpMessageIntroductionWhenError'|translate }}
+
+    * {{ helpMessage }}
+
+{% elseif coreToUpdate or pluginNamesToUpdate|length > 0 %}
+
+    {{ 'CoreUpdater_DatabaseUpgradeRequired'|translate }}
+
+    {{ 'CoreUpdater_YourDatabaseIsOutOfDate'|translate }}
+
+    {% if coreToUpdate %}
+        {{ 'CoreUpdater_PiwikWillBeUpgradedFromVersionXToVersionY'|translate(current_piwik_version, new_piwik_version) }}
+    {% endif %}
+
+    {% if pluginNamesToUpdate|length > 0 %}
+        {%- set listOfPlugins %}{{  pluginNamesToUpdate|implode(', ') }}{% endset %}
+        {{ 'CoreUpdater_TheFollowingPluginsWillBeUpgradedX'|translate( listOfPlugins) }}
+    {%  endif %}
+
+    {{ 'CoreUpdater_TheUpgradeProcessMayTakeAWhilePleaseBePatient'|translate }}
+{%  endif %}
+{% endautoescape %}
+