Permalink
Browse files

version 2.0 release, fix bug with not all passwords being exported

  • Loading branch information...
1 parent d07822c commit 6421afafe4732bad1716040a6413bab6d5c54db3 @mimecuvalo committed Nov 26, 2011
View
Binary file not shown.
View
Binary file not shown.
View
@@ -4,6 +4,6 @@
`FireFTP` has a dependency on the [paramikojs](https://github.com/mimecuvalo/paramikojs) library so it's a couple more steps than just cloning.
- git clone https://github.com/mimecuvalo/fireftp.git
+ git clone git://github.com/mimecuvalo/fireftp.git
git submodule init
git submodule update
View
@@ -1,8 +1,8 @@
#!/bin/bash
-FIREFTP_VER=1.99.7
+FIREFTP_VER=2.0
FIREFTP_MIN=4.0b1
-FIREFTP_MAX=8.*
+FIREFTP_MAX=9.*
FIREFTP_MASTER=0
FIREFTP_DEBUG=0
@@ -6,7 +6,7 @@ function connect(noAccountChange, showPassDialog) {
gStatusBarClear = false;
for (var x = 0; x < gMaxCon; ++x) {
- gConnections[x].host = gConnections[x].host.replace(/^ftp:\/*/, ''); // error checking - get rid of 'ftp://'
+ gConnections[x].host = gConnections[x].host.replace(/^ftp:\/*/i, ''); // error checking - get rid of 'ftp://'
if (gConnections[x].host && gConnections[x].host.charAt(gConnections[x].host.length - 1) == '/') {
gConnections[x].host = gConnections[x].host.substring(0, gConnections[x].host.length - 1);
@@ -1,6 +1,6 @@
var gConnections = []; // array of all our ftp connections
var gConnection; // the main connection - where the magic happens
-var gVersion = "1.99.7"; // version of FireFTP we're using
+var gVersion = "2.0"; // version of FireFTP we're using
var gSlash; // holds '/' or '\\' depending on local system
var gPlatform; // holds what platform we're on
var gTransferTypes; // holds 'Auto', 'Binary', 'ASCII'
@@ -85,11 +85,11 @@ function startup() {
localDirTree.changeDir(gLocalPath.value);
loadPrograms();
- var trht = 'http://www.youtube.com/watch?v=Uh_8j8k39y0';
+ var trht = 'http://www.youtube.com/watch?v=ekCvBztYs_A';
appendLog("<span id='opening' style='line-height:16px'><span style='cursor:pointer;text-decoration:underline;color:blue;' onclick=\"window.open('http://fireftp.mozdev.org/donate.html','FireFTP');\">"
+ "FireFTP</span> <span>" + gVersion
+ " '</span><span style='cursor:pointer;text-decoration:underline;' onclick=\"window.open('" + trht + "','trht');\">"
- + "Young Folks</span>'"
+ + "Nature Boy</span>'"
//+ " <img style='cursor:pointer;text-decoration:underline;' onclick=\"window.open('"
//+ trht + "','trht');\" src='chrome://fireftp/skin/icons/trht.png'/>"
+ " " + gStrbundle.getString("opening")
@@ -555,7 +555,7 @@ function loadSiteManager(pruneTemp, importFile) { // read gSiteManag
key = key ? key : "";
var cipher = cipherType == "arc4" ? new crypto.cipher.ARC4(key) : new crypto.cipher.Blowfish(key, 2, "");
- if (cipher.decrypt(tempSiteManager[x].password) != "check123") {
+ if (cipher.decrypt(tempSiteManager[x].password).replace(/\0/g, '') != "check123") {
error(gStrbundle.getString("badPassword"));
sstream.close();
fstream.close();
@@ -615,7 +615,7 @@ function loadSiteManager(pruneTemp, importFile) { // read gSiteManag
if (passCheck) {
var cipher = cipherType == "arc4" ? new crypto.cipher.ARC4(key) : new crypto.cipher.Blowfish(key, 2, "");
- tempSiteManager[x].password = cipher.decrypt(tempSiteManager[x].password);
+ tempSiteManager[x].password = cipher.decrypt(tempSiteManager[x].password).replace(/\0/g, '');
try {
tempSiteManager[x].password = toUTF8.convertStringToUTF8(tempSiteManager[x].password, "UTF-8", 1);
View
@@ -10,7 +10,7 @@
<em:description>FTP client for Mozilla Firefox.</em:description>
<em:homepageURL>http://fireftp.mozdev.org</em:homepageURL>
<em:name>FireFTP</em:name>
- <em:version>1.99.7</em:version>
+ <em:version>2.0</em:version>
<em:id>{a7c6cf7f-112c-4500-a7ea-39801a327e5f}</em:id>
<em:file>
<Description about="urn:mozilla:extension:file:fireftp.jar">
@@ -83,7 +83,7 @@
<Description>
<em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id>
<em:minVersion>4.0b1</em:minVersion>
- <em:maxVersion>8.*</em:maxVersion>
+ <em:maxVersion>9.*</em:maxVersion>
</Description>
</em:targetApplication>
<em:optionsURL>chrome://fireftp/content/preferences.xul</em:optionsURL>
View
@@ -36,7 +36,6 @@
<a href="http://downloads.mozdev.org/fireftp/fireftp_all.xpi">Čeština</a><br/>
<a href="http://downloads.mozdev.org/fireftp/fireftp_all.xpi">Dansk</a><br/>
<a href="http://downloads.mozdev.org/fireftp/fireftp_all.xpi">Deutsch</a><br/>
- <a href="http://downloads.mozdev.org/fireftp/fireftp_all.xpi">Deutsch (Hornjoserbšćina)</a><br/>
<a href="http://downloads.mozdev.org/fireftp/fireftp_all.xpi">Ελληνικά</a><br/>
<a href="http://downloads.mozdev.org/fireftp/fireftp_all.xpi">English</a><br/>
<a href="http://downloads.mozdev.org/fireftp/fireftp_all.xpi">Esperanto</a><br/>
@@ -46,12 +45,13 @@
<a href="http://downloads.mozdev.org/fireftp/fireftp_all.xpi">Français</a><br/>
<a href="http://downloads.mozdev.org/fireftp/fireftp_all.xpi">Gaeilge</a><br/>-->
<a href="http://downloads.mozdev.org/fireftp/fireftp_all.xpi">Galego</a><br/>
+ <a href="http://downloads.mozdev.org/fireftp/fireftp_all.xpi">Hornjoserbšćina</a><br/>
<a href="http://downloads.mozdev.org/fireftp/fireftp_all.xpi">Hrvatski</a><br/>
<!--<a href="http://downloads.mozdev.org/fireftp/fireftp_all.xpi">Bahasa Indonesia</a><br/>-->
<a href="http://downloads.mozdev.org/fireftp/fireftp_all.xpi">Italiano</a><br/>
- <!--<a href="http://downloads.mozdev.org/fireftp/fireftp_all.xpi">Lietuvių kalba</a><br/>
+ <!--<a href="http://downloads.mozdev.org/fireftp/fireftp_all.xpi">Lietuvių kalba</a><br/>-->
<a href="http://downloads.mozdev.org/fireftp/fireftp_all.xpi">Magyar</a><br/>
- <a href="http://downloads.mozdev.org/fireftp/fireftp_all.xpi">Norsk bokmål</a><br/>-->
+ <!--<a href="http://downloads.mozdev.org/fireftp/fireftp_all.xpi">Norsk bokmål</a><br/>-->
<a href="http://downloads.mozdev.org/fireftp/fireftp_all.xpi">Nederlands</a><br/>
<a href="http://downloads.mozdev.org/fireftp/fireftp_all.xpi">Polski</a><br/>
<a href="http://downloads.mozdev.org/fireftp/fireftp_all.xpi">Português</a><br/>
View
@@ -76,6 +76,19 @@
<h1>Developer Information</h1>
<div class="smaller">
+ <h2>release notes 2.0</h2>
+
+ version 2.0 <a href="http://www.youtube.com/watch?v=ekCvBztYs_A">'nature boy'</a> (November 26th, 2011) - firefox 4+ only<br/><br/>
+
+ <b>what's new/changes</b><br/>
+ not much difference from 1.99 actually - the relatively new SSH module (written natively in javascript) needed time before it felt stable enough for a 2.0 release<br/><br/>
+ fixed more utf8 issues<br/>
+ fixed bug when exporting not all passwords saved<br/>
+ </div>
+
+ <div class="padded hr"><hr /></div>
+
+ <div class="smaller">
<h2>release notes 1.99</h2>
version 1.99 <a href="http://www.youtube.com/watch?v=Uh_8j8k39y0">'young folks'</a> (March 6th, 2011) - firefox 4+ only<br/><br/>
View
@@ -63,7 +63,7 @@
<noscript id="download-link">
<div>
<h1><a href="https://addons.mozilla.org/firefox/downloads/latest/fireftp"><b>Download FireFTP</b></a></h1>
- <span class="smaller">1.99.7, English (300kb)</span><br/>
+ <span class="smaller">2.0, English (300kb)</span><br/>
<a class="smaller" href="features.html">Learn More</a> - <a class="smaller" href="all.html">Other Languages and Versions</a>
</div>
</noscript>
View
@@ -5,21 +5,21 @@
<RDF:Description about="urn:mozilla:extension:{a7c6cf7f-112c-4500-a7ea-39801a327e5f}">
<em:updates>
<RDF:Seq>
- <RDF:li resource="urn:mozilla:extension:{a7c6cf7f-112c-4500-a7ea-39801a327e5f}:1.99.7"/>
+ <RDF:li resource="urn:mozilla:extension:{a7c6cf7f-112c-4500-a7ea-39801a327e5f}:2.0"/>
</RDF:Seq>
</em:updates>
</RDF:Description>
- <RDF:Description about="urn:mozilla:extension:{a7c6cf7f-112c-4500-a7ea-39801a327e5f}:1.99.7">
- <em:version>1.99.7</em:version>
+ <RDF:Description about="urn:mozilla:extension:{a7c6cf7f-112c-4500-a7ea-39801a327e5f}:2.0">
+ <em:version>2.0</em:version>
<em:targetApplication>
<Description>
<em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id>
<em:minVersion>4.0b1</em:minVersion>
- <em:maxVersion>8.*</em:maxVersion>
+ <em:maxVersion>9.*</em:maxVersion>
<em:updateLink>https://addons.mozilla.org/firefox/downloads/latest/684</em:updateLink>
<em:updateHash>
- md5:5a0b520800417d85fff3728d4a768348
+ md5:d58a0670b4ee18f82e94b082bdfb79ff
</em:updateHash>
</Description>
</em:targetApplication>
View
@@ -2,22 +2,22 @@
<RDF:RDF xmlns:em="http://www.mozilla.org/2004/em-rdf#"
xmlns:NC="http://home.netscape.com/NC-rdf#"
xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
- <RDF:Description RDF:about="urn:mozilla:extension:{a7c6cf7f-112c-4500-a7ea-39801a327e5f}"
- em:signature="MIGTMA0GCSqGSIb3DQEBDQUAA4GBAC4D1k6A7WWSkm49Tc8eFbzGCHeW4cOg39wCsrsGzqondNBe2hmgN4F8I1wzWoqSh21hBjZj47qPzsTNf4F4fEQB1aPAW3MVUUJVGogH7La6V4laVEn+5TlWCa9gz/ZBpwHlyXvHCku6aZ6nt1KfSMHqWzuLlQjU4k9E3cfirkBQ">
- <em:updates RDF:resource="rdf:#$fMc5C2"/>
- </RDF:Description>
- <RDF:Description RDF:about="urn:mozilla:extension:{a7c6cf7f-112c-4500-a7ea-39801a327e5f}:1.99.7"
- em:version="1.99.7"
- em:signature="MIGTMA0GCSqGSIb3DQEBDQUAA4GBAJ59p90IOoX173Fd4v2HkXNe2gyenVsQyRckvbIWKa5xew0PVSay+x/gkZxW7C428lBp4+BlOMizOz6VCBx3tgTpQh01F4xeiVWPtHJ3+bB5ujFM7Xs5bmXIMCpr7d1FN5d9sHQxhzbRCo+pexFSbIrbLNlNj3P599Dbbl3Il5M8">
- <em:targetApplication RDF:resource="rdf:#$iMc5C2"/>
+ <RDF:Description RDF:about="urn:mozilla:extension:{a7c6cf7f-112c-4500-a7ea-39801a327e5f}:2.0"
+ em:version="2.0"
+ em:signature="MIGTMA0GCSqGSIb3DQEBDQUAA4GBAJs4rwhhfUFlPd0MxfsxUwaoZg+lpLLX63QbWpTJRyUZ9UT3sylmD+eg0kwSc3pf//tSio2Zn4bdGdfy4q1S8C2x45qvYksEtC7/4VprJTPFklpbpfKQQd0unj6IlMVLIM8Q+qndEpxI7054oLcO8dnxsRW21Wdq/LtHGdsg2zxb">
+ <em:targetApplication RDF:resource="rdf:#$iqilq3"/>
</RDF:Description>
- <RDF:Seq RDF:about="rdf:#$fMc5C2">
- <RDF:li RDF:resource="urn:mozilla:extension:{a7c6cf7f-112c-4500-a7ea-39801a327e5f}:1.99.7"/>
+ <RDF:Seq RDF:about="rdf:#$fqilq3">
+ <RDF:li RDF:resource="urn:mozilla:extension:{a7c6cf7f-112c-4500-a7ea-39801a327e5f}:2.0"/>
</RDF:Seq>
- <Description RDF:about="rdf:#$iMc5C2"
+ <RDF:Description RDF:about="urn:mozilla:extension:{a7c6cf7f-112c-4500-a7ea-39801a327e5f}"
+ em:signature="MIGTMA0GCSqGSIb3DQEBDQUAA4GBAIYe4GLHoJrZFa83vRyf1wOsSlY9lkcMeFtFQcFjtqRwyFRb1AAJ9PglOtYqZi40rml5rfu6DWsJ09sAdu2NK22p0poFwcu7BRnk8n3t3WcduGv5H5XxQs3v9Kl2KcVAqOOkSGFXWOHHZw95BDmgNdLpXieGodnAHbE+S4yEh/RA">
+ <em:updates RDF:resource="rdf:#$fqilq3"/>
+ </RDF:Description>
+ <Description RDF:about="rdf:#$iqilq3"
em:id="{ec8030f7-c20a-464f-9b0e-13a3a9e97384}"
em:minVersion="4.0b1"
- em:maxVersion="8.*"
+ em:maxVersion="9.*"
em:updateLink="http://downloads.mozdev.org/fireftp/fireftp_all.xpi"
- em:updateHash="md5:c4388f71b03142d7ece72a81fa38ac9f" />
+ em:updateHash="md5:58086302b5ced56701069f0d21001f9f" />
</RDF:RDF>

0 comments on commit 6421afa

Please sign in to comment.