Updated gotomasses.

-Updated template design.-
-Updated result parsing- there is something strange going on.

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@14189 594d385d-05f5-0310-b6e9-bd551577e9d8

diff --git a/gosa-plugins/goto/addons/goto/events/DaemonEvent_notify.tpl b/gosa-plugins/goto/addons/goto/events/DaemonEvent_notify.tpl
index 98ca474b465baf16525b1e6889797735aa8a3db2..3eb714b367fc314f920e81cefeec5118b17600b4 100644 (file)
--- a/gosa-plugins/goto/addons/goto/events/DaemonEvent_notify.tpl
+++ b/gosa-plugins/goto/addons/goto/events/DaemonEvent_notify.tpl
@@ -3,29 +3,29 @@
 
 <table style='width:100%;'>
   <tr>
-    <td style='width:50%; vertical-align:top; border-right:1px solid #AAA'>
+    <td style='width:50%; vertical-align:top; border-right:1px solid #AAA; padding:6px;'>
          <b>{t}Message settings{/t}</b>
-         <table style="width:100%;">
-               <tr>
-                       <td>{t}Sender{/t}</td>
-                       <td><input type='text' name="from" value="{$from}" style="width:100%;"></td>
-               </tr>
-               <tr>
-                       <td>{t}Subject{/t}</td>
-                       <td><input type='text' name="subject" value="{$subject}" style="width:100%;"></td>
-               </tr>
-               <tr>
-                       <td colspan="2">{t}Message{/t} :</td>
-               </tr>
-               <tr>
-                       <td colspan="2" style="width:100%;">
-                               <textarea style="width:100%;height:250px;" name="message" style="100%;">{$message}</textarea>
-                       </td>
-               </tr>
+      <table style="width:100%;">
+        <tr>
+          <td>{t}Sender{/t}</td>
+          <td><input type='text' name="from" value="{$from}" style="width:100%;"></td>
+        </tr>
+        <tr>
+          <td>{t}Subject{/t}</td>
+          <td><input type='text' name="subject" value="{$subject}" style="width:100%;"></td>
+        </tr>
+        <tr>
+          <td colspan="2">{t}Message{/t} :</td>
+        </tr>
+        <tr>
+          <td colspan="2" >
+            <textarea style="width:99%;height:250px;" name="message" >{$message}</textarea>
+          </td>
+        </tr>
       </table>
     </td>
     <td style='width:50%; vertical-align:top;'>
-         <b>{t}Schedule{/t}</b>
+           <b>{t}Schedule{/t}</b>
       <table>
         <tr>
           <td colspan="2" style='vertical-align:top'>{$timestamp}<br><br></td>
@@ -63,7 +63,7 @@
 
 <table style='width:100%;'>
        <tr>
-               <td style='width:50%; vertical-align:top;'>
+               <td style='vertical-align:top;'>
                        <table>
                                <tr>
                                        <td>{t}ID{/t}</td>

diff --git a/gosa-plugins/goto/addons/goto/events/class_DaemonEvent.inc b/gosa-plugins/goto/addons/goto/events/class_DaemonEvent.inc
index 192b67af73924352fba859ec2bc0fad0e2c2fdb3..ae9078130eeba7f0843c11223f09f5767445bf94 100644 (file)
--- a/gosa-plugins/goto/addons/goto/events/class_DaemonEvent.inc
+++ b/gosa-plugins/goto/addons/goto/events/class_DaemonEvent.inc
@@ -110,9 +110,9 @@ class DaemonEvent
       }
     }
 
-    if(isset($data['PERIODIC'])){
+    if(isset($data['PERIODIC']) && !preg_match("/none/i",$data['PERIODIC'])){
       $tmp = split("_",$data['PERIODIC']);
-      if(count($tmp)){
+      if(count($tmp) == 2){
         $this->activate_periodical_job = TRUE;
         $this->periodValue = $tmp[0];
         $this->periodType = $tmp[1];
@@ -492,6 +492,7 @@ class DaemonEvent
       unset($ret['timestamp']);
     }
 
+    $ret['periodic'] = "none";
     if($this-> activate_periodical_job){
       $ret['periodic'][$this->periodType] = $this->periodValue; 
     }

diff --git a/gosa-plugins/goto/addons/goto/events/timestamp_select.tpl b/gosa-plugins/goto/addons/goto/events/timestamp_select.tpl
index 593488abf3149b0fc026e2bf8a8900b6e881a24e..230bebdeaeac6fe1bcfddd156bdc7c4f06d0b1ad 100644 (file)
--- a/gosa-plugins/goto/addons/goto/events/timestamp_select.tpl
+++ b/gosa-plugins/goto/addons/goto/events/timestamp_select.tpl
@@ -43,15 +43,12 @@
        </tr>
 </table>
 <br>
-<br>
 <table width="100%">
   <tr>
     <td colspan="2">
-      <h2>
-        <input type="checkbox" name='activate_periodical_job' value='1' {if $activate_periodical_job} checked {/if}
-          onClick="changeState('periodValue'); changeState('periodType');">
-        {t}Periodical job{/t}
-      </h2>
+      <b>{t}Periodical job{/t}</b>
+      <input class='center' type="checkbox" name='activate_periodical_job' value='1' {if $activate_periodical_job} checked {/if}
+        onClick="changeState('periodValue'); changeState('periodType');">
     </td>
        </tr>
   <tr>