php-blog-cvs — Serendipity commit list

[php-blog-cvs] serendipity/docs NEWS,1.48,1.49

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

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

Modified Files:
	NEWS 
Log Message:
    * Upgraded htmlarea WYSIWYG editor to latest version. Entering      links now properly works, as finally does Copy+Paste from Mozilla!      (garvinhicking)



Index: NEWS
===================================================================
RCS file: /cvsroot/php-blog/serendipity/docs/NEWS,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -d -r1.48 -r1.49
--- NEWS	11 Jan 2005 13:00:37 -0000	1.48
+++ NEWS	11 Jan 2005 15:00:32 -0000	1.49
@@ -3,8 +3,13 @@
 Version 0.8 ()
 ------------------------------------------------------------------------
 
+    * Upgraded htmlarea WYSIWYG editor to latest version. Entering
+      links now properly works, as finally does Copy+Paste from Mozilla!
+      (garvinhicking)
+
     * New pretty URLs "/blog/serendipity.css" and
       "/blog/serendipity_admin.css" as links to the Stylesheets.
+      (garvinhicking)
 
     * Chief users are not allowed to hide plugins installed by other
       users. (garvinhicking)

[php-blog-cvs] serendipity/include functions_entries.inc.php,1.42,1.43

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

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

Modified Files:
	functions_entries.inc.php 
Log Message:
    * Upgraded htmlarea WYSIWYG editor to latest version. Entering      links now properly works, as finally does Copy+Paste from Mozilla!      (garvinhicking)



Index: functions_entries.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/functions_entries.inc.php,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -d -r1.42 -r1.43
--- functions_entries.inc.php	10 Jan 2005 13:12:55 -0000	1.42
+++ functions_entries.inc.php	11 Jan 2005 15:00:34 -0000	1.43
@@ -1487,6 +1487,7 @@
         var editorref = '';
     </script>
     <script type="text/javascript" src="htmlarea/htmlarea.js"></script>
+    <script type="text/javascript" src="htmlarea/lang/<?php echo WYSIWYG_LANG; ?>.js"></script>
     <script type="text/javascript" src="htmlarea/dialog.js"></script>
     <style  type="text/css">@import url(htmlarea/htmlarea.css);</style>
 <?php
@@ -1537,7 +1538,7 @@
 
             [ "justifyleft", "justifycenter", "justifyright", "justifyfull", "separator",
               "lefttoright", "righttoleft", "separator",
-              "insertorderedlist", "insertunorderedlist", "outdent", "indent", "separator",
+              "orderedlist", "unorderedlist", "outdent", "indent", "separator",
               "forecolor", "hilitecolor", "separator",
               "inserthorizontalrule", "createlink", "insertimage", "image_selector", "inserttable", "htmlmode", "separator",
               "popupeditor", "separator", "showhelp", "about" ]

[php-blog-cvs] serendipity/templates/default/admin style.css,1.14,1.15

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

Update of /cvsroot/php-blog/serendipity/templates/default/admin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31137/templates/default/admin

Modified Files:
	style.css 
Log Message:
poor IE users will now have a better display of our nifty backend style


Index: style.css
===================================================================
RCS file: /cvsroot/php-blog/serendipity/templates/default/admin/style.css,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- style.css	26 Dec 2004 18:34:37 -0000	1.14
+++ style.css	11 Jan 2005 13:52:14 -0000	1.15
@@ -2,33 +2,36 @@
     font-family: Verdana;
     margin: 0px 0px 0px 0px;
     background-color: #7F9BC2;
-    background-image: url(img/background.jpg);
+    background-image: url({TEMPLATE_PATH}img/background.jpg);
     background-repeat: repeat-x;
 }
 
+#serendipity_admin_page {
+    text-align: center;
+}
+
 #serendipityAdminBodyImageSelector {
     background-color: #FFFFFF;
 }
 
 #serendipityAdminFrame {
+    text-align: left;
     width: 80%;
     min-width: 777px;
     margin: auto;
 }
 
-#serendipityAdminMainpane {
+#serendipityAdminBanner {
     background-color: #FFFFFF;
-    border-bottom: 2px solid #0F3353;
     border-right: 2px solid #0F3353;
     border-left: 2px solid #0F3353;
-    padding: 5px;
+    height: 80px;
 }
 
 #serendipityAdminInfopane {
     background-color: #F8F9FA;
-    font-size: x-small;
+    font-size: 0.8em;
     padding: 5px;
-    padding-left: 5px;
     border-left: 2px solid #0F3353;
     border-right: 2px solid #0F3353;
     border-top: 1px solid #000000;
@@ -38,36 +41,48 @@
     color: #5E5E5E;
 }
 
-#serendipityAdminBanner {
+#serendipityAdminMainpane {
     background-color: #FFFFFF;
+    border-bottom: 2px solid #0F3353;
     border-right: 2px solid #0F3353;
     border-left: 2px solid #0F3353;
-    height: 80px;
+    padding: 5px;
+}
+
+.serendipityAdminContent {
+    font-size: 0.9em;
+    padding-top: 10px;
+    padding-right: 5px;
+    padding-left: 5px;
+}
+
+#serendipityAdminMainpane table {
+    width: 97%; // Stoopid IE will otherwise destroy borders
 }
 
 #serendipityAdminBanner h1 {
     padding-top: 20px;
     padding-left: 20px;
-    font-size: large;
+    font-size: 1.3em;
     margin: 0;
 }
 
 #serendipityAdminBanner h2 {
     padding-left: 30px;
-    font-size: small;
+    font-size: 0.9em;
     color: #AAAAAA;
     margin: 0;
 }
 
 
 #serendipitySideBar {
-    font-size: small;
+    font-size: 0.9em;
     width: 150px;
     padding-top: 10px;
 }
 
 #serendipityAdminFooter {
-    font-size: x-small;
+    font-size: 0.8em;
     text-align: center;
     color: #FFFFFF;
 }
@@ -75,12 +90,12 @@
 .serendipitySideBarTitle {
     padding-left: 2px;
     font-weight: bold;
-    font-size: small;
+    font-size: 0.9em;
 }
 
 .serendipitySideBarContent {
     padding-left: 10px;
-    font-size: x-small;
+    font-size: 0.8em;
 }
 
 .serendipitySideBarItem {
@@ -88,17 +103,10 @@
 }
 
 .serendipity_admin_title {
-    font-size: large;
+    font-size: 1.3em;
     margin-bottom: 5px;
 }
 
-.serendipityAdminContent {
-    font-size: small;
-    padding-top: 10px;
-    padding-right: 5px;
-    padding-left: 5px;
-}
-
 .serendipity_admin_list_item.serendipity_admin_list_item_uneven {
     border: 1px solid #294366;
     background-color: #F8F9FA;
@@ -126,7 +134,7 @@
 }
 
 .serendipityAdminMsgNote {
-    background-color: #FFFF9D; 
+    background-color: #FFFF9D;
     border: 1px solid #FF7700;
     padding: 3px;
     text-align: center;
@@ -136,7 +144,7 @@
 
 
 td, th {
-    font-size: small;
+    font-size: 0.9em;
 }
 
 a:visited,
@@ -152,7 +160,7 @@
 input, select, textarea {
     background-color: #F8F9FA;
     font-family: verdana;
-    font-size: small;
+    font-size: 0.9em;
     border: 1px solid #294366;
 }
 
@@ -162,12 +170,12 @@
     margin: auto;
 }
 
-a.button { 
+a.button {
     background-color: #F8F9FA;
     border: 1px solid #294366;
     color: #000000;
     font-family: verdana;
-    font-size: small;
+    font-size: 0.9em;
     padding-left: 0.3em;
     padding-right: 0.3em;
     padding-top: 0.1em;
@@ -175,12 +183,12 @@
     text-decoration: none;
 }
 
-a.button_disabled { 
+a.button_disabled {
     background-color: #F8F9FA;
     border: 1px solid #294366;
     color: #CCCCCC;
     font-family: verdana;
-    font-size: small;
+    font-size: 0.9em;
     padding-left: 0.3em;
     padding-right: 0.3em;
     text-decoration: none;
@@ -188,17 +196,21 @@
 
 ul.serendipitySideBarMenu {
     padding-left: 0px;
+    margin-left: 0px;
+    font-weight: bold;
 }
 
 ul.serendipitySideBarMenu lh {
-    font-size: small; 
+    font-size: 0.9em;
     font-weight: bold;
 }
 
 ul.serendipitySideBarMenu li {
-    font-size: x-small;
-    margin-left: 1.8em; 
+    font-size: 0.8em;
+    margin-left: 1.8em;
+    font-weight: normal;
 }
+
 .serendipityImageButton {
     cursor: pointer;
 }

[php-blog-cvs] serendipity/plugins/serendipity_event_browsercompatibility pngbehavior.htc,1.2,1.3

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

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

Modified Files:
	pngbehavior.htc 
Log Message:
don't use "width: 50pxpx"


Index: pngbehavior.htc
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_event_browsercompatibility/pngbehavior.htc,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- pngbehavior.htc	5 Jan 2005 11:49:19 -0000	1.2
+++ pngbehavior.htc	11 Jan 2005 13:08:41 -0000	1.3
@@ -64,8 +64,8 @@
 		element.src = blankSrc;
 		// set filter
 		element.runtimeStyle.filter = "progid:DXImageTransform.Microsoft.AlphaImageLoader(src='" + src + "', sizingMethod='scale')";
-		element.runtimeStyle.width  = width + "px";
-		element.runtimeStyle.height = height + "px";
+		element.runtimeStyle.width  = width;
+		element.runtimeStyle.height = height;
 	}
 	else {
 		// remove filter

[php-blog-cvs] serendipity serendipity_admin.php,1.58,1.59 serendipity_config.inc.php,1.131,1.132

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

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

Modified Files:
	serendipity_admin.php serendipity_config.inc.php 
Log Message:
dang, we can't use a 'css/' subpath because inside the CSS code we have
relative references starting from root (templates/bla/x.png). So the CSS
files needs to be inside the root directory.


Index: serendipity_config.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_config.inc.php,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -d -r1.131 -r1.132
--- serendipity_config.inc.php	11 Jan 2005 12:53:27 -0000	1.131
+++ serendipity_config.inc.php	11 Jan 2005 13:00:37 -0000	1.132
@@ -114,7 +114,6 @@
 @define('PATH_ADMIN', 'admin');
 @define('PATH_ENTRIES', 'entries');
 @define('PATH_SEARCH', 'search');
-@define('PATH_CSS', 'css');
 @define('PATH_SMARTY_COMPILE', 'templates_c'); // will be placed inside the template directory
 
 /* Changing this is NOT recommended, rewrite rules does not take them into account - yet */
@@ -144,7 +143,7 @@
 @define('PAT_CATEGORIES', '@/'.PATH_CATEGORIES.'/([0-9]+)@');
 @define('PAT_PLUGIN', '@/' . PATH_PLUGIN . '/(.*)@');
 @define('PAT_SEARCH', '@/' . PATH_SEARCH . '/(.*)@');
-@define('PAT_CSS', '@/' . PATH_CSS . '/(.*)@');
+@define('PAT_CSS', '@/(serendipity\.css|serendipity_admin\.css)@');
 
 @define('USERLEVEL_ADMIN', 255);
 @define('USERLEVEL_CHIEF', 1);

Index: serendipity_admin.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin.php,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -d -r1.58 -r1.59
--- serendipity_admin.php	11 Jan 2005 12:53:27 -0000	1.58
+++ serendipity_admin.php	11 Jan 2005 13:00:36 -0000	1.59
@@ -31,7 +31,7 @@
     <head>
         <title><?php echo SERENDIPITY_ADMIN_SUITE; ?></title>
         <meta http-equiv="Content-Type" content="text/html; charset=<?php echo LANG_CHARSET; ?>" />
-        <link rel="stylesheet" type="text/css" href="<?php echo serendipity_rewriteURL(PATH_CSS . '/serendipity_admin.css'); ?>" />
+        <link rel="stylesheet" type="text/css" href="<?php echo serendipity_rewriteURL('serendipity_admin.css'); ?>" />
         <script type="text/javascript">
         function spawn() {
             if (self.Spawnextended) {

[php-blog-cvs] serendipity/include/tpl htaccess_cgi_rewrite.tpl,1.6,1.7 htaccess_rewrite.tpl,1.6,1.7

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

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

Modified Files:
	htaccess_cgi_rewrite.tpl htaccess_rewrite.tpl 
Log Message:
dang, we can't use a 'css/' subpath because inside the CSS code we have
relative references starting from root (templates/bla/x.png). So the CSS
files needs to be inside the root directory.


Index: htaccess_rewrite.tpl
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/tpl/htaccess_rewrite.tpl,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- htaccess_rewrite.tpl	11 Jan 2005 12:53:29 -0000	1.6
+++ htaccess_rewrite.tpl	11 Jan 2005 13:00:45 -0000	1.7
@@ -19,7 +19,7 @@
 RewriteRule ^{PAT_FEED} rss.php?file=$1&ext=$2
 RewriteRule ^{PAT_PLUGIN} {indexFile}?url=plugin/$1 [L,QSA]
 RewriteRule ^{PAT_SEARCH} {indexFile}?url=/{PATH_SEARCH}/$1 [L,QSA]
-RewriteRule ^{PAT_CSS} {indexFile}?url=/{PATH_CSS}/$1 [L,QSA]
+RewriteRule ^{PAT_CSS} {indexFile}?url=/$1 [L,QSA]
 RewriteRule ^{PAT_AUTHORS} {indexFile}?url=/{PATH_AUTHORS}/$1 [L,QSA]
 RewriteRule ^index\.(html?|php.?) {indexFile}?url=index.html [L,QSA]
 RewriteRule ^htmlarea/(.*) htmlarea/$1 [L,QSA]

Index: htaccess_cgi_rewrite.tpl
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/tpl/htaccess_cgi_rewrite.tpl,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- htaccess_cgi_rewrite.tpl	11 Jan 2005 12:53:29 -0000	1.6
+++ htaccess_cgi_rewrite.tpl	11 Jan 2005 13:00:45 -0000	1.7
@@ -17,7 +17,7 @@
 RewriteRule ^{PAT_FEED} rss.php?file=$1&ext=$2
 RewriteRule ^{PAT_PLUGIN} {indexFile}?url=plugin/$1 [L,QSA]
 RewriteRule ^{PAT_SEARCH} {indexFile}?url=/{PATH_SEARCH}/$1 [L,QSA]
-RewriteRule ^{PAT_CSS} {indexFile}?url=/{PATH_CSS}/$1 [L,QSA]
+RewriteRule ^{PAT_CSS} {indexFile}?url=/$1 [L,QSA]
 RewriteRule ^{PAT_AUTHORS} {indexFile}?url=/{PATH_AUTHORS}/$1 [L,QSA]
 RewriteRule ^index\.(html?|php.?) {indexFile}?url=index.html [L,QSA]
 RewriteRule ^htmlarea/(.*) htmlarea/$1 [L,QSA]

[php-blog-cvs] serendipity/include functions_installer.inc.php,1.26,1.27 functions_smarty.inc.php,1.12,1.13

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

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

Modified Files:
	functions_installer.inc.php functions_smarty.inc.php 
Log Message:
dang, we can't use a 'css/' subpath because inside the CSS code we have
relative references starting from root (templates/bla/x.png). So the CSS
files needs to be inside the root directory.


Index: functions_installer.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/functions_installer.inc.php,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- functions_installer.inc.php	11 Jan 2005 12:53:28 -0000	1.26
+++ functions_installer.inc.php	11 Jan 2005 13:00:44 -0000	1.27
@@ -594,7 +594,7 @@
                    '{PAT_DELETE}', '{PATH_DELETE}',
                    '{PAT_APPROVE}', '{PATH_APPROVE}',
                    '{PAT_SEARCH}', '{PATH_SEARCH}',
-                   '{PAT_CSS}', '{PATH_CSS}',
+                   '{PAT_CSS}',
                    '{PAT_AUTHORS}', '{PATH_AUTHORS}'
                  ),
 
@@ -614,7 +614,7 @@
                    trim(PAT_DELETE, '@/i'), PATH_DELETE,
                    trim(PAT_APPROVE, '@/i'), PATH_APPROVE,
                    trim(PAT_SEARCH, '@/i'), PATH_SEARCH,
-                   trim(PAT_CSS, '@/i'), PATH_CSS,
+                   trim(PAT_CSS, '@/i'),
                    trim(PAT_AUTHORS, '@/i'), PATH_AUTHORS
                  ),
 

Index: functions_smarty.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/functions_smarty.inc.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- functions_smarty.inc.php	11 Jan 2005 12:53:28 -0000	1.12
+++ functions_smarty.inc.php	11 Jan 2005 13:00:45 -0000	1.13
@@ -154,7 +154,7 @@
             'head_version'              => $serendipity['version'],
             'head_title'                => $serendipity['head_title'],
             'head_subtitle'             => $serendipity['head_subtitle'],
-            'head_link_stylesheet'      => serendipity_rewriteURL(PATH_CSS . '/serendipity.css'),
+            'head_link_stylesheet'      => serendipity_rewriteURL('serendipity.css'),
 
             'CONST'                     => get_defined_constants(),
 

[php-blog-cvs] serendipity/docs NEWS,1.47,1.48

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

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

Modified Files:
	NEWS 
Log Message:
dang, we can't use a 'css/' subpath because inside the CSS code we have
relative references starting from root (templates/bla/x.png). So the CSS
files needs to be inside the root directory.


Index: NEWS
===================================================================
RCS file: /cvsroot/php-blog/serendipity/docs/NEWS,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -d -r1.47 -r1.48
--- NEWS	11 Jan 2005 12:53:28 -0000	1.47
+++ NEWS	11 Jan 2005 13:00:37 -0000	1.48
@@ -3,8 +3,8 @@
 Version 0.8 ()
 ------------------------------------------------------------------------
 
-    * New pretty URLs "/blog/css/serendipity.css" and
-      "/blog/css/serendipity_admin.css" as links to the Stylesheets.
+    * New pretty URLs "/blog/serendipity.css" and
+      "/blog/serendipity_admin.css" as links to the Stylesheets.
 
     * Chief users are not allowed to hide plugins installed by other
       users. (garvinhicking)

[php-blog-cvs] serendipity/templates/default index.tpl,1.3,1.4

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

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

Modified Files:
	index.tpl 
Log Message:
Pretty URLs for CSS output, hopefully exactly as Tom imagined. 
I'm going to tweak IE styles now, so I needed the PNG behavior plugin stuff.

Also fix the PAT_AUTHORS into the htaccess template and properly move the 
"search" pretty URL code above matching index.php so that it works on
hosts without rewriting.



Index: index.tpl
===================================================================
RCS file: /cvsroot/php-blog/serendipity/templates/default/index.tpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- index.tpl	1 Dec 2004 11:00:57 -0000	1.3
+++ index.tpl	11 Jan 2005 12:53:29 -0000	1.4
@@ -12,7 +12,7 @@
     <title>{$head_title|@default:$blogTitle} {if $head_subtitle} - {$head_subtitle}{/if}</title>
     <meta http-equiv="Content-Type" content="text/html; charset={$head_charset}" />
     <meta name="Powered-By" content="Serendipity v.{$head_version}" />
-    <link rel="stylesheet" type="text/css" href="{$serendipityHTTPPath}serendipity.css.php" />
+    <link rel="stylesheet" type="text/css" href="{$head_link_stylesheet}" />
     <link rel="alternate"  type="application/rss+xml" title="{$blogTitle} RSS feed" href="{$serendipityBaseURL}{$serendipityRewritePrefix}feeds/index.rss2" />
     <link rel="alternate"  type="application/x.atom+xml"  title="{$blogTitle} Atom feed"  href="{$serendipityBaseURL}{$serendipityRewritePrefix}feeds/atom.xml" />
 {if $entry_id}

[php-blog-cvs] serendipity/include functions_installer.inc.php,1.25,1.26 functions_smarty.inc.php,1.11,1.12

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

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

Modified Files:
	functions_installer.inc.php functions_smarty.inc.php 
Log Message:
Pretty URLs for CSS output, hopefully exactly as Tom imagined. 
I'm going to tweak IE styles now, so I needed the PNG behavior plugin stuff.

Also fix the PAT_AUTHORS into the htaccess template and properly move the 
"search" pretty URL code above matching index.php so that it works on
hosts without rewriting.



Index: functions_installer.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/functions_installer.inc.php,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- functions_installer.inc.php	10 Jan 2005 13:12:56 -0000	1.25
+++ functions_installer.inc.php	11 Jan 2005 12:53:28 -0000	1.26
@@ -594,6 +594,8 @@
                    '{PAT_DELETE}', '{PATH_DELETE}',
                    '{PAT_APPROVE}', '{PATH_APPROVE}',
                    '{PAT_SEARCH}', '{PATH_SEARCH}',
+                   '{PAT_CSS}', '{PATH_CSS}',
+                   '{PAT_AUTHORS}', '{PATH_AUTHORS}'
                  ),
 
                  array(
@@ -611,7 +613,9 @@
                    trim(PAT_PLUGIN, '@/i'), PATH_PLUGIN,
                    trim(PAT_DELETE, '@/i'), PATH_DELETE,
                    trim(PAT_APPROVE, '@/i'), PATH_APPROVE,
-                   trim(PAT_SEARCH, '@/i'), PATH_SEARCH
+                   trim(PAT_SEARCH, '@/i'), PATH_SEARCH,
+                   trim(PAT_CSS, '@/i'), PATH_CSS,
+                   trim(PAT_AUTHORS, '@/i'), PATH_AUTHORS
                  ),
 
                  implode('', $a)

Index: functions_smarty.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/functions_smarty.inc.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- functions_smarty.inc.php	4 Jan 2005 18:35:10 -0000	1.11
+++ functions_smarty.inc.php	11 Jan 2005 12:53:28 -0000	1.12
@@ -154,6 +154,7 @@
             'head_version'              => $serendipity['version'],
             'head_title'                => $serendipity['head_title'],
             'head_subtitle'             => $serendipity['head_subtitle'],
+            'head_link_stylesheet'      => serendipity_rewriteURL(PATH_CSS . '/serendipity.css'),
 
             'CONST'                     => get_defined_constants(),
 

[php-blog-cvs] serendipity/include/tpl htaccess_cgi_rewrite.tpl,1.5,1.6 htaccess_rewrite.tpl,1.5,1.6

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

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

Modified Files:
	htaccess_cgi_rewrite.tpl htaccess_rewrite.tpl 
Log Message:
Pretty URLs for CSS output, hopefully exactly as Tom imagined. 
I'm going to tweak IE styles now, so I needed the PNG behavior plugin stuff.

Also fix the PAT_AUTHORS into the htaccess template and properly move the 
"search" pretty URL code above matching index.php so that it works on
hosts without rewriting.



Index: htaccess_rewrite.tpl
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/tpl/htaccess_rewrite.tpl,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- htaccess_rewrite.tpl	10 Jan 2005 13:12:56 -0000	1.5
+++ htaccess_rewrite.tpl	11 Jan 2005 12:53:29 -0000	1.6
@@ -19,6 +19,8 @@
 RewriteRule ^{PAT_FEED} rss.php?file=$1&ext=$2
 RewriteRule ^{PAT_PLUGIN} {indexFile}?url=plugin/$1 [L,QSA]
 RewriteRule ^{PAT_SEARCH} {indexFile}?url=/{PATH_SEARCH}/$1 [L,QSA]
+RewriteRule ^{PAT_CSS} {indexFile}?url=/{PATH_CSS}/$1 [L,QSA]
+RewriteRule ^{PAT_AUTHORS} {indexFile}?url=/{PATH_AUTHORS}/$1 [L,QSA]
 RewriteRule ^index\.(html?|php.?) {indexFile}?url=index.html [L,QSA]
 RewriteRule ^htmlarea/(.*) htmlarea/$1 [L,QSA]
 RewriteRule (.*\.html?) {indexFile}?url=/$1 [L,QSA]

Index: htaccess_cgi_rewrite.tpl
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/tpl/htaccess_cgi_rewrite.tpl,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- htaccess_cgi_rewrite.tpl	10 Jan 2005 13:12:56 -0000	1.5
+++ htaccess_cgi_rewrite.tpl	11 Jan 2005 12:53:29 -0000	1.6
@@ -17,6 +17,8 @@
 RewriteRule ^{PAT_FEED} rss.php?file=$1&ext=$2
 RewriteRule ^{PAT_PLUGIN} {indexFile}?url=plugin/$1 [L,QSA]
 RewriteRule ^{PAT_SEARCH} {indexFile}?url=/{PATH_SEARCH}/$1 [L,QSA]
+RewriteRule ^{PAT_CSS} {indexFile}?url=/{PATH_CSS}/$1 [L,QSA]
+RewriteRule ^{PAT_AUTHORS} {indexFile}?url=/{PATH_AUTHORS}/$1 [L,QSA]
 RewriteRule ^index\.(html?|php.?) {indexFile}?url=index.html [L,QSA]
 RewriteRule ^htmlarea/(.*) htmlarea/$1 [L,QSA]
 RewriteRule (.*\.html?) {indexFile}?url=/$1 [L,QSA]

[php-blog-cvs] serendipity index.php,1.71,1.72 serendipity.css.php,1.33,1.34 serendipity_admin.php,1.57,1.58 serendipity_config.inc.php,1.130,1.131

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

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

Modified Files:
	index.php serendipity.css.php serendipity_admin.php 
	serendipity_config.inc.php 
Log Message:
Pretty URLs for CSS output, hopefully exactly as Tom imagined. 
I'm going to tweak IE styles now, so I needed the PNG behavior plugin stuff.

Also fix the PAT_AUTHORS into the htaccess template and properly move the 
"search" pretty URL code above matching index.php so that it works on
hosts without rewriting.



Index: serendipity.css.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity.css.php,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- serendipity.css.php	19 Nov 2004 11:24:34 -0000	1.33
+++ serendipity.css.php	11 Jan 2005 12:53:27 -0000	1.34
@@ -2,6 +2,23 @@
 
 session_start();
 
+if (!isset($css_mode)) {
+    $css_mode = 'frontend';
+}
+
+switch($css_mode) {
+    case 'serendipity.css':
+    default:
+        $css_hook = 'css';
+        $css_file = 'style.css';
+        break;
+
+    case 'serendipity_admin.css':
+        $css_hook = 'css_backend';
+        $css_file = 'admin/style.css';
+        break;
+}
+
 /* This is a small hack to allow CSS display during installations and upgrades */
 define('IN_installer', true);
 define('IN_upgrader', true);
@@ -11,19 +28,19 @@
 header('Content-type: text/css');
 function serendipity_printStylesheet($file) {
     global $serendipity;
-    return str_replace('{TEMPLATE_PATH}', dirname($file) .'/',  @file_get_contents($file, 1));
+    return str_replace('{TEMPLATE_PATH}', dirname($file) . '/',  @file_get_contents($file, 1));
 }
 
 if (IS_installed === false) {
-    if (file_exists('templates/'. $serendipity['defaultTemplate'] .'/style.css')) {
-        echo serendipity_printStylesheet('templates/'. $serendipity['defaultTemplate'] .'/style.css');
+    if (file_exists('templates/' . $serendipity['defaultTemplate'] . '/' . $css_file)) {
+        echo serendipity_printStylesheet('templates/'. $serendipity['defaultTemplate'] . $css_file);
     }
     die();
 }
 
-$out = serendipity_printStylesheet(serendipity_getTemplateFile('style.css', ''));
+$out = serendipity_printStylesheet(serendipity_getTemplateFile($css_file, ''));
 
-serendipity_plugin_api::hook_event('css', $out);
+serendipity_plugin_api::hook_event($css_hook, $out);
 
 echo $out;
 /* vim: set sts=4 ts=4 expandtab : */

Index: serendipity_config.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_config.inc.php,v
retrieving revision 1.130
retrieving revision 1.131
diff -u -d -r1.130 -r1.131
--- serendipity_config.inc.php	10 Jan 2005 13:12:53 -0000	1.130
+++ serendipity_config.inc.php	11 Jan 2005 12:53:27 -0000	1.131
@@ -114,9 +114,9 @@
 @define('PATH_ADMIN', 'admin');
 @define('PATH_ENTRIES', 'entries');
 @define('PATH_SEARCH', 'search');
+@define('PATH_CSS', 'css');
 @define('PATH_SMARTY_COMPILE', 'templates_c'); // will be placed inside the template directory
 
-
 /* Changing this is NOT recommended, rewrite rules does not take them into account - yet */
 @define('PERM_ARCHIVES', '%id%-%title%.html');
 @define('PERM_CATEGORIES', '%id%-%title%');
@@ -126,6 +126,8 @@
 /* URI patterns
  * Note that it's important to use @ as the pattern delimiter. DO NOT use shortcuts
  * like \d or \s, since mod_rewrite will use the regexps as well and chokes on them.
+ * If you add new patterns, remember to add the new rules to the *.tpl files and
+ * function serendipity_installFiles().
  */
 @define('PAT_FILENAME', '0-9a-z\.\_!;,\+\-');
 @define('PAT_UNSUBSCRIBE', '@/'.PATH_UNSUBSCRIBE.'/(.*)/([0-9]+)@');
@@ -142,6 +144,7 @@
 @define('PAT_CATEGORIES', '@/'.PATH_CATEGORIES.'/([0-9]+)@');
 @define('PAT_PLUGIN', '@/' . PATH_PLUGIN . '/(.*)@');
 @define('PAT_SEARCH', '@/' . PATH_SEARCH . '/(.*)@');
+@define('PAT_CSS', '@/' . PATH_CSS . '/(.*)@');
 
 @define('USERLEVEL_ADMIN', 255);
 @define('USERLEVEL_CHIEF', 1);

Index: index.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/index.php,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -d -r1.71 -r1.72
--- index.php	10 Jan 2005 13:12:52 -0000	1.71
+++ index.php	11 Jan 2005 12:53:26 -0000	1.72
@@ -254,16 +254,6 @@
     $serendipity['head_subtitle'] = $serendipity['blogTitle'];
 
     include_once(S9Y_INCLUDE_PATH . 'include/genpage.inc.php');
-} else if (preg_match('@/(index(\.php|\.html)?)|'. preg_quote($serendipity['indexFile']) .'@', $uri) ||
-           preg_match('@^/' . preg_quote(trim($serendipity['serendipityHTTPPath'], '/')) . '/?(\?.*)?$@', $uri)) {
-
-    if ($serendipity['GET']['action'] == 'search') {
-        $serendipity['uriArguments'] = array(PATH_SEARCH, urlencode($serendipity['GET']['searchTerm']));
-    } else {
-        $serendipity['uriArguments'][] = PATH_ARCHIVES;
-    }
-
-    include_once(S9Y_INCLUDE_PATH . 'include/genpage.inc.php');
 } else if (preg_match(PAT_SEARCH, $uri, $matches)) {
     $_args = $serendipity['uriArguments'];
 
@@ -286,6 +276,20 @@
     $serendipity['GET']['action']     = 'search';
     $serendipity['GET']['searchTerm'] = urldecode(htmlspecialchars(strip_tags(implode(' ', $search))));
     include_once(S9Y_INCLUDE_PATH . 'include/genpage.inc.php');
+} elseif (preg_match(PAT_CSS, $uri, $matches)) {
+    $css_mode = $matches[1];
+    include_once(S9Y_INCLUDE_PATH . 'serendipity.css.php');
+    exit;
+} else if (preg_match('@/(index(\.php|\.html)?)|'. preg_quote($serendipity['indexFile']) .'@', $uri) ||
+           preg_match('@^/' . preg_quote(trim($serendipity['serendipityHTTPPath'], '/')) . '/?(\?.*)?$@', $uri)) {
+
+    if ($serendipity['GET']['action'] == 'search') {
+        $serendipity['uriArguments'] = array(PATH_SEARCH, urlencode($serendipity['GET']['searchTerm']));
+    } else {
+        $serendipity['uriArguments'][] = PATH_ARCHIVES;
+    }
+
+    include_once(S9Y_INCLUDE_PATH . 'include/genpage.inc.php');
 } else {
     header('HTTP/1.0 404 Not found');
     include_once(S9Y_INCLUDE_PATH . 'include/genpage.inc.php');

Index: serendipity_admin.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin.php,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -d -r1.57 -r1.58
--- serendipity_admin.php	19 Dec 2004 00:03:23 -0000	1.57
+++ serendipity_admin.php	11 Jan 2005 12:53:27 -0000	1.58
@@ -31,7 +31,7 @@
     <head>
         <title><?php echo SERENDIPITY_ADMIN_SUITE; ?></title>
         <meta http-equiv="Content-Type" content="text/html; charset=<?php echo LANG_CHARSET; ?>" />
-        <link rel="stylesheet" type="text/css" href="<?php echo serendipity_getTemplateFile('admin/style.css') ?>" />
+        <link rel="stylesheet" type="text/css" href="<?php echo serendipity_rewriteURL(PATH_CSS . '/serendipity_admin.css'); ?>" />
         <script type="text/javascript">
         function spawn() {
             if (self.Spawnextended) {

[php-blog-cvs] serendipity/docs NEWS,1.46,1.47

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

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

Modified Files:
	NEWS 
Log Message:
Pretty URLs for CSS output, hopefully exactly as Tom imagined. 
I'm going to tweak IE styles now, so I needed the PNG behavior plugin stuff.

Also fix the PAT_AUTHORS into the htaccess template and properly move the 
"search" pretty URL code above matching index.php so that it works on
hosts without rewriting.



Index: NEWS
===================================================================
RCS file: /cvsroot/php-blog/serendipity/docs/NEWS,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -d -r1.46 -r1.47
--- NEWS	10 Jan 2005 16:37:51 -0000	1.46
+++ NEWS	11 Jan 2005 12:53:28 -0000	1.47
@@ -3,6 +3,9 @@
 Version 0.8 ()
 ------------------------------------------------------------------------
 
+    * New pretty URLs "/blog/css/serendipity.css" and
+      "/blog/css/serendipity_admin.css" as links to the Stylesheets.
+
     * Chief users are not allowed to hide plugins installed by other
       users. (garvinhicking)
 

[php-blog-cvs] serendipity/include/admin plugins.inc.php,1.12,1.13

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

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

Modified Files:
	plugins.inc.php 
Log Message:
fix undefined variable


Index: plugins.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/admin/plugins.inc.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- plugins.inc.php	10 Jan 2005 16:25:10 -0000	1.12
+++ plugins.inc.php	11 Jan 2005 12:18:40 -0000	1.13
@@ -553,6 +553,10 @@
         if (!empty($plug['version'])) {
             $pluginInfo[] = VERSION  . ': ' . $plug['version'];
         }
+
+        if (!isset($plug['customURI'])) {
+            $plug['customURI'] = '';
+        }
 ?>
     <tr id="serendipity_plugin_<?php echo $plug['class_name']; ?>">
         <td colspan="2" <?php echo $jsLine ?>>

[php-blog-cvs] serendipity/include/tpl config_personal.inc.php,1.3,1.4

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

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

Modified Files:
	config_personal.inc.php 
Log Message:
be nice to users and allow them to switch their language again


Index: config_personal.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/tpl/config_personal.inc.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- config_personal.inc.php	8 Dec 2004 20:27:53 -0000	1.3
+++ config_personal.inc.php	10 Jan 2005 16:37:52 -0000	1.4
@@ -40,6 +40,7 @@
                                           'description' => INSTALL_LANG_DESC,
                                           'type'        => 'list',
                                           'default'     => $serendipity['languages'],
+                                          'userlevel'   => USERLEVEL_EDITOR,
                                           'flags'       => array('config')),
 
                                     array('var'         => 'wysiwyg',
@@ -47,6 +48,7 @@
                                           'description' => INSTALL_WYSIWYG_DESC,
                                           'type'        => 'bool',
                                           'default'     => false,
+                                          'userlevel'   => USERLEVEL_EDITOR,
                                           'flags'       => array('config')),
 
                                     array('var'         => 'mail_comments',

[php-blog-cvs] serendipity/docs NEWS,1.45,1.46

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

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

Modified Files:
	NEWS 
Log Message:
be nice to users and allow them to switch their language again


Index: NEWS
===================================================================
RCS file: /cvsroot/php-blog/serendipity/docs/NEWS,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -d -r1.45 -r1.46
--- NEWS	10 Jan 2005 16:25:02 -0000	1.45
+++ NEWS	10 Jan 2005 16:37:51 -0000	1.46
@@ -3,7 +3,7 @@
 Version 0.8 ()
 ------------------------------------------------------------------------
 
-    * Editor users are not allowed to hide plugins installed by other
+    * Chief users are not allowed to hide plugins installed by other
       users. (garvinhicking)
 
     * Forbid uploading of active content files (.php, .shtml, ...) as

[php-blog-cvs] serendipity/include/admin plugins.inc.php,1.11,1.12

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

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

Modified Files:
	plugins.inc.php 
Log Message:
< Administrator users shall not be allowed to hide plugins not added by them


Index: plugins.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/admin/plugins.inc.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- plugins.inc.php	2 Jan 2005 15:05:48 -0000	1.11
+++ plugins.inc.php	10 Jan 2005 16:25:10 -0000	1.12
@@ -57,6 +57,8 @@
         foreach ($plugins as $plugin_data) {
             $plugin =& serendipity_plugin_api::load_plugin($plugin_data['name'], $plugin_data['authorid']);
             $key    = urlencode($plugin_data['name']);
+            $is_plugin_owner    = ($plugin_data['authorid'] == $serendipity['authorid'] || $serendipity['serendipityUserlevel'] >= USERLEVEL_ADMIN);
+            $is_plugin_editable = ($is_plugin_owner || $plugin_data['authorid'] == '0');
 
             if (!is_object($plugin)) {
                 $name = ERROR . ': ' . $plugin_data['name'];
@@ -83,7 +85,7 @@
                 $place = '<input type="hidden" name="serendipity[placement][' . $plugin_data['name'] . ']" value="event" />';
                 $event_only_uri = '&amp;serendipity[event_plugin]=true';
             } else {
-                $place = placement_box('serendipity[placement][' . $plugin_data['name'] . ']', $plugin_data['placement']);
+                $place = placement_box('serendipity[placement][' . $plugin_data['name'] . ']', $plugin_data['placement'], $is_plugin_editable);
                 $event_only_uri = '';
             }
 
@@ -103,7 +105,7 @@
             <tr>
                 <td style="border-bottom: 1px solid #000000">
                     <div>
-                    <?php if ($plugin_data['authorid'] == '0' || $plugin_data['authorid'] == $serendipity['authorid'] || $serendipity['serendipityUserlevel'] >= USERLEVEL_ADMIN) { ?>
+                    <?php if ($is_plugin_editable) { ?>
                         <input type="checkbox" name="serendipity[plugin_to_remove][]" value="<?php echo $plugin_data['name']; ?>" />
                     <?php } else { ?>
                         &nbsp;
@@ -115,11 +117,7 @@
                 <td style="border-bottom: 1px solid #000000" nowrap="nowrap">
                     <div>
                     <?php
-                    if ($plugin_data['authorid'] == $serendipity['authorid'] || $serendipity['serendipityUserlevel'] >= USERLEVEL_ADMIN) {
-                        ownership($plugin_data['authorid'], $plugin_data['name']);
-                    } else {
-                        ownership($plugin_data['authorid'], $plugin_data['name'], true);
-                    }
+                        ownership($plugin_data['authorid'], $plugin_data['name'], $is_plugin_owner);
                     ?>
                     </div>
                 </td>
@@ -146,7 +144,7 @@
 <?php
 }
 
-function ownership($authorid, $name, $readonly = false) {
+function ownership($authorid, $name, $is_plugin_owner = false) {
     global $serendipity;
 
     static $users = array();
@@ -154,7 +152,7 @@
         $users = serendipity_fetchUsers();
     }
 
-    if (!$readonly) {
+    if ($is_plugin_owner) {
 ?>
 <select name="serendipity[ownership][<?php echo $name; ?>]">
     <option value="0"><?php echo ALL_AUTHORS; ?></option>
@@ -162,16 +160,16 @@
     }
 
     foreach($users AS $user) {
-        if ($readonly && $user['authorid'] == $authorid) {
+        if (!$is_plugin_owner && $user['authorid'] == $authorid) {
             $username = htmlspecialchars($user['username']);
-        } elseif (!$readonly) {
+        } elseif ($is_plugin_owner) {
 ?>
     <option value="<?php echo $user['authorid']; ?>"<?php echo ($user['authorid'] == $authorid ? ' selected="selected"' : ''); ?>><?php echo htmlspecialchars($user['username']); ?></option>
 <?php
         }
     }
 
-    if (!$readonly) {
+    if ($is_plugin_owner) {
 ?>
 </select>
 <?php
@@ -180,7 +178,7 @@
     }
 }
 
-function placement_box($name, $val)
+function placement_box($name, $val, $is_plugin_editable = false)
 {
     static $opts = array(
                     'left'  => LEFT,
@@ -190,6 +188,10 @@
 
     $x = "\n<select name=\"$name\">\n";
     foreach ($opts as $k => $v) {
+        if (!$is_plugin_editable && $k == 'hide') {
+            continue;
+        }
+
         $x .= "    <option value=\"$k\"" . ($k == $val ? ' selected="selected"' : '') . ">$v</option>\n";
     }
     return $x . "</select>\n";

[php-blog-cvs] serendipity/docs NEWS,1.44,1.45

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

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

Modified Files:
	NEWS 
Log Message:
< Administrator users shall not be allowed to hide plugins not added by them


Index: NEWS
===================================================================
RCS file: /cvsroot/php-blog/serendipity/docs/NEWS,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -d -r1.44 -r1.45
--- NEWS	10 Jan 2005 16:01:45 -0000	1.44
+++ NEWS	10 Jan 2005 16:25:02 -0000	1.45
@@ -3,8 +3,8 @@
 Version 0.8 ()
 ------------------------------------------------------------------------
 
-    * Editor users are not allowed to hide pre-installed plugins
-      (garvinhicking)
+    * Editor users are not allowed to hide plugins installed by other
+      users. (garvinhicking)
 
     * Forbid uploading of active content files (.php, .shtml, ...) as
       user without Administrator privileges (garvinhicking)

[php-blog-cvs] serendipity/include plugin_api.inc.php,1.13,1.14

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

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

Modified Files:
	plugin_api.inc.php 
Log Message:
< Administrator users shall not be allowed to hide plugins not added by them


Index: plugin_api.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/plugin_api.inc.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- plugin_api.inc.php	8 Jan 2005 14:28:22 -0000	1.13
+++ plugin_api.inc.php	10 Jan 2005 16:25:09 -0000	1.14
@@ -337,13 +337,19 @@
     {
         global $serendipity;
 
+        $admin = '';
+        if ($serendipity['serendipityUserlevel'] < USERLEVEL_ADMIN && $placement = 'hidden') {
+            // Only administrators can set plugins to 'hidden' if they are not the owners.
+            $admin = " AND (authorid = 0 OR authorid = {$serendipity['authorid']})";
+        }
+
         $sql = "UPDATE {$serendipity['dbPrefix']}plugins set placement='$placement' ";
 
         if ($order !== null) {
             $sql .= ", sort_order=$order ";
         }
 
-        $sql .= "WHERE name='$name'";
+        $sql .= "WHERE name='$name' $admin";
 
         return serendipity_db_query($sql);
     }

[php-blog-cvs] serendipity/lang serendipity_lang_bg.inc.php,1.48,1.49 serendipity_lang_cn.inc.php,1.15,1.16 serendipity_lang_cs.inc.php,1.95,1.96 serendipity_lang_cz.inc.php,1.95,1.96 serendipity_lang_da.inc.php,1.114,1.115 serendipity_lang_de.inc.php,1.136,1.137 serendipity_lang_en.inc.php,1.116,1.117 serendipity_lang_es.inc.php,1.110,1.111 serendipity_lang_fi.inc.php,1.3,1.4 serendipity_lang_fr.inc.php,1.95,1.96 serendipity_lang_it.inc.php,1.34,1.35 serendipity_lang_ja.inc.php,1.7,1.8 serendipity_lang_ko.inc.php,1.2,1.3 serendipity_lang_nl.inc.php,1.71,1.72 serendipity_lang_no.inc.php,1.35,1.36 serendipity_lang_pt.inc.php,1.70,1.71 serendipity_lang_ru.inc.php,1.8,1.9 serendipity_lang_tn.inc.php,1.16,1.17 serendipity_lang_tw.inc.php,1.31,1.32 serendipity_lang_zh.inc.php,1.15,1.16

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

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

Modified Files:
	serendipity_lang_bg.inc.php serendipity_lang_cn.inc.php 
	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_fi.inc.php serendipity_lang_fr.inc.php 
	serendipity_lang_it.inc.php serendipity_lang_ja.inc.php 
	serendipity_lang_ko.inc.php serendipity_lang_nl.inc.php 
	serendipity_lang_no.inc.php serendipity_lang_pt.inc.php 
	serendipity_lang_ru.inc.php serendipity_lang_tn.inc.php 
	serendipity_lang_tw.inc.php serendipity_lang_zh.inc.php 
Log Message:
forbid uploading of active content files


Index: serendipity_lang_cs.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_cs.inc.php,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -d -r1.95 -r1.96
--- serendipity_lang_cs.inc.php	9 Jan 2005 18:51:45 -0000	1.95
+++ serendipity_lang_cs.inc.php	10 Jan 2005 16:01:48 -0000	1.96
@@ -666,6 +666,7 @@
 @define('DO_MARKUP_DESCRIPTION', 'Pøevést znaèky na text (smajlíky, zkratky *, /, _, ...). Vypnutí této volby zajistí uložení HTML kódù v textu.');
 @define('CATEGORY_ALREADY_EXIST', 'A category with the name "%s" already exist'); // Translate
 @define('IMPORT_NOTES', 'Note:'); // Translate
+@define('ERROR_FILE_FORBIDDEN', 'You are not allowed to upload files with active content'); // Translate
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>
\ No newline at end of file

Index: serendipity_lang_no.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_no.inc.php,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- serendipity_lang_no.inc.php	9 Jan 2005 18:51:48 -0000	1.35
+++ serendipity_lang_no.inc.php	10 Jan 2005 16:01:53 -0000	1.36
@@ -662,5 +662,6 @@
 @define('DO_MARKUP_DESCRIPTION', 'Tilføy markup-transformasjoner på teksten (smilies, shortcut markups via *, /, _, ...). Hvis du slår dette av vil all HTML-kode i teksten bli beholdt.');
 @define('CATEGORY_ALREADY_EXIST', 'A category with the name "%s" already exist'); // Translate
 @define('IMPORT_NOTES', 'Note:'); // Translate
+@define('ERROR_FILE_FORBIDDEN', 'You are not allowed to upload files with active content'); // Translate
 
 ?>
\ No newline at end of file

Index: serendipity_lang_zh.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_zh.inc.php,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- serendipity_lang_zh.inc.php	9 Jan 2005 18:51:49 -0000	1.15
+++ serendipity_lang_zh.inc.php	10 Jan 2005 16:01:54 -0000	1.16
@@ -665,6 +665,7 @@
 @define('DO_MARKUP_DESCRIPTION', 'Apply markup transformations to the text (smilies, shortcut markups via *, /, _, ...). Disabling this will preserve any HTML-code in the text.'); // Translate
 @define('CATEGORY_ALREADY_EXIST', 'A category with the name "%s" already exist'); // Translate
 @define('IMPORT_NOTES', 'Note:'); // Translate
+@define('ERROR_FILE_FORBIDDEN', 'You are not allowed to upload files with active content'); // Translate
 
 /* 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.116
retrieving revision 1.117
diff -u -d -r1.116 -r1.117
--- serendipity_lang_en.inc.php	9 Jan 2005 10:34:05 -0000	1.116
+++ serendipity_lang_en.inc.php	10 Jan 2005 16:01:50 -0000	1.117
@@ -663,6 +663,7 @@
 @define('APPROVE', 'Approve');
 @define('DO_MARKUP_DESCRIPTION', 'Apply markup transformations to the text (smilies, shortcut markups via *, /, _, ...). Disabling this will preserve any HTML-code in the text.');
 @define('CATEGORY_ALREADY_EXIST', 'A category with the name "%s" already exist');
+@define('ERROR_FILE_FORBIDDEN', 'You are not allowed to upload files with active content');
 
 /* vim: set sts=4 ts=4 expandtab : */
-?>
+?>
\ No newline at end of file

Index: serendipity_lang_ja.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_ja.inc.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- serendipity_lang_ja.inc.php	9 Jan 2005 18:51:48 -0000	1.7
+++ serendipity_lang_ja.inc.php	10 Jan 2005 16:01:51 -0000	1.8
@@ -668,6 +668,7 @@
 @define('APPROVE', '承認');
 @define('CATEGORY_ALREADY_EXIST', '"%s" という名前のカテゴリは既に存在します。');
 @define('IMPORT_NOTES', 'Note:'); // Translate
+@define('ERROR_FILE_FORBIDDEN', 'You are not allowed to upload files with active content'); // Translate
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>

Index: serendipity_lang_bg.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_bg.inc.php,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -d -r1.48 -r1.49
--- serendipity_lang_bg.inc.php	9 Jan 2005 18:51:44 -0000	1.48
+++ serendipity_lang_bg.inc.php	10 Jan 2005 16:01:48 -0000	1.49
@@ -649,6 +649,7 @@
 @define('DO_MARKUP_DESCRIPTION', 'Apply markup transformations to the text (smilies, shortcut markups via *, /, _, ...). Disabling this will preserve any HTML-code in the text.'); // Translate
 @define('CATEGORY_ALREADY_EXIST', 'A category with the name "%s" already exist'); // Translate
 @define('IMPORT_NOTES', 'Note:'); // Translate
+@define('ERROR_FILE_FORBIDDEN', 'You are not allowed to upload files with active content'); // Translate
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>
\ No newline at end of file

Index: serendipity_lang_tw.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_tw.inc.php,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- serendipity_lang_tw.inc.php	9 Jan 2005 18:51:49 -0000	1.31
+++ serendipity_lang_tw.inc.php	10 Jan 2005 16:01:54 -0000	1.32
@@ -666,6 +666,7 @@
 @define('DO_MARKUP_DESCRIPTION', 'Apply markup transformations to the text (smilies, shortcut markups via *, /, _, ...). Disabling this will preserve any HTML-code in the text.'); // Translate
 @define('CATEGORY_ALREADY_EXIST', 'A category with the name "%s" already exist'); // Translate
 @define('IMPORT_NOTES', 'Note:'); // Translate
+@define('ERROR_FILE_FORBIDDEN', 'You are not allowed to upload files with active content'); // Translate
 
 /* 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.95
retrieving revision 1.96
diff -u -d -r1.95 -r1.96
--- serendipity_lang_cz.inc.php	9 Jan 2005 18:51:45 -0000	1.95
+++ serendipity_lang_cz.inc.php	10 Jan 2005 16:01:48 -0000	1.96
@@ -666,6 +666,7 @@
 @define('DO_MARKUP_DESCRIPTION', 'Pøevést znaèky na text (smajlíky, zkratky *, /, _, ...). Vypnutí této volby zajistí ulo¾ení HTML kódù v textu.');
 @define('CATEGORY_ALREADY_EXIST', 'A category with the name "%s" already exist'); // Translate
 @define('IMPORT_NOTES', 'Note:'); // Translate
+@define('ERROR_FILE_FORBIDDEN', 'You are not allowed to upload files with active content'); // Translate
 
 /* 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.70
retrieving revision 1.71
diff -u -d -r1.70 -r1.71
--- serendipity_lang_pt.inc.php	9 Jan 2005 18:51:48 -0000	1.70
+++ serendipity_lang_pt.inc.php	10 Jan 2005 16:01:53 -0000	1.71
@@ -668,6 +668,7 @@
 @define('DO_MARKUP_DESCRIPTION', 'Apply markup transformations to the text (smilies, shortcut markups via *, /, _, ...). Disabling this will preserve any HTML-code in the text.'); // Translate
 @define('CATEGORY_ALREADY_EXIST', 'A category with the name "%s" already exist'); // Translate
 @define('IMPORT_NOTES', 'Note:'); // Translate
+@define('ERROR_FILE_FORBIDDEN', 'You are not allowed to upload files with active content'); // Translate
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>
\ No newline at end of file

Index: serendipity_lang_it.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_it.inc.php,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- serendipity_lang_it.inc.php	9 Jan 2005 18:51:47 -0000	1.34
+++ serendipity_lang_it.inc.php	10 Jan 2005 16:01:51 -0000	1.35
@@ -667,6 +667,7 @@
 @define('DO_MARKUP_DESCRIPTION', 'Applica le trasformazioni del markup al testo (smilies, abbreviazionicon *, /, _, ...). Disabilitare questa opzione significa mantenere il codice HTML nel testo.');
 @define('CATEGORY_ALREADY_EXIST', 'A category with the name "%s" already exist'); // Translate
 @define('IMPORT_NOTES', 'Note:'); // Translate
+@define('ERROR_FILE_FORBIDDEN', 'You are not allowed to upload files with active content'); // Translate
 
 /* 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.114
retrieving revision 1.115
diff -u -d -r1.114 -r1.115
--- serendipity_lang_da.inc.php	9 Jan 2005 18:51:46 -0000	1.114
+++ serendipity_lang_da.inc.php	10 Jan 2005 16:01:49 -0000	1.115
@@ -662,6 +662,7 @@
 @define('DO_MARKUP_DESCRIPTION', 'Tilføj markup-transformationer på teksten (smilies, shortcut markups via *, /, _, ...). Hvis du slår dette fra vil al HTML-kode i teksten blive bibeholdt.');
 @define('CATEGORY_ALREADY_EXIST', 'A category with the name "%s" already exist'); // Translate
 @define('IMPORT_NOTES', 'Note:'); // Translate
+@define('ERROR_FILE_FORBIDDEN', 'You are not allowed to upload files with active content'); // Translate
 
 /* 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.95
retrieving revision 1.96
diff -u -d -r1.95 -r1.96
--- serendipity_lang_fr.inc.php	9 Jan 2005 18:51:46 -0000	1.95
+++ serendipity_lang_fr.inc.php	10 Jan 2005 16:01:51 -0000	1.96
@@ -670,6 +670,7 @@
 @define('DO_MARKUP_DESCRIPTION', 'Transforme les balises dans le texte (smileys, raccourcis via *, /, _, ...). La désactiver préserva tout le code HTML dans le texte.');
 @define('CATEGORY_ALREADY_EXIST', 'A category with the name "%s" already exist'); // Translate
 @define('IMPORT_NOTES', 'Note:'); // Translate
+@define('ERROR_FILE_FORBIDDEN', 'You are not allowed to upload files with active content'); // Translate
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>
\ No newline at end of file

Index: serendipity_lang_fi.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_fi.inc.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- serendipity_lang_fi.inc.php	9 Jan 2005 18:51:46 -0000	1.3
+++ serendipity_lang_fi.inc.php	10 Jan 2005 16:01:51 -0000	1.4
@@ -663,6 +663,7 @@
 @define('DO_MARKUP_DESCRIPTION', 'Tee tekstille notaatiomuutokset (hymiöt, lyhennelmät käyttäen *, /, _, ...). Kieltämällä tämä säilyy  HTML-koodi tekstissä sellaisenaan.');
 @define('CATEGORY_ALREADY_EXIST', 'A category with the name "%s" already exist'); // Translate
 @define('IMPORT_NOTES', 'Note:'); // Translate
+@define('ERROR_FILE_FORBIDDEN', 'You are not allowed to upload files with active content'); // Translate
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>
\ No newline at end of file

Index: serendipity_lang_ko.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_ko.inc.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- serendipity_lang_ko.inc.php	9 Jan 2005 18:51:48 -0000	1.2
+++ serendipity_lang_ko.inc.php	10 Jan 2005 16:01:52 -0000	1.3
@@ -1328,10 +1328,7 @@
 
 @define('CATEGORY_ALREADY_EXIST', 'A category with the name "%s" already exist');
 @define('IMPORT_NOTES', 'Note:'); // Translate
-
-
+@define('ERROR_FILE_FORBIDDEN', 'You are not allowed to upload files with active content'); // Translate
 
 /* vim: set sts=4 ts=4 expandtab : */
-
-?>
-
+?>
\ No newline at end of file

Index: serendipity_lang_es.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_es.inc.php,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -d -r1.110 -r1.111
--- serendipity_lang_es.inc.php	9 Jan 2005 18:51:46 -0000	1.110
+++ serendipity_lang_es.inc.php	10 Jan 2005 16:01:51 -0000	1.111
@@ -671,6 +671,7 @@
 @define('DO_MARKUP_DESCRIPTION', 'Aplicar transformaciones de marcas al texto (caras, marcas abreviadas como *. /, _, ...). Desactivando esto preservará cualquier código HTML en el texto.');
 @define('CATEGORY_ALREADY_EXIST', 'A category with the name "%s" already exist'); // Translate
 @define('IMPORT_NOTES', 'Note:'); // Translate
+@define('ERROR_FILE_FORBIDDEN', 'You are not allowed to upload files with active content'); // Translate
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>
\ No newline at end of file

Index: serendipity_lang_cn.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_cn.inc.php,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- serendipity_lang_cn.inc.php	9 Jan 2005 18:51:45 -0000	1.15
+++ serendipity_lang_cn.inc.php	10 Jan 2005 16:01:48 -0000	1.16
@@ -665,6 +665,7 @@
 @define('DO_MARKUP_DESCRIPTION', 'Apply markup transformations to the text (smilies, shortcut markups via *, /, _, ...). Disabling this will preserve any HTML-code in the text.'); // Translate
 @define('CATEGORY_ALREADY_EXIST', 'A category with the name "%s" already exist'); // Translate
 @define('IMPORT_NOTES', 'Note:'); // Translate
+@define('ERROR_FILE_FORBIDDEN', 'You are not allowed to upload files with active content'); // Translate
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>
\ No newline at end of file

Index: serendipity_lang_tn.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_tn.inc.php,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- serendipity_lang_tn.inc.php	9 Jan 2005 18:51:48 -0000	1.16
+++ serendipity_lang_tn.inc.php	10 Jan 2005 16:01:54 -0000	1.17
@@ -666,6 +666,7 @@
 @define('DO_MARKUP_DESCRIPTION', 'Apply markup transformations to the text (smilies, shortcut markups via *, /, _, ...). Disabling this will preserve any HTML-code in the text.'); // Translate
 @define('CATEGORY_ALREADY_EXIST', 'A category with the name "%s" already exist'); // Translate
 @define('IMPORT_NOTES', 'Note:'); // Translate
+@define('ERROR_FILE_FORBIDDEN', 'You are not allowed to upload files with active content'); // Translate
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>
\ No newline at end of file

Index: serendipity_lang_ru.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_ru.inc.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- serendipity_lang_ru.inc.php	9 Jan 2005 18:51:48 -0000	1.8
+++ serendipity_lang_ru.inc.php	10 Jan 2005 16:01:53 -0000	1.9
@@ -668,7 +668,7 @@
 @define('DO_MARKUP_DESCRIPTION', 'Apply markup transformations to the text (smilies, shortcut markups via *, /, _, ...). Disabling this will preserve any HTML-code in the text.'); // Translate
 @define('CATEGORY_ALREADY_EXIST', 'A category with the name "%s" already exist'); // Translate
 @define('IMPORT_NOTES', 'Note:'); // Translate
-
+@define('ERROR_FILE_FORBIDDEN', 'You are not allowed to upload files with active content'); // Translate
 
 /* 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.136
retrieving revision 1.137
diff -u -d -r1.136 -r1.137
--- serendipity_lang_de.inc.php	9 Jan 2005 10:34:04 -0000	1.136
+++ serendipity_lang_de.inc.php	10 Jan 2005 16:01:50 -0000	1.137
@@ -664,6 +664,7 @@
 @define('APPROVE', 'Bewilligen');
 @define('DO_MARKUP_DESCRIPTION', 'Textformatierung(en) durchführen, wie z.B. Smilies, Schnellformatierung via *, /, _, ...). Dadurch wird jeglicher eingegebener HTML-Code beibehalten.');
 @define('CATEGORY_ALREADY_EXIST', 'A category with the name "%s" already exist'); // Translate
+@define('ERROR_FILE_FORBIDDEN', 'You are not allowed to upload files with active content'); // Translate
 
 /* 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.71
retrieving revision 1.72
diff -u -d -r1.71 -r1.72
--- serendipity_lang_nl.inc.php	9 Jan 2005 18:51:48 -0000	1.71
+++ serendipity_lang_nl.inc.php	10 Jan 2005 16:01:52 -0000	1.72
@@ -671,6 +671,7 @@
 @define('DO_MARKUP_DESCRIPTION', 'Voer tekstopmaak uit (smilies, shortcut markups via *, /, _, ...). Met het uitschakelen van deze optie behoud u de HTML-code in the text.');
 @define('CATEGORY_ALREADY_EXIST', 'A category with the name "%s" already exist'); // Translate
 @define('IMPORT_NOTES', 'Note:'); // Translate
+@define('ERROR_FILE_FORBIDDEN', 'You are not allowed to upload files with active content'); // Translate
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>
\ No newline at end of file

[php-blog-cvs] serendipity/docs NEWS,1.43,1.44

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

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

Modified Files:
	NEWS 
Log Message:
forbid uploading of active content files


Index: NEWS
===================================================================
RCS file: /cvsroot/php-blog/serendipity/docs/NEWS,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -d -r1.43 -r1.44
--- NEWS	9 Jan 2005 10:39:29 -0000	1.43
+++ NEWS	10 Jan 2005 16:01:45 -0000	1.44
@@ -3,14 +3,23 @@
 Version 0.8 ()
 ------------------------------------------------------------------------
 
+    * Editor users are not allowed to hide pre-installed plugins
+      (garvinhicking)
+
+    * Forbid uploading of active content files (.php, .shtml, ...) as
+      user without Administrator privileges (garvinhicking)
+
+    * Allow searching of the blog with pretty URLs, allow pagination
+      of searched entries (garvinhicking)
+
     * Added handling of CONVERT BREAKS-directive in MT-Importer. Do the
       whole importing process in a transaction to ensure either all or
-      no entires are imported.
+      no entires are imported. (pilif)
 
     * Added hook for external authentication. First implementation draft
       of LDAP auth added to additional_plugins CVS (garvinhicking)
 
-    * Added an extended property to disable nl2br() for specific 
+    * Added an extended property to disable nl2br() for specific
       entries (pilif)
 
     * Added korean language by Erich Iseli (garvinhicking)

[php-blog-cvs] serendipity/include/admin images.inc.php,1.9,1.10

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

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

Modified Files:
	images.inc.php 
Log Message:
forbid uploading of active content files


Index: images.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/admin/images.inc.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- images.inc.php	15 Dec 2004 19:58:05 -0000	1.9
+++ images.inc.php	10 Jan 2005 16:01:47 -0000	1.10
@@ -118,6 +118,11 @@
             $tfile   = basename($serendipity['POST']['imageurl']);
         }
 
+        if ($serendipity['serendipityUserlevel'] < USERLEVEL_ADMIN && preg_match('@\.(php[34]?|[ps]html?)$@i', $tfile)) {
+            printf(ERROR_FILE_FORBIDDEN, $tfile);
+            break;
+        }
+
         serendipity_uploadSecure($tfile);
         serendipity_uploadSecure($serendipity['POST']['target_directory'], true);
         $target = $serendipity['serendipityPath'] . $serendipity['uploadPath'] . $serendipity['POST']['target_directory'] . $tfile;
@@ -152,6 +157,11 @@
             $tfile   = $_FILES['userfile']['name'];
         }
 
+        if ($serendipity['serendipityUserlevel'] < USERLEVEL_ADMIN && preg_match('@\.(php[34]?|[ps]html?)$@i', $tfile)) {
+            printf(ERROR_FILE_FORBIDDEN, $tfile);
+            break;
+        }
+
         serendipity_uploadSecure($tfile);
         serendipity_uploadSecure($serendipity['POST']['target_directory'], true);
         $target = $serendipity['serendipityPath'] . $serendipity['uploadPath'] . $serendipity['POST']['target_directory'] . $tfile;

[php-blog-cvs] serendipity/include functions_entries.inc.php,1.41,1.42 functions_installer.inc.php,1.24,1.25

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

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

Modified Files:
	functions_entries.inc.php functions_installer.inc.php 
Log Message:
* Allow pagination for searched entries
* Pretty URLs for search: http://blog/search/SEARCHTERM and
  http://blog/search/SEARCHTERM/Pn.html for succeeding pages

- Requires version bump to work with mod_rewrite (not done yet, waiting
  for Tom)
- Done in a BC compatible way
- Needed to adjust RegExp for parsing uriArguments variable, because
  "%" and "+" signs need to be allowed to search for Umlauts etc.
  Please check if that may break things (don't know of any)



Index: functions_installer.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/functions_installer.inc.php,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- functions_installer.inc.php	2 Jan 2005 16:10:58 -0000	1.24
+++ functions_installer.inc.php	10 Jan 2005 13:12:56 -0000	1.25
@@ -592,7 +592,8 @@
                    '{PAT_CATEGORIES}', '{PATH_CATEGORIES}',
                    '{PAT_PLUGIN}', '{PATH_PLUGIN}',
                    '{PAT_DELETE}', '{PATH_DELETE}',
-                   '{PAT_APPROVE}', '{PATH_APPROVE}'
+                   '{PAT_APPROVE}', '{PATH_APPROVE}',
+                   '{PAT_SEARCH}', '{PATH_SEARCH}',
                  ),
 
                  array(
@@ -609,7 +610,8 @@
                    trim(PAT_CATEGORIES, '@/i'), PATH_CATEGORIES,
                    trim(PAT_PLUGIN, '@/i'), PATH_PLUGIN,
                    trim(PAT_DELETE, '@/i'), PATH_DELETE,
-                   trim(PAT_APPROVE, '@/i'), PATH_APPROVE
+                   trim(PAT_APPROVE, '@/i'), PATH_APPROVE,
+                   trim(PAT_SEARCH, '@/i'), PATH_SEARCH
                  ),
 
                  implode('', $a)

Index: functions_entries.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/functions_entries.inc.php,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -d -r1.41 -r1.42
--- functions_entries.inc.php	10 Jan 2005 12:22:51 -0000	1.41
+++ functions_entries.inc.php	10 Jan 2005 13:12:55 -0000	1.42
@@ -407,9 +407,19 @@
 /**
 * Give it a raw searchstring, it'll search
 **/
-function serendipity_searchEntries($term) {
+function serendipity_searchEntries($term, $limit = '') {
     global $serendipity;
 
+    if ($limit == '') {
+        $limit = $serendipity['fetchLimit'];
+    }
+
+    if (isset($serendipity['GET']['page']) && $serendipity['GET']['page'] > 1 && !strstr($limit, ',')) {
+        $limit = serendipity_db_limit(($serendipity['GET']['page']-1) * $limit, $limit);
+    }
+
+    $limit = serendipity_db_limit_sql($limit);
+
     $term = serendipity_db_escape_string($term);
     if (strtolower($serendipity['dbType']) == 'postgres') {
         $group     = '';
@@ -424,6 +434,19 @@
     $cond = array();
     $cond['and'] = " AND isdraft = 'false' " . (!serendipity_db_bool($serendipity['showFutureEntries']) ? " AND timestamp <= " . time() : '');
     serendipity_plugin_api::hook_event('frontend_fetchentries', $cond);
+
+    $serendipity['fullCountQuery'] = "
+                      FROM
+                            {$serendipity['dbPrefix']}entries e
+                 LEFT JOIN  {$serendipity['dbPrefix']}authors a
+                        ON  e.authorid = a.authorid
+                 LEFT JOIN  {$serendipity['dbPrefix']}entrycat ec
+                        ON  e.id = ec.entryid
+                            {$cond['joins']}
+                     WHERE
+                            $find_part
+                            {$cond['and']}";
+
     $querystring = "SELECT $distinct
                             e.id,
                             e.author,
@@ -437,20 +460,11 @@
                             e.extended,
                             e.trackbacks,
                             e.exflag
-                      FROM
-                            {$serendipity['dbPrefix']}entries e
-                 LEFT JOIN  {$serendipity['dbPrefix']}authors a
-                        ON  e.authorid = a.authorid
-                 LEFT JOIN  {$serendipity['dbPrefix']}entrycat ec
-                        ON  e.id = ec.entryid
-                            {$cond['joins']}
-                     WHERE
-                            $find_part
-                            {$cond['and']}
+                    {$serendipity['fullCountQuery']}
                     $group
-                  ORDER BY  timestamp DESC";
+                  ORDER BY  timestamp DESC
+                    $limit";
 
-    $serendipity['hidefooter'] = true;
     $search = serendipity_db_query($querystring);
     return $search;
 }

[php-blog-cvs] serendipity index.php,1.70,1.71 serendipity_config.inc.php,1.129,1.130

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

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

Modified Files:
	index.php serendipity_config.inc.php 
Log Message:
* Allow pagination for searched entries
* Pretty URLs for search: http://blog/search/SEARCHTERM and
  http://blog/search/SEARCHTERM/Pn.html for succeeding pages

- Requires version bump to work with mod_rewrite (not done yet, waiting
  for Tom)
- Done in a BC compatible way
- Needed to adjust RegExp for parsing uriArguments variable, because
  "%" and "+" signs need to be allowed to search for Umlauts etc.
  Please check if that may break things (don't know of any)



Index: serendipity_config.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_config.inc.php,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -d -r1.129 -r1.130
--- serendipity_config.inc.php	4 Jan 2005 10:18:06 -0000	1.129
+++ serendipity_config.inc.php	10 Jan 2005 13:12:53 -0000	1.130
@@ -113,6 +113,7 @@
 @define('PATH_PLUGIN', 'plugin');
 @define('PATH_ADMIN', 'admin');
 @define('PATH_ENTRIES', 'entries');
+@define('PATH_SEARCH', 'search');
 @define('PATH_SMARTY_COMPILE', 'templates_c'); // will be placed inside the template directory
 
 
@@ -140,6 +141,7 @@
 @define('PAT_ARCHIVE', '@/'.PATH_ARCHIVE.'$@');
 @define('PAT_CATEGORIES', '@/'.PATH_CATEGORIES.'/([0-9]+)@');
 @define('PAT_PLUGIN', '@/' . PATH_PLUGIN . '/(.*)@');
+@define('PAT_SEARCH', '@/' . PATH_SEARCH . '/(.*)@');
 
 @define('USERLEVEL_ADMIN', 255);
 @define('USERLEVEL_CHIEF', 1);

Index: index.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/index.php,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -d -r1.70 -r1.71
--- index.php	5 Jan 2005 13:08:44 -0000	1.70
+++ index.php	10 Jan 2005 13:12:52 -0000	1.71
@@ -29,7 +29,7 @@
 $uri = $_SERVER['REQUEST_URI'];
 
 /* Explode the path into sections, to later be able to check for arguments and add our own */
-preg_match('/^'. preg_quote($serendipity['serendipityHTTPPath'], '/') .'('. preg_quote($serendipity['indexFile'], '/') .'\?\/)?([a-z0-9\-*\/]+)/i', $uri, $_res);
+preg_match('/^'. preg_quote($serendipity['serendipityHTTPPath'], '/') .'('. preg_quote($serendipity['indexFile'], '/') .'\?\/)?([a-z0-9\-*\/%\+]+)/i', $uri, $_res);
 if ( strlen($_res[2]) != 0 ) {
     $serendipity['uriArguments'] = explode('/', $_res[2]);
 } else {
@@ -256,7 +256,35 @@
     include_once(S9Y_INCLUDE_PATH . 'include/genpage.inc.php');
 } else if (preg_match('@/(index(\.php|\.html)?)|'. preg_quote($serendipity['indexFile']) .'@', $uri) ||
            preg_match('@^/' . preg_quote(trim($serendipity['serendipityHTTPPath'], '/')) . '/?(\?.*)?$@', $uri)) {
-    $serendipity['uriArguments'][] = PATH_ARCHIVES;
+
+    if ($serendipity['GET']['action'] == 'search') {
+        $serendipity['uriArguments'] = array(PATH_SEARCH, urlencode($serendipity['GET']['searchTerm']));
+    } else {
+        $serendipity['uriArguments'][] = PATH_ARCHIVES;
+    }
+
+    include_once(S9Y_INCLUDE_PATH . 'include/genpage.inc.php');
+} else if (preg_match(PAT_SEARCH, $uri, $matches)) {
+    $_args = $serendipity['uriArguments'];
+
+    /* Attempt to locate hidden variables within the URI */
+    $search = array();
+    foreach ($_args as $k => $v){
+        if ($v == PATH_SEARCH) {
+            continue;
+        }
+
+        if ($v{0} == 'P') { /* Page */
+            $serendipity['GET']['page'] = substr($v, 1);
+            unset($_args[$k]);
+            unset($serendipity['uriArguments'][$k]);
+        } else {
+            $search[] = $v;
+        }
+    }
+
+    $serendipity['GET']['action']     = 'search';
+    $serendipity['GET']['searchTerm'] = urldecode(htmlspecialchars(strip_tags(implode(' ', $search))));
     include_once(S9Y_INCLUDE_PATH . 'include/genpage.inc.php');
 } else {
     header('HTTP/1.0 404 Not found');

[php-blog-cvs] serendipity/include/tpl htaccess_cgi_rewrite.tpl,1.4,1.5 htaccess_rewrite.tpl,1.4,1.5

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

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

Modified Files:
	htaccess_cgi_rewrite.tpl htaccess_rewrite.tpl 
Log Message:
* Allow pagination for searched entries
* Pretty URLs for search: http://blog/search/SEARCHTERM and
  http://blog/search/SEARCHTERM/Pn.html for succeeding pages

- Requires version bump to work with mod_rewrite (not done yet, waiting
  for Tom)
- Done in a BC compatible way
- Needed to adjust RegExp for parsing uriArguments variable, because
  "%" and "+" signs need to be allowed to search for Umlauts etc.
  Please check if that may break things (don't know of any)



Index: htaccess_rewrite.tpl
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/tpl/htaccess_rewrite.tpl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- htaccess_rewrite.tpl	29 Nov 2004 09:55:11 -0000	1.4
+++ htaccess_rewrite.tpl	10 Jan 2005 13:12:56 -0000	1.5
@@ -18,6 +18,7 @@
 RewriteRule ^{PAT_CATEGORIES} {indexFile}?url=/{PATH_CATEGORIES}/$1 [L,QSA]
 RewriteRule ^{PAT_FEED} rss.php?file=$1&ext=$2
 RewriteRule ^{PAT_PLUGIN} {indexFile}?url=plugin/$1 [L,QSA]
+RewriteRule ^{PAT_SEARCH} {indexFile}?url=/{PATH_SEARCH}/$1 [L,QSA]
 RewriteRule ^index\.(html?|php.?) {indexFile}?url=index.html [L,QSA]
 RewriteRule ^htmlarea/(.*) htmlarea/$1 [L,QSA]
 RewriteRule (.*\.html?) {indexFile}?url=/$1 [L,QSA]

Index: htaccess_cgi_rewrite.tpl
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/tpl/htaccess_cgi_rewrite.tpl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- htaccess_cgi_rewrite.tpl	29 Nov 2004 09:55:11 -0000	1.4
+++ htaccess_cgi_rewrite.tpl	10 Jan 2005 13:12:56 -0000	1.5
@@ -16,6 +16,7 @@
 RewriteRule ^{PAT_CATEGORIES} {indexFile}?url=/{PATH_CATEGORIES}/$1 [L,QSA]
 RewriteRule ^{PAT_FEED} rss.php?file=$1&ext=$2
 RewriteRule ^{PAT_PLUGIN} {indexFile}?url=plugin/$1 [L,QSA]
+RewriteRule ^{PAT_SEARCH} {indexFile}?url=/{PATH_SEARCH}/$1 [L,QSA]
 RewriteRule ^index\.(html?|php.?) {indexFile}?url=index.html [L,QSA]
 RewriteRule ^htmlarea/(.*) htmlarea/$1 [L,QSA]
 RewriteRule (.*\.html?) {indexFile}?url=/$1 [L,QSA]