Merge pull request #297 from bbommer/master

updated writeablity-checks to php5+, removed empty config.inc.php
berliCRM · Jun 18, 2019 · ddec47d · ddec47d
2 parents 5b36f2c + 1a9469b
commit ddec47d
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 24 deletions.
diff --git a/config.inc.php b/config.inc.php
diff --git a/include/utils/VtlibUtils.php b/include/utils/VtlibUtils.php
@@ -569,33 +569,14 @@ function vtlib_getModuleTemplate($module, $templateName) {
  * Check if give path is writeable.
  */
 function vtlib_isWriteable($path) {
-	if(is_dir($path)) {
-		return vtlib_isDirWriteable($path);
-	} else {
-		return is_writable($path);
-	}
+    return is_writable($path);
 }
 
 /**
- * Check if given directory is writeable.
- * NOTE: The check is made by trying to create a random file in the directory.
+ * Check if given path is writeable (PHP5+)
  */
-function vtlib_isDirWriteable($dirpath) {
-	if(is_dir($dirpath)) {
-		do {
-			$tmpfile = 'vtiger' . time() . '-' . rand(1,1000) . '.tmp';
-			// Continue the loop unless we find a name that does not exists already.
-			$usefilename = "$dirpath/$tmpfile";
-			if(!file_exists($usefilename)) break;
-		} while(true);
-		$fh = @fopen($usefilename,'a');
-		if($fh) {
-			fclose($fh);
-			unlink($usefilename);
-			return true;
-		}
-	}
-	return false;
+function vtlib_isDirWriteable($path) {
+    return is_writable($path);
 }
 
 /** HTML Purifier global instance */

diff --git a/modules/Install/models/Utils.php b/modules/Install/models/Utils.php
@@ -15,7 +15,6 @@ class Install_Utils_Model {
 	 * @var <Array>
 	 */
 	public static $writableFilesAndFolders = array (
-		'Configuration File' => './config.inc.php',
 		'Tabdata File' => './tabdata.php',
 		'Parent Tabdata File' => './parent_tabdata.php',
 		'Cache Directory' => './cache/',