Merge pull request #2114 from yama/1.4.x-refactor

1.4.x refactor
evolution-cms · Jan 5, 2023 · 4f1f111 · 4f1f111
2 parents ab762ef + 2e92305
commit 4f1f111
Show file tree

Hide file tree

Showing 7 changed files with 475 additions and 472 deletions.
diff --git a/assets/modules/docmanager/tv.ajax.php b/assets/modules/docmanager/tv.ajax.php
@@ -150,7 +150,7 @@ function renderFormElement($field_type, $field_id, $default_text, $field_element
                 if (strlen($itemvalue) == 0) {
                     $itemvalue = $item;
                 }
-                $field_html .= '<input type="checkbox" value="' . htmlspecialchars($itemvalue) . '" id="tv_' . $i . '" name="tv' . $field_id . '[]" ' . (in_array($itemvalue, $field_value) ? " checked='checked'" : "") . ' onchange="documentDirty=true;" /><label for="tv_' . $i . '">' . $item . '</label><br />';
+                $field_html .= '<input type="checkbox" value="' . htmlspecialchars($itemvalue) . '" id="tv_' . $field_id . '" name="tv' . $field_id . '[]" ' . (in_array($itemvalue, $field_value) ? " checked='checked'" : "") . ' onchange="documentDirty=true;" /><label for="tv_' . $i . '">' . $item . '</label><br />';
                 $i++;
             }
             break;
@@ -183,21 +183,21 @@ function OpenServerBrowser(url, width, height ) {
 							sOptions += ',top=' + iTop ;
 
 							var oWindow = window.open( url, 'FCKBrowseWindow', sOptions ) ;
-						}			
+						}
 						function BrowseServer(ctrl) {
 							lastImageCtrl = ctrl;
 							var w = screen.width * 0.7;
 							var h = screen.height * 0.7;
 							OpenServerBrowser('media/browser/{$which_browser}/browser.php?Type=images', w, h);
 						}
-						
+
 						function BrowseFileServer(ctrl) {
 							lastFileCtrl = ctrl;
 							var w = screen.width * 0.7;
 							var h = screen.height * 0.7;
 							OpenServerBrowser('media/browser/{$which_browser}/browser.php?Type=files', w, h);
 						}
-						
+
 						function SetUrl(url, width, height, alt){
 							if(lastFileCtrl) {
 								var c = document.templatevariables[lastFileCtrl];
@@ -238,21 +238,21 @@ function OpenServerBrowser(url, width, height ) {
 
 							var oWindow = window.open( url, 'FCKBrowseWindow', sOptions ) ;
 						}
-						
+
 							function BrowseServer(ctrl) {
 							lastImageCtrl = ctrl;
 							var w = screen.width * 0.7;
 							var h = screen.height * 0.7;
 							OpenServerBrowser('media/browser/{$which_browser}/browser.php?Type=images', w, h);
 						}
-									
+
 						function BrowseFileServer(ctrl) {
 							lastFileCtrl = ctrl;
 							var w = screen.width * 0.7;
 							var h = screen.height * 0.7;
 							OpenServerBrowser('media/browser/{$which_browser}/browser.php?Type=files', w, h);
 						}
-						
+
 						function SetUrl(url, width, height, alt){
 							if(lastFileCtrl) {
 								var c = document.templatevariables[lastFileCtrl];