diff -urN address104e/export.php address104e.patched/export.php --- address104e/export.php 2005-10-17 07:08:46.000000000 +0100 +++ address104e.patched/export.php 2006-10-18 16:18:49.000000000 +0100 @@ -634,6 +634,70 @@ break; + case "skype": // Most of this code was adopted from the vCard export procedure + $SkypeQuery = "SELECT id, firstname, middlename, lastname, nickname FROM ". TABLE_CONTACT; + + $r_contact = mysql_query($SkypeQuery, $db_link) + or die(reportSQLError($vCardQuery)); + + while($r = mysql_fetch_array($r_contact)) { // $r means result + + $telq = 'SELECT phone, type FROM ' . TABLE_OTHERPHONE . ' WHERE id=' . $r['id']; + $telq = mysql_query($telq); + + while($tel = mysql_fetch_array($telq)) { + + $output .= "BEGIN:VCARD\n"; + $output .= "VERSION:3.0\n"; + + $output .= "N:" . $tel['phone'] . "\n"; + $output .= "X-SKYPE-PSTNNUMBER:" . $tel['phone'] . "\n"; + + $output .= "X-SKYPE-DISPLAYNAME:" . iconv("ISO-8859-7", "UTF-8", $r['lastname']); + if ( $r['middlename'] ) $output .= ' ' . iconv("ISO-8859-7", "UTF-8", $r['middlename']); + $output .= ' ' . iconv("ISO-8859-7", "UTF-8", $r['firstname']); + + if ( $tel['type'] ) $output .= ' (' . iconv("ISO-8859-7", "UTF-8", $tel['type']) . ')'; + + $output .= "\n"; + + $output .= "END:VCARD\n"; + $output .= "\n"; + } + + $msgq = 'SELECT handle, type FROM ' . TABLE_MESSAGING . ' WHERE id=' . $r['id']; + $msgq = mysql_query($msgq); + + while($msg = mysql_fetch_array($msgq)) { + + if ( $msg['type'] == "Skype") { + + $output .= "BEGIN:VCARD\n"; + $output .= "VERSION:3.0\n"; + + $output .= "N:" . $msg['handle'] . "\n"; + $output .= "X-SKYPE-USERNAME:" . $msg['handle'] . "\n"; + + $output .= "X-SKYPE-DISPLAYNAME:" . iconv("ISO-8859-7", "UTF-8", $r['lastname']); + if ( $r['middlename'] ) $output .= ' ' . iconv("ISO-8859-7", "UTF-8", $r['middlename']); + $output .= ' ' . iconv("ISO-8859-7", "UTF-8", $r['firstname']); + + $output .= "\n"; + + $output .= "END:VCARD\n"; + $output .= "\n"; + + } + } + } + + Header("Content-Disposition: attachment; filename=export.vcf"); + Header("Content-Length: ".strlen($output)); + Header("Connection: close"); + Header("Content-Type: text/x-vCard; name=export.vcf"); + + echo $output; + break; /****************************************************************************** ** EXPORT MAIN MENU @@ -653,6 +717,7 @@ echo("
  • ".$lang['EXP_XML']); echo("
  • ".$lang['EXP_GMAIL']); echo("
  • ".$lang['EXP_VCARD']); + echo("
  • ".$lang['EXP_SKYPE']); echo(""); echo("

    ".$lang['EXP_CONVERT']." InterGuru's E-Mail Address Converter"); echo(""); diff -urN address104e/languages/dutch.php address104e.patched/languages/dutch.php --- address104e/languages/dutch.php 2005-07-31 09:56:00.000000000 +0100 +++ address104e.patched/languages/dutch.php 2006-10-18 16:17:23.000000000 +0100 @@ -146,6 +146,7 @@ 'EXP_TO_FILE' =>"Dit zal de adresboekdatabank naar een bestand exporteren. Als er geen \"Opslaan als\" dialoogvenster verschijnt, klik dan met de rechter muisknop op de link en kies dan \"Opslaan Als....\"", 'EXP_TXT' =>"Platte tekst (met scheidingsteken) (kapot)", 'EXP_VCARD' =>"vCard (opgelet: dit wordt automatisch gedownload en geοnstalleerd in je adresboek zonder verdere waarschuwingen!)", +'EXP_SKYPE' =>"Skype", 'EXP_XML' =>"XML", 'FOOTER_COPYRIGHT' =>"© 2001-2005 Infinity Plus One Productions. All rights reserved.", 'FOOTER_HOMEPAGE_LINK' =>"homepage", diff -urN address104e/languages/english.php address104e.patched/languages/english.php --- address104e/languages/english.php 2005-07-31 09:56:00.000000000 +0100 +++ address104e.patched/languages/english.php 2006-10-18 16:17:23.000000000 +0100 @@ -134,6 +134,7 @@ 'EXP_TO_FILE' =>"This will export the address book database to a file. If a \"Save As\" dialog box does not appear, right click the link instead and choose \"Save Target As...\"", 'EXP_TXT' =>"Plain text (with separator) (broken)", 'EXP_VCARD' =>"vCard (warning: downloads to your computer and installs in your address book with no further prompting!)", +'EXP_SKYPE' =>"Skype", 'EXP_XML' =>"XML", 'FOOTER_COPYRIGHT' =>"© 2001-2005 Infinity Plus One Productions. All rights reserved.", 'FOOTER_HOMEPAGE_LINK' =>"homepage", diff -urN address104e/languages/french.php address104e.patched/languages/french.php --- address104e/languages/french.php 2005-07-31 09:56:00.000000000 +0100 +++ address104e.patched/languages/french.php 2006-10-18 16:17:23.000000000 +0100 @@ -134,6 +134,7 @@ 'EXP_TO_FILE' =>"Cela exporte la base de donnιe de The Address Book vers un fichier. Si une boite de dialogue \"sauver sous\" n'apparait pas, clic droit pui \"sauver la cible sous ...\"", 'EXP_TXT' =>"Text seul (Avec sιparateur) (inactif)", 'EXP_VCARD' =>"vCard (attention: Cela tιlιcharge le carnet d'adresse et l'installe sans confirmation!)", +'EXP_SKYPE' =>"Skype", 'EXP_XML' =>"fichier XML", 'FOOTER_COPYRIGHT' =>"© 2001-2005 Infinity Plus One Productions. All rights reserved.", 'FOOTER_HOMEPAGE_LINK' =>"Page d'acceuil", diff -urN address104e/languages/german.php address104e.patched/languages/german.php --- address104e/languages/german.php 2005-07-31 09:55:00.000000000 +0100 +++ address104e.patched/languages/german.php 2006-10-18 16:17:23.000000000 +0100 @@ -134,6 +134,7 @@ 'EXP_TO_FILE' =>"Dies wird die Datenbank des Adressbuches in eine Datei exportieren. Falls der \"Speichern unter\"-Dialog nicht erscheint, klicken Sie mit der rechten Maustaste auf den Link und wδhlen Sie \"Ziel speichern unter\".", 'EXP_TXT' =>"Nur-Text (mit Trennzeichen) (nicht funktionstόchtig)", 'EXP_VCARD' =>"vCard (Warnung: Wird heruntergeladen und ohne weitere Eingabeaufforderung in Ihr Adressbuch όbernommen!)", +'EXP_SKYPE' =>"Skype", 'EXP_XML' =>"XML-Datei", 'FOOTER_COPYRIGHT' =>"© 2001-2005 Infinity Plus One Productions. Alle Rechte vorbehalten.", 'FOOTER_HOMEPAGE_LINK' =>"Homepage", diff -urN address104e/languages/greek.php address104e.patched/languages/greek.php --- address104e/languages/greek.php 2005-07-31 09:56:00.000000000 +0100 +++ address104e.patched/languages/greek.php 2006-10-18 16:17:23.000000000 +0100 @@ -134,6 +134,7 @@ 'EXP_TO_FILE' =>"Αυτό θα εξάγει το βιβλίο διευθύνσεων σε ένα αρχείο. Αν δεν εμφανιστεί ένας διάλογος της μορφής \"Save As\", κάντε δεξί κλικ στο σύνδεσμο και επιλέξτε \"Save Target As...\"", 'EXP_TXT' =>"Απλό κείμενο (με διαχωριστικό) (σπασμένο)", 'EXP_VCARD' =>"vCard (Προσοχή: κατεβάζει στον υπολογιστή σας και τα εγκαθιστά στο βιβλίο διευθύνσεών σας χωρίς άλλη προειδοποίηση!)", +'EXP_SKYPE' =>"Skype", 'EXP_XML' =>"XML", 'FOOTER_COPYRIGHT' =>"© 2001-2005 Infinity Plus One Productions. All rights reserved.", 'FOOTER_HOMEPAGE_LINK' =>"homepage", diff -urN address104e/languages/italian.php address104e.patched/languages/italian.php --- address104e/languages/italian.php 2005-07-31 09:56:00.000000000 +0100 +++ address104e.patched/languages/italian.php 2006-10-18 16:17:23.000000000 +0100 @@ -134,6 +134,7 @@ 'EXP_TO_FILE' =>"Questo esportera' la lista contatti in un file. Se la finestra di dialogo \"Salva con nome\" non compare, tasto destro sul link e scegliere \"Salva oggetto con nome...\"", 'EXP_TXT' =>"Testo normale (con il separatore) (tagliato)", 'EXP_VCARD' =>"vCard (attenzione: al download sul computer si inserisce nella rubrica senza ulteriori conferme!)", +'EXP_SKYPE' =>"Skype", 'EXP_XML' =>"XML", 'FOOTER_COPYRIGHT' =>"#© 2001-2005 Infinity Plus One Productions. All rights reserved.", 'FOOTER_HOMEPAGE_LINK' =>"homepage", diff -urN address104e/languages/swedish.php address104e.patched/languages/swedish.php --- address104e/languages/swedish.php 2005-07-31 09:56:00.000000000 +0100 +++ address104e.patched/languages/swedish.php 2006-10-18 16:17:23.000000000 +0100 @@ -135,6 +135,7 @@ 'EXP_TO_FILE' =>"Detta kommer exportera adressbokens databas till en fil. Om en \"Spara som\" dialog inte kommer upp, hφgerklicka istδllet pε lδnken och vδlj \"Spara mεl som...\"", 'EXP_TXT' =>"Enbart text (med separator) (broken SW)", 'EXP_VCARD' =>"vCard (Varning: laddas ner till din dator och installeras automatiskt i din lokala adressbok.", +'EXP_SKYPE' =>"Skype", 'EXP_XML' =>"XML", 'FOOTER_COPYRIGHT' =>"© 2001-2005 Infinity Plus One Productions. All rights reserved.", 'FOOTER_HOMEPAGE_LINK' =>"hemsida",