mirror of
https://github.com/icecoder/ICEcoder.git
synced 2026-03-06 16:46:48 +01:00
parent.parent. fixes on lib files
This commit is contained in:
@@ -113,18 +113,18 @@ include(dirname(__FILE__)."/language-modes-partial.js");
|
||||
|
||||
var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
|
||||
mode: mode,
|
||||
lineNumbers: ICEcoder.lineNumbers,
|
||||
lineNumbers: parent.parent.ICEcoder.lineNumbers,
|
||||
gutters: ["CodeMirror-foldgutter","CodeMirror-lint-markers","CodeMirror-linenumbers"],
|
||||
foldGutter: {gutter: "CodeMirror-foldgutter"},
|
||||
foldOptions: {minFoldSize: 1},
|
||||
lineWrapping: ICEcoder.lineWrapping,
|
||||
indentWithTabs: ICEcoder.indentWithTabs,
|
||||
indentUnit: ICEcoder.indentSize,
|
||||
tabSize: ICEcoder.indentSize,
|
||||
matchBrackets: ICEcoder.matchBrackets,
|
||||
lineWrapping: parent.parent.ICEcoder.lineWrapping,
|
||||
indentWithTabs: parent.parent.ICEcoder.indentWithTabs,
|
||||
indentUnit: parent.parent.ICEcoder.indentSize,
|
||||
tabSize: parent.parent.ICEcoder.indentSize,
|
||||
matchBrackets: parent.parent.ICEcoder.matchBrackets,
|
||||
electricChars: false,
|
||||
highlightSelectionMatches: true,
|
||||
showTrailingSpace: ICEcoder.showTrailingSpace,
|
||||
showTrailingSpace: parent.parent.ICEcoder.showTrailingSpace,
|
||||
lint: false,
|
||||
readOnly: "nocursor",
|
||||
theme: "<?php echo $ICEcoder["theme"]=="default" ? 'icecoder' : $ICEcoder["theme"];?>"
|
||||
@@ -134,31 +134,31 @@ editor.setSize("480px","500px");
|
||||
var openNew = function() {
|
||||
var cM;
|
||||
|
||||
ICEcoder.showHide('hide',document.getElementById('blackMask'))
|
||||
ICEcoder.newTab();
|
||||
cM = ICEcoder.getcMInstance();
|
||||
parent.parent.ICEcoder.showHide('hide',parent.document.getElementById('blackMask'))
|
||||
parent.parent.ICEcoder.newTab();
|
||||
cM = parent.parent.ICEcoder.getcMInstance();
|
||||
cM.setValue(editor.getValue());
|
||||
}
|
||||
|
||||
var openDiff = function() {
|
||||
var cMDiff;
|
||||
|
||||
ICEcoder.showHide('hide',document.getElementById('blackMask'))
|
||||
ICEcoder.setSplitPane('on');
|
||||
cMDiff = ICEcoder.getcMdiffInstance();
|
||||
ICEcoder.focus('diff');
|
||||
parent.parent.ICEcoder.showHide('hide',parent.document.getElementById('blackMask'))
|
||||
parent.parent.ICEcoder.setSplitPane('on');
|
||||
cMDiff = parent.parent.ICEcoder.getcMdiffInstance();
|
||||
parent.parent.ICEcoder.focus('diff');
|
||||
cMDiff.setValue(editor.getValue());
|
||||
}
|
||||
|
||||
var restoreVersion = function() {
|
||||
var cM;
|
||||
|
||||
if (ICEcoder.ask("To confirm - this will paste the displayed backup content to your current tab and save, OK?")) {
|
||||
ICEcoder.showHide('hide',document.getElementById('blackMask'))
|
||||
cM = ICEcoder.getcMInstance();
|
||||
ICEcoder.focus();
|
||||
if (parent.parent.ICEcoder.ask("To confirm - this will paste the displayed backup content to your current tab and save, OK?")) {
|
||||
parent.parent.ICEcoder.showHide('hide',parent.document.getElementById('blackMask'))
|
||||
cM = parent.parent.ICEcoder.getcMInstance();
|
||||
parent.parent.ICEcoder.focus();
|
||||
cM.setValue(editor.getValue());
|
||||
ICEcoder.saveFile();
|
||||
parent.parent.ICEcoder.saveFile();
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
@@ -18,7 +18,7 @@ if (!$demoMode && isset($_SESSION['loggedIn']) && $_SESSION['loggedIn'] && isset
|
||||
// Set the site ref in session, hide the popup and reload the file manager
|
||||
$_SESSION['ftpSiteRef'] = numClean($_GET['ftpSiteRef']);
|
||||
// Hide this popup and reload file manager
|
||||
echo "<script>ICEcoder.showHide('hide',document.getElementById('blackMask'));ICEcoder.refreshFileManager();</script>";
|
||||
echo "<script>parent.parent.ICEcoder.showHide('hide',parent.document.getElementById('blackMask'));parent.parent.ICEcoder.refreshFileManager();</script>";
|
||||
} else {
|
||||
// Start creating a new chunk for the FTP sites
|
||||
$settingsNew = '"ftpSites" => array(
|
||||
@@ -109,10 +109,10 @@ if (!$demoMode && isset($_SESSION['loggedIn']) && $_SESSION['loggedIn'] && isset
|
||||
fclose($fh);
|
||||
// Finally, reload the iFrame screen for the user
|
||||
header("Location: ftp-manager.php?updatedFTPSites&csrf=".$_SESSION["csrf"]);
|
||||
echo "<script>window.location='ftp-manager.php?updatedFTPSites&csrf='+ICEcoder.csrf;</script>";
|
||||
echo "<script>window.location='ftp-manager.php?updatedFTPSites&csrf='+parent.parent.ICEcoder.csrf;</script>";
|
||||
die($t['Saving FTP sites']);
|
||||
} else {
|
||||
echo "<script>ICEcoder.message('".$t['Cannot update config...']." data/".$settingsFile." ".$t['and try again']."');</script>";
|
||||
echo "<script>parent.parent.ICEcoder.message('".$t['Cannot update config...']." data/".$settingsFile." ".$t['and try again']."');</script>";
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -147,7 +147,7 @@ if (!$demoMode && isset($_SESSION['loggedIn']) && $_SESSION['loggedIn'] && isset
|
||||
echo '<td style="padding: 10px 10px 8px 0">'.$ftpSites[$i]['site'].'</td>';
|
||||
echo '<td style="padding: 10px 10px 8px 0">'.$ftpSites[$i]['host'].'</td>';
|
||||
echo '<td style="padding: 10px 10px 8px 0"><a href="ftp-manager.php?action=edit&ftpSiteRef='.$i.'&csrf='.$_SESSION["csrf"].'" class="blue">Edit</a></td>';
|
||||
echo '<td style="padding: 10px 10px 8px 0"><a href="ftp-manager.php?action=remove&ftpSiteRef='.$i.'&csrf='.$_SESSION["csrf"].'" class="blue" onclick="return ICEcoder.ask(\''.$t['Are you sure...'].'\')">Delete</a></td>';
|
||||
echo '<td style="padding: 10px 10px 8px 0"><a href="ftp-manager.php?action=remove&ftpSiteRef='.$i.'&csrf='.$_SESSION["csrf"].'" class="blue" onclick="return parent.parent.ICEcoder.ask(\''.$t['Are you sure...'].'\')">Delete</a></td>';
|
||||
echo '<td style="padding: 2px 20px 8px 0; text-align: right"><div style="display: inline-block; padding: 5px; margin-top: 4px; background: #2187e7; color: #fff; font-size: 12px; cursor: pointer" onclick="window.location=\'ftp-manager.php?action=choose&ftpSiteRef='.$i.'&csrf='.$_SESSION["csrf"].'\'">'.$t['Choose'].'</div></td>';
|
||||
echo '</tr>';
|
||||
}
|
||||
|
||||
@@ -127,7 +127,7 @@ if (isset($ftpSite)) {
|
||||
ftpStart();
|
||||
// Show user warning if no good connection
|
||||
if (!$ftpConn || !$ftpLogin) {
|
||||
die('<script>parent.ICEcoder.message("Sorry, no FTP connection to '.$ftpHost.' for user '.$ftpUser.'");</script>');
|
||||
die('<script>parent.parent.ICEcoder.message("Sorry, no FTP connection to '.$ftpHost.' for user '.$ftpUser.'");</script>');
|
||||
exit;
|
||||
}
|
||||
// Get our simple and detailed lists and close the FTP connection
|
||||
@@ -186,15 +186,15 @@ for ($i=0;$i<count($finalArray);$i++) {
|
||||
}
|
||||
$type == "folder" ? $class = 'pft-directory' : $class = 'pft-file '.strtolower($ext);
|
||||
$loadParam = $type == "folder" ? "true" : "false";
|
||||
echo "<li class=\"".$class."\" draggable=\"false\" ondragstart=\"parent.ICEcoder.addDefaultDragData(this,event)\" ondrag=\"parent.ICEcoder.draggingWithKeyTest(event);if(parent.ICEcoder.getcMInstance()){parent.ICEcoder.editorFocusInstance.indexOf('diff') == -1 ? parent.ICEcoder.getcMInstance().focus() : parent.ICEcoder.getcMdiffInstance().focus()}\" ondragover=\"parent.ICEcoder.setDragCursor(event,".($type == "folder" ? "'folder'" : "'file'").")\" ondragend=\"parent.ICEcoder.dropFile(this)\"><a nohref title=\"$fileFolderName\" onMouseOver=\"parentNode.draggable=true;parent.ICEcoder.overFileFolder('$type',this.childNodes[1].id)\" onMouseOut=\"parentNode.draggable=false;parent.ICEcoder.overFileFolder('$type','')\" ".
|
||||
echo "<li class=\"".$class."\" draggable=\"false\" ondragstart=\"parent.parent.ICEcoder.addDefaultDragData(this,event)\" ondrag=\"parent.parent.ICEcoder.draggingWithKeyTest(event);if(parent.parent.ICEcoder.getcMInstance()){parent.parent.ICEcoder.editorFocusInstance.indexOf('diff') == -1 ? parent.parent.ICEcoder.getcMInstance().focus() : parent.parent.ICEcoder.getcMdiffInstance().focus()}\" ondragover=\"parent.parent.ICEcoder.setDragCursor(event,".($type == "folder" ? "'folder'" : "'file'").")\" ondragend=\"parent.parent.ICEcoder.dropFile(this)\"><a nohref title=\"$fileFolderName\" onMouseOver=\"parentNode.draggable=true;parent.parent.ICEcoder.overFileFolder('$type',this.childNodes[1].id)\" onMouseOut=\"parentNode.draggable=false;parent.parent.ICEcoder.overFileFolder('$type','')\" ".
|
||||
|
||||
(($type == "folder")?"ondragover=\"if(parentNode.nextSibling && parentNode.nextSibling.tagName != 'UL' && parent.ICEcoder.thisFileFolderLink != this.childNodes[1].id) {parent.ICEcoder.openCloseDir(this,true);}\"":"").
|
||||
(($type == "folder")?"ondragover=\"if(parentNode.nextSibling && parentNode.nextSibling.tagName != 'UL' && parent.parent.ICEcoder.thisFileFolderLink != this.childNodes[1].id) {parent.parent.ICEcoder.openCloseDir(this,true);}\"":"").
|
||||
|
||||
" onClick=\"if(!event.ctrlKey && !parent.ICEcoder.cmdKey) {".
|
||||
" onClick=\"if(!event.ctrlKey && !parent.parent.ICEcoder.cmdKey) {".
|
||||
|
||||
(($type == "folder")?" parent.ICEcoder.openCloseDir(this,$loadParam);":"").
|
||||
(($type == "folder")?" parent.parent.ICEcoder.openCloseDir(this,$loadParam);":"").
|
||||
|
||||
" if (/Android|webOS|iPhone|iPad|iPod|BlackBerry/i.test(navigator.userAgent)) {parent.ICEcoder.openFile()}}\" style=\"position: relative; left:-22px\"> <span id=\"".str_replace($docRoot,"",str_replace("/","|",$fileFolderName))."\">".xssClean(basename($fileFolderName),"html")."</span> ";
|
||||
" if (/Android|webOS|iPhone|iPad|iPod|BlackBerry/i.test(navigator.userAgent)) {parent.parent.ICEcoder.openFile()}}\" style=\"position: relative; left:-22px\"> <span id=\"".str_replace($docRoot,"",str_replace("/","|",$fileFolderName))."\">".xssClean(basename($fileFolderName),"html")."</span> ";
|
||||
if (!isset($ftpSite)) {
|
||||
$thisPermVal = $serverType=="Linux" ? substr(sprintf('%o', fileperms($docRoot.$iceRoot.$fileFolderName)), -3) : '';
|
||||
} else {
|
||||
@@ -224,7 +224,7 @@ echo ' </div>';
|
||||
|
||||
if (!isset($ftpSite) && $_SESSION['githubDiff']) {
|
||||
// Show the loading screen until we're done comparing files with GitHub
|
||||
echo "<script>setTimeout(function(){parent.ICEcoder.showHide('show',parent.get('loadingMask'));},4)</script>";
|
||||
echo "<script>setTimeout(function(){parent.parent.ICEcoder.showHide('show',parent.get('loadingMask'));},4)</script>";
|
||||
$i=0;
|
||||
$dirListArray = $dirSHAArray = $dirTypeArray = array();
|
||||
// For each of the files in our local path...
|
||||
@@ -356,20 +356,20 @@ if (!isset($ftpSite) && $_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(parent.ICEcoder.ask('<?php echo $t['There are no...'];?>')) {
|
||||
parent.ICEcoder.githubDiffToggle();
|
||||
if(parent.parent.ICEcoder.ask('<?php echo $t['There are no...'];?>')) {
|
||||
parent.parent.ICEcoder.githubDiffToggle();
|
||||
} else {
|
||||
parent.ICEcoder.showHide('hide',parent.get('loadingMask'));
|
||||
parent.parent.ICEcoder.showHide('hide',parent.get('loadingMask'));
|
||||
}
|
||||
} else {
|
||||
parent.ICEcoder.showHide('hide',parent.get('loadingMask'));
|
||||
parent.parent.ICEcoder.showHide('hide',parent.get('loadingMask'));
|
||||
}
|
||||
},100);
|
||||
},4);
|
||||
} else {
|
||||
// There was an error, display HTTP error code and response message
|
||||
parent.ICEcoder.message('<?php echo $t['Sorry, there was...'];?> '+err.error+'\n\n'+err.request.response);
|
||||
parent.ICEcoder.showHide('hide',parent.get('loadingMask'));
|
||||
parent.parent.ICEcoder.message('<?php echo $t['Sorry, there was...'];?> '+err.error+'\n\n'+err.request.response);
|
||||
parent.parent.ICEcoder.showHide('hide',parent.get('loadingMask'));
|
||||
}
|
||||
});
|
||||
</script>
|
||||
@@ -432,15 +432,15 @@ if (!isset($ftpSite) && $_SESSION['githubDiff']) {
|
||||
|
||||
// If we're adding a deleted dir/file in a sub-dir
|
||||
if ("<?php echo $location;?>" == "/"+thePath) {
|
||||
parent.ICEcoder.updateFileManagerList('add','/'+thePath,theFile,false,false,false,'file');
|
||||
parent.parent.ICEcoder.updateFileManagerList('add','/'+thePath,theFile,false,false,false,'file');
|
||||
// If we're adding a deleted dir/file at the root level
|
||||
} else {
|
||||
// Folder
|
||||
if (thePath != "") {
|
||||
parent.ICEcoder.updateFileManagerList('add',parent.iceRoot,thePath,false,false,false,'folder');
|
||||
parent.parent.ICEcoder.updateFileManagerList('add',parent.iceRoot,thePath,false,false,false,'folder');
|
||||
// File
|
||||
} else {
|
||||
parent.ICEcoder.updateFileManagerList('add',parent.iceRoot+thePath,theFile,false,false,false,'file');
|
||||
parent.parent.ICEcoder.updateFileManagerList('add',parent.iceRoot+thePath,theFile,false,false,false,'file');
|
||||
}
|
||||
}
|
||||
|
||||
@@ -452,8 +452,8 @@ if (!isset($ftpSite) && $_SESSION['githubDiff']) {
|
||||
|
||||
},20);
|
||||
}
|
||||
setTimeout(function(){parent.ICEcoder.redoTabHighlight(parent.ICEcoder.selectedTab);},4);
|
||||
if (!parent.ICEcoder.fmReady) {parent.ICEcoder.fmReady=true;};
|
||||
setTimeout(function(){parent.parent.ICEcoder.redoTabHighlight(parent.parent.ICEcoder.selectedTab);},4);
|
||||
if (!parent.parent.ICEcoder.fmReady) {parent.parent.ICEcoder.fmReady=true;};
|
||||
}
|
||||
newUL.innerHTML = showContent;
|
||||
locNest.parentNode.insertBefore(newUL,locNest.nextSibling);
|
||||
@@ -469,10 +469,10 @@ if (!isset($ftpSite) && $_SESSION['githubDiff']) {
|
||||
$pathPos = array_search($iceRoot,$iceGithubLocalPaths);
|
||||
if ($pathPos !== false) {
|
||||
?>
|
||||
if (parent.ICEcoder.ask("<?php echo $t['Your local folder...'];?> <?php echo $iceGithubRemotePaths[$pathPos];?>?")) {
|
||||
if (parent.parent.ICEcoder.ask("<?php echo $t['Your local folder...'];?> <?php echo $iceGithubRemotePaths[$pathPos];?>?")) {
|
||||
setTimeout(function() {
|
||||
parent.ICEcoder.showHide('show',parent.get('loadingMask'));
|
||||
parent.ICEcoder.filesFrame.contentWindow.frames['fileControl'].location.href = "github.php?action=clone&csrf="+parent.ICEcoder.csrf;
|
||||
parent.parent.ICEcoder.showHide('show',parent.get('loadingMask'));
|
||||
parent.parent.ICEcoder.filesFrame.contentWindow.frames['fileControl'].location.href = "github.php?action=clone&csrf="+parent.parent.ICEcoder.csrf;
|
||||
},4);
|
||||
}
|
||||
<?php ;}; ?>
|
||||
|
||||
@@ -27,9 +27,9 @@ if (!$demoMode && isset($_SESSION['loggedIn']) && $_SESSION['loggedIn']) {
|
||||
$_SESSION['ftpSiteRef'] = false;
|
||||
|
||||
// Now we've reset the root path to localhost root, refresh the file manager to show it
|
||||
echo "<script>ICEcoder.refreshFileManager();</script>";
|
||||
echo "<script>parent.parent.ICEcoder.refreshFileManager();</script>";
|
||||
} else {
|
||||
echo "<script>ICEcoder.message('".$t['Cannot update config']." data/".$settingsFile." ".$t['and try again']."');</script>";
|
||||
echo "<script>parent.parent.ICEcoder.message('".$t['Cannot update config']." data/".$settingsFile." ".$t['and try again']."');</script>";
|
||||
}
|
||||
?>
|
||||
<?php
|
||||
|
||||
@@ -15,7 +15,7 @@ if ($_SESSION['loggedIn']) {
|
||||
|
||||
// If we're updating plugins, update those shown
|
||||
if (isset($_GET['updatedPlugins'])) {
|
||||
echo "<script>document.getElementById('pluginsOptional').innerHTML = '".str_replace("'","\\'",$pluginsDisplay)."';</script>";
|
||||
echo "<script>parent.document.getElementById('pluginsOptional').innerHTML = '".str_replace("'","\\'",$pluginsDisplay)."';</script>";
|
||||
}
|
||||
|
||||
// Work out what plugins we'll need to set on a setInterval
|
||||
@@ -30,10 +30,10 @@ if ($_SESSION['loggedIn']) {
|
||||
if (isset($_GET['updatedPlugins'])) {
|
||||
?>
|
||||
<script>
|
||||
for (i=0;i<=ICEcoder.pluginIntervalRefs.length-1;i++) {
|
||||
clearInterval(ICEcoder['plugTimer'+ICEcoder.pluginIntervalRefs[i]]);
|
||||
for (i=0;i<=parent.parent.ICEcoder.pluginIntervalRefs.length-1;i++) {
|
||||
clearInterval(parent.parent.ICEcoder['plugTimer'+parent.parent.ICEcoder.pluginIntervalRefs[i]]);
|
||||
}
|
||||
ICEcoder.pluginIntervalRefs = [];
|
||||
parent.parent.ICEcoder.pluginIntervalRefs = [];
|
||||
<?php echo $onLoadExtras.PHP_EOL; ?>
|
||||
</script>
|
||||
<?php
|
||||
|
||||
@@ -138,14 +138,14 @@ if (!$demoMode && isset($_SESSION['loggedIn']) && $_SESSION['loggedIn'] && isset
|
||||
fclose($fh);
|
||||
// Finally, reload ICEcoder itself if plugin requires it or just the iFrame screen for the user if it doesn't
|
||||
if ($_GET['action']=="install" && $pluginsData[$_GET['plugin']]['reload'] == "true") {
|
||||
echo "<script>if (confirm('".$t['ICEcoder needs to...']."')) {window.location.reload(true);} else {window.location='plugins-manager.php?updatedPlugins&csrf='+ICEcoder.csrf;}</script>";
|
||||
echo "<script>if (confirm('".$t['ICEcoder needs to...']."')) {window.location.reload(true);} else {window.location='plugins-manager.php?updatedPlugins&csrf='+parent.parent.ICEcoder.csrf;}</script>";
|
||||
} else {
|
||||
header("Location: plugins-manager.php?updatedPlugins&csrf=".$_SESSION["csrf"]);
|
||||
echo "<script>window.location='plugins-manager.php?updatedPlugins&csrf='+ICEcoder.csrf;</script>";
|
||||
}
|
||||
die("<span style='color: #fff'>".$t['saving plugins']."</span>");
|
||||
} else {
|
||||
echo "<script>ICEcoder.message('".$t['Cannot update config...']." data/".$settingsFile." ".$t['and try again']."');</script>";
|
||||
echo "<script>parent.parent.ICEcoder.message('".$t['Cannot update config...']." data/".$settingsFile." ".$t['and try again']."');</script>";
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -166,7 +166,7 @@ var validatePerms = function() {
|
||||
permText.split("")[2]*1 <0 || permText.split("")[2]*1 >7) {
|
||||
canUpdate = false;
|
||||
}
|
||||
if (canUpdate) {ICEcoder.chmod('<?php echo str_replace($docRoot,"",$fileName);?>',permText)};
|
||||
if (canUpdate) {parent.parent.ICEcoder.chmod('<?php echo str_replace($docRoot,"",$fileName);?>',permText)};
|
||||
}
|
||||
</script>
|
||||
|
||||
|
||||
@@ -252,7 +252,7 @@ function toUTF8noBOM($string,$message=false) {
|
||||
if (!$strictUTF8 && strlen($teststringConverted) == strlen($teststringBroken)) {
|
||||
$string = utf8_encode($string);
|
||||
if ($message) {
|
||||
echo "ICEcoder.message('".$t['Your document does...'].".');";
|
||||
echo "parent.parent.ICEcoder.message('".$t['Your document does...'].".');";
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -356,10 +356,10 @@ function findSequence(goal) {
|
||||
|
||||
<script>
|
||||
var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
|
||||
lineNumbers: ICEcoder.lineNumbers,
|
||||
lineNumbers: parent.parent.ICEcoder.lineNumbers,
|
||||
readOnly: "nocursor",
|
||||
indentUnit: ICEcoder.indentSize,
|
||||
tabSize: ICEcoder.indentSize,
|
||||
indentUnit: parent.parent.ICEcoder.indentSize,
|
||||
tabSize: parent.parent.ICEcoder.indentSize,
|
||||
mode: "javascript",
|
||||
theme: "<?php echo $ICEcoder["theme"]=="default" ? 'icecoder' : $ICEcoder["theme"];?>"
|
||||
});
|
||||
@@ -412,10 +412,10 @@ var showHideTabs = function() {
|
||||
|
||||
var validatePasswords = function() {
|
||||
if (document.settings.password.value != 0 && document.settings.password.value.length<8) {
|
||||
ICEcoder.message('Please use at least 8 chars in the password');
|
||||
parent.parent.ICEcoder.message('Please use at least 8 chars in the password');
|
||||
} else {
|
||||
if (document.settings.password.value != document.settings.passwordConfirm.value) {
|
||||
ICEcoder.message('Sorry, your passwords don\'t match')
|
||||
parent.parent.ICEcoder.message('Sorry, your passwords don\'t match')
|
||||
} else {
|
||||
document.settings.submit();
|
||||
}
|
||||
@@ -432,7 +432,7 @@ var switchTab = function(tab) {
|
||||
}
|
||||
</script>
|
||||
|
||||
<div class="update" id="updateButton" onClick="<?php echo $ICEcoder['demoMode'] ? "ICEcoder.message('Sorry, can\'t commit settings in demo mode')" : "validatePasswords()"; ?>">update</div>
|
||||
<div class="update" id="updateButton" onClick="<?php echo $ICEcoder['demoMode'] ? "parent.parent.ICEcoder.message('Sorry, can\'t commit settings in demo mode')" : "validatePasswords()"; ?>">update</div>
|
||||
<input type="hidden" name="csrf" value="<?php echo $_SESSION["csrf"]; ?>">
|
||||
</form>
|
||||
|
||||
|
||||
@@ -79,7 +79,7 @@ if (!$demoMode && isset($_SESSION['loggedIn']) && $_SESSION['loggedIn'] && isset
|
||||
fwrite($fh, $settingsContents);
|
||||
fclose($fh);
|
||||
} else {
|
||||
echo "<script>ICEcoder.message('".$t['Cannot update config']." data/".$settingsFile." ".$t['and try again']."');</script>";
|
||||
echo "<script>parent.parent.ICEcoder.message('".$t['Cannot update config']." data/".$settingsFile." ".$t['and try again']."');</script>";
|
||||
}
|
||||
|
||||
// OK, now the config file has been updated, update our current session with new arrays
|
||||
@@ -110,7 +110,7 @@ if (!$demoMode && isset($_SESSION['loggedIn']) && $_SESSION['loggedIn'] && isset
|
||||
fwrite($fConfigSettings, $generalSettingsContents);
|
||||
fclose($fConfigSettings);
|
||||
} else {
|
||||
echo "<script>ICEcoder.message('".$t['Cannot update config']." data/".$configSettings." ".$t['and try again']."');</script>";
|
||||
echo "<script>parent.parent.ICEcoder.message('".$t['Cannot update config']." data/".$configSettings." ".$t['and try again']."');</script>";
|
||||
}
|
||||
|
||||
$githubAuthTokenSet = $ICEcoder["githubAuthToken"] != "" ? "true" : "false";
|
||||
@@ -123,5 +123,5 @@ if (!$demoMode && isset($_SESSION['loggedIn']) && $_SESSION['loggedIn'] && isset
|
||||
|
||||
// With all that worked out, we can now hide the settings screen and apply the new settings
|
||||
$jsBugFilePaths = "['".str_replace(",","','",str_replace(" ","",$_POST['bugFilePaths']))."']";
|
||||
echo "<script>ICEcoder.settingsScreen('hide');ICEcoder.useNewSettings('".$themeURL."',".$ICEcoder["codeAssist"].",".$ICEcoder["lockedNav"].",'".$ICEcoder["tagWrapperCommand"]."','".$ICEcoder["autoComplete"]."',".$ICEcoder["visibleTabs"].",'".$ICEcoder["fontSize"]."',".$ICEcoder["lineWrapping"].",".$ICEcoder["lineNumbers"].",".$ICEcoder["showTrailingSpace"].",".$ICEcoder["matchBrackets"].",".$ICEcoder["autoCloseTags"].",".$ICEcoder["autoCloseBrackets"].",".$ICEcoder["indentWithTabs"].",".$ICEcoder["indentAuto"].",".$ICEcoder["indentSize"].",'".$ICEcoder["pluginPanelAligned"]."',".$jsBugFilePaths.",".$ICEcoder["bugFileCheckTimer"].",".$ICEcoder["bugFileMaxLines"].",'".$githubAuthTokenSet."',".$ICEcoder["updateDiffOnSave"].",".$ICEcoder["autoLogoutMins"].",".$refreshFM.");iceRoot = '".$ICEcoder["root"]."';</script>";
|
||||
echo "<script>parent.parent.ICEcoder.settingsScreen('hide');parent.parent.ICEcoder.useNewSettings('".$themeURL."',".$ICEcoder["codeAssist"].",".$ICEcoder["lockedNav"].",'".$ICEcoder["tagWrapperCommand"]."','".$ICEcoder["autoComplete"]."',".$ICEcoder["visibleTabs"].",'".$ICEcoder["fontSize"]."',".$ICEcoder["lineWrapping"].",".$ICEcoder["lineNumbers"].",".$ICEcoder["showTrailingSpace"].",".$ICEcoder["matchBrackets"].",".$ICEcoder["autoCloseTags"].",".$ICEcoder["autoCloseBrackets"].",".$ICEcoder["indentWithTabs"].",".$ICEcoder["indentAuto"].",".$ICEcoder["indentSize"].",'".$ICEcoder["pluginPanelAligned"]."',".$jsBugFilePaths.",".$ICEcoder["bugFileCheckTimer"].",".$ICEcoder["bugFileMaxLines"].",'".$githubAuthTokenSet."',".$ICEcoder["updateDiffOnSave"].",".$ICEcoder["autoLogoutMins"].",".$refreshFM.");iceRoot = '".$ICEcoder["root"]."';</script>";
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user