Skip to content
This repository was archived by the owner on Dec 14, 2023. It is now read-only.

Increase readability #741

Open
wants to merge 18 commits into
base: master
Choose a base branch
from
Open

Increase readability #741

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
76dc065
Changing instances of dirname(__FILE__) to __DIR__
rotelok Jun 16, 2018
52d8440
fixing funcion name case mismatch
rotelok Jun 16, 2018
fd2603a
removing unnecessary variable attributions
rotelok Jun 16, 2018
972ae19
changing the alias function is_writeable to the php function is_writable
rotelok Jun 16, 2018
fe3683a
simplifying $isMac attribution, it doesn't need a ternary operator
rotelok Jun 16, 2018
28ee41c
using array_merge instead of '+' to merge arrays
rotelok Jun 16, 2018
6ed2edb
Removing unnecessary semi-colons
rotelok Jun 16, 2018
05ee5e5
Removing unnecessary parenthesis
rotelok Jun 16, 2018
9cd129b
Altering
rotelok Jun 16, 2018
f4fe032
altering
rotelok Jun 16, 2018
2d63ef5
merging isset($var1) && isset($var2) to isset($var1,$var2) it's equiv…
rotelok Jun 16, 2018
2caa32a
changing the constructs intval($var) and floatval($var) to (int)$var
rotelok Jun 16, 2018
f2b19dd
Altering the function phpversion() to the constant PHP_VERSION
rotelok Jun 16, 2018
c8b2bc0
using $array[] = $value instead of array_push($array,$value)
rotelok Jun 16, 2018
399c046
merging multiple sequential str_replace() calls
rotelok Jun 16, 2018
7bc0dea
refactored the constructs
rotelok Jun 16, 2018
f8565d1
disable scandir sorting, because we don't use it
rotelok Jun 16, 2018
5c8aa37
Reverting the commig 6ed2edb "Removing unnecessary semi-colons"
rotelok Jun 17, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
changing the alias function is_writeable to the php function is_writable
  • Loading branch information
@rotelok
rotelok committed Jun 16, 2018
commit 972ae19e254febe7f0cbd2ba3bde791d31dcfabe
4 changes: 2 additions & 2 deletions lib/ftp-manager.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@
$settingsContents = substr($settingsContents,0,$repPosStart).$settingsNew.substr($settingsContents,$repPosEnd,strlen($settingsContents));

// Now update the config file
if (is_writeable($settingsFile)) {
if (is_writable($settingsFile)) {
$fh = fopen($settingsFile, 'w');
fwrite($fh, $settingsContents);
fclose($fh);
Expand Down Expand Up @@ -209,4 +209,4 @@

</body>

</html>
</html>
4 changes: 2 additions & 2 deletions lib/github-manager.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
$settingsContents = substr($settingsContents,0,$repPosStart).$settingsNew.substr($settingsContents,$repPosEnd,strlen($settingsContents));

// Now update the config file
if (is_writeable($settingsFile)) {
if (is_writable($settingsFile)) {
$fh = fopen($settingsFile, 'w');
fwrite($fh, $settingsContents);
fclose($fh);
Expand Down Expand Up @@ -151,7 +151,7 @@
$settingsContents = substr($settingsContents,0,$repPosStart).$settingsNew.substr($settingsContents,$repPosEnd,strlen($settingsContents));

// Now update the config file
if (is_writeable($settingsFile)) {
if (is_writable($settingsFile)) {
$fh = fopen($settingsFile, 'w');
fwrite($fh, $settingsContents);
fclose($fh);
Expand Down
4 changes: 2 additions & 2 deletions lib/go-localhost-root.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
substr($settingsContents,($repPosEnd),strlen($settingsContents));

// Now update the config file
if (is_writeable($settingsFile)) {
if (is_writable($settingsFile)) {
$fh = fopen($settingsFile, 'w');
fwrite($fh, $settingsContents);
fclose($fh);
Expand All @@ -34,4 +34,4 @@
?>
<?php
;};
?>
?>
2 changes: 1 addition & 1 deletion lib/plugins-manager.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@
$settingsContents = substr($settingsContents,0,$repPosStart).$settingsNew.substr($settingsContents,$repPosEnd,strlen($settingsContents));

// Now update the config file
if (is_writeable($settingsFile)) {
if (is_writable($settingsFile)) {
$fh = fopen($settingsFile, 'w');
fwrite($fh, $settingsContents);
fclose($fh);
Expand Down
4 changes: 2 additions & 2 deletions lib/properties.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
<br><br>
<span class="column" style="width: 180px"><?php echo $t['Type'];?>: <?php echo is_dir($fileName) ? "Folder" : "File"; ?></span>
<span class="column" style="margin: 0 10px"><?php echo $t['Readable Writeable'];?>:
<?php echo is_readable($fileName) ? "Yes" : "No"; ?> / <?php echo is_writeable($fileName) ? "Yes" : "No";?>
<?php echo is_readable($fileName) ? "Yes" : "No"; ?> / <?php echo is_writable($fileName) ? "Yes" : "No";?>
</span>
<span class="column"><?php echo $t['Relative path'];?>: <?php echo str_replace($docRoot,"",$fileName);?></span>
<br><br>
Expand Down Expand Up @@ -172,4 +172,4 @@ function changePerms(val) {

</body>

</html>
</html>
6 changes: 3 additions & 3 deletions lib/settings-save-current-files.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
}
$settingsContents = substr($settingsContents,0,$repPosStart).$saveFiles.substr($settingsContents,($repPosStart+$repPosEnd),strlen($settingsContents));
// Now update the config file
if (is_writeable($settingsFile)) {
if (is_writable($settingsFile)) {
$fh = fopen($settingsFile, 'w');
fwrite($fh, $settingsContents);
fclose($fh);
Expand All @@ -45,7 +45,7 @@
if (count($last10FilesArray)>=10) {$ICEcoder["last10Files"]=substr($ICEcoder["last10Files"],0,strrpos($ICEcoder["last10Files"],','));};
$settingsContents = substr($settingsContents,0,$repPosStart).$saveFilesArray[$i].$commaExtra.$ICEcoder["last10Files"].substr($settingsContents,($repPosStart+$repPosEnd),strlen($settingsContents));
// Now update the config file
if (is_writeable($settingsFile)) {
if (is_writable($settingsFile)) {
$fh = fopen($settingsFile, 'w');
fwrite($fh, $settingsContents);
fclose($fh);
Expand All @@ -57,4 +57,4 @@
}
echo '<script>top.ICEcoder.serverMessage();top.ICEcoder.serverQueue("del",0);</script>';
}
?>
?>
6 changes: 3 additions & 3 deletions lib/settings-update.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
$settingsContents = substr($settingsContents,0,$repPosStart).$settingsNew.substr($settingsContents,($repPosEnd),strlen($settingsContents));

// Now update the config file
if (is_writeable($settingsFile)) {
if (is_writable($settingsFile)) {
$fh = fopen($settingsFile, 'w');
fwrite($fh, $settingsContents);
fclose($fh);
Expand Down Expand Up @@ -94,7 +94,7 @@
$generalSettingsContents = str_replace('"enableRegistration" => true','"enableRegistration" => '.$isEnableRegistration,$generalSettingsContents);
$generalSettingsContents = str_replace('"enableRegistration" => false','"enableRegistration" => '.$isEnableRegistration,$generalSettingsContents);

if (is_writeable($configSettings)) {
if (is_writable($configSettings)) {
$fConfigSettings = fopen($configSettings, 'w');
fwrite($fConfigSettings, $generalSettingsContents);
fclose($fConfigSettings);
Expand All @@ -114,4 +114,4 @@
$jsBugFilePaths = "['".str_replace(",","','",str_replace(" ","",strClean($_POST['bugFilePaths'])))."']";
echo "<script>top.ICEcoder.settingsScreen('hide');top.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.");top.iceRoot = '".$ICEcoder["root"]."';</script>";
}
?>
?>
2 changes: 1 addition & 1 deletion lib/updater.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ function startUpdate() {
$testPath = $source.DIRECTORY_SEPARATOR.$iterator->getSubPathName();
$testPath = str_replace("\\","/",$testPath);
if (strpos($testPath,"/backups/")==false && strpos($testPath,"/plugins/")==false && strpos($testPath,"/.git/")==false) {
if (!is_writeable($item)) {
if (!is_writable($item)) {
array_push($cantMoveArray,substr($item,count($source)+2));
}
}
Expand Down