summaryrefslogtreecommitdiff
authorllornkcor <llornkcor>2002-03-24 14:14:49 (UTC)
committer llornkcor <llornkcor>2002-03-24 14:14:49 (UTC)
commit807ea39f3ccfbc26e769fc16a79d459327e13437 (patch) (unidiff)
treefa25defd4f0d6f6630cecad2f7eb274dcac30db6
parent5c17e8b168cf27ac2922e7c118cb886b116eab42 (diff)
downloadopie-807ea39f3ccfbc26e769fc16a79d459327e13437.zip
opie-807ea39f3ccfbc26e769fc16a79d459327e13437.tar.gz
opie-807ea39f3ccfbc26e769fc16a79d459327e13437.tar.bz2
radnom fixes
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/net/opieftp/ftplib.c2
-rw-r--r--noncore/net/opieftp/opieftp.cpp278
-rw-r--r--noncore/net/opieftp/opieftp.h9
3 files changed, 168 insertions, 121 deletions
diff --git a/noncore/net/opieftp/ftplib.c b/noncore/net/opieftp/ftplib.c
index b9ca746..5116170 100644
--- a/noncore/net/opieftp/ftplib.c
+++ b/noncore/net/opieftp/ftplib.c
@@ -60,3 +60,3 @@
60#define FTPLIB_BUFSIZ 8192 60#define FTPLIB_BUFSIZ 8192
61#define ACCEPT_TIMEOUT 30 61#define ACCEPT_TIMEOUT 15
62 62
diff --git a/noncore/net/opieftp/opieftp.cpp b/noncore/net/opieftp/opieftp.cpp
index eed133e..d74c55b 100644
--- a/noncore/net/opieftp/opieftp.cpp
+++ b/noncore/net/opieftp/opieftp.cpp
@@ -1,3 +1,3 @@
1/*************************************************************************** 1/***************************************************************************
2 opieftp.cpp 2 opieftp.cpp
3 ------------------- 3 -------------------
@@ -11,3 +11,3 @@
11 ***************************************************************************/ 11 ***************************************************************************/
12//#define DEVELOPER_VERSION 12#define DEVELOPERS_VERSION
13 13
@@ -135,3 +135,3 @@ OpieFtp::OpieFtp( )
135 135
136 connect( Local_View, SIGNAL( doubleClicked( QListViewItem*)), 136 connect( Local_View, SIGNAL( clicked( QListViewItem*)),
137 this,SLOT( localListClicked(QListViewItem *)) ); 137 this,SLOT( localListClicked(QListViewItem *)) );
@@ -156,3 +156,3 @@ OpieFtp::OpieFtp( )
156 156
157 connect( Remote_View, SIGNAL( doubleClicked( QListViewItem*)), 157 connect( Remote_View, SIGNAL( clicked( QListViewItem*)),
158 this,SLOT( remoteListClicked(QListViewItem *)) ); 158 this,SLOT( remoteListClicked(QListViewItem *)) );
@@ -176,3 +176,2 @@ OpieFtp::OpieFtp( )
176 UsernameComboBox->setEditable(TRUE); 176 UsernameComboBox->setEditable(TRUE);
177// UsernameComboBox->lineEdit()->setText("anonymous");
178 tabLayout_3->addMultiCellWidget( UsernameComboBox, 1, 1, 0, 1 ); 177 tabLayout_3->addMultiCellWidget( UsernameComboBox, 1, 1, 0, 1 );
@@ -185,3 +184,2 @@ OpieFtp::OpieFtp( )
185 PasswordEdit->setEchoMode(QLineEdit::Password); 184 PasswordEdit->setEchoMode(QLineEdit::Password);
186// PasswordEdit->setText( tr( "me@opieftp.org" ) );
187 tabLayout_3->addMultiCellWidget( PasswordEdit, 1, 1, 2, 3 ); 185 tabLayout_3->addMultiCellWidget( PasswordEdit, 1, 1, 2, 3 );
@@ -194,3 +192,2 @@ OpieFtp::OpieFtp( )
194 ServerComboBox->setEditable(TRUE); 192 ServerComboBox->setEditable(TRUE);
195// ServerComboBox->lineEdit()->setText( tr( "" ) );
196 tabLayout_3->addMultiCellWidget( ServerComboBox, 3, 3, 0, 1 ); 193 tabLayout_3->addMultiCellWidget( ServerComboBox, 3, 3, 0, 1 );
@@ -198,2 +195,3 @@ OpieFtp::OpieFtp( )
198 connect(ServerComboBox,SIGNAL(activated(int)),this,SLOT(serverComboSelected(int ) )); 195 connect(ServerComboBox,SIGNAL(activated(int)),this,SLOT(serverComboSelected(int ) ));
196 connect(ServerComboBox,SIGNAL(textChanged(const QString &)),this,SLOT(serverComboEdited(const QString & ) ));
199 197
@@ -204,3 +202,2 @@ OpieFtp::OpieFtp( )
204 remotePath = new QLineEdit( "/", tab_3, "remotePath" ); 202 remotePath = new QLineEdit( "/", tab_3, "remotePath" );
205 remotePath->setText( currentRemoteDir = "/");
206 tabLayout_3->addMultiCellWidget( remotePath, 3, 3, 2, 3 ); 203 tabLayout_3->addMultiCellWidget( remotePath, 3, 3, 2, 3 );
@@ -214,3 +211,2 @@ OpieFtp::OpieFtp( )
214 PortSpinBox->setMaxValue(32786); 211 PortSpinBox->setMaxValue(32786);
215 PortSpinBox->setValue( 21);
216 tabLayout_3->addMultiCellWidget( PortSpinBox, 4, 4, 1, 1); 212 tabLayout_3->addMultiCellWidget( PortSpinBox, 4, 4, 1, 1);
@@ -218,3 +214,3 @@ OpieFtp::OpieFtp( )
218 QPushButton *deleteServerBtn; 214 QPushButton *deleteServerBtn;
219 deleteServerBtn = new QPushButton( "Delete Server",this, "OpenButton" ); 215 deleteServerBtn = new QPushButton( "Delete Server", tab_3 , "OpenButton" );
220 tabLayout_3->addMultiCellWidget( deleteServerBtn, 5, 5, 2, 3); 216 tabLayout_3->addMultiCellWidget( deleteServerBtn, 5, 5, 2, 3);
@@ -223,6 +219,6 @@ OpieFtp::OpieFtp( )
223 219
224 QPushButton *connectServerBtn; 220 connectServerBtn = new QPushButton( "Connect", tab_3 , "ConnectButton" );
225 connectServerBtn = new QPushButton( "Connect",this, "ConnectButton" );
226 tabLayout_3->addMultiCellWidget( connectServerBtn, 5, 5, 0, 1); 221 tabLayout_3->addMultiCellWidget( connectServerBtn, 5, 5, 0, 1);
227 connect(connectServerBtn,SIGNAL( clicked()),SLOT( connector() )); 222 connectServerBtn->setToggleButton(TRUE);
223 connect(connectServerBtn,SIGNAL( toggled( bool)),SLOT( connectorBtnToggled(bool) ));
228 224
@@ -250,13 +246,15 @@ OpieFtp::OpieFtp( )
250 serverComboSelected(0); 246 serverComboSelected(0);
251#ifdef DEVELOPER_VERSION 247 fillCombos();
252// ServerComboBox->lineEdit()->setText( tr( "llornkcor.com" ) ); 248
249#ifdef DEVELOPERS_VERSION
253 ServerComboBox->lineEdit()->setText( tr( "192.168.129.201" ) ); 250 ServerComboBox->lineEdit()->setText( tr( "192.168.129.201" ) );
254 UsernameComboBox->lineEdit()->setText("root"); 251 UsernameComboBox->lineEdit()->setText("root");
255// UsernameComboBox->lineEdit()->setText("llornkcor");
256 PortSpinBox->setValue( 4242); 252 PortSpinBox->setValue( 4242);
257 remotePath->setText( currentRemoteDir = "/"); 253 remotePath->setText( currentRemoteDir = "/");
254// ServerComboBox->lineEdit()->setText( tr( "llornkcor.com" ) );
255// UsernameComboBox->lineEdit()->setText("llornkcor");
256// PortSpinBox->setValue( 21);
257// remotePath->setText( currentRemoteDir = "/home/llornkcor");
258 PasswordEdit->setText( tr( "" ) ); 258 PasswordEdit->setText( tr( "" ) );
259 259#endif
260#endif
261 fillCombos();
262 filterStr="*"; 260 filterStr="*";
@@ -306,2 +304,90 @@ void OpieFtp::tabChanged(QWidget *w)
306 304
305void OpieFtp::newConnection()
306{
307 UsernameComboBox->lineEdit()->setText("");
308 PasswordEdit->setText( "" );
309 ServerComboBox->lineEdit()->setText( "");
310 remotePath->setText( currentRemoteDir = "/");
311 PortSpinBox->setValue( 21);
312 TabWidget->setCurrentPage(2);
313 currentServerConfig = -1;
314}
315
316void OpieFtp::serverComboEdited(const QString & edit) {
317 if( !edit.isEmpty() ) {
318 currentServerConfig = -1;
319 qDebug("comboedited");
320 }
321}
322
323void OpieFtp::connectorBtnToggled(bool On)
324{
325 if(On) {
326 connector();
327 } else {
328 disConnector();
329 }
330
331}
332
333void OpieFtp::connector()
334{
335 QCopEnvelope ( "QPE/System", "busy()" );
336 qApp->processEvents();
337 currentRemoteDir=remotePath->text();
338 if(ServerComboBox->currentText().isEmpty()) {
339 QMessageBox::warning(this,tr("Ftp"),tr("Please set the server info"),tr("Ok"),0,0);
340 TabWidget->setCurrentPage(2);
341 ServerComboBox->setFocus();
342 connectServerBtn->setOn(FALSE);
343 connectServerBtn->setText( tr("Connect"));
344 return;
345 }
346 FtpInit();
347 TabWidget->setCurrentPage(1);
348 QString ftp_host = ServerComboBox->currentText();
349 QString ftp_user = UsernameComboBox->currentText();
350 QString ftp_pass = PasswordEdit->text();
351 QString port=PortSpinBox->cleanText();
352 port.stripWhiteSpace();
353
354 if(ftp_host.find("ftp://",0, TRUE) != -1 )
355 ftp_host=ftp_host.right(ftp_host.length()-6);
356 ftp_host+=":"+port;
357 if (!FtpConnect( ftp_host.latin1(), &conn)) {
358 QMessageBox::message(tr("Note"),tr("Unable to connect to\n")+ftp_host);
359 connectServerBtn->setOn(FALSE);
360 connectServerBtn->setText( tr("Connect"));
361 return ;
362 }
363 if (!FtpLogin( ftp_user.latin1(), ftp_pass.latin1(),conn )) {
364 QString msg;
365 msg.sprintf(tr("Unable to log in\n")+"%s",FtpLastResponse(conn));
366 msg.replace(QRegExp(":"),"\n");
367 QMessageBox::message(tr("Note"),msg);
368 if(conn)
369 FtpQuit(conn);
370 connectServerBtn->setOn(FALSE);
371 connectServerBtn->setText( tr("Connect"));
372 return ;
373 }
374 remoteDirList("/") ;
375 setCaption(ftp_host);
376 writeConfig();
377 connectServerBtn->setText( tr("Disconnect"));
378 QCopEnvelope ( "QPE/System", "notBusy()" );
379}
380
381void OpieFtp::disConnector()
382{
383 if(conn)
384 FtpQuit(conn);
385 setCaption("OpieFtp");
386 currentRemoteDir="/";
387 Remote_View->clear();
388 connectServerBtn->setText( tr("Connect"));
389 connectServerBtn->setOn(FALSE);
390
391}
392
307void OpieFtp::localUpload() 393void OpieFtp::localUpload()
@@ -330,3 +416,2 @@ void OpieFtp::localUpload()
330 QMessageBox::message(tr("Note"),msg); 416 QMessageBox::message(tr("Note"),msg);
331// FtpQuit(conn);
332 } 417 }
@@ -382,3 +467,2 @@ void OpieFtp::remoteDownload()
382 QMessageBox::message(tr("Note"),msg); 467 QMessageBox::message(tr("Note"),msg);
383// FtpQuit(conn);
384 } 468 }
@@ -391,62 +475,2 @@ void OpieFtp::remoteDownload()
391 475
392
393void OpieFtp::newConnection()
394{
395 UsernameComboBox->lineEdit()->setText("");
396 PasswordEdit->setText( "" );
397 ServerComboBox->lineEdit()->setText( "");
398 remotePath->setText( currentRemoteDir = "/");
399 PortSpinBox->setValue( 21);
400 TabWidget->setCurrentPage(2);
401
402}
403
404void OpieFtp::connector()
405{
406 QCopEnvelope ( "QPE/System", "busy()" );
407 qApp->processEvents();
408 currentRemoteDir=remotePath->text();
409 if(ServerComboBox->currentText().isEmpty()) {
410 QMessageBox::warning(this,tr("Ftp"),tr("Please set the server info"),tr("Ok"),0,0);
411 TabWidget->setCurrentPage(2);
412 ServerComboBox->setFocus();
413 return;
414 }
415 FtpInit();
416 TabWidget->setCurrentPage(1);
417 QString ftp_host = ServerComboBox->currentText();
418 QString ftp_user = UsernameComboBox->currentText();
419 QString ftp_pass = PasswordEdit->text();
420 QString port=PortSpinBox->cleanText();
421 port.stripWhiteSpace();
422
423 if(ftp_host.find("ftp://",0, TRUE) != -1 )
424 ftp_host=ftp_host.right(ftp_host.length()-6);
425 ftp_host+=":"+port;
426 if (!FtpConnect( ftp_host.latin1(), &conn)) {
427 QMessageBox::message(tr("Note"),tr("Unable to connect to\n")+ftp_host);
428 return ;
429 }
430 if (!FtpLogin( ftp_user.latin1(), ftp_pass.latin1(),conn )) {
431 QString msg;
432 msg.sprintf(tr("Unable to log in\n")+"%s",FtpLastResponse(conn));
433 msg.replace(QRegExp(":"),"\n");
434 QMessageBox::message(tr("Note"),msg);
435 FtpQuit(conn);
436 return ;
437 }
438 remoteDirList("/") ;
439 setCaption(ftp_host);
440 writeConfig();
441 QCopEnvelope ( "QPE/System", "notBusy()" );
442}
443
444void OpieFtp::disConnector()
445{
446 FtpQuit(conn);
447 setCaption("OpieFtp");
448 currentRemoteDir="/";
449 Remote_View->clear();
450}
451
452bool OpieFtp::remoteDirList(const QString &dir) 476bool OpieFtp::remoteDirList(const QString &dir)
@@ -465,3 +489,2 @@ bool OpieFtp::remoteDirList(const QString &dir)
465 QMessageBox::message(tr("Note"),msg); 489 QMessageBox::message(tr("Note"),msg);
466// FtpQuit(conn);
467 return false; 490 return false;
@@ -482,3 +505,2 @@ bool OpieFtp::remoteChDir(const QString &dir)
482 qDebug(msg); 505 qDebug(msg);
483// FtpQuit(conn);
484 QCopEnvelope ( "QPE/System", "notBusy()" ); 506 QCopEnvelope ( "QPE/System", "notBusy()" );
@@ -583,3 +605,3 @@ bool OpieFtp::populateRemoteView( )
583 Remote_View->setSorting( 4,TRUE); 605 Remote_View->setSorting( 4,TRUE);
584 606
585 return true; 607 return true;
@@ -788,3 +810,3 @@ void OpieFtp::localDelete()
788 break; 810 break;
789 case 1: 811 case 1:
790 // exit 812 // exit
@@ -847,3 +869,3 @@ void OpieFtp::remoteDelete()
847 remoteDirList( (const QString &)currentRemoteDir); //this also calls populate 869 remoteDirList( (const QString &)currentRemoteDir); //this also calls populate
848 870
849 } 871 }
@@ -950,3 +972,4 @@ void OpieFtp::switchToConfigTab()
950 972
951void OpieFtp::readConfig() { 973void OpieFtp::readConfig()
974{
952 975
@@ -975,8 +998,7 @@ void OpieFtp::readConfig() {
975 PasswordEdit->setText(password); 998 PasswordEdit->setText(password);
976
977 } 999 }
978
979} 1000}
980 1001
981void OpieFtp::writeConfig() { 1002void OpieFtp::writeConfig()
1003{
982 1004
@@ -984,4 +1006,12 @@ void OpieFtp::writeConfig() {
984 cfg.setGroup("Server"); 1006 cfg.setGroup("Server");
985 QString temp; 1007 QString username, remoteServerStr, remotePathStr, password, port, temp;
986 int numberOfEntries = cfg.readNumEntry("numberOfEntries",0); 1008 int numberOfEntries = cfg.readNumEntry("numberOfEntries",0);
1009 if( currentServerConfig == -1) {
1010
1011 temp.setNum( numberOfEntries + 1);
1012 cfg.setGroup("Server");
1013 remoteServerStr = cfg.readEntry( temp,"");
1014 int divider = remoteServerStr.length() - remoteServerStr.find(":",0,TRUE);
1015 remoteServerStr = remoteServerStr.left(remoteServerStr.length()-divider);
1016
987 temp.setNum(numberOfEntries+1); 1017 temp.setNum(numberOfEntries+1);
@@ -995,7 +1025,9 @@ void OpieFtp::writeConfig() {
995 cfg.writeEntry("numberOfEntries", QString::number(numberOfEntries + 1 )); 1025 cfg.writeEntry("numberOfEntries", QString::number(numberOfEntries + 1 ));
996 1026
1027 }
997} 1028}
998 1029
999void OpieFtp::fillCombos() { 1030void OpieFtp::fillCombos()
1000 Config cfg("opieftp"); 1031{
1032 Config cfg("opieftp");
1001 cfg.setGroup("Server"); 1033 cfg.setGroup("Server");
@@ -1028,5 +1060,3 @@ void OpieFtp::fillCombos() {
1028// PasswordEdit->setText(password); 1060// PasswordEdit->setText(password);
1029
1030 } 1061 }
1031
1032} 1062}
@@ -1034,4 +1064,5 @@ void OpieFtp::fillCombos() {
1034 1064
1035void OpieFtp::serverComboSelected(int index) { 1065void OpieFtp::serverComboSelected(int index)
1036 1066{
1067 currentServerConfig = index;
1037 QString username, remoteServerStr, remotePathStr, password, port, temp; 1068 QString username, remoteServerStr, remotePathStr, password, port, temp;
@@ -1042,22 +1073,20 @@ void OpieFtp::serverComboSelected(int index) {
1042 1073
1043// for (int i = 0; i <= numberOfEntries; i++) { 1074 temp.setNum(index+1);
1044 temp.setNum(index+1); 1075 remoteServerStr = cfg.readEntry( temp,"");
1045 remoteServerStr = cfg.readEntry( temp,""); 1076 cfg.setGroup(temp);
1046 // if( remoteServerStr.find( ServerComboBox->text(index),0,TRUE) != -1 ) { 1077 qDebug(temp);
1047 cfg.setGroup(temp); 1078 int divider = remoteServerStr.length() - remoteServerStr.find(":",0,TRUE);
1048 qDebug(temp); 1079 port = remoteServerStr.right( divider - 1);
1049 int divider = remoteServerStr.length() - remoteServerStr.find(":",0,TRUE); 1080 bool ok;
1050 port = remoteServerStr.right( divider - 1); 1081 int portInt = port.toInt(&ok,10);
1051 bool ok; 1082 if( portInt == 0) portInt = 21;
1052 PortSpinBox->setValue( port.toInt(&ok,10));
1053 1083
1054 remotePath->setText(cfg.readEntry("RemotePath", "")); 1084 PortSpinBox->setValue( portInt);
1055 username = cfg.readEntry("Username", "");
1056 UsernameComboBox->lineEdit()->setText(username);
1057 PasswordEdit->setText(cfg.readEntryCrypt(username, ""));
1058 1085
1059// } 1086 remotePath->setText(cfg.readEntry("RemotePath", "/"));
1060 1087
1061 // } 1088 username = cfg.readEntry("Username", "anonymous");
1062 update(); 1089 UsernameComboBox->lineEdit()->setText(username);
1090 PasswordEdit->setText(cfg.readEntryCrypt(username, "me@opieftp.org"));
1091 update();
1063} 1092}
@@ -1069,4 +1098,19 @@ void OpieFtp::serverComboSelected(int index) {
1069 1098
1070void OpieFtp::deleteServer() { 1099void OpieFtp::deleteServer()
1071 1100{
1101 QString username, remoteServerStr, remotePathStr, password, port, temp;
1102 remoteServerStr = ServerComboBox->currentText( );
1103 username = UsernameComboBox->currentText();
1104 Config cfg("opieftp");
1105 cfg.setGroup("Server");
1106 int numberOfEntries = cfg.readNumEntry("numberOfEntries",0);
1107 for (int i = 0; i <= numberOfEntries; i++) {
1108 temp.setNum(i+1);
1109 cfg.setGroup("Server");
1110 if( cfg.readEntry( temp,"").find( remoteServerStr,0,TRUE) != -1
1111 && cfg.readEntry(temp).find(username,0,TRUE) != -1
1112 && !remoteServerStr.isEmpty()) {
1113 qDebug(temp);
1114 }
1115 }
1072} 1116}
diff --git a/noncore/net/opieftp/opieftp.h b/noncore/net/opieftp/opieftp.h
index c88a15b..52ed885 100644
--- a/noncore/net/opieftp/opieftp.h
+++ b/noncore/net/opieftp/opieftp.h
@@ -38,5 +38,6 @@ class QListViewItem;
38class QLineEdit; 38class QLineEdit;
39class QPushButton;
39 40
40class OpieFtp : public QMainWindow 41class OpieFtp : public QMainWindow
41{ 42{
42 Q_OBJECT 43 Q_OBJECT
@@ -60,5 +61,7 @@ public:
60 QListViewItem * item; 61 QListViewItem * item;
62 QPushButton *connectServerBtn;
61 bool b; 63 bool b;
62 64 int currentServerConfig;
63protected slots: 65protected slots:
66 void serverComboEdited(const QString & );
64 void showLocalMenu( QListViewItem *); 67 void showLocalMenu( QListViewItem *);
@@ -98,3 +101,3 @@ protected slots:
98 void deleteServer(); 101 void deleteServer();
99 102 void connectorBtnToggled(bool);
100protected: 103protected: