Menu
▾
▴
phpeselgui-developer
|
From: Manfred S. <man...@gm...> - 2003-02-21 13:21:24
Attachments:
config.diff
functions.diff
|
i've done it... this mail including config.diff and functions.diff "... It can be applied against the current CVS-Version without problems To apply the patch, copy your CVS-Directory and change to the new directory, then execute: ..." ©2003 by Roman :) patch -p1 < /path/to/functions.diff patch -p1 < /path/to/config.diff good luck! :) |
|
From: Sven W. <eM...@Sv...> - 2003-02-22 10:14:46
|
I'm unable to apply this functions.inc-patch :-(
***
nobody@server:/opt/httpd/htdocs/phpEselGui > patch -l -p1
</tmp/functions.diff
patching file functions.inc
Hunk #1 FAILED at 258.
Hunk #2 FAILED at 335.
Hunk #3 FAILED at 368.
Hunk #4 FAILED at 415.
Hunk #5 FAILED at 439.
Hunk #6 FAILED at 503.
6 out of 6 hunks FAILED -- saving rejects to file functions.inc.rej
nobody@server:/opt/httpd/htdocs/phpEselGui >
***
I tried patch -l -p1 and i tried to "fix" the patch with vi, both didn't
work (the config-patch works...)
help...
Sven
Manfred Stellenberg schrieb:
> i've done it...
> this mail including
> config.diff and functions.diff
>
> "...
> It can be applied against the current CVS-Version without problems
> To apply the patch, copy your CVS-Directory and change to the new
> directory, then execute:
> ..." ©2003 by Roman :)
>
> patch -p1 < /path/to/functions.diff
> patch -p1 < /path/to/config.diff
>
> good luck! :)
>
>
> ------------------------------------------------------------------------
>
> --- phpEselGui/config.inc Wed Feb 19 10:50:53 2003
> +++ phpEselGui2/config.inc Fri Feb 21 13:54:44 2003
> @@ -34,6 +34,9 @@
> var $debugFile="controller.log";
>
> var $showPasswords = FALSE;
> +
> + // Show Statusbar and chunks for each download?
> + var $showStatusChunk = TRUE;
> }
> $conf = new Config();
>
>
>
> ------------------------------------------------------------------------
>
> --- phpEselGui/functions.inc Wed Feb 19 10:50:53 2003 +++
> phpEselGui2/functions.inc Fri Feb 21 14:17:19 2003 @@ -258,7 +258,7 @@
> $order="DESC"; } ?> -
> +
>
> vdNr; ?> <<?php echo $PHP_SELF; ?>?vd=TRUE&sortKey=nr&order=ASC> @@
> -335,34 +335,27 @@ } if ($color > 0) { echo "
> \n"; + $trclass = "list1"; } else { echo "
> \n"; + $trclass = "list2"; } - echo " \n"; + echo " \n"; echo "
> $value[nr]\n"; echo " \n"; echo " \n"; - echo " "; - /*echo "
> \n"; - echo " theme."/percentback.gif\" style=\"width:$value[prozent]%;
> height:100%; position:absolute; left:0px; z-index:1;\">\n"; - echo "
> \n";*/ - echo " ".htmlentities($value[name])."\n"; - /* echo " \n"; -
> echo "
> \n";*/ - echo " \n"; - /*echo " \n"; - echo " $value[prozent]\n"; - echo
> " \n";*/ + echo " ".htmlentities($value[name])."\n"; + echo " \n"; echo
> " \n"; echo " $value[fertig]\n"; echo " \n"; echo " \n"; echo "
> $value[gesamt]\n"; echo " \n"; - echo " \n"; + echo " \n"; echo "
> $value[old]\n"; echo " \n"; - echo " \n"; + echo " \n"; if
> ($value['speed'] == -1) { echo " Pause\n"; } else { @@ -375,7 +368,7 @@
> echo " \n"; echo " $value[est]\n"; echo " \n"; - echo " \n"; + echo "
> \n"; echo " $value[network]\n"; echo " \n"; @@ -422,13 +415,22 @@ \n"; -
> echo "
> \n"; - echo " $value[prozent]%\n"; - echo " \n"; - echo "
> theme."/percentback.gif\" alt=\"$value[prozent]%\"
> width=\"$value[prozent]%\" height=\"6pt\">\n"; - echo " \n"; - echo "
> 100%\n"; - echo "
> \n"; + if ($conf->showStatusChunk) { + echo " \n"; + echo "
> $value[prozent]%\n"; + echo " \n"; + echo "
> \n"; + echo " \n"; + echo " theme."/percentback.gif\"
> alt=\"$value[prozent]%\" title=\"$value[prozent]%\"
> width=\"$value[prozent]%\" height=\"6pt\" border=\"0\">\n"; + echo "
> <\$PHP_SELF?vd=TRUE&sortKey=prozent&order=DESC\>\n"; + echo "
>
> \n"; + echo " \n"; + echo " 100%\n"; + echo " \n"; +
> getChunks2($conf->host, $conf->port, $value['nr']); + echo " \n"; + echo "
> \n"; + } } ?>
>
> @@ -437,7 +439,7 @@ echo "
> \n\n"; echo " \n*$loc->sumSpeed: ".$geschwindigkeit."KB/s*\n\n"; echo "
> \n*".size2human($allmbready)." $loc->ofAllmb ".size2human($allmb)."
> $loc->readyAllmb*\n\n"; - echo "
> \n\n \ntheme."/percentback.gif\" height=\"12pt\"
> width=\"".$allmbready*100/$allmb."%\">\n\n
> \n
>
> \n"; + echo "\n\n\ntheme."/percentback.gif\" height=\"12pt\"
> width=\"".$allmbready*100/$allmb."%\"
> alt=\"".floor($allmbready*100/$allmb)."%\">\n\n\n\n"; ?> DEBUG) writeLog
> ("Starting getChunks (\"$host\", \"$port\", \"$nr\")"); + if
> ($conf->DEBUG) writeLog ("Opening telnet-client"); +
> $fh=fsockopen($host, $port); + if ($conf->DEBUG) writeLog
> ("telnet-client has been opened"); + if ($conf->DEBUG) writeLog
> ("Starting vd $nr"); + fputs ($fh, "auth $conf->password\nvd $nr\nq\n");
> + while (!feof($fh)) { + $temp[0]=fgets($fh, 4096); + if ($conf->DEBUG)
> writeLog ("donkey-response: \"$temp\""); + if (ereg("^\[", $temp[0]) &&
> !ereg("^\[ Num", $temp[0])) { + if ($conf->DEBUG) writeLog ("identified
> name, size an co"); + $det=getFinished($temp); + break; + } + } +
> $server = 0; + while (!feof($fh)) { + $temp=fgets($fh, 4096); +
> if(ereg("^Chunks", $temp)) { + if ($conf->DEBUG) writeLog ("identified
> Chunks"); + break; + } + } + $chunks=$temp; + if ($conf->DEBUG) writeLog
> ("donkey-response: \"$chunks\""); + echo "
> \n"; + $i = 0; + $tdwidth = 100 / (strlen($chunks) -10); + while ($i <
> strlen($chunks)) { + if ($chunks[$i] == "0" || $chunks[$i] == "1") { +
> switch($chunks[$i]) { + case "1": + $color="#B6C7B6"; + $alt = "this
> chunk is ready..."; + break; + case "0"; + $color=""; + $alt = "this
> chunk is needed ..."; + } + echo " [\$alt\] \n"; + } + $i += 1; + } + echo "
>
> \n"; + } + function getChunks($host, $port, $nr) { global $conf; global
> $loc;
|
|
From: Manfred S. <man...@gm...> - 2003-02-22 12:02:49
|
> I tried patch -l -p1 and i tried to "fix" the patch with vi, both > didn't work (the config-patch works...) > > help... hm, thats bad... roman, did u have an answer?? |
|
From: Roman K. <rom...@ep...> - 2003-02-22 22:11:50
|
-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 On Sat, 22 Feb 2003 13:03:55 +0100 Manfred Stellenberg <man...@gm...> wrote: > > I tried patch -l -p1 and i tried to "fix" the patch with vi, both > > didn't work (the config-patch works...) > > > > help... > > hm, thats bad... > > roman, did u have an answer?? Sorry, i haven't had the time (and the motivation) to try the patch yet, i'll promise you, to try it tomorrow... But i've seen you made several patchfile for one patch? what that... try it this way: 1. checkout source from cvs 2. COPY Source to another directory, eg. "cp phpeselgui phpeselgui.unchanged" 3. Apply changes in the directory "phpeselgui" 4. go 1 directory up (to the directory which contains the directories "phpeselgui" and "phpeselgui.unchanged" 5. execute "diff -u -N -r phpeselgui.unchanged phpeselgui > patch.diff" 6. Submit this patchfile... it should work... i made all my patchfiles this way ;) oh... if you made MANY changes, you could also do: diff -u -N -r phpeselgui.unchanged phpeselgui | gzip -c > patch.diff.gz Regards, Roman - --- The statement below is false The statement above is true -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.1 (GNU/Linux) iD8DBQE+V/WzkwLEKBhi12ARAlVKAJ0SRedVNT4aRP7WvxinqXk+D5xUSwCdHC1t 42J7lyAcx0HjDe9V/l49clY= =Jfff -----END PGP SIGNATURE----- |
|
From: Sven W. <eM...@Sv...> - 2003-02-23 10:22:40
|
am i thinking correct that the new theme mentioned in the other posting makes these patches outdated...!? And thanks for the docs about building a patch, never done this before... Roman Kreisel schrieb: > On Sat, 22 Feb 2003 13:03:55 +0100 > Manfred Stellenberg <man...@gm...> wrote: > > >>>I tried patch -l -p1 and i tried to "fix" the patch with vi, both >>>didn't work (the config-patch works...) >>> >>>help... >> >>hm, thats bad... >> >>roman, did u have an answer?? > > Sorry, i haven't had the time (and the motivation) to try the patch yet, > i'll promise you, to try it tomorrow... > > But i've seen you made several patchfile for one patch? what that... try > it this way: > > 1. checkout source from cvs > 2. COPY Source to another directory, eg. "cp phpeselgui > phpeselgui.unchanged" > 3. Apply changes in the directory "phpeselgui" > 4. go 1 directory up (to the directory which contains the directories > "phpeselgui" and "phpeselgui.unchanged" > 5. execute "diff -u -N -r phpeselgui.unchanged phpeselgui > patch.diff" > 6. Submit this patchfile... it should work... i made all my patchfiles > this way ;) > > oh... if you made MANY changes, you could also do: > > diff -u -N -r phpeselgui.unchanged phpeselgui | gzip -c > patch.diff.gz > > > > > Regards, > Roman > > --- > > The statement below is false > The statement above is true fascinating... > > > ------------------------------------------------------- This SF.net email is sponsored by: SlickEdit Inc. Develop an edge. The most comprehensive and flexible code editor you can use. Code faster. C/C++, C#, Java, HTML, XML, many more. FREE 30-Day Trial. www.slickedit.com/sourceforge _______________________________________________ Phpeselgui-developer mailing list Php...@li... https://lists.sourceforge.net/lists/listinfo/phpeselgui-developer |
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X