Fix baseurl for images and javascript

Some improvements to the example script

git-svn-id: svn+ssh://murphy/home/svn/banana/trunk@257 9869982d-c50d-0410-be91-f2a2ec7c7c7b

diff --git a/banana/page.inc.php b/banana/page.inc.php
index 78036a8..7d313ef 100644 (file)
--- a/banana/page.inc.php
+++ b/banana/page.inc.php
@@ -322,7 +322,7 @@ class BananaPage extends Smarty
         }
 
         $proto = empty($_SERVER['HTTPS']) ? 'http://' : 'https://';
-        $host  = $_SERVER['HTTP_HOST'];
+        $host  = Banana::$baseurl ? Banana::$baseurl : $_SERVER['SERVER_NAME'];
         $file  = dirname($_SERVER['PHP_SELF']) . '/img/' . $img;
         $url   = $proto . $host . $file;
 
@@ -344,7 +344,7 @@ class BananaPage extends Smarty
         }
 
         $proto = empty($_SERVER['HTTPS']) ? 'http://' : 'https://';
-        $host  = $_SERVER['HTTP_HOST'];
+        $host  = Banana::$baseurl ? Banana::$baseurl : $_SERVER['SERVER_NAME'];
         $file  = dirname($_SERVER['PHP_SELF']) . '/javascript/' . $src . '.js';
         $url   = $proto . $host . $file;
 

diff --git a/examples/index.php b/examples/index.php
index 37e2ee1..2be0f94 100644 (file)
--- a/examples/index.php
+++ b/examples/index.php
@@ -33,8 +33,9 @@ class MyBanana extends Banana
 // Minimalist login
 if ((@$_GET['action'] == 'rss2') && 
     (!isset($_SESSION['banana_email']) || isset($_POST['change_login']) || isset($_POST['valid_change']))) {
-    if (isset($_COOKIE['banana_login']) && !isset($_POST['change_login']) && !isset($_POST['valid_change'])) {
+    if (isset($_COOKIE['banana_email']) && !isset($_POST['change_login']) && !isset($_POST['valid_change'])) {
         $_SESSION['banana_email'] = $_COOKIE['banana_email'];
+        $_SESSION['banana_name'] = $_COOKIE['banana_name'];
     } elseif (isset($_POST['valid_change'])) {
         $_SESSION['banana_name'] = $_POST['name'];
         $_SESSION['banana_email'] = $_POST['email'];