Skip to content

fix(tmplvars): TVフォーム生成とURL型保存処理をPHP8対応 #410

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
yama wants to merge 3 commits into
base: main
Choose a base branch
from
Open

fix(tmplvars): TVフォーム生成とURL型保存処理をPHP8対応 #410

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3a57d92
fix(tmplvars): TVフォーム生成とURL型保存処理をPHP8対応
yama Apr 26, 2026
986e4d7
fix(tmplvars): PHP8でTVフォーム生成とURL保存処理を修正
yama Apr 26, 2026
5e8b304
fix(tmplvars): URL型TVのprefix正規化を強化
yama Apr 26, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 4 additions & 8 deletions assets/modules/docmanager/classes/dm_backend.class.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,14 +184,10 @@ public function changeTemplateVariables($pids)
$typeSQL = db()->select('*', evo()->getFullTableName('site_tmplvars'), "id=" . $tvKeyName);
$row = db()->getRow($typeSQL);
if ($row['type'] === 'url') {
$tmplvar = postv("tv" . $row['id']);
if (postv("tv" . $row['id' . '_prefix']) != '--') {
$tmplvar = str_replace([
"ftp://",
"http://"
], "", $tmplvar);
$tmplvar = postv("tv" . $row['id' . '_prefix']) . $tmplvar;
}
$tmplvar = normalize_url_tv_value(
postv("tv" . $row['id']),
postv("tv" . $row['id'] . '_prefix', '--')
);
} elseif ($row['type'] === 'file') {
$tmplvar = postv("tv" . $row['id']);
} else {
Expand Down
40 changes: 38 additions & 2 deletions assets/modules/docmanager/templates/main.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,43 @@
jQuery('#workText', parent.mainMenu.document).html('');
var baseurl = '[+baseurl+]';
top.mainMenu.defaultTreeFrame();
var $j = jQuery.noConflict();
var lastImageCtrl;
var lastFileCtrl;

function OpenServerBrowser(url, width, height) {
var left = (screen.width - width) / 2;
var top = (screen.height - height) / 2;
var options = 'toolbar=no,status=no,resizable=yes,dependent=yes';
options += ',width=' + width;
options += ',height=' + height;
options += ',left=' + left;
options += ',top=' + top;
window.open(url, 'FCKBrowseWindow', options);
}

function BrowseServer(ctrl) {
lastImageCtrl = ctrl;
var width = screen.width * 0.7;
var height = screen.height * 0.7;
OpenServerBrowser(baseurl + 'manager/media/browser/mcpuk/browser.php?Type=images', width, height);
}

function BrowseFileServer(ctrl) {
lastFileCtrl = ctrl;
var width = screen.width * 0.7;
var height = screen.height * 0.7;
OpenServerBrowser(baseurl + 'manager/media/browser/mcpuk/browser.php?Type=files', width, height);
}

function SetUrl(url, width, height, alt) {
var fieldName = lastFileCtrl || lastImageCtrl;
var field = fieldName ? document.templatevariables[fieldName] : null;
if (field) {
field.value = url;
}
lastFileCtrl = '';
lastImageCtrl = '';
}

function loadTemplateVars(tplId) {
var tokenElement = document.querySelector('meta[name="csrf-token"]');
Expand Down Expand Up @@ -109,4 +145,4 @@
[+view.documents+]
</body>

</html>
</html>
Loading
Loading