* Enabling Twig 'strict_variables' so that we write best code possible, and...

* Enabling Twig 'strict_variables' so that we write best code possible, and learn early if some tpl code is not valid. Fixing few bugs that this uncovered
* refactoring the percent column label in getPercentVisitColumn()
* removing indexBeforeMenu and putting directly in parent template
Refs #4019

core/Metrics.php

@@ -287,4 +287,12 @@ class Piwik_Metrics
         );
         return array_map('Piwik_Translate', $documentation);
     }
+
+
+    public static function getPercentVisitColumn()
+    {
+        $percentVisitsLabel = str_replace(' ', html_entity_decode(' '), Piwik_Translate('General_ColumnPercentageVisits'));
+        return $percentVisitsLabel;
+    }
+
 }
\ No newline at end of file

core/Twig.php

@@ -41,6 +41,7 @@ class Piwik_Twig
         $this->twig = new Twig_Environment($chainLoader,
             array(
                  'debug' => true, // to use {{ dump(var) }} in twig templates
+                 'strict_variables' => true, // throw an exception if variables are invalid
                 //'cache' => PIWIK_DOCUMENT_ROOT . '/tmp/templates_c',
             )
         );
@@ -52,9 +53,9 @@ class Piwik_Twig
         $this->addFilter_sumTime();
         $this->addFilter_money();
         $this->addFilter_truncate();
+
         $this->twig->addFilter( new Twig_SimpleFilter('implode', 'implode'));
         /*
-        $this->load_filter('output', 'cachebuster');
         $this->load_filter('output', 'trimwhitespace');*/
 
 

core/Version.php

@@ -20,5 +20,5 @@ final class Piwik_Version
      * Current Piwik version
      * @var string
      */
-    const VERSION = '1.12';
+    const VERSION = '2.0-b3';
 }

core/View.php

@@ -45,7 +45,6 @@ class Piwik_View implements Piwik_View_Interface
         $this->initializeTwig();
 
         $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());
     }
 

plugins/CoreAdminHome/Controller.php

@@ -41,11 +41,9 @@ class Piwik_CoreAdminHome_Controller extends Piwik_Controller_Admin
             $view->todayArchiveTimeToLive = $todayArchiveTimeToLive;
             $view->enableBrowserTriggerArchiving = $enableBrowserTriggerArchiving;
 
-            $config = Piwik_Config::getInstance();
+            $view->configFileNotWritable = !Piwik_Config::getInstance()->isFileWritable();
 
-            if (!$config->isFileWritable()) {
-                $view->configFileNotWritable = true;
-            }
+            $config = Piwik_Config::getInstance();
 
             $debug = $config->Debug;
             $view->enableBetaReleaseCheck = $debug['allow_upgrades_to_beta'];

plugins/CoreAdminHome/templates/generalSettings.twig

@@ -134,7 +134,7 @@
             <tr>
                 <td><label for="mailPassword">{{ 'General_SmtpPassword'|translate }}</label><br/>
 				<span class="form-description">{{ 'General_OnlyEnterIfRequiredPassword'|translate }}<br/>
-                    {{ 'General_WarningPasswordStored'|translate("<strong>","</strong>") }}</span>
+                    {{ 'General_WarningPasswordStored'|translate("<strong>","</strong>")|raw }}</span>
                 </td>
                 <td>
                     <input type="password" id="mailPassword" value="{{ mail.password }}"/>

plugins/CoreHome/templates/_dataTable.twig

@@ -27,7 +27,7 @@
                             id="{{ row.idsubdatatable }}"{% endif %}{% if row.issummaryrow is defined and row.issummaryrow and properties.highlight_summary_row %} class="highlight"{% endif %}>
                             {% for column in dataTableColumns %}
                                 <td>
-                                    {% include "@CoreHome/_dataTableCell.twig" %}
+                                    {% include "@CoreHome/_dataTableCell.twig" with properties %}
                                 </td>
                             {% endfor %}
                         </tr>

plugins/CoreHome/templates/_dataTableActions.twig

@@ -19,7 +19,7 @@
                             {% else %}class="actionsDataTable rowToProcess"{% endif %}>
                             {% for column in dataTableColumns %}
                                 <td>
-                                    {% include "@CoreHome/_dataTableCell.twig" with {'column': column, 'row': row} only %}
+                                    {% include "@CoreHome/_dataTableCell.twig" with {'column': column, 'row': row} %}
                                 </td>
                             {% endfor %}
                         </tr>

plugins/CoreHome/templates/_dataTableCell.twig

 {% spaceless %}
 {% set tooltipIndex = column ~ '_tooltip' %}
 {% if row.metadata[tooltipIndex] is defined %}<span class="cell-tooltip" data-tooltip="{{ row.metadata[tooltipIndex] }}">{% endif %}
-{% if not row.idsubdatatable and column=='label' and row.metadata.url is not empty %}
+{% if not row.idsubdatatable and column=='label' and row.metadata.url is defined %}
     <a target="_blank" href='{% if row.metadata.url|slice(0,4) not in ['http','ftp:'] %}http://{% endif %}{{ row.metadata.url }}'>
-    {% if row.metadata.logo is empty %}
+    {% if row.metadata.logo is not defined %}
         <img class="link" width="10" height="9" src="plugins/Zeitgeist/images/link.gif"/>
     {% endif %}
 {% endif %}
 {% if column=='label' %}
     {% import 'macros.twig' as piwik %}
     {{ piwik.logoHtml(row.metadata, row.columns.label) }}
-    {% if row.metadata.html_label_prefix is not empty %}<span class='label-prefix'>{{ row.metadata.html_label_prefix | raw }}</span>{% endif %}
-    <span class='label{% if row.metadata.is_aggregate is not empty and  row.metadata.is_aggregate %} highlighted{% endif %}'
-        {% if properties.tooltip_metadata_name is not empty %}title="{{ row.metadata[properties.tooltip_metadata_name] }}"{% endif %}>
-        {# make sure there are no whitespaces inside the span #}
-    {% if row.metadata.html_label_suffix is not empty %}<span class='label-suffix'>{{ row.metadata.html_label_suffix | raw }}</span>{% endif %}
-{% endif %}
+    {% if row.metadata.html_label_prefix is defined %}<span class='label-prefix'>{{ row.metadata.html_label_prefix | raw }}&nbsp;</span>{% endif -%}
+        <span class='label{% if row.metadata.is_aggregate is defined and row.metadata.is_aggregate %} highlighted{% endif %}'
+        {% if properties is defined and properties.tooltip_metadata_name is not empty %}title="{{ row.metadata[properties.tooltip_metadata_name] }}"{% endif %}>
+        {% if row.metadata.html_label_suffix is defined %}<span class='label-suffix'>{{ row.metadata.html_label_suffix | raw }}</span>{% endif %}
+    {% endif %}
 {% if row.columns[column] is defined %}{{ row.columns[column]|raw }}{% else %}{{ defaultWhenColumnValueNotDefined }}{% endif %}
 {% if column=='label' %}</span>{% endif %}
-{% if not row.idsubdatatable and column=='label' and row.metadata.url is not empty %}
+{% if not row.idsubdatatable and column=='label' and row.metadata.url is defined %}
     </a>
 {% endif %}
 {% if row.metadata[tooltipIndex] is defined %}</span>{% endif %}

plugins/CoreHome/templates/_dataTableFooter.twig

@@ -164,7 +164,7 @@
         {% endif %}
     </div>
 
-    {% if properties.show_footer_message is not empty %}
+    {% if properties.show_footer_message is defined and properties.show_footer_message is not empty %}
         <div class='datatableFooterMessage'>{{ properties.show_footer_message | raw }}</div>
     {% endif %}
 

plugins/CoreHome/templates/_topBar.twig

-<div id="topBars">
 
+{% if showTopMenu is not defined or showTopMenu %}
+<div id="topBars">
     {% include "@CoreHome/_topBarTopMenu.twig" %}
     {% include "@CoreHome/_topBarHelloMenu.twig" %}
-
 </div>
+{% endif %}
 
-{% if showSitesSelection %}
+{% if showSitesSelection is not defined or showSitesSelection %}
     <div class="top_bar_sites_selector">
         <label>{{ 'General_Website'|translate }}</label>
         {% include "@CoreHome/_siteSelect.twig" %}

plugins/CoreHome/templates/_topBarHelloMenu.twig

 <div id="topRightBar">
     {% set helloAlias %}
-        {% if userAlias %}
+        {% if userAlias is defined %}
             <strong>{{ userAlias }}</strong>
         {% else %}
             <strong>{{ userLogin }}</strong>

plugins/CoreHome/templates/_warningInvalidHost.twig

 {# untrusted host warning #}
-{% if (isValidHost and invalidHostMessage and isValidHost == false) %}
+{% if (isValidHost is defined and invalidHostMessage is defined and isValidHost == false) %}
     <div class="ajaxSuccess" style='clear:both;width:800px'>
         <a style="float:right" href="http://piwik.org/faq/troubleshooting/#faq_171" target="_blank"><img src="plugins/Zeitgeist/images/help_grey.png"/></a>
         <strong>{{ 'General_Warning'|translate }}:&nbsp;</strong>{{ invalidHostMessage }}

plugins/CorePluginsAdmin/Controller.php

@@ -55,9 +55,7 @@ class Piwik_CorePluginsAdmin_Controller extends Piwik_Controller_Admin
         $view->pluginsName = $plugins;
         $this->setBasicVariablesView($view);
         $view->menu = Piwik_GetAdminMenu();
-        if (!Piwik_Config::getInstance()->isFileWritable()) {
-            $view->configFileNotWritable = true;
-        }
+        $view->configFileNotWritable = !Piwik_Config::getInstance()->isFileWritable();
         echo $view->render();
     }
 

plugins/Goals/templates/getGoalReportView.twig

@@ -53,7 +53,7 @@
 </script>
 
 {% if displayFullReport %}
-    {% if nb_conversions > 0 or cart_nb_conversions is not empty %}
+    {% if nb_conversions > 0 or cart_nb_conversions is defined %}
         <h2 id='titleGoalsByDimension'>
             {% if idGoal is defined %}
                 {{ 'Goals_GoalConversionsBy'|translate(goalName)|raw }}

plugins/ImageGraph/templates/testAllSizes.twig

@@ -2,7 +2,7 @@
 
 {% block content %}
 {% set showSitesSelection=true %}
-<div class="top_controls_inner"></div>
+
 <div>
     <h2>{{ 'ImageGraph_ImageGraph'|translate }} ::: {{ siteName }}</h2>
 

plugins/Live/templates/getLastVisitsStart.twig

@@ -39,7 +39,7 @@
                     {% if visitor.referrerUrl is not empty %}
                         <a href="{{ visitor.referrerUrl }}" target="_blank">
                     {% endif %}
-                    {% if visitor.searchEngineIcon is not empty %}
+                    {% if visitor.searchEngineIcon is defined %}
                         <img src="{{ visitor.searchEngineIcon }}" />
                     {% endif %}
                     {{ visitor.referrerName }}
@@ -124,7 +124,7 @@
                         {% endif %}
                     {% endif %}
                 {% endfor %}
-                {% if actionDetails|length > maxPagesDisplayedByVisitor %}
+                {% if visitor.actionDetails|length > maxPagesDisplayedByVisitor %}
                     <i>({{ 'Live_MorePagesNotDisplayed'|translate }})</i>
                 {% endif %}
             </div>

plugins/Live/templates/getVisitorLog.twig

@@ -94,7 +94,7 @@
         {% endset %}
 
         {% set visitorRow %}
-            <tr class="label{{ cycle([odd,even], cycleIndex) }}">
+            <tr class="label{{ cycle(['odd','even'], cycleIndex) }}">
             {% set cycleIndex=cycleIndex+1 %}
                 <td style="display:none;"></td>
                 <td class="label" style="width:12%" width="12%">
@@ -116,7 +116,7 @@
                             {{ visitor.columns.providerName }}
                         </a>
                     {% endif %}
-                    {% if visitor.columns.customVariables is not empty %}
+                    {% if visitor.columns.customVariables is defined %}
                         <br/>
                         {% for id,customVariable in visitor.columns.customVariables %}
                             {% set name='customVariableName' ~ id %}
@@ -156,7 +156,7 @@
                             {% if visitor.columns.referrerKeyword is not empty %} - {{ visitor.columns.referrerKeyword }}{% endif %}
                         {% endif %}
                         {% if visitor.columns.referrerType == 'search' %}
-                            {% if visitor.columns.searchEngineIcon is not empty %}
+                            {% if visitor.columns.searchEngineIcon is defined %}
                                 <img src="{{ visitor.columns.searchEngineIcon }}" alt="{{ visitor.columns.referrerName }}"/>
                             {% endif %}
                             {{ visitor.columns.referrerName }}
@@ -193,7 +193,7 @@
                         {% set visitorHasSomeEcommerceActivity %}0{% endset %}
                         {% for action in visitor.columns.actionDetails %}
                             {% set customVariablesTooltip %}
-                                {% if action.customVariables is not empty %}
+                                {% if action.customVariables is defined %}
                                     {{ 'CustomVariables_CustomVariables'|translate }}
                                     {% for id,customVariable in action.customVariables %}
                                         {% set name = 'customVariablePageName' ~ id %}
@@ -203,7 +203,7 @@
                                 {% endif %}
                             {% endset %}
                             {% if not javascriptVariablesToSet.filterEcommerce or action.type == 'ecommerceOrder' or action.type == 'ecommerceAbandonedCart' %}
-                                <li class="{% if action.goalName is not empty %}goal{% else %}action{% endif %}"
+                                <li class="{% if action.goalName is defined %}goal{% else %}action{% endif %}"
                                     title="{{ action.serverTimePretty }}{% if action.url is not empty and action.url|trim|length %}
                                     {{ action.url }}{% endif %} {% if customVariablesTooltip|trim|length %}
 
@@ -261,12 +261,12 @@
                                                 </ul>
                                             {% endif %}
                                         </span>
-                                    {% elseif action.goalName is empty %}
+                                    {% elseif action.goalName is not defined%}
                                         {# Page view / Download / Outlink #}
                                         {% if action.pageTitle is not empty %}
                                             {{ action.pageTitle|truncate(80) }}
                                         {% endif %}
-                                        {% if action.siteSearchKeyword is not empty %}
+                                        {% if action.siteSearchKeyword is defined %}
                                             {% if action.type == 'search' %}
                                                 <img src='{{ action.icon }}' title='{{ 'Actions_SubmenuSitesearch'|translate }}'>
                                             {% endif %}

plugins/MobileMessaging/SMSProvider/Clockwork.php

@@ -69,17 +69,21 @@ class Piwik_MobileMessaging_SMSProvider_Clockwork extends Piwik_MobileMessaging_
 
         $timeout = self::SOCKET_TIMEOUT;
 
-        $result = Piwik_Http::sendHttpRequestBy(
-            Piwik_Http::getTransportMethod(),
-            $url,
-            $timeout,
-            $userAgent = null,
-            $destinationPath = null,
-            $file = null,
-            $followDepth = 0,
-            $acceptLanguage = false,
-            $acceptInvalidSslCertificate = true
-        );
+        try {
+            $result = Piwik_Http::sendHttpRequestBy(
+                Piwik_Http::getTransportMethod(),
+                $url,
+                $timeout,
+                $userAgent = null,
+                $destinationPath = null,
+                $file = null,
+                $followDepth = 0,
+                $acceptLanguage = false,
+                $acceptInvalidSslCertificate = true
+            );
+        } catch(Exception $e) {
+            $result = self::ERROR_STRING . " " . $e->getMessage();
+        }
 
         if (strpos($result, self::ERROR_STRING) !== false) {
             throw new Piwik_MobileMessaging_APIException(

plugins/MultiSites/Controller.php

@@ -41,7 +41,7 @@ class Piwik_MultiSites_Controller extends Piwik_Controller
     }
 
 
-    public function getSitesInfo($isWidgetized)
+    public function getSitesInfo($isWidgetized = false)
     {
         Piwik::checkUserHasSomeViewAccess();
         $displayRevenueColumn = Piwik_Common::isGoalPluginEnabled();