2.0.0

Author: benkeen

forget_password.php

@@ -3,6 +3,7 @@
 require_once("../../global/library.php");
 
 use FormTools\Administrator;
+use FormTools\Core;
 use FormTools\General;
 use FormTools\Modules;
 use FormTools\Settings;
@@ -75,4 +76,8 @@
 rules.push("required,email,{$L["validation_no_email"]}");
 END;
 
+// Urgh. Should be refactored along with User Roles
+Core::$user->setTheme($g_theme);
+Core::$user->setSwatch($g_swatch);
+
 $module->displayPage("templates/forget_password.tpl", $page_vars, $g_theme, $g_swatch);

templates/admin/tab_users.tpl

@@ -28,7 +28,7 @@
       <td align="center" class="medium_grey">{$submission.submission_id}</td>
       <td>{$submission.$username_col}</td>
       <td>
-        {$submission.last_logged_in|custom_format_date:$SESSION.account.timezone_offset:$SESSION.account.date_format}
+        {$submission.last_logged_in|custom_format_date:$account.timezone_offset:$account.date_format}
       </td>
       <td align="center"><a href="../../../admin/forms/edit_submission.php?submission_id={$submission.submission_id}&form_id={$form_id}&view_id={$submission_account.view_id}">{$LANG.word_view|upper}</a></td>
     </tr>

templates/index.tpl

@@ -41,7 +41,7 @@
     <tr>
       <td class="medium_grey" align="center">{$info.form_id}</td>
       <td class="pad_left_small"><a href="../../admin/forms/submissions.php?form_id={$info.form_id}">{$info.form_name}</a></td>
-      <td class="pad_left_small"><a href="../../admin/forms/edit.php?form_id={$info.form_id}&view_id={$info.view_id}&page=edit_view">{display_view_name view_id=$info.view_id}</a></td>
+      <td class="pad_left_small"><a href="../../admin/forms/edit/?form_id={$info.form_id}&view_id={$info.view_id}&page=edit_view">{display_view_name view_id=$info.view_id}</a></td>
       <td align="center">
         {if $info.view_overrides|@count == 0}
           {$LANG.word_no}