Menu
▾
▴
wackofork-developer — Developer List
You can subscribe to this list here.
| 2006 |
Jan
(1) |
Feb
(11) |
Mar
(53) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|---|
|
From: Sebastian D. <seb...@di...> - 2006-03-16 15:40:20
|
Zur Info: Der Bug in der vCard Action ist gefixed, kann also geupdated werden. Gruss Seebi -- http://sebastian.dietzold.de/ |
|
From: Lutz <li...@us...> - 2006-03-07 17:53:02
|
Hallo! Log-Nachrichten vom CVS werden ab sofort an=20 wac...@li... gesendet,=20 nicht mehr an diese Liste. Anmelden bei Bedarf unter https://lists.sourceforge.net/lists/listinfo/wackofork-cvslog Der Standardmodus f=FCr wackofork-cvslog ist=20 Digest. Wer will, kann das ja f=FCr sich umschalten ;-) Die neue Liste wird =FCbrigens nicht archiviert und=20 ist auch nicht public. Fand ich beides f=FCr blo=DFe=20 CVS-Benachrichtigung nicht sinnvoll. Gr=FC=DFe, -.Lutz.- |
|
From: Lutz <li...@us...> - 2006-03-06 19:58:49
|
At 18:48 06.03.2006, Seebi wrote: >> - CVS journal report (einer pro Tag) >Kannst du das bitte einrichten? Erwischt! Nee, kann ich nicht, weil ich nix wissen. Hab=20 grad mal nachgeguckt, aber dem cvs log nicht=20 beibringen k=F6nnen, nur die in einem Zeitraum=20 ge=E4nderten Revisionen auszuspucken. Ein Workaround w=E4re, die CVS-Reports in eine=20 andere Mailingliste umzubiegen, die dann jeder=20 nach belieben als Digest oder halt normal abonnieren kann. -.Lutz.- |
|
From: Sebastian D. <se...@us...> - 2006-03-06 19:06:42
|
quote Lutz I=DFler (6.3.2006): > ich f=E4nd's toll, wenn nicht CVS-Reports f=FCr jeden Commit jeder einzel= nen=20 > Datei in die Mailingliste gespammt w=FCrden ;-) > > Stattdessen vielleicht: > - CVS journal report (einer pro Tag) Da bin ich daf=FCr. Kannst du das bitte einrichten? S. |
|
From: Sebastian D. <se...@us...> - 2006-03-06 17:42:19
|
Update of /cvsroot/wackofork/wiki/themes/tmf/icons In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23049/themes/tmf/icons Added Files: rdf.gif Log Message: - Neuer RDF Link + RDF Image --- NEW FILE: rdf.gif --- (This appears to be a binary file; contents omitted.) |
|
From: Sebastian D. <se...@us...> - 2006-03-06 17:42:19
|
Update of /cvsroot/wackofork/wiki/themes/ontomed/icons In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23049/themes/ontomed/icons Added Files: rdf.gif Log Message: - Neuer RDF Link + RDF Image --- NEW FILE: rdf.gif --- (This appears to be a binary file; contents omitted.) |
|
From: Sebastian D. <se...@us...> - 2006-03-06 17:42:17
|
Update of /cvsroot/wackofork/wiki/themes/coffee/icons In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23049/themes/coffee/icons Added Files: rdf.gif Log Message: - Neuer RDF Link + RDF Image --- NEW FILE: rdf.gif --- (This appears to be a binary file; contents omitted.) |
|
From: Sebastian D. <se...@us...> - 2006-03-06 17:42:16
|
Update of /cvsroot/wackofork/wiki/themes/tabs/icons In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23049/themes/tabs/icons Added Files: rdf.gif Log Message: - Neuer RDF Link + RDF Image --- NEW FILE: rdf.gif --- (This appears to be a binary file; contents omitted.) |
|
From: Sebastian D. <se...@us...> - 2006-03-06 17:42:16
|
Update of /cvsroot/wackofork/wiki/themes/pro/icons In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23049/themes/pro/icons Added Files: rdf.gif Log Message: - Neuer RDF Link + RDF Image --- NEW FILE: rdf.gif --- (This appears to be a binary file; contents omitted.) |
|
From: Sebastian D. <se...@us...> - 2006-03-06 17:42:15
|
Update of /cvsroot/wackofork/wiki/lang In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23049/lang Modified Files: wakka.all.php wakka.de.php wakka.en.php Log Message: - Neuer RDF Link + RDF Image Index: wakka.en.php =================================================================== RCS file: /cvsroot/wackofork/wiki/lang/wakka.en.php,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** wakka.en.php 6 Mar 2006 01:03:06 -0000 1.3 --- wakka.en.php 6 Mar 2006 17:42:11 -0000 1.4 *************** *** 332,339 **** --- 332,342 ---- "fileicon" => '<img src="{theme}icons/file.gif" alt="" border="0" />', "pdficon" => '<img src="{theme}icons/pdf.gif" alt="PDF Document" border="0" />', + "rdficon" => '<img src="{theme}icons/rdf.gif" alt="RDF Document" border="0" />', "mailicon" => '<img src="{theme}icons/mail.gif" alt="" border="0" />', "lockicon" => '<img src="{theme}icons/lock.gif" align="middle" hspace="2" alt="Access denied" border="0" />', "keyicon" => '<img src="{theme}icons/key.gif" align="middle" hspace="2" alt="Page with custom access" border="0" />', "wantedicon" => '?', + + "FeedTitle" => "Feed Title", ); Index: wakka.de.php =================================================================== RCS file: /cvsroot/wackofork/wiki/lang/wakka.de.php,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** wakka.de.php 6 Mar 2006 01:03:06 -0000 1.5 --- wakka.de.php 6 Mar 2006 17:42:11 -0000 1.6 *************** *** 337,344 **** --- 337,348 ---- "fileicon" => '<img src="{theme}icons/file.gif" alt="" border="0" />', "pdficon" => '<img src="{theme}icons/pdf.gif" alt="PDF Dokument" border="0" />', + "rdficon" => '<img src="{theme}icons/rdf.gif" alt="RDF Dokument" border="0" />', "mailicon" => '<img src="{theme}icons/mail.gif" alt="" border="0" />', "lockicon" => '<img src="{theme}icons/lock.gif" alt="Zugriff verweigert" border="0" />', "keyicon" => '<img src="{theme}icons/key.gif" alt="Seite mit benutzerdefiniertem Zugriff" border="0" />', "wantedicon" => '?', + + "FeedTitle" => "Feed Titel", + "RDFLink" => "RDF Dokument", ); Index: wakka.all.php =================================================================== RCS file: /cvsroot/wackofork/wiki/lang/wakka.all.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** wakka.all.php 6 Mar 2006 01:03:06 -0000 1.2 --- wakka.all.php 6 Mar 2006 17:42:11 -0000 1.3 *************** *** 23,28 **** "tpl.interwiki" => '<a href="{url}" target="_blank" title="{title}" class="{class}">{icon}{text}</a>', "tpl.email" => '<a href="{url}" target="_blank" title="{title}" class="{class}">{icon}{text}</a>', ! "tpl.file" => '<a href="{url}" target="_blank" title="{title}" class="{class}">{icon}{text}</a>', ! "tpl.pdf" => '<a href="{url}" title="{title}" class="{class}">{icon}{text}</a>', "tpl.localfile" => '<a href="{url}" title="{title}" class="{class}">{icon}{text}</a>', "tpl.wlocalfile" => '<span class="missingpage" title="{title}">{text}</span>', --- 23,27 ---- "tpl.interwiki" => '<a href="{url}" target="_blank" title="{title}" class="{class}">{icon}{text}</a>', "tpl.email" => '<a href="{url}" target="_blank" title="{title}" class="{class}">{icon}{text}</a>', ! "tpl.file" => '<a href="{url}" title="{title}" class="{class}">{icon}{text}</a>', "tpl.localfile" => '<a href="{url}" title="{title}" class="{class}">{icon}{text}</a>', "tpl.wlocalfile" => '<span class="missingpage" title="{title}">{text}</span>', |
|
From: Sebastian D. <se...@us...> - 2006-03-06 17:42:15
|
Update of /cvsroot/wackofork/wiki/themes/imise/icons In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23049/themes/imise/icons Added Files: rdf.gif Log Message: - Neuer RDF Link + RDF Image --- NEW FILE: rdf.gif --- (This appears to be a binary file; contents omitted.) |
|
From: Sebastian D. <se...@us...> - 2006-03-06 17:42:15
|
Update of /cvsroot/wackofork/wiki/themes/default/icons In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23049/themes/default/icons Added Files: rdf.gif Log Message: - Neuer RDF Link + RDF Image --- NEW FILE: rdf.gif --- (This appears to be a binary file; contents omitted.) |
|
From: Sebastian D. <se...@us...> - 2006-03-06 17:42:14
|
Update of /cvsroot/wackofork/wiki/themes/bis/icons In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23049/themes/bis/icons Modified Files: web.gif Added Files: rdf.gif Log Message: - Neuer RDF Link + RDF Image --- NEW FILE: rdf.gif --- (This appears to be a binary file; contents omitted.) Index: web.gif =================================================================== RCS file: /cvsroot/wackofork/wiki/themes/bis/icons/web.gif,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Binary files /tmp/cvsmjbwKi and /tmp/cvsAf0s7o differ |
|
From: Sebastian D. <se...@us...> - 2006-03-06 17:42:14
|
Update of /cvsroot/wackofork/wiki/classes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23049/classes Modified Files: wacko.php Log Message: - Neuer RDF Link + RDF Image Index: wacko.php =================================================================== RCS file: /cvsroot/wackofork/wiki/classes/wacko.php,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** wacko.php 6 Mar 2006 11:26:24 -0000 1.13 --- wacko.php 6 Mar 2006 17:42:11 -0000 1.14 *************** *** 1127,1131 **** $title= $this->GetResourceValue("PDFLink"); $icon = $this->GetResourceValue("pdficon"); ! $tpl = "pdf"; } else if (preg_match("/^(http|https|ftp|file|nntp|telnet):\/\/([^\\s\"<>]+)$/", $tag)) { // this is a valid external URL --- 1127,1137 ---- $title= $this->GetResourceValue("PDFLink"); $icon = $this->GetResourceValue("pdficon"); ! $tpl = "file"; ! } else if (preg_match("/^(http|https|ftp|file):\/\/([^\\s\"<>]+)\.(rdf)$/", $tag)) { ! // this is a RDF link ! $url = str_replace("&", "&", str_replace("&", "&", $tag)); ! $title= $this->GetResourceValue("RDFLink"); ! $icon = $this->GetResourceValue("rdficon"); ! $tpl = "file"; } else if (preg_match("/^(http|https|ftp|file|nntp|telnet):\/\/([^\\s\"<>]+)$/", $tag)) { // this is a valid external URL |
|
From: Sebastian D. <se...@us...> - 2006-03-06 17:41:40
|
Update of /cvsroot/wackofork/wiki/themes/bis/css In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22657 Modified Files: all.css Log Message: - content image nun mit padding Index: all.css =================================================================== RCS file: /cvsroot/wackofork/wiki/themes/bis/css/all.css,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** all.css 6 Mar 2006 15:40:54 -0000 1.8 --- all.css 6 Mar 2006 17:41:36 -0000 1.9 *************** *** 19,23 **** } ! img { border: 0px; vertical-align: middle;} a { color:#0079c6; --- 19,27 ---- } ! img { ! border: 0px; ! vertical-align: middle; ! } ! a { color:#0079c6; *************** *** 42,45 **** --- 46,53 ---- */ + div.content img { + padding-right: 0.2em; + } + div.content h1 { font-size: 125%; |
|
From: Sebastian D. <se...@us...> - 2006-03-06 17:40:23
|
Update of /cvsroot/wackofork/wiki/actions In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22115 Modified Files: vcard.php Log Message: - std-link methode verwendet Index: vcard.php =================================================================== RCS file: /cvsroot/wackofork/wiki/actions/vcard.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** vcard.php 1 Mar 2006 17:04:50 -0000 1.2 --- vcard.php 6 Mar 2006 17:40:19 -0000 1.3 *************** *** 17,20 **** --- 17,22 ---- # the above three licenses. + # TODO: new VCard Class + # TODO: new LDAPServer Class ################################################################################ *************** *** 35,38 **** --- 37,41 ---- # Standart-Attribute-Ausgabe-Sets $user_card_set = array(array ("generate-postalAddress", "postalAddress"), "blankline", "generate-contact"); + #$user_card_set = array(array ("generate-postalAddress", "postalAddress"), "blankline", "generate-contact"); #$user_card01_set = array(array ("displayName", "cn"), "title", "telephoneNumber", "mail"); #$user_card03_set = array("generate-postalAddress", "blankline", "telephoneNumber", "facsimileTelephoneNumber", "blankline", "generate-mail", "generate-urls"); *************** *** 40,43 **** --- 43,47 ---- $GLOBALS['LDAP_CONFIG']=$LDAP_CONFIG; + $GLOBALS['wacko'] = $this; # outch!! *************** *** 176,183 **** --- 180,191 ---- ################################################################################ + # TODO: Alle Links durch wacko generieren lassen if (!function_exists('value2layout')) { function value2layout ($value, $type) { + # take the wacko object; + $wacko = $GLOBALS['wacko']; + # Falls kein Array übergeben wird, dann erschaffe einen if (!is_array($value)) $value[$type][0]=$value; *************** *** 212,219 **** return value2html($value[$type][0]); - case "mail": if (isset($value[$type][0])) ! return "<a href=\"mailto:". $value[$type][0] ."\">eMail</a><br>\n"; --- 220,227 ---- return value2html($value[$type][0]); case "mail": if (isset($value[$type][0])) ! return $wacko->Link("mailto:". $value[$type][0], "", "eMail", 1, 1); ! # return "<a href=\"mailto:". $value[$type][0] ."\">eMail</a><br>\n"; *************** *** 223,227 **** if ((isset($value['telephoneNumber'][0]))||(isset($value['facsimileTelephoneNumber'][0]))||(isset($value['mail'][0]))||(isset($value['homePhone'][0]))||(isset($value['mobile'][0]))) { ! $return.="<table cellpadding=0 cellspacing=0 border=0>"; if (isset($value['telephoneNumber'][0])) { --- 231,235 ---- if ((isset($value['telephoneNumber'][0]))||(isset($value['facsimileTelephoneNumber'][0]))||(isset($value['mail'][0]))||(isset($value['homePhone'][0]))||(isset($value['mobile'][0]))) { ! $return.="<table class='vCard'>"; if (isset($value['telephoneNumber'][0])) { *************** *** 254,258 **** if (isset($value['mail'][0])) { ! $return.="<a href=\"mailto:". $value['mail'][0] ."\">eMail</a>"; $MAILDONE=", "; } --- 262,267 ---- if (isset($value['mail'][0])) { ! $return.=$wacko->Link("mailto:".$value['mail'][0], "", "eMail", 1, 1); ! #$return.="<a href=\"mailto:". $value['mail'][0] ."\">eMail</a>"; $MAILDONE=", "; } *************** *** 263,267 **** { $URIexplode = explode(" ", $value['labeledURI'][0], 2); ! $return.="$MAILDONE<a href=\"$URIexplode[0]\">$URIexplode[1]</a>"; } --- 272,277 ---- { $URIexplode = explode(" ", $value['labeledURI'][0], 2); ! $return.=$MAILDONE . $wacko->Link($URIexplode[0], "", $URIexplode[1], 1, 1); ! #$return.="$MAILDONE<a href=\"$URIexplode[0]\">$URIexplode[1]</a>"; } *************** *** 269,273 **** { $URIexplode = explode(" ", $value['labeledURI'][$i], 2); ! $return.=", <a href=\"$URIexplode[0]\">$URIexplode[1]</a>"; } $return.="</td></tr>"; --- 279,284 ---- { $URIexplode = explode(" ", $value['labeledURI'][$i], 2); ! $return.=", ".$wacko->Link($URIexplode[0], "", $URIexplode[1], 1, 1); ! #$return.=", <a href=\"$URIexplode[0]\">$URIexplode[1]</a>"; } $return.="</td></tr>"; *************** *** 280,284 **** case "generate-mail": if (isset($value['mail'][0])) ! return "eMail: <a href=\"mailto:". $value['mail'][0] ."\">". $value['mail'][0] ."</a><br>"; case "generate-urls": --- 291,296 ---- case "generate-mail": if (isset($value['mail'][0])) ! return "eMail: ".$wacko->Link($value['mail'][0], "", $value['mail'][0], 1, 1)."<br />"; ! #return "eMail: <a href=\"mailto:". $value['mail'][0] ."\">". $value['mail'][0] ."</a><br>"; case "generate-urls": *************** *** 286,290 **** { $URIexplode = explode(" ", $value['labeledURI'][0], 2); ! return "Web: <a href=\"". $URIexplode[0] ."\">". $URIexplode[1] ."</a><br>"; } --- 298,303 ---- { $URIexplode = explode(" ", $value['labeledURI'][0], 2); ! return "Web: ".$wacko->Link($URIexplode[0], "", $URIexplode[1], 1, 1)."<br />"; ! #return "Web: <a href=\"". $URIexplode[0] ."\">". $URIexplode[1] ."</a><br>"; } *************** *** 298,302 **** if (isset($value['postOfficeBox'][0])) $return.=$value['postOfficeBox'][0] ."<br>"; ! if (isset($value['street'][0])) $return.=$value['street'][0] ."<br>"; if (isset($value['postalCode'][0])) $return.=$value['postalCode'][0] ." "; --- 311,319 ---- if (isset($value['postOfficeBox'][0])) $return.=$value['postOfficeBox'][0] ."<br>"; ! if (isset($value['street'][0])) ! if (isset($value['roomNumber'][0])) ! $return.=$value['street'][0].", Zimmer ".$value['roomNumber'][0] ."<br>"; ! else ! $return.=$value['street'][0] ."<br>"; if (isset($value['postalCode'][0])) $return.=$value['postalCode'][0] ." "; *************** *** 358,370 **** if (!auth_anon2()) { ! print "<h3>LDAP Verbindungsfehler!</h3>"; } else if (!($entry = searchPeople($name, $value))) { ! print "<h3>LDAP Objekt nicht gefunden!</h3>"; } else { ! print "<table cellpadding=5>\n"; print "<tr><td valign=top><img src=\"".$this->conf->getValue('base_url')."images/jpegPhoto.php?name=$name&value=$value\"></td>"; print "<td valign=top>"; --- 375,388 ---- if (!auth_anon2()) { ! print "<p><i>LDAP Verbindungsfehler!</i></p>"; } else if (!($entry = searchPeople($name, $value))) { ! print "<p><i>LDAP Objekt nicht gefunden!</i></p>"; } else { ! # TODO: output-table in value2layout, not here ! print "<table class='vCard'>\n"; print "<tr><td valign=top><img src=\"".$this->conf->getValue('base_url')."images/jpegPhoto.php?name=$name&value=$value\"></td>"; print "<td valign=top>"; |
|
From: Lutz <li...@us...> - 2006-03-06 17:21:22
|
Hallo, ich f=E4nd's toll, wenn nicht CVS-Reports f=FCr jeden=20 Commit jeder einzelnen Datei in die Mailingliste gespammt w=FCrden ;-) Stattdessen vielleicht: - CVS journal report (einer pro Tag) - eigene Mailingliste f=FCr CVS-Reports - keine CVS-Reports ;-P (sondern die Policy, dass=20 bei herausragenden =C4nderungen der =C4nderer h=E4ndisch eine kurze Mail= erzeugt) Ich hoffe, die anderen sehen das =E4hnlich und einer kann sich drum= k=FCmmern... Gr=FC=DFe, -.Lutz.- |
|
From: Sebastian D. <se...@us...> - 2006-03-06 15:40:58
|
Update of /cvsroot/wackofork/wiki/themes/bis/css In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25030 Modified Files: all.css Log Message: + floatbox, div.name Index: all.css =================================================================== RCS file: /cvsroot/wackofork/wiki/themes/bis/css/all.css,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** all.css 6 Mar 2006 00:02:51 -0000 1.7 --- all.css 6 Mar 2006 15:40:54 -0000 1.8 *************** *** 213,220 **** ! div.floatbox div.inner p{ font-size: 80%; margin-top: 0.1em; ! margin-bottom: 0.1em; padding-left: 0.5em; padding-right: 0.5em; --- 213,220 ---- ! div.floatbox div.inner p, div.floatbox div.inner div.name{ font-size: 80%; margin-top: 0.1em; ! margin-bottom: 0.3em; padding-left: 0.5em; padding-right: 0.5em; |
|
From: Sebastian D. <se...@us...> - 2006-03-06 15:40:07
|
Update of /cvsroot/wackofork/wiki/actions In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24482 Modified Files: feed.php Log Message: - ->Link() verwendet Index: feed.php =================================================================== RCS file: /cvsroot/wackofork/wiki/actions/feed.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** feed.php 6 Mar 2006 00:12:12 -0000 1.2 --- feed.php 6 Mar 2006 15:39:57 -0000 1.3 *************** *** 64,82 **** #$max=5; #$time="yes"; if (!$url) ! echo "<i>Please specify a Feed with the Parameter url. (e.g. {{feed url=\"http://del.icio.us/rss/seebi/ldap+client\"}}</i><br />\n"; else { $rss = fetch_rss( $url ); if (!$rss) ! echo "<i>Could not load or parse feed $url.<i><br />\n"; else { ! if ($divclass) # the new div-way ! { ! echo "<div class='$divclass'><div class='inner'>\n"; ! if ($title!="no") ! { if ($title!="") echo "<div class='legend'>$title</div>\n"; --- 64,89 ---- #$max=5; #$time="yes"; + $rss = fetch_rss( $url ); + + if ($divclass) # the new div-way + { + echo "<div class='$divclass'><div class='inner'>\n"; + } + else # the taditional fieldset-table-way + { + echo "<fieldset>"; + } if (!$url) ! echo "<p><i>Please specify a Feed with the Parameter url. (e.g. {{feed url=\"http://del.icio.us/rss/seebi/ldap+client\"}}</i></p>\n"; else { $rss = fetch_rss( $url ); if (!$rss) ! echo "<p><i>Could not load or parse feed $url.</i></p>\n"; else { ! if ($title!="no") ! if ($divclass) # the new div-way if ($title!="") echo "<div class='legend'>$title</div>\n"; *************** *** 87,102 **** echo "</div>\n"; } ! } ! } ! else # the taditional fieldset-table-way ! { ! echo "<fieldset>"; ! if ($title!="no") { ! echo "<legend>Feed Title: <strong><a target=\"_blank\" class=\"outerlink\" href=\"" . $rss->channel['link'] . "\">" . $rss->channel['title'] ."</a></strong>"; if (($max)&&($max>0)) echo " (last $max items)"; echo "</legend>\n"; } - } $current=1; --- 94,103 ---- echo "</div>\n"; } ! else { ! echo "<legend>".$this->GetResourceValue('FeedTitle').": <strong>".$this->Link($rss->channel['link'], "", $rss->channel['title'], 1, 1)."</strong>"; if (($max)&&($max>0)) echo " (last $max items)"; echo "</legend>\n"; } $current=1; *************** *** 124,128 **** # headline ! echo "<a target=\"_blank\" href=\"$href\" class=\"outerlink\">$title</a>"; if (($time == "yes")&&($date!=0)) --- 125,130 ---- # headline ! #echo "<a target=\"_blank\" href=\"$href\" class=\"outerlink\">$title</a>"; ! echo $this->Link($href, "", $title, 1, 1); if (($time == "yes")&&($date!=0)) *************** *** 139,149 **** $current++; } - - if ($divclass) # the new div-way - echo "</div></div>\n"; - else # the taditional fieldset-table-way - echo "<fieldset>"; } } ?> --- 141,151 ---- $current++; } } } + if ($divclass) # the new div-way + echo "</div></div>\n"; + else # the taditional fieldset-table-way + echo "</fieldset>"; + ?> |
|
From: Sebastian D. <se...@us...> - 2006-03-06 15:24:30
|
Update of /cvsroot/wackofork/wiki/actions In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17190 Modified Files: include.php Log Message: - default ist nun nomark=2 (smooth) - clean up Index: include.php =================================================================== RCS file: /cvsroot/wackofork/wiki/actions/include.php,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** include.php 6 Mar 2006 00:23:28 -0000 1.4 --- include.php 6 Mar 2006 15:24:21 -0000 1.5 *************** *** 1,51 **** <?php foreach (explode(',', $vars[0]) as $vars[0]) { ! $includeActionOutput = ""; ! $vars[0] = $this->UnwrapLink($vars[0]); ! if ($_SESSION["linktracking"] && $track) ! $this->TrackLinkTo($vars[0]); ! if (in_array($vars[0],$this->context)) return; ! if ($vars[0] == $this->tag) return; ! if (! $this->HasAccess("read",$vars[0])){ ! if ($nowarning!=1) ! $includeActionOutput .= $this->GetResourceValue("NoAccessToSourcePage"); ! }else{ ! if (!$inc_page = $this->LoadPage($vars[0], $_GET["time"])){ ! $includeActionOutput .= "<em> ".$this->GetResourceValue("SourcePageDoesntExist")."(".$this->Link("/".$vars[0]).")</em>"; ! }else{ ! if ($inc_page["body_r"]) $strings = $inc_page["body_r"]; ! else $strings = $this->Format($inc_page["body"], "wacko"); ! $strings = preg_replace("/\¡\¡toc[^\¡]*\¡\¡/i","",$strings); ! $strings = preg_replace("/\¡\¡tableofcontents[^\¡]*\¡\¡/i","",$strings); ! $strings = preg_replace("/\¡\¡p[^\¡]*\¡\¡/i","",$strings); ! $strings = preg_replace("/\¡\¡showparagraphs[^\¡]*\¡\¡/i","",$strings); ! $strings = preg_replace("/\¡\¡redirect[^\¡]*\¡\¡/i","",$strings); ! $strings = preg_replace("/.*\¡\¡a name=\"?$first_anchor\"?\¡\¡(.*)\¡\¡a name=\"?$last_anchor\"?\¡\¡.*$/is","\$1",$strings); ! if (($nomark!=1) && ($nomark!=2 || $this->HasAccess("write", $vars[0]))) ! $includeActionOutput .= "<div class=\"include\">"."<div class=\"name\">".$this->Link("/".$vars[0])." :: ". ! "<a href=\"".$this->Href("edit", $vars[0])."\">".$this->GetResourceValue("EditIcon")."</a></div>"; ! ! $this->context[++$this->current_context] = $vars[0]; ! $includeActionOutput .= $this->Format($strings, "post_wacko"); ! $this->current_context--; ! ! if (($nomark!=1) && ($nomark!=2 || $this->HasAccess("write", $vars[0]))) ! $includeActionOutput .= "<div class=\"name\">".$this->Link("/".$vars[0])." :: ". ! "<a href=\"".$this->Href("edit", $vars[0])."\">".$this->GetResourceValue("EditIcon")."</a></div></div>"; ! }; ! } ! if ($divclass != "") $includeActionOutput = "<div class='$divclass'><div class='inner'>\n".$includeActionOutput."</div></div>\n"; ! print $includeActionOutput; ! #print "<br />\n"; } ?> --- 1,63 ---- <?php + if (!isset($nomark)) $nomark=2; # default to dynamic edit buttons + foreach (explode(',', $vars[0]) as $vars[0]) { + $includeActionOutput = ""; ! $vars[0] = $this->UnwrapLink($vars[0]); ! if ($_SESSION["linktracking"] && $track) ! $this->TrackLinkTo($vars[0]); ! if (in_array($vars[0],$this->context)) return; ! if ($vars[0] == $this->tag) return; ! if (! $this->HasAccess("read",$vars[0])) ! { ! if ($nowarning!=1) ! $includeActionOutput .= $this->GetResourceValue("NoAccessToSourcePage"); ! } ! else ! { ! if (!$inc_page = $this->LoadPage($vars[0], $_GET["time"])) ! { ! $includeActionOutput .= "<em> ".$this->GetResourceValue("SourcePageDoesntExist")."(".$this->Link("/".$vars[0]).")</em>"; ! } ! else ! { ! if ($inc_page["body_r"]) $strings = $inc_page["body_r"]; ! else $strings = $this->Format($inc_page["body"], "wacko"); ! $strings = preg_replace("/\¡\¡toc[^\¡]*\¡\¡/i","",$strings); ! $strings = preg_replace("/\¡\¡tableofcontents[^\¡]*\¡\¡/i","",$strings); ! $strings = preg_replace("/\¡\¡p[^\¡]*\¡\¡/i","",$strings); ! $strings = preg_replace("/\¡\¡showparagraphs[^\¡]*\¡\¡/i","",$strings); ! $strings = preg_replace("/\¡\¡redirect[^\¡]*\¡\¡/i","",$strings); ! $strings = preg_replace("/.*\¡\¡a name=\"?$first_anchor\"?\¡\¡(.*)\¡\¡a name=\"?$last_anchor\"?\¡\¡.*$/is","\$1",$strings); ! if (($nomark!=1) && ($nomark!=2 || $this->HasAccess("write", $vars[0]))) ! $includeActionOutput .= "<div class=\"name\">".$this->Link("/".$vars[0])." :: ". ! "<a href=\"".$this->Href("edit", $vars[0])."\">".$this->GetResourceValue("EditIcon")."</a></div>"; ! $this->context[++$this->current_context] = $vars[0]; ! $includeActionOutput .= $this->Format($strings, "post_wacko"); ! $this->current_context--; ! if (($nomark!=1) && ($nomark!=2 || $this->HasAccess("write", $vars[0]))) ! $includeActionOutput .= "<div class=\"name\">".$this->Link("/".$vars[0])." :: ". ! "<a href=\"".$this->Href("edit", $vars[0])."\">".$this->GetResourceValue("EditIcon")."</a></div>"; ! } ! } ! ! if ($divclass != "") ! $includeActionOutput = "<div class='$divclass'><div class='inner'>\n".$includeActionOutput."</div></div>\n"; ! else ! $includeActionOutput = "<div class='include'>\n".$includeActionOutput."</div>\n"; + print $includeActionOutput; + #print "<br />\n"; } + unset($nomark); + ?> |
|
From: Sebastian D. <se...@us...> - 2006-03-06 13:50:35
|
Update of /cvsroot/wackofork/wiki/actions/magpierss/scripts In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1832/scripts Modified Files: magpie_debug.php magpie_simple.php Log Message: - Version 0.72 eingespielt Index: magpie_simple.php =================================================================== RCS file: /cvsroot/wackofork/wiki/actions/magpierss/scripts/magpie_simple.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** magpie_simple.php 3 Feb 2006 23:09:01 -0000 1.1 --- magpie_simple.php 6 Mar 2006 13:50:11 -0000 1.2 *************** *** 8,12 **** if ( $url ) { $rss = fetch_rss( $url ); - echo "Channel: " . $rss->channel['title'] . "<p>"; echo "<ul>"; --- 8,11 ---- *************** *** 24,25 **** --- 23,29 ---- <input type="submit" value="Parse RSS"> </form> + + <p> + <h2>Security Note:</h2> + This is a simple <b>example</b> script. If this was a <b>real</b> script we probably wouldn't allow strangers to submit random URLs, and we certainly wouldn't simply echo anything passed in the URL. Additionally its a bad idea to leave this example script lying around. + </p> \ No newline at end of file Index: magpie_debug.php =================================================================== RCS file: /cvsroot/wackofork/wiki/actions/magpierss/scripts/magpie_debug.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** magpie_debug.php 3 Feb 2006 23:09:01 -0000 1.1 --- magpie_debug.php 6 Mar 2006 13:50:11 -0000 1.2 *************** *** 3,32 **** ini_set('display_errors', 1); ini_set('error_reporting', E_ALL); ! define('MAGPIE_DIR', '../'); ! define('MAGPIE_DEBUG', 2); // flush cache quickly for debugging purposes, don't do this on a live site ! define('MAGPIE_CACHE_AGE', 2); require_once(MAGPIE_DIR.'rss_fetch.inc'); - $url = $_GET['url']; ! if ( $url ) { ! $rss = fetch_rss( $url ); ! if ($rss) { ! echo "Channel: " . $rss->channel['title'] . "<p>"; ! echo "<ul>"; ! foreach ($rss->items as $item) { ! $href = $item['link']; ! $title = $item['title']; ! echo "<li><a href=$href>$title</a></li>"; ! } ! echo "</ul>"; ! } ! else { ! echo "Error: " . magpie_error(); } } ?> --- 3,41 ---- ini_set('display_errors', 1); ini_set('error_reporting', E_ALL); ! define('MAGPIE_OUTPUT_ENCODING', 'UTF-8'); define('MAGPIE_DIR', '../'); ! define('MAGPIE_DEBUG', 1); ! // flush cache quickly for debugging purposes, don't do this on a live site ! define('MAGPIE_CACHE_AGE', 10); require_once(MAGPIE_DIR.'rss_fetch.inc'); ! if ( isset($_GET['url']) ) { ! $url = $_GET['url']; ! } ! else { ! $url = 'http://magpierss.sf.net/test.rss'; ! } ! ! ! test_library_support(); ! ! $rss = fetch_rss( $url ); ! if ($rss) { ! echo "<h3>Example Output</h3>"; ! echo "Channel: " . $rss->channel['title'] . "<p>"; ! echo "<ul>"; ! foreach ($rss->items as $item) { ! $href = $item['link']; ! $title = $item['title']; ! echo "<li><a href=$href>$title</a></li>"; } + echo "</ul>"; + } + else { + echo "Error: " . magpie_error(); } ?> *************** *** 37,41 **** </form> <pre> <?php var_dump($rss); ?> ! </pre> \ No newline at end of file --- 46,80 ---- </form> + <h3>Parsed Results (var_dump'ed)</h3> <pre> <?php var_dump($rss); ?> ! </pre> ! ! <?php ! ! function test_library_support() { ! if (!function_exists('xml_parser_create')) { ! echo "<b>Error:</b> PHP compiled without XML support (--with-xml), Mapgie won't work without PHP support for XML.<br />\n"; ! exit; ! } ! else { ! echo "<b>OK:</b> Found an XML parser. <br />\n"; ! } ! ! if ( ! function_exists('gzinflate') ) { ! echo "<b>Warning:</b> PHP compiled without Zlib support (--with-zlib). No support for GZIP encoding.<br />\n"; ! } ! else { ! echo "<b>OK:</b> Support for GZIP encoding.<br />\n"; ! } ! ! if ( ! (function_exists('iconv') and function_exists('mb_convert_encoding') ) ) { ! echo "<b>Warning:</b> No support for iconv (--with-iconv) or multi-byte strings (--enable-mbstring)." . ! "No support character set munging.<br />\n"; ! } ! else { ! echo "<b>OK:</b> Support for character munging.<br />\n"; ! } ! } ! ! ?> |
|
From: Sebastian D. <se...@us...> - 2006-03-06 13:50:18
|
Update of /cvsroot/wackofork/wiki/actions/magpierss In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1832 Modified Files: CHANGES ChangeLog rss_cache.inc rss_fetch.inc rss_parse.inc Log Message: - Version 0.72 eingespielt Index: ChangeLog =================================================================== RCS file: /cvsroot/wackofork/wiki/actions/magpierss/ChangeLog,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ChangeLog 3 Feb 2006 23:09:01 -0000 1.1 --- ChangeLog 6 Mar 2006 13:50:11 -0000 1.2 *************** *** 1,19 **** ! 2004-11-21 22:45 kellan * rss_fetch.inc: detab, bump version ! 2004-11-21 20:52 kellan * rss_fetch.inc, rss_parse.inc: cache on $url . $output_encoding otherwise we can get munged output * rss_parse.inc: don't set ERROR on notice or warning (rss_fetch dies on parse errors) * rss_fetch.inc: add encoding defines (fix timeout error reporting) ! 2004-11-21 17:21 kellan * rss_parse.inc: incorporate steve's patch ! 2004-11-21 16:26 kellan * rss_parse.inc: remove old debugging functions, totally --- 1,78 ---- ! 2005-10-28 14:11 kellan ! ! * extlib/Snoopy.class.inc: a better solution ! ! 2005-10-28 11:51 kellan ! ! * extlib/Snoopy.class.inc: fix arbtriary code execution ! vulnerability when using curl+ssl ! ! http://www.sec-consult.com/216.html ! ! 2005-03-08 10:46 kellan ! ! * rss_parse.inc: fix bug w/ atom and date normalization ! ! 2005-02-09 14:59 kellan ! ! * rss_fetch.inc: fix stale cache bug ! ! 2005-01-28 02:27 kellan ! ! * rss_parse.inc: support php w/o array_change_case ! ! 2005-01-23 20:02 kellan ! ! * rss_fetch.inc: fix cache bug introduced by charset encoding ! ! 2005-01-12 09:14 kellan ! ! * rss_cache.inc, rss_fetch.inc: more sanity checks for when things ! go wrong ! ! 2004-12-12 13:44 kellan ! ! * INSTALL, rss_cache.inc, rss_utils.inc: detab ! ! 2004-11-23 20:15 kellan ! ! * rss_parse.inc: fix calling iconv instead of mb_convert_encoding ! ! 2004-11-22 02:11 kellan ! ! * CHANGES, ChangeLog, rss_parse.inc, scripts/magpie_debug.php: last ! bit of tidying ! ! 2004-11-22 01:45 kellan * rss_fetch.inc: detab, bump version ! 2004-11-22 01:43 kellan ! ! * rss_parse.inc: was filtering too much ! ! 2004-11-22 00:03 kellan * rss_fetch.inc, rss_parse.inc: cache on $url . $output_encoding otherwise we can get munged output + + 2004-11-21 23:52 kellan + + * rss_parse.inc: add WARNING + + 2004-11-21 23:45 kellan + * rss_parse.inc: don't set ERROR on notice or warning (rss_fetch dies on parse errors) + + 2004-11-21 23:44 kellan + * rss_fetch.inc: add encoding defines (fix timeout error reporting) ! 2004-11-21 20:21 kellan * rss_parse.inc: incorporate steve's patch ! 2004-11-21 19:26 kellan * rss_parse.inc: remove old debugging functions, totally *************** *** 21,54 **** doing this. ! 2004-10-28 12:52 kellan * rss_parse.inc: fixed '=' instead of '==' ! 2004-10-25 21:48 kellan * rss_parse.inc: chance epoch to timestamp to conform w/ php naming conventions ! 2004-06-15 09:00 kellan * rss_parse.inc: [no log message] ! 2004-04-26 11:16 kellan * rss_fetch.inc: bump version ! 2004-04-26 09:36 kellan * rss_parse.inc: fix field doubling ! 2004-04-24 14:47 kellan * CHANGES, ChangeLog: updated ! 2004-04-24 14:35 kellan * rss_fetch.inc: bumped version ! 2004-04-24 13:52 kellan * rss_parse.inc: support arbitrary atom content constructs --- 80,113 ---- doing this. ! 2004-10-28 15:52 kellan * rss_parse.inc: fixed '=' instead of '==' ! 2004-10-26 00:48 kellan * rss_parse.inc: chance epoch to timestamp to conform w/ php naming conventions ! 2004-06-15 12:00 kellan * rss_parse.inc: [no log message] ! 2004-04-26 14:16 kellan * rss_fetch.inc: bump version ! 2004-04-26 12:36 kellan * rss_parse.inc: fix field doubling ! 2004-04-24 17:47 kellan * CHANGES, ChangeLog: updated ! 2004-04-24 17:35 kellan * rss_fetch.inc: bumped version ! 2004-04-24 16:52 kellan * rss_parse.inc: support arbitrary atom content constructs *************** *** 56,69 **** some refactoring ! 2004-04-24 13:15 kellan * rss_parse.inc: support summary content contstruct. add normalize function ! 2004-03-27 13:29 kellan * extlib/Snoopy.class.inc: accept self-signed certs ! 2004-03-27 09:53 kellan * extlib/Snoopy.class.inc: fixed SSL support * set status * set --- 115,128 ---- some refactoring ! 2004-04-24 16:15 kellan * rss_parse.inc: support summary content contstruct. add normalize function ! 2004-03-27 16:29 kellan * extlib/Snoopy.class.inc: accept self-signed certs ! 2004-03-27 12:53 kellan * extlib/Snoopy.class.inc: fixed SSL support * set status * set *************** *** 73,187 **** were getting in my way ! 2004-01-24 23:25 kellan * rss_parse.inc: make RSS 1.0's rdf:about available ! 2004-01-24 23:07 kellan * rss_parse.inc: clean up text, and line formats. add support item rdf:about ! 2004-01-24 20:40 kellan * CHANGES, ChangeLog: update changes ! 2004-01-24 20:37 kellan * rss_fetch.inc: updated version ! 2004-01-24 20:35 kellan * rss_parse.inc: whitespace ! 2004-01-24 20:23 kellan * extlib/Snoopy.class.inc: support badly formatted http headers ! 2004-01-24 20:20 kellan * rss_parse.inc: added alpha atom parsing support ! 2003-06-25 19:34 kellan * extlib/Snoopy.class.inc: fixed fread 4.3.2 compatibility problems ! 2003-06-13 08:31 kellan * rss_fetch.inc: reset cache on 304 ! 2003-06-12 18:37 kellan * rss_cache.inc, rss_fetch.inc, rss_parse.inc, rss_utils.inc: bumped up version numbers ! 2003-06-12 18:32 kellan * htdocs/index.html: updated news ! 2003-06-12 18:27 kellan * NEWS: a manual blog :) ! 2003-06-12 18:22 kellan * htdocs/index.html: fully qualified img ! 2003-06-12 18:20 kellan * htdocs/index.html: clean up. added badge. ! 2003-06-12 18:04 kellan * rss_utils.inc: clean up regex ! 2003-06-12 18:02 kellan * rss_cache.inc: suppress some warnings ! 2003-05-30 17:44 kellan * extlib/Snoopy.class.inc: more comments, cleaned up notice ! 2003-05-30 12:14 kellan * extlib/Snoopy.class.inc: don't advertise gzip support if the user hasn't built php with gzinflate support ! 2003-05-12 19:32 kellan * ChangeLog: changes ! 2003-05-12 19:11 kellan * htdocs/index.html: announce 0.5 ! 2003-05-12 18:42 kellan * htdocs/index.html: change ! 2003-05-12 18:39 kellan * rss_fetch.inc: use gzip ! 2003-05-12 18:37 kellan * extlib/Snoopy.class.inc: added support gzip encoded content negoiation ! 2003-05-12 18:32 kellan * rss_cache.inc, rss_fetch.inc, rss_parse.inc, rss_utils.inc: fixed typoes ! 2003-04-26 18:44 kellan * rss_parse.inc: fix minor typo ! 2003-04-18 05:19 kellan * htdocs/cookbook.html: updated cookbook to show more code for limiting items ! 2003-03-03 13:02 kellan * rss_parse.inc, scripts/magpie_slashbox.php: committed (or --- 132,246 ---- were getting in my way ! 2004-01-25 02:25 kellan * rss_parse.inc: make RSS 1.0's rdf:about available ! 2004-01-25 02:07 kellan * rss_parse.inc: clean up text, and line formats. add support item rdf:about ! 2004-01-24 23:40 kellan * CHANGES, ChangeLog: update changes ! 2004-01-24 23:37 kellan * rss_fetch.inc: updated version ! 2004-01-24 23:35 kellan * rss_parse.inc: whitespace ! 2004-01-24 23:23 kellan * extlib/Snoopy.class.inc: support badly formatted http headers ! 2004-01-24 23:20 kellan * rss_parse.inc: added alpha atom parsing support ! 2003-06-25 22:34 kellan * extlib/Snoopy.class.inc: fixed fread 4.3.2 compatibility problems ! 2003-06-13 11:31 kellan * rss_fetch.inc: reset cache on 304 ! 2003-06-12 21:37 kellan * rss_cache.inc, rss_fetch.inc, rss_parse.inc, rss_utils.inc: bumped up version numbers ! 2003-06-12 21:32 kellan * htdocs/index.html: updated news ! 2003-06-12 21:27 kellan * NEWS: a manual blog :) ! 2003-06-12 21:22 kellan * htdocs/index.html: fully qualified img ! 2003-06-12 21:20 kellan * htdocs/index.html: clean up. added badge. ! 2003-06-12 21:04 kellan * rss_utils.inc: clean up regex ! 2003-06-12 21:02 kellan * rss_cache.inc: suppress some warnings ! 2003-05-30 20:44 kellan * extlib/Snoopy.class.inc: more comments, cleaned up notice ! 2003-05-30 15:14 kellan * extlib/Snoopy.class.inc: don't advertise gzip support if the user hasn't built php with gzinflate support ! 2003-05-12 22:32 kellan * ChangeLog: changes ! 2003-05-12 22:11 kellan * htdocs/index.html: announce 0.5 ! 2003-05-12 21:42 kellan * htdocs/index.html: change ! 2003-05-12 21:39 kellan * rss_fetch.inc: use gzip ! 2003-05-12 21:37 kellan * extlib/Snoopy.class.inc: added support gzip encoded content negoiation ! 2003-05-12 21:32 kellan * rss_cache.inc, rss_fetch.inc, rss_parse.inc, rss_utils.inc: fixed typoes ! 2003-04-26 21:44 kellan * rss_parse.inc: fix minor typo ! 2003-04-18 08:19 kellan * htdocs/cookbook.html: updated cookbook to show more code for limiting items ! 2003-03-03 16:02 kellan * rss_parse.inc, scripts/magpie_slashbox.php: committed (or *************** *** 189,193 **** Indexes' notices ! 2003-03-03 12:59 kellan * rss_fetch.inc: commited patch from nicola (www.technick.com) to --- 248,252 ---- Indexes' notices ! 2003-03-03 15:59 kellan * rss_fetch.inc: commited patch from nicola (www.technick.com) to *************** *** 197,209 **** user-agent, & whether cacheing is turned on. ! 2003-02-11 22:22 kellan * CHANGES, ChangeLog: ChangeLog now auto-generated by cvs2cl ! 2003-02-11 21:21 kellan * rss_fetch.inc: better errors, hopefully stomped on pesky notices ! 2003-02-11 21:19 kellan * rss_parse.inc: check to see is xml is supported, if not die --- 256,268 ---- user-agent, & whether cacheing is turned on. ! 2003-02-12 01:22 kellan * CHANGES, ChangeLog: ChangeLog now auto-generated by cvs2cl ! 2003-02-12 00:21 kellan * rss_fetch.inc: better errors, hopefully stomped on pesky notices ! 2003-02-12 00:19 kellan * rss_parse.inc: check to see is xml is supported, if not die *************** *** 211,215 **** also throw better xml errors ! 2003-02-11 21:18 kellan * rss_cache.inc: hopefully cleared up some notices that were being --- 270,274 ---- also throw better xml errors ! 2003-02-12 00:18 kellan * rss_cache.inc: hopefully cleared up some notices that were being *************** *** 218,222 **** fixed a debug statement that was being called as an error ! 2003-02-11 21:15 kellan * scripts/: magpie_simple.php, magpie_slashbox.php: moved --- 277,281 ---- fixed a debug statement that was being called as an error ! 2003-02-12 00:15 kellan * scripts/: magpie_simple.php, magpie_slashbox.php: moved *************** *** 224,228 **** demo. ! 2003-02-11 21:02 kellan * INSTALL, README, TROUBLESHOOTING: Improved documentation. Better --- 283,287 ---- demo. ! 2003-02-12 00:02 kellan * INSTALL, README, TROUBLESHOOTING: Improved documentation. Better *************** *** 231,255 **** TROUBLESHOOTING cover common installation and usage problems ! 2003-01-22 11:40 kellan * htdocs/cookbook.html: added cookbook.html ! 2003-01-21 20:47 kellan * cookbook: a magpie cookbook ! 2003-01-20 07:09 kellan * ChangeLog: updated ! 2003-01-20 06:23 kellan * scripts/simple_smarty.php: minor clean up ! 2003-01-20 06:15 kellan * scripts/README: added smarty url ! 2003-01-20 06:14 kellan * magpie_simple.php, htdocs/index.html, scripts/README, --- 290,314 ---- TROUBLESHOOTING cover common installation and usage problems ! 2003-01-22 14:40 kellan * htdocs/cookbook.html: added cookbook.html ! 2003-01-21 23:47 kellan * cookbook: a magpie cookbook ! 2003-01-20 10:09 kellan * ChangeLog: updated ! 2003-01-20 09:23 kellan * scripts/simple_smarty.php: minor clean up ! 2003-01-20 09:15 kellan * scripts/README: added smarty url ! 2003-01-20 09:14 kellan * magpie_simple.php, htdocs/index.html, scripts/README, *************** *** 266,270 **** smarty demo templates/simple.smary - template for the smarty demo ! 2003-01-20 06:11 kellan * rss_fetch.inc, rss_parse.inc: changes to error handling to give --- 325,329 ---- smarty demo templates/simple.smary - template for the smarty demo ! 2003-01-20 09:11 kellan * rss_fetch.inc, rss_parse.inc: changes to error handling to give *************** *** 274,295 **** variable for when fetch_rss() returns false ! 2002-10-26 16:02 kellan * htdocs/index.html: putting the website under source control ! 2002-10-26 15:43 kellan * AUTHORS, ChangeLog, INSTALL, README: some documentation to make it all look official :) ! 2002-10-25 20:04 kellan * magpie_simple.php: quxx ! 2002-10-25 20:04 kellan * rss_parse.inc: added support for textinput and image ! 2002-10-25 16:23 kellan * magpie_simple.php, rss_cache.inc, rss_fetch.inc, rss_parse.inc, --- 333,354 ---- variable for when fetch_rss() returns false ! 2002-10-26 19:02 kellan * htdocs/index.html: putting the website under source control ! 2002-10-26 18:43 kellan * AUTHORS, ChangeLog, INSTALL, README: some documentation to make it all look official :) ! 2002-10-25 23:04 kellan * magpie_simple.php: quxx ! 2002-10-25 23:04 kellan * rss_parse.inc: added support for textinput and image ! 2002-10-25 19:23 kellan * magpie_simple.php, rss_cache.inc, rss_fetch.inc, rss_parse.inc, *************** *** 299,303 **** added support for conditional gets ! 2002-10-25 16:22 kellan * rss_cache.inc, rss_fetch.inc, rss_parse.inc, rss_utils.inc: --- 358,362 ---- added support for conditional gets ! 2002-10-25 19:22 kellan * rss_cache.inc, rss_fetch.inc, rss_parse.inc, rss_utils.inc: *************** *** 305,314 **** found in Smarty and Snoopy :) ! 2002-10-25 16:18 kellan * extlib/Snoopy.class.inc: added Snoopy in order to support conditional gets ! 2002-10-23 20:19 kellan * magpie_simple.php, rss_cache.inc, rss_fetch.inc, rss_parse.inc: --- 364,373 ---- found in Smarty and Snoopy :) ! 2002-10-25 19:18 kellan * extlib/Snoopy.class.inc: added Snoopy in order to support conditional gets ! 2002-10-23 23:19 kellan * magpie_simple.php, rss_cache.inc, rss_fetch.inc, rss_parse.inc: *************** *** 335,344 **** along blithely unaware. ! 2002-09-11 08:11 kellan * rss_cache.inc, rss_parse.inc, magpie_simple.php, rss_fetch.inc, rss_utils.inc: Initial revision ! 2002-09-11 08:11 kellan * rss_cache.inc, rss_parse.inc, magpie_simple.php, rss_fetch.inc, --- 394,403 ---- along blithely unaware. ! 2002-09-11 11:11 kellan * rss_cache.inc, rss_parse.inc, magpie_simple.php, rss_fetch.inc, rss_utils.inc: Initial revision ! 2002-09-11 11:11 kellan * rss_cache.inc, rss_parse.inc, magpie_simple.php, rss_fetch.inc, Index: rss_parse.inc =================================================================== RCS file: /cvsroot/wackofork/wiki/actions/magpierss/rss_parse.inc,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** rss_parse.inc 3 Feb 2006 23:09:01 -0000 1.1 --- rss_parse.inc 6 Mar 2006 13:50:11 -0000 1.2 *************** *** 61,65 **** var $intextinput = false; var $inimage = false; - var $current_field = ''; var $current_namespace = false; --- 61,64 ---- *************** *** 260,264 **** function feed_cdata ($p, $text) { - if ($this->feed_type == ATOM and $this->incontent) { --- 259,262 ---- *************** *** 392,396 **** $atom_date = (isset($item['issued']) ) ? $item['issued'] : $item['modified']; if ( $atom_date ) { ! $epoch = @parse_w3cdtf($item['modified']); if ($epoch and $epoch > 0) { $item['date_timestamp'] = $epoch; --- 390,394 ---- $atom_date = (isset($item['issued']) ) ? $item['issued'] : $item['modified']; if ( $atom_date ) { ! $epoch = @parse_w3cdtf($atom_date); if ($epoch and $epoch > 0) { $item['date_timestamp'] = $epoch; *************** *** 561,565 **** function error ($errormsg, $lvl=E_USER_WARNING) { // append PHP's error message if track_errors enabled ! if ( $php_errormsg ) { $errormsg .= " ($php_errormsg)"; } --- 559,563 ---- function error ($errormsg, $lvl=E_USER_WARNING) { // append PHP's error message if track_errors enabled ! if ( isset($php_errormsg) ) { $errormsg .= " ($php_errormsg)"; } *************** *** 586,589 **** --- 584,605 ---- } + // patch to support medieval versions of PHP4.1.x, + // courtesy, Ryan Currie, ry...@di... + + if (!function_exists('array_change_key_case')) { + define("CASE_UPPER",1); + define("CASE_LOWER",0); + + + function array_change_key_case($array,$case=CASE_LOWER) { + if ($case=CASE_LOWER) $cmd=strtolower; + elseif ($case=CASE_UPPER) $cmd=strtoupper; + foreach($array as $key=>$value) { + $output[$cmd($key)]=$value; + } + return $output; + } + + } ?> Index: rss_cache.inc =================================================================== RCS file: /cvsroot/wackofork/wiki/actions/magpierss/rss_cache.inc,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** rss_cache.inc 3 Feb 2006 23:09:01 -0000 1.1 --- rss_cache.inc 6 Mar 2006 13:50:11 -0000 1.2 *************** *** 94,101 **** } ! $data = fread( $fp, filesize($cache_file) ); ! $rss = $this->unserialize( $data ); ! return $rss; } --- 94,105 ---- } ! if ($filesize = filesize($cache_file) ) { ! $data = fread( $fp, filesize($cache_file) ); ! $rss = $this->unserialize( $data ); ! return $rss; ! } ! ! return 0; } *************** *** 131,134 **** --- 135,150 ---- } + function cache_age( $cache_key ) { + $filename = $this->file_name( $url ); + if ( file_exists( $filename ) ) { + $mtime = filemtime( $filename ); + $age = time() - $mtime; + return $age; + } + else { + return -1; + } + } + /*=======================================================================*\ Function: serialize Index: CHANGES =================================================================== RCS file: /cvsroot/wackofork/wiki/actions/magpierss/CHANGES,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** CHANGES 3 Feb 2006 23:09:01 -0000 1.1 --- CHANGES 6 Mar 2006 13:50:10 -0000 1.2 *************** *** 1,2 **** --- 1,6 ---- + Version 0.72 + ----------- + - fix security exploit: http://www.sec-consult.com/216.html + Version 0.7 ----------- Index: rss_fetch.inc =================================================================== RCS file: /cvsroot/wackofork/wiki/actions/magpierss/rss_fetch.inc,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** rss_fetch.inc 3 Feb 2006 23:09:01 -0000 1.1 --- rss_fetch.inc 6 Mar 2006 13:50:11 -0000 1.2 *************** *** 82,86 **** \*=======================================================================*/ ! define('MAGPIE_VERSION', '0.7'); $MAGPIE_ERROR = ""; --- 82,86 ---- \*=======================================================================*/ ! define('MAGPIE_VERSION', '0.72'); $MAGPIE_ERROR = ""; *************** *** 135,139 **** $cache_status = $cache->check_cache( $cache_key); } ! // if object cached, and cache is fresh, return cached obj if ( $cache_status == 'HIT' ) { --- 135,139 ---- $cache_status = $cache->check_cache( $cache_key); } ! // if object cached, and cache is fresh, return cached obj if ( $cache_status == 'HIT' ) { *************** *** 143,148 **** $rss->from_cache = 1; if ( MAGPIE_DEBUG > 1) { ! debug("MagpieRSS: Cache HIT", E_USER_NOTICE); ! } return $rss; } --- 143,148 ---- $rss->from_cache = 1; if ( MAGPIE_DEBUG > 1) { ! debug("MagpieRSS: Cache HIT", E_USER_NOTICE); ! } return $rss; } *************** *** 163,167 **** if (isset($resp) and $resp) { ! if ($resp->status == '304' ) { // we have the most current copy if ( MAGPIE_DEBUG > 1) { --- 163,167 ---- if (isset($resp) and $resp) { ! if ($resp->status == '304' ) { // we have the most current copy if ( MAGPIE_DEBUG > 1) { |
|
From: Sebastian D. <se...@us...> - 2006-03-06 13:50:15
|
Update of /cvsroot/wackofork/wiki/actions/magpierss/extlib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1832/extlib Modified Files: Snoopy.class.inc Log Message: - Version 0.72 eingespielt Index: Snoopy.class.inc =================================================================== RCS file: /cvsroot/wackofork/wiki/actions/magpierss/extlib/Snoopy.class.inc,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Snoopy.class.inc 3 Feb 2006 23:09:01 -0000 1.1 --- Snoopy.class.inc 6 Mar 2006 13:50:11 -0000 1.2 *************** *** 640,646 **** $headers[] = "Authorization: BASIC ".base64_encode($this->user.":".$this->pass); ! for($curr_header = 0; $curr_header < count($headers); $curr_header++) $cmdline_params .= " -H \"".$headers[$curr_header]."\""; ! if(!empty($body)) $cmdline_params .= " -d \"$body\""; --- 640,647 ---- $headers[] = "Authorization: BASIC ".base64_encode($this->user.":".$this->pass); ! for($curr_header = 0; $curr_header < count($headers); $curr_header++) { $cmdline_params .= " -H \"".$headers[$curr_header]."\""; ! } ! if(!empty($body)) $cmdline_params .= " -d \"$body\""; *************** *** 652,657 **** # accept self-signed certs ! $cmdline_params .= " -k"; ! exec($this->curl_path." -D \"/tmp/$headerfile\"".$cmdline_params." ".$URI,$results,$return); if($return) --- 653,658 ---- # accept self-signed certs ! $cmdline_params .= " -k"; ! exec($this->curl_path." -D \"/tmp/$headerfile\"".escapeshellcmd($cmdline_params)." ".escapeshellcmd($URI),$results,$return); if($return) |
|
From: Sebastian D. <se...@us...> - 2006-03-06 11:26:58
|
Update of /cvsroot/wackofork/wiki/themes/bis/lang In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23849/lang Modified Files: wakka.de.php wakka.en.php Log Message: - GetPageLastWriter eingebaut - i18n de+en Index: wakka.en.php =================================================================== RCS file: /cvsroot/wackofork/wiki/themes/bis/lang/wakka.en.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** wakka.en.php 4 Feb 2006 00:28:14 -0000 1.1 --- wakka.en.php 6 Mar 2006 11:26:55 -0000 1.2 *************** *** 3,6 **** "TextSearchPage" => "TextSearch", "LoginPage" => "Login", ); ! ?> \ No newline at end of file --- 3,8 ---- "TextSearchPage" => "TextSearch", "LoginPage" => "Login", + "LastModification" => "Last Modification", + "by" => "by", ); ! ?> Index: wakka.de.php =================================================================== RCS file: /cvsroot/wackofork/wiki/themes/bis/lang/wakka.de.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** wakka.de.php 4 Feb 2006 00:28:14 -0000 1.1 --- wakka.de.php 6 Mar 2006 11:26:55 -0000 1.2 *************** *** 4,7 **** --- 4,9 ---- "LoginPage" => "Anmeldung", "SettingsPage" => "Einstellungen", + "LastModification" => "Letzte Änderung", + "by" => "von", ); ?> |
|
From: Sebastian D. <se...@us...> - 2006-03-06 11:26:58
|
Update of /cvsroot/wackofork/wiki/themes/bis/appearance In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23849/appearance Modified Files: footer.php Log Message: - GetPageLastWriter eingebaut - i18n de+en Index: footer.php =================================================================== RCS file: /cvsroot/wackofork/wiki/themes/bis/appearance/footer.php,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** footer.php 1 Mar 2006 15:29:55 -0000 1.3 --- footer.php 6 Mar 2006 11:26:55 -0000 1.4 *************** *** 15,19 **** // Revisions link ! echo $this->GetPageTime() ? "Letzte Änderung: <a href=\"".$this->href("revisions")."\" title=\"".$this->GetResourceValue("RevisionTip")."\">".$this->GetPageTime()."</a> |\n" : ""; // Impressum link --- 15,19 ---- // Revisions link ! echo $this->GetPageTime() ? $this->GetResourceValue("LastModification") .": <a href=\"".$this->href("revisions")."\" title=\"".$this->GetResourceValue("RevisionTip")."\">".$this->GetPageTime()."</a> ".$this->GetResourceValue("by")." ".$this->Link($this->GetPageLastWriter())." |\n" : ""; // Impressum link |
