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


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@1395 a1433add-5e2c-0410-b055-b7f2511e0802

smarty.inc.php

@@ -53,9 +53,11 @@ class PFASmarty {
 }
 $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);

users/edit-alias.php

@@ -19,6 +19,7 @@
  *
  */
 
+$rel_path = '../';
 require_once('../common.php');
 $smarty->assign ('smarty_template', 'users_edit-alias');
 

users/login.php

@@ -27,6 +27,7 @@
  *  lang
  */
 
+$rel_path = '../';
 require_once("../common.php");
 
 

users/main.php

@@ -23,6 +23,7 @@
  * Form POST \ GET Variables: -none-
  */
 
+$rel_path = '../';
 require_once('../common.php');
 authentication_require_role('user');
 $USERID_USERNAME = authentication_get_username();

users/password.php

@@ -27,6 +27,7 @@
  * fPassword2
  */
 
+$rel_path = '../';
 require_once('../common.php');
 
 authentication_require_role('user');

users/vacation.php

@@ -17,6 +17,7 @@
  *
  */
 
+$rel_path = '../';
 require_once('../common.php');
 
 require_once('../vacation.php');