Merge pull request #41 from ggoffy/master

cosmetics

Author: ggoffy

_TODO.txt

@@ -4,7 +4,7 @@ TODOs:
 Permissions:
 implement autoapprove
 
-
+check error handling for upload image list (// Set Var tf_imagelist)
 
 
 *****************************

admin/codecleaning.php

@@ -24,15 +24,18 @@
 
 use Xmf\Request;
 
+$moduleDirName      = \basename(\dirname(\dirname(__DIR__)));
+$moduleDirNameUpper = \mb_strtoupper($moduleDirName);
+
 // Define main template
-$templateMain = 'modulebuilder_index.tpl';
+$templateMain = $moduleDirName . '_index.tpl';
 
 include __DIR__ . '/header.php';
 // Recovered value of argument op in the URL $
 $op    = Request::getString('op', 'list');
 
-$src_path = TDMC_PATH ;
-$dst_path = TDMC_UPLOAD_REPOSITORY_PATH . '/codecleaned';
+$src_path = \constant($moduleDirNameUpper . '_PATH');
+$dst_path = \constant($moduleDirNameUpper . '_UPLOAD_PATH') . '/codecleaned';
 
 $patKeys   = [];
 $patValues = [];
@@ -46,7 +49,10 @@ function_qualifier($dst_path);
 
 function function_qualifier($dst_path) {
 
-    $phpFunctions = [
+    $sources = [];
+
+    //php functions
+    $sources[0] = [
         'array_diff',
         'array_filter',
         'array_key_exists',
@@ -162,12 +168,14 @@ function function_qualifier($dst_path) {
         'mb_strrpos',
     ];
 
-    $xoopsFunctions = [
+    // xoops functions
+    $sources[1] = [
         'xoops_getHandler',
         'xoops_load',
         'xoops_loadLanguage',
     ];
 
+    // repair known errors
     $errors = [
         'mb_\strlen('   => 'mb_strlen(',
         'mb_\substr('   => 'mb_substr(',
@@ -182,20 +190,17 @@ function function_qualifier($dst_path) {
     ];
 
     $patterns = [];
-    //reset existing in order to avoid double \\
-    foreach ($phpFunctions as $item) {
-        $patterns['\\' . $item . '('] = $item . '(';
-    }
-    foreach ($xoopsFunctions as $item) {
-        $patterns['\\' . $item . '('] = $item . '(';
-    }
-    //apply now for all
-    foreach ($phpFunctions as $item) {
-        $patterns[$item . '('] = '\\' . $item . '(';
-    }
-    foreach ($xoopsFunctions as $item) {
-        $patterns[$item . '('] = '\\' . $item . '(';
+    foreach ($sources as $source) {
+        //reset existing in order to avoid double \\
+        foreach ($source as $item) {
+            $patterns['\\' . $item . '('] = $item . '(';
+        }
+        //apply now for all
+        foreach ($source as $item) {
+            $patterns[$item . '('] = '\\' . $item . '(';
+        }
     }
+
     //add errors
     foreach ($errors as $key => $value) {
         $patterns[$key] = $value;
@@ -265,4 +270,3 @@ function cloneFile($src_file, $dst_file, $patKeys = [], $patValues =[])
         \copy($src_file, $dst_file);
     }
 }
-

class/Files/Language/LanguageModinfo.php

@@ -312,9 +312,9 @@ private function getLanguageConfig($language, $tables)
             $ret .= $this->ld->getDefine($language, 'MIMETYPES_IMAGE', 'Mime types image');
             $ret .= $this->ld->getDefine($language, 'MIMETYPES_IMAGE_DESC', 'Define the allowed mime types for uploading images');
             $ret .= $this->ld->getDefine($language, 'MAXWIDTH_IMAGE', 'Max width image');
-            $ret .= $this->ld->getDefine($language, 'MAXWIDTH_IMAGE_DESC', 'Set the max width which is allowed for uploading images (in pixel)<br>0 means that images keep original size<br>If original image is smaller the image will be not enlarged');
+            $ret .= $this->ld->getDefine($language, 'MAXWIDTH_IMAGE_DESC', 'Set the max width to which uploaded images should be scaled (in pixel)<br>0 means, that images keeps the original size. <br>If an image is smaller than maximum value then the image will be not enlarge, it will be save in original width.');
             $ret .= $this->ld->getDefine($language, 'MAXHEIGHT_IMAGE', 'Max height image');
-            $ret .= $this->ld->getDefine($language, 'MAXHEIGHT_IMAGE_DESC', 'Set the max height which is allowed for uploading images (in pixel)<br>0 means that images keep original size<br>If original image is smaller the image will be not enlarged');
+            $ret .= $this->ld->getDefine($language, 'MAXHEIGHT_IMAGE_DESC', 'Set the max height to which uploaded images should be scaled (in pixel)<br>0 means, that images keeps the original size. <br>If an image is smaller than maximum value then the image will be not enlarge, it will be save in original height');
         }
 		if ($fieldFile) {
             $ret .= $this->ld->getDefine($language, 'MAXSIZE_FILE', 'Max size file');

class/Files/User/UserXoopsVersion.php

@@ -740,7 +740,7 @@ private function getXoopsVersionConfig($module, $tables, $language)
                 'description' => "'{$language}MAXWIDTH_IMAGE_DESC'",
                 'formtype'    => "'textbox'",
                 'valuetype'   => "'int'",
-                'default'     => '8000',
+                'default'     => '800',
             ];
             $ret .= $this->uxc->getUserModVersionArray(2, $maxwidth_image, 'config');
             $maxheight_image   = [
@@ -749,7 +749,7 @@ private function getXoopsVersionConfig($module, $tables, $language)
                 'description' => "'{$language}MAXHEIGHT_IMAGE_DESC'",
                 'formtype'    => "'textbox'",
                 'valuetype'   => "'int'",
-                'default'     => '8000',
+                'default'     => '800',
             ];
             $ret .= $this->uxc->getUserModVersionArray(2, $maxheight_image, 'config');
         }

files/commonfiles/class/Common/XoopsConfirm.php

@@ -87,8 +87,8 @@ public function getFormXoopsConfirm()
         }
         $form->addElement(new \XoopsFormHidden('ok', 1));
         $buttonTray = new \XoopsFormElementTray('');
-        $buttonTray->addElement(new \XoopsFormButton('', 'confirm_submit', _YES, 'submit', false));
-        $buttonBack = new \XoopsFormButton('', 'confirm_back', _NO, 'button', false);
+        $buttonTray->addElement(new \XoopsFormButton('', 'confirm_submit', _YES, 'submit'));
+        $buttonBack = new \XoopsFormButton('', 'confirm_back', _NO, 'button');
         $buttonBack->setExtra('onclick="history.go(-1);return true;"');
         $buttonTray->addElement($buttonBack);
         $form->addElement($buttonTray);