Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/matomo-org/matomo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--core/Twig.php2
-rw-r--r--core/View.php31
-rw-r--r--plugins/CoreUpdater/Controller.php31
-rw-r--r--plugins/CoreUpdater/CoreUpdater.php2
-rw-r--r--plugins/CoreUpdater/templates/runUpdaterAndExit_cli_done.tpl64
-rw-r--r--plugins/CoreUpdater/templates/runUpdaterAndExit_cli_welcome.tpl38
-rw-r--r--plugins/CoreUpdater/templates/runUpdaterAndExit_done.twig2
-rw-r--r--plugins/CoreUpdater/templates/runUpdaterAndExit_done_cli.twig55
-rw-r--r--plugins/CoreUpdater/templates/runUpdaterAndExit_welcome.twig2
-rw-r--r--plugins/CoreUpdater/templates/runUpdaterAndExit_welcome_cli.twig37
10 files changed, 120 insertions, 144 deletions
diff --git a/core/Twig.php b/core/Twig.php
index acd806a010..75c5987378 100644
--- a/core/Twig.php
+++ b/core/Twig.php
@@ -52,6 +52,8 @@ class Piwik_Twig
$this->addFilter_sumTime();
$this->addFilter_money();
$this->addFilter_truncate();
+ $this->twig->addFilter( new Twig_SimpleFilter('implode', 'implode'));
+ $this->twig->addFilter( new Twig_SimpleFilter('count', 'count'));
/*
$this->load_filter('output', 'cachebuster');
$this->load_filter('output', 'trimwhitespace');*/
diff --git a/core/View.php b/core/View.php
index 5e2af830c5..3ce36e7306 100644
--- a/core/View.php
+++ b/core/View.php
@@ -34,16 +34,16 @@ class Piwik_View implements Piwik_View_Interface
private $contentType = 'text/html; charset=utf-8';
private $xFrameOptions = null;
- public function __construct($templateFile, $smConf = array(), $filter = true)
+ public function __construct($templateFile)
{
- if(substr($templateFile, -5) !== '.twig') {
- $templateFile .= '.twig';
+ $templateExt = '.twig';
+ if(substr($templateFile, -strlen($templateExt)) !== $templateExt) {
+ $templateFile .= $templateExt;
}
$this->template = $templateFile;
$this->initializeTwig();
- // global value accessible to all templates: the piwik base URL for the current request
$this->piwik_version = Piwik_Version::VERSION;
$this->cacheBuster = md5(Piwik_Common::getSalt() . PHP_VERSION . Piwik_Version::VERSION);
$this->piwikUrl = Piwik_Common::sanitizeInputValue(Piwik_Url::getCurrentUrlWithoutFileName());
@@ -221,29 +221,10 @@ class Piwik_View implements Piwik_View_Interface
}
/**
- * View factory method
- *
- * @param string $templateName Template name (e.g., 'index')
- * @throws Exception
- * @return Piwik_View
+ * @deprecated
*/
static public function factory($templateName = null)
{
- // get caller
- $bt = @debug_backtrace();
- if ($bt === null || !isset($bt[0])) {
- throw new Exception("View factory cannot be invoked");
- }
- $path = basename(dirname($bt[0]['file']));
-
- // TODO fixmea
- if (Piwik_Common::isPhpCliMode()) {
- $templateFile = $path . '/templates/cli_' . $templateName . '.tpl';
- if (file_exists(PIWIK_INCLUDE_PATH . '/plugins/' . $templateFile)) {
- return new Piwik_View($templateFile, array(), false);
- }
- }
- $templateFile = $path . '/templates/' . $templateName . '.twig';
- return new Piwik_View($templateName . '.twig');
+ throw new Exception("Piwik_View::factory is deprecated. Use 'new Piwik_View(\$templateFile)' instead.");
}
}
diff --git a/plugins/CoreUpdater/Controller.php b/plugins/CoreUpdater/Controller.php
index 400b2f65f7..7aa65bc2b4 100644
--- a/plugins/CoreUpdater/Controller.php
+++ b/plugins/CoreUpdater/Controller.php
@@ -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/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 da70795b37..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>
diff --git a/plugins/CoreUpdater/templates/runUpdaterAndExit_done_cli.twig b/plugins/CoreUpdater/templates/runUpdaterAndExit_done_cli.twig
new file mode 100644
index 0000000000..097f4ad62e
--- /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|count > 0 %}
+ [!] {{ 'CoreUpdater_WarningMessages'|translate }}
+
+ {% for message in warningMessages -%}
+ * {{ message }}
+ {%- endfor %}
+{%- endif %}
+{% if errorMessages|count > 0 -%}
+
+ [X] {{ 'CoreUpdater_ErrorDuringPluginsUpdates'|translate }}
+
+ {% for message in errorMessages %}
+ * {{ message }}
+ {% endfor %}
+
+ {% if deactivatedPlugins|count > 0 -%}
+ {% set listOfDeactivatedPlugins %}{{ deactivatedPlugins|implode(', ') }}{% endset %}
+
+ [!] {{ 'CoreUpdater_WeAutomaticallyDeactivatedTheFollowingPlugins'|translate(listOfDeactivatedPlugins) }}
+ {% endif %}
+
+{% endif %}
+
+{% if errorMessages|count > 0 or warningMessages|count > 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 39f1f00920..bd710b89a9 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 }}
@@ -125,4 +126,5 @@
});
});
</script>
+{% 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..9e4fe6abf2
--- /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|count > 0 %}
+
+ {{ 'CoreUpdater_DatabaseUpgradeRequired'|translate }}
+
+ {{ 'CoreUpdater_YourDatabaseIsOutOfDate'|translate }}
+
+ {% if coreToUpdate %}
+ {{ 'CoreUpdater_PiwikWillBeUpgradedFromVersionXToVersionY'|translate(current_piwik_version, new_piwik_version) }}
+ {% endif %}
+
+ {% if pluginNamesToUpdate|count > 0 %}
+ {%- set listOfPlugins %}{{ pluginNamesToUpdate|implode(', ') }}{% endset %}
+ {{ 'CoreUpdater_TheFollowingPluginsWillBeUpgradedX'|translate( listOfPlugins) }}
+ {% endif %}
+
+ {{ 'CoreUpdater_TheUpgradeProcessMayTakeAWhilePleaseBePatient'|translate }}
+{% endif %}
+{% endautoescape %}
+
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-07 10:52:38 +0300