Master > Stable merge (9.8.29 | 2018.05.01)

.gitignore

@@ -6,6 +6,7 @@ emoncms.log
 .idea
 .vagrant/
 .env
+.vscode/*
 
 # Ignore all modules except core ones
 Modules/*

Lib/email.php

@@ -33,7 +33,7 @@ function check(){
     }
 
     function from($from) {
-        if ($this.check()) $this->message->setFrom($from);
+        if ($this->check()) $this->message->setFrom($from);
     }
 
     function to($to) {

Modules/admin/admin_main_view.php

@@ -302,26 +302,32 @@ function disk_list()
 // Raspberry Pi
 if ( @exec('ifconfig | grep b8:27:eb:') ) {
               echo "<tr><td><b>Pi</b></td><td>CPU Temp</td><td>".number_format((int)@exec('cat /sys/class/thermal/thermal_zone0/temp')/1000, '2', '.', '')."&degC".chkRebootBtn()."</td></tr>\n";
-}
+    if (glob('/boot/emonSD-*')) {
               foreach (glob("/boot/emonSD-*") as $emonpiRelease) {
                 $emonpiRelease = str_replace("/boot/", '', $emonpiRelease);
               }
               if (isset($emonpiRelease)) {
                 echo "<tr><td class=\"subinfo\"></td><td>Release</td><td>".$emonpiRelease."</td></tr>\n";
                 echo "<tr><td class=\"subinfo\"></td><td>File-system</td><td>Set root file-system temporarily to read-write, (default read-only)<button id=\"fs-rw\" class=\"btn btn-danger btn-small pull-right\">"._('Read-Write')."</button> <button id=\"fs-ro\" class=\"btn btn-info btn-small pull-right\">"._('Read-Only')."</button></td></tr>\n";
+              }
+      }
 }
 
 // Ram information
 if ($system['mem_info']) {
               $sysRamUsed = $system['mem_info']['MemTotal'] - $system['mem_info']['MemFree'] - $system['mem_info']['Buffers'] - $system['mem_info']['Cached'];
-              $sysRamPercent = sprintf('%.2f',($sysRamUsed / $system['mem_info']['MemTotal']) * 100);
-              echo "<tr><td><b>Memory</b></td><td>RAM</td><td><div class='progress progress-info' style='margin-bottom: 0;'><div class='bar' style='width: ".$sysRamPercent."%;'>Used:&nbsp;".$sysRamPercent."%&nbsp;</div></div>";
+              $sysRamPercentRaw = ($sysRamUsed / $system['mem_info']['MemTotal']) * 100;
+              $sysRamPercent = sprintf('%.2f',$sysRamPercentRaw);
+              $sysRamPercentTable = number_format(round($sysRamPercentRaw, 2), 2, '.', '');
+              echo "<tr><td><b>Memory</b></td><td>RAM</td><td><div class='progress progress-info' style='margin-bottom: 0;'><div class='bar' style='width: ".$sysRamPercentTable."%;'>Used:&nbsp;".$sysRamPercent."%&nbsp;</div></div>";
               echo "<b>Total:</b> ".formatSize($system['mem_info']['MemTotal'])."<b> Used:</b> ".formatSize($sysRamUsed)."<b> Free:</b> ".formatSize($system['mem_info']['MemTotal'] - $sysRamUsed)."</td></tr>\n";
 
               if ($system['mem_info']['SwapTotal'] > 0) {
                 $sysSwapUsed = $system['mem_info']['SwapTotal'] - $system['mem_info']['SwapFree'];
-                $sysSwapPercent = sprintf('%.2f',($sysSwapUsed / $system['mem_info']['SwapTotal']) * 100);
-                echo "<tr><td class='subinfo'></td><td>Swap</td><td><div class='progress progress-info' style='margin-bottom: 0;'><div class='bar' style='width: ".$sysSwapPercent."%;'>Used:&nbsp;".$sysSwapPercent."%&nbsp;</div></div>";
+                $sysSwapPercentRaw = ($sysSwapUsed / $system['mem_info']['SwapTotal']) * 100;
+                $sysSwapPercent = sprintf('%.2f',$sysSwapPercentRaw);
+                $sysSwapPercentTable = number_format(round($sysSwapPercentRaw, 2), 2, '.', '');
+                echo "<tr><td class='subinfo'></td><td>Swap</td><td><div class='progress progress-info' style='margin-bottom: 0;'><div class='bar' style='width: ".$sysSwapPercentTable."%;'>Used:&nbsp;".$sysSwapPercent."%&nbsp;</div></div>";
                 echo "<b>Total:</b> ".formatSize($system['mem_info']['SwapTotal'])."<b> Used:</b> ".formatSize($sysSwapUsed)."<b> Free:</b> ".formatSize($system['mem_info']['SwapFree'])."</td></tr>\n";
               }
 }
@@ -331,11 +337,13 @@ function disk_list()
                     foreach($system['partitions'] as $fs) {
                       if (!$fs['Temporary']['bool'] && $fs['FileSystem']['text']!= "none" && $fs['FileSystem']['text']!= "udev") {
                         $diskFree = $fs['Free']['value'];
-                        $diskTotal = $fs['Size']['value'];;
-                        $diskUsed = $fs['Used']['value'];;
-                        $diskPercent = sprintf('%.2f',($diskUsed / $diskTotal) * 100);
-
-                        echo "<tr><td class='subinfo'></td><td>".$fs['Partition']['text']."</td><td><div class='progress progress-info' style='margin-bottom: 0;'><div class='bar' style='width: ".$diskPercent."%;'>Used:&nbsp;".$diskPercent."%&nbsp;</div></div>";
+                        $diskTotal = $fs['Size']['value'];
+                        $diskUsed = $fs['Used']['value'];
+                        $diskPercentRaw = ($diskUsed / $diskTotal) * 100;
+                        $diskPercent = sprintf('%.2f',$diskPercentRaw);
+                        $diskPercentTable = number_format(round($diskPercentRaw, 2), 2, '.', '');
+
+                        echo "<tr><td class='subinfo'></td><td>".$fs['Partition']['text']."</td><td><div class='progress progress-info' style='margin-bottom: 0;'><div class='bar' style='width: ".$diskPercentTable."%;'>Used:&nbsp;".$diskPercent."%&nbsp;</div></div>";
                         echo "<b>Total:</b> ".formatSize($diskTotal)."<b> Used:</b> ".formatSize($diskUsed)."<b> Free:</b> ".formatSize($diskFree)."</td></tr>\n";
 
                       }

Modules/admin/locale/fr_FR/LC_MESSAGES/messages.po

@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: emoncms3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-07-29 22:19+0200\n"
-"PO-Revision-Date: 2017-07-29 22:20+0200\n"
+"POT-Creation-Date: 2018-02-14 23:41+0100\n"
+"PO-Revision-Date: 2018-02-14 23:45+0100\n"
 "Last-Translator: Aymeric THIBAUT\n"
 "Language-Team: Baptiste Gaultier (Télécom Bretagne) <baptiste."
 "gaultier@telecom-bretagne.eu>\n"
@@ -14,7 +14,7 @@ msgstr ""
 "X-Poedit-KeywordsList: _;gettext;gettext_noop\n"
 "X-Poedit-Basepath: .\n"
 "X-Poedit-SourceCharset: utf-8\n"
-"X-Generator: Poedit 2.0.3\n"
+"X-Generator: Poedit 2.0.6\n"
 "X-Poedit-SearchPath-0: ../../..\n"
 
 #: ../../../admin_controller.php:18
@@ -54,94 +54,102 @@ msgstr "Nom"
 msgid "Status"
 msgstr "Statut"
 
-#: ../../../admin_main_view.php:97
+#: ../../../admin_main_view.php:96
 msgid "Shutdown"
 msgstr "Éteindre"
 
-#: ../../../admin_main_view.php:97
+#: ../../../admin_main_view.php:96
 msgid "Reboot"
 msgstr "Redémarrer"
 
-#: ../../../admin_main_view.php:100
+#: ../../../admin_main_view.php:99
 msgid "Shutdown Unsupported"
 msgstr "Redémarrage non supporté"
 
-#: ../../../admin_main_view.php:173 ../../../admin_menu.php:7
+#: ../../../admin_main_view.php:171 ../../../admin_menu.php:7
 msgid "Administration"
 msgstr "Administration"
 
-#: ../../../admin_main_view.php:177 ../../../admin_main_view.php:181
+#: ../../../admin_main_view.php:175 ../../../admin_main_view.php:179
 msgid "Users"
 msgstr "Utilisateurs"
 
-#: ../../../admin_main_view.php:178
+#: ../../../admin_main_view.php:176
 msgid "Administer user accounts"
 msgstr "Administration des comptes utilisateurs"
 
-#: ../../../admin_main_view.php:186 ../../../update_view.php:21
+#: ../../../admin_main_view.php:184 ../../../update_view.php:21
 msgid "Update database"
 msgstr "Mise à jour de la base de données"
 
-#: ../../../admin_main_view.php:187
+#: ../../../admin_main_view.php:185
 msgid ""
 "Run this after updating emoncms, after installing a new module or to check "
 "emoncms database status."
 msgstr ""
 "Lancez cette commande après une mise à jour de Emoncms, après l'installation "
 "d'un nouveau module ou pour tester l'intégrité de la base de données."
 
-#: ../../../admin_main_view.php:190
+#: ../../../admin_main_view.php:188
 msgid "Update & check"
 msgstr "Mise à jour & Analyse"
 
-#: ../../../admin_main_view.php:201
+#: ../../../admin_main_view.php:199
 msgid "Logger"
 msgstr "Enregistreur"
 
-#: ../../../admin_main_view.php:205
+#: ../../../admin_main_view.php:203
 msgid "View last entries on the logfile:"
 msgstr "Vue des dernières entrées dans le fichier journal : "
 
-#: ../../../admin_main_view.php:216
+#: ../../../admin_main_view.php:214
 msgid "Auto refresh"
 msgstr "Rafraîchissement automatique"
 
-#: ../../../admin_main_view.php:217 ../../../admin_main_view.php:246
+#: ../../../admin_main_view.php:215 ../../../admin_main_view.php:245
 msgid "Download Log"
 msgstr "Télécharger le journal"
 
-#: ../../../admin_main_view.php:237
+#: ../../../admin_main_view.php:216 ../../../admin_main_view.php:262
+msgid "Copy to clipboard"
+msgstr "Copier dans presse-papier"
+
+#: ../../../admin_main_view.php:236
 msgid "Update"
 msgstr "Mise à jour"
 
-#: ../../../admin_main_view.php:244
+#: ../../../admin_main_view.php:243
 msgid "emonPi Update"
 msgstr "Mise à jour emonPi"
 
-#: ../../../admin_main_view.php:245
+#: ../../../admin_main_view.php:244
 msgid "emonBase Update"
 msgstr "Mise à jour emonBase"
 
 #: ../../../admin_main_view.php:261
 msgid "Server Information"
 msgstr "Informations serveur"
 
-#: ../../../admin_main_view.php:263
-msgid "Version"
-msgstr "Version"
-
-#: ../../../admin_main_view.php:289
+#: ../../../admin_main_view.php:291
 msgid "Flush"
 msgstr ""
 
-#: ../../../admin_main_view.php:309
+#: ../../../admin_main_view.php:311
 msgid "Read-Write"
 msgstr "Lecture-Écriture"
 
-#: ../../../admin_main_view.php:309
+#: ../../../admin_main_view.php:311
 msgid "Read-Only"
 msgstr "Lecture-seulement"
 
+#: ../../../admin_main_view.php:349
+msgid "Client Information"
+msgstr "Informations Client"
+
+#: ../../../admin_main_view.php:380
+msgid "Copy to clipboard: Ctrl+C, Enter"
+msgstr "Copier dans le presse-papier : Ctrl+C, Entrée"
+
 #: ../../../update_view.php:26
 msgid "Apply changes"
 msgstr "Appliquer les modifications"
@@ -170,5 +178,8 @@ msgstr "Nom utilisateur"
 msgid "Email"
 msgstr "Courriel"
 
+#~ msgid "Version"
+#~ msgstr "Version"
+
 #~ msgid "Admin"
 #~ msgstr "Admin"

Modules/admin/userlist_view.php

@@ -4,7 +4,7 @@
 <script type="text/javascript" src="<?php echo $path; ?>Lib/tablejs/table.js"></script>
 <script type="text/javascript" src="<?php echo $path; ?>Lib/tablejs/custom-table-fields.js"></script>
 
-<h2>Users</h2>
+<h2><?php echo _('Users'); ?></h2>
 <div id="table"></div>
 
 <script>
@@ -33,4 +33,4 @@
 
   table.data = admin.userlist();
   table.draw();
-</script>
+</script>

Modules/eventp/eventp_processlist.php

@@ -11,6 +11,10 @@
 // no direct access
 defined('EMONCMS_EXEC') or die('Restricted access');
 
+$domain3 = "eventp_messages";
+bindtextdomain($domain3, "Modules/eventp/locale");
+bind_textdomain_codeset($domain3, 'UTF-8');
+
 // Schedule Processlist Module
 class Eventp_ProcessList
 {
@@ -40,11 +44,11 @@ public function process_list()
 
         // 0=>Name | 1=>Arg type | 2=>function | 3=>No. of datafields if creating feed | 4=>Datatype | 5=>Group | 6=>Engines | 'desc'=>Description | 'requireredis'=>true | 'nochange'=>true  | 'helpurl'=>"http://..."
 
-        $list[] = array(_("If rate >=, skip next"), ProcessArg::VALUE, "ifRateGtEqualSkip", 0, DataType::UNDEFINED, "Conditional - Event", 'requireredis'=>true, 'nochange'=>true, 'desc'=>"<p>If value from last process has an absolute change from previous time it was calculated higher or equal to the specified value, processlist execution will skip the next process.</p>");
-        $list[] = array(_("If rate <, skip next"), ProcessArg::VALUE, "ifRateLtSkip", 0, DataType::UNDEFINED, "Conditional - Event", 'requireredis'=>true, 'nochange'=>true, 'desc'=>"<p>If value from last process has an absolute change from previous time it was calculated lower than the specified value, processlist execution will skip the next process.</p>");
-        $list[] = array(_("If Mute, skip next"), ProcessArg::VALUE, "ifMuteSkip", 0, DataType::UNDEFINED, "Conditional - Event", 'requireredis'=>true, 'nochange'=>true, 'desc'=>"<p>A time elapsed dependent condition, first time a processlist passes here the flow is unchanged. Next times the same processlist passes here, if the specified value time (in seconds) has not elapsed, flow will skip next process.</p>");
-        $list[] = array(_("If !Mute, skip next"), ProcessArg::VALUE, "ifNotMuteSkip", 0, DataType::UNDEFINED, "Conditional - Event", 'requireredis'=>true, 'nochange'=>true, 'desc'=>"<p>A time elapsed dependent condition, first time a processlist passes here the flow skips next. Next times the same processlist passes here, if the specified value time (in seconds) has elapsed, flow will skip next process.</p>");
-        $list[] = array(_("Send Email"), ProcessArg::TEXT, "sendEmail", 0, DataType::UNDEFINED, "Event", 'nochange'=>true, 'desc'=>"<p>Send an email to the user with the specified body.</p><p>Supported template tags to customize body: {type}, {id}, {key}, {name}, {node}, {time}, {value}</p><p>Example body text: At {time} your {type} from {node} with key {key} named {name} had value {value}.</p>");
+        $list[] = array(dgettext("eventp_messages","If rate >=, skip next"), ProcessArg::VALUE, "ifRateGtEqualSkip", 0, DataType::UNDEFINED, "Conditional - Event", 'requireredis'=>true, 'nochange'=>true, 'desc'=>"<p>".dgettext("eventp_messages","If value from last process has an absolute change from previous time it was calculated higher or equal to the specified value, processlist execution will skip the next process.")."</p>");
+        $list[] = array(dgettext("eventp_messages","If rate <, skip next"), ProcessArg::VALUE, "ifRateLtSkip", 0, DataType::UNDEFINED, "Conditional - Event", 'requireredis'=>true, 'nochange'=>true, 'desc'=>"<p>".dgettext("eventp_messages","If value from last process has an absolute change from previous time it was calculated lower than the specified value, processlist execution will skip the next process.")."</p>");
+        $list[] = array(dgettext("eventp_messages","If Mute, skip next"), ProcessArg::VALUE, "ifMuteSkip", 0, DataType::UNDEFINED, "Conditional - Event", 'requireredis'=>true, 'nochange'=>true, 'desc'=>"<p>".dgettext("eventp_messages","A time elapsed dependent condition, first time a processlist passes here the flow is unchanged. Next times the same processlist passes here, if the specified value time (in seconds) has not elapsed, flow will skip next process.")."</p>");
+        $list[] = array(dgettext("eventp_messages","If !Mute, skip next"), ProcessArg::VALUE, "ifNotMuteSkip", 0, DataType::UNDEFINED, "Conditional - Event", 'requireredis'=>true, 'nochange'=>true, 'desc'=>"<p>".dgettext("eventp_messages","A time elapsed dependent condition, first time a processlist passes here the flow skips next. Next times the same processlist passes here, if the specified value time (in seconds) has elapsed, flow will skip next process.")."</p>");
+        $list[] = array(dgettext("eventp_messages","Send Email"), ProcessArg::TEXT, "sendEmail", 0, DataType::UNDEFINED, "Event", 'nochange'=>true, 'desc'=>"<p>".dgettext("eventp_messages","Send an email to the user with the specified body.")."</p><p>".dgettext("eventp_messages","Supported template tags to customize body: {type}, {id}, {key}, {name}, {node}, {time}, {value}")."</p><p>".dgettext("eventp_messages","Example body text: At {time} your {type} from {node} with key {key} named {name} had value {value}.")."</p>");
         return $list;
     }