Jump to login after timeout and fix alert #310
Conversation
|
I see that a basic timeout functionality already exists, but time out can happen due to php sessions expiring. In that case the ugly "Fatal" error message was displayed withe the PHP |
|
we should know what the URL via the config.php settings... why not use them vs all that stuff in the code |
|
Hm, I'm still trying to figure out the vagrant Config.php. It sets |
|
Not to self |
|
Ok, This seems to work on the Vagrant box and makes $sRootPath do the important work now (be sure to set it correctly, it is set wrong in the Vagrant box). I'll have to review this thoroughly again though as this touches a whole bunch of files. |
|
There is more stuff to do here. Just looking at the error logs I see Looks like I broke database restore. I'll probably try to break down this last commit into smaller parts. |
| @@ -291,7 +291,7 @@ function VancoErrorString (errNo) | |||
| case 67: return "Transaction must have at least one transaction fund."; | |||
| case 68: return "User is Inactive"; | |||
| case 69: return "Expiration Date Invalid"; | |||
| case 70: return "Account Type must be �C�, �S' for ACH and must be blank for Credit Card"; | |||
| case 70: return "Account Type must be �C�, �S' for ACH and must be blank for Credit Card"; | |||
There was a problem hiding this comment.
hmm is that expected the ?
dschwen
force-pushed
the
timeout_309
branch
5 times, most recently
from
aa3c2ac
to
a5084d6
Compare
| <link rel="stylesheet" type="text/css" href="<?= $sURLPath; ?>/vendor/almasaeed2010/adminlte/plugins/datatables/dataTables.bootstrap.css"> | ||
| <script type="text/javascript" language="javascript" src="<?= $sURLPath; ?>/vendor/almasaeed2010/adminlte/plugins/datatables/jquery.dataTables.min.js"></script> | ||
| <script type="text/javascript" language="javascript" src="<?= $sURLPath; ?>/vendor/almasaeed2010/adminlte/plugins/datatables/dataTables.bootstrap.js"></script> | ||
| <link rel="stylesheet" type="text/css" href="<?= $sRootPath >/vendor/almasaeed2010/adminlte/plugins/datatables/dataTables.bootstrap.css"> |
There was a problem hiding this comment.
Oops. I guess it was too late last night
On Sun, Feb 14, 2016, 12:01 AM George Dawoud notifications@github.com
wrote:
In churchinfo/AddEvent.php
#310 (comment):@@ -44,9 +44,9 @@
require "Include/Header.php";
?>
-
-<script type="text/javascript" language="javascript" src="/vendor/almasaeed2010/adminlte/plugins/datatables/jquery.dataTables.min.js"></script>
-<script type="text/javascript" language="javascript" src="/vendor/almasaeed2010/adminlte/plugins/datatables/dataTables.bootstrap.js"></script>
+don't we need the last ?
—
Reply to this email directly or view it on GitHub
https://github.com/ChurchCRM/CRM/pull/310/files#r52838348.
|
Ok, I went through this with a fine toothed comb. Let's see what Travis says. If it passes it is ready for a final review. |
|
Starting to do a quick test with the changes now |
| @@ -97,7 +96,7 @@ | |||
| $usQueryResultSet = mysql_fetch_array($usQueryResult); | |||
| if ($usQueryResultSet == Null){ | |||
| // Set the error text | |||
| $sErrorText = ' ' . gettext('Invalid login or password'); | |||
There was a problem hiding this comment.
why did you remove the space?
There was a problem hiding this comment.
I don't see a reason that some error messages should start with a non-breaking space. Use of for layout purposes is almost always a bad idea. It is better to fix the CSS to increase the margin if you want leading whitespace. But again this was handled inconsistently so I opted to remove the nbsps.
|
I rebased this after you merged a bunch of PRs earlier |
Jump to login after timeout and fix alert
|
OK, this has been open for a long time... time for the merge... we will file bugs if it break things that we did not notice. |
First of all: sorry this commit is muddied by whitespace changes, but I and my editor are total whitespace-nazis...
Anyhow the changes are a
header('Location: Default.php?timeout=1');in Functions.php, and a fix hereCloses #309