Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings
This repository was archived by the owner on Dec 14, 2023. It is now read-only.
/ICEcoderPublic archive

Commit501d9f0

Browse files
author
mattpass
committed
item 0 removed when deleting from serverQueue, dont lowercase filename replace in modal, exclude findFilesExclude
1 parent8625c41 commit501d9f0

File tree

4 files changed

+23
-17
lines changed

4 files changed

+23
-17
lines changed

‎classes/File.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ public function load() {
149149
$this->ftpClass->ftpStart();
150150
// Show user warning if no good connection
151151
if (!$ftpConn || !$ftpLogin) {
152-
die('parent.parent.ICEcoder.message("Sorry, no FTP connection to' .$ftpHost .' for user' .$ftpUser .'");parent.parent.ICEcoder.serverMessage();parent.parent.ICEcoder.serverQueue("del",0);</script>');
152+
die('parent.parent.ICEcoder.message("Sorry, no FTP connection to' .$ftpHost .' for user' .$ftpUser .'");parent.parent.ICEcoder.serverMessage();parent.parent.ICEcoder.serverQueue("del");</script>');
153153
}
154154
// Get our file contents and close the FTP connection
155155
$loadedFile =toUTF8noBOM($this->ftpClass->ftpGetContents($ftpConn,$ftpRoot .$fileLoc ."/" .$fileName,$ftpMode),false);
@@ -339,7 +339,7 @@ public function handleSaveLooparound($fileDetails, $finalAction, $t) {
339339
/* UI dialog cancelling and saving contents for save as looparound */
340340
if (!newFileName || newFileName && !overwriteOK) {
341341
ICEcoder.saveAsContent = document.getElementById(\'saveTemp1\').value;
342-
ICEcoder.serverMessage();ICEcoder.serverQueue("del", 0);
342+
ICEcoder.serverMessage();ICEcoder.serverQueue("del");
343343
}
344344
';
345345

‎lib/file-control.php‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363
if (false ===$error) {
6464
$fileClass->check();
6565
if ("load" ===$_GET['action'] &&true ===$error) {
66-
die("parent.parent.ICEcoder.message('" .$errorMsg ."');parent.parent.ICEcoder.serverMessage();parent.parent.ICEcoder.serverQueue(\"del\",0);</script>");
66+
die("parent.parent.ICEcoder.message('" .$errorMsg ."');parent.parent.ICEcoder.serverMessage();parent.parent.ICEcoder.serverQueue(\"del\");</script>");
6767
}
6868
}
6969

@@ -88,7 +88,7 @@
8888
echo$fileClass->returnLoadTextScript();
8989
echo$fileClass->returnLoadImageScript();
9090
?>
91-
parent.parent.ICEcoder.serverMessage(); parent.parent.ICEcoder.serverQueue("del", 0);
91+
parent.parent.ICEcoder.serverMessage(); parent.parent.ICEcoder.serverQueue("del");
9292

9393
// Finally, switch mode in case we have saved, renamed file etc
9494
parent.parent.ICEcoder.switchMode();
@@ -184,7 +184,7 @@
184184
$finalAction ="nothing";
185185
$doNext .="ICEcoder.message('" .$t['Sorry, cannot save'] ."\\\\n" .$file ."');";
186186
}
187-
$doNext .='ICEcoder.serverMessage(); ICEcoder.serverQueue("del", 0);';
187+
$doNext .='ICEcoder.serverMessage(); ICEcoder.serverQueue("del");';
188188
}
189189
};
190190

@@ -215,7 +215,7 @@
215215
$doNext .="ICEcoder.message('" .$t['Sorry, cannot create...'] ."\\\\n" .$fileLoc ."');";
216216
$finalAction ="nothing";
217217
}
218-
$doNext .='ICEcoder.serverMessage(); ICEcoder.serverQueue("del", 0);';
218+
$doNext .='ICEcoder.serverMessage(); ICEcoder.serverQueue("del");';
219219
};
220220

221221
// ================
@@ -265,7 +265,7 @@
265265
$doNext .="";
266266
$finalAction ="nothing";
267267
}
268-
$doNext .='ICEcoder.serverMessage(); ICEcoder.serverQueue("del", 0);';
268+
$doNext .='ICEcoder.serverMessage(); ICEcoder.serverQueue("del");';
269269
};
270270

271271
// ==================
@@ -301,7 +301,7 @@
301301
$doNext .="ICEcoder.message('".$t['Sorry, cannot rename'] ."\\\\n" .str_replace("|","/",$_GET['oldFileName']) ."\\\\n\\\\n" .$t['Maybe public write...'] ."');";
302302
$finalAction ="nothing";
303303
}
304-
$doNext .='ICEcoder.serverMessage(); ICEcoder.serverQueue("del", 0);';
304+
$doNext .='ICEcoder.serverMessage(); ICEcoder.serverQueue("del");';
305305
};
306306

307307
// =================
@@ -325,7 +325,7 @@
325325
$doNext .="ICEcoder.message('" .$t['Sorry, cannot copy'] ."\\\\n" .str_replace($docRoot,"",$source) ."\\\\n" .$t['into'] ."\\\\n" .str_replace($docRoot,"",$dest) ."');";
326326
$finalAction ="nothing";
327327
}
328-
$doNext .='ICEcoder.serverMessage(); ICEcoder.serverQueue("del", 0);';
328+
$doNext .='ICEcoder.serverMessage(); ICEcoder.serverQueue("del");';
329329
};
330330

331331
// ==============
@@ -387,7 +387,7 @@
387387
}else {
388388
$fileClass->delete();
389389
}
390-
$doNext .='ICEcoder.serverMessage(); ICEcoder.serverQueue("del", 0);';
390+
$doNext .='ICEcoder.serverMessage(); ICEcoder.serverQueue("del");';
391391
};
392392

393393
// ======================
@@ -413,7 +413,7 @@
413413
$finalAction ="nothing";
414414
}
415415

416-
$doNext .='ICEcoder.serverMessage(); ICEcoder.serverQueue("del", 0);';
416+
$doNext .='ICEcoder.serverMessage(); ICEcoder.serverQueue("del");';
417417
};
418418

419419
// ==========================
@@ -438,7 +438,7 @@
438438
$doNext .='ICEcoder.message(\'' .$t['Sorry, could not...'] .''.$file .'\');';
439439
}
440440

441-
$doNext .='ICEcoder.serverMessage(); ICEcoder.serverQueue("del", 0);';
441+
$doNext .='ICEcoder.serverMessage(); ICEcoder.serverQueue("del");';
442442
};
443443

444444
// =======================
@@ -468,7 +468,7 @@
468468
$finalAction ="nothing";
469469
$doNext .="ICEcoder.message('" .$t['Sorry, cannot change...'] ."\\n" .$file ."');";
470470
}
471-
$doNext .='ICEcoder.serverMessage(); ICEcoder.serverQueue("del", 0);';
471+
$doNext .='ICEcoder.serverMessage(); ICEcoder.serverQueue("del");';
472472
};
473473

474474
// ====================
@@ -479,7 +479,7 @@
479479
// This action is called under seperate AJAX call and the responseText object stored in ICEcoder.lastFileDirCheckStatusObj
480480
// Nothing really done here though, we do something with the responseText
481481
$finalAction ="checkExists";
482-
$doNext .='ICEcoder.serverMessage(); ICEcoder.serverQueue("del", 0);';
482+
$doNext .='ICEcoder.serverMessage(); ICEcoder.serverQueue("del");';
483483
};
484484

485485
// ===================

‎lib/multiple-results.php‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@
122122
'<div id="foundCount' + i + '">' + spansArray[i].innerHTML +
123123
',<?phpecho$t['rename to'];?> ' +
124124
targetURL.replace(/\|/g, "/").replace(/_perms/g, "").replace(/<?phpechostr_replace("/","\/",strtolower($findText));?>/g,"<b><?php
125-
if (isset($_GET['replace'])) {echostrtolower($_GET['replace']);};
125+
if (isset($_GET['replace'])) {echo$_GET['replace'];};
126126
?></b>")+'</div>';
127127
<?php
128128
;};
@@ -152,11 +152,17 @@ function phpGrep($q, $path, $base) {
152152
$bFile =false;
153153
$foundInSelFile =false;
154154
// Exclude banned files
155-
for ($i =0;$i <count($ICEcoder['bannedFiles']);$i++) {
155+
for ($i =0;$i <count($ICEcoder['bannedFiles']);$i++) {
156156
if (false !==strpos($f,str_replace("*","",$ICEcoder['bannedFiles'][$i]))) {
157157
$bFile =true;
158158
};
159159
}
160+
// Exclude the dirs & files we wish to exclude from find & replace tasks
161+
for ($i =0;$i <count($ICEcoder['findFilesExclude']);$i++) {
162+
if (false !==strpos($f,str_replace("*","",$ICEcoder['findFilesExclude'][$i]))) {
163+
$bFile =true;
164+
};
165+
}
160166
// Exclude the folder ICEcoder is running from
161167
$rootPrefix ='/' .str_replace("/","\/",preg_quote(str_replace("\\","/",$docRoot))) .'/';
162168
$localPath =preg_replace($rootPrefix,'',$fullPath,1);

‎lib/settings-save-current-files.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,5 +36,5 @@
3636
}
3737
}
3838
}
39-
echo'<script>parent.parent.ICEcoder.serverMessage(); parent.parent.ICEcoder.serverQueue("del", 0);</script>';
39+
echo'<script>parent.parent.ICEcoder.serverMessage(); parent.parent.ICEcoder.serverQueue("del");</script>';
4040
}

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp