[pLog-svn] r7167 - in plog/trunk: . bin-devel class/action/admin class/template/smarty/plugins templates templates/admin templates/default templates/rss

mark at devel.lifetype.net mark at devel.lifetype.net
Tue Feb 21 03:44:18 EST 2012 

Author: mark
Date: 2012-02-21 03:44:18 -0500 (Tue, 21 Feb 2012)
New Revision: 7167

Modified:
   plog/trunk/
   plog/trunk/bin-devel/build-core-all-svn.sh
   plog/trunk/bin-devel/build-core-diff.sh
   plog/trunk/bin-devel/build-plugin-local.sh
   plog/trunk/bin-devel/build-plugins-all-svn.sh
   plog/trunk/bin-devel/genpluginfeeds.php
   plog/trunk/class/action/admin/adminnewpostaction.class.php
   plog/trunk/class/template/smarty/plugins/compiler.continue.php
   plog/trunk/templates/.htaccess
   plog/trunk/templates/admin/dashboard.template
   plog/trunk/templates/admin/newpost.template
   plog/trunk/templates/default/commentform.template
   plog/trunk/templates/rss/atom.template
   plog/trunk/templates/rss/rss20.template
Log:
Merge 6981:7000 from Lifetype 1.2 branch


Property changes on: plog/trunk
___________________________________________________________________
Modified: svn:mergeinfo
   - /plog/branches/lifetype-1.2:6449-6981
   + /plog/branches/lifetype-1.2:6449-7000


Property changes on: plog/trunk/bin-devel/build-core-all-svn.sh
___________________________________________________________________
Modified: svn:mergeinfo
   - /plog/branches/lifetype-1.2/bin-devel/build-core-all-svn.sh:6934-6981
   + /plog/branches/lifetype-1.2/bin-devel/build-core-all-svn.sh:6934-7000


Property changes on: plog/trunk/bin-devel/build-core-diff.sh
___________________________________________________________________
Modified: svn:mergeinfo
   - /plog/branches/lifetype-1.2/bin-devel/build-core-diff.sh:6934-6981
   + /plog/branches/lifetype-1.2/bin-devel/build-core-diff.sh:6934-7000


Property changes on: plog/trunk/bin-devel/build-plugin-local.sh
___________________________________________________________________
Modified: svn:mergeinfo
   - /plog/branches/lifetype-1.2/bin-devel/build-plugin-local.sh:6934-6981
   + /plog/branches/lifetype-1.2/bin-devel/build-plugin-local.sh:6934-7000


Property changes on: plog/trunk/bin-devel/build-plugins-all-svn.sh
___________________________________________________________________
Modified: svn:mergeinfo
   - /plog/branches/lifetype-1.2/bin-devel/build-plugins-all-svn.sh:6934-6981
   + /plog/branches/lifetype-1.2/bin-devel/build-plugins-all-svn.sh:6934-7000


Property changes on: plog/trunk/bin-devel/genpluginfeeds.php
___________________________________________________________________
Modified: svn:mergeinfo
   - /plog/branches/lifetype-1.2/bin-devel/genpluginfeeds.php:6934-6981
   + /plog/branches/lifetype-1.2/bin-devel/genpluginfeeds.php:6934-7000

Modified: plog/trunk/class/action/admin/adminnewpostaction.class.php
===================================================================
--- plog/trunk/class/action/admin/adminnewpostaction.class.php	2012-02-21 08:32:48 UTC (rev 7166)
+++ plog/trunk/class/action/admin/adminnewpostaction.class.php	2012-02-21 08:44:18 UTC (rev 7167)
@@ -50,12 +50,13 @@
             $postText = $this->_request->getValue( "postText" );
 			
 			// check if javascript code is allowed in posts
-			$config =& Config::getConfig();
+			// $config =& Config::getConfig();
                 // Don't ever allow javascript when directing from the 'bookmarklet'
                 // or perhaps other hackers trying to exploit the poor lifetype user
 //			if( !$config->getValue( "allow_javascript_blocks_in_posts", false ))
             $postText = Textfilter::filterJavaScript( $postText );
-        	$postText = trim(Textfilter::xhtmlize( $postText ));
+            $postText = trim(Textfilter::xhtmlize( $postText ));
+
 			$this->_view->setValue( "postText", $postText );
 
             $this->setCommonData();


Property changes on: plog/trunk/class/template/smarty/plugins/compiler.continue.php
___________________________________________________________________
Modified: svn:mergeinfo
   - 
   + /plog/branches/lifetype-1.2/class/template/smarty/plugins/compiler.continue.php:6982-7000

Modified: plog/trunk/templates/.htaccess
===================================================================
--- plog/trunk/templates/.htaccess	2012-02-21 08:32:48 UTC (rev 7166)
+++ plog/trunk/templates/.htaccess	2012-02-21 08:44:18 UTC (rev 7167)
@@ -3,4 +3,10 @@
 #
 # <Files *.template> 
 # deny from all 
-# </Files>
\ No newline at end of file
+# </Files>
+
+#<IfModule mod_expires.c>
+#  ExpiresActive On
+#  ExpiresDefault "access plus 2 days"
+#  ExpiresByType image/* "access plus 1 month"
+#</IfModule>
\ No newline at end of file

Modified: plog/trunk/templates/admin/dashboard.template
===================================================================
--- plog/trunk/templates/admin/dashboard.template	2012-02-21 08:32:48 UTC (rev 7166)
+++ plog/trunk/templates/admin/dashboard.template	2012-02-21 08:44:18 UTC (rev 7167)
@@ -101,11 +101,12 @@
                                 <div class="list_action_button">
                                 <a href="?op=blogSelect&blogId={$blog->getId()}&action=deleteComment&commentId={$comment->getId()}&articleId={$article->getId()}"><img src="imgs/admin/icon_delete-16.png" alt="{$locale->tr("delete")}" /></a>
 								{if $bayesian_filter_enabled}
-                                {if $comment->getStatus() == 0}
+                                {if $comment->getStatus() != 1}
                                     <a href="?op=blogSelect&blogId={$blog->getId()}&action=markComment&mode=1&articleId={$comment->getArticleId()}&commentId={$comment->getId()}">
                                      <img src="imgs/admin/icon_spam-16.png" alt="{$locale->tr("mark_as_spam")}" />
                                     </a>
-                                {elseif $comment->getStatus() == 1}
+                                {/if}
+                                {if $comment->getStatus() != 0}
                                     <a href="?op=blogSelect&blogId={$blog->getId()}&action=markComment&mode=0&articleId={$comment->getArticleId()}&commentId={$comment->getId()}">
                                      <img src="imgs/admin/icon_nospam-16.png" alt="{$locale->tr("mark_as_no_spam")}" />
                                     </a>

Modified: plog/trunk/templates/admin/newpost.template
===================================================================
--- plog/trunk/templates/admin/newpost.template	2012-02-21 08:32:48 UTC (rev 7166)
+++ plog/trunk/templates/admin/newpost.template	2012-02-21 08:44:18 UTC (rev 7167)
@@ -195,7 +195,7 @@
       <div class="field">
        	<br /><label for="bookmarklet">{$locale->tr("bookmarklet")}</label>
        	<div class="formHelp">{$locale->tr("bookmarklet_help")}</div>
-		<a href="javascript:bm=document.selection?document.selection.createRange().text:document.getSelection();void(ltbm=window.open('{$url->getAdminUrl()}?op=newPost&sendTrackbacks=1&postText='+encodeURIComponent('<p>'+bm+' ... '+'<a href="'+window.location.href+'">'+'{$locale->tr("original_post")}'+'</a></p>'),'ltbm','toolbar=1,status=1,location=1,scrollbars=1,menubar=1,resizable=1'))" onclick="window.alert('{$locale->tr("bookmarklet_help")}');">{$locale->tr("blogit_to_lifetype")}</a>
+		<a href="javascript:bm=document.selection?document.selection.createRange().text:window.getSelection();void(ltbm=window.open('{$url->getAdminUrl()}?op=newPost&sendTrackbacks=1&postText='+encodeURIComponent('<p>'+bm+' ... '+'<a href="'+window.location.href+'">'+'{$locale->tr("original_post")}'+'</a></p>'),'ltbm','toolbar=1,status=1,location=1,scrollbars=1,menubar=1,resizable=1'))" onclick="window.alert('{$locale->tr("bookmarklet_help")}');">{$locale->tr("blogit_to_lifetype")}</a> 
       </div>
 
 	</div>

Modified: plog/trunk/templates/default/commentform.template
===================================================================
--- plog/trunk/templates/default/commentform.template	2012-02-21 08:32:48 UTC (rev 7166)
+++ plog/trunk/templates/default/commentform.template	2012-02-21 08:44:18 UTC (rev 7167)
@@ -2,38 +2,76 @@
 <div id="CommentForm">
 <form id="NewComment" action="{$url->getIndexUrl()}" method="post">
 <fieldset>
-<legend>{$locale->tr("add_comment")}</legend>
-{nocache}
-<div><label for="commentTopic">{$locale->pr("comment_topic")}</label><input type="text" name="commentTopic" id="commentTopic" value="{$topic}" /></div>
-<div><label for="commentText">{$locale->pr("comment_text")} ({$locale->tr("required")})</label><textarea rows="10" cols="30" name="commentText" id="commentText"></textarea></div>
-<div><label for="userName">{$locale->pr("comment_username")} ({$locale->tr("required")})</label>
+<legend id="add_comment_title">{$locale->tr("add_comment")}</legend>
+<table border="0">
+<tr id="add_comment_topic">
+ <td><label for="commentTopic">{$locale->pr("comment_topic")}</label></td>
+ <td><input type="text" name="commentTopic" id="commentTopic" value="{$topic}" /></td>
+</tr>
+<tr id="add_comment_text">
+  <td><label for="commentText">{$locale->pr("comment_text")}<sup class="required">*</sup></label></td>
+  <td><textarea rows="10" cols="50" name="commentText" id="commentText"></textarea></td>
+ </tr>
+
+{if $smileys && $smileys->isEnabled()}
+  <script type="text/javascript" src="{$url->getBaseUrl()}/plugins/smileys/js/smileys/smileys.js"></script>
+  <tr id="add_comment_smileys">
+    <td> </td><td>{$smileys->generateSmileysBar()}</td>
+  </tr>
+{/if}
+
+<tr id="add_comment_username">
+  <td><label for="userName">{$locale->pr("comment_username")}<sup class="required">*</sup></label></td>
+  <td>
+   {dynamic}
 	{if $authuser}
-	<span id="AuthUser">{$authuser->getUsername()} ({$locale->tr("form_authenticated")})</span>
-	<input type="hidden" name="userName" id="userNameHidden" value="{if $authuser}{$authuser->getUsername()}{/if}" /></div>
+     <span id="AuthUser">{$authuser->getUsername()} ({$locale->tr("form_authenticated")})</span>
+	 <input type="hidden" name="userName" id="userNameHidden" value="{if $authuser}{$authuser->getUsername()}{/if}" />
 	{else}
-	<input type="text" name="userName" id="userName" value="" /></div>
+	 <input type="text" name="userName" id="userName" value="" />
 	{/if}
-<div><label for="userEmail">{$locale->tr("comment_email")}</label><input type="text" name="userEmail" id="userEmail" value="" /></div>
-<div><label for="userUrl">{$locale->tr("comment_url")}</label><input type="text" name="userUrl" id="userUrl" value="" /></div>
-{/nocache}
+   {/dynamic}
+  </td>
+</tr>
+
+<tr id="add_comment_useremail">
+  <td><label for="userEmail">{$locale->tr("comment_email")}</label></td>
+  <td><input type="text" name="userEmail" id="userEmail" value="" /></td>
+</tr>
+<tr id="add_comment_userurl">
+  <td><label for="userUrl">{$locale->tr("comment_url")}</label></td>
+  <td><input type="text" name="userUrl" id="userUrl" value="" /></td>
+</tr>
+
   {if $authimage && $authimage->isEnabled()}
-   <div><label for="authImage">{$locale->tr("authimage_type_code")}</label>
-    <input type="text" name="authImage" id="authImage" value="" /> {$authimage->show()}
-   </div>
+   <tr id="add_comment_authimage">
+     <td><label for="authImage">{$locale->tr("authimage_type_code")}</label></td>
+     <td><input type="text" name="authImage" id="authImage" value="" /> {$authimage->show()}</td>
+   </tr>
   {/if}
   {if $subscribe && $subscribe->isEnabled()}
-   <input type="checkbox" name="subscribe" />
-      E-mail me when comments occur on this article
+   <tr id="add_comment_subscribe">
+     <td colspan="2"><input type="checkbox" name="subscribe" /> E-mail me when comments occur on this article</td>
+   </tr>
   {/if}
   {if $hiddeninput && $hiddeninput->isEnabled()}
-   {$hiddeninput->printHiddenFields()}
+   <tr id="add_comment_hiddeninput">
+    <td>{$hiddeninput->printHiddenFields()}</td>
+   </tr>
   {/if}
 
-<div id="Submit"><input id="Add" type="submit" value="{$locale->pr("comment_send")}" name="Add" />
-<input type="hidden" name="op" value="AddComment" />
-<input type="hidden" name="articleId" value="{$post->getId()}" />
-<input type="hidden" name="blogId" value="{$blog->getId()}" />
-<input type="hidden" name="parentId" value="{$parentId}" /></div>
+<tr id="add_comment_submit">
+ <td colspan="2">
+  <input id="Add" type="submit" value="{$locale->pr("comment_send")}" name="Add" />
+ <input type="hidden" name="op" value="AddComment" />
+ <input type="hidden" name="articleId" value="{$post->getId()}" />
+ <input type="hidden" name="blogId" value="{$blog->getId()}" />
+ <input type="hidden" name="parentId" value="{$parentId}" />
+ </td>
+</tr>
+
+</table>
+
 </fieldset>
 </form>
 </div>

Modified: plog/trunk/templates/rss/atom.template
===================================================================
--- plog/trunk/templates/rss/atom.template	2012-02-21 08:32:48 UTC (rev 7166)
+++ plog/trunk/templates/rss/atom.template	2012-02-21 08:44:18 UTC (rev 7167)
@@ -4,6 +4,7 @@
       xml:lang="{$locale->getLanguageId()|lower}">
 <title>{$blog->getBlog()|escape}</title> 
 <link rel="alternate" type="text/html" href="{$url->blogLink()}" /> 
+<link href="{$url->rssLink("atom")}" rel="self" type="application/rss+xml" />
 {if $posts}
 	{assign var="newestDate" value=$posts[0]->getDateObject()} 
 	<updated>{$locale->formatDate($newestDate, "%Y-%m-%dT%H:%M:%S%G", $blog)}</updated> 

Modified: plog/trunk/templates/rss/rss20.template
===================================================================
--- plog/trunk/templates/rss/rss20.template	2012-02-21 08:32:48 UTC (rev 7166)
+++ plog/trunk/templates/rss/rss20.template	2012-02-21 08:44:18 UTC (rev 7167)
@@ -6,14 +6,15 @@
     xmlns:atom="http://www.w3.org/2005/Atom"
 >
  <channel>
-  <title>{$blog->getBlog()|escape}</title>
+  <atom:link href="{$url->rssLink("rss20")}" rel="self" type="application/rss+xml" />
+  <title>{$blog->getBlog()|escape:hexentity}</title>
   <link>{$url->blogLink()}</link>
   <description>{$blog->getAbout()|strip_tags}</description>
   <pubDate>{$locale->formatDateAsRFC822($now)}</pubDate>
-  <generator>http://www.lifetype.net</generator>
+  <generator>http://lifetype.net</generator>
   {foreach from=$posts item=post}
   <item>
-   <title>{$post->getTopic()|escape}</title>
+   <title>{$post->getTopic()|escape:hexentity}</title>
    <description>
     {$post->getText()|escape}
    </description>

More information about the pLog-svn mailing list