Merge with master

6 files changed, 79 insertions, 89 deletions

diff --git a/plugins/MobileMessaging/ReportRenderer/Exception.php b/plugins/MobileMessaging/ReportRenderer/Exception.php
index 5fa5796895..c6cdacf36b 100644
--- a/plugins/MobileMessaging/ReportRenderer/Exception.php
+++ b/plugins/MobileMessaging/ReportRenderer/Exception.php
@@ -59,7 +59,7 @@ class Piwik_MobileMessaging_ReportRenderer_Exception extends Piwik_ReportRendere
         return $this->rendering;
     }
 
-    public function renderFrontPage($reportTitle, $prettyDate, $description, $reportMetadata)
+    public function renderFrontPage($reportTitle, $prettyDate, $description, $reportMetadata, $segment)
     {
         // nothing to do
     }
diff --git a/plugins/MobileMessaging/ReportRenderer/Sms.php b/plugins/MobileMessaging/ReportRenderer/Sms.php
index d492dc1281..2fe2a3d111 100644
--- a/plugins/MobileMessaging/ReportRenderer/Sms.php
+++ b/plugins/MobileMessaging/ReportRenderer/Sms.php
@@ -47,7 +47,7 @@ class Piwik_MobileMessaging_ReportRenderer_Sms extends Piwik_ReportRenderer
         return $this->rendering;
     }
 
-    public function renderFrontPage($reportTitle, $prettyDate, $description, $reportMetadata)
+    public function renderFrontPage($reportTitle, $prettyDate, $description, $reportMetadata, $segment)
     {
         // nothing to do
     }
@@ -87,7 +87,7 @@ class Piwik_MobileMessaging_ReportRenderer_Sms extends Piwik_ReportRenderer
 
         // 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',
@@ -113,14 +113,22 @@ class Piwik_MobileMessaging_ReportRenderer_Sms extends Piwik_ReportRenderer
             $siteHasECommerce[$idSite] = Piwik_Site::isEcommerceEnabledFor($idSite);
         }
 
-        $smarty = new Piwik_Smarty();
-        $smarty->assign("isGoalPluginEnabled", $isGoalPluginEnabled);
-        $smarty->assign("reportRows", $dataRows);
-        $smarty->assign("reportRowsMetadata", $reportRowsMetadata);
-        $smarty->assign("prettyDate", $prettyDate);
-        $smarty->assign("siteHasECommerce", $siteHasECommerce);
-        $smarty->assign("displaySiteName", $processedReport['metadata']['action'] == 'getAll');
+        $view = new Piwik_View('@MobileMessaging/SMSReport');
+        $view->assign("isGoalPluginEnabled", $isGoalPluginEnabled);
+        $view->assign("reportRows", $dataRows);
+        $view->assign("reportRowsMetadata", $reportRowsMetadata);
+        $view->assign("prettyDate", $prettyDate);
+        $view->assign("siteHasECommerce", $siteHasECommerce);
+        $view->assign("displaySiteName", $processedReport['metadata']['action'] == 'getAll');
+
+        // segment
+        $segment = $processedReport['segment'];
+        $displaySegment = ($segment != null);
+        $view->assign("displaySegment", $displaySegment);
+        if ($displaySegment) {
+            $view->assign("segmentName", $segment['name']);
+        }
 
-        $this->rendering .= $smarty->fetch(PIWIK_USER_PATH . '/plugins/MobileMessaging/templates/SMSReport.tpl');
+        $this->rendering .= $view->render();
     }
 }
diff --git a/plugins/MobileMessaging/SMSProvider/Clockwork.php b/plugins/MobileMessaging/SMSProvider/Clockwork.php
index b7a50dfe02..faf5effbc7 100644
--- a/plugins/MobileMessaging/SMSProvider/Clockwork.php
+++ b/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(
diff --git a/plugins/MobileMessaging/templates/SMSReport.twig b/plugins/MobileMessaging/templates/SMSReport.twig
index effb58e7e7..858c1a38b8 100644
--- a/plugins/MobileMessaging/templates/SMSReport.twig
+++ b/plugins/MobileMessaging/templates/SMSReport.twig
@@ -1,70 +1,48 @@
-{% spaceless %}
-    {{ prettyDate }}.{% endspaceless %} {% spaceless %}
+{{ prettyDate }}{% if displaySegment %}, {{ segmentName }}{% endif %}. {% if false %}{% endif %}
 
-    {% if reportRows is empty %}
-        {{ 'CoreHome_ThereIsNoDataForThisReport'|translate }}
-    {% endif %}
+{%- if reportRows is empty -%}
+    {{ 'CoreHome_ThereIsNoDataForThisReport'|translate }}
+{%- endif -%}
 
-    {% for rowId, row in reportRows %}
-        {% set rowMetrics=row->getColumns() %}
-        {% set rowMetadata=reportRowsMetadata[rowId]->getColumns() %}
+{%- for rowId, row in reportRows -%}
+    {%- set rowMetrics=row.columns -%}
+    {%- set rowMetadata=reportRowsMetadata[rowId].columns -%}
 
-        {% if displaySiteName %}
-            {{ rowMetrics.label }}:{% endspaceless %} {% spaceless %}
-        {% endif %}
+    {%- if displaySiteName -%}{{ rowMetrics.label }}: {% endif -%}
+    
+    {# visits #}
+    {{- rowMetrics.nb_visits }} {{ 'General_ColumnNbVisits'|translate }}
+    {%- if rowMetrics.visits_evolution != 0 %} ({{ rowMetrics.visits_evolution }}%){%- endif -%}
+    
+    {%- if rowMetrics.nb_visits != 0 -%}
+        {#- actions -#}
+        , {{ rowMetrics.nb_actions }} {{ 'General_ColumnNbActions'|translate }}
+        {%- if rowMetrics.actions_evolution != 0 %} ({{ rowMetrics.actions_evolution }}%){%- endif -%}
 
-        {# visits #}
-        {{ rowMetrics.nb_visits }} {{ 'General_ColumnNbVisits'|translate }}
-        {% if rowMetrics.visits_evolution != 0 %}
-            {% endspaceless %} {% spaceless %}({{ rowMetrics.visits_evolution }}%)
-        {% endif %}
-
-        {% if rowMetrics.nb_visits != 0 %}
-
-        {# actions #}
-            ,{% endspaceless %} {% spaceless %}
-            {{ rowMetrics.nb_actions }} {{ 'General_ColumnNbActions'|translate }}
-            {% if rowMetrics.actions_evolution != 0 %}
-                {% endspaceless %} {% spaceless %}({{ rowMetrics.actions_evolution }}%)
-            {% endif %}
-
-            {% if isGoalPluginEnabled %}
+        {%- if isGoalPluginEnabled -%}
 
             {# goal metrics #}
-                {% if rowMetrics.nb_conversions != 0 %}
-
-                    ,{% endspaceless %} {% spaceless %}
-                    {{ 'Goals_ColumnRevenue'|translate }}:{% endspaceless %} {% spaceless %}{{ rowMetrics.revenue }}
-                    {% if rowMetrics.revenue_evolution != 0 %}
-                        {% endspaceless %} {% spaceless %}({{ rowMetrics.revenue_evolution }}%)
-                    {% endif %}
+            {%- if rowMetrics.nb_conversions != 0 -%}
+                , {{ 'Goals_ColumnRevenue'|translate }}: {{ rowMetrics.revenue }}
+                {%- if rowMetrics.revenue_evolution != 0 %} ({{ rowMetrics.revenue_evolution }}%){%- endif -%}
 
-                    ,{% endspaceless %} {% spaceless %}
-                    {{ rowMetrics.nb_conversions }} {{ 'Goals_GoalConversions'|translate }}
-                    {% if rowMetrics.nb_conversions_evolution != 0 %}
-                        {% endspaceless %} {% spaceless %}({{ rowMetrics.nb_conversions_evolution }}%)
-                    {% endif %}
-                {% endif %}
+                , {{ rowMetrics.nb_conversions }} {{ 'Goals_GoalConversions'|translate }}
+                {%- if rowMetrics.nb_conversions_evolution != 0 %} ({{ rowMetrics.nb_conversions_evolution }}%){%- endif -%}
+            {%- endif -%}
 
             {# eCommerce metrics #}
-                {% if siteHasECommerce[rowMetadata.idsite] %}
+            {%- if siteHasECommerce[rowMetadata.idsite] -%}
 
-                    ,{% endspaceless %} {% spaceless %}
-                    {{ 'General_ProductRevenue'|translate }}:{% endspaceless %} {% spaceless %}{{ rowMetrics.ecommerce_revenue }}
-                    {% if rowMetrics.ecommerce_revenue_evolution != 0 %}
-                        {% endspaceless %} {% spaceless %}({{ rowMetrics.ecommerce_revenue_evolution }}%)
-                    {% endif %}
+                , {{ 'General_ProductRevenue'|translate }}: {{ rowMetrics.ecommerce_revenue }}
+                {%- if rowMetrics.ecommerce_revenue_evolution != 0 %} ({{ rowMetrics.ecommerce_revenue_evolution }}%){%- endif -%}
 
-                    ,{% endspaceless %} {% spaceless %}
-                    {{ rowMetrics.orders }} {{ 'General_EcommerceOrders'|translate }}
-                    {% if rowMetrics.orders_evolution != 0 %}
-                        {% endspaceless %} {% spaceless %}({{ rowMetrics.orders_evolution }}%)
-                    {% endif %}
-                {% endif %}
-            {% endif %}
+                , {{ rowMetrics.orders }} {{ 'General_EcommerceOrders'|translate }}
+                {%- if rowMetrics.orders_evolution != 0 %} ({{ rowMetrics.orders_evolution }}%){%- endif -%}
+            {%- endif -%}
+        
+        {%- endif -%}
 
-        {% endif %}
+    {%- endif -%}
 
-        {% if not loop.last %}.{% endspaceless %} {% spaceless %}{% endif %}
-    {% endfor %}
-{% endspaceless %}
+    {%- if not loop.last -%}. {% endif -%}
+{%- endfor -%}
diff --git a/plugins/MobileMessaging/templates/index.twig b/plugins/MobileMessaging/templates/index.twig
index eec3528b04..13583a42de 100644
--- a/plugins/MobileMessaging/templates/index.twig
+++ b/plugins/MobileMessaging/templates/index.twig
@@ -9,7 +9,7 @@
             {{ 'MobileMessaging_Settings_CredentialProvided'|translate(provider) }}
             {{ creditLeft }}
             <br/>
-            {{ 'MobileMessaging_Settings_UpdateOrDeleteAccount'|translate("<a id='displayAccountForm'>","</a>","<a id='deleteAccount'>","</a>") }}
+            {{ 'MobileMessaging_Settings_UpdateOrDeleteAccount'|translate("<a id='displayAccountForm'>","</a>","<a id='deleteAccount'>","</a>")|raw }}
         {% else %}
             {{ 'MobileMessaging_Settings_PleaseSignUp'|translate }}
         {% endif %}
@@ -64,11 +64,11 @@
                     <br/><br/>
                 </span>
 
-                    + <input id='countryCallingCode' size='4' maxlength='4'/>&nbsp;
-                    <input id='newPhoneNumber'/>
-                    <input type='submit' value='{{ 'MobileMessaging_Settings_AddPhoneNumber'|translate }}'
-                           id='addPhoneNumberSubmit'/>
-                    <br/>
+                + <input id='countryCallingCode' size='4' maxlength='4'/>&nbsp;
+                <input id='newPhoneNumber'/>
+                <input type='submit' value='{{ 'MobileMessaging_Settings_AddPhoneNumber'|translate }}'
+                       id='addPhoneNumberSubmit'/>
+                <br/>
 		
 		<span style=' font-size: 11px;'><span
                     class="form-description">{{ 'MobileMessaging_Settings_CountryCode'|translate }}</span>
@@ -85,7 +85,7 @@
                             <option value='{{ country.countryCallingCode }}'
                                     {% if defaultCountry==countryCode %} selected='selected' {% endif %}
                                     >
-                                {{ country.countryName|truncate(15) }}
+                                {{ country.countryName }}
                             </option>
                         {% endfor %}
                     </select>
@@ -194,4 +194,4 @@
         <input role='no' type='button' value='{{ 'General_No'|translate }}'/>
     </div>
 
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/plugins/MobileMessaging/templates/reportParametersPDFReports.twig b/plugins/MobileMessaging/templates/reportParametersPDFReports.twig
index 13f89c752a..f16ee868ea 100644
--- a/plugins/MobileMessaging/templates/reportParametersPDFReports.twig
+++ b/plugins/MobileMessaging/templates/reportParametersPDFReports.twig
@@ -1,6 +1,6 @@
 <script>
     $(function () {
-        resetReportParametersFunctions ['{$reportType}'] =
+        resetReportParametersFunctions ['{{ reportType }}'] =
             function () {
 
                 var reportParameters = {
@@ -60,7 +60,7 @@
             {% endfor %}
             {{ 'MobileMessaging_MobileReport_AdditionalPhoneNumbers'|translate }}
         {% endif %}
-            <a href='{{ url({'module':"MobileMessaging",'updated':null}) }}'>{{ 'MobileMessaging_MobileReport_MobileMessagingSettingsLink'|translate }}</a>
+            <a href='{{ linkTo({'module':"MobileMessaging",'updated':null}) }}'>{{ 'MobileMessaging_MobileReport_MobileMessagingSettingsLink'|translate }}</a>
         </div>
     </td>
 </tr>