Merged changes from stable branch up to 2.3.23.

[fa-stable.git] / access / password_reset.php

diff --git a/access/password_reset.php b/access/password_reset.php
index 8ad67026e4c58237e3597e608d2a33f397a0ec07..bdea9136b89b6911fca2ae11d5823a6850a74fde 100644 (file)
--- a/access/password_reset.php
+++ b/access/password_reset.php
@@ -17,7 +17,7 @@
        $js = "<script language='JavaScript' type='text/javascript'>
 function defaultCompany()
 {
-       document.forms[0].company_login_name.options[".$_SESSION["wa_current_user"]->company."].selected = true;
+       document.forms[0].company_login_name.options[".user_company()."].selected = true;
 }
 </script>";
        add_js_file('login.js');
@@ -28,7 +28,7 @@ function defaultCompany()
 
        $login_timeout = $_SESSION["wa_current_user"]->last_act;
 
-       $title = $app_title." ".$version." - "._("Password reset");
+       $title = $SysPrefs->app_title." ".$version." - "._("Password reset");
        $encoding = isset($_SESSION['language']->encoding) ? $_SESSION['language']->encoding : "iso-8859-1";
        $rtl = isset($_SESSION['language']->dir) ? $_SESSION['language']->dir : "ltr";
        $onload = !$login_timeout ? "onload='defaultCompany()'" : "";
@@ -53,20 +53,19 @@ function defaultCompany()
        start_table(false, "class='login'");
        start_row();
        echo "<td align='center' colspan=2>";
-  echo "<a target='_blank' href='$power_url'><img src='$path_to_root/themes/$def_theme/images/logo_frontaccounting.png' alt='FrontAccounting' height='50' onload='fixPNG(this)' border='0' ></a>";
+       echo "<a target='_blank' href='".$SysPrefs->power_url."'><img src='$path_to_root/themes/$def_theme/images/logo_frontaccounting.png' alt='FrontAccounting' height='50' onload='fixPNG(this)' border='0' ></a>";
        echo "</td>\n";
        end_row();
 
-       echo "<input type='hidden' id=ui_mode name='ui_mode' value='".$_SESSION["wa_current_user"]->ui_mode."' >\n";
-       table_section_title(_("Version")." $version   Build $build_version - "._("Password reset"));
+       echo "<input type='hidden' id=ui_mode name='ui_mode' value='".fallback_mode()."' >\n";
+       table_section_title(_("Version")." $version   Build ".$SysPrefs->build_version." - "._("Password reset"));
 
        text_row(_("Email"), "email_entry_field", "", 20, 30);
 
-  if (isset($_SESSION['wa_current_user']->company))
-    $coy =  $_SESSION['wa_current_user']->company;
-  else
+  $coy =  user_company();
+  if (!isset($coy))
     $coy = $def_coy;
-  if (!@$text_company_selection) {
+  if (!@$SysPrefs->text_company_selection) {
     echo "<tr><td>"._("Company")."</td><td><select name='company_login_name'>\n";
     for ($i = 0; $i < count($db_connections); $i++)
       echo "<option value=$i ".($i==$coy ? 'selected':'') .">" . $db_connections[$i]["name"] . "</option>";
@@ -105,12 +104,11 @@ function defaultCompany()
        echo "</tr></table>\n";
        echo "<table class='footer'>\n";
        echo "<tr>\n";
-       echo "<td><a target='_blank' href='$power_url' tabindex='-1'>$app_title $version - " . _("Theme:") . " " . $def_theme . "</a></td>\n";
+       echo "<td><a target='_blank' href='".$SysPrefs->power_url."' tabindex='-1'>".$SysPrefs->app_title." $version - " . _("Theme:") . " " . $def_theme . "</a></td>\n";
        echo "</tr>\n";
        echo "<tr>\n";
-       echo "<td><a target='_blank' href='$power_url' tabindex='-1'>$power_by</a></td>\n";
+       echo "<td><a target='_blank' href='".$SysPrefs->power_url."' tabindex='-1'>".$SysPrefs->power_by."</a></td>\n";
        echo "</tr>\n";
        echo "</table><br><br>\n";
        echo "</body></html>\n";
 
-?>