Merge pull request #29 from sea75300/dev

Dev - merge to master
sea75300 · Aug 12, 2024 · 28f0652 · 28f0652
2 parents 5ea00b7 + c26b6df
commit 28f0652
Show file tree

Hide file tree

Showing 17 changed files with 2 additions and 34 deletions.
diff --git a/inc/controller/ajax/articles/draft.php b/inc/controller/ajax/articles/draft.php
@@ -40,5 +40,3 @@ public function process()
     }
 
 }
-
-?>
diff --git a/inc/controller/ajax/articles/editorlist.php b/inc/controller/ajax/articles/editorlist.php
@@ -231,5 +231,3 @@ protected function initObjectsShortlink()
     }
 
 }
-
-?>
diff --git a/inc/controller/ajax/articles/imgupload.php b/inc/controller/ajax/articles/imgupload.php
@@ -61,5 +61,3 @@ public function process()
     }
 
 }
-
-?>
diff --git a/inc/controller/ajax/articles/listnewtweets.php b/inc/controller/ajax/articles/listnewtweets.php
@@ -124,5 +124,3 @@ public function process()
     }
 
 }
-
-?>
diff --git a/inc/controller/ajax/articles/massedit.php b/inc/controller/ajax/articles/massedit.php
@@ -95,5 +95,3 @@ public function process()
     }
 
 }
-
-?>
diff --git a/inc/controller/ajax/articles/removeeditortags.php b/inc/controller/ajax/articles/removeeditortags.php
@@ -36,5 +36,3 @@ public function process()
     }
 
 }
-
-?>
diff --git a/inc/controller/ajax/articles/smileys.php b/inc/controller/ajax/articles/smileys.php
@@ -51,5 +51,3 @@ public function process()
     }
 
 }
-
-?>
diff --git a/inc/controller/ajax/categories/massedit.php b/inc/controller/ajax/categories/massedit.php
@@ -76,5 +76,3 @@ public function process()
     }
 
 }
-
-?>
diff --git a/inc/controller/ajax/comments/delete.php b/inc/controller/ajax/comments/delete.php
@@ -61,5 +61,3 @@ public function process()
     }
 
 }
-
-?>
diff --git a/inc/controller/ajax/comments/lockIp.php b/inc/controller/ajax/comments/lockIp.php
@@ -68,5 +68,3 @@ public function process()
     }
 
 }
-
-?>
diff --git a/inc/controller/ajax/comments/search.php b/inc/controller/ajax/comments/search.php
@@ -111,5 +111,3 @@ public function process()
     }
 
 }
-
-?>
diff --git a/inc/controller/ajax/common/autocompleteCleanup.php b/inc/controller/ajax/common/autocompleteCleanup.php
@@ -80,5 +80,3 @@ private function hasNoArticlesAccess() : bool
     }
 
 }
-
-?>
diff --git a/inc/controller/ajax/common/cache.php b/inc/controller/ajax/common/cache.php
@@ -109,5 +109,3 @@ private function cleanupArticles()
     }
 
 }
-
-?>
diff --git a/inc/controller/ajax/common/clearTrash.php b/inc/controller/ajax/common/clearTrash.php
@@ -171,5 +171,3 @@ protected function processrestoreComments()
     }
 
 }
-
-?>
diff --git a/inc/controller/ajax/installer/checkdb.php b/inc/controller/ajax/installer/checkdb.php
@@ -84,5 +84,3 @@ protected function initPermissionObject(): bool
     }
 
 }
-
-?>
diff --git a/inc/controller/ajax/installer/initdb.php b/inc/controller/ajax/installer/initdb.php
@@ -155,5 +155,3 @@ protected function initPermissionObject(): bool
     }
 
 }
-
-?>
diff --git a/inc/migrations/v521rc1.php b/inc/migrations/v521rc1.php
@@ -90,10 +90,10 @@ protected function updateFileSystem(): bool {
 
             array_map(function ($f) {
 
-                if ( !file_exists($f) ) {
+                if ( !file_exists($f) || !is_writable($f) ) {
                     return false;
                 }
-                
+
                 return unlink($f);
             }, $diff);
Original file line number	Diff line number	Diff line change
Expand Up		@@ -231,5 +231,3 @@ protected function initObjectsShortlink()
		}

		}

		?>
Original file line number	Diff line number	Diff line change
Expand Up		@@ -80,5 +80,3 @@ private function hasNoArticlesAccess() : bool
		}

		}

		?>
Original file line number	Diff line number	Diff line change
Expand Up		@@ -109,5 +109,3 @@ private function cleanupArticles()
		}

		}

		?>
Original file line number	Diff line number	Diff line change
Expand Up		@@ -171,5 +171,3 @@ protected function processrestoreComments()
		}

		}

		?>
Original file line number	Diff line number	Diff line change
Expand Up		@@ -84,5 +84,3 @@ protected function initPermissionObject(): bool
		}

		}

		?>
Original file line number	Diff line number	Diff line change
Expand Up		@@ -155,5 +155,3 @@ protected function initPermissionObject(): bool
		}

		}

		?>