Changeset 360

Timestamp:

07/11/07 16:47:41 (1 year ago)

Author:

ludo

Message:

Task repeat. Tunnel port 30080 to 80 to allow secure upload of inventories. (from r4601)

Files:

• trunk/webmin/lsc/debian/changelog (modified) (1 diff)
• trunk/webmin/lsc/include/command_launcher.inc.php (modified) (1 diff)
• trunk/webmin/lsc/include/exec.inc.php (modified) (1 diff)
• trunk/webmin/lsc/module.info (modified) (1 diff)
• trunk/webmin/lsc/repository.cgi (modified) (3 diffs)
• trunk/webmin/lsc/scripts/run-inventory-secure.bat (added)
• trunk/webmin/lsc/tmpl/en/widget_repository_actions.tpl (modified) (1 diff)
• trunk/webmin/lsc/tmpl/fr/widget_repository_actions.tpl (modified) (9 diffs)

trunk/webmin/lsc/debian/changelog

@@ -1 @@
-5
+6
-
-  * See SVN history

trunk/webmin/lsc/include/command_launcher.inc.php

@@ -698 +698 @@
-                }
-                /* to re-schedule: next_date = start_date + interval */
-30 minute
+".$this->command->repeat." hour
-                $coh->start_date = $coh->next_launch_date;
-                $coh->number_attempt_connection_remains = $this->command->max_connection_attempt;

trunk/webmin/lsc/include/exec.inc.php

@@ -51 +51 @@
-        /* -tt forces tty allocation so that signals like SIGINT
-        will be properly sent to the remote host */
-
+R30080:127.0.0.1:80 -
-        
-        $handle = popen($ssh_command, "r");

trunk/webmin/lsc/module.info

@@ -3 +3 @@
-desc_fr=LRS : Prise de Contrôle à Distance Sécurisé
-depends=1.030 lbs_common
-5
+6

trunk/webmin/lsc/repository.cgi

@@ -263 +263 @@
-        $delete_file_after_execute_successful_enable = $_POST['repository_delete_file_after_execute_successful'];
-        if (
-?
+è
-        ) {
-                list($date, $time) = split(" [^ ]* ", $repository_start_date);
@@ -312 +312 @@
-        } else {
-                $start_inventory_enable = false;
+        }
+        if (!$_POST["repeat"]) {
+                $repeat = 0;
+        } else {
+                $repeat = intval($_POST["repeat"]);
+                if ($start_date == "0000-00-00 00:00:00") $start_date = date("Y-m-d G:i:00");
-        }
-
@@ -334 +340 @@
-                $next_connection_delay,
-                $max_connection_attempt,
-
+
+
-        );
-        /*

trunk/webmin/lsc/tmpl/en/widget_repository_actions.tpl

@@ -83 +83 @@
-                        />
-                        or <a href="javascript:;" onclick="javascript:document.getElementById('repository_end_date').value='none';">none</a>
+                        </td>
+                        </tr>
+                        <tr>
+                        <td style="width:5px;white-space:nowrap;">Repeat :</td><td>
+                                <select name="repeat">
+                                <option value="0">None</option>
+                                <option value="1">Hourly</option>
+                                <option value="24">Daily</option>
+                                <option value="168">Weekly</option>
+                                </select>
-                        </td>
-                        </tr>

trunk/webmin/lsc/tmpl/fr/widget_repository_actions.tpl

@@ -50 +50 @@
-                        <table style="width:100%">
-                        <tr>
-é
+&eacute;
-                        <input
-                                type="text"
@@ -56 +56 @@
-                                id="repository_start_date"
-                                size="20"
-è
+&egrave;
-                                readonly="readonly"
-                        />
@@ -64 +64 @@
-                                id="repository_start_date_button"
-                        /></td><td>
-ès que possible';">dè
+?s que possible';">d&egrave;
-                        </td>
-                        </tr>
-                        <tr>
-é
+&eacute;
-                        <input
-                                type="text"
@@ -85 +85 @@
-                        </td>
-                        </tr>
+                        <tr>
+                        <td style="width:5px;white-space:nowrap;">R&eacute;p&eacute;tition :</td><td>
+                                <select name="repeat">
+                                <option value="0">Aucune</option>
+                                <option value="1">Chaque heure</option>
+                                <option value="24">Chaque jour</option>
+                                <option value="168">Chaque semaine</option>
+                                </select>
+                        </td>
+                        </tr>
+
-                        </table>
-                </td></tr>
@@ -90 +101 @@
-                        <table style="width:100%">
-                        <tr>
-ètres suivants au fichier à exé
+&ecirc;tres suivants au fichier &agrave; ex&eacute;
-                        <input 
-                                type="text"
@@ -110 +121 @@
-                                style="border:none;"
-                        />
-ès exécution avec succè
+&egrave;s ex&eacute;cution avec succ&egrave;
-                        </td>
-                </tr>
@@ -122 +133 @@
-                                style="border:none;"
-                        />
-Exécuter l'agent d'inventaire après l'exé
+Lancer l'agent d'inventaire apr&egrave;s l'ex&eacute;
-                        </td>
-                </tr>
@@ -134 +145 @@
-                                style="border:none;"
-                        />
-émettre une requè
+&eacute;mettre une requ&ecirc;
-                        </td>
-                </tr>
@@ -146 +157 @@
-                                size="3"
-                        />.
-é
+&eacute;
-                        <input 
-                                type="text"