Skip to content

Commit cb99ad5

Browse files
ggoffyggoffy
committed
- rebuild language defines for upload in forms
- fixed bug with multiple upload formfields in one form
1 parent 5d70971 commit cb99ad5

11 files changed

Lines changed: 72 additions & 53 deletions

File tree

‎_TODO.txt‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,12 @@
1+
****************************************************************************************
2+
3+
IMPORTANT:
4+
I moved files, where I do not know whether they are still needed into folder _archive
5+
6+
****************************************************************************************
7+
8+
9+
110
TODOs:
211

312

class/Files/User/UserObjects.php renamed to _archive/class/Files/User/UserObjects.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
/**
3131
* Class UserObjects.
3232
*/
33-
class UserObjects extends Files\CreateFile
33+
class UserObjects_old extends Files\CreateFile
3434
{
3535
/**
3636
* @public function constructor

‎class/Files/Classes/ClassFormElements.php‎

Lines changed: 43 additions & 33 deletions
Large diffs are not rendered by default.

‎class/Files/CreateArchitecture.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -663,7 +663,7 @@ public function setCommonFiles($module)
663663
'rcode' => true
664664
];
665665
foreach ($cloneFolders as $folder) {
666-
Tdmcreate\Files\Cloner::cloneFileFolder($folder['src'], $folder['dst'], $folder['rcode'], $patKeys, $patValues);
666+
Tdmcreate\Files\CreateClone::cloneFileFolder($folder['src'], $folder['dst'], $folder['rcode'], $patKeys, $patValues);
667667
}
668668
unset($cloneFolders);
669669

@@ -691,7 +691,7 @@ public function setCommonFiles($module)
691691
'rcode' => false
692692
];
693693
foreach ($cloneFolders as $folder) {
694-
Tdmcreate\Files\Cloner::cloneFileFolder($folder['src'], $folder['dst'], $folder['rcode'], $patKeys, $patValues);
694+
Tdmcreate\Files\CreateClone::cloneFileFolder($folder['src'], $folder['dst'], $folder['rcode'], $patKeys, $patValues);
695695
}
696696
unset($cloneFolders);
697697
}
@@ -716,7 +716,7 @@ public function setCommonFiles($module)
716716
'rcode' => true
717717
];
718718
foreach ($cloneFiles as $file) {
719-
Tdmcreate\Files\Cloner::cloneFile($file['src'] . $file['file'], $file['dst'] . $file['file'], $file['rcode'], $patKeys, $patValues);
719+
Tdmcreate\Files\CreateClone::cloneFile($file['src'] . $file['file'], $file['dst'] . $file['file'], $file['rcode'], $patKeys, $patValues);
720720
}
721721
unset($cloneFiles);
722722
}

class/Files/Cloner.php renamed to class/Files/CreateClone.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
use XoopsModules\Tdmcreate;
55

66
/**
7-
* Class Cloner
7+
* Class CreateClone
88
*/
9-
class Cloner
9+
class CreateClone
1010
{
1111
/**
1212
* Delete a file or recursively delete a directory

‎class/Files/CreateXoopsCode.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -261,7 +261,7 @@ public function getXcTextDateSelectSetVar($tableName, $tableSoleName, $fieldName
261261
$tf = Tdmcreate\Files\CreateFile::getInstance();
262262
$rightField = $tf->getRightString($fieldName);
263263
$ucfRightFiled = ucfirst($rightField);
264-
$value = "date_create_from_format(_SHORTDATESTRING, \$_POST['{$fieldName}'])";
264+
$value = "date_create_from_format(_SHORTDATESTRING, Request::getString('{$fieldName}'))";
265265
$ret = $this->getXcEqualsOperator("\${$tableSoleName}{$ucfRightFiled}", $value, null, false, $t);
266266
$ret .= $this->getXcSetVar($tableName, $fieldName, "\${$tableSoleName}{$ucfRightFiled}->getTimestamp()", $t);
267267

‎class/Files/Language/LanguageAdmin.php‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -190,17 +190,16 @@ public function getLanguageAdminClass($language, $tables, $moduleDirname)
190190

191191
switch ($fieldElement) {
192192
case 10:
193-
$ret .= $this->defines->getDefine($language, "FORM_IMAGE_LIST_{$stuTableName}", "{$fieldNameDesc} in frameworks images");
193+
$ret .= $this->defines->getDefine($language, $tableSoleName . '_' . $rpFieldName . '_UPLOADS', "{$fieldNameDesc} in frameworks images: %s");
194194
break;
195195
case 12:
196-
$ret .= $this->defines->getDefine($language, "FORM_URL_{$stuTableName}", "{$fieldNameDesc} in text url");
197-
$ret .= $this->defines->getDefine($language, 'FORM_URL_UPLOAD', "{$fieldNameDesc} in uploads files");
196+
$ret .= $this->defines->getDefine($language, $tableSoleName . '_' . $rpFieldName . '_UPLOADS', "{$fieldNameDesc} in uploads");
198197
break;
199198
case 13:
200-
$ret .= $this->defines->getDefine($language, "FORM_UPLOAD_IMAGE_{$stuTableName}", "{$fieldNameDesc} in ./uploads/{$moduleDirname}/images/{$tableName}/ :");
199+
$ret .= $this->defines->getDefine($language, $tableSoleName . '_' . $rpFieldName . '_UPLOADS', "{$fieldNameDesc} in %s :");
201200
break;
202201
case 14:
203-
$ret .= $this->defines->getDefine($language, "FORM_UPLOAD_FILE_{$stuTableName}", "{$fieldNameDesc} in ./uploads/{$moduleDirname}/files/{$tableName}/ :");
202+
$ret .= $this->defines->getDefine($language, $tableSoleName . '_' . $rpFieldName . '_UPLOADS', "{$fieldNameDesc} in %s :");
204203
break;
205204
}
206205
}
@@ -212,6 +211,7 @@ public function getLanguageAdminClass($language, $tables, $moduleDirname)
212211
$ret .= $this->defines->getDefine($language, 'FORM_UPLOAD_SIZE_MB', 'MB');
213212
$ret .= $this->defines->getDefine($language, 'FORM_UPLOAD_IMG_WIDTH', 'Max image width: ');
214213
$ret .= $this->defines->getDefine($language, 'FORM_UPLOAD_IMG_HEIGHT', 'Max image height: ');
214+
$ret .= $this->defines->getDefine($language, 'FORM_UPLOAD_URL', 'Upload new file from url: ');
215215
$ret .= $this->defines->getDefine($language, 'FORM_IMAGE_PATH', 'Files in %s :');
216216
$ret .= $this->defines->getDefine($language, 'FORM_ACTION', 'Action');
217217
$ret .= $this->defines->getDefine($language, 'FORM_EDIT', 'Modification');

‎class/Files/Templates/Admin/TemplatesAdminPages.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,8 @@ private function getTemplatesAdminPagesTableTBody($moduleDirname, $tableName, $t
153153
// Old code was <span style="background-color: #<{\$list.{$rpFieldName}}>;">...
154154
$double = $hc->getSmartyDoubleVar($tableSoleName, $rpFieldName);
155155
$span = $hc->getHtmlTag('span', [], $double);
156-
$td .= $hc->getHtmlTag('td', ['class' => 'center'], $span, false, "\t\t\t\t");
156+
$color = "<span style='background-color:{$double};'>&nbsp;&nbsp;&nbsp;&nbsp;</span>";
157+
$td .= $hc->getHtmlTag('td', ['class' => 'center'], $color, false, "\t\t\t\t");
157158
/*$ret .= <<<EOT
158159
<td class="center"><span style="background-color: #<{\$list.{$rpFieldName}}>;">&nbsp;&nbsp;&nbsp;&nbsp;</span></td>\n
159160
EOT;*/

‎class/Files/User/UserXoopsVersion.php‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -680,11 +680,8 @@ private function getXoopsVersionConfig($module, $tables, $language)
680680
'description' => "'{$language}MIMETYPES_FILE_DESC'",
681681
'formtype' => "'select_multi'",
682682
'valuetype' => "'array'",
683-
'default' => "['pdf' => 'application/pdf','zip' => 'application/zip','csv' => 'text/comma-separated-values', 'txt' => 'text/plain']",
684-
'options' => "[
685-
'pdf' => 'application/pdf','zip' => 'application/zip','csv' => 'text/comma-separated-values', 'txt' => 'text/plain', 'xml' => 'application/xml',
686-
'xlsx' => 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet', 'docx' => 'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
687-
]",
683+
'default' => "['application/pdf', 'application/zip', 'text/comma-separated-values', 'text/plain', 'image/gif', 'image/jpeg', 'image/png']",
684+
'options' => "['gif' => 'image/gif','pjpeg' => 'image/pjpeg', 'jpeg' => 'image/jpeg','jpg' => 'image/jpg','jpe' => 'image/jpe', 'png' => 'image/png', 'pdf' => 'application/pdf','zip' => 'application/zip','csv' => 'text/comma-separated-values', 'txt' => 'text/plain', 'xml' => 'application/xml', 'xlsx' => 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet', 'docx' => 'application/vnd.openxmlformats-officedocument.wordprocessingml.document']",
688685
];
689686
$ret .= $uCodeVConfig->getUserModVersionArray(2, $mimetypes_file, 'config');
690687
}

‎class/Files/admin/AdminXoopsCode.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -220,9 +220,9 @@ public function getAxcUploadImageSetVar($moduleDirname, $tableName, $fieldName,
220220
$ucfModuleDirname = ucfirst($moduleDirname);
221221
$ret = $pCodeUploadImage->getPhpCodeCommentLine('Set Var', $fieldName, $t);
222222
$ret .= $pCodeUploadImage->getPhpCodeIncludeDir('XOOPS_ROOT_PATH', 'class/uploader', true, false, '', $t);
223-
$file = $pCodeUploadImage->getPhpCodeGlobalsVariables('attachedfile', 'FILES') . "['name']";
223+
$file = $pCodeUploadImage->getPhpCodeGlobalsVariables($fieldName, 'FILES') . "['name']";
224224
$ret .= $xCodeUploadImage->getXcEqualsOperator('$filename ', $file, null, false, $t);
225-
$mimetype = $pCodeUploadImage->getPhpCodeGlobalsVariables('attachedfile', 'FILES') . "['type']";
225+
$mimetype = $pCodeUploadImage->getPhpCodeGlobalsVariables($fieldName, 'FILES') . "['type']";
226226
$ret .= $xCodeUploadImage->getXcEqualsOperator('$imgMimetype ', $mimetype, null, false, $t);
227227
$ret .= $xCodeUploadImage->getXcEqualsOperator('$imgNameDef ', "Request::getString('{$fieldMain}')", null, false, $t);
228228
$ret .= $xCodeUploadImage->getXcEqualsOperator('$uploaderErrors', "''", null, false, $t);

0 commit comments

Comments
 (0)