SF.net SVN: postfixadmin:[1395] trunk

[<chr...@us...>]

Revision: 1395
          http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=1395&view=rev
Author:   christian_boltz
Date:     2012-05-28 18:01:31 +0000 (Mon, 28 May 2012)
Log Message:
-----------
smarty.inc.php:
- replace (last) usage of $CONF['postfix_admin_url'] with $rel_path
  (relative path to CSS etc., set to '../' in users/*)

users/*.php:
- set $rel_path to '../'

https://sourceforge.net/tracker/?func=detail&aid=3039042&group_id=191583&atid=937964

Modified Paths:
--------------
    trunk/smarty.inc.php
    trunk/users/edit-alias.php
    trunk/users/login.php
    trunk/users/main.php
    trunk/users/password.php
    trunk/users/vacation.php

Modified: trunk/smarty.inc.php
===================================================================
--- trunk/smarty.inc.php	2012-05-28 17:43:39 UTC (rev 1394)
+++ trunk/smarty.inc.php	2012-05-28 18:01:31 UTC (rev 1395)
@@ -53,10 +53,12 @@
 }
 $smarty = new PFASmarty();
 
-$CONF['theme_css']  = $CONF['postfix_admin_url'].'/'.htmlentities($CONF['theme_css']);
-if ($CONF['theme_custom_css'] != "") $CONF['theme_custom_css']  = $CONF['postfix_admin_url'].'/'.htmlentities($CONF['theme_custom_css']);
-$CONF['theme_logo'] = $CONF['postfix_admin_url'].'/'.htmlentities($CONF['theme_logo']);
+if (!isset($rel_path)) $rel_path = ''; # users/* sets this to '../'
 
+$CONF['theme_css']  = $rel_path . htmlentities($CONF['theme_css']);
+if ($CONF['theme_custom_css'] != "") $CONF['theme_custom_css']  = $rel_path . htmlentities($CONF['theme_custom_css']);
+$CONF['theme_logo'] = $rel_path . htmlentities($CONF['theme_logo']);
+
 $smarty->assign ('CONF', $CONF);
 $smarty->assign ('PALANG', $PALANG);
 $smarty->assign('url_domain', '');

Modified: trunk/users/edit-alias.php
===================================================================
--- trunk/users/edit-alias.php	2012-05-28 17:43:39 UTC (rev 1394)
+++ trunk/users/edit-alias.php	2012-05-28 18:01:31 UTC (rev 1395)
@@ -19,6 +19,7 @@
  *
  */
 
+$rel_path = '../';
 require_once('../common.php');
 $smarty->assign ('smarty_template', 'users_edit-alias');
 

Modified: trunk/users/login.php
===================================================================
--- trunk/users/login.php	2012-05-28 17:43:39 UTC (rev 1394)
+++ trunk/users/login.php	2012-05-28 18:01:31 UTC (rev 1395)
@@ -27,6 +27,7 @@
  *  lang
  */
 
+$rel_path = '../';
 require_once("../common.php");
 
 

Modified: trunk/users/main.php
===================================================================
--- trunk/users/main.php	2012-05-28 17:43:39 UTC (rev 1394)
+++ trunk/users/main.php	2012-05-28 18:01:31 UTC (rev 1395)
@@ -23,6 +23,7 @@
  * Form POST \ GET Variables: -none-
  */
 
+$rel_path = '../';
 require_once('../common.php');
 authentication_require_role('user');
 $USERID_USERNAME = authentication_get_username();

Modified: trunk/users/password.php
===================================================================
--- trunk/users/password.php	2012-05-28 17:43:39 UTC (rev 1394)
+++ trunk/users/password.php	2012-05-28 18:01:31 UTC (rev 1395)
@@ -27,6 +27,7 @@
  * fPassword2
  */
 
+$rel_path = '../';
 require_once('../common.php');
 
 authentication_require_role('user');

Modified: trunk/users/vacation.php
===================================================================
--- trunk/users/vacation.php	2012-05-28 17:43:39 UTC (rev 1394)
+++ trunk/users/vacation.php	2012-05-28 18:01:31 UTC (rev 1395)
@@ -17,6 +17,7 @@
  *
  */
 
+$rel_path = '../';
 require_once('../common.php');
 
 require_once('../vacation.php');

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.