projects / textcart.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 19fe567)
When login screen is displayed after session timeout page content is broken. It
authorJoe Hunt <joe.hunt.consulting@gmail.com>
Wed, 16 Jan 2008 21:25:49 +0000 (21:25 +0000)
committerJoe Hunt <joe.hunt.consulting@gmail.com>
Wed, 16 Jan 2008 21:25:49 +0000 (21:25 +0000)
 is because of NOT using absolute paths in href attribute theme elements.

CHANGELOG.txt patch | blob | history
access/login.php patch | blob | history

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index d2ca9fba010e4669ce2c4bd63f60fbe0cca9ea93..1302cd37ae29a4ec0085dc0ca6bf098affe6f3e6 100644 (file)
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -19,6 +19,11 @@ Legend:
 ! -> Note
 $ -> Affected files
 
+16-Jan-2008 Joe Hunt
+ # When login screen is displayed after session timeout page content is broken. It
+   is because of NOT using absolute paths in href attribute theme elements.
+ $ /access/login.php
+ 
 30-Dec-2007 Joe Hunt
  # Minor adjustments in function db_export on line 325
  $ /admin/db/maintenance_db.inc
diff --git a/access/login.php b/access/login.php
index 12989497d906ceb75c656d6b87a50afecef167e6..9fd3356dc8125de92f935f9bc7114861632678e8 100644 (file)
--- a/access/login.php
+++ b/access/login.php
@@ -4,16 +4,17 @@
        include_once($path_to_root . "/includes/ui/ui_view.inc");
        // Display demo user name and password within login form if "$allow_demo_mode" is true
        $demo_text = "";
-       if ($allow_demo_mode == True) 
+       if ($allow_demo_mode == True)
        {
            $demo_text = "Login as user: demouser and password: cooldemo";
-       } 
-       else 
+       }
+       else
        {
                $demo_text = "Please login here";
        }
        if (!isset($def_coy))
                $def_coy = 0;
+       $def_theme = $path_to_root . '/themes/default';
 ?>
 <html>
 <head>
@@ -26,13 +27,13 @@ function defaultCompany()
 </script>
     <title><?php echo $app_title . " " . $version;?></title>
     <meta http-equiv="Content-type" content="text/html; charset=iso-8859-1" />
-    <link rel="stylesheet" href="themes/default/login.css" type="text/css" />
+    <link rel="stylesheet" href="<?php echo $def_theme;?>/login.css" type="text/css" />
 </head>
 
 <body leftmargin="0" topmargin="0" marginwidth="0" marginheight="0" onload="defaultCompany()">
     <table width="100%" height="100%" border="0" cellpadding="0" cellspacing="0">
         <tr>
-            <td align="center" valign="bottom"><a target="_blank" href="<?php $power_url; ?>"><img src="themes/default/images/logo_frontaccounting.png" alt="FrontAccounting" width="250" height="50" onload="fixPNG(this)" border="0" /></a></td>
+            <td align="center" valign="bottom"><a target="_blank" href="<?php $power_url; ?>"><img src="<?php echo $def_theme;?>/images/logo_frontaccounting.png" alt="FrontAccounting" width="250" height="50" onload="fixPNG(this)" border="0" /></a></td>
                </tr>
 
         <tr>
@@ -45,7 +46,7 @@ function defaultCompany()
                     <table width="346" border="0" cellpadding="0" cellspacing="0">
                                        <form action="<?php echo $_SERVER['PHP_SELF'];?>" name="loginform" method="post">
                         <tr>
-                            <td colspan="5" bgcolor="#FFFFFF"><img src="themes/default/images/spacer.png" width="346" height="1" alt="" /></td>
+                            <td colspan="5" bgcolor="#FFFFFF"><img src="<?php echo $def_theme;?>/images/spacer.png" width="346" height="1" alt="" /></td>
 
                                                </tr>
 
@@ -53,9 +54,9 @@ function defaultCompany()
 
 
 
-                            <td bgcolor="#367CB5"><img src="themes/default/images/spacer.png" width="12" height="200" alt="" /></td>
+                            <td bgcolor="#367CB5"><img src="<?php $def_theme; ?>/images/spacer.png" width="12" height="200" alt="" /></td>
 
-                            <!--<td background="themes/default/images/outline/bg.png" width="233" height="200" colspan="3" valign="top">-->
+                            <!--<td background="<?php $def_theme; ?>/images/outline/bg.png" width="233" height="200" colspan="3" valign="top">-->
                             <td class="login" colspan="3" valign="top">
                                 <table border="0" cellpadding="3" cellspacing="0" width="100%">
                                     <tr>
@@ -71,8 +72,8 @@ function defaultCompany()
                                                                                        <span>Company:</span></br>
                                                                                        <!--<select name="company_login_name" onchange="setCookie()">-->
                                                                                        <select name="company_login_name">
-<?php 
-for ($i = 0; $i < count($db_connections); $i++) 
+<?php
+for ($i = 0; $i < count($db_connections); $i++)
 {
        echo "<option value=$i>" . $db_connections[$i]["name"] . "</option>";
 }
@@ -90,33 +91,33 @@ for ($i = 0; $i < count($db_connections); $i++)
                                </td>
                         </tr>
                         <tr>
-                            <td colspan="5" bgcolor="#FFFFFF"><img src="themes/default/images/spacer.png" width="346" height="1" alt="" /></td>
+                            <td colspan="5" bgcolor="#FFFFFF"><img src="<?php $def_theme; ?>/images/spacer.png" width="346" height="1" alt="" /></td>
                         </tr>
                                                </form>
                     </table>
                            </td>
-                           <!--<td background="themes/default/images/outline/r.png" colspan="3" align="right" valign="top"><img src="themes/default/images/outline/tr.png" width="10" height="10" alt="" /></td>-->
+                           <!--<td background="<?php $def_theme; ?>/images/outline/r.png" colspan="3" align="right" valign="top"><img src="<?php $def_theme; ?>/images/outline/tr.png" width="10" height="10" alt="" /></td>-->
                        </tr>
                        <tr>
-                           <!--<td background="themes/default/images/outline/r.png"><img src="themes/default/images/outline/r.png" width="10" height="10" alt=""></td>-->
+                           <!--<td background="<?php $def_theme; ?>/images/outline/r.png"><img src="<?php $def_theme; ?>/images/outline/r.png" width="10" height="10" alt=""></td>-->
                        </tr>
                        <tr>
-                                       <!--<td background="themes/default/images/outline/bm.png"><img src="themes/default/images/outline/bl.png" width="10" height="10" alt=""></td>
-                           <!--<td background="themes/default/images/outline/bm.png"><img src="themes/default/images/outline/bm.png" width="10" height="10" alt=""></td>-->
-                           <!--<td><img src="themes/default/images/outline/br.png" width="10" height="10" alt="" /></td>-->
+                                       <!--<td background="<?php $def_theme; ?>/images/outline/bm.png"><img src="<?php $def_theme; ?>/images/outline/bl.png" width="10" height="10" alt=""></td>
+                           <!--<td background="<?php $def_theme; ?>/images/outline/bm.png"><img src="<?php $def_theme; ?>/images/outline/bm.png" width="10" height="10" alt=""></td>-->
+                           <!--<td><img src="<?php $def_theme; ?>/images/outline/br.png" width="10" height="10" alt="" /></td>-->
                        </tr>
 <tr><td>&nbsp;</td></tr><tr>
                <td align="center" class="footer"><font size=1><a target='_blank' style="text-decoration: none" HREF='<?php echo $power_url; ?>'><font color="#FFFF00" valign="top">&nbsp;&nbsp;<?php echo $power_by; ?></font></a></font></td>
        </tr>
 <!--<tr><td>&nbsp;</td></tr><tr>
-       <td align="center" class="footer"><a target="_blank" HREF="http://frontaccounting.com/"><img src="themes/default/images/logo_frontaccounting.png"  height="60" width="60" border="0"/></a></td>
-</tr>-->       
+       <td align="center" class="footer"><a target="_blank" HREF="http://frontaccounting.com/"><img src="<?php $def_theme; ?>/images/logo_frontaccounting.png"  height="60" width="60" border="0"/></a></td>
+</tr>-->
 <?php
 if ($allow_demo_mode == true)
 {
     ?>
       <tr>
-        <!--<td><br><div align="center"><a href="http://frontaccounting.com"><img src="themes/default/images/logo_frontaccounting.png"  border="0" align="middle" /></a></div></td>-->
+        <!--<td><br><div align="center"><a href="http://frontaccounting.com"><img src="<?php $def_theme; ?>/images/logo_frontaccounting.png"  border="0" align="middle" /></a></div></td>-->
       </tr>
     <?php
 }
Textcart module