Merge branch 'seeddms-5.1.x' into seeddms-6.0.x

CHANGELOG

@@ -228,6 +228,7 @@
 - add hook additionalDocumentContentInfo
 - add restapi function 'statstotal'
 - custom attributes of type 'date' regard the date format
+- check extension dependency on shell commands
 
 --------------------------------------------------------------------------------
                      Changes in version 5.1.25

inc/inc.ClassExtensionMgr.php

@@ -445,6 +445,14 @@ class SeedDMS_Extension_Mgr {
 							}
 						}
 						break;
+					case 'cmd':
+						if(is_array($dval) && $dval) {
+							foreach($dval as $d) {
+								if(!commandExists($d))
+									$this->errmsgs[] = sprintf("Missing command '%s'", $d);
+							}
+						}
+						break;
 					default:
 						$tmp = explode('-', $dval, 2);
 						if(isset($this->extconf[$dkey]['version'])) {

inc/inc.Utils.php

@@ -708,6 +708,37 @@ function formatComment($an) { /* {{{ */
 	return $t;
 } /* }}} */
 
+/*
+ * Determines if a command exists on the current environment
+ *
+ * @param string $command The command to check
+ * @return bool True if the command has been found ; otherwise, false.
+ */
+function commandExists ($command) {
+	$whereIsCommand = (PHP_OS == 'WINNT') ? 'where' : 'command -v';
+
+	$process = proc_open(
+		"$whereIsCommand $command",
+		array(
+			0 => array("pipe", "r"), //STDIN
+			1 => array("pipe", "w"), //STDOUT
+			2 => array("pipe", "w"), //STDERR
+		),
+		$pipes
+	);
+	if ($process !== false) {
+		$stdout = stream_get_contents($pipes[1]);
+		$stderr = stream_get_contents($pipes[2]);
+		fclose($pipes[1]);
+		fclose($pipes[2]);
+		proc_close($process);
+
+		return $stdout != '';
+	}
+
+	return false;
+}
+
 /**
  * Send a file from disk to the browser
  *

out/out.MyDocuments.php

@@ -65,6 +65,7 @@ if($view) {
 	$view->setParam('listtype', $listtype);
 	$view->setParam('workflowmode', $settings->_workflowMode);
 	$view->setParam('cachedir', $settings->_cacheDir);
+	$view->setParam('conversionmgr', $conversionmgr);
 	$view->setParam('previewWidthList', $settings->_previewWidthList);
 	$view->setParam('previewConverters', isset($settings->_converters['preview']) ? $settings->_converters['preview'] : array());
 	$view->setParam('timeout', $settings->_cmdTimeout);

views/bootstrap/class.MyDocuments.php

@@ -125,8 +125,8 @@ $(document).ready( function() {
 		$user = $this->params['user'];
 		$orderby = $this->params['orderby'];
 		$orderdir = $this->params['orderdir'];
-		$conversionmgr = $this->params['conversionmgr'];
 		$cachedir = $this->params['cachedir'];
+		$conversionmgr = $this->params['conversionmgr'];
 		$previewwidth = $this->params['previewWidthList'];
 		$previewconverters = $this->params['previewConverters'];
 		$timeout = $this->params['timeout'];