Upload files: use config DEST_FILE_INDEX_FIELD and more variables

SE/se-lib/FileUploader.php

@@ -36,6 +36,7 @@ class FileUploader {
 		$this->_cnf['LOOKAT_FOLDER'] = array();
 		$this->_cnf['LOOKAT_FILES'] = array();// LOOKAT_FILES_LOOK_GLOB
 		$this->_cnf['DEST_FOLDER'] = array();
+		$this->_cnf['DEST_FILE_INDEX_FIELD'] = V::get('DEST_FILE_INDEX_FIELD', 'ID', $conf);
 		foreach ($conf as $key => $val) {
 			if (substr($key, 0, 14) == 'LOOKAT_FOLDER_') {
 				$key = substr($key, 14);
@@ -102,6 +103,9 @@ class FileUploader {
 		$look->varname['VARNAME1'] = V::get('VARNAME1', '', $this->_cnf['LOOKAT_FOLDER']);
 		$look->varname['VARNAME2'] = V::get('VARNAME2', '', $this->_cnf['LOOKAT_FOLDER']);
 		$look->varname['VARNAME3'] = V::get('VARNAME3', '', $this->_cnf['LOOKAT_FOLDER']);
+		$look->varname['VARNAME4'] = V::get('VARNAME4', '', $this->_cnf['LOOKAT_FOLDER']);
+		$look->varname['VARNAME5'] = V::get('VARNAME5', '', $this->_cnf['LOOKAT_FOLDER']);
+		$look->varname['VARNAME6'] = V::get('VARNAME6', '', $this->_cnf['LOOKAT_FOLDER']);
 		if($DBG){ echo'<pre style="max-height:200px;overflow:auto;border:1px solid red;text-align:left;">$look (' . __CLASS__ . '::' . __FUNCTION__ . ':' . __LINE__ . '): ';print_r($look);echo'</pre>'; }
 		foreach ($look->varname as $kName => $vVar) {
 			if ($vVar) {
@@ -148,6 +152,9 @@ class FileUploader {
 		$look->varname['VARNAME1'] = V::get('VARNAME1', '', $this->_cnf['DEST_FOLDER']);
 		$look->varname['VARNAME2'] = V::get('VARNAME2', '', $this->_cnf['DEST_FOLDER']);
 		$look->varname['VARNAME3'] = V::get('VARNAME3', '', $this->_cnf['DEST_FOLDER']);
+		$look->varname['VARNAME4'] = V::get('VARNAME4', '', $this->_cnf['DEST_FOLDER']);
+		$look->varname['VARNAME5'] = V::get('VARNAME5', '', $this->_cnf['DEST_FOLDER']);
+		$look->varname['VARNAME6'] = V::get('VARNAME6', '', $this->_cnf['DEST_FOLDER']);
 		if($DBG){ echo'<pre style="max-height:200px;overflow:auto;border:1px solid red;text-align:left;">$look (' . __CLASS__ . '::' . __FUNCTION__ . ':' . __LINE__ . '): ';print_r($look);echo'</pre>'; }
 		foreach ($look->varname as $kName => $vVar) {
 			if (!empty($vVar)) {
@@ -601,7 +608,8 @@ class FileUploader {
 			return false;
 		}
 
-		$genLog['INDEXNAME'] = $this->_record->ID;
+		$indeksFieldName = $this->_cnf['DEST_FILE_INDEX_FIELD'];
+		$genLog['INDEXNAME'] = V::get($indeksFieldName, 'ID', $this->_record);
 		$genLog['EXT'] = end($postFileNameByDot);
 
 		$genLog['TYPE'] = $params['M_DIST_FILES_TYPE'];
@@ -747,7 +755,8 @@ class FileUploader {
 			}
 		}
 
-		$dest_folder_name = end(explode('/', $dest_folder));
+		$dest_folder_name = explode('/', $dest_folder);
+		$dest_folder_name = end($dest_folder_name);
 
 		$genLog['M_DIST_FILES_DEST_FOLDER'] = $dest_folder;
 

SE/se-lib/TableAjax.php

@@ -4704,6 +4704,8 @@ jQuery(document).ready(function(){
 
 		$rowFunctionsOut = $this->_showRowFunctions($record->ID, array('files', 'cp'), true);
 
+		$fileIndexField = V::get('DEST_FILE_INDEX_FIELD', 'ID', $folderConf);
+		$fileIndex = V::get($fileIndexField, $record->ID, $record);
 		?>
 		<script src="stuff/jquery.form.js"></script>
 		<div class="container">
@@ -4828,7 +4830,7 @@ jQuery(document).ready(function(){
 				</tr>
 				<tr>
 					<td>
-						<?php echo $record->ID; ?>
+						<?php echo $fileIndex; ?>
 					</td>
 					<td>
 						<select class="form-control" name="M_DIST_FILES_TYPE">