* removing most mentions to "tpl"

Refs #4019
matomo-org · Jun 28, 2013 · 60e3b96 · 60e3b96
1 parent e6009e4
commit 60e3b96
Show file tree

Hide file tree

Showing 12 changed files with 14 additions and 26 deletions.
diff --git a/core/Piwik.php b/core/Piwik.php
@@ -285,7 +285,7 @@ static public function copyRecursive($source, $target, $excludePhp = false)
      */
     static public function copy($source, $dest, $excludePhp = false)
     {
-        static $phpExtensions = array('php', 'tpl');
+        static $phpExtensions = array('php', 'tpl', 'twig');
 
         if ($excludePhp) {
             $path_parts = pathinfo($source);
@@ -547,7 +547,7 @@ static public function createHtAccessFiles()
         // more selective allow/deny filters
         $allowAny = "<Files \"*\">\n" . $allow . "Satisfy any\n</Files>\n";
         $allowStaticAssets = "<Files ~ \"\\.(test\.php|gif|ico|jpg|png|svg|js|css|swf)$\">\n" . $allow . "Satisfy any\n</Files>\n";
-        $denyDirectPhp = "<Files ~ \"\\.(php|php4|php5|inc|tpl|in)$\">\n" . $deny . "</Files>\n";
+        $denyDirectPhp = "<Files ~ \"\\.(php|php4|php5|inc|tpl|in|twig)$\">\n" . $deny . "</Files>\n";
 
         $directoriesToProtect = array(
             '/js'      => $allowAny,
@@ -582,6 +582,7 @@ static public function createWebConfigFiles()
         </hiddenSegments>
         <fileExtensions>
           <add fileExtension=".tpl" allowed="false" />
+          <add fileExtension=".twig" allowed="false" />
           <add fileExtension=".php4" allowed="false" />
           <add fileExtension=".php5" allowed="false" />
           <add fileExtension=".inc" allowed="false" />

diff --git a/core/Version.php b/core/Version.php
@@ -20,5 +20,5 @@ final class Piwik_Version
      * Current Piwik version
      * @var string
      */
-    const VERSION = '1.12';
+    const VERSION = '1.11';
 }
diff --git a/core/View.php b/core/View.php
@@ -236,6 +236,7 @@ static public function factory($templateName = null)
         }
         $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)) {

diff --git a/core/ViewDataTable.php b/core/ViewDataTable.php
@@ -899,7 +899,7 @@ public function disableFooterIcons()
     }
 
     /**
-     * When this method is called, the output will not contain the template datatable_footer.tpl
+     * When this method is called, the output will not include the template datatable_footer
      */
     public function disableFooter()
     {

diff --git a/core/ViewDataTable/Cloud.php b/core/ViewDataTable/Cloud.php
@@ -11,7 +11,7 @@
 
 /**
  * Reads the requested DataTable from the API, and prepares the data to give
- * to Piwik_Visualization_Cloud that will display the tag cloud (via the template cloud.tpl).
+ * to Piwik_Visualization_Cloud that will display the tag cloud (via the template _dataTable_cloud.twig).
  *
  * @package Piwik
  * @subpackage Piwik_ViewDataTable

diff --git a/plugins/CoreHome/javascripts/broadcast.js b/plugins/CoreHome/javascripts/broadcast.js
@@ -9,14 +9,6 @@
  *  broadcast object is to help maintain a hash for link clicks and ajax calls
  *  so we can have back button and refresh button working.
  *
- *   Other file that currently depending on this are:
- *     calendar.js
- *     period_select.tpl
- *     sites_selections.tpl
- *     menu.js, ...etc
- *
- * !! Load this once and only once. !!
- *
  * @type {object}
  */
 var broadcast = {
@@ -229,12 +221,6 @@ var broadcast = {
      * Expecting:
      *         str = "param1=newVal1&param2=newVal2";
      *
-     * Currently being use by:
-     *
-     *  handlePeriodClick,
-     *  calendar.js,
-     *  sites_selection.tpl
-     *
      * NOTE: This method will refresh the page with new values.
      *
      * @param {string} str  url with parameters to be updated

diff --git a/plugins/ExamplePlugin/Controller.php b/plugins/ExamplePlugin/Controller.php
@@ -48,7 +48,7 @@ public function photostreamMatt()
 
     /**
      * this widgets shows how to make a remote API request to piwik.org
-     * you find the main JS code in templates/piwikDownloadCount.tpl
+     * you find the main JS code in templates/piwikDownloads.twig
      */
     public function piwikDownloads()
     {

diff --git a/plugins/MobileMessaging/ReportRenderer/Sms.php b/plugins/MobileMessaging/ReportRenderer/Sms.php
@@ -87,7 +87,7 @@ public function renderReport($processedReport)
 
         // evolution metrics formatting :
         //  - remove monetary, percentage and white spaces to shorten SMS content
-        //    (this is also needed to be able to test $value != 0 and see if there is an evolution at all in SMSReport.tpl)
+        //    (this is also needed to be able to test $value != 0 and see if there is an evolution at all in SMSReport.twig)
         //  - adds a plus sign
         $reportData->filter(
             'ColumnCallbackReplace',

diff --git a/plugins/Overlay/javascripts/Piwik_Overlay.js b/plugins/Overlay/javascripts/Piwik_Overlay.js
@@ -139,7 +139,7 @@ var Piwik_Overlay = (function () {
 
     return {
 
-        /** This method is called when Overlay loads (from index.tpl) */
+        /** This method is called when Overlay loads  */
         init: function (iframeSrc, pIdSite, pPeriod, pDate) {
             iframeSrcBase = iframeSrc;
             idSite = pIdSite;

diff --git a/plugins/SitesManager/javascripts/SitesManager.js b/plugins/SitesManager/javascripts/SitesManager.js
@@ -5,7 +5,7 @@
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
 
-// NOTE: if you cannot find the definition of a variable here, look in SitesManager.tpl
+// NOTE: if you cannot find the definition of a variable here, look in index.twig
 function SitesManager(_timezones, _currencies, _defaultTimezone, _defaultCurrency) {
 
     var timezones = _timezones;

diff --git a/plugins/UserCountry/Controller.php b/plugins/UserCountry/Controller.php
@@ -141,7 +141,7 @@ private function getGeoIpUpdaterManageScreen()
     }
 
     /**
-     * Sets some variables needed by the updaterSetup.tpl template.
+     * Sets some variables needed by the _updaterManage.twig template.
      *
      * @param Piwik_View $view
      */

diff --git a/tests/PHPUnit/Core/ReleaseCheckListTest.php b/tests/PHPUnit/Core/ReleaseCheckListTest.php
@@ -52,8 +52,8 @@ private function _checkEqual($key, $valueExpected)
      */
     public function testTemplatesDontContainDebug()
     {
-        $patternFailIfFound = '{debug}';
-        $files = Piwik::globr(PIWIK_INCLUDE_PATH . '/plugins', '*.tpl');
+        $patternFailIfFound = 'dump(';
+        $files = Piwik::globr(PIWIK_INCLUDE_PATH . '/plugins', '*.twig');
         foreach ($files as $file) {
             $content = file_get_contents($file);
             $this->assertFalse(strpos($content, $patternFailIfFound), 'found in ' . $file);