Textarea should not use proprietary wrap attribute (#1512681). Original

[squirrelmail.git] / src / vcard.php

diff --git a/src/vcard.php b/src/vcard.php
index 995afb8cca231e5098e844eab505b50cac5d1a77..d22b9687b158fe44e2260b51f9283e5f0bf12128 100644 (file)
--- a/src/vcard.php
+++ b/src/vcard.php
@@ -12,15 +12,23 @@
  */
 
 /**
- * Path for SquirrelMail required files.
- * @ignore
+ * Include the SquirrelMail initialization file.
  */
-Define('SM_PATH','../');
+require('../include/init.php');
 
 /* SquirrelMail required files. */
-include_once(SM_PATH . 'include/validate.php');
-require_once(SM_PATH . 'functions/mime.php');
-require_once(SM_PATH . 'functions/url_parser.php');
+
+/** imap functions depend on date functions */
+include_once(SM_PATH . 'functions/date.php');
+/** form functions */
+include_once(SM_PATH . 'functions/forms.php');
+/** mime decoding */
+include_once(SM_PATH . 'functions/mime.php');
+/** url parser */
+include_once(SM_PATH . 'functions/url_parser.php');
+/** imap functions used to retrieve vcard */
+include_once(SM_PATH . 'functions/imap_general.php');
+include_once(SM_PATH . 'functions/imap_messages.php');
 
 /* globals */
 sqgetGlobalVar('username', $username, SQ_SESSION);
@@ -188,7 +196,7 @@ if (isset($vcard_nice['org'])) {
     $opts[$vcard_nice['org']] = _("Organization / Department");
 }
 if (isset($vcard_nice['title'])) {
-    $opts[$vcard_nice['title'].'; '.$vcard_nice['org']] = _("Title & Org. / Dept.");
+    $opts[$vcard_nice['title'].'; '.$vcard_nice['org']] = _("Title & Org. / Dept.");
 }
 if (isset($vcard_nice['tel;work'])) {
     $opts[$vcard_nice['tel;work']] = _("Work Phone");