Shit .. Microsoft is violating RFC 2426 .. Thanks a lot !

2 files changed, 42 insertions, 16 deletions

diff --git a/libopie/pim/ocontact.cpp b/libopie/pim/ocontact.cpp
index 734f5a2..bf27d0f 100644
--- a/libopie/pim/ocontact.cpp
+++ b/libopie/pim/ocontact.cpp
@@ -572,10 +572,10 @@ QString OContact::toRichText() const
 	text += "<b>" + QObject::tr("Spouse: ") + "</b>"
 		+ Qtopia::escapeString(str) + "<br>";
-    if ( !birthday().isNull() ){
+    if ( !birthday().isValid() ){
 	    str = TimeString::numberDateString( birthday() );
 	    text += "<b>" + QObject::tr("Birthday: ") + "</b>"
 		    + Qtopia::escapeString(str) + "<br>";
     }
-    if ( !anniversary().isNull() ){
+    if ( !anniversary().isValid() ){
 	    str = TimeString::numberDateString( anniversary() );
 	    text += "<b>" + QObject::tr("Anniversary: ") + "</b>"
@@ -1124,6 +1124,14 @@ static VObject *createVObject( const OContact &c )
 
     // Exporting Birthday regarding RFC 2425 (5.8.4)
-    if ( !c.birthday().isNull() ){
-	    QString birthd_rfc2425 = c.birthday().year() + QString( "-" ) + c.birthday().month() + QString( "-" ) + c.birthday().day();
+    if ( !c.birthday().isValid() ){
+	    QString birthd_rfc2425 = QString("%1-%2-%3")
+		    .arg( c.birthday().year() ) 
+		    .arg( c.birthday().month(), 2 )
+		    .arg( c.birthday().day(), 2 );
+	    // Now replace spaces with "0"...
+	    int pos = 0;
+	    while ( ( pos = birthd_rfc2425.find (' ')  ) > 0 )
+		    birthd_rfc2425.replace( pos, 1, "0" );
+		    
 	    qWarning("Exporting birthday as: %s", birthd_rfc2425.latin1());
 	    safeAddPropValue( vcard, VCBirthDateProp, birthd_rfc2425.latin1() );
@@ -1159,13 +1167,18 @@ static QDate convVCardDateToDate( const QString& datestr )
 	int monthPos = datestr.find('-');
 	int dayPos = datestr.find('-', monthPos+1 );
+	int sep_ignore = 1;
 	if ( monthPos == -1 || dayPos == -1 ) {
 		qDebug("fromString didn't find - in str = %s; mpos = %d ypos = %d", datestr.latin1(), monthPos, dayPos );
-		return QDate();
+		// Ok.. Outlook is violating ISO 8601, therefore we will try to read their format ( YYYYMMDD )
+		monthPos   = 4;
+		dayPos     = 6;
+		sep_ignore = 0;
+		qDebug("Try with follwing positions str = %s; mpos = %d ypos = %d", datestr.latin1(), monthPos, dayPos );
 	}
 	int y = datestr.left( monthPos ).toInt();
-	int m = datestr.mid( monthPos+1, dayPos - monthPos - 1 ).toInt();
-	int d = datestr.mid( dayPos+1 ).toInt();
-	QDate date ( y,m,d );
+	int m = datestr.mid( monthPos + sep_ignore, dayPos - monthPos - sep_ignore ).toInt();
+	int d = datestr.mid( dayPos + sep_ignore ).toInt();
 	qDebug("TimeConversion::fromString ymd = %s => %d %d %d; mpos = %d ypos = %d", datestr.latin1(), y, m, d, monthPos, dayPos);
+	QDate date ( y,m,d );
 	return date;
 }
diff --git a/libopie2/opiepim/ocontact.cpp b/libopie2/opiepim/ocontact.cpp
index 734f5a2..bf27d0f 100644
--- a/libopie2/opiepim/ocontact.cpp
+++ b/libopie2/opiepim/ocontact.cpp
@@ -572,10 +572,10 @@ QString OContact::toRichText() const
 	text += "<b>" + QObject::tr("Spouse: ") + "</b>"
 		+ Qtopia::escapeString(str) + "<br>";
-    if ( !birthday().isNull() ){
+    if ( !birthday().isValid() ){
 	    str = TimeString::numberDateString( birthday() );
 	    text += "<b>" + QObject::tr("Birthday: ") + "</b>"
 		    + Qtopia::escapeString(str) + "<br>";
     }
-    if ( !anniversary().isNull() ){
+    if ( !anniversary().isValid() ){
 	    str = TimeString::numberDateString( anniversary() );
 	    text += "<b>" + QObject::tr("Anniversary: ") + "</b>"
@@ -1124,6 +1124,14 @@ static VObject *createVObject( const OContact &c )
 
     // Exporting Birthday regarding RFC 2425 (5.8.4)
-    if ( !c.birthday().isNull() ){
-	    QString birthd_rfc2425 = c.birthday().year() + QString( "-" ) + c.birthday().month() + QString( "-" ) + c.birthday().day();
+    if ( !c.birthday().isValid() ){
+	    QString birthd_rfc2425 = QString("%1-%2-%3")
+		    .arg( c.birthday().year() ) 
+		    .arg( c.birthday().month(), 2 )
+		    .arg( c.birthday().day(), 2 );
+	    // Now replace spaces with "0"...
+	    int pos = 0;
+	    while ( ( pos = birthd_rfc2425.find (' ')  ) > 0 )
+		    birthd_rfc2425.replace( pos, 1, "0" );
+		    
 	    qWarning("Exporting birthday as: %s", birthd_rfc2425.latin1());
 	    safeAddPropValue( vcard, VCBirthDateProp, birthd_rfc2425.latin1() );
@@ -1159,13 +1167,18 @@ static QDate convVCardDateToDate( const QString& datestr )
 	int monthPos = datestr.find('-');
 	int dayPos = datestr.find('-', monthPos+1 );
+	int sep_ignore = 1;
 	if ( monthPos == -1 || dayPos == -1 ) {
 		qDebug("fromString didn't find - in str = %s; mpos = %d ypos = %d", datestr.latin1(), monthPos, dayPos );
-		return QDate();
+		// Ok.. Outlook is violating ISO 8601, therefore we will try to read their format ( YYYYMMDD )
+		monthPos   = 4;
+		dayPos     = 6;
+		sep_ignore = 0;
+		qDebug("Try with follwing positions str = %s; mpos = %d ypos = %d", datestr.latin1(), monthPos, dayPos );
 	}
 	int y = datestr.left( monthPos ).toInt();
-	int m = datestr.mid( monthPos+1, dayPos - monthPos - 1 ).toInt();
-	int d = datestr.mid( dayPos+1 ).toInt();
-	QDate date ( y,m,d );
+	int m = datestr.mid( monthPos + sep_ignore, dayPos - monthPos - sep_ignore ).toInt();
+	int d = datestr.mid( dayPos + sep_ignore ).toInt();
 	qDebug("TimeConversion::fromString ymd = %s => %d %d %d; mpos = %d ypos = %d", datestr.latin1(), y, m, d, monthPos, dayPos);
+	QDate date ( y,m,d );
 	return date;
 }