1414 Commits

Author SHA1 Message Date
Matt Pass
f8565d87b7 Version 5.5 2016-04-21 09:38:10 +01:00
Matt Pass
5a9cd5e85c Change true to false if checkbox is set 2016-04-14 09:28:05 +01:00
Matt Pass
09d34da6c3 disable further reg checkbox added & style tweaks 2016-04-14 09:26:17 +01:00
Matt Pass
f388545412 Check if file/dir requested is on banned list first 2016-04-14 08:28:47 +01:00
Matt Pass
f5705393ee Check if requested file is on banned list first 2016-04-14 08:25:42 +01:00
Matt Pass
1e7b735b7f Add note re comma delimited 2016-04-14 08:24:31 +01:00
Matt Pass
838612932c Create duplicate IP based config file also 2016-04-08 10:22:10 +01:00
Matt Pass
1fdb6c0086 Redo style for matchingbracket 2016-04-06 22:49:57 +01:00
Matt Pass
095d626883 Auto logout and interaction timers
openSecs to store a total number of secs ICEcoder has been open for, a 1
sec interval to check for auto-logout and session ping events. Function
added to show warning 60 secs before a logout, useNewSettings function
updates auto-logout period on settings change. Also function added to
reset the auto logout timer if it's showing. logout function now accepts
a type and maybe passes that through plus interceptKeys will reset timer
also
2016-04-06 21:48:40 +01:00
Matt Pass
d909d5ce1c Add file to keep session alive 2016-04-06 21:23:37 +01:00
Matt Pass
3d866fa2f2 Auto logout warning content added 2016-04-05 19:27:47 +01:00
Matt Pass
6ed0861f5b autoLogoutMins param added with 0 as default
0 being disabled setting
2016-04-05 19:25:43 +01:00
Matt Pass
59a18645c6 autoLogoutMins now updated in file 2016-04-05 17:13:38 +01:00
Matt Pass
aa92f86aa9 Setting added for auto-logout mins 2016-04-05 17:13:08 +01:00
Matt Pass
444e7ef6b4 Dropped support for Rust
CodeMirror doesn't seem to work with this mode after minification and so
has been dropped.
2016-04-02 14:23:41 +01:00
Matt Pass
904dee8f80 Check & clear server queue & return if we have this
If we have the exact same item URL, there is a save jamming situation,
so clear the server message and item from the queue then return
2016-04-02 12:55:19 +01:00
Matt Pass
cca5836698 No longer LZ compressing data before sending 2016-04-02 11:48:00 +01:00
Matt Pass
a406abd610 No longer using PHP LZ Compressor
Was too problematic one some characters so dropping use of this idea.
Too little benefit and many issues arising.
2016-04-02 11:46:15 +01:00
Matt Pass
de5460b43f Removed PHP and JS versions of LZ Compressor
Becoming too problematic to use and for such little benefit so dropping
2016-04-02 11:42:36 +01:00
Matt Pass
587132d81b LZCompress now including UTF16 2016-03-28 22:26:40 +01:00
Matt Pass
3c6b6ff81d Version 5.4 2016-03-19 12:28:47 +00:00
Matt Pass
c811b8585a Remove commented line re folding
Using CodeMirror foldcode addon now
2016-03-19 11:46:04 +00:00
Matt Pass
344bd2dd50 Handle dragging files setting drag cursor
On drag over CM instance, call setDragCursor with event and 'editor'
string
Set ondragover function call upon this function too with folder/file
string, same as when init'ing via get branch
setDragCursor function added, handles cursor for dropping files editior,
folder and file including if we have the CTRL key down or not
2016-03-19 11:10:30 +00:00
Matt Pass
875d8a75ca On drag over file/folder, start setDragCursor() 2016-03-19 11:06:14 +00:00
Matt Pass
891a4c2b8c Set drag data using new func on dragstart (FF need) 2016-03-18 22:10:18 +00:00
Matt Pass
2bbc2f5628 Set default data on drag start (so it works in FF) 2016-03-18 22:07:44 +00:00
Matt Pass
2cd2aaa916 String escaping needed 2016-03-18 22:06:22 +00:00
Matt Pass
fd73e42df3 Improvements and fixes, esp to FTP saving
No need to replace \r\n also in stitchChanges (\n and then \r will do
that).

If FTP based file, get from fixed filepath, explode on new lines and add
lineEnding to end of each but last, to match what the local file($file)
process will do.

Establish number of Unix and Windows lines in 'changes' update process
only (no need to do on new file) and also str_replace based on their
counts under FTP usage also (to match what local file processes are
doing).
2016-03-18 19:42:18 +00:00
Matt Pass
e127a9eee1 strClean 2 x input points 2016-03-18 15:46:38 +00:00
Matt Pass
0617f294cd No newlines at EOF and remove file_exists
Existence of a dir is done on is_dir
2016-03-18 14:00:18 +00:00
Matt Pass
31428cdaf0 Merge pull request #614 from microvb/patch-1
Error control for missing local folder
2016-03-18 13:57:16 +00:00
Matt Pass
ff9db44537 Merge pull request #615 from microvb/master
Corrects some issues that caused the interface to hang
2016-03-18 13:50:54 +00:00
MicroVB INC
4307dc1ae6 Added check tor stat results
When `$file` is a folder, the commands `filesize` and `filemtime` would result in the following warnings :

PHP Warning:  filemtime(): stat failed for /var/www/html/css in /var/www/html/ice/lib/file-control-xhr.php on line 921
PHP Warning:  filesize(): stat failed for /var/www/html/css in /var/www/html/ice/lib/file-control-xhr.php on line 940

This patch corrects this.
2016-03-18 08:28:40 -04:00
MicroVB INC
76010bb5cf Corrected php notice in XHR file manager
Wrapped `$ftpSite` in `isset()` where $ftpSite was a part of a condition for existence testing and was using the simplified mode for the check.  The simplified mode resulted in the following notice being produced when no data was present in the `$ftpSite` variable.

> PHP Notice:  Undefined variable: ftpSite in /var/www/html/ice/lib/file-control-xhr.php on line 518

While the error pertains specifically to line 518, this adjustment was applied to all condition checks on this variable.
2016-03-18 07:57:22 -04:00
Matt Pass
6a432f2f5c New flag and only perform actions if relevant value 2016-03-18 11:32:01 +00:00
Matt Pass
9a516ecd27 XSS clean 3 areas 2016-03-17 17:36:13 +00:00
MicroVB INC
7017ab1c33 Update settings-common.php 2016-03-16 18:20:22 -04:00
MicroVB INC
5d6299e3c8 Fix enumeration warning when localhost missing
Corrects the following error :

scandir(/var/www/html/ice/lib/../backups/localhost): failed to open dir: No such file or directory in /var/www/html/ice/lib/settings-common.php on line 190

(possible review required for if this is something that should be created before this method is called, or if a simple check as this patch does is all that is required.)
2016-03-16 18:16:02 -04:00
Matt Pass
be842742de JS LZ compress changes/content before sending 2016-03-16 19:54:05 +00:00
Matt Pass
cba7f06b4e Load LZ PHP lib, compress and decompress contents 2016-03-16 19:51:59 +00:00
Matt Pass
d8eb2b72db Load LZ PHP lib, convert posted content, set on XHR 2016-03-16 19:51:17 +00:00
Matt Pass
4581d32551 LZ String JS lib added
Compress and decompress strings with LZ compression in JS
2016-03-16 18:32:03 +00:00
MicroVB INC
7d8b229153 Context is now accessible inside GetVersionCount()
globalized $context inside `GetVersionCount()` to eliminate `Notice:  Undefined variable: context in /var/www/html/ice/lib/settings-common.php on line 203`

Added check if file is readable for `.version-index`'s inside the loop within `GetVersionCount()`
2016-03-16 12:59:59 -04:00
Matt Pass
09fde0c3e5 Only get statusObj if we have status 200
A non 200 event means there may not be a statusObj, which in turn causes
an error which causes a JS jam
2016-03-16 13:27:48 +00:00
Matt Pass
e82d93108d Don't recursively set fold markers now onload 2016-03-12 16:41:16 +00:00
Matt Pass
c72fd7f49a Don't recursively fold, let CM addon do this
Also comment out shortcut for now, to reimplement using new lib
2016-03-12 16:39:54 +00:00
Matt Pass
65b36d9e23 Own foldcode.js dropped in favor of CM version
It's more efficient and creates the markers without blocking the display
of the editor.
2016-03-12 16:21:57 +00:00
Matt Pass
5e04e79354 New function and system to handle saving via update
stitchContents added to stitch content changes together into version the
user is seeing in the browser.
Can action save on having changes or full content now
2016-03-11 18:36:51 +00:00
Matt Pass
c896ebb087 Set savedContents also when loading 2016-03-11 18:35:05 +00:00
Matt Pass
55ab3d63dd Saving will now send only changes
savedContents added to maintain last known version of saved file
changesToSave function added to output array of differences between
current and last known saved version stored in array
Establish any changes using this function in save events, pass changes
or content via XHR
2016-03-11 18:34:50 +00:00