php-blog-cvs — Serendipity commit list

[php-blog-cvs] serendipity/templates/mt-clean preview.png,NONE,1.4 style.css,1.6,1.10 info.txt,1.1,1.5 inactive.txt,1.1,NONE

[Evan N. <tad...@us...>]

Update of /cvsroot/php-blog/serendipity/templates/mt-clean
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17577/mt-plainjane

Modified Files:
	style.css info.txt 
Added Files:
	preview.png 
Removed Files:
	inactive.txt 
Log Message:
Import new versions of mt-clean, mt-georgiablue, mt-gettysburg, mt-plainjane, and mt-rusty.

--- NEW FILE: preview.png ---
(This appears to be a binary file; contents omitted.)

--- inactive.txt DELETED ---

Index: style.css
===================================================================
RCS file: /cvsroot/php-blog/serendipity/templates/mt-clean/style.css,v
retrieving revision 1.6
retrieving revision 1.10
diff -u -d -r1.6 -r1.10
--- style.css	26 Apr 2004 10:33:22 -0000	1.6
+++ style.css	15 Jul 2004 20:29:23 -0000	1.10
@@ -1,45 +1,53 @@
 /* HTML Elements */
 
 body {
-  background: #ffffff;
-  margin: 0px 0px 20px 0px;
+  color: #666;
+  background: white;
 }
 
 a,
 a:link,
 a:visited {
-  color: #003366;
-  text-decoration: underline;
+  color: #336666;
+  text-decoration: none;
 }
 
 a:active,
 a:hover {
-  color: #999999;
+  color: #669999;
 }
 
 h3, h4 {
-  margin: 0px;
-  padding: 0px;
+  margin: 0;
+  padding: 0;
 }
 
 /* Banner */
 
 #serendipity_banner {
-  border-top: 4px double #666666;
-  color: #333333;
-  padding: 15px;
+  padding: 1em;
 }
 
+a.homelink1,
+a.homelink1:hover,
+a.homelink1:link,
+a.homelink1:visited,
 #serendipity_banner h1 {
-  font-family: Palatino, Georgia, Verdana, Arial, sans-serif;
+  font-family: verdana, arial, sans-serif;
   font-size: x-large;
-  font-weight: normal;
+  color: #cc9933;
+  text-decoration: none;
 }
 
+a.homelink2,
+a.homelink2:hover,
+a.homelink2:link,
+a.homelink2:visited,
 #serendipity_banner h2 {
-  font-family: Palatino, Georgia, Times New Roman, serif;
-  font-size: small;
-  text-transform: none;
+  font-family: verdana, arial, sans-serif;
+  color: #ccc;
+  font-size: x-small;
+  font-weight: bold;
 }
 
 /* Calendar */
@@ -48,84 +56,145 @@
 table.serendipity_calendar a:link,
 table.serendipity_calendar a:visited,
 table.serendipity_calendar a:hover {
+  color: #666;
+  font-size: x-small;
 }
 
 table.serendipity_calendar td {
+  line-height: 140%;
+  font-size: x-small;
 }
 
 td.serendipity_weekDayName {
+  font-size: x-small;
 }
 
 td.serendipity_calendarHeader a:link,
 td.serendipity_calendarHeader a:visited,
 td.serendipity_calendarHeader a:hover {
+  font-family: verdana, arial, sans-serif;
+  color: #003366;
+  font-size: x-small;
+  text-decoration: none;
+  font-weight: bold;
 }
 
 /* Sidebars */
 
 #serendipityLeftSideBar,
 #serendipityRightSideBar {
-  border: 1px solid #ffffff;
   display: block;
-  padding: 15px;
+  padding: 10px;
   vertical-align: top;
-  width: 200px;			
 }
 
 .serendipitySideBarTitle {
-  color: #666600;
-  font-family: Palatino, Georgia, Times New Roman, serif;
-  font-size: small;
-  font-weight: normal;
-  letter-spacing: .3em;
-  margin-top: 30px;
-  padding: 2px;
+  font-family: verdana, arial, sans-serif;
+  color: #999;
+  font-size: x-small;
+  font-weight: bold;
+  line-height: 140%;
+  padding: 0.2em;
+  letter-spacing: 0.2em;
   text-transform: uppercase;
+  border-bottom: thin #666 dotted;
+  padding-left: 1em;
 }
 
 div.serendipitySideBarItem {
-  color: #333333;
-  font-family: Verdana, Arial, sans-serif;
+  font-family: verdana, arial, sans-serif;
+  color: #333;
   font-size: x-small;
   font-weight: normal;
-  line-height: 140%;
-  padding: 2px;
+  margin-bottom: 1em;
+  padding-bottom: 1em;
+}
+
+.serendipitySideBarContent {
+  padding-top: 0.5em;
+  padding-left: 1em;
+  padding-right: 1em;
 }
 
 /* Entries */
 
 div.serendipity_Entry_Date {
+  padding-left: 1em;
 }
 
 .serendipity_date {
+  font-family: verdana, arial, sans-serif; 
+  font-size: normal;
+  color: #999;
+  font-weight: bold;
+  text-transform: uppercase;
+  padding-top: 1em;
+  border-bottom: thin #666 dotted;
 }
 
-.serendipity_title,
-.serendipity_Admin_title {
+.serendipity_title {
+  border-left: thin #666 dotted;
+  border-right: thin #666 dotted;
+}
+
+.serendipity_title a,
+.serendipity_title a:hover,
+.serendipity_title a:link,
+.serendipity_title a:visited,
+.serendipity_Admin_title,
+.serendipity_Admin_title a,
+.serendipity_Admin_title a:hover,
+.serendipity_Admin_title a:link,
+.serendipity_Admin_title a:visited {
+  font-family: verdana, arial;
+  font-size: small;
+  font-weight: bold;
+  color: #ccc;
+  text-transform: uppercase;
+  text-decoration: none;
+  padding-left: 0.7em;
 }
 
 .serendipity_entry,
 .serendipity_admin {
+  font-size: small;
+  font-weight: normal;
+  line-height: 140%;
+  padding: 1em;
+  padding-left: 0.7em;
+  border-left: thin #666 dotted;
+  border-right: thin #666 dotted;
+  border-bottom: thin #666 dotted;
 }
 
 div.serendipity_entryFooter {
+  padding-top: 1em;
   clear: both;
+  font-size: x-small;
 }
 
-img.serendipity_entryIcon {
-    float: right;
-    border: 0px;
+div.serendipity_entryFooter a {
+  text-decoration: underline;
 }
 
 /* Comments */
 
 .serendipity_comment {
+  border-bottom: 1px dotted #999;
+  font-size: small;
+  margin-left: 10px;
+  margin-right: 10px;
+  padding: 3px;
 }
 
 .serendipity_commentsLabel {
+  font-size: small;
 }
 
 .serendipity_commentsTitle {
+  font-size: normal;
+  font-weight: bold;
+  text-transform: uppercase;
 }
 
 /* Admin */
@@ -138,3 +207,70 @@
 #content {
   width: 100%;
 }
+
+/** Embedded images with the s9y image manager **/
+.serendipity_imageComment_center,
+.serendipity_imageComment_left,
+.serendipity_imageComment_right {
+    border: 1px solid black;
+    background-color: #EFEFEF;
+    margin: 3px;
+}
+
+.serendipity_imageComment_center {
+    margin: 0px;
+}
+
+.serendipity_imageComment_left {
+    float: left;
+}
+
+.serendipity_imageComment_right {
+    float: right;
+}
+
+.serendipity_imageComment_img,
+.serendipity_imageComment_img img {
+    margin: 0px;
+    padding: 0px;
+    border: 0px;
+}
+
+.serendipity_imageComment_txt {
+    margin: 0px;
+    padding: 3px;
+    clear: both;
+    font-size: 9pt;
+}
+
+img.serendipity_entryIcon {
+    float: right;
+    border: 0px;
+}
+
+.serendipity_imageCommentClosing_center {
+    clear: both;
+    display: block;
+}
+
+.serendipity_admin_list_item_even {
+    background-color: #ffffff;
+}
+
+.serendipity_admin_list_item_uneven {
+    background-color: #eee;
+}
+
+.serendipity_admin_filters,
+.serendipity_admin_filters input,
+.serendipity_admin_filters select {
+}
+
+.serendipity_comments {
+}
+
+.serendipity_center {
+    margin-left: auto;
+    margin-right: auto;
+    text-align: center;
+}
\ No newline at end of file

Index: info.txt
===================================================================
RCS file: /cvsroot/php-blog/serendipity/templates/mt-clean/info.txt,v
retrieving revision 1.1
retrieving revision 1.5
diff -u -d -r1.1 -r1.5
--- info.txt	18 Feb 2004 08:30:22 -0000	1.1
+++ info.txt	15 Jul 2004 20:29:23 -0000	1.5
@@ -1,3 +1,3 @@
-Name: mt-clean
-Author: Sebastian Bergmann
-Date: 17/02/2004
+Name: mt-plainjane
+Author: Evan Nemerson
+Date: 29/06/2004

[php-blog-cvs] serendipity/templates/mt-clean preview.png,NONE,1.3 style.css,1.6,1.9 info.txt,1.1,1.4 inactive.txt,1.1,NONE

[Evan N. <tad...@us...>]

Update of /cvsroot/php-blog/serendipity/templates/mt-clean
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17577/mt-gettysburg

Modified Files:
	style.css info.txt 
Added Files:
	preview.png 
Removed Files:
	inactive.txt 
Log Message:
Import new versions of mt-clean, mt-georgiablue, mt-gettysburg, mt-plainjane, and mt-rusty.

--- NEW FILE: preview.png ---
(This appears to be a binary file; contents omitted.)

--- inactive.txt DELETED ---

Index: style.css
===================================================================
RCS file: /cvsroot/php-blog/serendipity/templates/mt-clean/style.css,v
retrieving revision 1.6
retrieving revision 1.9
diff -u -d -r1.6 -r1.9
--- style.css	26 Apr 2004 10:33:22 -0000	1.6
+++ style.css	15 Jul 2004 20:29:23 -0000	1.9
@@ -1,45 +1,67 @@
 /* HTML Elements */
 
 body {
-  background: #ffffff;
-  margin: 0px 0px 20px 0px;
+  color: #333;
+  background: #eee;
+}
+
+#mainpane {
+  margin-left: 1em;
+  margin-bottom: 1em;
+  margin-right: 1em;
+  background: white;
 }
 
 a,
 a:link,
 a:visited {
+  text-decoration: none;
   color: #003366;
-  text-decoration: underline;
 }
 
 a:active,
 a:hover {
-  color: #999999;
+  color: #FFCC66;
 }
 
 h3, h4 {
-  margin: 0px;
-  padding: 0px;
+  margin: 0;
+  padding: 0;
 }
 
 /* Banner */
 
 #serendipity_banner {
-  border-top: 4px double #666666;
-  color: #333333;
+  margin-left: 1em;
+  margin-top: 1em;
+  margin-right: 1em;
+  font-family: georgia, verdana, arial, sans-serif;
+  border-left: thin white solid;
+  border-top: thin white solid;
+  border-right: thin white solid;
+  background: #003366;
   padding: 15px;
 }
 
+a.homelink1,
+a.homelink1:hover,
+a.homelink1:link,
+a.homelink1:visited,
 #serendipity_banner h1 {
-  font-family: Palatino, Georgia, Verdana, Arial, sans-serif;
-  font-size: x-large;
-  font-weight: normal;
+  text-decoration: none;
+  color: white;
+  font-size: xx-large;
 }
 
+a.homelink2,
+a.homelink2:hover,
+a.homelink2:link,
+a.homelink2:visited,
 #serendipity_banner h2 {
-  font-family: Palatino, Georgia, Times New Roman, serif;
+  font-size: x-large;
+  text-decoration: none;
+  color: white;
   font-size: small;
-  text-transform: none;
 }
 
 /* Calendar */
@@ -48,84 +70,132 @@
 table.serendipity_calendar a:link,
 table.serendipity_calendar a:visited,
 table.serendipity_calendar a:hover {
+  color: #003366;
+  font-size: x-small;
 }
 
 table.serendipity_calendar td {
+  color: white;
+  line-height: 140%;
+  font-size: x-small;
 }
 
 td.serendipity_weekDayName {
+  color: white;
+  font-size: x-small;
+  font-weight: bold;
+  line-height: 140%;
 }
 
 td.serendipity_calendarHeader a:link,
 td.serendipity_calendarHeader a:visited,
 td.serendipity_calendarHeader a:hover {
+  color: white;
+  font-family: verdana, arial, sans-serif;
+  font-size: x-small;
+  font-weight: bold;
+  line-height: 140%;
 }
 
 /* Sidebars */
 
 #serendipityLeftSideBar,
 #serendipityRightSideBar {
-  border: 1px solid #ffffff;
-  display: block;
-  padding: 15px;
   vertical-align: top;
-  width: 200px;			
+  background: #999;
+  font-family: verdana, arial, sans-serif;
+  color: #333;
 }
 
 .serendipitySideBarTitle {
-  color: #666600;
-  font-family: Palatino, Georgia, Times New Roman, serif;
+  color: white;
   font-size: small;
-  font-weight: normal;
-  letter-spacing: .3em;
-  margin-top: 30px;
-  padding: 2px;
-  text-transform: uppercase;
+  font-family: georgia, verdana, arial, sans-serif;
+  border-bottom: thin white dotted;
+  text-align: center;
 }
 
 div.serendipitySideBarItem {
-  color: #333333;
-  font-family: Verdana, Arial, sans-serif;
+  font-family: palatino, georgia, times new roman, serif;
+  color: #333;
   font-size: x-small;
   font-weight: normal;
-  line-height: 140%;
-  padding: 2px;
+  margin-bottom: 1em;
+  padding-bottom: 1em;
+}
+
+.serendipitySideBarContent {
+  padding: 0.7em;
 }
 
 /* Entries */
 
 div.serendipity_Entry_Date {
+  margin: 10px;
+  padding: 10px;
+  width: auto;
 }
 
 .serendipity_date {
+  font-family: georgia, verdana, arial, sans-serif; 
+  font-size: small;
+  color: #666;
+  border-bottom: 1px solid #999;
+  margin-top: 10px;
+  font-weight: bold;
 }
 
 .serendipity_title,
-.serendipity_Admin_title {
+.serendipity_title a,
+.serendipity_title a:hover,
+.serendipity_title a:link,
+.serendipity_title a:visited,
+.serendipity_Admin_title,
+.serendipity_Admin_title a,
+.serendipity_Admin_title a:hover,
+.serendipity_Admin_title a:link,
+.serendipity_Admin_title a:visited {
+  padding-top: 1em;
+  padding-bottom: 1em;
+  font-family: verdana, arial, sans-serif;
+  color: black;
+  font-size: small;
+  text-decoration: none;
+  text-transform: uppercase;
 }
 
 .serendipity_entry,
 .serendipity_admin {
+  font-size: small;
+  font-weight: normal;
+  line-height: 140%;
 }
 
 div.serendipity_entryFooter {
   clear: both;
-}
-
-img.serendipity_entryIcon {
-    float: right;
-    border: 0px;
+  color: black;
+  padding-top: 1em;
+  font-size: x-small;
 }
 
 /* Comments */
 
 .serendipity_comment {
+  border-bottom: 1px dotted #999;
+  font-size: small;
+  margin-left: 10px;
+  margin-right: 10px;
+  padding: 3px;
 }
 
 .serendipity_commentsLabel {
+  font-size: small;
 }
 
 .serendipity_commentsTitle {
+  font-size: normal;
+  font-weight: bold;
+  text-transform: uppercase;
 }
 
 /* Admin */
@@ -138,3 +208,70 @@
 #content {
   width: 100%;
 }
+
+/** Embedded images with the s9y image manager **/
+.serendipity_imageComment_center,
+.serendipity_imageComment_left,
+.serendipity_imageComment_right {
+    border: 1px solid black;
+    background-color: #EFEFEF;
+    margin: 3px;
+}
+
+.serendipity_imageComment_center {
+    margin: 0px;
+}
+
+.serendipity_imageComment_left {
+    float: left;
+}
+
+.serendipity_imageComment_right {
+    float: right;
+}
+
+.serendipity_imageComment_img,
+.serendipity_imageComment_img img {
+    margin: 0px;
+    padding: 0px;
+    border: 0px;
+}
+
+.serendipity_imageComment_txt {
+    margin: 0px;
+    padding: 3px;
+    clear: both;
+    font-size: 9pt;
+}
+
+img.serendipity_entryIcon {
+    float: right;
+    border: 0px;
+}
+
+.serendipity_imageCommentClosing_center {
+    clear: both;
+    display: block;
+}
+
+.serendipity_admin_list_item_even {
+    background-color: #ffffff;
+}
+
+.serendipity_admin_list_item_uneven {
+    background-color: #E0E0E0;
+}
+
+.serendipity_admin_filters,
+.serendipity_admin_filters input,
+.serendipity_admin_filters select {
+}
+
+.serendipity_comments {
+}
+
+.serendipity_center {
+    margin-left: auto;
+    margin-right: auto;
+    text-align: center;
+}
\ No newline at end of file

Index: info.txt
===================================================================
RCS file: /cvsroot/php-blog/serendipity/templates/mt-clean/info.txt,v
retrieving revision 1.1
retrieving revision 1.4
diff -u -d -r1.1 -r1.4
--- info.txt	18 Feb 2004 08:30:22 -0000	1.1
+++ info.txt	15 Jul 2004 20:29:23 -0000	1.4
@@ -1,3 +1,3 @@
-Name: mt-clean
-Author: Sebastian Bergmann
-Date: 17/02/2004
+Name: mt-gettysburg
+Author: Evan Nemerson
+Date: 29/06/2004

[php-blog-cvs] serendipity/templates/mt-clean preview.png,NONE,1.2 style.css,1.6,1.8 info.txt,1.1,1.3 inactive.txt,1.1,NONE

[Evan N. <tad...@us...>]

Update of /cvsroot/php-blog/serendipity/templates/mt-clean
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17577/mt-georgiablue

Modified Files:
	style.css info.txt 
Added Files:
	preview.png 
Removed Files:
	inactive.txt 
Log Message:
Import new versions of mt-clean, mt-georgiablue, mt-gettysburg, mt-plainjane, and mt-rusty.

--- NEW FILE: preview.png ---
(This appears to be a binary file; contents omitted.)

--- inactive.txt DELETED ---

Index: style.css
===================================================================
RCS file: /cvsroot/php-blog/serendipity/templates/mt-clean/style.css,v
retrieving revision 1.6
retrieving revision 1.8
diff -u -d -r1.6 -r1.8
--- style.css	26 Apr 2004 10:33:22 -0000	1.6
+++ style.css	15 Jul 2004 20:29:23 -0000	1.8
@@ -1,45 +1,57 @@
 /* HTML Elements */
 
 body {
-  background: #ffffff;
-  margin: 0px 0px 20px 0px;
+  color: #333;
+  background: white;
 }
 
 a,
 a:link,
 a:visited {
-  color: #003366;
-  text-decoration: underline;
+  color: #999966;
+  text-decoration: none;
 }
 
 a:active,
 a:hover {
-  color: #999999;
+  color: #99CC66;
 }
 
 h3, h4 {
-  margin: 0px;
-  padding: 0px;
+  margin: 0;
+  padding: 0;
 }
 
 /* Banner */
 
 #serendipity_banner {
-  border-top: 4px double #666666;
-  color: #333333;
+  font-family: verdana, arial, sans-serif;
+  border-bottom: thin dotted white;
+  border-top: medium solid #99CCFF;
+  background: #336699;
   padding: 15px;
+  letter-spacing: 0.2em;
 }
 
+a.homelink1,
+a.homelink1:hover,
+a.homelink1:link,
+a.homelink1:visited,
 #serendipity_banner h1 {
-  font-family: Palatino, Georgia, Verdana, Arial, sans-serif;
+  color: white;
+  text-decoration: none;
   font-size: x-large;
-  font-weight: normal;
 }
 
+a.homelink2,
+a.homelink2:hover,
+a.homelink2:link,
+a.homelink2:visited,
 #serendipity_banner h2 {
-  font-family: Palatino, Georgia, Times New Roman, serif;
+  font-size: x-large;
+  text-decoration: none;
+  color: #99CCFF;
   font-size: small;
-  text-transform: none;
 }
 
 /* Calendar */
@@ -48,48 +60,64 @@
 table.serendipity_calendar a:link,
 table.serendipity_calendar a:visited,
 table.serendipity_calendar a:hover {
+  color: #666;
+  font-size: x-small;
 }
 
 table.serendipity_calendar td {
+  line-height: 140%;
+  font-size: x-small;
 }
 
 td.serendipity_weekDayName {
+  font-size: x-small;
 }
 
 td.serendipity_calendarHeader a:link,
 td.serendipity_calendarHeader a:visited,
 td.serendipity_calendarHeader a:hover {
+  font-family: verdana, arial, sans-serif;
+  color: #003366;
+  font-size: x-small;
+  text-decoration: none;
+  font-weight: bold;
 }
 
 /* Sidebars */
 
 #serendipityLeftSideBar,
 #serendipityRightSideBar {
-  border: 1px solid #ffffff;
   display: block;
-  padding: 15px;
+  padding: 10px;
   vertical-align: top;
-  width: 200px;			
 }
 
 .serendipitySideBarTitle {
-  color: #666600;
-  font-family: Palatino, Georgia, Times New Roman, serif;
-  font-size: small;
-  font-weight: normal;
-  letter-spacing: .3em;
-  margin-top: 30px;
-  padding: 2px;
+  font-family: verdana, arial, sans-serif;
+  color: #666;
+  font-size: x-small;
+  font-weight: bold;
+  background-color: #eee;
+  line-height: 140%;
+  padding: 0.2em;
+  letter-spacing: 0.2em;
   text-transform: uppercase;
+  text-align: center;
 }
 
 div.serendipitySideBarItem {
-  color: #333333;
-  font-family: Verdana, Arial, sans-serif;
+  font-family: verdana, arial, sans-serif;
+  color: #333;
   font-size: x-small;
   font-weight: normal;
-  line-height: 140%;
-  padding: 2px;
+  margin-bottom: 1em;
+  padding-bottom: 1em;
+}
+
+.serendipitySideBarContent {
+  padding-top: 0.5em;
+  padding-left: 0.7em;
+  padding-right: 0.7em;
 }
 
 /* Entries */
@@ -98,34 +126,68 @@
 }
 
 .serendipity_date {
+  font-family: georgia, verdana, arial, sans-serif;
+  font-size: small;
+  color: #666;
+  border: thin #999 solid;
+  padding: 0.5em;
+  margin-bottom: 1em;
+  padding-left: 1em;
 }
 
 .serendipity_title,
-.serendipity_Admin_title {
+.serendipity_title a,
+.serendipity_title a:hover,
+.serendipity_title a:link,
+.serendipity_title a:visited,
+.serendipity_Admin_title,
+.serendipity_Admin_title a,
+.serendipity_Admin_title a:hover,
+.serendipity_Admin_title a:link,
+.serendipity_Admin_title a:visited {
+  font-family: verdana, arial; 
+  color: #003366;
+  font-weight: bold;
+  font-size: small;
+  text-transform: uppercase;
+  text-decoration: none;
+  padding-left: 0.7em;
 }
 
 .serendipity_entry,
 .serendipity_admin {
+  font-size: small;
+  font-weight: normal;
+  line-height: 140%;
+  padding: 1em;
+  padding-left: 1.5em;
 }
 
 div.serendipity_entryFooter {
+  padding-top: 1em;
+  color: #003366;
   clear: both;
-}
-
-img.serendipity_entryIcon {
-    float: right;
-    border: 0px;
+  font-size: x-small;
 }
 
 /* Comments */
 
 .serendipity_comment {
+  border-bottom: 1px dotted #999;
+  font-size: small;
+  margin-left: 10px;
+  margin-right: 10px;
+  padding: 3px;
 }
 
 .serendipity_commentsLabel {
+  font-size: small;
 }
 
 .serendipity_commentsTitle {
+  font-size: normal;
+  font-weight: bold;
+  text-transform: uppercase;
 }
 
 /* Admin */
@@ -138,3 +200,70 @@
 #content {
   width: 100%;
 }
+
+/** Embedded images with the s9y image manager **/
+.serendipity_imageComment_center,
+.serendipity_imageComment_left,
+.serendipity_imageComment_right {
+    border: 1px solid black;
+    background-color: #EFEFEF;
+    margin: 3px;
+}
+
+.serendipity_imageComment_center {
+    margin: 0px;
+}
+
+.serendipity_imageComment_left {
+    float: left;
+}
+
+.serendipity_imageComment_right {
+    float: right;
+}
+
+.serendipity_imageComment_img,
+.serendipity_imageComment_img img {
+    margin: 0px;
+    padding: 0px;
+    border: 0px;
+}
+
+.serendipity_imageComment_txt {
+    margin: 0px;
+    padding: 3px;
+    clear: both;
+    font-size: 9pt;
+}
+
+img.serendipity_entryIcon {
+    float: right;
+    border: 0px;
+}
+
+.serendipity_imageCommentClosing_center {
+    clear: both;
+    display: block;
+}
+
+.serendipity_admin_list_item_even {
+    background-color: #ffffff;
+}
+
+.serendipity_admin_list_item_uneven {
+    background-color: #eee;
+}
+
+.serendipity_admin_filters,
+.serendipity_admin_filters input,
+.serendipity_admin_filters select {
+}
+
+.serendipity_comments {
+}
+
+.serendipity_center {
+    margin-left: auto;
+    margin-right: auto;
+    text-align: center;
+}
\ No newline at end of file

Index: info.txt
===================================================================
RCS file: /cvsroot/php-blog/serendipity/templates/mt-clean/info.txt,v
retrieving revision 1.1
retrieving revision 1.3
diff -u -d -r1.1 -r1.3
--- info.txt	18 Feb 2004 08:30:22 -0000	1.1
+++ info.txt	15 Jul 2004 20:29:23 -0000	1.3
@@ -1,3 +1,3 @@
-Name: mt-clean
-Author: Sebastian Bergmann
-Date: 17/02/2004
+Name: mt-georgablue
+Author: Evan Nemerson
+Date: 29/06/2004

[php-blog-cvs] serendipity/templates/mt-clean preview.png,NONE,1.1 style.css,1.6,1.7 info.txt,1.1,1.2 inactive.txt,1.1,NONE

[Evan N. <tad...@us...>]

Update of /cvsroot/php-blog/serendipity/templates/mt-clean
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17577/mt-clean

Modified Files:
	style.css info.txt 
Added Files:
	preview.png 
Removed Files:
	inactive.txt 
Log Message:
Import new versions of mt-clean, mt-georgiablue, mt-gettysburg, mt-plainjane, and mt-rusty.

--- NEW FILE: preview.png ---
(This appears to be a binary file; contents omitted.)

--- inactive.txt DELETED ---

Index: style.css
===================================================================
RCS file: /cvsroot/php-blog/serendipity/templates/mt-clean/style.css,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- style.css	26 Apr 2004 10:33:22 -0000	1.6
+++ style.css	15 Jul 2004 20:29:22 -0000	1.7
@@ -1,15 +1,15 @@
 /* HTML Elements */
 
 body {
-  background: #ffffff;
-  margin: 0px 0px 20px 0px;
+  color: #333;
+  background: white;
 }
 
 a,
 a:link,
 a:visited {
-  color: #003366;
   text-decoration: underline;
+  color: #003366;
 }
 
 a:active,
@@ -18,28 +18,39 @@
 }
 
 h3, h4 {
-  margin: 0px;
-  padding: 0px;
+  margin: 0;
+  padding: 0;
 }
 
 /* Banner */
 
 #serendipity_banner {
-  border-top: 4px double #666666;
-  color: #333333;
+  font-family: palatino, georgia, verdana, arial, sans-serif;
+  color: #333;
+  font-weight: normal;
   padding: 15px;
+  border-top: 4px double #666;
 }
 
+a.homelink1,
+a.homelink1:hover,
+a.homelink1:link,
+a.homelink1:visited,
 #serendipity_banner h1 {
-  font-family: Palatino, Georgia, Verdana, Arial, sans-serif;
-  font-size: x-large;
-  font-weight: normal;
+  text-decoration: none;
+  color: #333;
+  font-size: xx-large;
 }
 
+a.homelink2,
+a.homelink2:hover,
+a.homelink2:link,
+a.homelink2:visited,
 #serendipity_banner h2 {
-  font-family: Palatino, Georgia, Times New Roman, serif;
+  font-size: x-large;
+  text-decoration: none;
+  color: #333;
   font-size: small;
-  text-transform: none;
 }
 
 /* Calendar */
@@ -48,84 +59,122 @@
 table.serendipity_calendar a:link,
 table.serendipity_calendar a:visited,
 table.serendipity_calendar a:hover {
+  color: #666;
+  font-size: x-small;
 }
 
 table.serendipity_calendar td {
+  line-height: 140%;
+  font-size: x-small;
 }
 
 td.serendipity_weekDayName {
+  font-size: x-small;
+  font-weight: bold;
+  line-height: 140%;
 }
 
 td.serendipity_calendarHeader a:link,
 td.serendipity_calendarHeader a:visited,
 td.serendipity_calendarHeader a:hover {
+  font-family: palatino, georgia, times new roman, serif;
+  color: #666600;
+  font-size: small;
+  letter-spacing: 0.3em;
+  text-transform: uppercase;
+  text-decoration: none;
 }
 
 /* Sidebars */
 
 #serendipityLeftSideBar,
 #serendipityRightSideBar {
-  border: 1px solid #ffffff;
   display: block;
-  padding: 15px;
+  padding: 10px;
   vertical-align: top;
-  width: 200px;			
 }
 
 .serendipitySideBarTitle {
+  font-family: palatino, georgia, times new roman, serif;
   color: #666600;
-  font-family: Palatino, Georgia, Times New Roman, serif;
   font-size: small;
-  font-weight: normal;
-  letter-spacing: .3em;
-  margin-top: 30px;
-  padding: 2px;
+  letter-spacing: 0.3em;
   text-transform: uppercase;
 }
 
 div.serendipitySideBarItem {
-  color: #333333;
-  font-family: Verdana, Arial, sans-serif;
+  font-family: palatino, georgia, times new roman, serif;
+  color: #333;
   font-size: x-small;
   font-weight: normal;
-  line-height: 140%;
-  padding: 2px;
+  margin-bottom: 1em;
+  padding-bottom: 1em;
 }
 
 /* Entries */
 
 div.serendipity_Entry_Date {
+  margin: 10px;
+  padding: 10px;
+  width: auto;
 }
 
 .serendipity_date {
+  font-family: palatino, georgia, times new roman, serif;
+  font-size: large;
+  color: #333;
+  border-bottom: 1px solid #999;
+  margin-top: 10px;
+  font-weight: bold;
 }
 
 .serendipity_title,
-.serendipity_Admin_title {
+.serendipity_title a,
+.serendipity_title a:hover,
+.serendipity_title a:link,
+.serendipity_title a:visited,
+.serendipity_Admin_title,
+.serendipity_Admin_title a,
+.serendipity_Admin_title a:hover,
+.serendipity_Admin_title a:link,
+.serendipity_Admin_title a:visited {
+  font-family: palatino, georgia, times new roman, serif;
+  color: #666;
+  font-size: medium;
+  text-decoration: none;
 }
 
 .serendipity_entry,
 .serendipity_admin {
+  font-size: small;
+  font-weight: normal;
+  line-height: 140%;
+  padding: 10px;
 }
 
 div.serendipity_entryFooter {
   clear: both;
-}
-
-img.serendipity_entryIcon {
-    float: right;
-    border: 0px;
+  font-size: x-small;
 }
 
 /* Comments */
 
 .serendipity_comment {
+  border-bottom: 1px dotted #999;
+  font-size: small;
+  margin-left: 10px;
+  margin-right: 10px;
+  padding: 3px;
 }
 
 .serendipity_commentsLabel {
+  font-size: small;
 }
 
 .serendipity_commentsTitle {
+  font-size: normal;
+  font-weight: bold;
+  text-transform: uppercase;
 }
 
 /* Admin */
@@ -138,3 +187,70 @@
 #content {
   width: 100%;
 }
+
+/** Embedded images with the s9y image manager **/
+.serendipity_imageComment_center,
+.serendipity_imageComment_left,
+.serendipity_imageComment_right {
+    border: 1px solid black;
+    background-color: #EFEFEF;
+    margin: 3px;
+}
+
+.serendipity_imageComment_center {
+    margin: 0px;
+}
+
+.serendipity_imageComment_left {
+    float: left;
+}
+
+.serendipity_imageComment_right {
+    float: right;
+}
+
+.serendipity_imageComment_img,
+.serendipity_imageComment_img img {
+    margin: 0px;
+    padding: 0px;
+    border: 0px;
+}
+
+.serendipity_imageComment_txt {
+    margin: 0px;
+    padding: 3px;
+    clear: both;
+    font-size: 9pt;
+}
+
+img.serendipity_entryIcon {
+    float: right;
+    border: 0px;
+}
+
+.serendipity_imageCommentClosing_center {
+    clear: both;
+    display: block;
+}
+
+.serendipity_admin_list_item_even {
+    background-color: #ffffff;
+}
+
+.serendipity_admin_list_item_uneven {
+    background-color: #E0E0E0;
+}
+
+.serendipity_admin_filters,
+.serendipity_admin_filters input,
+.serendipity_admin_filters select {
+}
+
+.serendipity_comments {
+}
+
+.serendipity_center {
+    margin-left: auto;
+    margin-right: auto;
+    text-align: center;
+}
\ No newline at end of file

Index: info.txt
===================================================================
RCS file: /cvsroot/php-blog/serendipity/templates/mt-clean/info.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- info.txt	18 Feb 2004 08:30:22 -0000	1.1
+++ info.txt	15 Jul 2004 20:29:22 -0000	1.2
@@ -1,3 +1,3 @@
 Name: mt-clean
-Author: Sebastian Bergmann
-Date: 17/02/2004
+Author: Evan Nemerson
+Date: 29/06/2004

[php-blog-cvs] serendipity serendipity_functions.inc.php,1.334,1.335

[Kristian K. <is...@us...>]

Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17481

Modified Files:
	serendipity_functions.inc.php 
Log Message:
Repair borked comment attributions


Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.334
retrieving revision 1.335
diff -u -d -r1.334 -r1.335
--- serendipity_functions.inc.php	15 Jul 2004 07:54:13 -0000	1.334
+++ serendipity_functions.inc.php	15 Jul 2004 20:29:06 -0000	1.335
@@ -1463,7 +1463,7 @@
     foreach ($comments as $comment) {
         if ($comment['parent_id'] == $parent) {
             $i++;
-            $retval .= '<option value="' . $comment['id'] . '"'. ($selected == $comment['id'] || (isset($serendipity['POST']['replyTo']) && $comment['id'] == $serendipity['POST']['replyTo']) ? ' selected="selected"' : '') .'>' . str_repeat('&nbsp;', $level * 2) . '#' . $indent . $i . ': ' . (empty($comment['author']) ? ANONYMOUS : $comment['author']) . ' ' . ON . ' ' . ucfirst(strftime('%b %e %Y, %H:%M', $comment['timestamp'])) . "</option>\n";
+            $retval .= '<option value="' . $comment['id'] . '"'. ($selected == $comment['id'] || (isset($serendipity['POST']['replyTo']) && $comment['id'] == $serendipity['POST']['replyTo']) ? ' selected="selected"' : '') .'>' . str_repeat('&nbsp;', $level * 2) . '#' . $indent . $i . ': ' . (empty($comment['username']) ? ANONYMOUS : $comment['username']) . ' ' . ON . ' ' . ucfirst(strftime('%b %e %Y, %H:%M', $comment['timestamp'])) . "</option>\n";
             $retval .= serendipity_generateCommentList($id, $comments, $selected, $comment['id'], $level + 1, $i . '.');
         }
     }
@@ -1502,7 +1502,7 @@
                 $comment['email'] = str_replace('@', '[at]', $comment['email']);
             }
 
-            $name = empty($comment['author']) ? ANONYMOUS : $comment['author'];
+            $name = empty($comment['username']) ? ANONYMOUS : $comment['username'];
             $body = $comment['comment'];
 ?>
     <div class="serendipity_comment">

[php-blog-cvs] serendipity/templates/mt3-chalkboard info.txt,NONE,1.1 preview.png,NONE,1.1 style.css,NONE,1.1

[Tom S. <tom...@us...>]

Update of /cvsroot/php-blog/serendipity/templates/mt3-chalkboard
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21771

Added Files:
	info.txt preview.png style.css 
Log Message:
Introducing MovableType 3 - Chalkboard


--- NEW FILE: preview.png ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: style.css ---
h4,h3 {
    margin: 0;
}

.serendipitySideBarContent input {
    width: 175px;
}

#mainpane {
    line-height: 140%;
    text-align: left;
    padding: 0px;
    width: 700px;
    background-color: #222;
    border: 1px solid #FFFFFF;
    margin: auto;
}

#serendipity_comment_page {
    line-height: 140%;
    text-align: left;
    padding: 0px;
    background-color: #222;
    border: 1px solid #FFFFFF;
    margin: auto;

}

#content {
    width: 500px;
    color: #ffffff;
}

#serendipityRightSideBar {
    width: 150px;
    padding: 10px;
    background-color: #222;
    vertical-align: top;
}

#serendipityLeftSideBar {
    width: 150px;
    padding: 10px;
    vertical-align: top;
    background-color: #222;
}

BODY {
	margin: 0px 0px 20px 0px;
	background-color: #6699CC;
}

INPUT, TEXTAREA {
    font-size: x-small;
    font-family: verdana, arial, helvetica, sans-serif;
}

TH, TD {
    font-size: x-small;
}

P, TD, TH, DIV, SPAN {
    font-family: verdana, arial, helvetica, sans-serif;
}

#serendipity_banner {
    font-family: Georgia, 'Times New Roman', serif;
    color: #FFFFFF;
    background-color: #000000;
    text-align: left;
    border-bottom: 1px solid #FFFFFF;
    width: 700px;
    height: 76px;
    margin: auto;
}

a.homelink1,
a.homelink1:hover,
a.homelink1:link,
a.homelink1:visited,
#serendipity_banner h1 {
    color: #ffffff;
    font-size: xx-large;
    font-weight: bold;
    padding-left:10px;
    padding-top: 5px;
    margin: 0px;
    text-decoration: none;
}

a.homelink2,
a.homelink2:hover,
a.homelink2:link,
a.homelink2:visited,
#serendipity_banner h2 {
    color: #FFFFFF;
    padding-left: 10px;
    font-size: small;
    margin: 0px;
    text-decoration: none;
}

.serendipity_title {
    color: #FFFFFF;
    font-family: Georgia, 'Times New Roman', serif;
    font-size: medium;
    text-align: left;
    font-weight: bold;
    padding-left: 7px;
}

.serendipity_title a:link {
    color: #ffffff;
    text-decoration: none;
}

.serendipity_title a:visited {
    color: #ffffff;
    text-decoration: none;
}

.serendipity_title a:hover {
    color: #ffffff;
    text-decoration: none;
}

.serendipity_entry {
    padding: 10px 15px 5px 7px;
    background-color: #222;
    color: #ffffff;
    font-family: Helvetica, Arial, sans-serif;
    font-size: small;
    clear: both;
}

.serendipity_entry_body_folded,
.serendipity_entry_body_unfolded,
.serendipity_entry_extended {
    /* Inner blocks of .serendipity_entry, can be used for further customization */
}

div.serendipity_Entry_Date {
    padding-left: 5px;
    width: auto;
}

.serendipity_date {
    color: #FFFFFF;
    font-family: Helvetica, Arial, sans-serif;
    font-size: small;
    text-align: left;
    font-weight: bold;
    margin-bottom: 10px;
}

.serendipity_commentsTitle {
    display: block;
    width: 100%;
    color: #ffffff;
    font-size: x-small;
    font-weight: bold;
    padding-left:8px;
}

div.serendipity_entryFooter {
    color: #FFFFFF;
    font-family: Helvetica, Arial, sans-serif;
    font-size: x-small;
    border-top: 1px solid #666666;
    text-align: left;
    margin-bottom: 25px;
    line-height: normal;
    padding: 3px;
    
}

img.serendipity_entryIcon {
    float: right;
    border: 0px;
}

img.serendipity_entryIcon {
    float: right;
    border: 0px;
}

TD.serendipity_commentsLabel {
    font-weight: bold;
    width: 10%;
    vertical-align: top;
}

.serendipity_commentForm {
    font-size:x-small;
    color: #000000;
    margin-bottom: 13px;
    margin-right: 10px;
    margin-left: 10px;
}
.serendipity_comment {
    font-family: Helvetica, Arial, sans-serif;
    margin-right: 10px;
    margin-left: 10px;
    color: #ffffff;
    padding: 3px;
    font-size: small;
    border-right: 1px dotted #BBB;
}

.serendipity_comment_source {
    font-family: Helvetica, Arial, sans-serif;
    margin-top: 5px;
    padding-left: 5px;
    margin-bottom: 5px;
    font-weight: bold;
    font-size: small;
}

TD.serendipity_admin {
    padding: 10px;
}

a {
	text-decoration: underline;
	
	
	}

a:link {
	color: #6699CC;
	}

a:visited {
	color: #6699CC;
	}

a:active {
	color: #6699CC;
	}

a:hover {
	color: #99CC66;
	}

TABLE.serendipity_calendar TD {
    font-size: x-small;
    padding: 3px;
}
TABLE.serendipity_calendar A {
    font-weight: bold;
    text-decoration:none;
}

TABLE.serendipity_calendar A:hover {
    text-decoration: none;
}

TD.serendipity_weekDayName {
    font-size: x-small;
    font-weight:bold;
}
TD.serendipity_calendarHeader A:link,
TD.serendipity_calendarHeader A:visited,
TD.serendipity_calendarHeader A:hover {
    border: 0;
    text-decoration: none;
}
div.serendipityPlug, div.serendipityPlug A {
    font-size: 11px;
    text-decoration: none;
    border: 0px;
}

/* Container for each item on the side bar */
div.serendipitySideBarItem {
	color: #ffffff;
	font-family: Helvetica, Arial, sans-serif;
	font-size: x-small;
	text-align: left;
	margin-bottom: 25px;
	line-height: normal;
	padding: 3px;}

/* title of an individual item */
.serendipitySideBarTitle {
    color: #ffffff;
    font-family: Helvetica, Arial, sans-serif;
    font-size: x-small;
    text-align: left;
    font-weight: bold;
    text-transform: uppercase;
    letter-spacing: .3em;
    padding-bottom: 5px;
}

.serendipityImageButton {
    cursor: pointer;
}

td.serendipitySideBar {
    font-size: x-small;
    width: 200px;
    padding: 10px;
}

div.serendipity_admin_title {
    font-size: 22px;
    font-weight: bold;
    margin-bottom: 12px;
    color: #ffffff;
}
div.serendipity_admin,
.serendipityEntryEdit {
    color: #ffffff;
}

div.serendipity_admin_list_title {
    font-size: 12px;
    font-weight: bold;
    margin-bottom: 8px;
}

td.serendipity_admin_list_item {
    padding: 15px;
    border: dashed 1px #000000;
}

.serendipity_entry p {
    margin: 0px;
    padding-bottom: 10px;
}

/** Embedded images with the s9y image manager **/
.serendipity_imageComment_center,
.serendipity_imageComment_left,
.serendipity_imageComment_right {
    border: 1px solid black;
    background-color: #EFEFEF;
    margin: 3px;
}

.serendipity_imageComment_center {
    margin: 0px;
}

.serendipity_imageComment_left {
    float: left;
}

.serendipity_imageComment_right {
    float: right;
}

.serendipity_imageComment_img,
.serendipity_imageComment_img img {
    margin: 0px;
    padding: 0px;
    border: 0px;
}

.serendipity_imageComment_txt {
    margin: 0px;
    padding: 3px;
    clear: both;
    font-size: xx-small;
}

.serendipity_imageCommentClosing_center {
    clear: both;
    display: block;
}

.serendipity_admin_list_item_even {
    background-color: #cccccc;
}

.serendipity_admin_list_item_uneven {
    background-color: #E0E0E0;
}
.serendipity_admin_filters {
    font-size: 10px;
    color: #ffffff;
}

.serendipity_admin_filters input,
.serendipity_admin_filters select {
    font-size: 10px;
}

.serendipity_comments {
}

.serendipity_center {
    text-align: center;
    font-family: Helvetica, Arial, sans-serif;
    font-size: small;
}

--- NEW FILE: info.txt ---
Name: MoveableType 3 - Chalkboard
Author: Kaustubh Srikanth
Date: 31-06-2004

[php-blog-cvs] serendipity/templates/mt3-chalkboard - New directory

[Tom S. <tom...@us...>]

Update of /cvsroot/php-blog/serendipity/templates/mt3-chalkboard
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20669/mt3-chalkboard

Log Message:
Directory /cvsroot/php-blog/serendipity/templates/mt3-chalkboard added to the repository

[php-blog-cvs] serendipity serendipity_admin_image_selector.php,1.24,1.25

[Garvin H. <gar...@us...>]

Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1868

Modified Files:
	serendipity_admin_image_selector.php 
Log Message:
wrong path link for images in subdirectories


Index: serendipity_admin_image_selector.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_image_selector.php,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- serendipity_admin_image_selector.php	17 Jun 2004 20:13:48 -0000	1.24
+++ serendipity_admin_image_selector.php	15 Jul 2004 13:31:57 -0000	1.25
@@ -83,7 +83,7 @@
                 <br />
                 <input id="radio_islink_yes" type="radio" name="serendipity[isLink]" checked="checked" /><label for="radio_islink_yes"> <?php echo I_WANT_NO_LINK; ?></label><br />
                 <input id="radio_islink_no"  type="radio" name="serendipity[isLink]" /><label for="radio_islink_no"> <?php echo I_WANT_IT_TO_LINK; ?></label>
-                    <input type="text"  name="serendipity[url]" size="30" value="<?php echo $serendipity['serendipityHTTPPath'] . $serendipity['uploadPath'] . $file['name'] .'.'. $file['extension']; ?>" onfocus="value='';" /><br />
+                    <input type="text"  name="serendipity[url]" size="30" value="<?php echo $serendipity['serendipityHTTPPath'] . $serendipity['uploadPath'] . $file['path'] . $file['name'] .'.'. $file['extension']; ?>" onfocus="value='';" /><br />
                 <br />
 
                 <b><?php echo COMMENT; ?>:</b>

[php-blog-cvs] serendipity serendipity_functions_images.inc.php,1.17,1.18

[Garvin H. <gar...@us...>]

Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1264

Modified Files:
	serendipity_functions_images.inc.php 
Log Message:
subdirectory not selected after submitting


Index: serendipity_functions_images.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions_images.inc.php,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- serendipity_functions_images.inc.php	15 Jul 2004 07:30:46 -0000	1.17
+++ serendipity_functions_images.inc.php	15 Jul 2004 13:29:14 -0000	1.18
@@ -857,7 +857,7 @@
                             break;
                     }
 
-                    serendipity_traversePath($out, $basedir, $jscode, $cdir . $file, $show_files, $pattern, $output_mode, $level + 1);
+                    serendipity_traversePath($out, $basedir, $jscode, $cdir . $file, $show_files, $pattern, $output_mode, $level + 1, $selected);
                 } elseif ($show_files) {
                     $out .= '<li>' . $file . '</li>' . "\n";
                 }

[php-blog-cvs] serendipity serendipity_functions.inc.php,1.333,1.334

[Garvin H. <gar...@us...>]

Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10889

Modified Files:
	serendipity_functions.inc.php 
Log Message:
changed DISTINCT/GROUP BY issues. See mailinglist.


Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.333
retrieving revision 1.334
diff -u -d -r1.333 -r1.334
--- serendipity_functions.inc.php	15 Jul 2004 03:59:07 -0000	1.333
+++ serendipity_functions.inc.php	15 Jul 2004 07:54:13 -0000	1.334
@@ -727,11 +727,14 @@
         }
     }
 
-    ##Query modified to remove GROUP BY clause.  If Distinct doesn't work
-    ##for mysql, please see the serendipity_mailSubscribers function in
-    ##this file for an example of how to fix it.
+    if (strtolower($serendipity['dbType']) == 'postgres') {
+        $group = 'DISTINCT ON (e.id)';
+    } else {
+        $group = 'GROUP BY e.id';
+    }
+
     $query = "SELECT
-                    DISTINCT(e.id),
+                    e.id,
                     e.title,
                     e.timestamp,
                     e.comments,
@@ -755,11 +758,10 @@
                         ON e.id = ec.entryid
                     LEFT JOIN {$serendipity['dbPrefix']}category c
                         ON ec.categoryid = c.categoryid $and
+                    $group
                     ORDER BY
                         $orderby
                     $limit";
-                    #GROUP BY
-                    #    e.id
 
     $ret = serendipity_db_query($query);
 
@@ -911,11 +913,14 @@
 function serendipity_searchEntries($term) {
     global $serendipity;
 
-    ##Query modified to remove GROUP BY clause.  If Distinct doesn't work
-    ##for mysql, please see the serendipity_mailSubscribers function in
-    ##this file for an example of how to fix it.
+    if (strtolower($serendipity['dbType']) == 'postgres') {
+        $group = 'DISTINCT ON (e.id)';
+    } else {
+        $group = 'GROUP BY e.id';
+    }
+
     $querystring = "SELECT
-                            DISTINCT(e.id),
+                            e.id,
                             e.author,
                             a.username,
                             a.email,
@@ -936,10 +941,9 @@
                             AND e.id = ec.entryid
                             AND MATCH (title,body,extended) AGAINST ('" . serendipity_db_escape_string($term) . "')
                             AND isdraft = 'false'
+                    $group
                     ORDER BY
                             timestamp DESC";
-                    #GROUP BY
-                    #        e.id
 
     return serendipity_db_query($querystring);
 }
@@ -1394,8 +1398,14 @@
         $and = 'AND co.entry_id=' . $id;
     }
 
+    if (strtolower($serendipity['dbType']) == 'postgres') {
+        $group = 'DISTINCT ON (co.id)';
+    } else {
+        $group = 'GROUP BY co.id';
+    }
+
     $query = "SELECT
-                    DISTINCT(co.id),
+                    co.id,
                     co.entry_id, co.timestamp, co.title, co.email, co.url, co.ip, co.body, co.type, co.subscribed,
                     co.author AS username,
                     e.title,
@@ -1409,11 +1419,11 @@
                     LEFT JOIN {$serendipity['dbPrefix']}entries e ON (co.entry_id = e.id)
                     LEFT JOIN {$serendipity['dbPrefix']}entrycat ec ON (e.id = ec.entryid)
                     LEFT JOIN {$serendipity['dbPrefix']}category c ON (ec.categoryid = c.categoryid)
-                    WHERE co.type LIKE 'NORMAL' AND entry_id > 0 $and
-                    ORDER BY
-                        co.id " . ($order != '' ? $order : '') . "
+              WHERE co.type LIKE 'NORMAL' AND entry_id > 0 $and
+              $group
+              ORDER BY
+                    co.id " . ($order != '' ? $order : '') . "
                     $limit";
-                    #GROUP BY co.id
 
     $comments = serendipity_db_query($query);
 

[php-blog-cvs] serendipity serendipity_admin_category.inc.php,1.18,1.19

[Garvin H. <gar...@us...>]

Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8018

Modified Files:
	serendipity_admin_category.inc.php 
Log Message:
Subselects don't work in MySQL < 5
(see mailinglist)


Index: serendipity_admin_category.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_category.inc.php,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- serendipity_admin_category.inc.php	15 Jul 2004 03:15:02 -0000	1.18
+++ serendipity_admin_category.inc.php	15 Jul 2004 07:34:02 -0000	1.19
@@ -18,10 +18,12 @@
 
     if ($cat_to_edit == 0) {
         if ($parentid != 0) {
-            // TODO: This doesn't seem to work as expected, serendipity_rebuildCategoryTree(); is still needed!
+            // TODO: This doesn't seem to work as expected, serendipity_rebuildCategoryTree(); is still needed! Only activate this optimization function when it's really working :)
             // TODO: This works if only one subcategory exists.  Otherwise, the first query will return an array.
+            /*
             $res = serendipity_db_query("SELECT category_right FROM {$serendipity['dbPrefix']}category WHERE parentid={$parentid}");
             serendipity_db_query("UPDATE {$serendipity['dbPrefix']}category SET category_left=category_left+2, category_right=category_right+2 WHERE category_right>{$res}");
+            */
         }
         $query = "INSERT INTO {$serendipity['dbPrefix']}category (category_name, category_description, authorid, category_icon, parentid) values ('$name', '$desc', $authorid, '$icon', $parentid)";
     } else {
@@ -47,24 +49,26 @@
     if ($cat_to_edit != 0) {
         $remaining_cat = (int)$_POST['serendipity']['cat']['remaining_catid'];
         $category_range = implode(' AND ', serendipity_fetchCategoryRange($cat_to_edit));
-        #TODO: Does the revised query work on MySQL?  Does it do the same thing?
-        /*$query = "UPDATE {$serendipity['dbPrefix']}entries e,
-                    {$serendipity['dbPrefix']}entrycat ec,
-                    {$serendipity['dbPrefix']}category c
-                  SET ec.categoryid={$remaining_cat}
-                    WHERE e.id = ec.entryid
-                      AND c.categoryid = ec.categoryid
-                      AND c.category_left BETWEEN {$category_range}
-                      {$admin_category}";*/
-        $query = "UPDATE {$serendipity['dbPrefix']}entrycat
-                    SET categoryid={$remaining_cat} WHERE entryid IN
-                    (
-                      SELECT DISTINCT(e.id) FROM {$serendipity['dbPrefix']}entries e,
-                      {$serendipity['dbPrefix']}category c,
-                      {$serendipity['dbPrefix']}entrycat ec
-                      WHERE e.id=ec.entryid AND c.categoryid=ec.categoryid
-                      AND c.category_left BETWEEN {$category_range} {$admin_category}
-                    )";
+        if (strtolower($serendipity['dbType']) == 'postgres') {
+            $query = "UPDATE {$serendipity['dbPrefix']}entrycat
+                        SET categoryid={$remaining_cat} WHERE entryid IN
+                        (
+                          SELECT DISTINCT(e.id) FROM {$serendipity['dbPrefix']}entries e,
+                          {$serendipity['dbPrefix']}category c,
+                          {$serendipity['dbPrefix']}entrycat ec
+                          WHERE e.id=ec.entryid AND c.categoryid=ec.categoryid
+                          AND c.category_left BETWEEN {$category_range} {$admin_category}
+                        )";
+        } else {
+            $query = "UPDATE {$serendipity['dbPrefix']}entries e,
+                        {$serendipity['dbPrefix']}entrycat ec,
+                        {$serendipity['dbPrefix']}category c
+                      SET ec.categoryid={$remaining_cat}
+                        WHERE e.id = ec.entryid
+                          AND c.categoryid = ec.categoryid
+                          AND c.category_left BETWEEN {$category_range}
+                          {$admin_category}";
+        }
         if ( serendipity_db_query($query) ) {
             if ( serendipity_db_query("DELETE FROM {$serendipity['dbPrefix']}category WHERE category_left BETWEEN {$category_range} {$admin_category}") ) {
               $msg = $remaining_cat ? sprintf(CATEGORY_DELETED_ARTICLES_MOVED, $cat_to_edit, $remaining_cat) : sprintf(CATEGORY_DELETED,  $cat_to_edit);

[php-blog-cvs] serendipity serendipity_functions_images.inc.php,1.16,1.17

[Garvin H. <gar...@us...>]

Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7507

Modified Files:
	serendipity_functions_images.inc.php 
Log Message:
text/plain mimetype


Index: serendipity_functions_images.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions_images.inc.php,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- serendipity_functions_images.inc.php	11 Jul 2004 17:49:47 -0000	1.16
+++ serendipity_functions_images.inc.php	15 Jul 2004 07:30:46 -0000	1.17
@@ -407,6 +407,10 @@
         case 'mid':
             $mime = 'audio/x-midi';
             break;
+
+        case 'txt':
+            $mime = 'text/plain';
+            break;
     }
 
     return $mime;

[php-blog-cvs] serendipity/lang serendipity_lang_cs.inc.php,1.33,1.34 serendipity_lang_cz.inc.php,1.33,1.34 serendipity_lang_da.inc.php,1.49,1.50 serendipity_lang_de.inc.php,1.63,1.64 serendipity_lang_en.inc.php,1.52,1.53 serendipity_lang_es.inc.php,1.49,1.50 serendipity_lang_fr.inc.php,1.29,1.30 serendipity_lang_nl.inc.php,1.7,1.8 serendipity_lang_pt.inc.php,1.7,1.8

[Garvin H. <gar...@us...>]

Update of /cvsroot/php-blog/serendipity/lang
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6996

Modified Files:
	serendipity_lang_cs.inc.php serendipity_lang_cz.inc.php 
	serendipity_lang_da.inc.php serendipity_lang_de.inc.php 
	serendipity_lang_en.inc.php serendipity_lang_es.inc.php 
	serendipity_lang_fr.inc.php serendipity_lang_nl.inc.php 
	serendipity_lang_pt.inc.php 
Log Message:
update


Index: serendipity_lang_cs.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_cs.inc.php,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- serendipity_lang_cs.inc.php	13 Jul 2004 08:49:41 -0000	1.33
+++ serendipity_lang_cs.inc.php	15 Jul 2004 07:28:01 -0000	1.34
@@ -114,7 +114,6 @@
 @define('ADDING_IMAGE', 'Pøidání obrázku...');
 @define('THUMB_CREATED_DONE', 'Náhled je vytvoøen.<br>Hotovo.');
 @define('ERROR_FILE_EXISTS_ALREADY', 'Chyba: Soubor už ve Vašem poèítaèi existuje!');
-@define('ERROR_UNKNOWN_NOUPLOAD', 'Neznámá chyba, soubor nebyl nahrán...');
 @define('ADD_IMAGE_BLAHBLAH', '<b>Pøidání obrázkù do zásobníku:</b><p>Zde mùžete stáhnout obrázky nebo urèit, na kterém WEBu je nalézt! Jestliže nemáte potøebné obrázky, zkuste je najít vyhledávaèem Google. Zkuste <a href="http://images.google.com" target="_blank">Hledání obrázkù Google</a>, výsledky bývají užiteèné a nìkdy i zábavné :)<p><b>Vyberte metodu:</b><br>');
 @define('ENTER_IMAGE_URL', 'Zadejte URL pro vyhledání obrázku:');
 @define('ENTER_IMAGE_TO_UP', 'Vyberte obrázek k pøidání:');
@@ -531,6 +530,7 @@
 /* TRANSLATE */
 @define('RSS_IMPORT_DESC', 'The RSS import will fetch an RSS feed and insert all the entries contained there inside your article base. You can choose if you want to import the items in DRAFT or PUBLISHED state. Categories in the foreign feed need to contain the exact same name like you entered the names in Serendipity. Via the other input box you can choose the category you want to have entries associated which do not match the imported feed.');
 @define('RSS_IMPORT_CATEGORY', 'Use this category for non-matching imported entries');
+@define('ERROR_UNKNOWN_NOUPLOAD', 'Unknown error occured, file not uploaded. Maybe your filesize is larger than the maximum size allowed by your server installation. Check with your ISP or edit your php.ini file to allow larger file size uploads.');
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>
\ No newline at end of file

Index: serendipity_lang_da.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_da.inc.php,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -d -r1.49 -r1.50
--- serendipity_lang_da.inc.php	13 Jul 2004 08:49:41 -0000	1.49
+++ serendipity_lang_da.inc.php	15 Jul 2004 07:28:02 -0000	1.50
@@ -109,7 +109,6 @@
 @define('ADDING_IMAGE', 'Tilføjet billede...');
 @define('THUMB_CREATED_DONE', 'Minibillede er oprettet.<br>Done.');
 @define('ERROR_FILE_EXISTS_ALREADY', 'Fejl: Filen findes allerede på din maskine!');
-@define('ERROR_UNKNOWNE_NOUPLOAD', 'Der skete en fejl, filen kunne ikke uploades...');
 @define('ADD_IMAGE_BLAHBLAH', '<b>Tilføj et billede til dit opbevaringssted:</b><p>her kan du uploade billeder, eller få mig til at hente dem fra et sted på nettet! Hvis du ikke har et passende billede, så søg efter billeder på google som passer til dine tanker. Prøv <a href="http://images.google.com" target="_blank">Google\'s billedesøgning</a>, resultaterne er ofte brugebare og altid sjove :)<p><b>Vælg metode:</b><br>');
 @define('ENTER_IMAGE_URL', 'Skriv en URL til billedet der skal hentes:');
 @define('ENTER_IMAGE_TO_UP', 'Vælg det billede du ønsker at uploade:');
@@ -531,6 +530,7 @@
 @define('PLUGIN_ITEM_DISPLAY_BOTH', 'All times');
 @define('RSS_IMPORT_DESC', 'The RSS import will fetch an RSS feed and insert all the entries contained there inside your article base. You can choose if you want to import the items in DRAFT or PUBLISHED state. Categories in the foreign feed need to contain the exact same name like you entered the names in Serendipity. Via the other input box you can choose the category you want to have entries associated which do not match the imported feed.');
 @define('RSS_IMPORT_CATEGORY', 'Use this category for non-matching imported entries');
+@define('ERROR_UNKNOWN_NOUPLOAD', 'Unknown error occured, file not uploaded. Maybe your filesize is larger than the maximum size allowed by your server installation. Check with your ISP or edit your php.ini file to allow larger file size uploads.');
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>
\ No newline at end of file

Index: serendipity_lang_fr.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_fr.inc.php,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- serendipity_lang_fr.inc.php	13 Jul 2004 08:49:41 -0000	1.29
+++ serendipity_lang_fr.inc.php	15 Jul 2004 07:28:02 -0000	1.30
@@ -111,7 +111,6 @@
 @define('ADDING_IMAGE', 'Ajout d\'une image...');
 @define('THUMB_CREATED_DONE', 'Aperçu crée.<br>Terminé.');
 @define('ERROR_FILE_EXISTS_ALREADY', 'Erreur: Le fichier existe déjà sur votre machine!');
-@define('ERROR_UNKNOWNE_NOUPLOAD', 'Erreur inconnue survenur, le fichier n\'a pas été uploadé...');
 @define('ADD_IMAGE_BLAHBLAH', '<b>Ajoutez une image dans votre visualisateur:</b><p>Ici vous pouvez uploader des images, ou me demander de les prendre pour vous sur le web! Si vous n\'avez pas l\'image appropriée, faites une recherche sur google pour la trouver. Essayez <a href="http://images.google.com" target="_blank">le chercheur d\'images de google</a>, les résultats sont souvent utiles et toujours amusants :)<p><b>Choissisez la méthode:</b><br>');
 @define('ENTER_IMAGE_URL', 'Entrez l\'URL de l\'image à prendre sur le web:');
 @define('ENTER_IMAGE_TO_UP', 'Sélectionnez une image que vous souhaitez uploader:');
@@ -520,6 +519,7 @@
 @define('PLUGIN_ITEM_DISPLAY_BOTH', 'All times');
 @define('RSS_IMPORT_DESC', 'The RSS import will fetch an RSS feed and insert all the entries contained there inside your article base. You can choose if you want to import the items in DRAFT or PUBLISHED state. Categories in the foreign feed need to contain the exact same name like you entered the names in Serendipity. Via the other input box you can choose the category you want to have entries associated which do not match the imported feed.');
 @define('RSS_IMPORT_CATEGORY', 'Use this category for non-matching imported entries');
+@define('ERROR_UNKNOWN_NOUPLOAD', 'Unknown error occured, file not uploaded. Maybe your filesize is larger than the maximum size allowed by your server installation. Check with your ISP or edit your php.ini file to allow larger file size uploads.');
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>
\ No newline at end of file

Index: serendipity_lang_cz.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_cz.inc.php,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- serendipity_lang_cz.inc.php	13 Jul 2004 08:49:41 -0000	1.33
+++ serendipity_lang_cz.inc.php	15 Jul 2004 07:28:02 -0000	1.34
@@ -114,7 +114,6 @@
 @define('ADDING_IMAGE', 'Pøidání obrázku...');
 @define('THUMB_CREATED_DONE', 'Náhled je vytvoøen.<br>Hotovo.');
 @define('ERROR_FILE_EXISTS_ALREADY', 'Chyba: Soubor u¾ ve Va¹em poèítaèi existuje!');
-@define('ERROR_UNKNOWN_NOUPLOAD', 'Neznámá chyba, soubor nebyl nahrán...');
 @define('ADD_IMAGE_BLAHBLAH', '<b>Pøidání obrázkù do zásobníku:</b><p>Zde mù¾ete stáhnout obrázky nebo urèit, na kterém WEBu je nalézt! Jestli¾e nemáte potøebné obrázky, zkuste je najít vyhledávaèem Google. Zkuste <a href="http://images.google.com" target="_blank">Hledání obrázkù Google</a>, výsledky bývají u¾iteèné a nìkdy i zábavné :)<p><b>Vyberte metodu:</b><br>');
 @define('ENTER_IMAGE_URL', 'Zadejte URL pro vyhledání obrázku:');
 @define('ENTER_IMAGE_TO_UP', 'Vyberte obrázek k pøidání:');
@@ -529,6 +528,7 @@
 @define('PLUGIN_ITEM_DISPLAY_BOTH', 'V obojím');
 @define('RSS_IMPORT_DESC', 'The RSS import will fetch an RSS feed and insert all the entries contained there inside your article base. You can choose if you want to import the items in DRAFT or PUBLISHED state. Categories in the foreign feed need to contain the exact same name like you entered the names in Serendipity. Via the other input box you can choose the category you want to have entries associated which do not match the imported feed.');
 @define('RSS_IMPORT_CATEGORY', 'Use this category for non-matching imported entries');
+@define('ERROR_UNKNOWN_NOUPLOAD', 'Unknown error occured, file not uploaded. Maybe your filesize is larger than the maximum size allowed by your server installation. Check with your ISP or edit your php.ini file to allow larger file size uploads.');
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>
\ No newline at end of file

Index: serendipity_lang_nl.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_nl.inc.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- serendipity_lang_nl.inc.php	13 Jul 2004 08:49:41 -0000	1.7
+++ serendipity_lang_nl.inc.php	15 Jul 2004 07:28:02 -0000	1.8
@@ -113,7 +113,6 @@
 @define('ADDING_IMAGE', 'Toevoegen beeld...');
 @define('THUMB_CREATED_DONE', 'Thumbnail aangemaakt.<br>Done.');
 @define('ERROR_FILE_EXISTS_ALREADY', 'Fout: Bestand bestaat reeds op uw computer!');
-@define('ERROR_UNKNOWNE_NOUPLOAD', 'Er is een ongekende fout opgetreden. Het bestand werd niet opgeladen...');
 @define('ADD_IMAGE_BLAHBLAH', '<b>Voeg een beeld toe</b><p>Hier kan je beelden opladen of aanduiden waar ik ze kan vinden. Heb je niet de juiste beelden, zoek ze dan op google: <a href="http://images.google.com" target="_blank">Google\'s image search</a>, De resultaten zijn dikwijls results are often useful bruikbaar én grappig :)<p><b>Kies je methode:</b><br>');
 @define('ENTER_IMAGE_URL', 'Geef een URL of een beeld om op te laden:');
 @define('ENTER_IMAGE_TO_UP', 'Kies een beeld om op te lade:');
@@ -519,6 +518,7 @@
 @define('PLUGIN_ITEM_DISPLAY_BOTH', 'All times');
 @define('RSS_IMPORT_DESC', 'The RSS import will fetch an RSS feed and insert all the entries contained there inside your article base. You can choose if you want to import the items in DRAFT or PUBLISHED state. Categories in the foreign feed need to contain the exact same name like you entered the names in Serendipity. Via the other input box you can choose the category you want to have entries associated which do not match the imported feed.');
 @define('RSS_IMPORT_CATEGORY', 'Use this category for non-matching imported entries');
+@define('ERROR_UNKNOWN_NOUPLOAD', 'Unknown error occured, file not uploaded. Maybe your filesize is larger than the maximum size allowed by your server installation. Check with your ISP or edit your php.ini file to allow larger file size uploads.');
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>
\ No newline at end of file

Index: serendipity_lang_en.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_en.inc.php,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -d -r1.52 -r1.53
--- serendipity_lang_en.inc.php	14 Jul 2004 13:57:26 -0000	1.52
+++ serendipity_lang_en.inc.php	15 Jul 2004 07:28:02 -0000	1.53
@@ -114,7 +114,7 @@
 @define('ADDING_IMAGE', 'Adding image...');
 @define('THUMB_CREATED_DONE', 'Thumbnail created.<br>Done.');
 @define('ERROR_FILE_EXISTS_ALREADY', 'Error: File already exists on your machine!');
-@define('ERROR_UNKNOWNE_NOUPLOAD', 'Unknown error occured, file not uploaded...');
+@define('ERROR_UNKNOWN_NOUPLOAD', 'Unknown error occured, file not uploaded. Maybe your filesize is larger than the maximum size allowed by your server installation. Check with your ISP or edit your php.ini file to allow larger file size uploads.');
 @define('ADD_IMAGE_BLAHBLAH', '<b>Add an image to your repository:</b><p>Here you can upload images, or tell me to fetch them from somewhere in the web! If you don\'t have appropriate images, search for images on google matching your thoughts. Try <a href="http://images.google.com" target="_blank">Google\'s image search</a>, the results are often useful and always funny :)<p><b>Select method:</b><br>');
 @define('ENTER_IMAGE_URL', 'Enter an URL of an image to fetch:');
 @define('ENTER_IMAGE_TO_UP', 'Select an image you wish to upload:');

Index: serendipity_lang_es.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_es.inc.php,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -d -r1.49 -r1.50
--- serendipity_lang_es.inc.php	13 Jul 2004 08:49:41 -0000	1.49
+++ serendipity_lang_es.inc.php	15 Jul 2004 07:28:02 -0000	1.50
@@ -112,7 +112,6 @@
 @define('ADDING_IMAGE', 'Añadiendo imagen..');
 @define('THUMB_CREATED_DONE', 'Miniatura creada.<br>Terminado.');
 @define('ERROR_FILE_EXISTS_ALREADY', 'Error: ¡El archivo ya existe en el sistema!');
-@define('ERROR_UNKNOWNE_NOUPLOAD', 'Error desconocido, el archivo no ha sido transferido...');
 @define('ADD_IMAGE_BLAHBLAH', '<b>Añade una imagen:</b><p>Aquí puedes subir tus imágenes o bien indicar la dirección url de una imagen para direccionarla. Si no tienes las imágenes adecuadas puedes buscar en <a href="http://images.google.es" target="_blank">Imágenes de Google</a>, los resultados no son siempre efectivos pero si divertidos :)<p><b>Selecciona un método:</b><br>');
 @define('ENTER_IMAGE_URL', 'Introduce la URL de la imagen que quieres enlazar:');
 @define('ENTER_IMAGE_TO_UP', 'Selecciona la imagen que deseas transferir:');
@@ -513,6 +512,7 @@
 @define('PLUGIN_ITEM_DISPLAY_BOTH', 'All times');
 @define('RSS_IMPORT_DESC', 'The RSS import will fetch an RSS feed and insert all the entries contained there inside your article base. You can choose if you want to import the items in DRAFT or PUBLISHED state. Categories in the foreign feed need to contain the exact same name like you entered the names in Serendipity. Via the other input box you can choose the category you want to have entries associated which do not match the imported feed.');
 @define('RSS_IMPORT_CATEGORY', 'Use this category for non-matching imported entries');
+@define('ERROR_UNKNOWN_NOUPLOAD', 'Unknown error occured, file not uploaded. Maybe your filesize is larger than the maximum size allowed by your server installation. Check with your ISP or edit your php.ini file to allow larger file size uploads.');
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>
\ No newline at end of file

Index: serendipity_lang_de.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_de.inc.php,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -d -r1.63 -r1.64
--- serendipity_lang_de.inc.php	14 Jul 2004 10:21:28 -0000	1.63
+++ serendipity_lang_de.inc.php	15 Jul 2004 07:28:02 -0000	1.64
@@ -110,7 +110,6 @@
 @define('ADDING_IMAGE', 'Bild hinzufügen...');
 @define('THUMB_CREATED_DONE', 'Vorschau erstellt.<br>Fertig.');
 @define('ERROR_FILE_EXISTS_ALREADY', 'Fehler: Diese Datei existiert schon auf dem Server!');
-@define('ERROR_UNKNOWNE_NOUPLOAD', 'Unbekannter Fehler aufgetreten, Datei nicht hochgeladen.');
 @define('ADD_IMAGE_BLAHBLAH', '<b>Bild zur Sammlung hinzufügen:</b><p>Hier können Sie ein Bild hochladen, oder mir sagen, von wo ich es downloaden soll! Wenn das passende Bild fehlt, einfach bei Google danach suchen. Probieren Sie mal <a href="http://images.google.de" target="_blank">Googles Bildsuche</a>, die Resultate sind meistens brauchbar, aber auf jeden Fall witzig :)<p><b>Methode wählen:</b><br>');
 @define('ENTER_IMAGE_URL', 'Bildurl zum Download angeben:');
 @define('ENTER_IMAGE_TO_UP', 'Bild zum Hochladen eingeben:');
@@ -515,7 +514,8 @@
 @define('PLUGIN_ITEM_DISPLAY_OVERVIEW', 'Nur Artikelübersicht');
 @define('PLUGIN_ITEM_DISPLAY_BOTH', 'Überall');
 @define('RSS_IMPORT_DESC', 'Der RSS-Import liest einen RSS-Feed ein und fügt alle dort vorhandenen Artikel in Ihre Artikeldatenbank ein. Ein importierter Artikel kann als VERÖFFENTLICHUNG oder ENTWURF eingefügt werden. Die Kategorien im importierten Feed müssen den exakt selben Namen enthalten wie die Namen ihrer Kategorien im Serendipity-Blog. Über das Dropdown kann gewählt werden, wie die Artikel kategorisiert werden sollen, wenn keine oder eine ungültige Angabe über die Kategorie im Feed enthalten ist.');
-@define('RSS_IMPORT_CATEGORY', 'Use this category for non-matching imported entries');
+@define('RSS_IMPORT_CATEGORY', 'Diese Kategorie für nicht zugeordnete importierte Einträge verwenden');
+@define('ERROR_UNKNOWN_NOUPLOAD', 'Ein Fehler trat auf beim Dateupload. Vielleicht ist die Datei größer als durch die Server-Konfiguration zugelassen. Bitte mit ISP absprechen oder die php.ini datei bearbeiten um größere Uploads zuzulassen.');
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>
\ No newline at end of file

Index: serendipity_lang_pt.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_pt.inc.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- serendipity_lang_pt.inc.php	13 Jul 2004 08:49:41 -0000	1.7
+++ serendipity_lang_pt.inc.php	15 Jul 2004 07:28:02 -0000	1.8
@@ -111,7 +111,6 @@
 @define('ADDING_IMAGE', 'Adicionando imagem...');
 @define('THUMB_CREATED_DONE', 'Miniatura criada.<br>Pronto.');
 @define('ERROR_FILE_EXISTS_ALREADY', 'Erro: Arquivo já existe em sua máquina!');
-@define('ERROR_UNKNOWNE_NOUPLOAD', 'Ocorreu um erro desconhecido, arquivo não enviado...');
 @define('ADD_IMAGE_BLAHBLAH', '<b>Adicione uma imagem ao seu repositório:</b><p>Aqui Here você pode transferir imagens, ou orientar-me para buscar uma imagem em qualquer lugar da WEB! Se você não possui as imagens apropriadas, procure-as no google de acordo com sua preferência. Tente a <a href="http://images.google.com" target="_blank">busca de imagens do Google</a>, os resultados são geralmente úteis e sempre divertidos :)<p><b>Selecione o método:</b><br>');
 @define('ENTER_IMAGE_URL', 'Informe a URL de uma imagem para pega-la:');
 @define('ENTER_IMAGE_TO_UP', 'Selecione a imagem que você gostaria de transferir:');
@@ -515,6 +514,7 @@
 @define('PLUGIN_ITEM_DISPLAY_BOTH', 'All times');
 @define('RSS_IMPORT_DESC', 'The RSS import will fetch an RSS feed and insert all the entries contained there inside your article base. You can choose if you want to import the items in DRAFT or PUBLISHED state. Categories in the foreign feed need to contain the exact same name like you entered the names in Serendipity. Via the other input box you can choose the category you want to have entries associated which do not match the imported feed.');
 @define('RSS_IMPORT_CATEGORY', 'Use this category for non-matching imported entries');
+@define('ERROR_UNKNOWN_NOUPLOAD', 'Unknown error occured, file not uploaded. Maybe your filesize is larger than the maximum size allowed by your server installation. Check with your ISP or edit your php.ini file to allow larger file size uploads.');
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>
\ No newline at end of file

[php-blog-cvs] serendipity serendipity_functions.inc.php,1.332,1.333

[Joseph T. <jt...@us...>]

Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13542

Modified Files:
	serendipity_functions.inc.php 
Log Message:
Fixed a few GROUP BY statements.  If this breaks MySQL, please see serendipity_mailSubscribers for a good way to fix this.

Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.332
retrieving revision 1.333
diff -u -d -r1.332 -r1.333
--- serendipity_functions.inc.php	14 Jul 2004 13:57:26 -0000	1.332
+++ serendipity_functions.inc.php	15 Jul 2004 03:59:07 -0000	1.333
@@ -727,8 +727,11 @@
         }
     }
 
+    ##Query modified to remove GROUP BY clause.  If Distinct doesn't work
+    ##for mysql, please see the serendipity_mailSubscribers function in
+    ##this file for an example of how to fix it.
     $query = "SELECT
-                    e.id,
+                    DISTINCT(e.id),
                     e.title,
                     e.timestamp,
                     e.comments,
@@ -752,11 +755,11 @@
                         ON e.id = ec.entryid
                     LEFT JOIN {$serendipity['dbPrefix']}category c
                         ON ec.categoryid = c.categoryid $and
-                    GROUP BY
-                        e.id
                     ORDER BY
                         $orderby
                     $limit";
+                    #GROUP BY
+                    #    e.id
 
     $ret = serendipity_db_query($query);
 
@@ -908,8 +911,11 @@
 function serendipity_searchEntries($term) {
     global $serendipity;
 
+    ##Query modified to remove GROUP BY clause.  If Distinct doesn't work
+    ##for mysql, please see the serendipity_mailSubscribers function in
+    ##this file for an example of how to fix it.
     $querystring = "SELECT
-                            e.id,
+                            DISTINCT(e.id),
                             e.author,
                             a.username,
                             a.email,
@@ -930,10 +936,10 @@
                             AND e.id = ec.entryid
                             AND MATCH (title,body,extended) AGAINST ('" . serendipity_db_escape_string($term) . "')
                             AND isdraft = 'false'
-                    GROUP BY
-                            e.id
                     ORDER BY
                             timestamp DESC";
+                    #GROUP BY
+                    #        e.id
 
     return serendipity_db_query($querystring);
 }
@@ -1389,7 +1395,8 @@
     }
 
     $query = "SELECT
-                    co.*,
+                    DISTINCT(co.id),
+                    co.entry_id, co.timestamp, co.title, co.email, co.url, co.ip, co.body, co.type, co.subscribed,
                     co.author AS username,
                     e.title,
                     e.id AS entryid,
@@ -1403,10 +1410,10 @@
                     LEFT JOIN {$serendipity['dbPrefix']}entrycat ec ON (e.id = ec.entryid)
                     LEFT JOIN {$serendipity['dbPrefix']}category c ON (ec.categoryid = c.categoryid)
                     WHERE co.type LIKE 'NORMAL' AND entry_id > 0 $and
-                    GROUP BY co.id
                     ORDER BY
                         co.id " . ($order != '' ? $order : '') . "
                     $limit";
+                    #GROUP BY co.id
 
     $comments = serendipity_db_query($query);
 
@@ -3035,7 +3042,7 @@
         /* Portable version of the same query */
         $query = "SELECT scheme, host, SUM(count) AS total
                   FROM {$serendipity['dbPrefix']}$list
-                  GROUP BY host
+                  GROUP BY scheme, host
                   ORDER BY total DESC, host
                   LIMIT $limit";
     }

[php-blog-cvs] serendipity serendipity_db_postgres.inc.php,1.14,1.15

[Joseph T. <jt...@us...>]

Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9075

Modified Files:
	serendipity_db_postgres.inc.php 
Log Message:
added some formatting to debugging output.

Index: serendipity_db_postgres.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_db_postgres.inc.php,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- serendipity_db_postgres.inc.php	5 Jul 2004 08:25:49 -0000	1.14
+++ serendipity_db_postgres.inc.php	15 Jul 2004 03:21:24 -0000	1.15
@@ -57,8 +57,8 @@
 
     if (!$serendipity['dbLastResult']) {
         if (!$serendipity['production']) {
-            print "Error in $sql<br>\n";
-            print pg_last_error($serendipity['dbConn']);
+            print "Error in $sql<br/>\n";
+            print pg_last_error($serendipity['dbConn']) . "<BR/>\n";
             if (function_exists('debug_backtrace')) {
                 highlight_string(var_export(debug_backtrace(), 1));
             }

[php-blog-cvs] serendipity serendipity_lang.inc.php,1.14,1.15

[Joseph T. <jt...@us...>]

Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8455

Modified Files:
	serendipity_lang.inc.php 
Log Message:
Fixed a duplicate define of LANGUAGE_LIST

Index: serendipity_lang.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_lang.inc.php,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- serendipity_lang.inc.php	1 Jul 2004 11:34:06 -0000	1.14
+++ serendipity_lang.inc.php	15 Jul 2004 03:17:56 -0000	1.15
@@ -1,6 +1,6 @@
 <?php # $Id$
 
-define('LANGUAGE_LIST', 'en=>English,de=>German,da=>Danish,es=>Spanish,fr=>French,cs=>Czech (Win-1250),cz=>Czech (ISO-8859-2),nl=>Dutch,pt=>Portuguese Brazilian');
+if (!defined('LANGUAGE_LIST')) define('LANGUAGE_LIST', 'en=>English,de=>German,da=>Danish,es=>Spanish,fr=>French,cs=>Czech (Win-1250),cz=>Czech (ISO-8859-2),nl=>Dutch,pt=>Portuguese Brazilian');
 
 if (!defined('serendipity_LANG_LOADED') || serendipity_LANG_LOADED !== true) {
     // Try and include preferred language from the configurated setting

[php-blog-cvs] serendipity serendipity_admin_category.inc.php,1.17,1.18

[Joseph T. <jt...@us...>]

Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7509

Modified Files:
	serendipity_admin_category.inc.php 
Log Message:
Fixed a couple of bombing queries.  Please review, and test on MySQL.

There are two issues remaining: a TODO that was there before I started messing with this file, and a new TODO listing another issue.  Would whomever wrote this code step forward and either ask for help, or fix it?

We should not release until these issues have been resolved.

Is there a better way to represent subcategories?  What are the category_left, category_right fields for?



Index: serendipity_admin_category.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_category.inc.php,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- serendipity_admin_category.inc.php	13 Jul 2004 15:04:33 -0000	1.17
+++ serendipity_admin_category.inc.php	15 Jul 2004 03:15:02 -0000	1.18
@@ -19,8 +19,9 @@
     if ($cat_to_edit == 0) {
         if ($parentid != 0) {
             // TODO: This doesn't seem to work as expected, serendipity_rebuildCategoryTree(); is still needed!
-            $res = serendipity_db_query("SELECT category_right FROM {$serendipity['dbPrefix']}category WHERE parentid={$parentid};");
-            serendipity_db_query("UPDATE {$serendipity['dbPrefix']}category SET category_left=category_left+2, category_right=category_right+2 WHERE category_right>{$res['right']};");
+            // TODO: This works if only one subcategory exists.  Otherwise, the first query will return an array.
+            $res = serendipity_db_query("SELECT category_right FROM {$serendipity['dbPrefix']}category WHERE parentid={$parentid}");
+            serendipity_db_query("UPDATE {$serendipity['dbPrefix']}category SET category_left=category_left+2, category_right=category_right+2 WHERE category_right>{$res}");
         }
         $query = "INSERT INTO {$serendipity['dbPrefix']}category (category_name, category_description, authorid, category_icon, parentid) values ('$name', '$desc', $authorid, '$icon', $parentid)";
     } else {
@@ -46,14 +47,24 @@
     if ($cat_to_edit != 0) {
         $remaining_cat = (int)$_POST['serendipity']['cat']['remaining_catid'];
         $category_range = implode(' AND ', serendipity_fetchCategoryRange($cat_to_edit));
-        $query = "UPDATE {$serendipity['dbPrefix']}entries e,
+        #TODO: Does the revised query work on MySQL?  Does it do the same thing?
+        /*$query = "UPDATE {$serendipity['dbPrefix']}entries e,
                     {$serendipity['dbPrefix']}entrycat ec,
                     {$serendipity['dbPrefix']}category c
                   SET ec.categoryid={$remaining_cat}
                     WHERE e.id = ec.entryid
                       AND c.categoryid = ec.categoryid
-                      AND category_left BETWEEN {$category_range}
-                      {$admin_category}";
+                      AND c.category_left BETWEEN {$category_range}
+                      {$admin_category}";*/
+        $query = "UPDATE {$serendipity['dbPrefix']}entrycat
+                    SET categoryid={$remaining_cat} WHERE entryid IN
+                    (
+                      SELECT DISTINCT(e.id) FROM {$serendipity['dbPrefix']}entries e,
+                      {$serendipity['dbPrefix']}category c,
+                      {$serendipity['dbPrefix']}entrycat ec
+                      WHERE e.id=ec.entryid AND c.categoryid=ec.categoryid
+                      AND c.category_left BETWEEN {$category_range} {$admin_category}
+                    )";
         if ( serendipity_db_query($query) ) {
             if ( serendipity_db_query("DELETE FROM {$serendipity['dbPrefix']}category WHERE category_left BETWEEN {$category_range} {$admin_category}") ) {
               $msg = $remaining_cat ? sprintf(CATEGORY_DELETED_ARTICLES_MOVED, $cat_to_edit, $remaining_cat) : sprintf(CATEGORY_DELETED,  $cat_to_edit);

[php-blog-cvs] serendipity serendipity_functions.inc.php,1.331,1.332

[Justin A. <jba...@us...>]

Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2329

Modified Files:
	serendipity_functions.inc.php 
Log Message:
Add a hover title to category icons - figured we should use the category_description somewhere


Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.331
retrieving revision 1.332
diff -u -d -r1.331 -r1.332
--- serendipity_functions.inc.php	14 Jul 2004 13:04:09 -0000	1.331
+++ serendipity_functions.inc.php	14 Jul 2004 13:57:26 -0000	1.332
@@ -1176,7 +1176,7 @@
                     $icon_string = '';
                     foreach ($entry['categories'] as $cat) {
                         if ($cat['category_icon'] != '') {
-                            $icon_string .= '<a href="' . $serendipity['serendipityHTTPPath'] . ($serendipity['rewrite'] == 'none' ? $serendipity['indexFile'] . '?/' : '') . 'categories/' . $cat['categoryid'] . '_' . serendipity_makeFilename($cat['category_name']) . '"><img class="serendipity_entryIcon" alt="' . htmlspecialchars($cat['category_name']) . '" src="' . htmlspecialchars($cat['category_icon']) . '"/></a>';
+                            $icon_string .= '<a href="' . $serendipity['serendipityHTTPPath'] . ($serendipity['rewrite'] == 'none' ? $serendipity['indexFile'] . '?/' : '') . 'categories/' . $cat['categoryid'] . '_' . serendipity_makeFilename($cat['category_name']) . '"><img class="serendipity_entryIcon" title="' . htmlspecialchars($cat['category_name']) . ' : ' . htmlspecialchars($cat['category_description']) . '" alt="' . htmlspecialchars($cat['category_name']) . '" src="' . htmlspecialchars($cat['category_icon']) . '"/></a>';
                         }
                     }
                     if ($icon_string != '') {

[php-blog-cvs] serendipity/lang serendipity_lang_en.inc.php,1.51,1.52

[Justin A. <jba...@us...>]

Update of /cvsroot/php-blog/serendipity/lang
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2329/lang

Modified Files:
	serendipity_lang_en.inc.php 
Log Message:
Add a hover title to category icons - figured we should use the category_description somewhere


Index: serendipity_lang_en.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_en.inc.php,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -d -r1.51 -r1.52
--- serendipity_lang_en.inc.php	13 Jul 2004 08:49:41 -0000	1.51
+++ serendipity_lang_en.inc.php	14 Jul 2004 13:57:26 -0000	1.52
@@ -519,4 +519,4 @@
 @define('RSS_IMPORT_CATEGORY', 'Use this category for non-matching imported entries');
 
 /* vim: set sts=4 ts=4 expandtab : */
-?>
\ No newline at end of file
+?>

[php-blog-cvs] serendipity/plugins/serendipity_event_livesearch serendipity_event_livesearch.js,1.1,1.2 serendipity_event_livesearch.php,1.2,1.3

[Garvin H. <gar...@us...>]

Update of /cvsroot/php-blog/serendipity/plugins/serendipity_event_livesearch
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24503/plugins/serendipity_event_livesearch

Modified Files:
	serendipity_event_livesearch.js 
	serendipity_event_livesearch.php 
Log Message:
Livesearch: The <script src=...> tag must be within the HEAD section,
otherwise mozilla makes trouble. So I renamed the pagebottom hook to
page_header (which is also better for future plugins).
Embedded blogs need to emit that library call on their own. I documented
that in both NEWS and our wiki-installation page.


Index: serendipity_event_livesearch.js
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_event_livesearch/serendipity_event_livesearch.js,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- serendipity_event_livesearch.js	13 Jul 2004 16:25:26 -0000	1.1
+++ serendipity_event_livesearch.js	14 Jul 2004 13:04:09 -0000	1.2
@@ -52,7 +52,6 @@
     }
 
     document.getElementById('serendipityQuickSearchTermField').style.border = '1px solid green';
-
 }
 
 function liveSearchKeyPress(event) {
@@ -153,6 +152,3 @@
         return true;
     }
 }
-
-// s9y is missing easy onload() adding, so call it from here:
-addLoadEvent(liveSearchInit);
\ No newline at end of file

Index: serendipity_event_livesearch.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_event_livesearch/serendipity_event_livesearch.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- serendipity_event_livesearch.php	14 Jul 2004 10:23:04 -0000	1.2
+++ serendipity_event_livesearch.php	14 Jul 2004 13:04:09 -0000	1.3
@@ -3,7 +3,7 @@
 switch ($serendipity['lang']) {
     case 'de':
         @define('PLUGIN_EVENT_LIVESEARCH_NAME', 'LiveSearch');
-        @define('PLUGIN_EVENT_LIVESEARCH_DESC', 'Erweitert die Suchfunktion mit einer live-aktualisierung mit dem Datenbestand zur sofortigen Anzeige (JavaScript)');
+        @define('PLUGIN_EVENT_LIVESEARCH_DESC', 'Erweitert die Suchfunktion mit einer Live-aktualisierung (JavaScript)');
         @define('PLUGIN_EVENT_LIVESEARCH_WAIT', 'Suche aktiviert, bitte warten...');
 
         break;
@@ -12,7 +12,7 @@
     case 'es':
     default:
         @define('PLUGIN_EVENT_LIVESEARCH_NAME', 'LiveSearch');
-        @define('PLUGIN_EVENT_LIVESEARCH_DESC', 'Enhances the Search function of your blog with live-updates on keypress (JavaScript)');
+        @define('PLUGIN_EVENT_LIVESEARCH_DESC', 'Enhances the Search function with live-updates on keypress (JavaScript)');
         @define('PLUGIN_EVENT_LIVESEARCH_WAIT', 'Wait, sending request...');
         break;
 }
@@ -27,7 +27,7 @@
         $propbag->add('description',   PLUGIN_EVENT_LIVESEARCH_DESC);
         $propbag->add('event_hooks',    array(
             'external_plugin'  => true,
-            'frontend_pagebottom' => true,
+            'frontend_header' => true,
             'css' => true
         ));
     }
@@ -90,12 +90,17 @@
 <?php
                     break;
 
-                case 'frontend_pagebottom':
+                case 'frontend_header':
+                    if (!$serendipity['embed'] || $serendipity['embed'] === 'false' || $serendipity['embed'] === false) {
+                        echo '<script type="text/javascript" src="' . $serendipity['baseURL'] . 'plugin/ls-js"></script>';
+                    }
+
                     echo '<script type="text/javascript">
                     lsbase = "' . $serendipity['baseURL'] . 'plugin/ls";
                     waittext = "' . PLUGIN_EVENT_LIVESEARCH_WAIT . '";
+                    addLoadEvent(liveSearchInit);
                     </script>';
-                    echo '<script type="text/javascript" src="' . $serendipity['baseURL'] . 'plugin/ls-js"></script>';
+
                     break;
 
                 case 'external_plugin':

[php-blog-cvs] serendipity serendipity_functions.inc.php,1.330,1.331 serendipity_genpage.inc.php,1.30,1.31

[Garvin H. <gar...@us...>]

Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24503

Modified Files:
	serendipity_functions.inc.php serendipity_genpage.inc.php 
Log Message:
Livesearch: The <script src=...> tag must be within the HEAD section,
otherwise mozilla makes trouble. So I renamed the pagebottom hook to
page_header (which is also better for future plugins).
Embedded blogs need to emit that library call on their own. I documented
that in both NEWS and our wiki-installation page.


Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.330
retrieving revision 1.331
diff -u -d -r1.330 -r1.331
--- serendipity_functions.inc.php	14 Jul 2004 10:21:05 -0000	1.330
+++ serendipity_functions.inc.php	14 Jul 2004 13:04:09 -0000	1.331
@@ -1158,8 +1158,8 @@
                 $html_extended = '';
                 $extended_css = 'serendipity_entry_body_folded';
                 if ($extended && strlen($entry['extended'])) {
-                    $html_extended = '<span class="serendipity_entry_extended"><a ' . ($serendipity['XHTML11'] ? 'id' : 'name') . '="extended"></a>';
-                    $html_extended .= $entry['extended'] . '</span>';
+                    $html_extended = '<div class="serendipity_entry_extended"><a ' . ($serendipity['XHTML11'] ? 'id' : 'name') . '="extended"></a>';
+                    $html_extended .= $entry['extended'] . '</div>';
                     $extended_css = 'serendipity_entry_body_unfolded';
                 }
 

Index: serendipity_genpage.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_genpage.inc.php,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- serendipity_genpage.inc.php	13 Jul 2004 14:15:18 -0000	1.30
+++ serendipity_genpage.inc.php	14 Jul 2004 13:04:09 -0000	1.31
@@ -27,11 +27,15 @@
       if (isset($serendipity['GET']['id']) && is_numeric($serendipity['GET']['id'])) { ?>
     <link rel="pingback" href="<?php echo $serendipity['baseURL']; ?>comment.php?type=pingback&amp;entry_id=<?php echo $serendipity['GET']['id']; ?>" />
 <?php } ?>
+<?php serendipity_plugin_api::hook_event('frontend_header', $serendipity); ?>
 </head>
 
 <body>
 <?php
 } // end if (is serendipity embedded?)
+ else {
+    serendipity_plugin_api::hook_event('frontend_header', $serendipity);
+}
 
 include_once('serendipity_config.inc.php');
 include_once(S9Y_INCLUDE_PATH . 'serendipity_plugin_api.php');
@@ -43,8 +47,6 @@
     include $serendipity['serendipityPath'] . $serendipity['templatePath'] . 'default/layout.php';
 }
 
-serendipity_plugin_api::hook_event('frontend_pagebottom', $serendipity);
-
 if (!$serendipity['embed'] || $serendipity['embed'] === 'false' || $serendipity['embed'] === false) {
 ?>
 </body>

[php-blog-cvs] serendipity NEWS,1.172,1.173 htaccess.rewrite.tpl,1.11,1.12 serendipity_admin_upgrader.inc.php,1.14,1.15 serendipity_functions_installer.inc.php,1.19,1.20

[Garvin H. <gar...@us...>]

Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13428

Modified Files:
	NEWS htaccess.rewrite.tpl serendipity_admin_upgrader.inc.php 
	serendipity_functions_installer.inc.php 
Log Message:
* update htaccess correctly on the next release
* updated NEWS


Index: NEWS
===================================================================
RCS file: /cvsroot/php-blog/serendipity/NEWS,v
retrieving revision 1.172
retrieving revision 1.173
diff -u -d -r1.172 -r1.173
--- NEWS	14 Jul 2004 10:21:05 -0000	1.172
+++ NEWS	14 Jul 2004 11:52:43 -0000	1.173
@@ -3,6 +3,15 @@
 Version 0.7 ()
 ------------------------------------------------------------------------
 
+    * An entries' LastModified timestamp will get updated if a comment
+      is made to it, but only if the article is newer than 7 days.
+      Make the conditional Get RSS-feed a lot more usable because old
+      entries no longer come up again. The limit of days can be set
+      within serendipity_config.inc.php. (garvinhicking)
+
+    * Plugins can register the event-hook 'external_plugin' to spawn
+      individual content outside of the blog layout (garvinhicking)
+
     * Fixed link insertion in non-WYSIWYG-mode for Internet Explorer
       (garvinhicking)
 

Index: serendipity_functions_installer.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions_installer.inc.php,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- serendipity_functions_installer.inc.php	14 Jul 2004 03:42:06 -0000	1.19
+++ serendipity_functions_installer.inc.php	14 Jul 2004 11:52:43 -0000	1.20
@@ -583,9 +583,19 @@
 
     $htaccess = @file_get_contents('./.htaccess');
 
-    if ($_POST['rewrite'] == 'rewrite') {
+    // Let this function be callable outside installation and let it use existing settings.
+    $import = array('rewrite', 'serendipityHTTPPath', 'indexFile');
+    foreach($import AS $key) {
+        if (empty($_POST[$key]) && isset($serendipity[$key])) {
+            $$key = $serendipity[$key];
+        } else {
+            $$key = $_POST[$key];
+        }
+    }
+
+    if ($rewrite == 'rewrite') {
         $template = 'htaccess.rewrite.tpl';
-    } elseif ($_POST['rewrite'] == 'errordocs') {
+    } elseif ($rewrite == 'errordocs') {
         $template = 'htaccess.errordocs.tpl';
     } else {
         $template = 'htaccess.normal.tpl';
@@ -610,11 +620,12 @@
                    '{PAT_ENTRIES}', '{PATH_ENTRIES}',
                    '{PAT_ARCHIVE}', '{PATH_ARCHIVE}',
                    '{PAT_CATEGORIES}', '{PATH_CATEGORIES}',
+                   '{PAT_PLUGIN}', '{PATH_PLUGIN}'
                  ),
 
                  array(
-                   $_POST['serendipityHTTPPath'],
-                   $_POST['indexFile'],
+                   $serendipityHTTPPath,
+                   $indexFile,
                    trim(PAT_UNSUBSCRIBE, '@/i'), PATH_UNSUBSCRIBE,
                    trim(PAT_ARCHIVES, '@/i'), PATH_ARCHIVES,
                    trim(PAT_ARCHIVES_SHORT, '@/i'),
@@ -624,6 +635,7 @@
                    trim(PAT_ENTRIES, '@/i'), PATH_ENTRIES,
                    trim(PAT_ARCHIVE, '@/i'), PATH_ARCHIVE,
                    trim(PAT_CATEGORIES, '@/i'), PATH_CATEGORIES,
+                   trim(PAT_PLUGIN, '@/i'), PATH_PLUGIN,
                  ),
 
                  implode('', $a)

Index: serendipity_admin_upgrader.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_upgrader.inc.php,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- serendipity_admin_upgrader.inc.php	29 Jun 2004 10:48:57 -0000	1.14
+++ serendipity_admin_upgrader.inc.php	14 Jul 2004 11:52:43 -0000	1.15
@@ -12,7 +12,8 @@
 
 /* Functions which needs to be run if installed version is equal or lower */
 $tasks = array('0.5.1' => 'serendipity_syncThumbs',
-               '0.6.5' => 'serendipity_rebuildCategoryTree');
+               '0.6.5' => 'serendipity_rebuildCategoryTree',
+               '0.7'   => 'serendipity_installFiles');
 
 
 /* Fetch SQL files which needs to be run */
@@ -160,7 +161,12 @@
     if (version_compare(serendipity_version($serendipity['versionInstalled']), '0.6.5', '<')) {
         echo '<br /><strong>0.6.5 - Nested subcategories, post to multiple categories</strong>';
         echo '<br />[<strong style="color: red">INFO</strong>] This update will update the categories table of your database and update the relations from entries to categories. This is a possibly dangerous task to perform, so <strong style="color: red">make sure you have a backup of your database!</strong><br />';
-        echo '<br />The categories-update syntax feature has only been tested for MySQL. PostgreSQL support should be tested first!!!<br/>';
+        $taskCount++;
+    }
+
+    if (version_compare(serendipity_version($serendipity['versionInstalled']), '0.7', '<')) {
+        echo '<br /><strong>0.7 - .htaccess</strong>';
+        echo '<br />[INFO] The Plugin API now allows external plugins to generate individual content. Your .htaccess file needs to be updated for this to occur. This will happen automatically, if you continue. If you made individual changes to your .htaccess file, backup that file now.<br />';
         $taskCount++;
     }
 

Index: htaccess.rewrite.tpl
===================================================================
RCS file: /cvsroot/php-blog/serendipity/htaccess.rewrite.tpl,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- htaccess.rewrite.tpl	9 Jul 2004 09:34:52 -0000	1.11
+++ htaccess.rewrite.tpl	14 Jul 2004 11:52:43 -0000	1.12
@@ -15,9 +15,9 @@
 RewriteRule ^{PAT_ARCHIVE} {indexFile}?url=/{PATH_ARCHIVE} [L,QSA]
 RewriteRule ^{PAT_CATEGORIES} {indexFile}?url={PATH_ARCHIVE}/$1 [L,QSA]
 RewriteRule ^{PAT_FEED} rss.php?file=$1&ext=$2
+RewriteRule ^{PAT_PLUGIN} {indexFile}?url=plugin/$1 [L,QSA]
 RewriteRule ^index\.(html?|php.?) {indexFile}?url=index.html [L,QSA]
 RewriteRule ^htmlarea/(.*) htmlarea/$1 [L,QSA]
-RewriteRule ^plugin/(.*) {indexFile}?url=plugin/$1 [L,QSA]
 RewriteRule (.*\.html?) {indexFile}?url=/$1 [L,QSA]
 
 <Files *.tpl>

[php-blog-cvs] serendipity/plugins/serendipity_event_livesearch serendipity_event_livesearch.php,1.1,1.2

[Garvin H. <gar...@us...>]

Update of /cvsroot/php-blog/serendipity/plugins/serendipity_event_livesearch
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31385

Modified Files:
	serendipity_event_livesearch.php 
Log Message:
get javascript via hook to bypasse mod_rewrite issues.
correctly get request-variables with mod_rewrite and missing [QSA] command
for jannis, only used as fallback


Index: serendipity_event_livesearch.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_event_livesearch/serendipity_event_livesearch.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- serendipity_event_livesearch.php	13 Jul 2004 16:25:26 -0000	1.1
+++ serendipity_event_livesearch.php	14 Jul 2004 10:23:04 -0000	1.2
@@ -95,11 +95,24 @@
                     lsbase = "' . $serendipity['baseURL'] . 'plugin/ls";
                     waittext = "' . PLUGIN_EVENT_LIVESEARCH_WAIT . '";
                     </script>';
-                    echo '<script type="text/javascript" src="' . $serendipity['baseURL'] . 'plugins/serendipity_event_livesearch/serendipity_event_livesearch.js"></script>';
+                    echo '<script type="text/javascript" src="' . $serendipity['baseURL'] . 'plugin/ls-js"></script>';
                     break;
 
                 case 'external_plugin':
-                    $parts     = explode('_', preg_replace('@^([^\?]+).*$@', '\1', $eventData));
+                    $uri_parts = explode('?', str_replace('&amp;', '&', $eventData));
+
+                    // Try to get request parameters from eventData name
+                    if (!empty($uri_parts[1])) {
+                        $reqs = explode('&', $uri_parts[1]);
+                        foreach($reqs AS $id => $req) {
+                            $val = explode('=', $req);
+                            if (empty($_REQUEST[$val[0]])) {
+                                $_REQUEST[$val[0]] = $val[1];
+                            }
+                        }
+                    }
+
+                    $parts     = explode('_', $uri_parts[0]);
                     if (!empty($parts[1])) {
                         $param     = (int) $parts[1];
                     } else {
@@ -107,6 +120,11 @@
                     }
 
                     switch($parts[0]) {
+                        case 'ls-js':
+                            header('Content-Type: text/javascript');
+                            echo file_get_contents(S9Y_INCLUDE_PATH . 'plugins/serendipity_event_livesearch/serendipity_event_livesearch.js');
+                            break;
+
                         case 'ls':
                             $res = serendipity_searchEntries($_REQUEST['s']);
 

[php-blog-cvs] serendipity/lang serendipity_lang_de.inc.php,1.62,1.63

[Garvin H. <gar...@us...>]

Update of /cvsroot/php-blog/serendipity/lang
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31232/lang

Modified Files:
	serendipity_lang_de.inc.php 
Log Message:
spelling correction


Index: serendipity_lang_de.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_de.inc.php,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -d -r1.62 -r1.63
--- serendipity_lang_de.inc.php	13 Jul 2004 14:45:49 -0000	1.62
+++ serendipity_lang_de.inc.php	14 Jul 2004 10:21:28 -0000	1.63
@@ -372,7 +372,7 @@
 @define('CONFIRM_DELETE_DIRECTORY', 'Wirklich alle Inhalte von Verzeichnis %s löschen?');
 @define('STORE_IN_DIRECTORY', 'In diesem Verzeichnis speichern: ');
 @define('ERROR_NO_DIRECTORY', 'Fehler: Verzeichnis %s existiert nicht.');
-@define('FORCE_DELETE', 'Aller Dateien ausserhalb der Mediendatenbank löschen');
+@define('FORCE_DELETE', 'Alle Dateien ausserhalb der Mediendatenbank löschen');
 @define('CHECKING_DIRECTORY', 'Prüfe Dateien im Verzeichnis %s');
 @define('DELETING_DIRECTORY', 'Lösche Verzeichnis %s...');
 @define('DELETING_FILE', 'Lösche Datei %s...');

[php-blog-cvs] serendipity NEWS,1.171,1.172 serendipity_editor.js,1.11,1.12 serendipity_functions.inc.php,1.329,1.330

[Garvin H. <gar...@us...>]

Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31055

Modified Files:
	NEWS serendipity_editor.js serendipity_functions.inc.php 
Log Message:
fixed internet explorer bugs with restored multiple categories and link
insertion


Index: serendipity_editor.js
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_editor.js,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- serendipity_editor.js	12 May 2004 14:35:20 -0000	1.11
+++ serendipity_editor.js	14 Jul 2004 10:21:05 -0000	1.12
@@ -17,16 +17,22 @@
     var selLength = txtarea.textLength;
     var selStart = txtarea.selectionStart;
     var selEnd = txtarea.selectionEnd;
+
     if (selEnd==1 || selEnd==2) {
         selEnd=selLength;
     }
     return (txtarea.value).substring(selStart, selEnd);
 }
 
+function getIESelection(txtarea) {
+    return document.selection.createRange().text;
+}
+
 function mozWrap(txtarea, lft, rgt) {
     var selLength = txtarea.textLength;
     var selStart = txtarea.selectionStart;
     var selEnd = txtarea.selectionEnd;
+
     if (selEnd==1 || selEnd==2) selEnd=selLength;
     var s1 = (txtarea.value).substring(0,selStart);
     var s2 = (txtarea.value).substring(selStart, selEnd)
@@ -34,16 +40,18 @@
     txtarea.value = s1 + lft + s2 + rgt + s3;
 }
 
-function IEWrap(lft, rgt) {
+function IEWrap(txtarea, lft, rgt) {
     strSelection = document.selection.createRange().text;
     if (strSelection != "") {
         document.selection.createRange().text = lft + strSelection + rgt;
+    } else {
+        txtarea.value = txtarea.value + lft + rgt;
     }
 }
 
 function wrapSelection(txtarea, lft, rgt) {
     if (document.all) {
-        IEWrap(lft, rgt);
+        IEWrap(txtarea, lft, rgt);
     } else if (document.getElementById) {
         mozWrap(txtarea, lft, rgt);
     }
@@ -52,14 +60,15 @@
 function wrapSelectionWithLink(txtarea) {
     var my_link = prompt("Enter URL:","http://");
 
-    if (getMozSelection(txtarea) == "") {
-        var my_desc = prompt("Enter Description");
+    if (document.all && getIESelection(txtarea) == "" ||
+         document.getElementById && getMozSelection(txtarea) == "") {
+        var my_desc = prompt("Enter Description", '');
     }
 
     if (my_link != null) {
         lft = "<a href=\"" + my_link + "\">";
         if (my_desc != null && my_desc != "") {
-            rgt = my_desc +"</a>";
+            rgt = my_desc + "</a>";
         } else {
             rgt = "</a>";
         }
@@ -110,7 +119,7 @@
 }
 
 function serendipity_insLink (area) {
-    var loc  = prompt('Enter Location: ');
+    var loc  = prompt('Enter URL Location: ');
     var text = prompt('Enter Description: ');
 
     if (!loc) {

Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.329
retrieving revision 1.330
diff -u -d -r1.329 -r1.330
--- serendipity_functions.inc.php	14 Jul 2004 08:11:21 -0000	1.329
+++ serendipity_functions.inc.php	14 Jul 2004 10:21:05 -0000	1.330
@@ -2572,6 +2572,7 @@
 
     $draftD = '';
     $draftP = '';
+    $categoryselector_expanded = false;
 
     if (isset($entry['isdraft']) && $entry['isdraft'] == 'true') {
         $draftD = ' selected="selected"';
@@ -2589,13 +2590,24 @@
     }
 
     $n = "\n";
-    $cat_list = '<select id="categoryselector" name="serendipity[categories][]" style="vertical-align: middle;" multiple="multple">' . $n;
+    $cat_list = '<select id="categoryselector" name="serendipity[categories][]" style="vertical-align: middle;" multiple="multiple">' . $n;
     $cat_list .= '    <option value="0">[' . NO_CATEGORY . ']</option>' . $n;
     $selected = array();
     if (is_array($entry['categories'])) {
-        foreach ($entry['categories'] as $cat)
+        if (count($entry['categories']) > 1) {
+            $categoryselector_expanded = true;
+        }
+
+        foreach ($entry['categories'] as $cat) {
             $selected[] = $cat['categoryid'];
+        }
     }
+
+    if (count($selected) > 1 ||
+          (isset($serendipity['POST']['categories']) && is_array($serendipity['POST']['categories']) && sizeof($serendipity['POST']['categories']) > 1)) {
+        $categoryselector_expanded = true;
+    }
+
     if (is_array($cats = serendipity_fetchCategories())) {
         $cat_list .= serendipity_generateCategoryList($cats, ($selected == array() ? array(0) : $selected), 1);
     }
@@ -2727,7 +2739,7 @@
                         }
                     }
 
-                    selector_toggle['categoryselector'] = '<?php echo ((isset($serendipity['POST']['categories']) && is_array($serendipity['POST']['categories']) && sizeof($serendipity['POST']['categories']) > 1) ? 'on' : 'off'); ?>';
+                    selector_toggle['categoryselector'] = '<?php echo ($categoryselector_expanded ? 'on' : 'off'); ?>';
                     showItem('categoryselector');
                     </script>
                     </td>

Index: NEWS
===================================================================
RCS file: /cvsroot/php-blog/serendipity/NEWS,v
retrieving revision 1.171
retrieving revision 1.172
diff -u -d -r1.171 -r1.172
--- NEWS	13 Jul 2004 16:25:26 -0000	1.171
+++ NEWS	14 Jul 2004 10:21:05 -0000	1.172
@@ -3,7 +3,13 @@
 Version 0.7 ()
 ------------------------------------------------------------------------
 
-    * Added Bitflux Livesearch Javascript as plugin 
+    * Fixed link insertion in non-WYSIWYG-mode for Internet Explorer
+      (garvinhicking)
+
+    * Fixed retrieving multiple stored categories for InternetExplorer
+      when editing existing entry (garvinhicking)
+
+    * Added Bitflux Livesearch Javascript as plugin
       (serendipity_event_livesearch). It will immediately search your
       articlebase and offer an autocomplete dropdown to the quicksearch
       box. (chregu, garvinhicking)