diff --git a/lib/get-branch.php b/lib/get-branch.php index c64bafb..c495758 100644 --- a/lib/get-branch.php +++ b/lib/get-branch.php @@ -8,6 +8,8 @@ if (!$_SESSION['loggedIn']) { header("Location: ../"); } +$text = $_SESSION['text']; +$t = $text['get-branch']; ?> @@ -213,7 +215,7 @@ if ($_SESSION['githubDiff']) { repoSHAArray = []; // Set our repo and get the tree recursively - var repo = github.getRepo(top.repo.split("/")[0], top.repo.split("/")[1]); + var repo = github.getRepo(top.repo.split("/")[0], top.repo.split("/")[1]); repo.getTree('master?recursive=true', function(err, tree) { if(!err) { treePaths = []; @@ -288,7 +290,7 @@ if ($_SESSION['githubDiff']) { // If there are no diffs, ask user if they want to switch back to regular mode setTimeout(function(){ if (parent.document.getElementById('|').parentNode.parentNode.parentNode.childNodes[2].childNodes.length==1) { - if(top.ICEcoder.ask('There are no differences between the local and GitHub repo. Switch back to regular mode?')) { + if(top.ICEcoder.ask('')) { top.ICEcoder.githubDiffToggle(); } else { top.ICEcoder.showHide('hide',top.get('loadingMask')); @@ -300,7 +302,7 @@ if ($_SESSION['githubDiff']) { },4); } else { // There was an error, display HTTP error code and response message - top.ICEcoder.message('Sorry, there was an error, code: '+err.error+'\n\n'+err.request.response); + top.ICEcoder.message(' '+err.error+'\n\n'+err.request.response); top.ICEcoder.showHide('hide',top.get('loadingMask')); } }); @@ -364,7 +366,7 @@ if ($_SESSION['githubDiff']) { $pathPos = array_search($iceRoot,$iceGithubLocalPaths); if ($pathPos !== false) { ?> - if (top.ICEcoder.ask("Your local folder is empty, would you like to clone ?")) { + if (top.ICEcoder.ask(" ?")) { setTimeout(function() { top.ICEcoder.showHide('show',top.get('loadingMask')); top.ICEcoder.filesFrame.contentWindow.frames['fileControl'].location.href = "github.php?action=clone&csrf="+top.ICEcoder.csrf; diff --git a/lib/github-manager.php b/lib/github-manager.php index 1598101..3240429 100644 --- a/lib/github-manager.php +++ b/lib/github-manager.php @@ -1,6 +1,7 @@ top.ICEcoder.message('Sorry, cannot create folder at\\n".$chosenLocal."');"; + echo ""; } } @@ -54,9 +55,9 @@ if (!$demoMode && isset($_SESSION['loggedIn']) && $_SESSION['loggedIn'] && isset // Hide this popup and reload file manager echo ""; } else { - echo ""; + echo ""; } - + } } @@ -153,9 +154,9 @@ if (!$demoMode && isset($_SESSION['loggedIn']) && $_SESSION['loggedIn'] && isset // Finally, reload the iFrame screen for the user header("Location: github-manager.php?updatedGithubPaths&csrf=".$_SESSION["csrf"]); echo ""; - die('saving github paths...'); + die($t['saving github paths']); } else { - echo ""; + echo ""; } } } @@ -172,7 +173,7 @@ if (!$demoMode && isset($_SESSION['loggedIn']) && $_SESSION['loggedIn'] && isset -

github paths

+

0) { ?>
-

Choose existing path


+


- - + + '; echo ''; echo ''; - echo ''; + echo ''; echo ''; } echo ''; - echo ''; - echo ''; + echo ''; + echo ''; echo ''; ?>
Local pathRemote GitHub path
Choose
'.$t['Choose'].'
Set local and remote path to blanks to remove
Update
'.$t['Set local and...'].'
'.$t['Update'].'
@@ -211,32 +212,32 @@ if (!$demoMode && isset($_SESSION['loggedIn']) && $_SESSION['loggedIn'] && isset ?>
-

Add new path


+


- - + + - +
Local pathRemote GitHub path
Add
">
-

Usage Info:

+

-

Enter relative local paths (eg /server/myfiles) and absolute GitHub paths (eg https://github.com/user/repo or https://github.com/user/repo/tree/branch for branches), as per the examples. With this done you have established the source paths at both locations, as a pair.

-

You can then choose a path pair and this then becomes your new root path in ICEcoder.

-

The file manager then displays a new GitHub icon, which you can click on to perform and show a diff check between the 2 sources. These diffs can then be committed and pushed to the remote path at GitHub or cloned to your local path, to sync your files.

-

If you want to set another root path, this can be done in the Help > Settings screen.

+

+

+

+

diff --git a/lib/github.php b/lib/github.php index 7f31be2..a0ded37 100644 --- a/lib/github.php +++ b/lib/github.php @@ -1,13 +1,14 @@ top.ICEcoder.message('Sorry, you don\'t appear to have OpenSSL loaded on your PHP instance, so https is not available. This is required for GitHub data transfer, please amend php.ini settings, restart your server and try again');top.ICEcoder.showHide('hide',top.get('loadingMask'));"; + echo ""; die(); } diff --git a/lib/headers.php b/lib/headers.php index e8f9aaf..2a313ce 100644 --- a/lib/headers.php +++ b/lib/headers.php @@ -1,22 +1,23 @@
+ die($t['Bad CSRF token...']."

CSRF issue:
REQUEST: ".$req."
SESSION: ".xssClean($_SESSION["csrf"],"html")."
FILE: ".xssClean($_SERVER["SCRIPT_NAME"],"html")."
GET: ".xssClean(var_export($_GET, true),"html")."
- POST: ".xssClean(var_export($_POST, true),"html")."
-
Many thanks!"); + POST: ".xssClean(var_export($_POST, true),"html")); } // Set our security related headers diff --git a/lib/help.php b/lib/help.php index 7c01264..0818724 100644 --- a/lib/help.php +++ b/lib/help.php @@ -1,6 +1,7 @@ @@ -14,63 +15,63 @@ include("settings.php"); -

shortcuts

+

-1 ? true : false;?>
-

Within document

+

- Ctrl + Space Autocomplete / add snippet
- Ctrl + Click or Alt + Drag Multiple select
- + ↑ Move line up
- + ↓ Move line down
- + + Duplicate line(s)
- + - Remove line(s)
- Shift + Enter Insert line before
- Alt + Enter Insert line after
- + i Search for selected [?]
- + j Jump to definition / jump back
- Esc Comment / uncomment
- Tab Insert tab / indent selected
- + Alt + d Wrap with <div>
- + Alt + s Wrap with <span>
- + Alt + p Wrap / unwrap with <p>
- + Alt + a Wrap / unwrap with <a>
- + Alt + b Wrap / unwrap with <b>
- + Alt + i Wrap / unwrap with <i>
- + Alt + g Wrap / unwrap with <strong>
- + Alt + e Wrap / unwrap with <em>
- + Alt + nums 1 - 3 Wrap/unwrap with <h1> - <h3>
- + Alt + Enter End line with <br>

-

On Tabs

- Middle click Close tab
+ +
+ + Alt +
+ + ↑
+ + ↓
+ + +
+ + -
+ Shift + Enter
+ Alt + Enter
+ + i [?]
+ + j
+ Esc
+ Tab
+ + Alt + d
+ + Alt + s
+ + Alt + p
+ + Alt + a
+ + Alt + b
+ + Alt + i
+ + Alt + g
+ + Alt + e
+ + Alt + 1, 2 3
+ + Alt + Enter

+

+
-

Within file manager

- Left click Select file / folder
- Double click / click (mobile) Open file
- + left click Multiple select
- Shift + left click Range select
- Right click Options for selected
- Delete Delete selected

+

+
+
+ +
+ Shift +
+
+ Delete

-

Anywhere

- Middle scrollwheel Next/previous tab
- + → Next tab
- + ← Previous tab
- + + New tab
- + - Close current tab
- + o Open file prompt
- + f Find
- + g Focus on Go to line input
- + s Save
- + Shift + s Save as...
- + Enter View webpage [?]
- + ` Contract/expand file manager
- + . Fold/unfold current line
- Space Refocus on document
- Esc Cancel tasks

+

+
+ + →
+ + ←
+ + +
+ + -
+ + o
+ + f
+ + g
+ + s
+ + Shift + s
+ + Enter [?]
+ + `
+ + .
+
+ Esc

diff --git a/lib/multiple-results.php b/lib/multiple-results.php index 3fb8877..21f8015 100644 --- a/lib/multiple-results.php +++ b/lib/multiple-results.php @@ -1,6 +1,7 @@ " style="opacity: 0.1">
+ ?>" style="opacity: 0.1">