[Kde-print-devel] [Bug 106369] No fax sent when special characters are included in the sender information

[Cristian Tibirna]

------- You are receiving this mail because: -------
You are the assignee for the bug, or are watching the assignee.
         
http://bugs.kde.org/show_bug.cgi?id=106369         
tibirna kde org changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|UNCONFIRMED                 |RESOLVED
         Resolution|                            |FIXED



------- Additional Comments From tibirna kde org  2006-04-22 15:17 -------
SVN commit 532670 by tibirna:

allow for # (hash) characters in a fax number

allow passing the raw number to the commandline fax command

Both fixes courtesy of Ray Lischner. Thank you!

CCMAIL:rl.news tempest-sw com
BUG:106369


 M  +5 -3      faxctrl.cpp  


--- branches/KDE/3.5/kdebase/kdeprint/kdeprintfax/faxctrl.cpp #532669:532670
 @ -60,9 +60,9  @
 	KConfig *conf = KGlobal::config();
 	conf->setGroup( "Personal" );
 
-	// removes any non-numeric character, except ('+','*') (hope it's supported by faxing tools)
+	// removes any non-numeric character, except ('+','*','#') (hope it's supported by faxing tools)
 	QString strip_s = s;
-	strip_s.replace( QRegExp( "[^\\d+*]" ), "" );
+	strip_s.replace( QRegExp( "[^\\d+*#]" ), "" );
 	if ( strip_s.find( '+' ) != -1 && conf->readBoolEntry( "ReplaceIntChar", false ) )
 		strip_s.replace( "+", conf->readEntry( "ReplaceIntCharVal" ) );
 	return strip_s;
 @ -253,6 +253,8  @
 			// arguments
 			else if (isTag( match, "%number" ))
 				v = processTag( match, stripNumber( item.number) );
+			else if (isTag( match, "%rawnumber" ))
+				v = processTag( match, item.number );
 			else if (isTag( match, "%name" ))
 				v = processTag(match, item.name);
 			else if (isTag( match, "%comment" ))
 @ -395,7 +397,7  @
 
 		addLogTitle( i18n( "Sending fax to %1 (%2)" ).arg( item.number ).arg( item.name ) );
 
-		QString cmd = replaceTags( m_command, tagList( 3, "%number", "%name", "%enterprise" ), NULL, item );
+		QString cmd = replaceTags( m_command, tagList( 4, "%number", "%name", "%enterprise", "%rawnumber" ), NULL, item );
 		m_process->clearArguments();
 		*m_process << cmd;
 		addLog(i18n("Sending to fax using: %1").arg(cmd));