From: cajus <cajus@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Wed, 19 Mar 2008 08:29:16 +0000 (+0000)
Subject: Updated Personal/* Addressbook
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=d0900a4a5998b10fe93756d11a41bbe9925d53f7;p=gosa.git

Updated Personal/* Addressbook
-Updated msgPool invalid mailAddress example.


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

diff --git a/gosa-core/plugins/personal/generic/class_user.inc b/gosa-core/plugins/personal/generic/class_user.inc
index b252f3b29..5da067458 100644
--- a/gosa-core/plugins/personal/generic/class_user.inc
+++ b/gosa-core/plugins/personal/generic/class_user.inc
@@ -1167,7 +1167,7 @@ class user extends plugin
       }
     }
     if (!tests::is_url($this->labeledURI)){
-      $message[]= msgPool::invalid(_("Homepage"), "", "", "http://www.example.com/yourname");
+      $message[]= msgPool::invalid(_("Homepage"), "", "", "http://www.your-domain.com/yourname");
     }
 
     /* Check phone numbers */
diff --git a/gosa-plugins/addressbook/addons/addressbook/class_addressbook.inc b/gosa-plugins/addressbook/addons/addressbook/class_addressbook.inc
index be2e7125b..4ae4aefd1 100644
--- a/gosa-plugins/addressbook/addons/addressbook/class_addressbook.inc
+++ b/gosa-plugins/addressbook/addons/addressbook/class_addressbook.inc
@@ -707,7 +707,7 @@ class addressbook extends plugin
 
   /* Check mail */
   if (!tests::is_email($this->mail)){
-    $message[] = msgPool::invalid(_("Email"),"","","example@your-domain.com");
+    $message[] = msgPool::invalid(_("Email"),"","","your-domain@your-domain.com");
   }
 
   /* Assemble cn/dn */
diff --git a/gosa-plugins/kolab/personal/connectivity/kolab/class_kolabAccount.inc b/gosa-plugins/kolab/personal/connectivity/kolab/class_kolabAccount.inc
index d4b40b295..2b103d2f1 100644
--- a/gosa-plugins/kolab/personal/connectivity/kolab/class_kolabAccount.inc
+++ b/gosa-plugins/kolab/personal/connectivity/kolab/class_kolabAccount.inc
@@ -162,7 +162,7 @@ class kolabAccount extends plugin
         $valid= FALSE;
         if (!tests::is_email($address)){
           if (!tests::is_email($address, TRUE)){
-            msg_dialog::display(_("Error"), msgPool::invalid(_("Mail address"), "","", "example@your-domain.com"));
+            msg_dialog::display(_("Error"), msgPool::invalid(_("Mail address"), "","", "your-domain@your-domain.com"));
           }
         } else {
 
diff --git a/gosa-plugins/mail/personal/mail/class_mailAccount.inc b/gosa-plugins/mail/personal/mail/class_mailAccount.inc
index 63cf3260e..6a5c47c2f 100644
--- a/gosa-plugins/mail/personal/mail/class_mailAccount.inc
+++ b/gosa-plugins/mail/personal/mail/class_mailAccount.inc
@@ -357,7 +357,7 @@ class mailAccount extends plugin
               $valid= TRUE;
             } else {
               msg_dialog::display(_("Error"), 
-                  msgPool::invalid(_("Mail address"),"","","example@your-domain.com"),
+                  msgPool::invalid(_("Mail address"),"","","your-domain@your-domain.com"),
                   ERROR_DIALOG);
             }
           }
@@ -393,7 +393,7 @@ class mailAccount extends plugin
         if ($this->is_template){
           if (!(tests::is_email($_POST['alternate_address'], TRUE))){
             msg_dialog::display(_("Error"), 
-                msgPool::invalid(_("Mail address"),"","","example@your-domain.com"),
+                msgPool::invalid(_("Mail address"),"","","your-domain@your-domain.com"),
                 ERROR_DIALOG);
 
           } else {
@@ -401,7 +401,7 @@ class mailAccount extends plugin
           }
         } else {
           msg_dialog::display(_("Error"), 
-              msgPool::invalid(_("Mail address"),"","","example@your-domain.com"),
+              msgPool::invalid(_("Mail address"),"","","your-domain@your-domain.com"),
               ERROR_DIALOG);
         }
 
@@ -932,7 +932,7 @@ class mailAccount extends plugin
       }
     } else {
       if (!tests::is_email($this->mail)){
-        $message[]= msgPool::invalid(_("Mail address"),"","","example@your-domain.com");
+        $message[]= msgPool::invalid(_("Mail address"),"","","your-domain@your-domain.com");
       }
     }
     $ldap->cd($this->config->current['BASE']);
diff --git a/gosa-plugins/nagios/personal/nagios/class_nagiosAccount.inc b/gosa-plugins/nagios/personal/nagios/class_nagiosAccount.inc
index 9a10451b2..0129427c9 100644
--- a/gosa-plugins/nagios/personal/nagios/class_nagiosAccount.inc
+++ b/gosa-plugins/nagios/personal/nagios/class_nagiosAccount.inc
@@ -202,7 +202,7 @@ class nagiosAccount extends plugin
       }
     } else {
       if (!tests::is_email($this->NagiosMail)){
-        $message[]= msgPool::invalid(_("Mail"),"","","example@your-domain.com");
+        $message[]= msgPool::invalid(_("Mail"),"","","your-domain@your-domain.com");
       }
     }
     return($message);