[pLog-svn] r1902 - in plog/branches/plog-1.0.1: .
class/action/admin class/template js/htmlarea templates/admin
oscar at devel.plogworld.net
oscar at devel.plogworld.net
Sun Apr 24 19:14:51 GMT 2005
Author: oscar
Date: 2005-04-24 19:14:50 +0000 (Sun, 24 Apr 2005)
New Revision: 1902
Modified:
plog/branches/plog-1.0.1/class/action/admin/adminaction.class.php
plog/branches/plog-1.0.1/class/template/templateutils.class.php
plog/branches/plog-1.0.1/js/htmlarea/htmlarea-plog-resourcelist.js
plog/branches/plog-1.0.1/resserver.php
plog/branches/plog-1.0.1/summary.php
plog/branches/plog-1.0.1/templates/admin/editpost.template
plog/branches/plog-1.0.1/templates/admin/newpost.template
plog/branches/plog-1.0.1/templates/admin/resourcelist.template
Log:
fixed issue 445
Modified: plog/branches/plog-1.0.1/class/action/admin/adminaction.class.php
===================================================================
--- plog/branches/plog-1.0.1/class/action/admin/adminaction.class.php 2005-04-24 14:55:06 UTC (rev 1901)
+++ plog/branches/plog-1.0.1/class/action/admin/adminaction.class.php 2005-04-24 19:14:50 UTC (rev 1902)
@@ -139,6 +139,7 @@
$this->_view->setValue( "blogsettings", $this->_blogInfo->getSettings());
$this->_view->setValue( "op", $this->_actionInfo->_actionParamValue );
$this->_view->setValue( "locale", $this->_locale );
+ $this->_view->setValue( "config", $this->_config );
}
/**
Modified: plog/branches/plog-1.0.1/class/template/templateutils.class.php
===================================================================
--- plog/branches/plog-1.0.1/class/template/templateutils.class.php 2005-04-24 14:55:06 UTC (rev 1901)
+++ plog/branches/plog-1.0.1/class/template/templateutils.class.php 2005-04-24 19:14:50 UTC (rev 1902)
@@ -54,12 +54,14 @@
{
$textFilter = new TextFilter();
$result = $textFilter->cutText( $post->getText(), $maxWords );
+ $config =& Config::getConfig();
if( $result != $post->getText()) {
$rg =& RequestGenerator::getRequestGenerator();
$rg->addParameter( "op", "ViewArticle" );
$rg->addParameter( "articleId", $post->getId());
$rg->addParameter( "blogId", $this->_blogInfo->getId());
- $showMoreLink = " <a href=\"index.php".$rg->getRequest()."\">".$linkText."</a>";
+ $indexPage = $config->getValue( "script_name", "index.php" );
+ $showMoreLink = " <a href=\"$indexPage".$rg->getRequest()."\">".$linkText."</a>";
$result .= $showMoreLink;
}
Modified: plog/branches/plog-1.0.1/js/htmlarea/htmlarea-plog-resourcelist.js
===================================================================
--- plog/branches/plog-1.0.1/js/htmlarea/htmlarea-plog-resourcelist.js 2005-04-24 14:55:06 UTC (rev 1901)
+++ plog/branches/plog-1.0.1/js/htmlarea/htmlarea-plog-resourcelist.js 2005-04-24 19:14:50 UTC (rev 1902)
@@ -71,6 +71,11 @@
function _generateAlbumLink( dest, blogId, albumId, albumName, albumDesc )
{
var htmlCode = '';
+
+ // if no other global variable called 'indexPage' is defined, use the
+ // default one
+ if( indexPage == '' )
+ indexPage = 'index.php';
htmlCode = '<a title="'+albumDesc+'" href="'+plogBaseUrl+'/index.php?op=ViewAlbum&blogId='+blogId+'&albumId='+albumId+'">'+albumName+'</a>';
Modified: plog/branches/plog-1.0.1/resserver.php
===================================================================
--- plog/branches/plog-1.0.1/resserver.php 2005-04-24 14:55:06 UTC (rev 1901)
+++ plog/branches/plog-1.0.1/resserver.php 2005-04-24 19:14:50 UTC (rev 1902)
@@ -9,6 +9,8 @@
if (!defined( "PLOG_CLASS_PATH" )) {
define( "PLOG_CLASS_PATH", dirname(__FILE__)."/");
}
+
+ include_once( PLOG_CLASS_PATH."class/config/config.class.php" );
// the functionality of the old ressever.php file have been moved
// to the action ResourceServerAction and ResourceServerView for better
@@ -17,5 +19,8 @@
// generated internally that point to resources so please DO NOT REMOVE IT!
$_REQUEST["op"] = "ResourceServer";
- include_once( PLOG_CLASS_PATH."index.php" );
+ $config =& Config::getConfig();
+ $indexPage = $config->getValue( "script_name", "index.php" );
+
+ include_once( PLOG_CLASS_PATH.$indexPage );
?>
\ No newline at end of file
Modified: plog/branches/plog-1.0.1/summary.php
===================================================================
--- plog/branches/plog-1.0.1/summary.php 2005-04-24 14:55:06 UTC (rev 1901)
+++ plog/branches/plog-1.0.1/summary.php 2005-04-24 19:14:50 UTC (rev 1902)
@@ -21,7 +21,8 @@
// redirect to index.php because it is not coming to us!
$config =& Config::getConfig();
if( $config->getValue( "subdomains_enabled") && Subdomains::isSubdomainUrl()) {
- include_once( PLOG_CLASS_PATH."index.php" );
+ $indexPage = $config->getValue( "script_name", "index.php" );
+ include_once( PLOG_CLASS_PATH.$indexPage );
die();
}
Modified: plog/branches/plog-1.0.1/templates/admin/editpost.template
===================================================================
--- plog/branches/plog-1.0.1/templates/admin/editpost.template 2005-04-24 14:55:06 UTC (rev 1901)
+++ plog/branches/plog-1.0.1/templates/admin/editpost.template 2005-04-24 19:14:50 UTC (rev 1902)
@@ -3,6 +3,9 @@
<script type="text/javascript" src="js/calendar/datetimepicker.js"></script>
<script type="text/javascript" src="js/ui/plogui.js"></script>
{assign var=htmlarea value=$blogsettings->getValue("htmlarea_enabled")}
+ <script type="text/javascript">
+ var indexPage = "{$config->getValue("script_name")}";
+ </script>
{if $htmlarea}
<link rel="stylesheet" href="js/htmlarea/htmlarea.css" type="text/css"/>
<script type="text/javascript" src="js/htmlarea/htmlarea.js"/></script>
@@ -14,7 +17,7 @@
{/if}
<script type="text/javascript">
- var htmlAreaEnabled = '{$htmlarea}';
+ var htmlAreaEnabled = '{$htmlarea}';
{include file="$admintemplatepath/calendarstuff.template"}
</script>
<form name="newPost" id="editPost" action="admin.php" method="post">
Modified: plog/branches/plog-1.0.1/templates/admin/newpost.template
===================================================================
--- plog/branches/plog-1.0.1/templates/admin/newpost.template 2005-04-24 14:55:06 UTC (rev 1901)
+++ plog/branches/plog-1.0.1/templates/admin/newpost.template 2005-04-24 19:14:50 UTC (rev 1902)
@@ -3,6 +3,9 @@
{assign var=htmlarea value=$blogsettings->getValue("htmlarea_enabled")}
<script type="text/javascript" src="js/ui/plogui.js"></script>
<script type="text/javascript" src="js/calendar/datetimepicker.js"></script>
+ <script type="text/javascript">
+ var indexPage = "{$config->getValue("script_name")}";
+ </script>
{if $htmlarea}
<link rel="stylesheet" href="js/htmlarea/htmlarea.css" type="text/css"/>
<script type="text/javascript" src="js/htmlarea/htmlarea.js"/></script>
Modified: plog/branches/plog-1.0.1/templates/admin/resourcelist.template
===================================================================
--- plog/branches/plog-1.0.1/templates/admin/resourcelist.template 2005-04-24 14:55:06 UTC (rev 1901)
+++ plog/branches/plog-1.0.1/templates/admin/resourcelist.template 2005-04-24 19:14:50 UTC (rev 1902)
@@ -8,7 +8,8 @@
<script type="text/javascript" src="js/htmlarea/htmlarea-plog-resourcelist.js"></script>
<script type="text/javascript" src="js/ui/common.js"></script>
<script type="text/javascript">
- var plogBaseUrl = '{$baseurl}';
+ var plogBaseUrl = '{$baseurl}';
+ var indexPage = '{$config->getValue("script_name")}';
</script>
<style>{literal}
html,body {
More information about the pLog-svn
mailing list