Changeset 207

Timestamp:

06/19/08 11:34:21 (15 years ago)

Author:

olivier

Message:

Piwik update. Added a summary in admin page and FR translation update.

Location:

plugins/piwik

Files:

• class.dc.piwik.php (modified) (4 diffs)
• index.php (modified) (2 diffs)
• locales/_pot/main.pot (modified) (3 diffs)
• locales/en/help.html (modified) (1 diff)
• locales/fr/help.html (added)
• locales/fr/main.po (modified) (3 diffs)
• locales/fr/resources.php (added)

plugins/piwik/class.dc.piwik.php

@@ -23 +23 @@
 class dcPiwik extends netHttp
 {
+     protected $api_path;
+     protected $api_token;
+     
      public function __construct($uri)
      {
@@ -57 +60 @@
           $get = $this->methodCall('SitesManager.getSitesWithAdminAccess');
           $this->get($get['path'],$get['data']);
-          return $this->readResponse();
+          $rsp = $this->readResponse();
+          $res = array();
+          foreach ($rsp as $v) {
+               $res[$v['idsite']] = $v;
+          }
+          return $res;
      }
      
@@ -144 +152 @@
      }
      
+     public static function getVisitSummaryGraph($uri,$token,$site)
+     {
+          $flash_movie = dirname($uri).'/libs/open-flash-chart/open-flash-chart.swf';
+          $flash_vars = array(
+               'module=VisitsSummary',
+               'action=getLastVisitsGraph',
+               'idSite='.$site,
+               'period=day',
+               'date='.date('Y-m-d',strtotime('-1 month')).','.date('Y-m-d'),
+               'viewDataTable=generateDataChartEvolution',
+               'token_auth='.$token
+          );
+          
+          $flash_vars = $uri.'?'.implode('&',$flash_vars);
+          
+          return
+          '<object height="150" width="100%" type="application/x-shockwave-flash" '.
+          'data="'.$flash_movie.'">'.
+          '<param name="movie" value="'.$flash_movie.'" />'.
+          '<param name="quality" value="high" />'.
+          '<param name="allowScriptAccess" value="samedomain" />'.
+          '<param name="flashvars" value="data='.urlencode($flash_vars).'" />'.
+          '</object>';
+     }
+     
      public static function getScriptCode($uri,$idsite,$action='')
      {
@@ -152 +185 @@
           return
           "<!-- Piwik -->\n".
-          '<script language="javascript" src="'.html::escapeURL($js).'" type="text/javascript"></script>'."\n".
+          '<script type="text/javascript" src="'.html::escapeURL($js).'"></script>'."\n".
           '<script type="text/javascript">'.
           "//<![CDATA[\n".

plugins/piwik/index.php

@@ -94 +94 @@
           
           # Get sites list
-          $sites = $o->getSitesWithAdminAccess();
+          $piwik_sites = $o->getSitesWithAdminAccess();
           
-          if (count($sites) < 1) {
+          if (count($piwik_sites) < 1) {
                throw new Exception(__('No Piwik sites configured.'));
           }
           
-          foreach ($sites as $v) {
-               $sites_combo[$v['idsite'].' - '.$v['name']] = $v['idsite'];
+          foreach ($piwik_sites as $k => $v) {
+               $sites_combo[html::escapeHTML($k.' - '.$v['name'])] = $k;
+          }
+          
+          if ($piwik_site && !isset($piwik_sites[$piwik_site])) {
+               $piwik_site = '';
           }
      }
@@ -150 +154 @@
 '</form>';
 
+if ($piwik_site && $piwik_uri)
+{
+     echo
+     '<h3>'.sprintf(__('Last visits graph on %s'),html::escapeHTML($piwik_sites[$piwik_site]['name'])).
+     ' - <a href="'.$piwik_uri.'">'.__('View your blog statistics').'</a></h3>'.
+     '<p>'.dcPiwik::getVisitSummaryGraph($piwik_uri,$piwik_token,$piwik_site).'</p>';
+}
+
 if ($piwik_uri)
 {

plugins/piwik/locales/_pot/main.pot

@@ -8 +8 @@
 "Project-Id-Version: Dotclear 2 piwik module\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-06-18 11:19+0200\n"
+"POT-Creation-Date: 2008-06-19 11:13+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
@@ -16 +16 @@
 "Content-Transfer-Encoding: 8bit\n"
 
-#: plugins-test/piwik//class.dc.piwik.php:30
+#: plugins-test/piwik//class.dc.piwik.php:33
 msgid "Unable to read Piwik URI."
 msgstr ""
 
-#: plugins-test/piwik//class.dc.piwik.php:89
+#: plugins-test/piwik//class.dc.piwik.php:97
 msgid "Invalid Piwik Response."
 msgstr ""
 
-#: plugins-test/piwik//class.dc.piwik.php:100
+#: plugins-test/piwik//class.dc.piwik.php:108
 #, php-format
 msgid "Piwik returned an error: %s"
 msgstr ""
 
-#: plugins-test/piwik//class.dc.piwik.php:122
+#: plugins-test/piwik//class.dc.piwik.php:130
 msgid "Invalid Service URI."
 msgstr ""
@@ -45 +45 @@
 msgstr ""
 
-#: plugins-test/piwik//index.php:119
+#: plugins-test/piwik//index.php:123
 msgid "Piwik configuration"
 msgstr ""
 
-#: plugins-test/piwik//index.php:123
+#: plugins-test/piwik//index.php:127
 msgid "Your Piwik configuration"
 msgstr ""
 
-#: plugins-test/piwik//index.php:127
+#: plugins-test/piwik//index.php:131
 msgid "Your Piwik URL:"
 msgstr ""
 
-#: plugins-test/piwik//index.php:129
+#: plugins-test/piwik//index.php:133
 msgid "Your Piwik Token:"
 msgstr ""
 
-#: plugins-test/piwik//index.php:134
+#: plugins-test/piwik//index.php:138
 msgid "Your Piwik installation is not configured yet."
 msgstr ""
 
-#: plugins-test/piwik//index.php:139
+#: plugins-test/piwik//index.php:143
 msgid "Piwik website to track:"
 msgstr ""
 
-#: plugins-test/piwik//index.php:141
+#: plugins-test/piwik//index.php:145
 msgid "Do not track following IP addresses:"
 msgstr ""
 
-#: plugins-test/piwik//index.php:143
+#: plugins-test/piwik//index.php:147
 msgid "Use fancy page names:"
 msgstr ""
 
-#: plugins-test/piwik//index.php:153
+#: plugins-test/piwik//index.php:159
+#, php-format
+msgid "Last visits graph on %s"
+msgstr ""
+
+#: plugins-test/piwik//index.php:160
+msgid "View your blog statistics"
+msgstr ""
+
+#: plugins-test/piwik//index.php:167
 msgid "Create a new Piwik site for this blog"
 msgstr ""
 
-#: plugins-test/piwik//index.php:155
+#: plugins-test/piwik//index.php:169
 msgid "Site name:"
 msgstr ""
 
-#: plugins-test/piwik//index.php:157
+#: plugins-test/piwik//index.php:171
 msgid "Site URL:"
 msgstr ""
 
-#: plugins-test/piwik//index.php:159
+#: plugins-test/piwik//index.php:173
 msgid "create site"
 msgstr ""

plugins/piwik/locales/en/help.html

@@ -1 @@
-<p>Piwik is an open source (GPL license) web analytics software. It gives
+<p><em>Piwik is an open source (GPL license) web analytics software. It gives
 interesting reports on your website visitors, your popular pages, the search
-engines keywords they used, the language they speak and so much more.</p>
+engines keywords they used, the language they speak and so much more.</em></p>
 <p>Please visit <a href="http://piwik.org/">piwik.org</a> for download and more
 information.</p>

plugins/piwik/locales/fr/main.po

@@ -7 +7 @@
 "Project-Id-Version: Dotclear 2 piwik module\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-06-18 11:18+0200\n"
-"PO-Revision-Date: 2008-06-18 11:19+0100\n"
+"POT-Creation-Date: 2008-06-19 11:13+0200\n"
+"PO-Revision-Date: 2008-06-19 11:14+0100\n"
 "Last-Translator: Olivier Meunier <olivier@dotclear.net>\n"
 "Language-Team: \n"
@@ -22 +22 @@
 msgstr "Réponse Piwik invalide."
 
-#, fuzzy, php-format
+#, php-format
 msgid "Piwik returned an error: %s"
 msgstr "Piwik a renvoyé une erreur : %s"
@@ -62 +62 @@
 msgstr "Utiliser des noms de page améliorés :"
 
+#, php-format
+msgid "Last visits graph on %s"
+msgstr "Graphique des dernières visites sur %s"
+
+msgid "View your blog statistics"
+msgstr "Voir les statistiques de votre blog"
+
 msgid "Create a new Piwik site for this blog"
 msgstr "Créer un nouveau site Piwik pour ce blog"