Menu
▾
▴
[xoops-svn] SF.net SVN: xoops-svn:[12460] XoopsModules/wfdownloads/branches/mamba/ wfdownloads
|
From: <luc...@us...> - 2014-04-18 16:11:15
|
Revision: 12460
http://sourceforge.net/p/xoops/svn/12460
Author: luciorota
Date: 2014-04-18 16:11:12 +0000 (Fri, 18 Apr 2014)
Log Message:
-----------
fixed bug when using formulize
Modified Paths:
--------------
XoopsModules/wfdownloads/branches/mamba/wfdownloads/admin/categories.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/admin/downloads.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/category.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/download.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/submit.php
XoopsModules/wfdownloads/branches/mamba/wfdownloads/templates/wfdownloads_common_breadcrumb.html
XoopsModules/wfdownloads/branches/mamba/wfdownloads/xoops_version.php
Modified: XoopsModules/wfdownloads/branches/mamba/wfdownloads/admin/categories.php
===================================================================
--- XoopsModules/wfdownloads/branches/mamba/wfdownloads/admin/categories.php 2014-04-18 16:03:16 UTC (rev 12459)
+++ XoopsModules/wfdownloads/branches/mamba/wfdownloads/admin/categories.php 2014-04-18 16:11:12 UTC (rev 12460)
@@ -99,7 +99,7 @@
$imgurl = (isset($_POST["imgurl"]) && $_POST["imgurl"] != "blank.png") ? $myts -> addslashes($_POST["imgurl"]) : "";
}
// Formulize module support (2006/05/04) jpc
- if (wfdownloads_checkModule('formulize') < 300) {
+ if (wfdownloads_checkModule('formulize')) {
$formulize_fid = (isset($_POST["formulize_fid"])) ? (int) $_POST["formulize_fid"] : 0;
}
Modified: XoopsModules/wfdownloads/branches/mamba/wfdownloads/admin/downloads.php
===================================================================
--- XoopsModules/wfdownloads/branches/mamba/wfdownloads/admin/downloads.php 2014-04-18 16:03:16 UTC (rev 12459)
+++ XoopsModules/wfdownloads/branches/mamba/wfdownloads/admin/downloads.php 2014-04-18 16:11:12 UTC (rev 12460)
@@ -84,7 +84,7 @@
$customArray['fid'] = $fid;
$customArray['formulize_mgr'] =& xoops_getmodulehandler('elements', 'formulize');
$customArray['groups'] = $xoopsUser ? $xoopsUser->getGroups() : array(0 => XOOPS_GROUP_ANONYMOUS);
- $customArray['prevEntry'] = getEntryValues(
+ $customArray['prevEntry'] = getEntryValues( // is a 'formulize' function
$download->getVar('formulize_idreq'),
$customArray['formulize_mgr'],
$customArray['groups'],
@@ -94,9 +94,9 @@
$customArray['go_back'] = "";
$customArray['parentLinks'] = "";
if (wfdownloads_checkModule('formulize') < 300) {
- $owner = getEntryOwner($entry);
+ $owner = getEntryOwner($entry); // is a 'formulize' function
} else {
- $owner = getEntryOwner($entry, $fid);
+ $owner = getEntryOwner($entry, $fid); // is a 'formulize' function
}
$ownerGroups = $member_handler->getGroupsByUser($owner, false);
$customArray['owner_groups'] = $ownerGroups;
@@ -420,9 +420,9 @@
$entries[$fid][0] = $download->getVar('formulize_idreq');
if ($entries[$fid][0]) {
if (wfdownloads_checkModule('formulize') < 300) {
- $owner = getEntryOwner($entries[$fid][0]);
+ $owner = getEntryOwner($entries[$fid][0]); // is a 'formulize' function
} else {
- $owner = getEntryOwner($entries[$fid][0], $fid);
+ $owner = getEntryOwner($entries[$fid][0], $fid); // is a 'formulize' function
}
} else {
print "no idreq";
Modified: XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/category.php
===================================================================
--- XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/category.php 2014-04-18 16:03:16 UTC (rev 12459)
+++ XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/category.php 2014-04-18 16:11:12 UTC (rev 12460)
@@ -169,11 +169,11 @@
if (wfdownloads_checkModule('formulize')) {
if (file_exists(XOOPS_ROOT_PATH . "/modules/formulize/include/functions.php")) {
include_once XOOPS_ROOT_PATH . "/modules/formulize/include/functions.php";
- $fids = allowedForms();
+ $fids = allowedForms(); // is a 'formulize' function
$fids_select = array();
$fids_select[0] = _AM_WFDOWNLOADS_FFS_STANDARD_FORM;
foreach ($fids as $fid) {
- $fids_select[$fid] = getFormTitle($fid);
+ $fids_select[$fid] = getFormTitle($fid); // is a 'formulize' function
}
$formulize_forms = new XoopsFormSelect(_AM_WFDOWNLOADS_FFS_CUSTOM_FORM, "formulize_fid", $this->getVar('formulize_fid'));
Modified: XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/download.php
===================================================================
--- XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/download.php 2014-04-18 16:03:16 UTC (rev 12459)
+++ XoopsModules/wfdownloads/branches/mamba/wfdownloads/class/download.php 2014-04-18 16:11:12 UTC (rev 12460)
@@ -625,17 +625,23 @@
true
);
$sform->addElement(new XoopsFormHidden('size', $this->getVar('size', 'e')));
- $sform = compileElements(
- $customArray['fid'],
- $sform,
- $customArray['formulize_mgr'],
- $customArray['prevEntry'],
- $customArray['entry'],
- $customArray['go_back'],
- $customArray['parentLinks'],
- $customArray['owner_groups'],
- $customArray['groups']
- );
+ if (wfdownloads_checkModule('formulize')) {
+ include_once XOOPS_ROOT_PATH . "/modules/formulize/include/formdisplay.php";
+ include_once XOOPS_ROOT_PATH . "/modules/formulize/include/functions.php";
+ $sform = compileElements( // is a 'formulize' function
+ $customArray['fid'],
+ $sform,
+ $customArray['formulize_mgr'],
+ $customArray['prevEntry'],
+ $customArray['entry'],
+ $customArray['go_back'],
+ $customArray['parentLinks'],
+ $customArray['owner_groups'],
+ $customArray['groups']
+ );
+ } else {
+ // IN PROGRESS... formulize module not installed!!!
+ }
}
// download: dhistory
$sform->addElement(new XoopsFormTextArea(_MD_WFDOWNLOADS_HISTORYC, 'dhistory', $this->getVar('dhistory', 'e'), 7, 60), false);
@@ -884,7 +890,6 @@
);
} else {
// if we are using a custom form, then add in the form's elements here
-
// download: description
$description_tray = new XoopsFormElementTray(_MD_WFDOWNLOADS_DESCRIPTION, '<br />');
$options['name'] = 'description';
@@ -900,17 +905,23 @@
$sform->addElement($description_tray);
// download: size
$sform->addElement(new XoopsFormHidden('size', $this->getVar('size', 'e')));
- $sform = compileElements(
- $customArray['fid'],
- $sform,
- $customArray['formulize_mgr'],
- $customArray['prevEntry'],
- $customArray['entry'],
- $customArray['go_back'],
- $customArray['parentLinks'],
- $customArray['owner_groups'],
- $customArray['groups']
- );
+ if (wfdownloads_checkModule('formulize')) {
+ include_once XOOPS_ROOT_PATH . "/modules/formulize/include/formdisplay.php";
+ include_once XOOPS_ROOT_PATH . "/modules/formulize/include/functions.php";
+ $sform = compileElements( // is a 'formulize' function
+ $customArray['fid'],
+ $sform,
+ $customArray['formulize_mgr'],
+ $customArray['prevEntry'],
+ $customArray['entry'],
+ $customArray['go_back'],
+ $customArray['parentLinks'],
+ $customArray['owner_groups'],
+ $customArray['groups']
+ );
+ } else {
+ // IN PROGRESS... formulize module not installed!!!
+ }
}
// download: dhistory
$sform->addElement(new XoopsFormTextArea(_AM_WFDOWNLOADS_FILE_HISTORY, 'dhistory', $this->getVar('dhistory', 'e'), 7, 60), false);
Modified: XoopsModules/wfdownloads/branches/mamba/wfdownloads/submit.php
===================================================================
--- XoopsModules/wfdownloads/branches/mamba/wfdownloads/submit.php 2014-04-18 16:03:16 UTC (rev 12459)
+++ XoopsModules/wfdownloads/branches/mamba/wfdownloads/submit.php 2014-04-18 16:11:12 UTC (rev 12460)
@@ -144,7 +144,7 @@
$customArray['fid'] = $fid;
$customArray['formulize_mgr'] = xoops_getmodulehandler('elements', 'formulize');
$customArray['groups'] = $xoopsUser ? $xoopsUser->getGroups() : array(0 => XOOPS_GROUP_ANONYMOUS);
- $customArray['prevEntry'] = getEntryValues(
+ $customArray['prevEntry'] = getEntryValues( // is a 'formulize' function
$download->getVar('formulize_idreq'),
$customArray['formulize_mgr'],
$customArray['groups'],
@@ -154,9 +154,9 @@
$customArray['go_back'] = '';
$customArray['parentLinks'] = '';
if (wfdownloads_checkModule('formulize') < 300) {
- $owner = getEntryOwner($entry);
+ $owner = getEntryOwner($entry); // is a 'formulize' function
} else {
- $owner = getEntryOwner($entry, $fid);
+ $owner = getEntryOwner($entry, $fid); // is a 'formulize' function
}
$owner_groups = $member_handler->getGroupsByUser($owner, false);
$customArray['owner_groups'] = $owner_groups;
Modified: XoopsModules/wfdownloads/branches/mamba/wfdownloads/templates/wfdownloads_common_breadcrumb.html
===================================================================
--- XoopsModules/wfdownloads/branches/mamba/wfdownloads/templates/wfdownloads_common_breadcrumb.html 2014-04-18 16:03:16 UTC (rev 12459)
+++ XoopsModules/wfdownloads/branches/mamba/wfdownloads/templates/wfdownloads_common_breadcrumb.html 2014-04-18 16:11:12 UTC (rev 12460)
@@ -12,6 +12,5 @@
<span class="delimiter">></span>
<{/if}>
<{/foreach}>
- <hr/>
</div>
</div>
Modified: XoopsModules/wfdownloads/branches/mamba/wfdownloads/xoops_version.php
===================================================================
--- XoopsModules/wfdownloads/branches/mamba/wfdownloads/xoops_version.php 2014-04-18 16:03:16 UTC (rev 12459)
+++ XoopsModules/wfdownloads/branches/mamba/wfdownloads/xoops_version.php 2014-04-18 16:11:12 UTC (rev 12460)
@@ -42,9 +42,9 @@
$modversion['onUpdate'] = 'include/module.php';
$modversion['onUninstall'] = 'include/module.php';
-$modversion['date'] = '2014-04-14';
-$modversion['release_date'] = '2014/04/14';
-$modversion['releasedate'] = '2014-04-14';
+$modversion['date'] = '2014-04-18';
+$modversion['release_date'] = '2014/04/18';
+$modversion['releasedate'] = '2014-04-18';
$modversion['status'] = 'RC1';
$modversion['teammembers'] = "Bender, David, FrankBlack, Xpider, M0nty, Mithrandir, Marcan, felix[fx2024], Sudhaker, Jegelstaff";
|
