diff -ru -d -N Pivot_1.10_full/pivot/modules/module_parser.php pivot-martin/pivot/modules/module_parser.php --- Pivot_1.10_full/pivot/modules/module_parser.php 2004-03-23 18:39:00.000000000 +0100 +++ pivot-martin/pivot/modules/module_parser.php 2004-06-15 04:08:51.000000000 +0200 @@ -1015,85 +1015,37 @@ $body = snippet_body(); - $description = strip_tags($introduction); - $tag = str_replace("_", "", safe_string($Cfg['sitename'], TRUE)) . ",". date("Y") . ":" . - str_replace("_", "", safe_string($Weblogs[$Current_weblog]['name'], TRUE))."." . $uid; - - $lang = snippet_lang(); - $date = format_date( $date, "%year%-%month%-%day%T%hour24%:%minute%:00").rss_offset(); - if ( (isset($global_pref['rss_entry_length'])) && (strlen($description)>$global_pref['rss_entry_length']) ) { - $description=htmlspecialchars(substr($description, 0, $global_pref['rss_entry_length']).".."); - $description=str_replace(" "," ", $description); - } - $rss_item=' %title% %link% - %link%#comm - %description% + %date% %guid% - - %category% - %date% + %description% '; - $atom_item=' - %title% - - %date% - %date% - tag:%tag% - - %date% - %description% - %title% - - %author% - - - - - -'; - - $from = array( "%title%", "%link%", - "%description%", - "%author%", + "%date%", "%guid%", - "%date%", - "%category%", - "%content%", - "%tag%", - "%lang%", + "%description%" ); $to = array( - htmlspecialchars(strip_tags($title)), - $link, - htmlspecialchars(RelativeToAbsoluteURLS($description)), - $user, - $uid."@".$weblog, - $date, - implode(", ",$category), - RelativeToAbsoluteURLS($introduction.$body), - $tag, - $lang, + htmlspecialchars(strip_tags($title)), + $link, + $date, + $uid."@".$weblog, + htmlspecialchars(RelativeToAbsoluteURLS($introduction.$body)) ); $rss_item= str_replace($from, $to, $rss_item); - $atom_item= str_replace($from, $to, $atom_item); $rss_items[$date]=$rss_item; - $atom_items[$date]=$atom_item; - - } function finish_rss() { @@ -1103,10 +1055,6 @@ ksort($rss_items); $rss_items= array_reverse($rss_items); - ksort($atom_items); - $atom_items= array_reverse($atom_items); - - //write out the rss if($Weblogs[$Current_weblog]['rss_filename'] != "") { @@ -1126,26 +1074,6 @@ write_file($filename, $rss); } - - - //write out the atom feed - if($Weblogs[$Current_weblog]['atom_filename'] != "") { - - foreach ($atom_items as $item) { - $atom .= $item; - } - - $atom.="\n\n"; - - $filename = $Weblogs[$Current_weblog]['rss_path'] . $Weblogs[$Current_weblog]['atom_filename']; - - add_log("Write Atom: $filename"); - - write_file($filename, $atom); - - - } - } diff -ru -d -N Pivot_1.10_full/pivot/pvlib.php pivot-martin/pivot/pvlib.php --- Pivot_1.10_full/pivot/pvlib.php 2004-03-15 16:06:50.000000000 +0100 +++ pivot-martin/pivot/pvlib.php 2004-06-15 03:43:05.000000000 +0200 @@ -1807,6 +1807,17 @@ } +function html2xml($i) { + + $i = str_replace ('<', '<', $i); + $i = str_replace ('>', '>', $i); + $i = str_replace ('"', '"', $i); + $i = str_replace ("'", ''', $i); + $i = str_replace ("&", '&', $i); + + return $i; + +} function addquotes($i) { diff -ru -d -N Pivot_1.10_full/pivot/templates/archivepage_template.html pivot-martin/pivot/templates/archivepage_template.html --- Pivot_1.10_full/pivot/templates/archivepage_template.html 2004-01-12 22:02:10.000000000 +0100 +++ pivot-martin/pivot/templates/archivepage_template.html 2004-06-14 22:17:10.000000000 +0200 @@ -2,85 +2,33 @@ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> - [[weblogtitle]] - [[weblogsubtitle]] + [[weblogtitle]] + [[rss_autodiscovery]] + [[atom_autodiscovery]] - + + [[calendar_style]] - + -
+
-
-

[[label:archives]]

-

+

+ - -
-

[[label:last_comments]]

-[[last_comments]] -
- -[[get_referrer]] -
-

[[label:last_referrers]]

-[[show_referrers]] -
- - -
-

[[label:links]]

-

[[link_list]]

+[[subweblog:standard]] -
-

Stuff

-

[[pivotbutton]] 
-[[rssbutton]] 
-

- - -

- - -
- -
- -
-

About

-

This is the default template for Pivot. You can change this text by editing the file templates/frontpage_template.html in your pivot folder.

-
- -
-

Linkdump

-[[subweblog:linkdump]]
- -
- -
- -
- -[[subweblog:standard]] - -
-
- - diff -ru -d -N Pivot_1.10_full/pivot/templates/_aux_link_list.html pivot-martin/pivot/templates/_aux_link_list.html --- Pivot_1.10_full/pivot/templates/_aux_link_list.html 2003-12-07 16:51:18.000000000 +0100 +++ pivot-martin/pivot/templates/_aux_link_list.html 2004-06-14 20:36:30.000000000 +0200 @@ -1,8 +1,3 @@

- -Google
-Pivot

- -To change this list, edit the file '_aux_link_list.html' in your pivot's templates folder. - +Mono

diff -ru -d -N Pivot_1.10_full/pivot/templates/_aux_template_onlybody.html pivot-martin/pivot/templates/_aux_template_onlybody.html --- Pivot_1.10_full/pivot/templates/_aux_template_onlybody.html 2004-01-31 16:58:28.000000000 +0100 +++ pivot-martin/pivot/templates/_aux_template_onlybody.html 2004-06-14 20:52:48.000000000 +0200 @@ -4,7 +4,7 @@ [[weblogtitle]] » [[title]] - + diff -ru -d -N Pivot_1.10_full/pivot/templates/_aux_template_onlycomments.html pivot-martin/pivot/templates/_aux_template_onlycomments.html --- Pivot_1.10_full/pivot/templates/_aux_template_onlycomments.html 2004-01-31 16:58:36.000000000 +0100 +++ pivot-martin/pivot/templates/_aux_template_onlycomments.html 1970-01-01 01:00:00.000000000 +0100 @@ -1,22 +0,0 @@ - - - - -[[weblogtitle]] » [[title]] - - - - - -
-

[[comments]]

- -[[commentform]] - -
-
- - - - diff -ru -d -N Pivot_1.10_full/pivot/templates/entrypage_template.html pivot-martin/pivot/templates/entrypage_template.html --- Pivot_1.10_full/pivot/templates/entrypage_template.html 2003-10-18 19:29:36.000000000 +0200 +++ pivot-martin/pivot/templates/entrypage_template.html 2004-06-14 21:46:33.000000000 +0200 @@ -2,28 +2,44 @@ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -[[weblogtitle]] » [[title]] - - + [[weblogtitle]] + [[rss_autodiscovery]] + [[atom_autodiscovery]] + + + [[calendar_style]] - - -
-

[[diffdate]] [[karma:good:+]] [[karma:bad:-]] [[title]]

- [[introduction]] - [[body]] - [[message]] - [[comments]] - [[commentform]] -
- -
-
-
+ + + + + +
+ +
+ +
+ +
+

[[fulldate]]

+ +
+

[[title]]

+ +

[[introduction]] +[[body]] +[[message]] +

+ +
+Posted by [[user:emailtonick]] at [[fulldate]]. +
+ +
diff -ru -d -N Pivot_1.10_full/pivot/templates/frontpage_template.html pivot-martin/pivot/templates/frontpage_template.html --- Pivot_1.10_full/pivot/templates/frontpage_template.html 2004-01-31 17:55:08.000000000 +0100 +++ pivot-martin/pivot/templates/frontpage_template.html 2004-06-15 04:11:32.000000000 +0200 @@ -2,102 +2,67 @@ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> - [[weblogtitle]] - [[weblogsubtitle]] + [[weblogtitle]] [[rss_autodiscovery]] [[atom_autodiscovery]] - + [[calendar_style]] - - -
+ -
-

Search

-[[search::go!]] +
+
+[[subweblog:standard]] +
+