Menu
▾
▴
xoops-svn — All SVN commits will be posted to this ML
You can subscribe to this list here.
| 2012 |
Jan
|
Feb
(214) |
Mar
(139) |
Apr
(198) |
May
(187) |
Jun
(151) |
Jul
(210) |
Aug
(169) |
Sep
(58) |
Oct
(53) |
Nov
(54) |
Dec
(301) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2013 |
Jan
(348) |
Feb
(178) |
Mar
(219) |
Apr
(154) |
May
(117) |
Jun
(194) |
Jul
(61) |
Aug
(132) |
Sep
(121) |
Oct
(110) |
Nov
(11) |
Dec
(18) |
| 2014 |
Jan
(34) |
Feb
(50) |
Mar
(82) |
Apr
(98) |
May
(39) |
Jun
(111) |
Jul
(67) |
Aug
(36) |
Sep
(33) |
Oct
(26) |
Nov
(53) |
Dec
(44) |
| 2015 |
Jan
(29) |
Feb
(47) |
Mar
(25) |
Apr
(19) |
May
(23) |
Jun
(20) |
Jul
(49) |
Aug
(7) |
Sep
(10) |
Oct
(10) |
Nov
(4) |
Dec
(25) |
| 2016 |
Jan
(8) |
Feb
(7) |
Mar
(1) |
Apr
|
May
(3) |
Jun
|
Jul
(1) |
Aug
(2) |
Sep
|
Oct
|
Nov
(7) |
Dec
(5) |
| 2017 |
Jan
(4) |
Feb
|
Mar
|
Apr
|
May
(15) |
Jun
|
Jul
(18) |
Aug
(24) |
Sep
|
Oct
(14) |
Nov
|
Dec
|
| 2018 |
Jan
|
Feb
(22) |
Mar
|
Apr
(11) |
May
(1) |
Jun
(17) |
Jul
(2) |
Aug
(2) |
Sep
|
Oct
(6) |
Nov
(5) |
Dec
|
| 2019 |
Jan
|
Feb
|
Mar
|
Apr
(1) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(2) |
| 2025 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(2) |
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <al...@us...> - 2013-10-09 18:17:19
|
Revision: 12167
http://sourceforge.net/p/xoops/svn/12167
Author: alain91
Date: 2013-10-09 18:17:16 +0000 (Wed, 09 Oct 2013)
Log Message:
-----------
files are now on github
Removed Paths:
-------------
XoopsCore/branches/2.6.x/2.6.0_alain091/UnitTestXoops/
|
|
From: <luc...@us...> - 2013-10-08 18:25:03
|
Revision: 12166
http://sourceforge.net/p/xoops/svn/12166
Author: luciorota
Date: 2013-10-08 18:24:57 +0000 (Tue, 08 Oct 2013)
Log Message:
-----------
added: html or plain text auto summary
Modified Paths:
--------------
XoopsModules/wfdownloads/trunk/wfdownloads/admin/reportsmodifications.php
XoopsModules/wfdownloads/trunk/wfdownloads/class/download.php
XoopsModules/wfdownloads/trunk/wfdownloads/docs/changelog.txt
XoopsModules/wfdownloads/trunk/wfdownloads/include/functions.php
XoopsModules/wfdownloads/trunk/wfdownloads/language/english/modinfo.php
XoopsModules/wfdownloads/trunk/wfdownloads/xoops_version.php
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/admin/reportsmodifications.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/admin/reportsmodifications.php 2013-10-08 12:12:22 UTC (rev 12165)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/admin/reportsmodifications.php 2013-10-08 18:24:57 UTC (rev 12166)
@@ -62,10 +62,8 @@
break;
case "modification.show":
- wfdownloads_xoops_cp_header();
+ $requestid = WfdownloadsRequest::getInt('requestid', 0);
- $requestid = intval($_GET['requestid']);
-
$modification = $wfdownloads->getHandler('modification')->get($requestid);
$download = $wfdownloads->getHandler('download')->get($modification->getVar('lid'));
@@ -73,6 +71,7 @@
$submittername = XoopsUserUtility::getUnameFromId($download->getVar('submitter')); // $orig_user->getvar("uname");
$submitteremail = $orig_user->getVar('email');
+ wfdownloads_xoops_cp_header();
echo "<div><b>" . _AM_WFDOWNLOADS_MOD_MODPOSTER . "</b> $submittername</div>";
$not_allowed = array('lid', 'submitter', 'requestid', 'modifysubmitter');
@@ -233,10 +232,8 @@
case "modification.change":
/* Added by Lankford on 2007/3/21 */
- //Get a pointer to the download record and the modification record, then compare
- //their 'versions' to see if they are different. If they are, then raise filemodify
- //events.
- $requestid = intval($_POST['requestid']);
+ // Get a pointer to the download record and the modification record, then compare their 'versions' to see if they are different. If they are, then raise filemodify events.
+ $requestid = WfdownloadsRequest::getInt('requestid', 0, 'POST');
$modification = $wfdownloads->getHandler('modification')->get($requestid);
$download = $wfdownloads->getHandler('download')->get($modification->getVar('lid'));
@@ -275,7 +272,9 @@
break;
case "modification.ignore":
- $criteria = new Criteria('requestid', intval($_POST['requestid']));
+ $requestid = WfdownloadsRequest::getInt('requestid', 0, 'POST');
+
+ $criteria = new Criteria('requestid', $requestid);
$wfdownloads->getHandler('modification')->deleteAll($criteria, true);
redirect_header(WFDOWNLOADS_URL . '/admin/index.php', 1, _AM_WFDOWNLOADS_MOD_REQDELETED);
break;
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/class/download.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/class/download.php 2013-10-08 12:12:22 UTC (rev 12165)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/class/download.php 2013-10-08 18:24:57 UTC (rev 12166)
@@ -319,22 +319,24 @@
if (($this->wfdownloads->getConfig('autosummary') == _WFDOWNLOADS_AUTOSUMMARY_YES)
|| ($this->wfdownloads->getConfig('autosummary') == _WFDOWNLOADS_AUTOSUMMARY_IFBLANK && empty($summary))
) {
- // generate autosummary
- $maxSummaryLength = (int)$this->wfdownloads->getConfig('autosumlength');
-
+ // generate auto summary from description field
+ $download['summary'] = $this->getVar('description');
+ // patch for multilanguage summary if xlanguage module is installed
if (wfdownloads_checkModule('xlanguage')) {
global $xlanguage;
include_once(XOOPS_ROOT_PATH . '/modules/xlanguage/include/vars.php');
include_once(XOOPS_ROOT_PATH . '/modules/xlanguage/include/functions.php');
- $download['summary'] = xlanguage_ml($this->getVar('description'));
- } else {
- $download['summary'] = $this->getVar('description');
+ $download['summary'] = xlanguage_ml($download['summary']);
}
- if (strlen($download['summary']) > $maxSummaryLength) {
- $download['summary'] = wfdownloads_truncateHtml($download['summary'], $maxSummaryLength, '...', false, true);
- } else {
- // NOP
+ // html or plain text auto summary
+ if ($this->wfdownloads->getConfig('autosumplaintext')) {
+ $download['summary'] = strip_tags($download['summary'], "<br><br />");
}
+ // truncate auto summary
+ $autosumLength = (int) $this->wfdownloads->getConfig('autosumlength');
+ if (strlen($download['summary']) > $autosumLength) {
+ $download['summary'] = wfdownloads_truncateHtml($download['summary'], $autosumLength, '...', false, true);
+ }
} else {
$download['summary'] = $summary;
}
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/docs/changelog.txt
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/docs/changelog.txt 2013-10-08 12:12:22 UTC (rev 12165)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/docs/changelog.txt 2013-10-08 18:24:57 UTC (rev 12166)
@@ -1,4 +1,4 @@
-<b><u>=> Version 3.23 Beta (2013-10-05)</u></b>
+<b><u>=> Version 3.23 Beta (2013-10-08)</u></b>
- standardization of English language files (cesag)
- fixed: typos in english folder (cesag)
- module standardization: header.php, admin/admin_header.php, xoops_version.php
@@ -20,8 +20,10 @@
- added: enable/disable brokens reports system (luciorota)
- added: admin side downloads filter (luciorota)
- added: breadcrumb class (luciorota)
-- added: new autosummary option: autosummary if summary field is empty (luciorota)
-- added: xoops/xlanguage/html tags compatible autosummary generator (luciorota)
+- added: new auto summary option: auto summary if summary field is empty (luciorota)
+- added: new auto summary option: plain text or html auto summary (luciorota)
+- added: xoops/xlanguage/html tags compatible auto summary generator (luciorota)
+
- added: sort subcategories by cid or title or weight (luciorota)
- added: improved by letters choice bar (luciorota)
- added: wfdownloads_submit.html template for submit.php (luciorota)
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/include/functions.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/include/functions.php 2013-10-08 12:12:22 UTC (rev 12165)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/include/functions.php 2013-10-08 18:24:57 UTC (rev 12166)
@@ -50,7 +50,7 @@
function wfdownloads_bytesToSize1024($bytes, $precision = 2)
{
// human readable format -- powers of 1024
- $unit = array('B', 'KB', 'MB', 'GB', 'TB', 'PB', 'EB');
+ $unit = array('B', 'kB', 'MB', 'GB', 'TB', 'PB', 'EB');
return @round(
$bytes / pow(1024, ($i = floor(log($bytes, 1024)))),
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/language/english/modinfo.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/language/english/modinfo.php 2013-10-08 12:12:22 UTC (rev 12165)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/language/english/modinfo.php 2013-10-08 18:24:57 UTC (rev 12166)
@@ -99,7 +99,7 @@
define('_MI_WFDOWNLOADS_IMGHEIGHTDSC', "Maximum image height permitted when uploading image files.");
define('_MI_WFDOWNLOADS_AUTOSUMMARY', "[auto summary] Enable download auto summary");
define('_MI_WFDOWNLOADS_AUTOSUMMARYDESC', "Automatically create download summary based on x amount of characters defined.");
-define('_MI_WFDOWNLOADS_AUTOSUMMARYLENGTH', "[auto summary] Summary length");
+define('_MI_WFDOWNLOADS_AUTOSUMMARYLENGTH', "[auto summary] Auto summary length");
define('_MI_WFDOWNLOADS_AUTOSUMMARYLENGTHDESC', "The maximum amount of characters displayed for the summary.");
define('_MI_WFDOWNLOADS_UPLOADDIR', "[upload files] Upload directory");
define('_MI_WFDOWNLOADS_UPLOADDIRDSC', "Upload directory *MUST* be an absolute path! <br />No trailing slash.");
@@ -334,5 +334,8 @@
define('_MI_WFDOWNLOADS_AUTOSUMMARY2', "If blank");
define('_MI_WFDOWNLOADS_AUTOSUMMARY3', _YES);
+define('_MI_WFDOWNLOADS_AUTOSUMMARYPLAINTEXT', "[auto summary] Auto summary plain text");
+define('_MI_WFDOWNLOADS_AUTOSUMMARYPLAINTEXTDESC', "If '" . _YES . "' all html tags, except <br>, will be removed.");
+
define('_MI_WFDOWNLOADS_DISCLAIMER_DEFAULT', 'We have the right, but not the obligation to monitor and review submissions submitted by users, in the forums. We shall not be responsible for any of the content of these messages. We further reserve the right, to delete, move or edit submissions that the we, in its exclusive discretion, deems abusive, defamatory, obscene or in violation of any Copyright or Trademark laws or otherwise objectionable.');
define('_MI_WFDOWNLOADS_DOWNDISCLAIMER_DEFAULT', 'The file downloads on this site are provided as is without warranty either expressed or implied. Downloaded files should be checked for possible virus infection using the most up-to-date detection and security packages. If you have a question concerning a particular piece of software, feel free to contact the developer. We refuse liability for any damage or loss resulting from the use or misuse of any software offered from this site for downloading. If you have any doubt at all about the safety and operation of software made available to you on this site, do not download it.<br /><br />Contact us if you have questions concerning this disclaimer.');
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/xoops_version.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/xoops_version.php 2013-10-08 12:12:22 UTC (rev 12165)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/xoops_version.php 2013-10-08 18:24:57 UTC (rev 12166)
@@ -42,9 +42,9 @@
$modversion['onUpdate'] = 'include/module.php';
$modversion['onUninstall'] = 'include/module.php';
-$modversion['date'] = '2013-10-05';
-$modversion['release_date'] = '2013/10/05';
-$modversion['releasedate'] = '2013-10-05';
+$modversion['date'] = '2013-10-08';
+$modversion['release_date'] = '2013/10/08';
+$modversion['releasedate'] = '2013-10-08';
$modversion['status'] = 'BETA 1';
$modversion['teammembers'] = "Bender, David, FrankBlack, Xpider, M0nty, Mithrandir, Marcan, felix[fx2024], Sudhaker, Jegelstaff";
@@ -887,16 +887,7 @@
'default' => 'title ASC'
);
-/*
$modversion['config'][] = array(
- 'name' => 'autosummary',
- 'title' => '_MI_WFDOWNLOADS_AUTOSUMMARY',
- 'description' => '_MI_WFDOWNLOADS_AUTOSUMMARYDESC',
- 'formtype' => 'yesno',
- 'valuetype' => 'int',
- 'default' => true);
-*/
-$modversion['config'][] = array(
'name' => 'autosummary',
'title' => '_MI_WFDOWNLOADS_AUTOSUMMARY',
'description' => '_MI_WFDOWNLOADS_AUTOSUMMARYDESC',
@@ -920,6 +911,16 @@
);
$modversion['config'][] = array(
+ 'name' => 'autosumplaintext',
+ 'title' => '_MI_WFDOWNLOADS_AUTOSUMMARYPLAINTEXT',
+ 'description' => '_MI_WFDOWNLOADS_AUTOSUMMARYPLAINTEXTDESC',
+ 'formtype' => 'yesno',
+ 'valuetype' => 'int',
+ 'default' => true
+);
+
+
+$modversion['config'][] = array(
'name' => 'platform',
'title' => '_MI_WFDOWNLOADS_PLATFORM',
'description' => '_MI_WFDOWNLOADS_PLATFORMDSC',
|
|
From: <be...@us...> - 2013-10-08 12:12:25
|
Revision: 12165
http://sourceforge.net/p/xoops/svn/12165
Author: beckmi
Date: 2013-10-08 12:12:22 +0000 (Tue, 08 Oct 2013)
Log Message:
-----------
Module standardization
Modified Paths:
--------------
XoopsModules/contact/trunk/contact/admin/about.php
XoopsModules/contact/trunk/contact/admin/contact.php
XoopsModules/contact/trunk/contact/admin/index.php
XoopsModules/contact/trunk/contact/admin/log.php
XoopsModules/contact/trunk/contact/admin/menu.php
XoopsModules/contact/trunk/contact/admin/tools.php
XoopsModules/contact/trunk/contact/include/functions_update.php
XoopsModules/contact/trunk/contact/xoops_version.php
Added Paths:
-----------
XoopsModules/contact/trunk/contact/admin/admin_footer.php
XoopsModules/contact/trunk/contact/admin/admin_header.php
Removed Paths:
-------------
XoopsModules/contact/trunk/contact/admin/footer.php
XoopsModules/contact/trunk/contact/admin/header.php
Modified: XoopsModules/contact/trunk/contact/admin/about.php
===================================================================
--- XoopsModules/contact/trunk/contact/admin/about.php 2013-10-08 11:14:45 UTC (rev 12164)
+++ XoopsModules/contact/trunk/contact/admin/about.php 2013-10-08 12:12:22 UTC (rev 12165)
@@ -21,7 +21,7 @@
*/
// Call header
-require dirname(__FILE__) . '/header.php';
+require dirname(__FILE__) . '/admin_header.php';
// Display Admin header
xoops_cp_header();
@@ -31,4 +31,4 @@
// Call template file
$xoopsTpl->display(XOOPS_ROOT_PATH . '/modules/contact/templates/admin/contact_about.html');
// Call footer
-require dirname(__FILE__) . '/footer.php';
+require dirname(__FILE__) . '/admin_footer.php';
Added: XoopsModules/contact/trunk/contact/admin/admin_footer.php
===================================================================
--- XoopsModules/contact/trunk/contact/admin/admin_footer.php (rev 0)
+++ XoopsModules/contact/trunk/contact/admin/admin_footer.php 2013-10-08 12:12:22 UTC (rev 12165)
@@ -0,0 +1,23 @@
+<?php
+/*
+ You may not change or alter any portion of this comment or credits
+ of supporting developers from this source code or any supporting source code
+ which is considered copyrighted (c) material of the original comment or credit authors.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+*/
+
+/**
+ * Contact module
+ *
+ * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license http://www.fsf.org/copyleft/gpl.html GNU public license
+ * @author Kazumi Ono (aka Onokazu)
+ * @author Trabis <lus...@gm...>
+ * @author Hossein Azizabadi (AKA Voltan)
+ * @version $Id$
+ */
+
+xoops_cp_footer();
Property changes on: XoopsModules/contact/trunk/contact/admin/admin_footer.php
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Rev URL
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: XoopsModules/contact/trunk/contact/admin/admin_header.php
===================================================================
--- XoopsModules/contact/trunk/contact/admin/admin_header.php (rev 0)
+++ XoopsModules/contact/trunk/contact/admin/admin_header.php 2013-10-08 12:12:22 UTC (rev 12165)
@@ -0,0 +1,46 @@
+<?php
+/*
+ You may not change or alter any portion of this comment or credits
+ of supporting developers from this source code or any supporting source code
+ which is considered copyrighted (c) material of the original comment or credit authors.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+*/
+
+/**
+ * Contact module
+ *
+ * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license http://www.fsf.org/copyleft/gpl.html GNU public license
+ * @author Kazumi Ono (aka Onokazu)
+ * @author Trabis <lus...@gm...>
+ * @author Hossein Azizabadi (AKA Voltan)
+ * @version $Id$
+ */
+
+$path = dirname(dirname(dirname(dirname(__FILE__))));
+
+include_once $path . '/mainfile.php';
+include_once XOOPS_ROOT_PATH . '/include/cp_functions.php';
+include_once XOOPS_ROOT_PATH . '/include/cp_header.php';
+include_once XOOPS_ROOT_PATH . '/class/pagenav.php';
+include_once XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
+global $xoopsModule;
+
+$thisModuleDir = $GLOBALS['xoopsModule']->getVar('dirname');
+
+// Load language files
+xoops_loadLanguage('admin', $thisModuleDir);
+xoops_loadLanguage('modinfo', $thisModuleDir);
+xoops_loadLanguage('main', $thisModuleDir);
+
+$pathIcon16 = XOOPS_URL . '/' . $xoopsModule->getInfo('icons16');
+$pathIcon32 = XOOPS_URL . '/' . $xoopsModule->getInfo('icons32');
+$pathModuleAdmin = XOOPS_ROOT_PATH . '/' . $xoopsModule->getInfo('dirmoduleadmin');
+require_once $pathModuleAdmin . '/moduleadmin/moduleadmin.php';
+$admin_class = new ModuleAdmin();
+
+// Contact Handler
+$contact_handler = & xoops_getModuleHandler('contact', 'contact');
Property changes on: XoopsModules/contact/trunk/contact/admin/admin_header.php
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Rev URL
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: XoopsModules/contact/trunk/contact/admin/contact.php
===================================================================
--- XoopsModules/contact/trunk/contact/admin/contact.php 2013-10-08 11:14:45 UTC (rev 12164)
+++ XoopsModules/contact/trunk/contact/admin/contact.php 2013-10-08 12:12:22 UTC (rev 12165)
@@ -21,7 +21,7 @@
*/
// Call header
-require dirname(__FILE__) . '/header.php';
+require dirname(__FILE__) . '/admin_header.php';
// Display Admin header
xoops_cp_header();
// Define default value
@@ -203,4 +203,4 @@
// Call template file
$xoopsTpl->display(XOOPS_ROOT_PATH . '/modules/contact/templates/admin/contact_contact.html');
// Call footer
-require dirname(__FILE__) . '/footer.php';
+require dirname(__FILE__) . '/admin_footer.php';
Deleted: XoopsModules/contact/trunk/contact/admin/footer.php
===================================================================
--- XoopsModules/contact/trunk/contact/admin/footer.php 2013-10-08 11:14:45 UTC (rev 12164)
+++ XoopsModules/contact/trunk/contact/admin/footer.php 2013-10-08 12:12:22 UTC (rev 12165)
@@ -1,23 +0,0 @@
-<?php
-/*
- You may not change or alter any portion of this comment or credits
- of supporting developers from this source code or any supporting source code
- which is considered copyrighted (c) material of the original comment or credit authors.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-*/
-
-/**
- * Contact module
- *
- * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
- * @license http://www.fsf.org/copyleft/gpl.html GNU public license
- * @author Kazumi Ono (aka Onokazu)
- * @author Trabis <lus...@gm...>
- * @author Hossein Azizabadi (AKA Voltan)
- * @version $Id$
- */
-
-xoops_cp_footer();
Deleted: XoopsModules/contact/trunk/contact/admin/header.php
===================================================================
--- XoopsModules/contact/trunk/contact/admin/header.php 2013-10-08 11:14:45 UTC (rev 12164)
+++ XoopsModules/contact/trunk/contact/admin/header.php 2013-10-08 12:12:22 UTC (rev 12165)
@@ -1,53 +0,0 @@
-<?php
-/*
- You may not change or alter any portion of this comment or credits
- of supporting developers from this source code or any supporting source code
- which is considered copyrighted (c) material of the original comment or credit authors.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-*/
-
-/**
- * Contact module
- *
- * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
- * @license http://www.fsf.org/copyleft/gpl.html GNU public license
- * @author Kazumi Ono (aka Onokazu)
- * @author Trabis <lus...@gm...>
- * @author Hossein Azizabadi (AKA Voltan)
- * @version $Id$
- */
-
-$path = dirname(dirname(dirname(dirname(__FILE__))));
-
-include_once $path . '/mainfile.php';
-include_once XOOPS_ROOT_PATH . '/include/cp_functions.php';
-include_once XOOPS_ROOT_PATH . '/include/cp_header.php';
-include_once XOOPS_ROOT_PATH . '/class/pagenav.php';
-include_once XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
-global $xoopsModule;
-
-$thisModuleDir = $GLOBALS['xoopsModule']->getVar('dirname');
-
-// Load language files
-xoops_loadLanguage('admin', $thisModuleDir);
-xoops_loadLanguage('modinfo', $thisModuleDir);
-xoops_loadLanguage('main', $thisModuleDir);
-
-$pathIcon16 = '../' . $xoopsModule->getInfo('icons16');
-$pathIcon32 = '../' . $xoopsModule->getInfo('icons32');
-$pathModuleAdmin = $xoopsModule->getInfo('dirmoduleadmin');
-
-// Contact Handler
-$contact_handler = & xoops_getModuleHandler('contact', 'contact');
-
-// Locad admin menu class
-if (file_exists($GLOBALS['xoops']->path($pathModuleAdmin . '/moduleadmin.php'))) {
- include_once $GLOBALS['xoops']->path($pathModuleAdmin . '/moduleadmin.php');
-} else {
- redirect_header("../../../admin.php", 5, _AM_MODULEADMIN_MISSING, false);
-}
-
-$admin_class = new ModuleAdmin();
Modified: XoopsModules/contact/trunk/contact/admin/index.php
===================================================================
--- XoopsModules/contact/trunk/contact/admin/index.php 2013-10-08 11:14:45 UTC (rev 12164)
+++ XoopsModules/contact/trunk/contact/admin/index.php 2013-10-08 12:12:22 UTC (rev 12165)
@@ -21,7 +21,7 @@
*/
// Call header
-require dirname(__FILE__) . '/header.php';
+require dirname(__FILE__) . '/admin_header.php';
// Display Admin header
xoops_cp_header();
@@ -34,4 +34,4 @@
// Call template file
$xoopsTpl->display(XOOPS_ROOT_PATH . '/modules/contact/templates/admin/contact_index.html');
// Call footer
-require dirname(__FILE__) . '/footer.php';
+require dirname(__FILE__) . '/admin_footer.php';
Modified: XoopsModules/contact/trunk/contact/admin/log.php
===================================================================
--- XoopsModules/contact/trunk/contact/admin/log.php 2013-10-08 11:14:45 UTC (rev 12164)
+++ XoopsModules/contact/trunk/contact/admin/log.php 2013-10-08 12:12:22 UTC (rev 12165)
@@ -21,7 +21,7 @@
*/
// Call header
-require dirname(__FILE__) . '/header.php';
+require dirname(__FILE__) . '/admin_header.php';
// Display Admin header
xoops_cp_header();
// Define default value
@@ -52,4 +52,4 @@
// Call template file
$xoopsTpl->display(XOOPS_ROOT_PATH . '/modules/contact/templates/admin/contact_logs.html');
// Call footer
-require dirname(__FILE__) . '/footer.php';
+require dirname(__FILE__) . '/admin_footer.php';
Modified: XoopsModules/contact/trunk/contact/admin/menu.php
===================================================================
--- XoopsModules/contact/trunk/contact/admin/menu.php 2013-10-08 11:14:45 UTC (rev 12164)
+++ XoopsModules/contact/trunk/contact/admin/menu.php 2013-10-08 12:12:22 UTC (rev 12165)
@@ -22,13 +22,11 @@
defined("XOOPS_ROOT_PATH") or die("XOOPS root path not defined");
-$dirname = basename(dirname(dirname(__FILE__)));
-$module_handler = xoops_gethandler('module');
-$module = $module_handler->getByDirname($dirname);
-$pathIcon32 = $module->getInfo('icons32');
+$module_handler = xoops_gethandler('module');
+$module = $module_handler->getByDirname(basename(dirname(dirname(__FILE__))));
+$pathIcon32 = '../../' . $module->getInfo('icons32');
+xoops_loadLanguage('modinfo', $module->dirname());
-//xoops_loadLanguage('admin', $dirname);
-
$adminmenu = array();
$i = 1;
Modified: XoopsModules/contact/trunk/contact/admin/tools.php
===================================================================
--- XoopsModules/contact/trunk/contact/admin/tools.php 2013-10-08 11:14:45 UTC (rev 12164)
+++ XoopsModules/contact/trunk/contact/admin/tools.php 2013-10-08 12:12:22 UTC (rev 12165)
@@ -21,7 +21,7 @@
*/
// Call header
-require dirname(__FILE__) . '/header.php';
+require dirname(__FILE__) . '/admin_header.php';
// Display Admin header
xoops_cp_header();
// Define default value
@@ -56,4 +56,4 @@
// Call template file
$xoopsTpl->display(XOOPS_ROOT_PATH . '/modules/contact/templates/admin/contact_tools.html');
// Call footer
-require dirname(__FILE__) . '/footer.php';
+require dirname(__FILE__) . '/admin_footer.php';
Modified: XoopsModules/contact/trunk/contact/include/functions_update.php
===================================================================
--- XoopsModules/contact/trunk/contact/include/functions_update.php 2013-10-08 11:14:45 UTC (rev 12164)
+++ XoopsModules/contact/trunk/contact/include/functions_update.php 2013-10-08 12:12:22 UTC (rev 12165)
@@ -26,25 +26,25 @@
if ($version < 180) {
$sql = "CREATE TABLE " . $xoopsDB->prefix('contact') . " (
- contact_id int(10) unsigned NOT NULL auto_increment,
- contact_uid int(10) NOT NULL,
- contact_cid int(10) NOT NULL,
- contact_create int(10) NOT NULL,
- contact_subject varchar(255) NOT NULL,
- contact_name varchar(255) NOT NULL,
- contact_mail varchar(255) NOT NULL,
- contact_url varchar(255) NOT NULL,
- contact_icq varchar(255) NOT NULL,
- contact_company varchar(255) NOT NULL,
- contact_location varchar(255) NOT NULL,
- contact_department varchar(60) NOT NULL,
- contact_ip varchar(20) NOT NULL,
- contact_phone varchar(20) NOT NULL,
- contact_message text NOT NULL,
- contact_address text NOT NULL,
- contact_reply tinyint(1) NOT NULL,
- PRIMARY KEY (contact_id)
- ) ENGINE=MyISAM;";
+ contact_id int(10) unsigned NOT NULL auto_increment,
+ contact_uid int(10) NOT NULL,
+ contact_cid int(10) NOT NULL,
+ contact_create int(10) NOT NULL,
+ contact_subject varchar(255) NOT NULL,
+ contact_name varchar(255) NOT NULL,
+ contact_mail varchar(255) NOT NULL,
+ contact_url varchar(255) NOT NULL,
+ contact_icq varchar(255) NOT NULL,
+ contact_company varchar(255) NOT NULL,
+ contact_location varchar(255) NOT NULL,
+ contact_department varchar(60) NOT NULL,
+ contact_ip varchar(20) NOT NULL,
+ contact_phone varchar(20) NOT NULL,
+ contact_message text NOT NULL,
+ contact_address text NOT NULL,
+ contact_reply tinyint(1) NOT NULL,
+ PRIMARY KEY (contact_id)
+ ) ENGINE=MyISAM;";
$xoopsDB->query($sql);
}
Modified: XoopsModules/contact/trunk/contact/xoops_version.php
===================================================================
--- XoopsModules/contact/trunk/contact/xoops_version.php 2013-10-08 11:14:45 UTC (rev 12164)
+++ XoopsModules/contact/trunk/contact/xoops_version.php 2013-10-08 12:12:22 UTC (rev 12165)
@@ -39,9 +39,9 @@
$modversion['image'] = "images/contact_slogo.png";
$modversion['dirname'] = basename(dirname(__FILE__));
$modversion['onUpdate'] = 'include/functions_update.php';
-$modversion['dirmoduleadmin'] = '/Frameworks/moduleclasses/moduleadmin';
-$modversion['icons16'] = '../../Frameworks/moduleclasses/icons/16';
-$modversion['icons32'] = '../../Frameworks/moduleclasses/icons/32';
+$modversion['dirmoduleadmin'] = 'Frameworks/moduleclasses';
+$modversion['icons16'] = 'Frameworks/moduleclasses/icons/16';
+$modversion['icons32'] = 'Frameworks/moduleclasses/icons/32';
// DB
$modversion['sqlfile']['mysql'] = "sql/mysql.sql";
|
|
From: <be...@us...> - 2013-10-08 11:14:49
|
Revision: 12164
http://sourceforge.net/p/xoops/svn/12164
Author: beckmi
Date: 2013-10-08 11:14:45 +0000 (Tue, 08 Oct 2013)
Log Message:
-----------
Fixing few more issues with Apostrophes in the title of the sent email
Modified Paths:
--------------
XoopsModules/contact/trunk/contact/admin/footer.php
XoopsModules/contact/trunk/contact/admin/header.php
XoopsModules/contact/trunk/contact/admin/menu.php
XoopsModules/contact/trunk/contact/admin/tools.php
XoopsModules/contact/trunk/contact/ajax.php
XoopsModules/contact/trunk/contact/class/contact.php
XoopsModules/contact/trunk/contact/header.php
XoopsModules/contact/trunk/contact/templates/contact_index.html
Modified: XoopsModules/contact/trunk/contact/admin/footer.php
===================================================================
--- XoopsModules/contact/trunk/contact/admin/footer.php 2013-10-08 02:33:07 UTC (rev 12163)
+++ XoopsModules/contact/trunk/contact/admin/footer.php 2013-10-08 11:14:45 UTC (rev 12164)
@@ -19,5 +19,5 @@
* @author Hossein Azizabadi (AKA Voltan)
* @version $Id$
*/
-
+
xoops_cp_footer();
Modified: XoopsModules/contact/trunk/contact/admin/header.php
===================================================================
--- XoopsModules/contact/trunk/contact/admin/header.php 2013-10-08 02:33:07 UTC (rev 12163)
+++ XoopsModules/contact/trunk/contact/admin/header.php 2013-10-08 11:14:45 UTC (rev 12164)
@@ -19,7 +19,7 @@
* @author Hossein Azizabadi (AKA Voltan)
* @version $Id$
*/
-
+
$path = dirname(dirname(dirname(dirname(__FILE__))));
include_once $path . '/mainfile.php';
@@ -36,18 +36,18 @@
xoops_loadLanguage('modinfo', $thisModuleDir);
xoops_loadLanguage('main', $thisModuleDir);
-$pathIcon16 = '../'.$xoopsModule->getInfo('icons16');
-$pathIcon32 = '../'.$xoopsModule->getInfo('icons32');
+$pathIcon16 = '../' . $xoopsModule->getInfo('icons16');
+$pathIcon32 = '../' . $xoopsModule->getInfo('icons32');
$pathModuleAdmin = $xoopsModule->getInfo('dirmoduleadmin');
// Contact Handler
-$contact_handler = & xoops_getModuleHandler ( 'contact', 'contact' );
+$contact_handler = & xoops_getModuleHandler('contact', 'contact');
// Locad admin menu class
-if ( file_exists($GLOBALS['xoops']->path($pathModuleAdmin.'/moduleadmin.php'))){
- include_once $GLOBALS['xoops']->path($pathModuleAdmin.'/moduleadmin.php');
-}else{
- redirect_header("../../../admin.php", 5, _AM_MODULEADMIN_MISSING, false);
+if (file_exists($GLOBALS['xoops']->path($pathModuleAdmin . '/moduleadmin.php'))) {
+ include_once $GLOBALS['xoops']->path($pathModuleAdmin . '/moduleadmin.php');
+} else {
+ redirect_header("../../../admin.php", 5, _AM_MODULEADMIN_MISSING, false);
}
$admin_class = new ModuleAdmin();
Modified: XoopsModules/contact/trunk/contact/admin/menu.php
===================================================================
--- XoopsModules/contact/trunk/contact/admin/menu.php 2013-10-08 02:33:07 UTC (rev 12163)
+++ XoopsModules/contact/trunk/contact/admin/menu.php 2013-10-08 11:14:45 UTC (rev 12164)
@@ -1,58 +1,58 @@
-<?php
-/*
- You may not change or alter any portion of this comment or credits
- of supporting developers from this source code or any supporting source code
- which is considered copyrighted (c) material of the original comment or credit authors.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-*/
-
-/**
- * Contact module
- *
- * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
- * @license http://www.fsf.org/copyleft/gpl.html GNU public license
- * @author Kazumi Ono (aka Onokazu)
- * @author Trabis <lus...@gm...>
- * @author Hossein Azizabadi (AKA Voltan)
- * @version $Id$
- */
-
-defined("XOOPS_ROOT_PATH") or die("XOOPS root path not defined");
-
-$dirname = basename(dirname(dirname(__FILE__)));
-$module_handler = xoops_gethandler('module');
-$module = $module_handler->getByDirname($dirname);
-$pathIcon32 = $module->getInfo('icons32');
-
-//xoops_loadLanguage('admin', $dirname);
-
-$adminmenu = array();
-
-$i = 1;
-$adminmenu[$i]["title"] = _MI_CONTACT_MENU_HOME;
-$adminmenu[$i]["link"] = "admin/index.php";
-$adminmenu[$i]["desc"] = _MI_CONTACT_MENU_HOME_DESC;
-$adminmenu[$i]["icon"] = $pathIcon32.'/home.png';
-$i++;
-$adminmenu[$i]["title"] = _MI_CONTACT_MENU_CONTACT;
-$adminmenu[$i]["link"] = "admin/contact.php";
-$adminmenu[$i]["desc"] = _MI_CONTACT_MENU_CONTACT_DESC;
-$adminmenu[$i]["icon"] = $pathIcon32.'/content.png';
-$i++;
-$adminmenu[$i]["title"] = _MI_CONTACT_MENU_LOGS;
-$adminmenu[$i]["link"] = "admin/log.php";
-$adminmenu[$i]["desc"] = _MI_CONTACT_MENU_LOGS_DESC;
-$adminmenu[$i]["icon"] = $pathIcon32.'/exec.png';
-$i++;
-$adminmenu[$i]["title"] = _MI_CONTACT_MENU_TOOLS;
-$adminmenu[$i]["link"] = "admin/tools.php";
-$adminmenu[$i]["desc"] = _MI_CONTACT_MENU_TOOLS_DESC;
-$adminmenu[$i]["icon"] = $pathIcon32.'/exec.png';
-$i++;
-$adminmenu[$i]["title"] = _MI_CONTACT_MENU_ABOUT;
-$adminmenu[$i]["link"] = "admin/about.php";
-$adminmenu[$i]["desc"] = _MI_CONTACT_MENU_ABOUT_DESC;
-$adminmenu[$i]["icon"] = $pathIcon32.'/about.png';
+<?php
+/*
+ You may not change or alter any portion of this comment or credits
+ of supporting developers from this source code or any supporting source code
+ which is considered copyrighted (c) material of the original comment or credit authors.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+*/
+
+/**
+ * Contact module
+ *
+ * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license http://www.fsf.org/copyleft/gpl.html GNU public license
+ * @author Kazumi Ono (aka Onokazu)
+ * @author Trabis <lus...@gm...>
+ * @author Hossein Azizabadi (AKA Voltan)
+ * @version $Id$
+ */
+
+defined("XOOPS_ROOT_PATH") or die("XOOPS root path not defined");
+
+$dirname = basename(dirname(dirname(__FILE__)));
+$module_handler = xoops_gethandler('module');
+$module = $module_handler->getByDirname($dirname);
+$pathIcon32 = $module->getInfo('icons32');
+
+//xoops_loadLanguage('admin', $dirname);
+
+$adminmenu = array();
+
+$i = 1;
+$adminmenu[$i]["title"] = _MI_CONTACT_MENU_HOME;
+$adminmenu[$i]["link"] = "admin/index.php";
+$adminmenu[$i]["desc"] = _MI_CONTACT_MENU_HOME_DESC;
+$adminmenu[$i]["icon"] = $pathIcon32 . '/home.png';
+$i++;
+$adminmenu[$i]["title"] = _MI_CONTACT_MENU_CONTACT;
+$adminmenu[$i]["link"] = "admin/contact.php";
+$adminmenu[$i]["desc"] = _MI_CONTACT_MENU_CONTACT_DESC;
+$adminmenu[$i]["icon"] = $pathIcon32 . '/content.png';
+$i++;
+$adminmenu[$i]["title"] = _MI_CONTACT_MENU_LOGS;
+$adminmenu[$i]["link"] = "admin/log.php";
+$adminmenu[$i]["desc"] = _MI_CONTACT_MENU_LOGS_DESC;
+$adminmenu[$i]["icon"] = $pathIcon32 . '/exec.png';
+$i++;
+$adminmenu[$i]["title"] = _MI_CONTACT_MENU_TOOLS;
+$adminmenu[$i]["link"] = "admin/tools.php";
+$adminmenu[$i]["desc"] = _MI_CONTACT_MENU_TOOLS_DESC;
+$adminmenu[$i]["icon"] = $pathIcon32 . '/exec.png';
+$i++;
+$adminmenu[$i]["title"] = _MI_CONTACT_MENU_ABOUT;
+$adminmenu[$i]["link"] = "admin/about.php";
+$adminmenu[$i]["desc"] = _MI_CONTACT_MENU_ABOUT_DESC;
+$adminmenu[$i]["icon"] = $pathIcon32 . '/about.png';
Modified: XoopsModules/contact/trunk/contact/admin/tools.php
===================================================================
--- XoopsModules/contact/trunk/contact/admin/tools.php 2013-10-08 02:33:07 UTC (rev 12163)
+++ XoopsModules/contact/trunk/contact/admin/tools.php 2013-10-08 11:14:45 UTC (rev 12164)
@@ -31,7 +31,7 @@
case 'list':
// prune manager
$form = new XoopsThemeForm(_AM_CONTACT_TOOLS_PRUNE, 'tools', 'tools.php', 'post');
- $form->addElement(new XoopsFormTextDateSelect(_AM_CONTACT_TOOLS_PRUNE_BEFORE, 'prune_date', 15, time()));
+ $form->addElement(new XoopsFormTextDateSelect(_AM_CONTACT_TOOLS_PRUNE_BEFORE, 'prune_date', 15, time()));
$onlyreply = new xoopsFormCheckBox('', 'onlyreply');
$onlyreply->addOption(1, _AM_CONTACT_TOOLS_PRUNE_REPLYONLY);
$form->addElement($onlyreply, false);
@@ -41,15 +41,15 @@
break;
case 'prune':
- $timestamp = $contact_handler->Contact_CleanVars( $_REQUEST, 'prune_date', '', 'int' );
- $onlyreply = $contact_handler->Contact_CleanVars( $_REQUEST, 'onlyreply', 0, 'int' );
- $timestamp = strtotime($timestamp);
- $count = $contact_handler->Contact_PruneCount($timestamp,$onlyreply);
- $contact_handler->Contact_DeleteBeforeDate($timestamp,$onlyreply);
- redirect_header ( 'tools.php', 1, sprintf(_AM_CONTACT_MSG_PRUNE_DELETED,$count) );
- xoops_cp_footer ();
- exit ();
- break;
+ $timestamp = $contact_handler->Contact_CleanVars($_REQUEST, 'prune_date', '', 'int');
+ $onlyreply = $contact_handler->Contact_CleanVars($_REQUEST, 'onlyreply', 0, 'int');
+ $timestamp = strtotime($timestamp);
+ $count = $contact_handler->Contact_PruneCount($timestamp, $onlyreply);
+ $contact_handler->Contact_DeleteBeforeDate($timestamp, $onlyreply);
+ redirect_header('tools.php', 1, sprintf(_AM_CONTACT_MSG_PRUNE_DELETED, $count));
+ xoops_cp_footer();
+ exit ();
+ break;
}
$xoopsTpl->assign('navigation', $admin_class->addNavigation('tools.php'));
Modified: XoopsModules/contact/trunk/contact/ajax.php
===================================================================
--- XoopsModules/contact/trunk/contact/ajax.php 2013-10-08 02:33:07 UTC (rev 12163)
+++ XoopsModules/contact/trunk/contact/ajax.php 2013-10-08 11:14:45 UTC (rev 12164)
@@ -24,8 +24,8 @@
if (!empty($_POST)) {
// Info Processing
- $contact = $contact_handler->Contact_InfoProcessing($_POST);
- // Save info
+ $contact = $contact_handler->Contact_InfoProcessing($_POST);
+ // Save info
$obj = $contact_handler->create();
$obj->setVars($contact);
$contact_handler->insert($obj);
Modified: XoopsModules/contact/trunk/contact/class/contact.php
===================================================================
--- XoopsModules/contact/trunk/contact/class/contact.php 2013-10-08 02:33:07 UTC (rev 12163)
+++ XoopsModules/contact/trunk/contact/class/contact.php 2013-10-08 11:14:45 UTC (rev 12164)
@@ -241,15 +241,15 @@
$contact = array();
$contact['contact_cid'] = $this->Contact_CleanVars($_POST, 'contact_id', '', 'int');
$contact['contact_uid'] = $this->Contact_CleanVars($_POST, 'contact_uid', '', 'int');
- $contact['contact_name'] = $this->Contact_CleanVars($_POST, 'contact_name', '', 'string');
- $contact['contact_nameto'] = $this->Contact_CleanVars($_POST, 'contact_nameto', '', 'string');
- $contact['contact_subject'] = $this->Contact_CleanVars($_POST, 'contact_subject', '', 'string');
+ $contact['contact_name'] = $this->Contact_CleanVars($_POST, 'contact_name', '', 'text'); //mb changed from string to text
+ $contact['contact_nameto'] = $this->Contact_CleanVars($_POST, 'contact_nameto', '', 'text'); //mb changed from string to text
+ $contact['contact_subject'] = $this->Contact_CleanVars($_POST, 'contact_subject', '', 'text'); //mb changed from string to text
$contact['contact_mail'] = $this->Contact_CleanVars($_POST, 'contact_mail', '', 'mail');
$contact['contact_mailto'] = $this->Contact_CleanVars($_POST, 'contact_mailto', '', 'mail');
$contact['contact_url'] = $this->Contact_CleanVars($_POST, 'contact_url', '', 'url');
$contact['contact_create'] = time();
- $contact['contact_icq'] = $this->Contact_CleanVars($_POST, 'contact_icq', '', 'string');
- $contact['contact_company'] = $this->Contact_CleanVars($_POST, 'contact_company', '', 'string');
+ $contact['contact_icq'] = $this->Contact_CleanVars($_POST, 'contact_icq', '', 'text'); //mb changed from string to text
+ $contact['contact_company'] = $this->Contact_CleanVars($_POST, 'contact_company', '', 'text'); //mb changed from string to text
$contact['contact_location'] = $this->Contact_CleanVars($_POST, 'contact_location', '', 'text');
$contact['contact_phone'] = $this->Contact_CleanVars($_POST, 'contact_phone', '', 'int');
$contact['contact_department'] = $this->Contact_CleanVars($_POST, 'contact_department', _MD_CONTACT_DEFULTDEP, 'string');
@@ -268,8 +268,8 @@
$xoopsMailer->useMail();
$xoopsMailer->setToEmails($this->Contact_ToEmails($contact['contact_department']));
$xoopsMailer->setFromEmail($contact['contact_mail']);
- $xoopsMailer->setFromName($contact['contact_name']);
- $xoopsMailer->setSubject($contact['contact_subject']);
+ $xoopsMailer->setFromName(html_entity_decode($contact['contact_name'], ENT_QUOTES, 'UTF-8'));
+ $xoopsMailer->setSubject(html_entity_decode($contact['contact_subject'], ENT_QUOTES, 'UTF-8'));
$xoopsMailer->setBody(html_entity_decode($contact['contact_message'], ENT_QUOTES, 'UTF-8'));
if ($xoopsMailer->send()) {
$message = _MD_CONTACT_MES_SEND;
Modified: XoopsModules/contact/trunk/contact/header.php
===================================================================
--- XoopsModules/contact/trunk/contact/header.php 2013-10-08 02:33:07 UTC (rev 12163)
+++ XoopsModules/contact/trunk/contact/header.php 2013-10-08 11:14:45 UTC (rev 12164)
@@ -21,7 +21,7 @@
*/
include '../../mainfile.php';
-include XOOPS_ROOT_PATH."/modules/contact/class/contact.php";
-include_once XOOPS_ROOT_PATH."/class/xoopsformloader.php";
+include XOOPS_ROOT_PATH . "/modules/contact/class/contact.php";
+include_once XOOPS_ROOT_PATH . "/class/xoopsformloader.php";
-$contact_handler = & xoops_getModuleHandler ( 'contact', 'contact' );
+$contact_handler = & xoops_getModuleHandler('contact', 'contact');
Modified: XoopsModules/contact/trunk/contact/templates/contact_index.html
===================================================================
--- XoopsModules/contact/trunk/contact/templates/contact_index.html 2013-10-08 02:33:07 UTC (rev 12163)
+++ XoopsModules/contact/trunk/contact/templates/contact_index.html 2013-10-08 11:14:45 UTC (rev 12164)
@@ -1,5 +1,5 @@
<div class="contact">
- <div class="breadcrumb"><{$breadcrumb}></div>
- <div class="contact_info"><{$info}></div>
- <div class="contact_form"><{$form}></div>
-</div>
+ <div class="breadcrumb"><{$breadcrumb}></div>
+ <div class="contact_info"><{$info}></div>
+ <div class="contact_form"><{$form}></div>
+</div>
|
|
From: <be...@us...> - 2013-10-08 02:33:09
|
Revision: 12163
http://sourceforge.net/p/xoops/svn/12163
Author: beckmi
Date: 2013-10-08 02:33:07 +0000 (Tue, 08 Oct 2013)
Log Message:
-----------
fixed: bug with apostrophe
Modified Paths:
--------------
XoopsModules/contact/trunk/contact/class/contact.php
Modified: XoopsModules/contact/trunk/contact/class/contact.php
===================================================================
--- XoopsModules/contact/trunk/contact/class/contact.php 2013-10-08 02:00:11 UTC (rev 12162)
+++ XoopsModules/contact/trunk/contact/class/contact.php 2013-10-08 02:33:07 UTC (rev 12163)
@@ -270,7 +270,7 @@
$xoopsMailer->setFromEmail($contact['contact_mail']);
$xoopsMailer->setFromName($contact['contact_name']);
$xoopsMailer->setSubject($contact['contact_subject']);
- $xoopsMailer->setBody(html_entity_decode($contact['contact_message']), ENT_QUOTES, 'UTF-8');
+ $xoopsMailer->setBody(html_entity_decode($contact['contact_message'], ENT_QUOTES, 'UTF-8'));
if ($xoopsMailer->send()) {
$message = _MD_CONTACT_MES_SEND;
} else {
|
|
From: <be...@us...> - 2013-10-08 02:00:16
|
Revision: 12162
http://sourceforge.net/p/xoops/svn/12162
Author: beckmi
Date: 2013-10-08 02:00:11 +0000 (Tue, 08 Oct 2013)
Log Message:
-----------
making Captcha optional for Anonymous/Registered users
Modified Paths:
--------------
XoopsModules/contact/trunk/contact/class/contact.php
XoopsModules/contact/trunk/contact/docs/changelog.txt
XoopsModules/contact/trunk/contact/include/functions_update.php
XoopsModules/contact/trunk/contact/index.php
XoopsModules/contact/trunk/contact/language/english/modinfo.php
XoopsModules/contact/trunk/contact/xoops_version.php
Modified: XoopsModules/contact/trunk/contact/class/contact.php
===================================================================
--- XoopsModules/contact/trunk/contact/class/contact.php 2013-10-07 20:46:22 UTC (rev 12161)
+++ XoopsModules/contact/trunk/contact/class/contact.php 2013-10-08 02:00:11 UTC (rev 12162)
@@ -56,7 +56,7 @@
public function Contact_ContactForm($department)
{
- global $xoopsConfig, $xoopsOption, $xoopsUser,$xoopsModuleConfig;
+ global $xoopsConfig, $xoopsOption, $xoopsUser, $xoopsUserIsAdmin, $xoopsModuleConfig;
if ($this->isNew()) {
if (!empty($xoopsUser)) {
$contact_uid = $xoopsUser->getVar('uid');
@@ -123,11 +123,15 @@
$form->addElement(new XoopsFormText (_MD_CONTACT_SUBJECT, 'contact_subject', 50, 255, $this->getVar('contact_subject')), true);
$form->addElement(new XoopsFormTextArea (_MD_CONTACT_MESSAGE, 'contact_message', $this->getVar('contact_message', 'e'), 5, 60), true);
- if ($xoopsModuleConfig['captcha']) {
- xoops_load('XoopsFormCaptcha');
- $form->addElement(new XoopsFormCaptcha(), true);
- }
+ // check captcha
+ if ((!$xoopsUser && $xoopsModuleConfig['captchaAnonymous'])
+ || ($xoopsUser && !$xoopsUserIsAdmin && $xoopsModuleConfig['captchaRegistered'])
+ ) {
+ xoops_load('XoopsFormCaptcha');
+ $form->addElement(new XoopsFormCaptcha('','',false), true);
+ }
+
$form->addElement(new XoopsFormButton('', 'submit', _SUBMIT, 'submit'));
return $form;
Modified: XoopsModules/contact/trunk/contact/docs/changelog.txt
===================================================================
--- XoopsModules/contact/trunk/contact/docs/changelog.txt 2013-10-07 20:46:22 UTC (rev 12161)
+++ XoopsModules/contact/trunk/contact/docs/changelog.txt 2013-10-08 02:00:11 UTC (rev 12162)
@@ -4,7 +4,7 @@
- English corrections (Cesag)
- fixed: bug when sending UTF-8 emails (cesag/mamba)
- PSR-2 code reformatting (mamba)
-- making Captcha optional (mamba)
+- making Captcha optional for Anonymous/Registered users (mamba)
Version 1.80 from 2012-1-19
=================================
Modified: XoopsModules/contact/trunk/contact/include/functions_update.php
===================================================================
--- XoopsModules/contact/trunk/contact/include/functions_update.php 2013-10-07 20:46:22 UTC (rev 12161)
+++ XoopsModules/contact/trunk/contact/include/functions_update.php 2013-10-08 02:00:11 UTC (rev 12162)
@@ -22,10 +22,10 @@
function xoops_module_update_contact($module, $version)
{
- $xoopsDB = Database::getInstance();
+ $xoopsDB = XoopsDatabaseFactory::getDatabaseConnection();
- if ($version < 180) {
- $sql = "CREATE TABLE " . $xoopsDB->prefix('contact') . " (
+ if ($version < 180) {
+ $sql = "CREATE TABLE " . $xoopsDB->prefix('contact') . " (
contact_id int(10) unsigned NOT NULL auto_increment,
contact_uid int(10) NOT NULL,
contact_cid int(10) NOT NULL,
@@ -45,36 +45,36 @@
contact_reply tinyint(1) NOT NULL,
PRIMARY KEY (contact_id)
) ENGINE=MyISAM;";
- $xoopsDB->query($sql);
- }
+ $xoopsDB->query($sql);
+ }
- if ($version < 181) {
- // Add contact_platform
- $sql = "ALTER TABLE `" . $xoopsDB->prefix('contact') . "` ADD `contact_platform` ENUM('Android','Ios','Web') NOT NULL DEFAULT 'Web'";
- $xoopsDB->query($sql);
- // Add contact_type
- $sql = "ALTER TABLE `" . $xoopsDB->prefix('contact') . "` ADD `contact_type` ENUM('Contact','Phone','Mail') NOT NULL DEFAULT 'Contact'";
- $xoopsDB->query($sql);
- // Add index contact_uid
- $sql = "ALTER TABLE `" . $xoopsDB->prefix('contact') . "` ADD INDEX `contact_uid` ( `contact_uid` )";
- $xoopsDB->query($sql);
- // Add index contact_cid
- $sql = "ALTER TABLE `" . $xoopsDB->prefix('contact') . "` ADD INDEX `contact_cid` ( `contact_cid` )";
- $xoopsDB->query($sql);
- // Add index contact_create
- $sql = "ALTER TABLE `" . $xoopsDB->prefix('contact') . "` ADD INDEX `contact_create` ( `contact_create` )";
- $xoopsDB->query($sql);
- // Add index contact_mail
- $sql = "ALTER TABLE `" . $xoopsDB->prefix('contact') . "` ADD INDEX `contact_mail` ( `contact_mail` )";
- $xoopsDB->query($sql);
- // Add index contact_phone
- $sql = "ALTER TABLE `" . $xoopsDB->prefix('contact') . "` ADD INDEX `contact_phone` ( `contact_phone` )";
- $xoopsDB->query($sql);
- // Add index contact_platform
- $sql = "ALTER TABLE `" . $xoopsDB->prefix('contact') . "` ADD INDEX `contact_platform` ( `contact_platform` )";
- $xoopsDB->query($sql);
- // Add index contact_type
- $sql = "ALTER TABLE `" . $xoopsDB->prefix('contact') . "` ADD INDEX `contact_type` ( `contact_type` )";
- $xoopsDB->query($sql);
- }
+ if ($version < 181) {
+ // Add contact_platform
+ $sql = "ALTER TABLE `" . $xoopsDB->prefix('contact') . "` ADD `contact_platform` ENUM('Android','Ios','Web') NOT NULL DEFAULT 'Web'";
+ $xoopsDB->query($sql);
+ // Add contact_type
+ $sql = "ALTER TABLE `" . $xoopsDB->prefix('contact') . "` ADD `contact_type` ENUM('Contact','Phone','Mail') NOT NULL DEFAULT 'Contact'";
+ $xoopsDB->query($sql);
+ // Add index contact_uid
+ $sql = "ALTER TABLE `" . $xoopsDB->prefix('contact') . "` ADD INDEX `contact_uid` ( `contact_uid` )";
+ $xoopsDB->query($sql);
+ // Add index contact_cid
+ $sql = "ALTER TABLE `" . $xoopsDB->prefix('contact') . "` ADD INDEX `contact_cid` ( `contact_cid` )";
+ $xoopsDB->query($sql);
+ // Add index contact_create
+ $sql = "ALTER TABLE `" . $xoopsDB->prefix('contact') . "` ADD INDEX `contact_create` ( `contact_create` )";
+ $xoopsDB->query($sql);
+ // Add index contact_mail
+ $sql = "ALTER TABLE `" . $xoopsDB->prefix('contact') . "` ADD INDEX `contact_mail` ( `contact_mail` )";
+ $xoopsDB->query($sql);
+ // Add index contact_phone
+ $sql = "ALTER TABLE `" . $xoopsDB->prefix('contact') . "` ADD INDEX `contact_phone` ( `contact_phone` )";
+ $xoopsDB->query($sql);
+ // Add index contact_platform
+ $sql = "ALTER TABLE `" . $xoopsDB->prefix('contact') . "` ADD INDEX `contact_platform` ( `contact_platform` )";
+ $xoopsDB->query($sql);
+ // Add index contact_type
+ $sql = "ALTER TABLE `" . $xoopsDB->prefix('contact') . "` ADD INDEX `contact_type` ( `contact_type` )";
+ $xoopsDB->query($sql);
+ }
}
Modified: XoopsModules/contact/trunk/contact/index.php
===================================================================
--- XoopsModules/contact/trunk/contact/index.php 2013-10-07 20:46:22 UTC (rev 12161)
+++ XoopsModules/contact/trunk/contact/index.php 2013-10-08 02:00:11 UTC (rev 12162)
@@ -48,7 +48,9 @@
} else {
// check captcha
- if ($xoopsModuleConfig['captcha']) {
+ if ((!$xoopsUser && $xoopsModuleConfig['captchaAnonymous'])
+ || ($xoopsUser && !$xoopsUserIsAdmin && $xoopsModuleConfig['captchaRegistered'])
+ ) {
// Verify entered code
xoops_load('XoopsCaptcha');
if (class_exists('XoopsFormCaptcha')) {
@@ -61,7 +63,6 @@
}
}
-
// check email
if (!$contact_handler->Contact_CleanVars($_POST, 'contact_mail', '', 'mail')) {
redirect_header("javascript:history.go(-1)", 1, _MD_CONTACT_MES_NOVALIDEMAIL);
Modified: XoopsModules/contact/trunk/contact/language/english/modinfo.php
===================================================================
--- XoopsModules/contact/trunk/contact/language/english/modinfo.php 2013-10-07 20:46:22 UTC (rev 12161)
+++ XoopsModules/contact/trunk/contact/language/english/modinfo.php 2013-10-08 02:00:11 UTC (rev 12162)
@@ -32,8 +32,8 @@
define('_MI_CONTACT_FORM_ADDRESS_DESC', "");
define('_MI_CONTACT_FORM_DEPT', "Select Departments");
define('_MI_CONTACT_FORM_DEPT_DESC', "");
-define('_MI_CONTACT_FORM_CAPTCHA', "Use captcha in submit form?");
-define('_MI_CONTACT_FORM_CAPTCHA_DESC', "Select <em>Yes</em> to use captcha in the submit form.<br />Default: <em>Yes</em>");
+define('_MI_CONTACT_FORM_CAPTCHA_REGISTERED', "Use Captcha for Registered Users?");
+define('_MI_CONTACT_FORM_CAPTCHA_DESC', "Select <em>Yes</em> to use Captcha in the submit form.<br />Default: <em>Yes</em>");
define('_MI_CONTACT_DEPT', "Departments");
define('_MI_CONTACT_DEPT_DESC', "Departments allow you to define a department/email combination. Users selecting<br />"
. "from a defined department will have their contact information sent to the corresponding<br />"
@@ -48,3 +48,7 @@
define('_MI_CONTACT_HEAD_OPTIONS', "Form Options");
define('_MI_CONTACT_HEAD_ADMIN', "Admin setting");
define('_MI_CONTACT_HEAD_INFO', "Information");
+//1.81
+define('_MI_CONTACT_FORM_CAPTCHA_ANONYMOUS', "Use Captcha for Anonymous Users?");
+
+
Modified: XoopsModules/contact/trunk/contact/xoops_version.php
===================================================================
--- XoopsModules/contact/trunk/contact/xoops_version.php 2013-10-07 20:46:22 UTC (rev 12161)
+++ XoopsModules/contact/trunk/contact/xoops_version.php 2013-10-08 02:00:11 UTC (rev 12162)
@@ -85,8 +85,8 @@
);
$modversion['config'][] = array(
- 'name' => 'captcha',
- 'title' => '_MI_CONTACT_FORM_CAPTCHA',
+ 'name' => 'captchaRegistered',
+ 'title' => '_MI_CONTACT_FORM_CAPTCHA_REGISTERED',
'description' => '_MI_CONTACT_FORM_CAPTCHA_DESC',
'formtype' => 'yesno',
'valuetype' => 'int',
@@ -94,6 +94,15 @@
);
$modversion['config'][] = array(
+ 'name' => 'captchaAnonymous',
+ 'title' => '_MI_CONTACT_FORM_CAPTCHA_ANONYMOUS',
+ 'description' => '_MI_CONTACT_FORM_CAPTCHA_DESC',
+ 'formtype' => 'yesno',
+ 'valuetype' => 'int',
+ 'default' => 1
+);
+
+$modversion['config'][] = array(
'name' => 'form_url',
'title' => '_MI_CONTACT_FORM_URL',
'description' => '_MI_CONTACT_FORM_URL_DESC',
|
|
From: <be...@us...> - 2013-10-07 20:46:26
|
Revision: 12161
http://sourceforge.net/p/xoops/svn/12161
Author: beckmi
Date: 2013-10-07 20:46:22 +0000 (Mon, 07 Oct 2013)
Log Message:
-----------
making Captcha optional (mamba)
Modified Paths:
--------------
XoopsModules/contact/trunk/contact/class/contact.php
XoopsModules/contact/trunk/contact/docs/changelog.txt
XoopsModules/contact/trunk/contact/index.php
XoopsModules/contact/trunk/contact/language/english/modinfo.php
XoopsModules/contact/trunk/contact/xoops_version.php
Modified: XoopsModules/contact/trunk/contact/class/contact.php
===================================================================
--- XoopsModules/contact/trunk/contact/class/contact.php 2013-10-07 20:17:51 UTC (rev 12160)
+++ XoopsModules/contact/trunk/contact/class/contact.php 2013-10-07 20:46:22 UTC (rev 12161)
@@ -56,7 +56,7 @@
public function Contact_ContactForm($department)
{
- global $xoopsConfig, $xoopsOption, $xoopsUser;
+ global $xoopsConfig, $xoopsOption, $xoopsUser,$xoopsModuleConfig;
if ($this->isNew()) {
if (!empty($xoopsUser)) {
$contact_uid = $xoopsUser->getVar('uid');
@@ -123,8 +123,10 @@
$form->addElement(new XoopsFormText (_MD_CONTACT_SUBJECT, 'contact_subject', 50, 255, $this->getVar('contact_subject')), true);
$form->addElement(new XoopsFormTextArea (_MD_CONTACT_MESSAGE, 'contact_message', $this->getVar('contact_message', 'e'), 5, 60), true);
- xoops_load('XoopsFormCaptcha');
- $form->addElement(new XoopsFormCaptcha(), true);
+ if ($xoopsModuleConfig['captcha']) {
+ xoops_load('XoopsFormCaptcha');
+ $form->addElement(new XoopsFormCaptcha(), true);
+ }
$form->addElement(new XoopsFormButton('', 'submit', _SUBMIT, 'submit'));
Modified: XoopsModules/contact/trunk/contact/docs/changelog.txt
===================================================================
--- XoopsModules/contact/trunk/contact/docs/changelog.txt 2013-10-07 20:17:51 UTC (rev 12160)
+++ XoopsModules/contact/trunk/contact/docs/changelog.txt 2013-10-07 20:46:22 UTC (rev 12161)
@@ -4,6 +4,7 @@
- English corrections (Cesag)
- fixed: bug when sending UTF-8 emails (cesag/mamba)
- PSR-2 code reformatting (mamba)
+- making Captcha optional (mamba)
Version 1.80 from 2012-1-19
=================================
Modified: XoopsModules/contact/trunk/contact/index.php
===================================================================
--- XoopsModules/contact/trunk/contact/index.php 2013-10-07 20:17:51 UTC (rev 12160)
+++ XoopsModules/contact/trunk/contact/index.php 2013-10-07 20:46:22 UTC (rev 12161)
@@ -48,13 +48,20 @@
} else {
// check captcha
- xoops_load("captcha");
- $xoopsCaptcha = XoopsCaptcha::getInstance();
- if (!$xoopsCaptcha->verify()) {
- redirect_header("javascript:history.go(-1)", 1, $xoopsCaptcha->getMessage());
- exit();
+ if ($xoopsModuleConfig['captcha']) {
+ // Verify entered code
+ xoops_load('XoopsCaptcha');
+ if (class_exists('XoopsFormCaptcha')) {
+ $xoopsCaptcha = XoopsCaptcha::getInstance();
+ if (!$xoopsCaptcha->verify()) {
+ // $err[] = $xoopsCaptcha->getMessage();
+ redirect_header("javascript:history.go(-1)", 1, $xoopsCaptcha->getMessage());
+ exit();
+ }
+ }
}
+
// check email
if (!$contact_handler->Contact_CleanVars($_POST, 'contact_mail', '', 'mail')) {
redirect_header("javascript:history.go(-1)", 1, _MD_CONTACT_MES_NOVALIDEMAIL);
Modified: XoopsModules/contact/trunk/contact/language/english/modinfo.php
===================================================================
--- XoopsModules/contact/trunk/contact/language/english/modinfo.php 2013-10-07 20:17:51 UTC (rev 12160)
+++ XoopsModules/contact/trunk/contact/language/english/modinfo.php 2013-10-07 20:46:22 UTC (rev 12161)
@@ -32,11 +32,11 @@
define('_MI_CONTACT_FORM_ADDRESS_DESC', "");
define('_MI_CONTACT_FORM_DEPT', "Select Departments");
define('_MI_CONTACT_FORM_DEPT_DESC', "");
-define('_MI_CONTACT_FORM_CAPTCHA', "Use Captcha");
-define('_MI_CONTACT_FORM_CAPTCHA_DESC', "");
+define('_MI_CONTACT_FORM_CAPTCHA', "Use captcha in submit form?");
+define('_MI_CONTACT_FORM_CAPTCHA_DESC', "Select <em>Yes</em> to use captcha in the submit form.<br />Default: <em>Yes</em>");
define('_MI_CONTACT_DEPT', "Departments");
define('_MI_CONTACT_DEPT_DESC', "Departments allow you to define a department/email combination. Users selecting<br />"
- . "from a defined department will have their contact information sent to the corresponding<br />"
+ . "from a defined department will have their contact information sent to the corresponding<br />"
. "email address you define.<br /><br />"
. "Define each department/email as follows:<br /><br />"
. "dept1,email1|dept2,email2|dept3,email3 etc. - each department and email must be separated<br />"
Modified: XoopsModules/contact/trunk/contact/xoops_version.php
===================================================================
--- XoopsModules/contact/trunk/contact/xoops_version.php 2013-10-07 20:17:51 UTC (rev 12160)
+++ XoopsModules/contact/trunk/contact/xoops_version.php 2013-10-07 20:46:22 UTC (rev 12161)
@@ -85,6 +85,15 @@
);
$modversion['config'][] = array(
+ 'name' => 'captcha',
+ 'title' => '_MI_CONTACT_FORM_CAPTCHA',
+ 'description' => '_MI_CONTACT_FORM_CAPTCHA_DESC',
+ 'formtype' => 'yesno',
+ 'valuetype' => 'int',
+ 'default' => 1
+);
+
+$modversion['config'][] = array(
'name' => 'form_url',
'title' => '_MI_CONTACT_FORM_URL',
'description' => '_MI_CONTACT_FORM_URL_DESC',
|
|
From: <luc...@us...> - 2013-10-07 20:17:57
|
Revision: 12160
http://sourceforge.net/p/xoops/svn/12160
Author: luciorota
Date: 2013-10-07 20:17:51 +0000 (Mon, 07 Oct 2013)
Log Message:
-----------
added: sort downloads by file size
Modified Paths:
--------------
XoopsModules/wfdownloads/trunk/wfdownloads/brokenfile.php
XoopsModules/wfdownloads/trunk/wfdownloads/class/download.php
XoopsModules/wfdownloads/trunk/wfdownloads/include/functions.php
XoopsModules/wfdownloads/trunk/wfdownloads/index.php
XoopsModules/wfdownloads/trunk/wfdownloads/language/english/main.php
XoopsModules/wfdownloads/trunk/wfdownloads/language/english/modinfo.php
XoopsModules/wfdownloads/trunk/wfdownloads/mirror.php
XoopsModules/wfdownloads/trunk/wfdownloads/newlist.php
XoopsModules/wfdownloads/trunk/wfdownloads/ratefile.php
XoopsModules/wfdownloads/trunk/wfdownloads/review.php
XoopsModules/wfdownloads/trunk/wfdownloads/singlefile.php
XoopsModules/wfdownloads/trunk/wfdownloads/submit.php
XoopsModules/wfdownloads/trunk/wfdownloads/templates/wfdownloads_viewcat.html
XoopsModules/wfdownloads/trunk/wfdownloads/viewcat.php
XoopsModules/wfdownloads/trunk/wfdownloads/visit.php
XoopsModules/wfdownloads/trunk/wfdownloads/xoops_version.php
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/brokenfile.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/brokenfile.php 2013-10-07 19:11:27 UTC (rev 12159)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/brokenfile.php 2013-10-07 20:17:51 UTC (rev 12160)
@@ -170,7 +170,7 @@
$xoopsTpl->assign('brokenreportexists', true);
$xoopsTpl->assign('broken', $broken);
- $xoopsTpl->assign('brokenreport', true); // this definition is not removed for compatibility issues
+ $xoopsTpl->assign('brokenreport', true); // this definition is not removed for backward compatibility issues
} else {
// file info
$down['title'] = trim($download->getVar('title'));
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/class/download.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/class/download.php 2013-10-07 19:11:27 UTC (rev 12159)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/class/download.php 2013-10-07 20:17:51 UTC (rev 12160)
@@ -163,7 +163,7 @@
$use_ratings = $this->wfdownloads->getConfig('enable_ratings');
$download['rateimg']
=
- "rate" . round(number_format($this->getVar('rating'), 0) / 2) . ".gif"; // this definition is not removed for compatibility issues
+ "rate" . round(number_format($this->getVar('rating'), 0) / 2) . ".gif"; // this definition is not removed for backward compatibility issues
$download['average_rating'] = $this->getVar('rating'); // new
$download['votes'] = ($this->getVar('votes') == 1)
? _MD_WFDOWNLOADS_ONEVOTE
@@ -422,7 +422,7 @@
$download['review_average_rating'] = $averageReviewsRating; // new
$download['review_rateimg']
=
- 'rate' . round(number_format($averageReviewsRating, 0) / 2) . '.gif'; // this definition is not removed for compatibility issues
+ 'rate' . round(number_format($averageReviewsRating, 0) / 2) . '.gif'; // this definition is not removed for backward compatibility issues
$download['icons'] = wfdownloads_displayIcons($this->getVar('published'), $this->getVar('status'), $this->getVar('hits'));
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/include/functions.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/include/functions.php 2013-10-07 19:11:27 UTC (rev 12159)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/include/functions.php 2013-10-07 20:17:51 UTC (rev 12160)
@@ -777,31 +777,22 @@
function convertorderbyin($orderby)
{
switch (trim($orderby)) {
- case "titleA":
- $orderby = "title ASC";
- break;
- case "dateA":
- $orderby = "published ASC";
- break;
- case "hitsA":
- $orderby = "hits ASC";
- break;
- case "ratingA":
- $orderby = "rating ASC";
- break;
- case "titleD":
- $orderby = "title DESC";
- break;
- case "hitsD":
- $orderby = "hits DESC";
- break;
- case "ratingD":
- $orderby = "rating DESC";
- break;
- case"dateD":
- default:
- $orderby = "published DESC";
- break;
+ case "titleA" : $orderby = "title ASC"; break;
+ case "titleD" : $orderby = "title DESC"; break;
+
+ case "dateA" : $orderby = "published ASC"; break;
+ case "dateD" : $orderby = "published DESC"; break;
+
+ case "hitsA" : $orderby = "hits ASC"; break;
+ case "hitsD" : $orderby = "hits DESC"; break;
+
+ case "ratingA" : $orderby = "rating ASC"; break;
+ case "ratingD" : $orderby = "rating DESC"; break;
+
+ case "sizeD" : $orderby = "size DESC"; break;
+ case "sizeA" : $orderby = "size ASC"; break;
+
+ default: $orderby = "published DESC"; break;
}
return $orderby;
@@ -811,30 +802,21 @@
if (!function_exists('convertorderbytrans')) {
function convertorderbytrans($orderby)
{
- if ($orderby == "hits ASC") {
- $orderbyTrans = _MD_WFDOWNLOADS_POPULARITYLTOM;
- }
- if ($orderby == "hits DESC") {
- $orderbyTrans = _MD_WFDOWNLOADS_POPULARITYMTOL;
- }
- if ($orderby == "title ASC") {
- $orderbyTrans = _MD_WFDOWNLOADS_TITLEATOZ;
- }
- if ($orderby == "title DESC") {
- $orderbyTrans = _MD_WFDOWNLOADS_TITLEZTOA;
- }
- if ($orderby == "published ASC") {
- $orderbyTrans = _MD_WFDOWNLOADS_DATEOLD;
- }
- if ($orderby == "published DESC") {
- $orderbyTrans = _MD_WFDOWNLOADS_DATENEW;
- }
- if ($orderby == "rating ASC") {
- $orderbyTrans = _MD_WFDOWNLOADS_RATINGLTOH;
- }
- if ($orderby == "rating DESC") {
- $orderbyTrans = _MD_WFDOWNLOADS_RATINGHTOL;
- }
+ if ($orderby == "title ASC") $orderbyTrans = _MD_WFDOWNLOADS_TITLEATOZ;
+ if ($orderby == "title DESC") $orderbyTrans = _MD_WFDOWNLOADS_TITLEZTOA;
+
+ if ($orderby == "published ASC") $orderbyTrans = _MD_WFDOWNLOADS_DATEOLD;
+ if ($orderby == "published DESC") $orderbyTrans = _MD_WFDOWNLOADS_DATENEW;
+
+ if ($orderby == "hits ASC") $orderbyTrans = _MD_WFDOWNLOADS_POPULARITYLTOM;
+ if ($orderby == "hits DESC") $orderbyTrans = _MD_WFDOWNLOADS_POPULARITYMTOL;
+
+ if ($orderby == "rating ASC") $orderbyTrans = _MD_WFDOWNLOADS_RATINGLTOH;
+ if ($orderby == "rating DESC") $orderbyTrans = _MD_WFDOWNLOADS_RATINGHTOL;
+
+ if ($orderby == "size ASC") $orderbyTrans = _MD_WFDOWNLOADS_SIZELTOH;
+ if ($orderby == "size DESC") $orderbyTrans = _MD_WFDOWNLOADS_SIZEHTOL;
+
return $orderbyTrans;
}
}
@@ -842,30 +824,20 @@
if (!function_exists('convertorderbyout')) {
function convertorderbyout($orderby)
{
- if ($orderby == "title ASC") {
- $orderby = "titleA";
- }
- if ($orderby == "published ASC") {
- $orderby = "dateA";
- }
- if ($orderby == "hits ASC") {
- $orderby = "hitsA";
- }
- if ($orderby == "rating ASC") {
- $orderby = "ratingA";
- }
- if ($orderby == "title DESC") {
- $orderby = "titleD";
- }
- if ($orderby == "published DESC") {
- $orderby = "dateD";
- }
- if ($orderby == "hits DESC") {
- $orderby = "hitsD";
- }
- if ($orderby == "rating DESC") {
- $orderby = "ratingD";
- }
+ if ($orderby == "title ASC") $orderby = "titleA";
+ if ($orderby == "title DESC") $orderby = "titleD";
+
+ if ($orderby == "published ASC") $orderby = "dateA";
+ if ($orderby == "published DESC") $orderby = "dateD";
+
+ if ($orderby == "hits ASC") $orderby = "hitsA";
+ if ($orderby == "hits DESC") $orderby = "hitsD";
+
+ if ($orderby == "rating ASC") $orderby = "ratingA";
+ if ($orderby == "rating DESC") $orderby = "ratingD";
+
+ if ($orderby == "size ASC") $orderby = "sizeA";
+ if ($orderby == "size DESC") $orderby = "sizeD";
return $orderby;
}
}
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/index.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/index.php 2013-10-07 19:11:27 UTC (rev 12159)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/index.php 2013-10-07 20:17:51 UTC (rev 12160)
@@ -56,7 +56,7 @@
$breadcrumb = new WfdownloadsBreadcrumb();
$breadcrumb->addLink($wfdownloads->getModule()->getVar('name'), WFDOWNLOADS_URL);
-$xoopsTpl->assign('module_home', wfdownloads_module_home(false)); // this definition is not removed for compatibility issues
+$xoopsTpl->assign('module_home', wfdownloads_module_home(false)); // this definition is not removed for backward compatibility issues
$xoopsTpl->assign('wfdownloads_breadcrumb', $breadcrumb->render());
$cat_criteria = new CriteriaCompo();
@@ -193,7 +193,7 @@
if ($wfdownloads->getConfig('subcats') == 1 AND $allSubcategories[$k]->getVar('pid') == $mainCategories[$i]->getVar('cid')) {
// if we are collecting subcat info for displaying, and this subcat is a first level child...
$subcategories[] = array(
- 'id' => $allSubcategories[$k]->getVar('cid'), // this definition is not removed for compatibility issues
+ 'id' => $allSubcategories[$k]->getVar('cid'), // this definition is not removed for backward compatibility issues
'cid' => $allSubcategories[$k]->getVar('cid'),
'allowed_download' => in_array($allSubcategories[$k]->getVar('cid'), $allowedDownCategoriesIds),
'allowed_upload' => ($isSubmissionAllowed && in_array($allSubcategories[$k]->getVar('cid'), $allowedUpCategoriesIds)),
@@ -209,15 +209,15 @@
$xoopsTpl->append(
'categories',
array(
- 'image' => $imageURL, // this definition is not removed for compatibility issues
+ 'image' => $imageURL, // this definition is not removed for backward compatibility issues
'image_URL' => $imageURL,
- 'id' => (int)$mainCategories[$i]->getVar('cid'), // this definition is not removed for compatibility issues
+ 'id' => (int)$mainCategories[$i]->getVar('cid'), // this definition is not removed for backward compatibility issues
'cid' => (int)$mainCategories[$i]->getVar('cid'),
'allowed_download' => in_array($mainCategories[$i]->getVar('cid'), $allowedDownCategoriesIds),
'allowed_upload' => ($isSubmissionAllowed && in_array($mainCategories[$i]->getVar('cid'), $allowedUpCategoriesIds)),
'title' => $mainCategories[$i]->getVar('title'),
'summary' => $mainCategories[$i]->getVar('summary'),
- 'totaldownloads' => (int)$download_count, // this definition is not removed for compatibility issues
+ 'totaldownloads' => (int)$download_count, // this definition is not removed for backward compatibility issues
'downloads_count' => (int)$download_count,
'count' => (int)$count,
'alttext' => $isNewImage['alttext']
@@ -227,16 +227,16 @@
$xoopsTpl->append(
'categories',
array(
- 'image' => $imageURL, // this definition is not removed for compatibility issues
+ 'image' => $imageURL, // this definition is not removed for backward compatibility issues
'image_URL' => $imageURL,
- 'id' => (int)$mainCategories[$i]->getVar('cid'), // this definition is not removed for compatibility issues
+ 'id' => (int)$mainCategories[$i]->getVar('cid'), // this definition is not removed for backward compatibility issues
'cid' => (int)$mainCategories[$i]->getVar('cid'),
'allowed_download' => in_array($mainCategories[$i]->getVar('cid'), $allowedDownCategoriesIds),
'allowed_upload' => ($isSubmissionAllowed && in_array($mainCategories[$i]->getVar('cid'), $allowedUpCategoriesIds)),
'title' => $mainCategories[$i]->getVar('title'),
'summary' => $mainCategories[$i]->getVar('summary'),
'subcategories' => $subcategories,
- 'totaldownloads' => (int)$download_count, // this definition is not removed for compatibility issues
+ 'totaldownloads' => (int)$download_count, // this definition is not removed for backward compatibility issues
'downloads_count' => (int)$download_count,
'count' => (int)$count,
'alttext' => $isNewImage['alttext']
@@ -257,7 +257,7 @@
"<a href='" . $rsslink_URL . "' title='" . _MD_WFDOWNLOADS_LEGENDTEXTRSS . "'><img src='" . XOOPS_URL . "/modules/" . $wfdownloads->getModule(
)->getVar('dirname') . "/images/icon/rss.gif' border='0' alt='" . _MD_WFDOWNLOADS_LEGENDTEXTRSS . "' title='" . _MD_WFDOWNLOADS_LEGENDTEXTRSS
. "'></a>";
- $xoopsTpl->assign('full_rssfeed_link', $rsslink); // this definition is not removed for compatibility issues
+ $xoopsTpl->assign('full_rssfeed_link', $rsslink); // this definition is not removed for backward compatibility issues
}
include 'footer.php';
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/language/english/main.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/language/english/main.php 2013-10-07 19:11:27 UTC (rev 12159)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/language/english/main.php 2013-10-07 20:17:51 UTC (rev 12160)
@@ -46,6 +46,8 @@
define('_MD_WFDOWNLOADS_DATENEW', "Date (new files listed first)");
define('_MD_WFDOWNLOADS_RATINGLTOH', "Rating (lowest to highest score)");
define('_MD_WFDOWNLOADS_RATINGHTOL', "Rating (highest to lowest score)");
+define('_MD_WFDOWNLOADS_SIZELTOH', "Size (smallest to largest)");
+define('_MD_WFDOWNLOADS_SIZEHTOL', "Size (largest to smallest)");
define('_MD_WFDOWNLOADS_DESCRIPTIONC', "Description");
define('_MD_WFDOWNLOADS_CATEGORYC', "Category");
define('_MD_WFDOWNLOADS_VERSION', "Version");
@@ -112,6 +114,7 @@
define('_MD_WFDOWNLOADS_TITLE', "Title");
define('_MD_WFDOWNLOADS_DATE', "Date");
define('_MD_WFDOWNLOADS_POPULARITY', "Popularity");
+define('_MD_WFDOWNLOADS_SIZE', "Size");
define('_MD_WFDOWNLOADS_TOPRATED', "Rating");
define('_MD_WFDOWNLOADS_CURSORTBY', "Downloads currently sorted by: %s");
define('_MD_WFDOWNLOADS_CANCEL', "Cancel");
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/language/english/modinfo.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/language/english/modinfo.php 2013-10-07 19:11:27 UTC (rev 12159)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/language/english/modinfo.php 2013-10-07 20:17:51 UTC (rev 12160)
@@ -333,3 +333,6 @@
define('_MI_WFDOWNLOADS_AUTOSUMMARY1', _NO);
define('_MI_WFDOWNLOADS_AUTOSUMMARY2', "If blank");
define('_MI_WFDOWNLOADS_AUTOSUMMARY3', _YES);
+
+define('_MI_WFDOWNLOADS_DISCLAIMER_DEFAULT', 'We have the right, but not the obligation to monitor and review submissions submitted by users, in the forums. We shall not be responsible for any of the content of these messages. We further reserve the right, to delete, move or edit submissions that the we, in its exclusive discretion, deems abusive, defamatory, obscene or in violation of any Copyright or Trademark laws or otherwise objectionable.');
+define('_MI_WFDOWNLOADS_DOWNDISCLAIMER_DEFAULT', 'The file downloads on this site are provided as is without warranty either expressed or implied. Downloaded files should be checked for possible virus infection using the most up-to-date detection and security packages. If you have a question concerning a particular piece of software, feel free to contact the developer. We refuse liability for any damage or loss resulting from the use or misuse of any software offered from this site for downloading. If you have any doubt at all about the safety and operation of software made available to you on this site, do not download it.<br /><br />Contact us if you have questions concerning this disclaimer.');
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/mirror.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/mirror.php 2013-10-07 19:11:27 UTC (rev 12159)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/mirror.php 2013-10-07 20:17:51 UTC (rev 12160)
@@ -66,7 +66,7 @@
$op = WfdownloadsRequest::getString('op', 'mirror.add');
switch ($op) {
case "mirrors.list" :
- case "list" : // this case is not removed for compatibility issues
+ case "list" : // this case is not removed for backward compatibility issues
$start = WfdownloadsRequest::getInt('start', 0);
$xoopsOption['template_main'] = 'wfdownloads_mirrors.html';
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/newlist.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/newlist.php 2013-10-07 19:11:27 UTC (rev 12159)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/newlist.php 2013-10-07 20:17:51 UTC (rev 12160)
@@ -73,7 +73,7 @@
$xoopsTpl->assign('lang_dltimes', sprintf(_MD_WFDOWNLOADS_DLTIMES, $downloadInfo['hits']));
$xoopsTpl->assign('lang_subdate', $downloadInfo['is_updated']);
$xoopsTpl->append('file', $downloadInfo);
- $xoopsTpl->append('downloads', $downloadInfo); // this definition is not removed for compatibility issues
+ $xoopsTpl->append('downloads', $downloadInfo); // this definition is not removed for backward compatibility issues
}
// Screenshots display
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/ratefile.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/ratefile.php 2013-10-07 19:11:27 UTC (rev 12159)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/ratefile.php 2013-10-07 20:17:51 UTC (rev 12160)
@@ -167,7 +167,7 @@
$xoopsTpl->assign(
'file',
array('id' => $lid, 'lid' => $lid, 'cid' => $cid, 'title' => $download->getVar('title'), 'imageheader' => wfdownloads_headerImage())
- ); // this definition is not removed for compatibility issues
+ ); // this definition is not removed for backward compatibility issues
include 'footer.php';
}
break;
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/review.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/review.php 2013-10-07 19:11:27 UTC (rev 12159)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/review.php 2013-10-07 20:17:51 UTC (rev 12160)
@@ -66,7 +66,7 @@
$op = WfdownloadsRequest::getString('op', 'review.add');
switch ($op) {
case "reviews.list" :
- case "list" : // this care is not removed for compatibility issues
+ case "list" : // this care is not removed for backward compatibility issues
$start = WfdownloadsRequest::getInt('start', 0);
$xoopsOption['template_main'] = 'wfdownloads_reviews.html';
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/singlefile.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/singlefile.php 2013-10-07 19:11:27 UTC (rev 12159)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/singlefile.php 2013-10-07 20:17:51 UTC (rev 12160)
@@ -182,7 +182,7 @@
// Get download informations
$downloadInfo = $download->getDownloadInfo();
-$xoopsTpl->assign('categoryPath', $downloadInfo['path'] . ' > ' . $downloadInfo['title']); // this definition is not removed for compatibility issues
+$xoopsTpl->assign('categoryPath', $downloadInfo['path'] . ' > ' . $downloadInfo['title']); // this definition is not removed for backward compatibility issues
$xoopsTpl->assign('lang_dltimes', sprintf(_MD_WFDOWNLOADS_DLTIMES, $downloadInfo['hits']));
$xoopsTpl->assign('lang_subdate', $downloadInfo['is_updated']);
$xoopsTpl->append('file', $downloadInfo);
@@ -218,7 +218,7 @@
$downloadByUser['lid'] = (int)$download->getVar('lid');
$downloadByUser['cid'] = (int)$download->getVar('cid');
$downloadByUser['published'] = formatTimestamp($download->getVar('published'), $wfdownloads->getConfig('dateformat'));
- $xoopsTpl->append('down_uid', $downloadByUser); // this definition is not removed for compatibility issues
+ $xoopsTpl->append('down_uid', $downloadByUser); // this definition is not removed for backward compatibility issues
$xoopsTpl->append('downloads_by_user', $downloadByUser);
}
@@ -262,7 +262,7 @@
if ($wfdownloads->getConfig('copyright') == true) {
$xoopsTpl->assign('lang_copyright', $download->getVar('title') . ' © ' . _MD_WFDOWNLOADS_COPYRIGHT . ' ' . formatTimestamp(time(), 'Y'));
}
-$xoopsTpl->assign('down', $downloadInfo); // this definition is not removed for compatibility issues
+$xoopsTpl->assign('down', $downloadInfo); // this definition is not removed for backward compatibility issues
$xoopsTpl->assign('download', $downloadInfo);
include XOOPS_ROOT_PATH . '/include/comment_view.php';
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/submit.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/submit.php 2013-10-07 19:11:27 UTC (rev 12159)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/submit.php 2013-10-07 20:17:51 UTC (rev 12160)
@@ -98,12 +98,12 @@
$xoopsTpl->assign('download_disclaimer', false);
$xoopsTpl->assign('submission_disclaimer_content', $myts->displayTarea($wfdownloads->getConfig('disclaimer'), true, true, true, true, true));
- $xoopsTpl->assign('down_disclaimer', false); // this definition is not removed for compatibility issues
+ $xoopsTpl->assign('down_disclaimer', false); // this definition is not removed for backward compatibility issues
$xoopsTpl->assign(
'disclaimer',
$myts->displayTarea($wfdownloads->getConfig('disclaimer'), true, true, true, true, true)
- ); // this definition is not removed for compatibility issues
- $xoopsTpl->assign('cancel_location', WFDOWNLOADS_URL . '/index.php'); // this definition is not removed for compatibility issues
+ ); // this definition is not removed for backward compatibility issues
+ $xoopsTpl->assign('cancel_location', WFDOWNLOADS_URL . '/index.php'); // this definition is not removed for backward compatibility issues
if (!isset($_REQUEST['lid'])) {
$xoopsTpl->assign('agree_location', WFDOWNLOADS_URL . "/{$currentFile}?agreed=1");
} else {
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/templates/wfdownloads_viewcat.html
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/templates/wfdownloads_viewcat.html 2013-10-07 19:11:27 UTC (rev 12159)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/templates/wfdownloads_viewcat.html 2013-10-07 20:17:51 UTC (rev 12160)
@@ -223,6 +223,23 @@
title="<{$smarty.const._MD_WFDOWNLOADS_POPULARITYMTOL}>"><{$smarty.const._MD_WFDOWNLOADS_POPULARITY}> <img
src="<{xoModuleIcons16 down.gif}>" alt="↓"></a>
<{/if}>
+ |
+ <{if ($orderby == "sizeA")}>
+ <span class='button_green' title="<{$smarty.const._MD_WFDOWNLOADS_SIZELTOH}>"><{$smarty.const._MD_WFDOWNLOADS_SIZE}> <img
+ src="<{xoModuleIcons16 up.gif}>" alt="↑"></span>
+ <{else}>
+ <a class='button_grey' href="viewcat.php?cid=<{$category_cid}>&orderby=sizeA"
+ title="<{$smarty.const._MD_WFDOWNLOADS_SIZELTOH}>"><{$smarty.const._MD_WFDOWNLOADS_SIZE}> <img
+ src="<{xoModuleIcons16 up.gif}>" alt="↑"></a>
+ <{/if}>
+ <{if ($orderby == "sizeD")}>
+ <span class='button_green' title="<{$smarty.const._MD_WFDOWNLOADS_SIZEHTOL}>"><{$smarty.const._MD_WFDOWNLOADS_SIZE}> <img
+ src="<{xoModuleIcons16 down.gif}>" alt="↓"></span>
+ <{else}>
+ <a class='button_grey' href="viewcat.php?cid=<{$category_cid}>&orderby=sizeD"
+ title="<{$smarty.const._MD_WFDOWNLOADS_SIZEHTOL}>"><{$smarty.const._MD_WFDOWNLOADS_SIZE}> <img
+ src="<{xoModuleIcons16 down.gif}>" alt="↓"></a>
+ <{/if}>
</div>
</div>
<{/if}>
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/viewcat.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/viewcat.php 2013-10-07 19:11:27 UTC (rev 12159)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/viewcat.php 2013-10-07 20:17:51 UTC (rev 12160)
@@ -75,8 +75,8 @@
$xoTheme->addStylesheet(WFDOWNLOADS_URL . '/thickbox.css');
$xoopsTpl->assign('wfdownloads_url', WFDOWNLOADS_URL . '/');
-$xoopsTpl->assign('cid', $cid); // this definition is not removed for compatibility issues
-$xoopsTpl->assign('category_id', $cid); // this definition is not removed for compatibility issues
+$xoopsTpl->assign('cid', $cid); // this definition is not removed for backward compatibility issues
+$xoopsTpl->assign('category_id', $cid); // this definition is not removed for backward compatibility issues
$xoopsTpl->assign('category_cid', $cid);
// Retreiving the top parent category
@@ -84,7 +84,7 @@
$allSubcatsTopParentCid = $wfdownloads->getHandler('category')->getAllSubcatsTopParentCid();
$topCategory = $wfdownloads->getHandler('category')->allCategories[$allSubcatsTopParentCid[$cid]];
$xoopsTpl->assign('topcategory_title', $topCategory->getVar('title'));
- $xoopsTpl->assign('topcategory_image', $topCategory->getVar('imgurl')); // this definition is not removed for compatibility issues
+ $xoopsTpl->assign('topcategory_image', $topCategory->getVar('imgurl')); // this definition is not removed for backward compatibility issues
$xoopsTpl->assign('topcategory_image_URL', $topCategory->getVar('imgurl'));
$xoopsTpl->assign('topcategory_cid', $topCategory->getVar('cid'));
}
@@ -106,8 +106,8 @@
$catArray['toolbar'] = wfdownloads_toolbar();
$xoopsTpl->assign('catarray', $catArray);
-$xoopsTpl->assign('categoryPath', $wfdownloads->getHandler('category')->getNicePath($cid)); // this definition is not removed for compatibility issues
-$xoopsTpl->assign('module_home', wfdownloads_module_home(true)); // this definition is not removed for compatibility issues
+$xoopsTpl->assign('categoryPath', $wfdownloads->getHandler('category')->getNicePath($cid)); // this definition is not removed for backward compatibility issues
+$xoopsTpl->assign('module_home', wfdownloads_module_home(true)); // this definition is not removed for backward compatibility issues
// Get categories tree
$criteria = new CriteriaCompo();
@@ -179,11 +179,11 @@
: 0;
$infercategories[] = array(
'cid' => $subsubCategory->getVar('cid'),
- 'id' => $subsubCategory->getVar('cid'), // this definition is not removed for compatibility issues
+ 'id' => $subsubCategory->getVar('cid'), // this definition is not removed for backward compatibility issues
'title' => $subsubCategory->getVar('title'),
'image' => $imageURL,
'image_URL' => $imageURL,
- 'count' => $download_count, // this definition is not removed for compatibility issues
+ 'count' => $download_count, // this definition is not removed for backward compatibility issues
'downloads_count' => $download_count
);
}
@@ -199,18 +199,18 @@
'subcategories',
array(
'title' => $subcategory->getVar('title'),
- 'image' => $imageURL, // this definition is not removed for compatibility issues
+ 'image' => $imageURL, // this definition is not removed for backward compatibility issues
'image_URL' => $imageURL,
- 'id' => $subcategory->getVar('cid'), // this definition is not removed for compatibility issues
+ 'id' => $subcategory->getVar('cid'), // this definition is not removed for backward compatibility issues
'cid' => $subcategory->getVar('cid'),
'allowed_download' => in_array($subcategory->getVar('cid'), $allowedDownCategoriesIds),
'allowed_upload' => ($isSubmissionAllowed && in_array($subcategory->getVar('cid'), $allowedUpCategoriesIds)),
'summary' => $subcategory->getVar('summary'),
'infercategories' => $infercategories,
'subcategories' => $infercategories,
- 'totallinks' => $catdowncount, // this definition is not removed for compatibility issues
+ 'totallinks' => $catdowncount, // this definition is not removed for backward compatibility issues
'downloads_count' => $catdowncount,
- 'count' => $scount, // this definition is not removed for compatibility issues
+ 'count' => $scount, // this definition is not removed for backward compatibility issues
'subcategories_count' => $catdowncount,
)
);
@@ -249,7 +249,7 @@
}
$xoopsTpl->assign('xoops_pagetitle', $categories[$cid]->getVar('title') . ' | ' . $wfdownloads->getModule()->name());
- $xoopsTpl->assign('category_image', $imageURL); // this definition is not removed for compatibility issues
+ $xoopsTpl->assign('category_image', $imageURL); // this definition is not removed for backward compatibility issues
$xoopsTpl->assign('category_image_URL', $imageURL);
}
@@ -279,7 +279,7 @@
$downloadInfo = $downloads[$i]->getDownloadInfo();
$xoopsTpl->assign('lang_dltimes', sprintf(_MD_WFDOWNLOADS_DLTIMES, $downloadInfo['hits']));
$xoopsTpl->assign('lang_subdate', $downloadInfo['is_updated']);
- $xoopsTpl->append('file', $downloadInfo); // this definition is not removed for compatibility issues
+ $xoopsTpl->append('file', $downloadInfo); // this definition is not removed for backward compatibility issues
$xoopsTpl->append('downloads', $downloadInfo);
}
@@ -312,7 +312,7 @@
$pagenav = new XoopsPageNav($downloads_count, $wfdownloads->getConfig('perpage'), $start, 'start', 'cid=' . $cid);
}
$page_nav = $pagenav->renderNav();
- $xoopsTpl->assign('page_nav', (isset($page_nav) && !empty($page_nav))); // this definition is not removed for compatibility issues
+ $xoopsTpl->assign('page_nav', (isset($page_nav) && !empty($page_nav))); // this definition is not removed for backward compatibility issues
$xoopsTpl->assign('pagenav', $pagenav->renderNav());
}
@@ -327,7 +327,7 @@
$rsslink = "<a href='" . $rsslink_URL . "' title='" . _MD_WFDOWNLOADS_LEGENDTEXTCATRSS . "'><img src='" . XOOPS_URL . "/modules/"
. $wfdownloads->getModule()->getVar('dirname') . "/images/icon/rss.gif' border='0' alt='" . _MD_WFDOWNLOADS_LEGENDTEXTCATRSS . "' title='"
. _MD_WFDOWNLOADS_LEGENDTEXTCATRSS . "'></a>";
- $xoopsTpl->assign('cat_rssfeed_link', $rsslink); // this definition is not removed for compatibility issues
+ $xoopsTpl->assign('cat_rssfeed_link', $rsslink); // this definition is not removed for backward compatibility issues
}
include 'footer.php';
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/visit.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/visit.php 2013-10-07 19:11:27 UTC (rev 12159)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/visit.php 2013-10-07 20:17:51 UTC (rev 12160)
@@ -107,12 +107,12 @@
$xoopsTpl->assign('download_disclaimer', truee);
$xoopsTpl->assign('download_disclaimer_content', $myts->displayTarea($wfdownloads->getConfig('downdisclaimer'), true, true, true, true, true));
- $xoopsTpl->assign('down_disclaimer', true); // this definition is not removed for compatibility issues
+ $xoopsTpl->assign('down_disclaimer', true); // this definition is not removed for backward compatibility issues
$xoopsTpl->assign(
'downdisclaimer',
$myts->displayTarea($wfdownloads->getConfig('downdisclaimer'), true, true, true, true, true)
- ); // this definition is not removed for compatibility issues
- $xoopsTpl->assign('cancel_location', WFDOWNLOADS_URL . '/index.php'); // this definition is not removed for compatibility issues
+ ); // this definition is not removed for backward compatibility issues
+ $xoopsTpl->assign('cancel_location', WFDOWNLOADS_URL . '/index.php'); // this definition is not removed for backward compatibility issues
$xoopsTpl->assign('agree_location', WFDOWNLOADS_URL . "/{$currentFile}?agree=1&lid={$lid}&cid={$cid}");
include 'footer.php';
} else {
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/xoops_version.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/xoops_version.php 2013-10-07 19:11:27 UTC (rev 12159)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/xoops_version.php 2013-10-07 20:17:51 UTC (rev 12160)
@@ -506,7 +506,7 @@
'description' => '_MI_WFDOWNLOADS_DISCLAIMERDSC',
'formtype' => 'textarea',
'valuetype' => 'text',
- 'default' => 'We have the right, but not the obligation to monitor and review submissions submitted by users, in the forums. We shall not be responsible for any of the content of these messages. We further reserve the right, to delete, move or edit submissions that the we, in its exclusive discretion, deems abusive, defamatory, obscene or in violation of any Copyright or Trademark laws or otherwise objectionable.'
+ 'default' => _MI_WFDOWNLOADS_DISCLAIMER_DEFAULT
);
@@ -544,7 +544,7 @@
'description' => '_MI_WFDOWNLOADS_DOWNDISCLAIMERDSC',
'formtype' => 'textarea',
'valuetype' => 'text',
- 'default' => 'The file downloads on this site are provided as is without warranty either expressed or implied. Downloaded files should be checked for possible virus infection using the most up-to-date detection and security packages. If you have a question concerning a particular piece of software, feel free to contact the developer. We refuse liability for any damage or loss resulting from the use or misuse of any software offered from this site for downloading. If you have any doubt at all about the safety and operation of software made available to you on this site, do not download it.<br /><br />Contact us if you have questions concerning this disclaimer.'
+ 'default' => _MI_WFDOWNLOADS_DOWNDISCLAIMER_DEFAULT
);
|
|
From: <be...@us...> - 2013-10-07 19:11:32
|
Revision: 12159
http://sourceforge.net/p/xoops/svn/12159
Author: beckmi
Date: 2013-10-07 19:11:27 +0000 (Mon, 07 Oct 2013)
Log Message:
-----------
fixed UTF-8 bug in email sending (cesag/mamba), PSR-2 code reformatting
Modified Paths:
--------------
XoopsModules/contact/trunk/contact/admin/about.php
XoopsModules/contact/trunk/contact/admin/contact.php
XoopsModules/contact/trunk/contact/admin/footer.php
XoopsModules/contact/trunk/contact/admin/header.php
XoopsModules/contact/trunk/contact/admin/index.html
XoopsModules/contact/trunk/contact/admin/index.php
XoopsModules/contact/trunk/contact/admin/log.php
XoopsModules/contact/trunk/contact/admin/menu.php
XoopsModules/contact/trunk/contact/admin/tools.php
XoopsModules/contact/trunk/contact/ajax.php
XoopsModules/contact/trunk/contact/class/contact.php
XoopsModules/contact/trunk/contact/class/index.html
XoopsModules/contact/trunk/contact/docs/ajax.html
XoopsModules/contact/trunk/contact/docs/changelog.txt
XoopsModules/contact/trunk/contact/docs/credits.txt
XoopsModules/contact/trunk/contact/docs/index.html
XoopsModules/contact/trunk/contact/docs/readme.html
XoopsModules/contact/trunk/contact/header.php
XoopsModules/contact/trunk/contact/images/index.html
XoopsModules/contact/trunk/contact/include/functions.php
XoopsModules/contact/trunk/contact/include/functions_update.php
XoopsModules/contact/trunk/contact/index.php
XoopsModules/contact/trunk/contact/js/admin.js
XoopsModules/contact/trunk/contact/language/english/admin.php
XoopsModules/contact/trunk/contact/language/english/help/index.html
XoopsModules/contact/trunk/contact/language/english/main.php
XoopsModules/contact/trunk/contact/language/english/modinfo.php
XoopsModules/contact/trunk/contact/language/index.html
XoopsModules/contact/trunk/contact/templates/admin/contact_about.html
XoopsModules/contact/trunk/contact/templates/admin/contact_contact.html
XoopsModules/contact/trunk/contact/templates/admin/contact_index.html
XoopsModules/contact/trunk/contact/templates/admin/contact_logs.html
XoopsModules/contact/trunk/contact/templates/admin/contact_tools.html
XoopsModules/contact/trunk/contact/templates/admin/index.html
XoopsModules/contact/trunk/contact/templates/index.html
XoopsModules/contact/trunk/contact/xoops_version.php
Modified: XoopsModules/contact/trunk/contact/admin/about.php
===================================================================
--- XoopsModules/contact/trunk/contact/admin/about.php 2013-10-07 19:04:54 UTC (rev 12158)
+++ XoopsModules/contact/trunk/contact/admin/about.php 2013-10-07 19:11:27 UTC (rev 12159)
@@ -32,4 +32,3 @@
$xoopsTpl->display(XOOPS_ROOT_PATH . '/modules/contact/templates/admin/contact_about.html');
// Call footer
require dirname(__FILE__) . '/footer.php';
-?>
\ No newline at end of file
Modified: XoopsModules/contact/trunk/contact/admin/contact.php
===================================================================
--- XoopsModules/contact/trunk/contact/admin/contact.php 2013-10-07 19:04:54 UTC (rev 12158)
+++ XoopsModules/contact/trunk/contact/admin/contact.php 2013-10-07 19:11:27 UTC (rev 12159)
@@ -25,7 +25,7 @@
// Display Admin header
xoops_cp_header();
// Define default value
-$op = $contact_handler->Contact_CleanVars($_REQUEST, 'op', 'list', 'string');
+$op = $contact_handler->Contact_CleanVars($_REQUEST, 'op', 'list', 'string');
$contact_id = $contact_handler->Contact_CleanVars($_REQUEST, 'id', '0', 'int');
// Define scripts
@@ -37,167 +37,166 @@
$xoTheme->addStylesheet(XOOPS_URL . '/modules/system/css/ui/' . xoops_getModuleOption('jquery_theme', 'system') . '/ui.all.css');
$xoTheme->addStylesheet(XOOPS_URL . '/modules/system/css/admin.css');
-switch ($op)
-{
- case 'list':
- $contact = array();
- $contact['perpage'] = xoops_getModuleOption('admin_perpage','contact');
- $contact['order'] = 'DESC';
- $contact['sort'] = 'contact_id';
-
- // get limited information
- if (isset($_REQUEST['limit'])) {
- $contact['limit'] = $contact_handler->Contact_CleanVars($_REQUEST, 'limit', 0, 'int');
- } else {
- $contact['limit'] = $contact['perpage'];
- }
+switch ($op) {
+ case 'list':
+ $contact = array();
+ $contact['perpage'] = xoops_getModuleOption('admin_perpage', 'contact');
+ $contact['order'] = 'DESC';
+ $contact['sort'] = 'contact_id';
- // get start information
- if (isset($_REQUEST['start'])) {
- $contact['start'] = $contact_handler->Contact_CleanVars($_REQUEST, 'start', 0, 'int');
- } else {
- $contact['start'] = 0;
- }
-
- $contact_numrows = $contact_handler->Contact_GetCount('contact_cid');
- $contacts = $contact_handler->Contact_GetAdminList($contact , 'contact_cid');
+ // get limited information
+ if (isset($_REQUEST['limit'])) {
+ $contact['limit'] = $contact_handler->Contact_CleanVars($_REQUEST, 'limit', 0, 'int');
+ } else {
+ $contact['limit'] = $contact['perpage'];
+ }
- if ($contact_numrows > $contact['limit']) {
- $contact_pagenav = new XoopsPageNav($contact_numrows, $contact['limit'], $contact['start'], 'start', 'limit=' . $contact['limit']);
- $contact_pagenav = $contact_pagenav->renderNav(4);
- } else {
- $contact_pagenav = '';
- }
-
- $xoopsTpl->assign('contacts', $contacts);
- $xoopsTpl->assign('contact_pagenav', $contact_pagenav);
- $level = 'list';
- break;
-
- case 'reply':
- if ($contact_id > 0) {
- $obj = $contact_handler->get($contact_id);
- if($obj->getVar('contact_cid') != 0) {
- redirect_header ( 'contact.php', 3, _AM_CONTACT_CANTREPLY);
- }
- $form = $obj->Contact_ReplyForm();
- $xoopsTpl->assign('replyform', $form->render());
- $xoopsTpl->assign('replylist', $contact_handler->Contact_GetReply($contact_id));
- } else {
- redirect_header ( 'contact.php', 3, _AM_CONTACT_MSG_EXIST);
- }
- $level = 'reply';
- break;
-
- case 'doreply':
-
- // check email
- if ( !$contact_handler->Contact_CleanVars($_POST, 'contact_mailto', '', 'mail') ) {
- redirect_header ( "contact.php", 3, _MD_CONTACT_MES_NOVALIDEMAIL );
- exit();
- }
-
- // Info Processing
- $contact = $contact_handler->Contact_InfoProcessing($_POST);
-
- // insert in DB
- if($saveinfo = true) {
- $obj = $contact_handler->create();
- $obj->setVars ( $contact );
+ // get start information
+ if (isset($_REQUEST['start'])) {
+ $contact['start'] = $contact_handler->Contact_CleanVars($_REQUEST, 'start', 0, 'int');
+ } else {
+ $contact['start'] = 0;
+ }
- if(!$contact_handler->insert ( $obj )) {
- redirect_header ( "contact.php", 3, '4' );
- exit();
- }
-
- $contact_handler->Contact_AddReply( $contact['contact_cid'] );
-
- }
+ $contact_numrows = $contact_handler->Contact_GetCount('contact_cid');
+ $contacts = $contact_handler->Contact_GetAdminList($contact, 'contact_cid');
- // send mail can seet message
- if($sendmail = true) {
- $message = $contact_handler->Contact_ReplyMail($contact);
- } else if ($saveinfo = true) {
- $message = _MD_CONTACT_MES_SAVEINDB;
- } else {
- $message = _MD_CONTACT_MES_SENDERROR;
- }
-
- redirect_header ( "contact.php", 3, $message );
+ if ($contact_numrows > $contact['limit']) {
+ $contact_pagenav = new XoopsPageNav($contact_numrows, $contact['limit'], $contact['start'], 'start', 'limit=' . $contact['limit']);
+ $contact_pagenav = $contact_pagenav->renderNav(4);
+ } else {
+ $contact_pagenav = '';
+ }
- $level = 'doreply';
- break;
-
- case 'view':
+ $xoopsTpl->assign('contacts', $contacts);
+ $xoopsTpl->assign('contact_pagenav', $contact_pagenav);
+ $level = 'list';
+ break;
- $obj = $contact_handler->get ( $contact_id );
-
- if(!$obj) {
- redirect_header ( 'contact.php', 3, _AM_CONTACT_MSG_EXIST);
- exit ();
- }
-
- $contact = array ();
- $contact = $obj->toArray ();
- $contact['contact_id'] = $obj->getVar('contact_id');
- $contact['contact_uid'] = $obj->getVar('contact_uid');
- $contact['contact_name'] = $obj->getVar('contact_name');
- $contact['contact_owner'] = XoopsUser::getUnameFromId ( $obj->getVar('contact_uid') );
- $contact['contact_subject'] = $obj->getVar('contact_subject');
- $contact['contact_mail'] = $obj->getVar('contact_mail');
- $contact['contact_url'] = $obj->getVar('contact_url');
- $contact['contact_create'] = formatTimestamp ( $obj->getVar('contact_create'), _MEDIUMDATESTRING );
- $contact['contact_icq'] = $obj->getVar('contact_icq');
- $contact['contact_company'] = $obj->getVar('contact_company');
- $contact['contact_location'] = $obj->getVar('contact_location');
- $contact['contact_phone'] = $obj->getVar('contact_phone');
- $contact['contact_department'] = $obj->getVar('contact_department');
- $contact['contact_ip'] = $obj->getVar('contact_ip');
- $contact['contact_message'] = $obj->getVar('contact_message');
- $contact['contact_address'] = $obj->getVar('contact_address');
-
- $xoopsTpl->assign('contact', $contact);
- $xoopsTpl->assign('replylist', $contact_handler->Contact_GetReply($contact_id));
-
- $level = 'view';
- break;
-
- case 'delete':
-
- if ($contact_id > 0) {
- // Prompt message
- xoops_confirm(array("id" => $contact_id), 'contact.php?op=dodelete', _AM_CONTACT_MSG_DELETE);
- } else {
- redirect_header ( 'contact.php', 3, _AM_CONTACT_MSG_EXIST);
- }
+ case 'reply':
+ if ($contact_id > 0) {
+ $obj = $contact_handler->get($contact_id);
+ if ($obj->getVar('contact_cid') != 0) {
+ redirect_header('contact.php', 3, _AM_CONTACT_CANTREPLY);
+ }
+ $form = $obj->Contact_ReplyForm();
+ $xoopsTpl->assign('replyform', $form->render());
+ $xoopsTpl->assign('replylist', $contact_handler->Contact_GetReply($contact_id));
+ } else {
+ redirect_header('contact.php', 3, _AM_CONTACT_MSG_EXIST);
+ }
+ $level = 'reply';
+ break;
- $level = 'delete';
- break;
-
- case 'dodelete':
-
- if (!$contact_id > 0) {
- redirect_header ( 'contact.php', 3, _AM_CONTACT_MSG_EXIST);
- xoops_cp_footer ();
- exit ();
- }
-
- $criteria = new CriteriaCompo ();
- $criteria->add ( new Criteria ( 'contact_id', $contact_id ) );
- $criteria->add ( new Criteria ( 'contact_cid', $contact_id ), 'OR' );
+ case 'doreply':
- if (! $contact_handler->deleteAll($criteria)) {
- redirect_header ( 'contact.php', 1, _AM_CONTACT_MSG_DELETEERROR );
- xoops_cp_footer ();
- exit ();
- }
-
- redirect_header ( 'contact.php', 1, _AM_CONTACT_MSG_DELETED );
- xoops_cp_footer ();
- exit ();
- break;
-}
+ // check email
+ if (!$contact_handler->Contact_CleanVars($_POST, 'contact_mailto', '', 'mail')) {
+ redirect_header("contact.php", 3, _MD_CONTACT_MES_NOVALIDEMAIL);
+ exit();
+ }
+ // Info Processing
+ $contact = $contact_handler->Contact_InfoProcessing($_POST);
+
+ // insert in DB
+ if ($saveinfo = true) {
+ $obj = $contact_handler->create();
+ $obj->setVars($contact);
+
+ if (!$contact_handler->insert($obj)) {
+ redirect_header("contact.php", 3, '4');
+ exit();
+ }
+
+ $contact_handler->Contact_AddReply($contact['contact_cid']);
+
+ }
+
+ // send mail can seet message
+ if ($sendmail = true) {
+ $message = $contact_handler->Contact_ReplyMail($contact);
+ } elseif ($saveinfo = true) {
+ $message = _MD_CONTACT_MES_SAVEINDB;
+ } else {
+ $message = _MD_CONTACT_MES_SENDERROR;
+ }
+
+ redirect_header("contact.php", 3, $message);
+
+ $level = 'doreply';
+ break;
+
+ case 'view':
+
+ $obj = $contact_handler->get($contact_id);
+
+ if (!$obj) {
+ redirect_header('contact.php', 3, _AM_CONTACT_MSG_EXIST);
+ exit ();
+ }
+
+ $contact = array();
+ $contact = $obj->toArray();
+ $contact['contact_id'] = $obj->getVar('contact_id');
+ $contact['contact_uid'] = $obj->getVar('contact_uid');
+ $contact['contact_name'] = $obj->getVar('contact_name');
+ $contact['contact_owner'] = XoopsUser::getUnameFromId($obj->getVar('contact_uid'));
+ $contact['contact_subject'] = $obj->getVar('contact_subject');
+ $contact['contact_mail'] = $obj->getVar('contact_mail');
+ $contact['contact_url'] = $obj->getVar('contact_url');
+ $contact['contact_create'] = formatTimestamp($obj->getVar('contact_create'), _MEDIUMDATESTRING);
+ $contact['contact_icq'] = $obj->getVar('contact_icq');
+ $contact['contact_company'] = $obj->getVar('contact_company');
+ $contact['contact_location'] = $obj->getVar('contact_location');
+ $contact['contact_phone'] = $obj->getVar('contact_phone');
+ $contact['contact_department'] = $obj->getVar('contact_department');
+ $contact['contact_ip'] = $obj->getVar('contact_ip');
+ $contact['contact_message'] = $obj->getVar('contact_message');
+ $contact['contact_address'] = $obj->getVar('contact_address');
+
+ $xoopsTpl->assign('contact', $contact);
+ $xoopsTpl->assign('replylist', $contact_handler->Contact_GetReply($contact_id));
+
+ $level = 'view';
+ break;
+
+ case 'delete':
+
+ if ($contact_id > 0) {
+ // Prompt message
+ xoops_confirm(array("id" => $contact_id), 'contact.php?op=dodelete', _AM_CONTACT_MSG_DELETE);
+ } else {
+ redirect_header('contact.php', 3, _AM_CONTACT_MSG_EXIST);
+ }
+
+ $level = 'delete';
+ break;
+
+ case 'dodelete':
+
+ if (!$contact_id > 0) {
+ redirect_header('contact.php', 3, _AM_CONTACT_MSG_EXIST);
+ xoops_cp_footer();
+ exit ();
+ }
+
+ $criteria = new CriteriaCompo ();
+ $criteria->add(new Criteria ('contact_id', $contact_id));
+ $criteria->add(new Criteria ('contact_cid', $contact_id), 'OR');
+
+ if (!$contact_handler->deleteAll($criteria)) {
+ redirect_header('contact.php', 1, _AM_CONTACT_MSG_DELETEERROR);
+ xoops_cp_footer();
+ exit ();
+ }
+
+ redirect_header('contact.php', 1, _AM_CONTACT_MSG_DELETED);
+ xoops_cp_footer();
+ exit ();
+ break;
+}
+
$xoopsTpl->assign('navigation', $admin_class->addNavigation('contact.php'));
$xoopsTpl->assign('level', $level);
@@ -205,4 +204,3 @@
$xoopsTpl->display(XOOPS_ROOT_PATH . '/modules/contact/templates/admin/contact_contact.html');
// Call footer
require dirname(__FILE__) . '/footer.php';
-?>
\ No newline at end of file
Modified: XoopsModules/contact/trunk/contact/admin/footer.php
===================================================================
--- XoopsModules/contact/trunk/contact/admin/footer.php 2013-10-07 19:04:54 UTC (rev 12158)
+++ XoopsModules/contact/trunk/contact/admin/footer.php 2013-10-07 19:11:27 UTC (rev 12159)
@@ -21,4 +21,3 @@
*/
xoops_cp_footer();
-?>
\ No newline at end of file
Modified: XoopsModules/contact/trunk/contact/admin/header.php
===================================================================
--- XoopsModules/contact/trunk/contact/admin/header.php 2013-10-07 19:04:54 UTC (rev 12158)
+++ XoopsModules/contact/trunk/contact/admin/header.php 2013-10-07 19:11:27 UTC (rev 12159)
@@ -50,4 +50,4 @@
redirect_header("../../../admin.php", 5, _AM_MODULEADMIN_MISSING, false);
}
-$admin_class = new ModuleAdmin();
\ No newline at end of file
+$admin_class = new ModuleAdmin();
Modified: XoopsModules/contact/trunk/contact/admin/index.html
===================================================================
--- XoopsModules/contact/trunk/contact/admin/index.html 2013-10-07 19:04:54 UTC (rev 12158)
+++ XoopsModules/contact/trunk/contact/admin/index.html 2013-10-07 19:11:27 UTC (rev 12159)
@@ -1 +1 @@
- <script>history.go(-1);</script>
\ No newline at end of file
+<script>history.go(-1);</script>
Modified: XoopsModules/contact/trunk/contact/admin/index.php
===================================================================
--- XoopsModules/contact/trunk/contact/admin/index.php 2013-10-07 19:04:54 UTC (rev 12158)
+++ XoopsModules/contact/trunk/contact/admin/index.php 2013-10-07 19:11:27 UTC (rev 12159)
@@ -35,4 +35,3 @@
$xoopsTpl->display(XOOPS_ROOT_PATH . '/modules/contact/templates/admin/contact_index.html');
// Call footer
require dirname(__FILE__) . '/footer.php';
-?>
\ No newline at end of file
Modified: XoopsModules/contact/trunk/contact/admin/log.php
===================================================================
--- XoopsModules/contact/trunk/contact/admin/log.php 2013-10-07 19:04:54 UTC (rev 12158)
+++ XoopsModules/contact/trunk/contact/admin/log.php 2013-10-07 19:11:27 UTC (rev 12159)
@@ -27,31 +27,29 @@
// Define default value
$op = $contact_handler->Contact_CleanVars($_REQUEST, 'op', 'form', 'string');
-switch ($op)
-{
- case 'form':
- // prune manager
- $form = new XoopsThemeForm(_AM_CONTACT_LOGS_FORM, 'logs', 'log.php', 'post');
- $column = new XoopsFormSelect(_AM_CONTACT_LOGS_COLUMN, 'column','contact_phone');
- $column->addOption("contact_phone", _AM_CONTACT_LOGS_COLUMN_PHONE);
- $column->addOption("contact_url", _AM_CONTACT_LOGS_COLUMN_URL);
- $column->addOption("contact_mail", _AM_CONTACT_LOGS_COLUMN_MAIL);
- $form->addElement($column);
- $form->addElement(new XoopsFormHidden('op', 'getlog'));
- $form->addElement(new XoopsFormButton('', 'post', _SUBMIT, 'submit'));
- $xoopsTpl->assign('form', $form->render());
- break;
-
- case 'getlog':
- $column = $contact_handler->Contact_CleanVars($_REQUEST, 'column', '', 'string');
- $log = $contact_handler->Contact_Logs($column);
- $xoopsTpl->assign('logs', $log);
- break;
-}
+switch ($op) {
+ case 'form':
+ // prune manager
+ $form = new XoopsThemeForm(_AM_CONTACT_LOGS_FORM, 'logs', 'log.php', 'post');
+ $column = new XoopsFormSelect(_AM_CONTACT_LOGS_COLUMN, 'column', 'contact_phone');
+ $column->addOption("contact_phone", _AM_CONTACT_LOGS_COLUMN_PHONE);
+ $column->addOption("contact_url", _AM_CONTACT_LOGS_COLUMN_URL);
+ $column->addOption("contact_mail", _AM_CONTACT_LOGS_COLUMN_MAIL);
+ $form->addElement($column);
+ $form->addElement(new XoopsFormHidden('op', 'getlog'));
+ $form->addElement(new XoopsFormButton('', 'post', _SUBMIT, 'submit'));
+ $xoopsTpl->assign('form', $form->render());
+ break;
+ case 'getlog':
+ $column = $contact_handler->Contact_CleanVars($_REQUEST, 'column', '', 'string');
+ $log = $contact_handler->Contact_Logs($column);
+ $xoopsTpl->assign('logs', $log);
+ break;
+}
+
$xoopsTpl->assign('navigation', $admin_class->addNavigation('log.php'));
// Call template file
$xoopsTpl->display(XOOPS_ROOT_PATH . '/modules/contact/templates/admin/contact_logs.html');
// Call footer
require dirname(__FILE__) . '/footer.php';
-?>
\ No newline at end of file
Modified: XoopsModules/contact/trunk/contact/admin/menu.php
===================================================================
--- XoopsModules/contact/trunk/contact/admin/menu.php 2013-10-07 19:04:54 UTC (rev 12158)
+++ XoopsModules/contact/trunk/contact/admin/menu.php 2013-10-07 19:11:27 UTC (rev 12159)
@@ -45,7 +45,7 @@
$adminmenu[$i]["title"] = _MI_CONTACT_MENU_LOGS;
$adminmenu[$i]["link"] = "admin/log.php";
$adminmenu[$i]["desc"] = _MI_CONTACT_MENU_LOGS_DESC;
-$adminmenu[$i]["icon"] = $pathIcon32.'/exec.png';
+$adminmenu[$i]["icon"] = $pathIcon32.'/exec.png';
$i++;
$adminmenu[$i]["title"] = _MI_CONTACT_MENU_TOOLS;
$adminmenu[$i]["link"] = "admin/tools.php";
@@ -56,5 +56,3 @@
$adminmenu[$i]["link"] = "admin/about.php";
$adminmenu[$i]["desc"] = _MI_CONTACT_MENU_ABOUT_DESC;
$adminmenu[$i]["icon"] = $pathIcon32.'/about.png';
-
-?>
\ No newline at end of file
Modified: XoopsModules/contact/trunk/contact/admin/tools.php
===================================================================
--- XoopsModules/contact/trunk/contact/admin/tools.php 2013-10-07 19:04:54 UTC (rev 12158)
+++ XoopsModules/contact/trunk/contact/admin/tools.php 2013-10-07 19:11:27 UTC (rev 12159)
@@ -27,35 +27,33 @@
// Define default value
$op = $contact_handler->Contact_CleanVars($_REQUEST, 'op', 'list', 'string');
-switch ($op)
-{
- case 'list':
- // prune manager
- $form = new XoopsThemeForm(_AM_CONTACT_TOOLS_PRUNE, 'tools', 'tools.php', 'post');
- $form->addElement(new XoopsFormTextDateSelect(_AM_CONTACT_TOOLS_PRUNE_BEFORE, 'prune_date', 15, time()));
- $onlyreply = new xoopsFormCheckBox('', 'onlyreply');
- $onlyreply->addOption(1, _AM_CONTACT_TOOLS_PRUNE_REPLYONLY);
- $form->addElement($onlyreply, false);
- $form->addElement(new XoopsFormHidden('op', 'prune'));
- $form->addElement(new XoopsFormButton('', 'post', _SUBMIT, 'submit'));
- $xoopsTpl->assign('prune', $form->render());
- break;
-
- case 'prune':
+switch ($op) {
+ case 'list':
+ // prune manager
+ $form = new XoopsThemeForm(_AM_CONTACT_TOOLS_PRUNE, 'tools', 'tools.php', 'post');
+ $form->addElement(new XoopsFormTextDateSelect(_AM_CONTACT_TOOLS_PRUNE_BEFORE, 'prune_date', 15, time()));
+ $onlyreply = new xoopsFormCheckBox('', 'onlyreply');
+ $onlyreply->addOption(1, _AM_CONTACT_TOOLS_PRUNE_REPLYONLY);
+ $form->addElement($onlyreply, false);
+ $form->addElement(new XoopsFormHidden('op', 'prune'));
+ $form->addElement(new XoopsFormButton('', 'post', _SUBMIT, 'submit'));
+ $xoopsTpl->assign('prune', $form->render());
+ break;
+
+ case 'prune':
$timestamp = $contact_handler->Contact_CleanVars( $_REQUEST, 'prune_date', '', 'int' );
$onlyreply = $contact_handler->Contact_CleanVars( $_REQUEST, 'onlyreply', 0, 'int' );
- $timestamp = strtotime($timestamp);
- $count = $contact_handler->Contact_PruneCount($timestamp,$onlyreply);
+ $timestamp = strtotime($timestamp);
+ $count = $contact_handler->Contact_PruneCount($timestamp,$onlyreply);
$contact_handler->Contact_DeleteBeforeDate($timestamp,$onlyreply);
redirect_header ( 'tools.php', 1, sprintf(_AM_CONTACT_MSG_PRUNE_DELETED,$count) );
- xoops_cp_footer ();
- exit ();
- break;
-}
+ xoops_cp_footer ();
+ exit ();
+ break;
+}
$xoopsTpl->assign('navigation', $admin_class->addNavigation('tools.php'));
// Call template file
$xoopsTpl->display(XOOPS_ROOT_PATH . '/modules/contact/templates/admin/contact_tools.html');
// Call footer
require dirname(__FILE__) . '/footer.php';
-?>
\ No newline at end of file
Modified: XoopsModules/contact/trunk/contact/ajax.php
===================================================================
--- XoopsModules/contact/trunk/contact/ajax.php 2013-10-07 19:04:54 UTC (rev 12158)
+++ XoopsModules/contact/trunk/contact/ajax.php 2013-10-07 19:11:27 UTC (rev 12159)
@@ -21,16 +21,14 @@
*/
include 'header.php';
-
-if(!empty($_POST)) {
- // Info Processing
+
+if (!empty($_POST)) {
+ // Info Processing
$contact = $contact_handler->Contact_InfoProcessing($_POST);
// Save info
- $obj = $contact_handler->create();
- $obj->setVars($contact);
- $contact_handler->insert($obj);
- // send mail can seet message
- $message = $contact_handler->Contact_SendMail($contact);
+ $obj = $contact_handler->create();
+ $obj->setVars($contact);
+ $contact_handler->insert($obj);
+ // send mail can seet message
+ $message = $contact_handler->Contact_SendMail($contact);
}
-
-?>
\ No newline at end of file
Modified: XoopsModules/contact/trunk/contact/class/contact.php
===================================================================
--- XoopsModules/contact/trunk/contact/class/contact.php 2013-10-07 19:04:54 UTC (rev 12158)
+++ XoopsModules/contact/trunk/contact/class/contact.php 2013-10-07 19:11:27 UTC (rev 12159)
@@ -21,453 +21,474 @@
*/
if (!defined("XOOPS_ROOT_PATH")) {
- die("XOOPS root path not defined");
+ die("XOOPS root path not defined");
}
class contact extends XoopsObject
{
-
- public function __construct()
- {
- $this->XoopsObject();
- $this->initVar("contact_id",XOBJ_DTYPE_INT,null,false,11);
- $this->initVar("contact_uid",XOBJ_DTYPE_INT,null,false,11);
- $this->initVar("contact_cid",XOBJ_DTYPE_INT,null,false,11);
- $this->initVar("contact_name",XOBJ_DTYPE_TXTBOX, null, false);
- $this->initVar("contact_subject",XOBJ_DTYPE_TXTBOX, null, false);
- $this->initVar("contact_mail",XOBJ_DTYPE_EMAIL, null, false);
- $this->initVar("contact_url",XOBJ_DTYPE_TXTBOX, null, false);
- $this->initVar("contact_create", XOBJ_DTYPE_INT, null, false);
- $this->initVar("contact_icq",XOBJ_DTYPE_TXTBOX, null, false);
- $this->initVar("contact_company",XOBJ_DTYPE_TXTBOX, null, false);
- $this->initVar("contact_location",XOBJ_DTYPE_TXTBOX, null, false);
- $this->initVar("contact_phone",XOBJ_DTYPE_TXTBOX,null,false);
- $this->initVar("contact_department",XOBJ_DTYPE_TXTBOX, null, false);
- $this->initVar("contact_ip",XOBJ_DTYPE_TXTBOX, null, false);
- $this->initVar("contact_message",XOBJ_DTYPE_TXTAREA, null, false);
- $this->initVar("contact_address",XOBJ_DTYPE_TXTAREA, null, false);
- $this->initVar("contact_reply",XOBJ_DTYPE_INT,null,false,1);
- $this->initVar("contact_platform",XOBJ_DTYPE_ENUM,null,false,'','',array('Android','Ios','Web'));
- $this->initVar("contact_type",XOBJ_DTYPE_ENUM,null,false,'','',array('Contact','Phone','Mail'));
-
- $this->db = $GLOBALS ['xoopsDB'];
- $this->table = $this->db->prefix ( 'contact' );
- }
-
- public function Contact_ContactForm($department)
- {
- global $xoopsConfig, $xoopsOption, $xoopsUser;
- if($this->isNew()) {
- if(!empty($xoopsUser)) {
- $contact_uid = $xoopsUser->getVar('uid');
- $contact_name = $xoopsUser->getVar('uname');
- $contact_mail = $xoopsUser->getVar('email');
- $contact_url = $xoopsUser->getVar('url');
- $contact_icq = $xoopsUser->getVar('user_icq');
- $contact_location = $xoopsUser->getVar('user_from');
-
- } else {
- $contact_uid = 0;
- $contact_name = '';
- $contact_mail = '';
- $contact_url = '';
- $contact_icq = '';
- $contact_location = '';
- }
- } else {
- $contact_uid = $this->getVar ( 'contact_uid');
- $contact_name = $this->getVar ( 'contact_name');
- $contact_mail = $this->getVar ( 'contact_mail');
- $contact_url = $this->getVar ( 'contact_url');
- $contact_icq = $this->getVar ( 'contact_icq');
- $contact_location = $this->getVar ( 'contact_location');
- }
-
- $form = new XoopsThemeForm(_MD_CONTACT_FORM, 'save', 'index.php', 'post', true);
- $form->setExtra ( 'enctype="multipart/form-data"' );
- $form->addElement ( new XoopsFormHidden ( 'op', 'save' ) );
- $form->addElement ( new XoopsFormHidden ( 'contact_id', $this->getVar ( 'contact_id', 'e' ) ) );
- $form->addElement ( new XoopsFormHidden ( 'contact_uid', $contact_uid ) );
- $form->addElement ( new XoopsFormText ( _MD_CONTACT_NAME, 'contact_name', 50, 255, $contact_name), true );
- $form->addElement ( new XoopsFormText ( _MD_CONTACT_MAIL, 'contact_mail', 50, 255, $contact_mail), true );
-
- if(xoops_getModuleOption('form_url','contact')) {
- $form->addElement ( new XoopsFormText ( _MD_CONTACT_URL, 'contact_url', 50, 255, $contact_url), false );
- }
- if(xoops_getModuleOption('form_icq','contact')) {
- $form->addElement ( new XoopsFormText ( _MD_CONTACT_ICQ, 'contact_icq', 50, 255, $contact_icq), false );
- }
- if(xoops_getModuleOption('form_company','contact')) {
- $form->addElement ( new XoopsFormText ( _MD_CONTACT_COMPANY, 'contact_company', 50, 255, $this->getVar ( 'contact_company')), false );
- }
- if(xoops_getModuleOption('form_location','contact')) {
- $form->addElement ( new XoopsFormText ( _MD_CONTACT_LOCATION, 'contact_location', 50, 255, $contact_location), false );
- }
- if(xoops_getModuleOption('form_phone','contact')) {
- $form->addElement ( new XoopsFormText ( _MD_CONTACT_PHONE, 'contact_phone', 50, 255, $this->getVar ( 'contact_phone')), false );
- }
- if(xoops_getModuleOption('form_address','contact')) {
- $form->addElement ( new XoopsFormTextArea ( _MD_CONTACT_ADDRESS, 'contact_address', $this->getVar ( 'contact_address', 'e' ), 3, 60 ), false );
- }
- if(xoops_getModuleOption('form_dept','contact')) {
- // show a drop down with the correct departments listed
- $departmentlist = new XoopsFormSelect( _MD_CONTACT_DEPARTMENT, 'contact_department' );
- $departments = xoops_getModuleOption('contact_dept','contact');
- foreach( $departments as $val ) {
- $valexplode = explode( ',', $val );
- $departmentlist->addOption($valexplode[0]);
+
+ public function __construct()
+ {
+ $this->XoopsObject();
+ $this->initVar("contact_id", XOBJ_DTYPE_INT, null, false, 11);
+ $this->initVar("contact_uid", XOBJ_DTYPE_INT, null, false, 11);
+ $this->initVar("contact_cid", XOBJ_DTYPE_INT, null, false, 11);
+ $this->initVar("contact_name", XOBJ_DTYPE_TXTBOX, null, false);
+ $this->initVar("contact_subject", XOBJ_DTYPE_TXTBOX, null, false);
+ $this->initVar("contact_mail", XOBJ_DTYPE_EMAIL, null, false);
+ $this->initVar("contact_url", XOBJ_DTYPE_TXTBOX, null, false);
+ $this->initVar("contact_create", XOBJ_DTYPE_INT, null, false);
+ $this->initVar("contact_icq", XOBJ_DTYPE_TXTBOX, null, false);
+ $this->initVar("contact_company", XOBJ_DTYPE_TXTBOX, null, false);
+ $this->initVar("contact_location", XOBJ_DTYPE_TXTBOX, null, false);
+ $this->initVar("contact_phone", XOBJ_DTYPE_TXTBOX, null, false);
+ $this->initVar("contact_department", XOBJ_DTYPE_TXTBOX, null, false);
+ $this->initVar("contact_ip", XOBJ_DTYPE_TXTBOX, null, false);
+ $this->initVar("contact_message", XOBJ_DTYPE_TXTAREA, null, false);
+ $this->initVar("contact_address", XOBJ_DTYPE_TXTAREA, null, false);
+ $this->initVar("contact_reply", XOBJ_DTYPE_INT, null, false, 1);
+ $this->initVar("contact_platform", XOBJ_DTYPE_ENUM, null, false, '', '', array('Android', 'Ios', 'Web'));
+ $this->initVar("contact_type", XOBJ_DTYPE_ENUM, null, false, '', '', array('Contact', 'Phone', 'Mail'));
+
+ $this->db = $GLOBALS ['xoopsDB'];
+ $this->table = $this->db->prefix('contact');
+ }
+
+ public function Contact_ContactForm($department)
+ {
+ global $xoopsConfig, $xoopsOption, $xoopsUser;
+ if ($this->isNew()) {
+ if (!empty($xoopsUser)) {
+ $contact_uid = $xoopsUser->getVar('uid');
+ $contact_name = $xoopsUser->getVar('uname');
+ $contact_mail = $xoopsUser->getVar('email');
+ $contact_url = $xoopsUser->getVar('url');
+ $contact_icq = $xoopsUser->getVar('user_icq');
+ $contact_location = $xoopsUser->getVar('user_from');
+
+ } else {
+ $contact_uid = 0;
+ $contact_name = '';
+ $contact_mail = '';
+ $contact_url = '';
+ $contact_icq = '';
+ $contact_location = '';
+ }
+ } else {
+ $contact_uid = $this->getVar('contact_uid');
+ $contact_name = $this->getVar('contact_name');
+ $contact_mail = $this->getVar('contact_mail');
+ $contact_url = $this->getVar('contact_url');
+ $contact_icq = $this->getVar('contact_icq');
+ $contact_location = $this->getVar('contact_location');
}
- $form->addElement( $departmentlist );
- }
-
- $form->addElement ( new XoopsFormText ( _MD_CONTACT_SUBJECT, 'contact_subject', 50, 255, $this->getVar ( 'contact_subject' )), true );
- $form->addElement(new XoopsFormTextArea ( _MD_CONTACT_MESSAGE, 'contact_message', $this->getVar ( 'contact_message', 'e' ), 5, 60 ), true );
-
- xoops_load('XoopsFormCaptcha');
- $form->addElement(new XoopsFormCaptcha(), true);
-
- $form->addElement(new XoopsFormButton('', 'submit', _SUBMIT, 'submit'));
- return $form;
- }
-
- public function Contact_ReplyForm()
- {
- global $xoopsConfig;
- $form = new XoopsThemeForm(_AM_CONTACT_REPLY, 'doreply', 'contact.php', 'post', true);
- $form->setExtra ( 'enctype="multipart/form-data"' );
- $form->addElement ( new XoopsFormHidden ( 'op', 'doreply' ) );
- $form->addElement ( new XoopsFormHidden ( 'contact_id', $this->getVar ( 'contact_id', 'e' ) ) );
- $form->addElement ( new XoopsFormHidden ( 'contact_uid', $this->getVar ( 'contact_uid', 'e' ) ) );
- $form->addElement ( new XoopsFormLabel( _AM_CONTACT_FROM, '',''));
- $form->addElement ( new XoopsFormText ( _AM_CONTACT_NAMEFROM, 'contact_name', 50, 255, XoopsUser::getUnameFromId ( $this->getVar ( 'contact_uid' ) )), true );
- $form->addElement ( new XoopsFormText ( _AM_CONTACT_MAILFROM, 'contact_mail', 50, 255, $xoopsConfig['adminmail']), true );
- $form->addElement ( new XoopsFormLabel( _AM_CONTACT_TO, '',''));
- $form->addElement ( new XoopsFormText ( _AM_CONTACT_NAMETO, 'contact_nameto', 50, 255, $this->getVar ( 'contact_name' )), true );
- $form->addElement ( new XoopsFormText ( _AM_CONTACT_MAILTO, 'contact_mailto', 50, 255, $this->getVar ( 'contact_mail' )), true );
- $form->addElement ( new XoopsFormText ( _AM_CONTACT_SUBJECT, 'contact_subject', 50, 255, _RE . $this->getVar ( 'contact_subject' )), true );
- $form->addElement(new XoopsFormTextArea ( _AM_CONTACT_MESSAGE, 'contact_message', '', 5, 60 ), true );
- $form->addElement(new XoopsFormButton('', 'submit', _SUBMIT, 'submit'));
- return $form;
- }
-
- /**
- * Returns an array representation of the object
- *
- * @return array
- **/
- public function toArray()
- {
- $ret = array ();
- $vars = $this->getVars ();
- foreach ( array_keys ( $vars ) as $i ) {
- $ret [$i] = $this->getVar ( $i );
- }
- return $ret;
- }
+
+ $form = new XoopsThemeForm(_MD_CONTACT_FORM, 'save', 'index.php', 'post', true);
+ $form->setExtra('enctype="multipart/form-data"');
+ $form->addElement(new XoopsFormHidden ('op', 'save'));
+ $form->addElement(new XoopsFormHidden ('contact_id', $this->getVar('contact_id', 'e')));
+ $form->addElement(new XoopsFormHidden ('contact_uid', $contact_uid));
+ $form->addElement(new XoopsFormText (_MD_CONTACT_NAME, 'contact_name', 50, 255, $contact_name), true);
+ $form->addElement(new XoopsFormText (_MD_CONTACT_MAIL, 'contact_mail', 50, 255, $contact_mail), true);
+
+ if (xoops_getModuleOption('form_url', 'contact')) {
+ $form->addElement(new XoopsFormText (_MD_CONTACT_URL, 'contact_url', 50, 255, $contact_url), false);
+ }
+ if (xoops_getModuleOption('form_icq', 'contact')) {
+ $form->addElement(new XoopsFormText (_MD_CONTACT_ICQ, 'contact_icq', 50, 255, $contact_icq), false);
+ }
+ if (xoops_getModuleOption('form_company', 'contact')) {
+ $form->addElement(new XoopsFormText (_MD_CONTACT_COMPANY, 'contact_company', 50, 255, $this->getVar('contact_company')), false);
+ }
+ if (xoops_getModuleOption('form_location', 'contact')) {
+ $form->addElement(new XoopsFormText (_MD_CONTACT_LOCATION, 'contact_location', 50, 255, $contact_location), false);
+ }
+ if (xoops_getModuleOption('form_phone', 'contact')) {
+ $form->addElement(new XoopsFormText (_MD_CONTACT_PHONE, 'contact_phone', 50, 255, $this->getVar('contact_phone')), false);
+ }
+ if (xoops_getModuleOption('form_address', 'contact')) {
+ $form->addElement(new XoopsFormTextArea (_MD_CONTACT_ADDRESS, 'contact_address', $this->getVar('contact_address', 'e'), 3, 60), false);
+ }
+ if (xoops_getModuleOption('form_dept', 'contact')) {
+ // show a drop down with the correct departments listed
+ $departmentlist = new XoopsFormSelect(_MD_CONTACT_DEPARTMENT, 'contact_department');
+ $departments = xoops_getModuleOption('contact_dept', 'contact');
+ foreach ($departments as $val) {
+ $valexplode = explode(',', $val);
+ $departmentlist->addOption($valexplode[0]);
+ }
+ $form->addElement($departmentlist);
+ }
+
+ $form->addElement(new XoopsFormText (_MD_CONTACT_SUBJECT, 'contact_subject', 50, 255, $this->getVar('contact_subject')), true);
+ $form->addElement(new XoopsFormTextArea (_MD_CONTACT_MESSAGE, 'contact_message', $this->getVar('contact_message', 'e'), 5, 60), true);
+
+ xoops_load('XoopsFormCaptcha');
+ $form->addElement(new XoopsFormCaptcha(), true);
+
+ $form->addElement(new XoopsFormButton('', 'submit', _SUBMIT, 'submit'));
+
+ return $form;
+ }
+
+ public function Contact_ReplyForm()
+ {
+ global $xoopsConfig;
+ $form = new XoopsThemeForm(_AM_CONTACT_REPLY, 'doreply', 'contact.php', 'post', true);
+ $form->setExtra('enctype="multipart/form-data"');
+ $form->addElement(new XoopsFormHidden ('op', 'doreply'));
+ $form->addElement(new XoopsFormHidden ('contact_id', $this->getVar('contact_id', 'e')));
+ $form->addElement(new XoopsFormHidden ('contact_uid', $this->getVar('contact_uid', 'e')));
+ $form->addElement(new XoopsFormLabel(_AM_CONTACT_FROM, '', ''));
+ $form->addElement(
+ new XoopsFormText (_AM_CONTACT_NAMEFROM, 'contact_name', 50, 255, XoopsUser::getUnameFromId($this->getVar('contact_uid'))),
+ true
+ );
+ $form->addElement(new XoopsFormText (_AM_CONTACT_MAILFROM, 'contact_mail', 50, 255, $xoopsConfig['adminmail']), true);
+ $form->addElement(new XoopsFormLabel(_AM_CONTACT_TO, '', ''));
+ $form->addElement(new XoopsFormText (_AM_CONTACT_NAMETO, 'contact_nameto', 50, 255, $this->getVar('contact_name')), true);
+ $form->addElement(new XoopsFormText (_AM_CONTACT_MAILTO, 'contact_mailto', 50, 255, $this->getVar('contact_mail')), true);
+ $form->addElement(new XoopsFormText (_AM_CONTACT_SUBJECT, 'contact_subject', 50, 255, _RE . $this->getVar('contact_subject')), true);
+ $form->addElement(new XoopsFormTextArea (_AM_CONTACT_MESSAGE, 'contact_message', '', 5, 60), true);
+ $form->addElement(new XoopsFormButton('', 'submit', _SUBMIT, 'submit'));
+
+ return $form;
+ }
+
+ /**
+ * Returns an array representation of the object
+ *
+ * @return array
+ **/
+ public function toArray()
+ {
+ $ret = array();
+ $vars = $this->getVars();
+ foreach (array_keys($vars) as $i) {
+ $ret [$i] = $this->getVar($i);
+ }
+
+ return $ret;
+ }
}
class ContactContactHandler extends XoopsPersistableObjectHandler
{
- public function __construct(&$db)
- {
- parent::__construct($db, "contact", 'contact', 'contact_id', 'contact_mail');
- }
-
- /**
- * Get variables passed by GET or POST method
- *
- */
- public function Contact_CleanVars(&$global, $key, $default = '', $type = 'int')
- {
-
- switch ($type) {
- case 'array':
- $ret = (isset($global[$key]) && is_array($global[$key])) ? $global[$key] : $default;
- break;
- case 'date':
- $ret = (isset($global[$key])) ? strtotime($global[$key]) : $default;
- break;
- case 'string':
- $ret = (isset($global[$key])) ? filter_var($global[$key], FILTER_SANITIZE_MAGIC_QUOTES) : $default;
- break;
- case 'mail':
- $ret = (isset($global[$key])) ? filter_var($global[$key], FILTER_VALIDATE_EMAIL) : $default;
- break;
- case 'url':
- $ret = (isset($global[$key])) ? filter_var($global[$key], FILTER_VALIDATE_URL, FILTER_FLAG_SCHEME_REQUIRED) : $default;
- break;
- case 'ip':
- $ret = (isset($global[$key])) ? filter_var($global[$key], FILTER_VALIDATE_IP) : $default;
- break;
- case 'amp':
- $ret = (isset($global[$key])) ? filter_var($global[$key], FILTER_FLAG_ENCODE_AMP) : $default;
- break;
- case 'text':
- $ret = (isset($global[$key])) ? htmlentities($global[$key], ENT_QUOTES, 'UTF-8') : $default;
- break;
- case 'platform':
- $ret = (isset($global[$key])) ? $this->Contact_Platform($global[$key]) : $this->Contact_Platform($default);
- break;
- case 'type':
- $ret = (isset($global[$key])) ? $this->Contact_Type($global[$key]) : $this->Contact_Type($default);
- break;
- case 'int': default:
- $ret = (isset($global[$key])) ? filter_var($global[$key], FILTER_SANITIZE_NUMBER_INT) : $default;
- break;
-
- }
- if ($ret === false) {
- return $default;
- }
- return $ret;
- }
-
- public function Contact_InfoProcessing($global)
- {
- $contact = array();
- $contact['contact_cid'] = $this->Contact_CleanVars($_POST, 'contact_id', '', 'int');
- $contact['contact_uid'] = $this->Contact_CleanVars($_POST, 'contact_uid', '', 'int');
- $contact['contact_name'] = $this->Contact_CleanVars($_POST, 'contact_name', '', 'string');
- $contact['contact_nameto'] = $this->Contact_CleanVars($_POST, 'contact_nameto', '', 'string');
- $contact['contact_subject'] = $this->Contact_CleanVars($_POST, 'contact_subject', '', 'string');
- $contact['contact_mail'] = $this->Contact_CleanVars($_POST, 'contact_mail', '', 'mail');
- $contact['contact_mailto'] = $this->Contact_CleanVars($_POST, 'contact_mailto', '', 'mail');
- $contact['contact_url'] = $this->Contact_CleanVars($_POST, 'contact_url', '', 'url');
- $contact['contact_create'] = time();
- $contact['contact_icq'] = $this->Contact_CleanVars($_POST, 'contact_icq', '', 'string');
- $contact['contact_company'] = $this->Contact_CleanVars($_POST, 'contact_company', '', 'string');
- $contact['contact_location'] = $this->Contact_CleanVars($_POST, 'contact_location', '', 'text');
- $contact['contact_phone'] = $this->Contact_CleanVars($_POST, 'contact_phone', '', 'int');
- $contact['contact_department'] = $this->Contact_CleanVars($_POST, 'contact_department', _MD_CONTACT_DEFULTDEP, 'string');
- $contact['contact_ip'] = getenv ( "REMOTE_ADDR" );
- $contact['contact_message'] = $this->Contact_CleanVars($_POST, 'contact_message', '', 'text');
- $contact['contact_address'] = $this->Contact_CleanVars($_POST, 'contact_address', '', 'text');
- $contact['contact_platform'] = $this->Contact_CleanVars($_POST, 'contact_platform', 'Web', 'platform');
- $contact['contact_type'] = $this->Contact_CleanVars($_POST, 'contact_type', 'Contact', 'type');
- return $contact;
- }
-
- public function Contact_SendMail($contact)
- {
- $xoopsMailer = xoops_getMailer();
- $xoopsMailer->useMail();
- $xoopsMailer->setToEmails($this->Contact_ToEmails($contact['contact_department']));
- $xoopsMailer->setFromEmail($contact['contact_mail']);
- $xoopsMailer->setFromName($contact['contact_name']);
- $xoopsMailer->setSubject($contact['contact_subject']);
- $xoopsMailer->setBody($contact['contact_message']);
- if($xoopsMailer->send()) {
- $message = _MD_CONTACT_MES_SEND;
- } else {
- $message = $xoopsMailer->getErrors();
- }
- return $message;
- }
-
- public function Contact_ReplyMail($contact)
- {
- $xoopsMailer = xoops_getMailer();
- $xoopsMailer->useMail();
- $xoopsMailer->setToEmails($contact['contact_mailto']);
- $xoopsMailer->setFromEmail($contact['contact_mail']);
- $xoopsMailer->setFromName($contact['contact_name']);
- $xoopsMailer->setSubject($contact['contact_subject']);
- $xoopsMailer->setBody($contact['contact_message']);
- if($xoopsMailer->send()) {
- $message = _MD_CONTACT_MES_SEND;
- } else {
- $message = $xoopsMailer->getErrors();
- }
- return $message;
- }
+ public function __construct(&$db)
+ {
+ parent::__construct($db, "contact", 'contact', 'contact_id', 'contact_mail');
+ }
- public function Contact_ToEmails($department = null)
- {
- global $xoopsConfig;
- $department_mail[] = $xoopsConfig['adminmail'];
- if(!empty($department)) {
- $departments = xoops_getModuleOption('contact_dept','contact');
- foreach( $departments as $vals ) {
- $vale = explode( ',', $vals );
- if($department == $vale[0]) $department_mail[] = $vale[1];
- }
- }
- return $department_mail;
- }
-
- public function Contact_AddReply($contact_id)
- {
- $obj = $this->get ( $contact_id );
- $obj->setVar ( 'contact_reply', 1 );
- if(!$this->insert ( $obj )) {
- return false;
- }
- return true;
- }
-
- public function Contact_GetReply($contact_id)
- {
-
- $criteria = new CriteriaCompo ();
- $criteria->add ( new Criteria ( 'contact_cid', $contact_id ) );
- $criteria->add ( new Criteria ( 'contact_type', 'Contact' ) );
- $contacts = $this->getObjects ( $criteria, false );
- if ($contacts) {
- $ret = array ();
- foreach ( $contacts as $root ) {
- $tab = array ();
- $tab = $root->toArray ();
- $tab['contact_owner'] = XoopsUser::getUnameFromId ( $root->getVar ( 'contact_uid' ) );
- $tab['contact_create'] = formatTimestamp ( $root->getVar ( 'contact_create' ), _MEDIUMDATESTRING );
- $ret [] = $tab;
- }
- return $ret;
- } else {
- return false;
- }
- }
-
- public function Contact_GetAdminList($contact , $id)
- {
- $ret = array ();
- $criteria = new CriteriaCompo ();
- $criteria->add ( new Criteria ( $id, '0' ) );
- $criteria->add ( new Criteria ( 'contact_type', 'Contact' ) );
- $criteria->setSort ( $contact['sort'] );
- $criteria->setOrder ( $contact['order'] );
- $criteria->setStart ( $contact['start'] );
- $criteria->setLimit ( $contact['limit'] );
- $contacts = $this->getObjects ( $criteria, false );
- if ($contacts) {
- foreach ( $contacts as $root ) {
- $tab = array ();
- $tab = $root->toArray ();
- $tab['contact_owner'] = XoopsUser::getUnameFromId ( $root->getVar ( 'contact_uid' ) );
- $tab['contact_create'] = formatTimestamp ( $root->getVar ( 'contact_create' ), _MEDIUMDATESTRING );
- $ret [] = $tab;
- }
- }
- return $ret;
- }
-
- /**
- * Get file Count
- */
- public function Contact_GetCount($id)
- {
- $criteria = new CriteriaCompo ();
- $criteria->add ( new Criteria ( $id, '0' ) );
- $criteria->add ( new Criteria ( 'contact_type', 'Contact' ) );
- return $this->getCount ( $criteria );
- }
-
- /**
- * Get Insert ID
- */
- public function getInsertId()
- {
- return $this->db->getInsertId ();
- }
-
- /**
- * Contact Prune Count
- */
- public function Contact_PruneCount($timestamp, $onlyreply)
- {
- $criteria = new CriteriaCompo ();
- $criteria->add ( new Criteria ( 'contact_create', $timestamp , '<=' ));
- if($onlyreply) {
- $criteria->add ( new Criteria ( 'contact_reply', 1 ));
- }
- return $this->getCount ( $criteria );
- }
-
- /**
- * Contact Delete Before Date
- */
- public function Contact_DeleteBeforeDate($timestamp, $onlyreply)
- {
- $criteria = new CriteriaCompo ();
- $criteria->add ( new Criteria ( 'contact_create', $timestamp , '<=' ));
- if($onlyreply) {
- $criteria->add ( new Criteria ( 'contact_reply', 1 ));
- }
- $this->deleteAll($criteria);
- }
-
- /**
- * Contact Platform
- */
- public function Contact_Platform($platform)
- {
- $platform = strtolower($platform);
- switch($platform) {
- case 'Android':
- $ret = 'Android';
- break;
-
- case 'Ios':
- $ret = 'Ios';
- break;
-
- case 'Web':
- default:
- $ret = 'Web';
- break;
- }
- return $ret;
- }
-
- /**
- * Contact type
- */
- public function Contact_Type($type)
- {
- $type = strtolower($type);
- switch($type) {
- case 'Mail':
- $ret = 'Mail';
- break;
-
- case 'Phone':
- $ret = 'Phone';
- break;
-
- case 'Contact':
- default:
- $ret = 'Contact';
- break;
- }
- return $ret;
- }
-
- /**
- * Contact logs
- */
- public function Contact_Logs($column, $timestamp = null)
- {
- $ret = array();
- if(!in_array($column, array('contact_mail', 'contact_url', 'contact_phone'))) {
- return $ret;
- }
- $criteria = new CriteriaCompo();
- $criteria->add( new Criteria('contact_cid', '0'));
- if(!empty($timestamp)) {
- $criteria->add( new Criteria('contact_create', $timestamp, '<='));
- }
- $criteria->setSort('contact_create');
- $criteria->setOrder('DESC');
- $contacts = $this->getObjects($criteria, false);
- if ($contacts) {
- foreach ( $contacts as $root ) {
- $rootColumn = $root->getVar($column);
- if(!empty($rootColumn)) {
- $ret[] = $root->getVar($column);
- unset($root);
- }
- }
- }
- return array_unique($ret);
- }
+ /**
+ * Get variables passed by GET or POST method
+ *
+ */
+ public function Contact_CleanVars(&$global, $key, $default = '', $type = 'int')
+ {
+
+ switch ($type) {
+ case 'array':
+ $ret = (isset($global[$key]) && is_array($global[$key])) ? $global[$key] : $default;
+ break;
+ case 'date':
+ $ret = (isset($global[$key])) ? strtotime($global[$key]) : $default;
+ break;
+ case 'string':
+ $ret = (isset($global[$key])) ? filter_var($global[$key], FILTER_SANITIZE_MAGIC_QUOTES) : $default;
+ break;
+ case 'mail':
+ $ret = (isset($global[$key])) ? filter_var($global[$key], FILTER_VALIDATE_EMAIL) : $default;
+ break;
+ case 'url':
+ $ret = (isset($global[$key])) ? filter_var($global[$key], FILTER_VALIDATE_URL, FILTER_FLAG_SCHEME_REQUIRED) : $default;
+ break;
+ case 'ip':
+ $ret = (isset($global[$key])) ? filter_var($global[$key], FILTER_VALIDATE_IP) : $default;
+ break;
+ case 'amp':
+ $ret = (isset($global[$key])) ? filter_var($global[$key], FILTER_FLAG_ENCODE_AMP) : $default;
+ break;
+ case 'text':
+ $ret = (isset($global[$key])) ? htmlentities($global[$key], ENT_QUOTES, 'UTF-8') : $default;
+ break;
+ case 'platform':
+ $ret = (isset($global[$key])) ? $this->Contact_Platform($global[$key]) : $this->Contact_Platform($default);
+ break;
+ case 'type':
+ $ret = (isset($global[$key])) ? $this->Contact_Type($global[$key]) : $this->Contact_Type($default);
+ break;
+ case 'int':
+ default:
+ $ret = (isset($global[$key])) ? filter_var($global[$key], FILTER_SANITIZE_NUMBER_INT) : $default;
+ break;
+
+ }
+ if ($ret === false) {
+ return $default;
+ }
+
+ return $ret;
+ }
+
+ public function Contact_InfoProcessing($global)
+ {
+ $contact = array();
+ $contact['contact_cid'] = $this->Contact_CleanVars($_POST, 'contact_id', '', 'int');
+ $contact['contact_uid'] = $this->Contact_CleanVars($_POST, 'contact_uid', '', 'int');
+ $contact['contact_name'] = $this->Contact_CleanVars($_POST, 'contact_name', '', 'string');
+ $contact['contact_nameto'] = $this->Contact_CleanVars($_POST, 'contact_nameto', '', 'string');
+ $contact['contact_subject'] = $this->Contact_CleanVars($_POST, 'contact_subject', '', 'string');
+ $contact['contact_mail'] = $this->Contact_CleanVars($_POST, 'contact_mail', '', 'mail');
+ $contact['contact_mailto'] = $this->Contact_CleanVars($_POST, 'contact_mailto', '', 'mail');
+ $contact['contact_url'] = $this->Contact_CleanVars($_POST, 'contact_url', '', 'url');
+ $contact['contact_create'] = time();
+ $contact['contact_icq'] = $this->Contact_CleanVars($_POST, 'contact_icq', '', 'string');
+ $contact['contact_company'] = $this->Contact_CleanVars($_POST, 'contact_company', '', 'string');
+ $contact['contact_location'] = $this->Contact_CleanVars($_POST, 'contact_location', '', 'text');
+ $contact['contact_phone'] = $this->Contact_CleanVars($_POST, 'contact_phone', '', 'int');
+ $contact['contact_department'] = $this->Contact_CleanVars($_POST, 'contact_department', _MD_CONTACT_DEFULTDEP, 'string');
+ $contact['contact_ip'] = getenv("REMOTE_ADDR");
+ $contact['contact_message'] = $this->Contact_CleanVars($_POST, 'contact_message', '', 'text');
+ $contact['contact_address'] = $this->Contact_CleanVars($_POST, 'contact_address', '', 'text');
+ $contact['contact_platform'] = $this->Contact_CleanVars($_POST, 'contact_platform', 'Web', 'platform');
+ $contact['contact_type'] = $this->Contact_CleanVars($_POST, 'contact_type', 'Contact', 'type');
+
+ return $contact;
+ }
+
+ public function Contact_SendMail($contact)
+ {
+ $xoopsMailer = xoops_getMailer();
+ $xoopsMailer->useMail();
+ $xoopsMailer->setToEmails($this->Contact_ToEmails($contact['contact_department']));
+ $xoopsMailer->setFromEmail($contact['contact_mail']);
+ $xoopsMailer->setFromName($contact['contact_name']);
+ $xoopsMailer->setSubject($contact['contact_subject']);
+ $xoopsMailer->setBody(html_entity_decode($contact['contact_message']), ENT_QUOTES, 'UTF-8');
+ if ($xoopsMailer->send()) {
+ $message = _MD_CONTACT_MES_SEND;
+ } else {
+ $message = $xoopsMailer->getErrors();
+ }
+
+ return $message;
+ }
+
+ public function Contact_ReplyMail($contact)
+ {
+ $xoopsMailer = xoops_getMailer();
+ $xoopsMailer->useMail();
+ $xoopsMailer->setToEmails($contact['contact_mailto']);
+ $xoopsMailer->setFromEmail($contact['contact_mail']);
+ $xoopsMailer->setFromName($contact['contact_name']);
+ $xoopsMailer->setSubject($contact['contact_subject']);
+ $xoopsMailer->setBody($contact['contact_message']);
+ if ($xoopsMailer->send()) {
+ $message = _MD_CONTACT_MES_SEND;
+ } else {
+ $message = $xoopsMailer->getErrors();
+ }
+
+ return $message;
+ }
+
+ public function Contact_ToEmails($department = null)
+ {
+ global $xoopsConfig;
+ $department_mail[] = $xoopsConfig['adminmail'];
+ if (!empty($department)) {
+ $departments = xoops_getModuleOption('contact_dept', 'contact');
+ foreach ($departments as $vals) {
+ $vale = explode(',', $vals);
+ if ($department == $vale[0]) {
+ $department_mail[] = $vale[1];
+ }
+ }
+ }
+
+ return $department_mail;
+ }
+
+ public function Contact_AddReply($contact_id)
+ {
+ $obj = $this->get($contact_id);
+ $obj->setVar('contact_reply', 1);
+ if (!$this->insert($obj)) {
+ return false;
+ }
+
+ return true;
+ }
+
+ public function Contact_GetReply($contact_id)
+ {
+
+ $criteria = new CriteriaCompo ();
+ $criteria->add(new Criteria ('contact_cid', $contact_id));
+ $criteria->add(new Criteria ('contact_type', 'Contact'));
+ $contacts = $this->getObjects($criteria, false);
+ if ($contacts) {
+ $ret = array();
+ foreach ($contacts as $root) {
+ $tab = array();
+ $tab = $root->toArray();
+ $tab['contact_owner'] = XoopsUser::getUnameFromId($root->getVar('contact_uid'));
+ $tab['contact_create'] = formatTimestamp($root->getVar('contact_create'), _MEDIUMDATESTRING);
+ $ret [] = $tab;
+ }
+
+ return $ret;
+ } else {
+ return false;
+ }
+ }
+
+ public function Contact_GetAdminList($contact, $id)
+ {
+ $ret = array();
+ $criteria = new CriteriaCompo ();
+ $criteria->add(new Criteria ($id, '0'));
+ $criteria->add(new Criteria ('contact_type', 'Contact'));
+ $criteria->setSort($contact['sort']);
+ $criteria->setOrder($contact['order']);
+ $criteria->setStart($contact['start']);
+ $criteria->setLimit($contact['limit']);
+ $contacts = $this->getObjects($criteria, false);
+ if ($contacts) {
+ foreach ($contacts as $root) {
+ $tab = array();
+ $tab = $root->toArray();
+ $tab['contact_owner'] = XoopsUser::getUnameFromId($root->getVar('contact_uid'));
+ $tab['contact_create'] = formatTimestamp($root->getVar('contact_create'), _MEDIUMDATESTRING);
+ $ret [] = $tab;
+ }
+ }
+
+ return $ret;
+ }
+
+ /**
+ * Get file Count
+ */
+ public function Contact_GetCount($id)
+ {
+ $criteria = new CriteriaCompo ();
+ $criteria->add(new Criteria ($id, '0'));
+ $criteria->add(new Criteria ('contact_type', 'Contact'));
+
+ return $this->getCount($criteria);
+ }
+
+ /**
+ * Get Insert ID
+ */
+ public function getInsertId()
+ {
+ return $this->db->getInsertId();
+ }
+
+ /**
+ * Contact Prune Count
+ */
+ public function Contact_PruneCount($timestamp, $onlyreply)
+ {
+ $criteria = new CriteriaCompo ();
+ $criteria->add(new Criteria ('contact_create', $timestamp, '<='));
+ if ($onlyreply) {
+ $criteria->add(new Criteria ('contact_reply', 1));
+ }
+
+ return $this->getCount($criteria);
+ }
+
+ /**
+ * Contact Delete Before Date
+ */
+ public function Contact_DeleteBeforeDate($timestamp, $onlyreply)
+ {
+ $criteria = new CriteriaCompo ();
+ $criteria->add(new Criteria ('contact_create', $timestamp, '<='));
+ if ($onlyreply) {
+ $criteria->add(new Criteria ('contact_reply', 1));
+ }
+ $this->deleteAll($criteria);
+ }
+
+ /**
+ * Contact Platform
+ */
+ public function Contact_Platform($platform)
+ {
+ $platform = strtolower($platform);
+ switch ($platform) {
+ case 'Android':
+ $ret = 'Android';
+ break;
+
+ case 'Ios':
+ $ret = 'Ios';
+ break;
+
+ case 'Web':
+ default:
+ $ret = 'Web';
+ break;
+ }
+
+ return $ret;
+ }
+
+ /**
+ * Contact type
+ */
+ public function Contact_Type($type)
+ {
+ $type = strtolower($type);
+ switch ($type) {
+ case 'Mail':
+ $ret = 'Mail';
+ break;
+
+ case 'Phone':
+ $ret = 'Phone';
+ break;
+
+ case 'Contact':
+ default:
+ $ret = 'Contact';
+ break;
+ }
+
+ return $ret;
+ }
+
+ /**
+ * Contact logs
+ */
+ public function Contact_Logs($column, $timestam...
[truncated message content] |
|
From: <al...@us...> - 2013-10-07 19:05:03
|
Revision: 12158
http://sourceforge.net/p/xoops/svn/12158
Author: alain91
Date: 2013-10-07 19:04:54 +0000 (Mon, 07 Oct 2013)
Log Message:
-----------
save working version
Added Paths:
-----------
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/images/avatar/
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/images/avatar/icon4.gif
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/images/avatar/icon5.gif
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/images/avatar/icon6.gif
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/images/avatar/icon7.gif
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/images/avatar/index.html
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/images/avatar/toto/
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/images/avatar/toto/icon1.gif
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/images/avatar/toto/icon2.gif
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/images/avatar/toto/icon3.gif
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/images/subject/toto/
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/images/subject/toto/icon1.gif
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/images/subject/toto/icon2.gif
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/images/subject/toto/icon3.gif
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/mainfile.VC6.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/uploads/banners/
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/uploads/banners/.htaccess
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/uploads/banners/banner.swf
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/uploads/banners/blank.gif
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/uploads/banners/index.html
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/uploads/banners/xoops_banner_2.gif
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/uploads/banners/xoops_flashbanner2.swf
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/xoops_data/caches/xoops_cache/xoops_78948e84_banners_configs.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/xoops_data/caches/xoops_cache/xoops_78948e84_editorlist.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/xoops_data/caches/xoops_cache/xoops_78948e84_logger_configs.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/xoops_data/caches/xoops_cache/xoops_78948e84_module_dirname_banners.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/xoops_data/caches/xoops_cache/xoops_78948e84_module_dirname_logger.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/xoops_data/caches/xoops_cache/xoops_78948e84_module_dirname_page.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/xoops_data/caches/xoops_cache/xoops_78948e84_module_dirname_system.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/xoops_data/caches/xoops_cache/xoops_78948e84_module_id_1.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/xoops_data/caches/xoops_cache/xoops_78948e84_module_id_14.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/xoops_data/caches/xoops_cache/xoops_78948e84_module_logger_plugin.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/xoops_data/caches/xoops_cache/xoops_78948e84_system_configs.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/xoops_data/caches/xoops_cache/xoops_78948e84_system_modules_active.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/xoops_data/configs/captcha.config.image.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/xoops_data/configs/captcha.config.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/xoops_data/configs/captcha.config.recaptcha.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/xoops_data/configs/captcha.config.text.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/xoops_data/configs/protector_configcache_1c1562
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/xoops_data/configs/protector_configcache_446afb
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/xoops_data/configs/protector_configcache_7914ad
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/xoops_data/configs/protector_configcache_c28e53
Index: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/images/avatar
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/images/avatar 2013-10-07 13:58:13 UTC (rev 12157)
+++ XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/images/avatar 2013-10-07 19:04:54 UTC (rev 12158)
Property changes on: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/images/avatar
___________________________________________________________________
Added: tsvn:autoprops
## -0,0 +1 ##
+*.php = svn:executable=*;svn:keywords=Author Date Id Rev URL;
\ No newline at end of property
Added: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/images/avatar/icon4.gif
===================================================================
(Binary files differ)
Index: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/images/avatar/icon4.gif
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/images/avatar/icon4.gif 2013-10-07 13:58:13 UTC (rev 12157)
+++ XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/images/avatar/icon4.gif 2013-10-07 19:04:54 UTC (rev 12158)
Property changes on: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/images/avatar/icon4.gif
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/images/avatar/icon5.gif
===================================================================
(Binary files differ)
Index: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/images/avatar/icon5.gif
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/images/avatar/icon5.gif 2013-10-07 13:58:13 UTC (rev 12157)
+++ XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/images/avatar/icon5.gif 2013-10-07 19:04:54 UTC (rev 12158)
Property changes on: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/images/avatar/icon5.gif
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/images/avatar/icon6.gif
===================================================================
(Binary files differ)
Index: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/images/avatar/icon6.gif
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/images/avatar/icon6.gif 2013-10-07 13:58:13 UTC (rev 12157)
+++ XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/images/avatar/icon6.gif 2013-10-07 19:04:54 UTC (rev 12158)
Property changes on: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/images/avatar/icon6.gif
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/images/avatar/icon7.gif
===================================================================
(Binary files differ)
Index: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/images/avatar/icon7.gif
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/images/avatar/icon7.gif 2013-10-07 13:58:13 UTC (rev 12157)
+++ XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/images/avatar/icon7.gif 2013-10-07 19:04:54 UTC (rev 12158)
Property changes on: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/images/avatar/icon7.gif
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/images/avatar/index.html
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/images/avatar/index.html (rev 0)
+++ XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/images/avatar/index.html 2013-10-07 19:04:54 UTC (rev 12158)
@@ -0,0 +1 @@
+ <script>history.go(-1);</script>
\ No newline at end of file
Index: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/images/avatar/toto
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/images/avatar/toto 2013-10-07 13:58:13 UTC (rev 12157)
+++ XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/images/avatar/toto 2013-10-07 19:04:54 UTC (rev 12158)
Property changes on: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/images/avatar/toto
___________________________________________________________________
Added: tsvn:autoprops
## -0,0 +1 ##
+*.php = svn:executable=*;svn:keywords=Author Date Id Rev URL;
\ No newline at end of property
Added: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/images/avatar/toto/icon1.gif
===================================================================
(Binary files differ)
Index: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/images/avatar/toto/icon1.gif
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/images/avatar/toto/icon1.gif 2013-10-07 13:58:13 UTC (rev 12157)
+++ XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/images/avatar/toto/icon1.gif 2013-10-07 19:04:54 UTC (rev 12158)
Property changes on: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/images/avatar/toto/icon1.gif
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/images/avatar/toto/icon2.gif
===================================================================
(Binary files differ)
Index: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/images/avatar/toto/icon2.gif
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/images/avatar/toto/icon2.gif 2013-10-07 13:58:13 UTC (rev 12157)
+++ XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/images/avatar/toto/icon2.gif 2013-10-07 19:04:54 UTC (rev 12158)
Property changes on: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/images/avatar/toto/icon2.gif
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/images/avatar/toto/icon3.gif
===================================================================
(Binary files differ)
Index: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/images/avatar/toto/icon3.gif
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/images/avatar/toto/icon3.gif 2013-10-07 13:58:13 UTC (rev 12157)
+++ XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/images/avatar/toto/icon3.gif 2013-10-07 19:04:54 UTC (rev 12158)
Property changes on: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/images/avatar/toto/icon3.gif
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/images/subject/toto
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/images/subject/toto 2013-10-07 13:58:13 UTC (rev 12157)
+++ XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/images/subject/toto 2013-10-07 19:04:54 UTC (rev 12158)
Property changes on: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/images/subject/toto
___________________________________________________________________
Added: tsvn:autoprops
## -0,0 +1 ##
+*.php = svn:executable=*;svn:keywords=Author Date Id Rev URL;
\ No newline at end of property
Added: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/images/subject/toto/icon1.gif
===================================================================
(Binary files differ)
Index: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/images/subject/toto/icon1.gif
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/images/subject/toto/icon1.gif 2013-10-07 13:58:13 UTC (rev 12157)
+++ XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/images/subject/toto/icon1.gif 2013-10-07 19:04:54 UTC (rev 12158)
Property changes on: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/images/subject/toto/icon1.gif
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/images/subject/toto/icon2.gif
===================================================================
(Binary files differ)
Index: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/images/subject/toto/icon2.gif
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/images/subject/toto/icon2.gif 2013-10-07 13:58:13 UTC (rev 12157)
+++ XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/images/subject/toto/icon2.gif 2013-10-07 19:04:54 UTC (rev 12158)
Property changes on: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/images/subject/toto/icon2.gif
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/images/subject/toto/icon3.gif
===================================================================
(Binary files differ)
Index: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/images/subject/toto/icon3.gif
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/images/subject/toto/icon3.gif 2013-10-07 13:58:13 UTC (rev 12157)
+++ XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/images/subject/toto/icon3.gif 2013-10-07 19:04:54 UTC (rev 12158)
Property changes on: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/images/subject/toto/icon3.gif
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/mainfile.VC6.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/mainfile.VC6.php (rev 0)
+++ XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/mainfile.VC6.php 2013-10-07 19:04:54 UTC (rev 12158)
@@ -0,0 +1,81 @@
+<?php
+/*
+ You may not change or alter any portion of this comment or credits
+ of supporting developers from this source code or any supporting source code
+ which is considered copyrighted (c) material of the original comment or credit authors.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+*/
+
+/**
+ * XOOPS main configuration file
+ *
+ * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html)
+ * @version $Id$
+ */
+
+if (!defined("XOOPS_MAINFILE_INCLUDED")) {
+ define("XOOPS_MAINFILE_INCLUDED", 1);
+
+ // XOOPS Physical Paths
+
+ // Physical path to the XOOPS documents (served) directory WITHOUT trailing slash
+ define("XOOPS_ROOT_PATH", "D:\MesApp\EasyPHP-2.0b1\www\xoops\htdocs");
+
+ // For forward compatibility
+ // Physical path to the XOOPS library directory WITHOUT trailing slash
+ define("XOOPS_PATH", "D:\MesApp\EasyPHP-2.0b1\www\xoops\htdocs\xoops_lib");
+ // Physical path to the XOOPS datafiles (writable) directory WITHOUT trailing slash
+ define("XOOPS_VAR_PATH", "D:\MesApp\EasyPHP-2.0b1\www\xoops\htdocs\xoops_data");
+ // Alias of XOOPS_PATH, for compatibility, temporary solution
+ define("XOOPS_TRUST_PATH", XOOPS_PATH);
+
+ // URL Association for SSL and Protocol Compatibility
+ $http = 'http://';
+ if (!empty($_SERVER['HTTPS'])) {
+ $http = ($_SERVER['HTTPS']=='on') ? 'https://' : 'http://';
+ }
+ define('XOOPS_PROT', $http);
+
+ // XOOPS Virtual Path (URL)
+ // Virtual path to your main XOOPS directory WITHOUT trailing slash
+ // Example: define("XOOPS_URL", "http://url_to_xoops_directory");
+ define("XOOPS_URL", "http://localhost/xoops/htdocs");
+
+ // Shall be handled later, don't forget!
+ define("XOOPS_CHECK_PATH", 0);
+ // Protect against external scripts execution if safe mode is not enabled
+ if (XOOPS_CHECK_PATH && !@ini_get("safe_mode")) {
+ if (function_exists("debug_backtrace")) {
+ $xoopsScriptPath = debug_backtrace();
+ if (!count($xoopsScriptPath)) {
+ die("XOOPS path check: this file cannot be requested directly");
+ }
+ $xoopsScriptPath = $xoopsScriptPath[0]["file"];
+ } else {
+ $xoopsScriptPath = isset($_SERVER["PATH_TRANSLATED"]) ? $_SERVER["PATH_TRANSLATED"] : $_SERVER["SCRIPT_FILENAME"];
+ }
+ if (DIRECTORY_SEPARATOR != "/") {
+ // IIS6 may double the \ chars
+ $xoopsScriptPath = str_replace(strpos($xoopsScriptPath, "\\\\", 2) ? "\\\\" : DIRECTORY_SEPARATOR, "/", $xoopsScriptPath);
+ }
+ if (strcasecmp(substr($xoopsScriptPath, 0, strlen(XOOPS_ROOT_PATH)), str_replace(DIRECTORY_SEPARATOR, "/", XOOPS_ROOT_PATH))) {
+ exit("XOOPS path check: Script is not inside XOOPS_ROOT_PATH and cannot run.");
+ }
+ }
+
+ // Secure file
+ require XOOPS_VAR_PATH . '/data/secure.php';
+
+ define("XOOPS_GROUP_ADMIN", "1");
+ define("XOOPS_GROUP_USERS", "2");
+ define("XOOPS_GROUP_ANONYMOUS", "3");
+
+ if (!isset($xoopsOption["nocommon"]) && XOOPS_ROOT_PATH != "") {
+ include XOOPS_ROOT_PATH."/include/common.php";
+ }
+
+}
Property changes on: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/mainfile.VC6.php
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Rev URL
\ No newline at end of property
Index: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/uploads/banners
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/uploads/banners 2013-10-07 13:58:13 UTC (rev 12157)
+++ XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/uploads/banners 2013-10-07 19:04:54 UTC (rev 12158)
Property changes on: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/uploads/banners
___________________________________________________________________
Added: tsvn:autoprops
## -0,0 +1 ##
+*.php = svn:executable=*;svn:keywords=Author Date Id Rev URL;
\ No newline at end of property
Added: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/uploads/banners/.htaccess
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/uploads/banners/.htaccess (rev 0)
+++ XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/uploads/banners/.htaccess 2013-10-07 19:04:54 UTC (rev 12158)
@@ -0,0 +1,3 @@
+# secure directory by disabling script execution
+AddHandler cgi-script .php .pl .py .jsp .asp .htm .shtml .sh .cgi .php5 .php4 .php3 .phps
+Options -ExecCGI -Indexes
Added: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/uploads/banners/banner.swf
===================================================================
(Binary files differ)
Index: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/uploads/banners/banner.swf
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/uploads/banners/banner.swf 2013-10-07 13:58:13 UTC (rev 12157)
+++ XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/uploads/banners/banner.swf 2013-10-07 19:04:54 UTC (rev 12158)
Property changes on: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/uploads/banners/banner.swf
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/uploads/banners/blank.gif
===================================================================
(Binary files differ)
Index: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/uploads/banners/blank.gif
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/uploads/banners/blank.gif 2013-10-07 13:58:13 UTC (rev 12157)
+++ XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/uploads/banners/blank.gif 2013-10-07 19:04:54 UTC (rev 12158)
Property changes on: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/uploads/banners/blank.gif
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/uploads/banners/index.html
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/uploads/banners/index.html (rev 0)
+++ XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/uploads/banners/index.html 2013-10-07 19:04:54 UTC (rev 12158)
@@ -0,0 +1 @@
+ <script>history.go(-1);</script>
\ No newline at end of file
Added: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/uploads/banners/xoops_banner_2.gif
===================================================================
(Binary files differ)
Index: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/uploads/banners/xoops_banner_2.gif
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/uploads/banners/xoops_banner_2.gif 2013-10-07 13:58:13 UTC (rev 12157)
+++ XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/uploads/banners/xoops_banner_2.gif 2013-10-07 19:04:54 UTC (rev 12158)
Property changes on: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/uploads/banners/xoops_banner_2.gif
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/uploads/banners/xoops_flashbanner2.swf
===================================================================
(Binary files differ)
Index: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/uploads/banners/xoops_flashbanner2.swf
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/uploads/banners/xoops_flashbanner2.swf 2013-10-07 13:58:13 UTC (rev 12157)
+++ XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/uploads/banners/xoops_flashbanner2.swf 2013-10-07 19:04:54 UTC (rev 12158)
Property changes on: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/uploads/banners/xoops_flashbanner2.swf
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/xoops_data/caches/xoops_cache/xoops_78948e84_banners_configs.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/xoops_data/caches/xoops_cache/xoops_78948e84_banners_configs.php (rev 0)
+++ XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/xoops_data/caches/xoops_cache/xoops_78948e84_banners_configs.php 2013-10-07 19:04:54 UTC (rev 12158)
@@ -0,0 +1,6 @@
+1405812495
+return array (
+ 'banners_myip' => '127.0.0.1',
+ 'banners_pager' => 15,
+ 'banners_clientspager' => 15,
+);
Property changes on: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/xoops_data/caches/xoops_cache/xoops_78948e84_banners_configs.php
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Rev URL
\ No newline at end of property
Added: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/xoops_data/caches/xoops_cache/xoops_78948e84_editorlist.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/xoops_data/caches/xoops_cache/xoops_78948e84_editorlist.php (rev 0)
+++ XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/xoops_data/caches/xoops_cache/xoops_78948e84_editorlist.php 2013-10-07 19:04:54 UTC (rev 12158)
@@ -0,0 +1,18 @@
+1405812370
+return array (
+ 'textarea' =>
+ array (
+ 'title' => 'Plain Text',
+ 'nohtml' => 1,
+ ),
+ 'dhtmltextarea' =>
+ array (
+ 'title' => 'DHTML Form with xCode',
+ 'nohtml' => 1,
+ ),
+ 'tinymce' =>
+ array (
+ 'title' => 'TinyMCE',
+ 'nohtml' => 0,
+ ),
+);
Property changes on: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/xoops_data/caches/xoops_cache/xoops_78948e84_editorlist.php
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Rev URL
\ No newline at end of property
Added: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/xoops_data/caches/xoops_cache/xoops_78948e84_logger_configs.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/xoops_data/caches/xoops_cache/xoops_78948e84_logger_configs.php (rev 0)
+++ XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/xoops_data/caches/xoops_cache/xoops_78948e84_logger_configs.php 2013-10-07 19:04:54 UTC (rev 12158)
@@ -0,0 +1,6 @@
+1405812452
+return array (
+ 'debug_mode' => 1,
+ 'debug_level' => 2,
+ 'debug_plugin' => 'legacy',
+);
Property changes on: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/xoops_data/caches/xoops_cache/xoops_78948e84_logger_configs.php
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Rev URL
\ No newline at end of property
Added: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/xoops_data/caches/xoops_cache/xoops_78948e84_module_dirname_banners.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/xoops_data/caches/xoops_cache/xoops_78948e84_module_dirname_banners.php (rev 0)
+++ XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/xoops_data/caches/xoops_cache/xoops_78948e84_module_dirname_banners.php 2013-10-07 19:04:54 UTC (rev 12158)
@@ -0,0 +1,2 @@
+1405812495
+return 'O:11:"XoopsModule":10:{s:7:"modinfo";N;s:9:"adminmenu";N;s:17:"' . "\0" . 'XoopsModule' . "\0" . '_msg";a:0:{}s:4:"vars";a:13:{s:3:"mid";a:6:{s:5:"value";s:2:"14";s:8:"required";b:0;s:9:"data_type";i:3;s:9:"maxlength";N;s:7:"changed";b:0;s:7:"options";s:0:"";}s:4:"name";a:6:{s:5:"value";s:7:"Banners";s:8:"required";b:1;s:9:"data_type";i:1;s:9:"maxlength";i:150;s:7:"changed";b:0;s:7:"options";s:0:"";}s:7:"version";a:6:{s:5:"value";s:2:"10";s:8:"required";b:0;s:9:"data_type";i:3;s:9:"maxlength";N;s:7:"changed";b:0;s:7:"options";s:0:"";}s:11:"last_update";a:6:{s:5:"value";s:10:"1374255542";s:8:"required";b:0;s:9:"data_type";i:3;s:9:"maxlength";N;s:7:"changed";b:0;s:7:"options";s:0:"";}s:6:"weight";a:6:{s:5:"value";s:1:"1";s:8:"required";b:0;s:9:"data_type";i:3;s:9:"maxlength";N;s:7:"changed";b:0;s:7:"options";s:0:"";}s:8:"isactive";a:6:{s:5:"value";s:1:"1";s:8:"required";b:0;s:9:"data_type";i:3;s:9:"maxlength";N;s:7:"changed";b:0;s:7:"options";s:0:"";}s:7:"dirname";a:6:{s:5:"value";s:7:"banners";s:8:"required";b:1;s:9:"data_type";i:7;s:9:"maxlength";N;s:7:"changed";b:0;s:7:"options";s:0:"";}s:7:"hasmain";a:6:{s:5:"value";s:1:"1";s:8:"required";b:0;s:9:"data_type";i:3;s:9:"maxlength";N;s:7:"changed";b:0;s:7:"options";s:0:"";}s:8:"hasadmin";a:6:{s:5:"value";s:1:"1";s:8:"required";b:0;s:9:"data_type";i:3;s:9:"maxlength";N;s:7:"changed";b:0;s:7:"options";s:0:"";}s:9:"hassearch";a:6:{s:5:"value";s:1:"0";s:8:"required";b:0;s:9:"data_type";i:3;s:9:"maxlength";N;s:7:"changed";b:0;s:7:"options";s:0:"";}s:9:"hasconfig";a:6:{s:5:"value";s:1:"1";s:8:"required";b:0;s:9:"data_type";i:3;s:9:"maxlength";N;s:7:"changed";b:0;s:7:"options";s:0:"";}s:11:"hascomments";a:6:{s:5:"value";s:1:"0";s:8:"required";b:0;s:9:"data_type";i:3;s:9:"maxlength";N;s:7:"changed";b:0;s:7:"options";s:0:"";}s:15:"hasnotification";a:6:{s:5:"value";s:1:"0";s:8:"required";b:0;s:9:"data_type";i:3;s:9:"maxlength";N;s:7:"changed";b:0;s:7:"options";s:0:"";}}s:9:"cleanVars";a:0:{}s:19:"' . "\0" . 'XoopsObject' . "\0" . '_isNew";b:0;s:21:"' . "\0" . 'XoopsObject' . "\0" . '_isDirty";b:0;s:20:"' . "\0" . 'XoopsObject' . "\0" . '_errors";a:0:{}s:21:"' . "\0" . 'XoopsObject' . "\0" . '_filters";a:0:{}s:11:"plugin_path";N;}';
Property changes on: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/xoops_data/caches/xoops_cache/xoops_78948e84_module_dirname_banners.php
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Rev URL
\ No newline at end of property
Added: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/xoops_data/caches/xoops_cache/xoops_78948e84_module_dirname_logger.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/xoops_data/caches/xoops_cache/xoops_78948e84_module_dirname_logger.php (rev 0)
+++ XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/xoops_data/caches/xoops_cache/xoops_78948e84_module_dirname_logger.php 2013-10-07 19:04:54 UTC (rev 12158)
@@ -0,0 +1,2 @@
+1405812452
+return 'O:11:"XoopsModule":10:{s:7:"modinfo";N;s:9:"adminmenu";N;s:17:"' . "\0" . 'XoopsModule' . "\0" . '_msg";a:0:{}s:4:"vars";a:13:{s:3:"mid";a:6:{s:5:"value";s:2:"13";s:8:"required";b:0;s:9:"data_type";i:3;s:9:"maxlength";N;s:7:"changed";b:0;s:7:"options";s:0:"";}s:4:"name";a:6:{s:5:"value";s:6:"Logger";s:8:"required";b:1;s:9:"data_type";i:1;s:9:"maxlength";i:150;s:7:"changed";b:0;s:7:"options";s:0:"";}s:7:"version";a:6:{s:5:"value";s:2:"10";s:8:"required";b:0;s:9:"data_type";i:3;s:9:"maxlength";N;s:7:"changed";b:0;s:7:"options";s:0:"";}s:11:"last_update";a:6:{s:5:"value";s:10:"1374253720";s:8:"required";b:0;s:9:"data_type";i:3;s:9:"maxlength";N;s:7:"changed";b:0;s:7:"options";s:0:"";}s:6:"weight";a:6:{s:5:"value";s:1:"1";s:8:"required";b:0;s:9:"data_type";i:3;s:9:"maxlength";N;s:7:"changed";b:0;s:7:"options";s:0:"";}s:8:"isactive";a:6:{s:5:"value";s:1:"1";s:8:"required";b:0;s:9:"data_type";i:3;s:9:"maxlength";N;s:7:"changed";b:0;s:7:"options";s:0:"";}s:7:"dirname";a:6:{s:5:"value";s:6:"logger";s:8:"required";b:1;s:9:"data_type";i:7;s:9:"maxlength";N;s:7:"changed";b:0;s:7:"options";s:0:"";}s:7:"hasmain";a:6:{s:5:"value";s:1:"0";s:8:"required";b:0;s:9:"data_type";i:3;s:9:"maxlength";N;s:7:"changed";b:0;s:7:"options";s:0:"";}s:8:"hasadmin";a:6:{s:5:"value";s:1:"0";s:8:"required";b:0;s:9:"data_type";i:3;s:9:"maxlength";N;s:7:"changed";b:0;s:7:"options";s:0:"";}s:9:"hassearch";a:6:{s:5:"value";s:1:"0";s:8:"required";b:0;s:9:"data_type";i:3;s:9:"maxlength";N;s:7:"changed";b:0;s:7:"options";s:0:"";}s:9:"hasconfig";a:6:{s:5:"value";s:1:"1";s:8:"required";b:0;s:9:"data_type";i:3;s:9:"maxlength";N;s:7:"changed";b:0;s:7:"options";s:0:"";}s:11:"hascomments";a:6:{s:5:"value";s:1:"0";s:8:"required";b:0;s:9:"data_type";i:3;s:9:"maxlength";N;s:7:"changed";b:0;s:7:"options";s:0:"";}s:15:"hasnotification";a:6:{s:5:"value";s:1:"0";s:8:"required";b:0;s:9:"data_type";i:3;s:9:"maxlength";N;s:7:"changed";b:0;s:7:"options";s:0:"";}}s:9:"cleanVars";a:0:{}s:19:"' . "\0" . 'XoopsObject' . "\0" . '_isNew";b:0;s:21:"' . "\0" . 'XoopsObject' . "\0" . '_isDirty";b:0;s:20:"' . "\0" . 'XoopsObject' . "\0" . '_errors";a:0:{}s:21:"' . "\0" . 'XoopsObject' . "\0" . '_filters";a:0:{}s:11:"plugin_path";N;}';
Property changes on: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/xoops_data/caches/xoops_cache/xoops_78948e84_module_dirname_logger.php
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Rev URL
\ No newline at end of property
Added: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/xoops_data/caches/xoops_cache/xoops_78948e84_module_dirname_page.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/xoops_data/caches/xoops_cache/xoops_78948e84_module_dirname_page.php (rev 0)
+++ XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/xoops_data/caches/xoops_cache/xoops_78948e84_module_dirname_page.php 2013-10-07 19:04:54 UTC (rev 12158)
@@ -0,0 +1,2 @@
+1406041395
+return 'O:11:"XoopsModule":10:{s:7:"modinfo";N;s:9:"adminmenu";N;s:17:"' . "\0" . 'XoopsModule' . "\0" . '_msg";a:0:{}s:4:"vars";a:13:{s:3:"mid";a:6:{s:5:"value";s:1:"3";s:8:"required";b:0;s:9:"data_type";i:3;s:9:"maxlength";N;s:7:"changed";b:0;s:7:"options";s:0:"";}s:4:"name";a:6:{s:5:"value";s:4:"Page";s:8:"required";b:1;s:9:"data_type";i:1;s:9:"maxlength";i:150;s:7:"changed";b:0;s:7:"options";s:0:"";}s:7:"version";a:6:{s:5:"value";s:2:"10";s:8:"required";b:0;s:9:"data_type";i:3;s:9:"maxlength";N;s:7:"changed";b:0;s:7:"options";s:0:"";}s:11:"last_update";a:6:{s:5:"value";s:10:"1367861682";s:8:"required";b:0;s:9:"data_type";i:3;s:9:"maxlength";N;s:7:"changed";b:0;s:7:"options";s:0:"";}s:6:"weight";a:6:{s:5:"value";s:1:"1";s:8:"required";b:0;s:9:"data_type";i:3;s:9:"maxlength";N;s:7:"changed";b:0;s:7:"options";s:0:"";}s:8:"isactive";a:6:{s:5:"value";s:1:"1";s:8:"required";b:0;s:9:"data_type";i:3;s:9:"maxlength";N;s:7:"changed";b:0;s:7:"options";s:0:"";}s:7:"dirname";a:6:{s:5:"value";s:4:"page";s:8:"required";b:1;s:9:"data_type";i:7;s:9:"maxlength";N;s:7:"changed";b:0;s:7:"options";s:0:"";}s:7:"hasmain";a:6:{s:5:"value";s:1:"1";s:8:"required";b:0;s:9:"data_type";i:3;s:9:"maxlength";N;s:7:"changed";b:0;s:7:"options";s:0:"";}s:8:"hasadmin";a:6:{s:5:"value";s:1:"1";s:8:"required";b:0;s:9:"data_type";i:3;s:9:"maxlength";N;s:7:"changed";b:0;s:7:"options";s:0:"";}s:9:"hassearch";a:6:{s:5:"value";s:1:"0";s:8:"required";b:0;s:9:"data_type";i:3;s:9:"maxlength";N;s:7:"changed";b:0;s:7:"options";s:0:"";}s:9:"hasconfig";a:6:{s:5:"value";s:1:"1";s:8:"required";b:0;s:9:"data_type";i:3;s:9:"maxlength";N;s:7:"changed";b:0;s:7:"options";s:0:"";}s:11:"hascomments";a:6:{s:5:"value";s:1:"0";s:8:"required";b:0;s:9:"data_type";i:3;s:9:"maxlength";N;s:7:"changed";b:0;s:7:"options";s:0:"";}s:15:"hasnotification";a:6:{s:5:"value";s:1:"0";s:8:"required";b:0;s:9:"data_type";i:3;s:9:"maxlength";N;s:7:"changed";b:0;s:7:"options";s:0:"";}}s:9:"cleanVars";a:0:{}s:19:"' . "\0" . 'XoopsObject' . "\0" . '_isNew";b:0;s:21:"' . "\0" . 'XoopsObject' . "\0" . '_isDirty";b:0;s:20:"' . "\0" . 'XoopsObject' . "\0" . '_errors";a:0:{}s:21:"' . "\0" . 'XoopsObject' . "\0" . '_filters";a:0:{}s:11:"plugin_path";N;}';
Property changes on: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/xoops_data/caches/xoops_cache/xoops_78948e84_module_dirname_page.php
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Rev URL
\ No newline at end of property
Added: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/xoops_data/caches/xoops_cache/xoops_78948e84_module_dirname_system.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/xoops_data/caches/xoops_cache/xoops_78948e84_module_dirname_system.php (rev 0)
+++ XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/xoops_data/caches/xoops_cache/xoops_78948e84_module_dirname_system.php 2013-10-07 19:04:54 UTC (rev 12158)
@@ -0,0 +1,2 @@
+1405812452
+return 'O:11:"XoopsModule":10:{s:7:"modinfo";N;s:9:"adminmenu";N;s:17:"' . "\0" . 'XoopsModule' . "\0" . '_msg";a:0:{}s:4:"vars";a:13:{s:3:"mid";a:6:{s:5:"value";s:1:"1";s:8:"required";b:0;s:9:"data_type";i:3;s:9:"maxlength";N;s:7:"changed";b:0;s:7:"options";s:0:"";}s:4:"name";a:6:{s:5:"value";s:6:"System";s:8:"required";b:1;s:9:"data_type";i:1;s:9:"maxlength";i:150;s:7:"changed";b:0;s:7:"options";s:0:"";}s:7:"version";a:6:{s:5:"value";s:3:"210";s:8:"required";b:0;s:9:"data_type";i:3;s:9:"maxlength";N;s:7:"changed";b:0;s:7:"options";s:0:"";}s:11:"last_update";a:6:{s:5:"value";s:10:"1367861618";s:8:"required";b:0;s:9:"data_type";i:3;s:9:"maxlength";N;s:7:"changed";b:0;s:7:"options";s:0:"";}s:6:"weight";a:6:{s:5:"value";s:1:"1";s:8:"required";b:0;s:9:"data_type";i:3;s:9:"maxlength";N;s:7:"changed";b:0;s:7:"options";s:0:"";}s:8:"isactive";a:6:{s:5:"value";s:1:"1";s:8:"required";b:0;s:9:"data_type";i:3;s:9:"maxlength";N;s:7:"changed";b:0;s:7:"options";s:0:"";}s:7:"dirname";a:6:{s:5:"value";s:6:"system";s:8:"required";b:1;s:9:"data_type";i:7;s:9:"maxlength";N;s:7:"changed";b:0;s:7:"options";s:0:"";}s:7:"hasmain";a:6:{s:5:"value";s:1:"0";s:8:"required";b:0;s:9:"data_type";i:3;s:9:"maxlength";N;s:7:"changed";b:0;s:7:"options";s:0:"";}s:8:"hasadmin";a:6:{s:5:"value";s:1:"1";s:8:"required";b:0;s:9:"data_type";i:3;s:9:"maxlength";N;s:7:"changed";b:0;s:7:"options";s:0:"";}s:9:"hassearch";a:6:{s:5:"value";s:1:"0";s:8:"required";b:0;s:9:"data_type";i:3;s:9:"maxlength";N;s:7:"changed";b:0;s:7:"options";s:0:"";}s:9:"hasconfig";a:6:{s:5:"value";s:1:"1";s:8:"required";b:0;s:9:"data_type";i:3;s:9:"maxlength";N;s:7:"changed";b:0;s:7:"options";s:0:"";}s:11:"hascomments";a:6:{s:5:"value";s:1:"0";s:8:"required";b:0;s:9:"data_type";i:3;s:9:"maxlength";N;s:7:"changed";b:0;s:7:"options";s:0:"";}s:15:"hasnotification";a:6:{s:5:"value";s:1:"0";s:8:"required";b:0;s:9:"data_type";i:3;s:9:"maxlength";N;s:7:"changed";b:0;s:7:"options";s:0:"";}}s:9:"cleanVars";a:0:{}s:19:"' . "\0" . 'XoopsObject' . "\0" . '_isNew";b:0;s:21:"' . "\0" . 'XoopsObject' . "\0" . '_isDirty";b:0;s:20:"' . "\0" . 'XoopsObject' . "\0" . '_errors";a:0:{}s:21:"' . "\0" . 'XoopsObject' . "\0" . '_filters";a:0:{}s:11:"plugin_path";N;}';
Property changes on: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/xoops_data/caches/xoops_cache/xoops_78948e84_module_dirname_system.php
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Rev URL
\ No newline at end of property
Added: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/xoops_data/caches/xoops_cache/xoops_78948e84_module_id_1.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/xoops_data/caches/xoops_cache/xoops_78948e84_module_id_1.php (rev 0)
+++ XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/xoops_data/caches/xoops_cache/xoops_78948e84_module_id_1.php 2013-10-07 19:04:54 UTC (rev 12158)
@@ -0,0 +1,2 @@
+1406041395
+return 'O:11:"XoopsModule":10:{s:7:"modinfo";N;s:9:"adminmenu";N;s:17:"' . "\0" . 'XoopsModule' . "\0" . '_msg";a:0:{}s:4:"vars";a:13:{s:3:"mid";a:6:{s:5:"value";s:1:"1";s:8:"required";b:0;s:9:"data_type";i:3;s:9:"maxlength";N;s:7:"changed";b:0;s:7:"options";s:0:"";}s:4:"name";a:6:{s:5:"value";s:6:"System";s:8:"required";b:1;s:9:"data_type";i:1;s:9:"maxlength";i:150;s:7:"changed";b:0;s:7:"options";s:0:"";}s:7:"version";a:6:{s:5:"value";s:3:"210";s:8:"required";b:0;s:9:"data_type";i:3;s:9:"maxlength";N;s:7:"changed";b:0;s:7:"options";s:0:"";}s:11:"last_update";a:6:{s:5:"value";s:10:"1367861618";s:8:"required";b:0;s:9:"data_type";i:3;s:9:"maxlength";N;s:7:"changed";b:0;s:7:"options";s:0:"";}s:6:"weight";a:6:{s:5:"value";s:1:"1";s:8:"required";b:0;s:9:"data_type";i:3;s:9:"maxlength";N;s:7:"changed";b:0;s:7:"options";s:0:"";}s:8:"isactive";a:6:{s:5:"value";s:1:"1";s:8:"required";b:0;s:9:"data_type";i:3;s:9:"maxlength";N;s:7:"changed";b:0;s:7:"options";s:0:"";}s:7:"dirname";a:6:{s:5:"value";s:6:"system";s:8:"required";b:1;s:9:"data_type";i:7;s:9:"maxlength";N;s:7:"changed";b:0;s:7:"options";s:0:"";}s:7:"hasmain";a:6:{s:5:"value";s:1:"0";s:8:"required";b:0;s:9:"data_type";i:3;s:9:"maxlength";N;s:7:"changed";b:0;s:7:"options";s:0:"";}s:8:"hasadmin";a:6:{s:5:"value";s:1:"1";s:8:"required";b:0;s:9:"data_type";i:3;s:9:"maxlength";N;s:7:"changed";b:0;s:7:"options";s:0:"";}s:9:"hassearch";a:6:{s:5:"value";s:1:"0";s:8:"required";b:0;s:9:"data_type";i:3;s:9:"maxlength";N;s:7:"changed";b:0;s:7:"options";s:0:"";}s:9:"hasconfig";a:6:{s:5:"value";s:1:"1";s:8:"required";b:0;s:9:"data_type";i:3;s:9:"maxlength";N;s:7:"changed";b:0;s:7:"options";s:0:"";}s:11:"hascomments";a:6:{s:5:"value";s:1:"0";s:8:"required";b:0;s:9:"data_type";i:3;s:9:"maxlength";N;s:7:"changed";b:0;s:7:"options";s:0:"";}s:15:"hasnotification";a:6:{s:5:"value";s:1:"0";s:8:"required";b:0;s:9:"data_type";i:3;s:9:"maxlength";N;s:7:"changed";b:0;s:7:"options";s:0:"";}}s:9:"cleanVars";a:0:{}s:19:"' . "\0" . 'XoopsObject' . "\0" . '_isNew";b:0;s:21:"' . "\0" . 'XoopsObject' . "\0" . '_isDirty";b:0;s:20:"' . "\0" . 'XoopsObject' . "\0" . '_errors";a:0:{}s:21:"' . "\0" . 'XoopsObject' . "\0" . '_filters";a:0:{}s:11:"plugin_path";N;}';
Property changes on: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/xoops_data/caches/xoops_cache/xoops_78948e84_module_id_1.php
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Rev URL
\ No newline at end of property
Added: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/xoops_data/caches/xoops_cache/xoops_78948e84_module_id_14.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/xoops_data/caches/xoops_cache/xoops_78948e84_module_id_14.php (rev 0)
+++ XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/xoops_data/caches/xoops_cache/xoops_78948e84_module_id_14.php 2013-10-07 19:04:54 UTC (rev 12158)
@@ -0,0 +1,2 @@
+1405812489
+return 'O:11:"XoopsModule":10:{s:7:"modinfo";N;s:9:"adminmenu";N;s:17:"' . "\0" . 'XoopsModule' . "\0" . '_msg";a:0:{}s:4:"vars";a:13:{s:3:"mid";a:6:{s:5:"value";s:2:"14";s:8:"required";b:0;s:9:"data_type";i:3;s:9:"maxlength";N;s:7:"changed";b:0;s:7:"options";s:0:"";}s:4:"name";a:6:{s:5:"value";s:7:"Banners";s:8:"required";b:1;s:9:"data_type";i:1;s:9:"maxlength";i:150;s:7:"changed";b:0;s:7:"options";s:0:"";}s:7:"version";a:6:{s:5:"value";s:2:"10";s:8:"required";b:0;s:9:"data_type";i:3;s:9:"maxlength";N;s:7:"changed";b:0;s:7:"options";s:0:"";}s:11:"last_update";a:6:{s:5:"value";s:10:"1374255542";s:8:"required";b:0;s:9:"data_type";i:3;s:9:"maxlength";N;s:7:"changed";b:0;s:7:"options";s:0:"";}s:6:"weight";a:6:{s:5:"value";s:1:"1";s:8:"required";b:0;s:9:"data_type";i:3;s:9:"maxlength";N;s:7:"changed";b:0;s:7:"options";s:0:"";}s:8:"isactive";a:6:{s:5:"value";s:1:"1";s:8:"required";b:0;s:9:"data_type";i:3;s:9:"maxlength";N;s:7:"changed";b:0;s:7:"options";s:0:"";}s:7:"dirname";a:6:{s:5:"value";s:7:"banners";s:8:"required";b:1;s:9:"data_type";i:7;s:9:"maxlength";N;s:7:"changed";b:0;s:7:"options";s:0:"";}s:7:"hasmain";a:6:{s:5:"value";s:1:"1";s:8:"required";b:0;s:9:"data_type";i:3;s:9:"maxlength";N;s:7:"changed";b:0;s:7:"options";s:0:"";}s:8:"hasadmin";a:6:{s:5:"value";s:1:"1";s:8:"required";b:0;s:9:"data_type";i:3;s:9:"maxlength";N;s:7:"changed";b:0;s:7:"options";s:0:"";}s:9:"hassearch";a:6:{s:5:"value";s:1:"0";s:8:"required";b:0;s:9:"data_type";i:3;s:9:"maxlength";N;s:7:"changed";b:0;s:7:"options";s:0:"";}s:9:"hasconfig";a:6:{s:5:"value";s:1:"1";s:8:"required";b:0;s:9:"data_type";i:3;s:9:"maxlength";N;s:7:"changed";b:0;s:7:"options";s:0:"";}s:11:"hascomments";a:6:{s:5:"value";s:1:"0";s:8:"required";b:0;s:9:"data_type";i:3;s:9:"maxlength";N;s:7:"changed";b:0;s:7:"options";s:0:"";}s:15:"hasnotification";a:6:{s:5:"value";s:1:"0";s:8:"required";b:0;s:9:"data_type";i:3;s:9:"maxlength";N;s:7:"changed";b:0;s:7:"options";s:0:"";}}s:9:"cleanVars";a:0:{}s:19:"' . "\0" . 'XoopsObject' . "\0" . '_isNew";b:0;s:21:"' . "\0" . 'XoopsObject' . "\0" . '_isDirty";b:0;s:20:"' . "\0" . 'XoopsObject' . "\0" . '_errors";a:0:{}s:21:"' . "\0" . 'XoopsObject' . "\0" . '_filters";a:0:{}s:11:"plugin_path";N;}';
Property changes on: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/xoops_data/caches/xoops_cache/xoops_78948e84_module_id_14.php
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Rev URL
\ No newline at end of property
Added: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/xoops_data/caches/xoops_cache/xoops_78948e84_module_logger_plugin.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/xoops_data/caches/xoops_cache/xoops_78948e84_module_logger_plugin.php (rev 0)
+++ XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/xoops_data/caches/xoops_cache/xoops_78948e84_module_logger_plugin.php 2013-10-07 19:04:54 UTC (rev 12158)
@@ -0,0 +1,2 @@
+1405812452
+return 'legacy';
Property changes on: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/xoops_data/caches/xoops_cache/xoops_78948e84_module_logger_plugin.php
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Rev URL
\ No newline at end of property
Added: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/xoops_data/caches/xoops_cache/xoops_78948e84_system_configs.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/xoops_data/caches/xoops_cache/xoops_78948e84_system_configs.php (rev 0)
+++ XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/xoops_data/caches/xoops_cache/xoops_78948e84_system_configs.php 2013-10-07 19:04:54 UTC (rev 12158)
@@ -0,0 +1,160 @@
+1405812453
+return array (
+ 'sitename' => 'XOOPS Site',
+ 'slogan' => 'Just Use it!',
+ 'adminmail' => '',
+ 'language' => 'english',
+ 'startpage' => '--',
+ 'server_TZ' => 0,
+ 'default_TZ' => 0,
+ 'theme_set' => 'default',
+ 'cpanel' => 'default',
+ 'redirect_message_ajax' => 1,
+ 'theme_set_allowed' =>
+ array (
+ 'default' => 'default',
+ ),
+ 'theme_fromfile' => 0,
+ 'template_set' => 'default',
+ 'anonymous' => 'Anonymous',
+ 'gzip_compression' => 0,
+ 'usercookie' => 'xoops_user',
+ 'use_mysession' => 0,
+ 'session_name' => 'xoops_session',
+ 'session_expire' => 15,
+ 'closesite' => 0,
+ 'closesite_okgrp' =>
+ array (
+ 0 => '1',
+ ),
+ 'closesite_text' => 'The site is currently closed for maintenance. Please come back later.',
+ 'use_ssl' => 0,
+ 'sslpost_name' => 'xoops_ssl',
+ 'sslloginlink' => 'https://',
+ 'enable_badips' => 0,
+ 'bad_ips' =>
+ array (
+ 0 => '127.0.0.1',
+ ),
+ 'module_cache' =>
+ array (
+ 0 => '',
+ ),
+ 'allow_register' => 1,
+ 'minpass' => 5,
+ 'minuname' => 3,
+ 'maxuname' => 10,
+ 'allow_chgmail' => 0,
+ 'welcome_type' => 1,
+ 'new_user_notify' => 1,
+ 'new_user_notify_group' => 1,
+ 'activation_type' => 0,
+ 'activation_group' => 1,
+ 'uname_test_level' => 0,
+ 'self_delete' => 0,
+ 'bad_unames' =>
+ array (
+ 0 => 'webmaster',
+ 1 => '^xoops',
+ 2 => '^admin',
+ ),
+ 'bad_emails' =>
+ array (
+ 0 => 'xoops.org$',
+ ),
+ 'reg_dispdsclmr' => 1,
+ 'reg_disclaimer' => 'While the administrators and moderators of this site will attempt to remove
+or edit any generally objectionable material as quickly as possible, it is
+impossible to review every message. Therefore you acknowledge that all posts
+made to this site express the views and opinions of the author and not the
+administrators, moderators or webmaster (except for posts by these people)
+and hence will not be held liable.
+
+You agree not to post any abusive, obscene, vulgar, slanderous, hateful,
+threatening, sexually-orientated or any other material that may violate any
+applicable laws. Doing so may lead to you being immediately and permanently
+banned (and your service provider being informed). The IP address of all
+posts is recorded to aid in enforcing these conditions. Creating multiple
+accounts for a single user is not allowed. You agree that the webmaster,
+administrator and moderators of this site have the right to remove, edit,
+move or close any topic at any time should they see fit. As a user you agree
+to any information you have entered above being stored in a database. While
+this information will not be disclosed to any third party without your
+consent the webmaster, administrator and moderators cannot be held
+responsible for any hacking attempt that may lead to the data being
+compromised.
+
+This site system uses cookies to store information on your local computer.
+These cookies do not contain any of the information you have entered above,
+they serve only to improve your viewing pleasure. The email address is used
+only for confirming your registration details and password (and for sending
+new passwords should you forget your current one).
+
+By clicking Register below you agree to be bound by these conditions.',
+ 'meta_keywords' => 'xoops, web applications, web 2.0, sns, news, technology, headlines, linux, software, download, downloads, free, community, forum, bulletin board, bbs, php, survey, polls, kernel, comment, comments, portal, odp, open source, opensource, FreeSoftware, gnu, gpl, license, Unix, *nix, mysql, sql, database, databases, web site, blog, wiki, module, modules, theme, themes, cms, content management',
+ 'meta_description' => 'XOOPS is a dynamic Object Oriented based open source portal script written in PHP.',
+ 'meta_robots' => 'index,follow',
+ 'meta_rating' => 'general',
+ 'meta_author' => 'XOOPS',
+ 'meta_copyright' => 'Copyright © 2001-2013',
+ 'footer' => 'Powered by XOOPS © 2001-2013 <a href="http://xoops.sourceforge.net" rel="external" title="The XOOPS Project">The XOOPS Project</a>',
+ 'from' => '',
+ 'fromname' => '',
+ 'fromuid' => 1,
+ 'mailmethod' => 'mail',
+ 'sendmailpath' => '/usr/sbin/sendmail',
+ 'smtphost' =>
+ array (
+ ),
+ 'smtpuser' => '',
+ 'smtppass' => '',
+ 'censor_enable' => 0,
+ 'censor_words' =>
+ array (
+ 0 => 'fuck',
+ 1 => 'shit',
+ ),
+ 'censor_replace' => '#OOPS#',
+ 'auth_method' => 'xoops',
+ 'ldap_port' => 389,
+ 'ldap_server' => 'your directory server',
+ 'ldap_base_dn' => 'dc=xoops,dc=org',
+ 'ldap_manager_dn' => 'manager_dn',
+ 'ldap_manager_pass' => 'manager_pass',
+ 'ldap_version' => '3',
+ 'ldap_users_bypass' =>
+ array (
+ 0 => 'admin',
+ ),
+ 'ldap_loginname_asdn' => 0,
+ 'ldap_loginldap_attr' => 'uid',
+ 'ldap_filter_person' => '',
+ 'ldap_domain_name' => 'mydomain',
+ 'ldap_provisionning' => 0,
+ 'ldap_provisionning_group' =>
+ array (
+ ),
+ 'ldap_mail_attr' => 'mail',
+ 'ldap_givenname_attr' => 'givenname',
+ 'ldap_surname_attr' => 'sn',
+ 'ldap_field_mapping' => 'email=mail|name=displayname',
+ 'ldap_provisionning_upd' => 1,
+ 'ldap_use_TLS' => 0,
+ 'usetips' => 1,
+ 'typeicons' => 'default',
+ 'typebreadcrumb' => 'default',
+ 'jquery_theme' => 'base',
+ 'active_blocksadmin' => 1,
+ 'active_filemanager' => 1,
+ 'active_groups' => 1,
+ 'active_modulesadmin' => 1,
+ 'active_preferences' => 1,
+ 'active_tplsets' => 1,
+ 'active_users' => 1,
+ 'groups_pager' => 15,
+ 'users_pager' => 20,
+ 'blocks_editor' => 'dhtmltextarea',
+ 'general_editor' => 'dhtmltextarea',
+ 'redirect' => 'admin.php?fct=preferences',
+ 'com_anonpost' => 0,
+);
Property changes on: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/xoops_data/caches/xoops_cache/xoops_78948e84_system_configs.php
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Rev URL
\ No newline at end of property
Added: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/xoops_data/caches/xoops_cache/xoops_78948e84_system_modules_active.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/xoops_data/caches/xoops_cache/xoops_78948e84_system_modules_active.php (rev 0)
+++ XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/xoops_data/caches/xoops_cache/xoops_78948e84_system_modules_active.php 2013-10-07 19:04:54 UTC (rev 12158)
@@ -0,0 +1,16 @@
+1409596396
+return array (
+ 1 => 'system',
+ 3 => 'page',
+ 4 => 'avatars',
+ 5 => 'comments',
+ 6 => 'images',
+ 7 => 'mailusers',
+ 8 => 'maintenance',
+ 9 => 'menus',
+ 10 => 'notifications',
+ 11 => 'protector',
+ 12 => 'smilies',
+ 13 => 'logger',
+ 14 => 'banners',
+);
Property changes on: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/xoops_data/caches/xoops_cache/xoops_78948e84_system_modules_active.php
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Rev URL
\ No newline at end of property
Added: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/xoops_data/configs/captcha.config.image.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/xoops_data/configs/captcha.config.image.php (rev 0)
+++ XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/xoops_data/configs/captcha.config.image.php 2013-10-07 19:04:54 UTC (rev 12158)
@@ -0,0 +1,17 @@
+return array (
+ 'num_chars' => 6,
+ 'casesensitive' => false,
+ 'fontsize_min' => 10,
+ 'fontsize_max' => 24,
+ 'background_type' => 0,
+ 'background_num' => 50,
+ 'polygon_point' => 3,
+ 'skip_characters' =>
+ array (
+ 0 => 'o',
+ 1 => '0',
+ 2 => 'i',
+ 3 => 'l',
+ 4 => '1',
+ ),
+);
\ No newline at end of file
Property changes on: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/xoops_data/configs/captcha.config.image.php
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Rev URL
\ No newline at end of property
Added: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/xoops_data/configs/captcha.config.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/xoops_data/configs/captcha.config.php (rev 0)
+++ XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/xoops_data/configs/captcha.config.php 2013-10-07 19:04:54 UTC (rev 12158)
@@ -0,0 +1,7 @@
+return array (
+ 'disabled' => false,
+ 'mode' => 'image',
+ 'name' => 'xoopscaptcha',
+ 'skipmember' => true,
+ 'maxattempts' => 10,
+);
\ No newline at end of file
Property changes on: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/xoops_data/configs/captcha.config.php
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Rev URL
\ No newline at end of property
Added: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/xoops_data/configs/captcha.config.recaptcha.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/xoops_data/configs/captcha.config.recaptcha.php (rev 0)
+++ XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/xoops_data/configs/captcha.config.recaptcha.php 2013-10-07 19:04:54 UTC (rev 12158)
@@ -0,0 +1,6 @@
+return array (
+ 'private_key' => 'YourPrivateApiKey',
+ 'public_key' => 'YourPublicApiKey',
+ 'theme' => 'white',
+ 'lang' => 'en-US',
+);
\ No newline at end of file
Property changes on: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/xoops_data/configs/captcha.config.recaptcha.php
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Rev URL
\ No newline at end of property
Added: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/xoops_data/configs/captcha.config.text.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/xoops_data/configs/captcha.config.text.php (rev 0)
+++ XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/xoops_data/configs/captcha.config.text.php 2013-10-07 19:04:54 UTC (rev 12158)
@@ -0,0 +1,3 @@
+return array (
+ 'num_chars' => 6,
+);
\ No newline at end of file
Property changes on: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/xoops_data/configs/captcha.config.text.php
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Rev URL
\ No newline at end of property
Added: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/xoops_data/configs/protector_configcache_1c1562
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/xoops_data/configs/protector_configcache_1c1562 (rev 0)
+++ XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/xoops_data/configs/protector_configcache_1c1562 2013-10-07 19:04:54 UTC (rev 12158)
@@ -0,0 +1 @@
+a:31:{s:15:"global_disabled";s:1:"0";s:12:"default_lang";s:7:"english";s:9:"log_level";s:3:"255";s:11:"banip_time0";s:5:"86400";s:12:"reliable_ips";s:46:"a:2:{i:0;s:9:"^192.168.";i:1;s:9:"127.0.0.1";}";s:20:"session_fixed_topbit";s:2:"24";s:17:"groups_denyipmove";s:14:"a:1:{i:0;i:1;}";s:12:"san_nullbyte";s:1:"1";s:10:"die_badext";s:1:"1";s:14:"contami_action";s:1:"3";s:13:"isocom_action";s:1:"0";s:12:"union_action";s:1:"0";s:14:"id_forceintval";s:1:"0";s:11:"file_dotdot";s:1:"1";s:8:"bf_count";s:2:"10";s:13:"bwlimit_count";s:1:"0";s:15:"dos_skipmodules";s:0:"";s:10:"dos_expire";s:2:"60";s:11:"dos_f5count";s:2:"20";s:12:"dos_f5action";s:4:"exit";s:11:"dos_crcount";s:2:"40";s:12:"dos_craction";s:4:"exit";s:10:"dos_crsafe";s:34:"/(msnbot|Googlebot|Yahoo! Slurp)/i";s:10:"bip_except";s:14:"a:1:{i:0;i:1;}";s:16:"disable_features";s:1:"1";s:18:"enable_dblayertrap";s:1:"1";s:21:"dblayertrap_wo_server";s:1:"0";s:18:"enable_bigumbrella";s:1:"1";s:18:"spamcount_uri4user";s:1:"0";s:19:"spamcount_uri4guest";s:1:"5";s:20:"stopforumspam_action";s:4:"none";}
\ No newline at end of file
Added: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/xoops_data/configs/protector_configcache_446afb
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/xoops_data/configs/protector_configcache_446afb (rev 0)
+++ XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/xoops_data/configs/protector_configcache_446afb 2013-10-07 19:04:54 UTC (rev 12158)
@@ -0,0 +1 @@
+a:31:{s:15:"global_disabled";s:1:"0";s:12:"default_lang";s:7:"en...
[truncated message content] |
|
From: <ce...@us...> - 2013-10-07 13:58:17
|
Revision: 12157
http://sourceforge.net/p/xoops/svn/12157
Author: cesag
Date: 2013-10-07 13:58:13 +0000 (Mon, 07 Oct 2013)
Log Message:
-----------
Replacing colume with column (cesag)
Modified Paths:
--------------
XoopsModules/contact/trunk/contact/admin/log.php
XoopsModules/contact/trunk/contact/language/english/admin.php
Modified: XoopsModules/contact/trunk/contact/admin/log.php
===================================================================
--- XoopsModules/contact/trunk/contact/admin/log.php 2013-10-07 13:16:45 UTC (rev 12156)
+++ XoopsModules/contact/trunk/contact/admin/log.php 2013-10-07 13:58:13 UTC (rev 12157)
@@ -32,10 +32,10 @@
case 'form':
// prune manager
$form = new XoopsThemeForm(_AM_CONTACT_LOGS_FORM, 'logs', 'log.php', 'post');
- $column = new XoopsFormSelect(_AM_CONTACT_LOGS_COLUME, 'column','contact_phone');
- $column->addOption("contact_phone", _AM_CONTACT_LOGS_COLUME_PHONE);
- $column->addOption("contact_url", _AM_CONTACT_LOGS_COLUME_URL);
- $column->addOption("contact_mail", _AM_CONTACT_LOGS_COLUME_MAIL);
+ $column = new XoopsFormSelect(_AM_CONTACT_LOGS_COLUMN, 'column','contact_phone');
+ $column->addOption("contact_phone", _AM_CONTACT_LOGS_COLUMN_PHONE);
+ $column->addOption("contact_url", _AM_CONTACT_LOGS_COLUMN_URL);
+ $column->addOption("contact_mail", _AM_CONTACT_LOGS_COLUMN_MAIL);
$form->addElement($column);
$form->addElement(new XoopsFormHidden('op', 'getlog'));
$form->addElement(new XoopsFormButton('', 'post', _SUBMIT, 'submit'));
Modified: XoopsModules/contact/trunk/contact/language/english/admin.php
===================================================================
--- XoopsModules/contact/trunk/contact/language/english/admin.php 2013-10-07 13:16:45 UTC (rev 12156)
+++ XoopsModules/contact/trunk/contact/language/english/admin.php 2013-10-07 13:58:13 UTC (rev 12157)
@@ -40,8 +40,8 @@
define('_AM_CONTACT_TOOLS_PRUNE_BEFORE', "Delete messages that were published before");
define('_AM_CONTACT_TOOLS_PRUNE_REPLYONLY', "Delete only messages with replies");
define('_AM_CONTACT_LOGS_FORM', "Log form");
-define('_AM_CONTACT_LOGS_COLUME', "Select Colume");
-define('_AM_CONTACT_LOGS_COLUME_PHONE', "Phone");
-define('_AM_CONTACT_LOGS_COLUME_URL', "URL");
-define('_AM_CONTACT_LOGS_COLUME_MAIL', "Email");
+define('_AM_CONTACT_LOGS_COLUMN', "Select the required column");
+define('_AM_CONTACT_LOGS_COLUMN_PHONE', "Phone");
+define('_AM_CONTACT_LOGS_COLUMN_URL', "URL");
+define('_AM_CONTACT_LOGS_COLUMN_MAIL', "Email");
?>
\ No newline at end of file
|
|
From: <ce...@us...> - 2013-10-07 13:16:48
|
Revision: 12156
http://sourceforge.net/p/xoops/svn/12156
Author: cesag
Date: 2013-10-07 13:16:45 +0000 (Mon, 07 Oct 2013)
Log Message:
-----------
Standardization of the English language files (cesag)
Modified Paths:
--------------
XoopsModules/contact/trunk/contact/language/english/admin.php
XoopsModules/contact/trunk/contact/language/english/main.php
XoopsModules/contact/trunk/contact/language/english/modinfo.php
Modified: XoopsModules/contact/trunk/contact/language/english/admin.php
===================================================================
--- XoopsModules/contact/trunk/contact/language/english/admin.php 2013-10-07 13:07:14 UTC (rev 12155)
+++ XoopsModules/contact/trunk/contact/language/english/admin.php 2013-10-07 13:16:45 UTC (rev 12156)
@@ -1,54 +1,47 @@
<?php
-
// index
-define("_AM_CONTACT_INDEX_ADMENU1","Messages");
-define("_AM_CONTACT_INDEX_TOTAL","There are <span class='green'>%s</span> Messages in our database");
-
+define('_AM_CONTACT_INDEX_ADMENU1', "Messages");
+define('_AM_CONTACT_INDEX_TOTAL', "There are <span class='green'>%s</span> Messages in our database");
// Contact
-define("_AM_CONTACT_ID","Id");
-define("_AM_CONTACT_SUBJECT","Subject");
-define("_AM_CONTACT_DEPARTMENT","Department");
-define("_AM_CONTACT_SUBMITTER","Submitter");
-define("_AM_CONTACT_DATE","Date Submitted");
-define("_AM_CONTACT_MESSAGE","Message");
-define("_AM_CONTACT_EMAIL","Email");
-define("_AM_CONTACT_URL","URL");
-define("_AM_CONTACT_VIEWURL","View URL");
-define("_AM_CONTACT_ICQ","ICQ");
-define("_AM_CONTACT_COMPANY","Company");
-define("_AM_CONTACT_LOCATION","Location");
-define("_AM_CONTACT_IP","IP");
-define("_AM_CONTACT_PHONE","Phone");
-define("_AM_CONTACT_ADDRESS","Address");
-define("_AM_CONTACT_ACTION","Action");
-define("_AM_CONTACT_VIEW","View");
-define("_AM_CONTACT_REPLY","Reply");
-define("_AM_CONTACT_HAVEREPLY","Replied");
-define("_AM_CONTACT_HAVENTREPLY","Not Replied");
-
-define("_AM_CONTACT_FROM","From");
-define("_AM_CONTACT_NAMEFROM","Name");
-define("_AM_CONTACT_MAILFROM","Email");
-define("_AM_CONTACT_TO","To");
-define("_AM_CONTACT_NAMETO","Name");
-define("_AM_CONTACT_MAILTO","Email");
-
-define("_AM_CONTACT_TITLE","Title");
-define("_AM_CONTACT_INFO","Information");
-
-define("_AM_CONTACT_MSG_EXIST","Selected Message does not exist");
-define("_AM_CONTACT_MSG_DELETE","Are you sure to delete this message and all replies?");
-define("_AM_CONTACT_MSG_DELETED","Your selected message has been deleted");
-define("_AM_CONTACT_MSG_DELETEERROR","Error in deleting message");
-define("_AM_CONTACT_MSG_PRUNE_DELETED","%s messages deleted");
-
-define("_AM_CONTACT_TOOLS_PRUNE","Delete Messages");
-define("_AM_CONTACT_TOOLS_PRUNE_BEFORE","Delete messages that were published before");
-define("_AM_CONTACT_TOOLS_PRUNE_REPLYONLY","Delete only messages with replies");
-
-define("_AM_CONTACT_LOGS_FORM","Log form");
-define("_AM_CONTACT_LOGS_COLUME","Select Colume");
-define("_AM_CONTACT_LOGS_COLUME_PHONE","Phone");
-define("_AM_CONTACT_LOGS_COLUME_URL","URL");
-define("_AM_CONTACT_LOGS_COLUME_MAIL","Email");
+define('_AM_CONTACT_ID', "Id");
+define('_AM_CONTACT_SUBJECT', "Subject");
+define('_AM_CONTACT_DEPARTMENT', "Department");
+define('_AM_CONTACT_SUBMITTER', "Submitter");
+define('_AM_CONTACT_DATE', "Date Submitted");
+define('_AM_CONTACT_MESSAGE', "Message");
+define('_AM_CONTACT_EMAIL', "Email");
+define('_AM_CONTACT_URL', "URL");
+define('_AM_CONTACT_VIEWURL', "View URL");
+define('_AM_CONTACT_ICQ', "ICQ");
+define('_AM_CONTACT_COMPANY', "Company");
+define('_AM_CONTACT_LOCATION', "Location");
+define('_AM_CONTACT_IP', "IP");
+define('_AM_CONTACT_PHONE', "Phone");
+define('_AM_CONTACT_ADDRESS', "Address");
+define('_AM_CONTACT_ACTION', "Action");
+define('_AM_CONTACT_VIEW', "View");
+define('_AM_CONTACT_REPLY', "Reply");
+define('_AM_CONTACT_HAVEREPLY', "Replied");
+define('_AM_CONTACT_HAVENTREPLY', "Not Replied");
+define('_AM_CONTACT_FROM', "From");
+define('_AM_CONTACT_NAMEFROM', "Name");
+define('_AM_CONTACT_MAILFROM', "Email");
+define('_AM_CONTACT_TO', "To");
+define('_AM_CONTACT_NAMETO', "Name");
+define('_AM_CONTACT_MAILTO', "Email");
+define('_AM_CONTACT_TITLE', "Title");
+define('_AM_CONTACT_INFO', "Information");
+define('_AM_CONTACT_MSG_EXIST', "Selected Message does not exist");
+define('_AM_CONTACT_MSG_DELETE', "Are you sure to delete this message and all replies?");
+define('_AM_CONTACT_MSG_DELETED', "Your selected message has been deleted");
+define('_AM_CONTACT_MSG_DELETEERROR', "Error in deleting message");
+define('_AM_CONTACT_MSG_PRUNE_DELETED', "%s messages deleted");
+define('_AM_CONTACT_TOOLS_PRUNE', "Delete Messages");
+define('_AM_CONTACT_TOOLS_PRUNE_BEFORE', "Delete messages that were published before");
+define('_AM_CONTACT_TOOLS_PRUNE_REPLYONLY', "Delete only messages with replies");
+define('_AM_CONTACT_LOGS_FORM', "Log form");
+define('_AM_CONTACT_LOGS_COLUME', "Select Colume");
+define('_AM_CONTACT_LOGS_COLUME_PHONE', "Phone");
+define('_AM_CONTACT_LOGS_COLUME_URL', "URL");
+define('_AM_CONTACT_LOGS_COLUME_MAIL', "Email");
?>
\ No newline at end of file
Modified: XoopsModules/contact/trunk/contact/language/english/main.php
===================================================================
--- XoopsModules/contact/trunk/contact/language/english/main.php 2013-10-07 13:07:14 UTC (rev 12155)
+++ XoopsModules/contact/trunk/contact/language/english/main.php 2013-10-07 13:16:45 UTC (rev 12156)
@@ -1,22 +1,21 @@
<?php
-define("_MD_CONTACT_FORM","Contact Form");
-define("_MD_CONTACT_NAME","Name");
-define("_MD_CONTACT_MAIL","Email");
-define("_MD_CONTACT_URL","URL");
-define("_MD_CONTACT_ICQ","ICQ");
-define("_MD_CONTACT_COMPANY","Company");
-define("_MD_CONTACT_LOCATION","Location");
-define("_MD_CONTACT_PHONE","Phone");
-define("_MD_CONTACT_ADDRESS","Address");
-define("_MD_CONTACT_SUBJECT","Subject");
-define("_MD_CONTACT_MESSAGE","Comment");
-define("_MD_CONTACT_DEPARTMENT","Department");
-define("_MD_CONTACT_DEFULTDEP","Contact us");
-
-define("_MD_CONTACT_MES_SEND","Thank you for contacting us");
-define("_MD_CONTACT_MES_NOVALIDEMAIL","Your Email is not Valid");
-define("_MD_CONTACT_MES_NOTSAVE","Sorry, your Message was not saved in our DB");
-define("_MD_CONTACT_MES_SAVEINDB","Your Message has been saved in our DB");
-define("_MD_CONTACT_MES_SENDERROR","Error in sending Message");
-define("_MD_CONTACT_MES_ERROR","Error");
+define('_MD_CONTACT_FORM', "Contact Form");
+define('_MD_CONTACT_NAME', "Name");
+define('_MD_CONTACT_MAIL', "Email");
+define('_MD_CONTACT_URL', "URL");
+define('_MD_CONTACT_ICQ', "ICQ");
+define('_MD_CONTACT_COMPANY', "Company");
+define('_MD_CONTACT_LOCATION', "Location");
+define('_MD_CONTACT_PHONE', "Phone");
+define('_MD_CONTACT_ADDRESS', "Address");
+define('_MD_CONTACT_SUBJECT', "Subject");
+define('_MD_CONTACT_MESSAGE', "Comment");
+define('_MD_CONTACT_DEPARTMENT', "Department");
+define('_MD_CONTACT_DEFULTDEP', "Contact us");
+define('_MD_CONTACT_MES_SEND', "Thank you for contacting us");
+define('_MD_CONTACT_MES_NOVALIDEMAIL', "Your Email is not Valid");
+define('_MD_CONTACT_MES_NOTSAVE', "Sorry, your Message was not saved in our DB");
+define('_MD_CONTACT_MES_SAVEINDB', "Your Message has been saved in our DB");
+define('_MD_CONTACT_MES_SENDERROR', "Error in sending Message");
+define('_MD_CONTACT_MES_ERROR', "Error");
?>
\ No newline at end of file
Modified: XoopsModules/contact/trunk/contact/language/english/modinfo.php
===================================================================
--- XoopsModules/contact/trunk/contact/language/english/modinfo.php 2013-10-07 13:07:14 UTC (rev 12155)
+++ XoopsModules/contact/trunk/contact/language/english/modinfo.php 2013-10-07 13:16:45 UTC (rev 12156)
@@ -1,58 +1,51 @@
<?php
// $Id$
// Module Info
-
// The name of this module
-define("_MI_CONTACT_NAME","Contact us");
-define("_MI_CONTACT_DESC","Contact module with email and database storage");
-
+define('_MI_CONTACT_NAME', "Contact us");
+define('_MI_CONTACT_DESC', "Contact module with email and database storage");
// Admin menu
define('_MI_CONTACT_MENU_HOME',"Home");
-define("_MI_CONTACT_MENU_HOME_DESC","Go back to homepage");
+define('_MI_CONTACT_MENU_HOME_DESC', "Go back to homepage");
define('_MI_CONTACT_MENU_CONTACT',"Messages");
-define("_MI_CONTACT_MENU_CONTACT_DESC","List of messages");
+define('_MI_CONTACT_MENU_CONTACT_DESC', "List of messages");
define('_MI_CONTACT_MENU_TOOLS',"Purge");
-define("_MI_CONTACT_MENU_TOOLS_DESC","Purge Tools");
+define('_MI_CONTACT_MENU_TOOLS_DESC', "Purge Tools");
define('_MI_CONTACT_MENU_LOGS',"Logs");
-define("_MI_CONTACT_MENU_LOGS_DESC","Get Logs");
-define("_MI_CONTACT_MENU_ABOUT", "About");
-define("_MI_CONTACT_MENU_ABOUT_DESC" , "About this module");
-define("_MI_CONTACT_MENU_HELP","Help");
-define("_MI_CONTACT_MENU_HELP_DESC" , "Module help");
-
+define('_MI_CONTACT_MENU_LOGS_DESC', "Get Logs");
+define('_MI_CONTACT_MENU_ABOUT', "About");
+define('_MI_CONTACT_MENU_ABOUT_DESC', "About this module");
+define('_MI_CONTACT_MENU_HELP', "Help");
+define('_MI_CONTACT_MENU_HELP_DESC', "Module help");
// Module Settings
-define("_MI_CONTACT_FORM_URL","Get URL");
-define("_MI_CONTACT_FORM_URL_DESC","");
-define("_MI_CONTACT_FORM_ICQ","Get ICQ");
-define("_MI_CONTACT_FORM_ICQ_DESC","");
-define("_MI_CONTACT_FORM_COMPANY","Get Company");
-define("_MI_CONTACT_FORM_COMPANY_DESC","");
-define("_MI_CONTACT_FORM_LOCATION","Get Location");
-define("_MI_CONTACT_FORM_LOCATION_DESC","");
-define("_MI_CONTACT_FORM_PHONE","Get Phone");
-define("_MI_CONTACT_FORM_PHONE_DESC","");
-define("_MI_CONTACT_FORM_ADDRESS","Get Address");
-define("_MI_CONTACT_FORM_ADDRESS_DESC","");
-define("_MI_CONTACT_FORM_DEPT","Select Departments");
-define("_MI_CONTACT_FORM_DEPT_DESC","");
-define("_MI_CONTACT_FORM_CAPTCHA","Use Captcha");
-define("_MI_CONTACT_FORM_CAPTCHA_DESC","");
-
-define("_MI_CONTACT_DEPT","Departments");
-define("_MI_CONTACT_DEPT_DESC","Departments allow you to define a department/email combination. Users selecting<br />"
+define('_MI_CONTACT_FORM_URL', "Get URL");
+define('_MI_CONTACT_FORM_URL_DESC', "");
+define('_MI_CONTACT_FORM_ICQ', "Get ICQ");
+define('_MI_CONTACT_FORM_ICQ_DESC', "");
+define('_MI_CONTACT_FORM_COMPANY', "Get Company");
+define('_MI_CONTACT_FORM_COMPANY_DESC', "");
+define('_MI_CONTACT_FORM_LOCATION', "Get Location");
+define('_MI_CONTACT_FORM_LOCATION_DESC', "");
+define('_MI_CONTACT_FORM_PHONE', "Get Phone");
+define('_MI_CONTACT_FORM_PHONE_DESC', "");
+define('_MI_CONTACT_FORM_ADDRESS', "Get Address");
+define('_MI_CONTACT_FORM_ADDRESS_DESC', "");
+define('_MI_CONTACT_FORM_DEPT', "Select Departments");
+define('_MI_CONTACT_FORM_DEPT_DESC', "");
+define('_MI_CONTACT_FORM_CAPTCHA', "Use Captcha");
+define('_MI_CONTACT_FORM_CAPTCHA_DESC', "");
+define('_MI_CONTACT_DEPT', "Departments");
+define('_MI_CONTACT_DEPT_DESC', "Departments allow you to define a department/email combination. Users selecting<br />"
."from a defined department will have their contact information sent to the corresponding<br />"
."email address you define.<br /><br />"
."Define each department/email as follows:<br /><br />"
."dept1,email1|dept2,email2|dept3,email3 etc. - each department and email must be separated<br />"
."by a comma ',', and each department email combination must be separated by a pipe '|'");
-
-define("_MI_CONTACT_PERPAGE","Messages per page");
-define("_MI_CONTACT_PERPAGE_DESC","");
-
-define("_MI_CONTACT_TOPINFO","Header contact form");
-define("_MI_CONTACT_TOPINFO_DESC","Set HTML codes to show in contact page");
-
-define("_MI_CONTACT_HEAD_OPTIONS","Form Options");
-define("_MI_CONTACT_HEAD_ADMIN","Admin setting");
-define("_MI_CONTACT_HEAD_INFO","Information");
+define('_MI_CONTACT_PERPAGE', "Messages per page");
+define('_MI_CONTACT_PERPAGE_DESC', "");
+define('_MI_CONTACT_TOPINFO', "Header contact form");
+define('_MI_CONTACT_TOPINFO_DESC', "Set HTML codes to show in contact page");
+define('_MI_CONTACT_HEAD_OPTIONS', "Form Options");
+define('_MI_CONTACT_HEAD_ADMIN', "Admin setting");
+define('_MI_CONTACT_HEAD_INFO', "Information");
?>
\ No newline at end of file
|
|
From: <ce...@us...> - 2013-10-07 13:07:17
|
Revision: 12155
http://sourceforge.net/p/xoops/svn/12155
Author: cesag
Date: 2013-10-07 13:07:14 +0000 (Mon, 07 Oct 2013)
Log Message:
-----------
Language corrections, typos (cesag)
Modified Paths:
--------------
XoopsModules/contact/trunk/contact/admin/contact.php
XoopsModules/contact/trunk/contact/language/english/main.php
XoopsModules/contact/trunk/contact/language/english/modinfo.php
Modified: XoopsModules/contact/trunk/contact/admin/contact.php
===================================================================
--- XoopsModules/contact/trunk/contact/admin/contact.php 2013-10-06 23:36:44 UTC (rev 12154)
+++ XoopsModules/contact/trunk/contact/admin/contact.php 2013-10-07 13:07:14 UTC (rev 12155)
@@ -192,7 +192,7 @@
exit ();
}
- redirect_header ( 'contact.php', 1, _AM_CONTACT_MSG_DELETEDO );
+ redirect_header ( 'contact.php', 1, _AM_CONTACT_MSG_DELETED );
xoops_cp_footer ();
exit ();
break;
Modified: XoopsModules/contact/trunk/contact/language/english/main.php
===================================================================
--- XoopsModules/contact/trunk/contact/language/english/main.php 2013-10-06 23:36:44 UTC (rev 12154)
+++ XoopsModules/contact/trunk/contact/language/english/main.php 2013-10-07 13:07:14 UTC (rev 12155)
@@ -11,9 +11,9 @@
define("_MD_CONTACT_SUBJECT","Subject");
define("_MD_CONTACT_MESSAGE","Comment");
define("_MD_CONTACT_DEPARTMENT","Department");
-define("_MD_CONTACT_DEFULTDEP","Contact Us");
+define("_MD_CONTACT_DEFULTDEP","Contact us");
-define("_MD_CONTACT_MES_SEND","Thank you for Contacting Us");
+define("_MD_CONTACT_MES_SEND","Thank you for contacting us");
define("_MD_CONTACT_MES_NOVALIDEMAIL","Your Email is not Valid");
define("_MD_CONTACT_MES_NOTSAVE","Sorry, your Message was not saved in our DB");
define("_MD_CONTACT_MES_SAVEINDB","Your Message has been saved in our DB");
Modified: XoopsModules/contact/trunk/contact/language/english/modinfo.php
===================================================================
--- XoopsModules/contact/trunk/contact/language/english/modinfo.php 2013-10-06 23:36:44 UTC (rev 12154)
+++ XoopsModules/contact/trunk/contact/language/english/modinfo.php 2013-10-07 13:07:14 UTC (rev 12155)
@@ -3,14 +3,14 @@
// Module Info
// The name of this module
-define("_MI_CONTACT_NAME","Contact Us");
-define("_MI_CONTACT_DESC","Contact module with email and DB storage");
+define("_MI_CONTACT_NAME","Contact us");
+define("_MI_CONTACT_DESC","Contact module with email and database storage");
// Admin menu
define('_MI_CONTACT_MENU_HOME',"Home");
-define("_MI_CONTACT_MENU_HOME_DESC","Go back to Home");
+define("_MI_CONTACT_MENU_HOME_DESC","Go back to homepage");
define('_MI_CONTACT_MENU_CONTACT',"Messages");
-define("_MI_CONTACT_MENU_CONTACT_DESC","List of Messages");
+define("_MI_CONTACT_MENU_CONTACT_DESC","List of messages");
define('_MI_CONTACT_MENU_TOOLS',"Purge");
define("_MI_CONTACT_MENU_TOOLS_DESC","Purge Tools");
define('_MI_CONTACT_MENU_LOGS',"Logs");
|
|
From: <rgr...@us...> - 2013-10-06 23:36:47
|
Revision: 12154
http://sourceforge.net/p/xoops/svn/12154
Author: rgriffith
Date: 2013-10-06 23:36:44 +0000 (Sun, 06 Oct 2013)
Log Message:
-----------
Backing out r12096, r12101, r12102, r12112 for now
Revision Links:
--------------
http://sourceforge.net/p/xoops/svn/12096
http://sourceforge.net/p/xoops/svn/12101
http://sourceforge.net/p/xoops/svn/12102
http://sourceforge.net/p/xoops/svn/12112
Modified Paths:
--------------
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/theme.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/sampleform.inc.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/tinymce/formtinymce.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/tinymce/language/english.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/tinymce/tinymce.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/xoopseditor.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/form.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formcheckbox.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formcolorpicker.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formdatetime.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formdhtmltextarea.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formeditor.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formelement.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formfile.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formradio.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formselect.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formselecteditor.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/include/functions.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/include/site-closed.php
Removed Paths:
-------------
XoopsCore/branches/2.5.x/2.5.7/htdocs/include/json2.js
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/theme.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/theme.php 2013-10-06 19:11:55 UTC (rev 12153)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/theme.php 2013-10-06 23:36:44 UTC (rev 12154)
@@ -304,7 +304,6 @@
}
// Load global javascript
$this->addScript('include/xoops.js');
- $this->addScript('include/json2.js');
$this->loadLocalization();
if ($this->bufferOutput) {
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/sampleform.inc.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/sampleform.inc.php 2013-10-06 19:11:55 UTC (rev 12153)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/sampleform.inc.php 2013-10-06 23:36:44 UTC (rev 12154)
@@ -34,11 +34,8 @@
$editor = @ $xoopsUser->getVar('editor'); // Need set through user profile
}
// Add the editor selection box
- // If dohtml is disabled, set $noHtml = true; $mode not considered if $noHtml is false
- xoops_load('XoopsCache');
- XoopsCache::delete('editorlist');
- $mode = 'html'; // extension or mimetype
- $sample_form->addElement(new XoopsFormSelectEditor($sample_form, 'editor', $editor, $noHtml = false, $mode));
+ // If dohtml is disabled, set $noHtml = true
+ $sample_form->addElement(new XoopsFormSelectEditor($sample_form, 'editor', $editor, $noHtml = false));
// options for the editor
// required configs
$options['editor'] = $editor;
@@ -49,8 +46,8 @@
$options['cols'] = 60; // default value = 50
$options['width'] = '100%'; // default value = 100%
$options['height'] = '400px'; // default value = 400px
- $options['mode'] = $mode; // for editors that support mode option
+
// "textarea": if the selected editor with name of $editor can not be created, the editor "textarea" will be used
// if no $onFailure is set, then the first available editor will be used
// If dohtml is disabled, set $noHtml to true
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/tinymce/formtinymce.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/tinymce/formtinymce.php 2013-10-06 19:11:55 UTC (rev 12153)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/tinymce/formtinymce.php 2013-10-06 23:36:44 UTC (rev 12154)
@@ -35,7 +35,7 @@
*
* @param array $configs Editor Options
*/
- function __construct($configs, $mode)
+ function __construct($configs)
{
$current_path = __FILE__;
if (DIRECTORY_SEPARATOR != "/") {
@@ -86,23 +86,6 @@
}
/**
- * Renders the Javascript function needed for client-side for get content
- *
- * I'VE USED THIS EXAMPLE TO WRITE VALIDATION CODE
- * http://tinymce.moxiecode.com/punbb/viewtopic.php?id=12616
- *
- * @return string
- */
- function renderGetContentJS()
- {
- if ($eltname = $this->getName()) {
- $ret = "tinyMCE.get('{$eltname}').getContent()";
- return $ret;
- }
- return '';
- }
-
- /**
* get language
*
* @return string
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/tinymce/language/english.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/tinymce/language/english.php 2013-10-06 19:11:55 UTC (rev 12153)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/tinymce/language/english.php 2013-10-06 23:36:44 UTC (rev 12154)
@@ -14,7 +14,7 @@
* Assocated with editor_registry.php
*/
// Name of the editor
-define('_XOOPS_EDITOR_TINYMCE',"TinyMCE v3.5.8");
+define('_XOOPS_EDITOR_TINYMCE',"TinyMCE");
// The value must be the same as /tinymce/jscripts/langs/your_language_code, for example, "en" for English, "fr" for French
// For details, check http://tinymce.moxiecode.com/download_i18n.php
define('_XOOPS_EDITOR_TINYMCE_LANGUAGE',"en");
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/tinymce/tinymce.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/tinymce/tinymce.php 2013-10-06 19:11:55 UTC (rev 12153)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/tinymce/tinymce.php 2013-10-06 23:36:44 UTC (rev 12154)
@@ -269,10 +269,11 @@
$this->init();
if (self::$LastOfElementsTinymce!=$this->setting["elements"]) {
$ret = "\n<!-- 'tiny_mce.js' SCRIPT NOT YET ".$this->setting["elements"]." -->\n"; //debug
+
return $ret;
- } else {
+ } else {
$this->setting["elements"]=implode(",",self::$ListOfElementsTinymce);
- }
+ }
if ( !empty($this->setting["callback"]) ) {
$callback = $this->setting["callback"];
unset($this->setting["callback"]);
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/xoopseditor.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/xoopseditor.php 2013-10-06 19:11:55 UTC (rev 12153)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopseditor/xoopseditor.php 2013-10-06 23:36:44 UTC (rev 12154)
@@ -90,7 +90,6 @@
var $root_path = "";
var $nohtml = false;
var $allowed_editors = array();
- var $mode = null;
/**
* Enter description here...
*
@@ -126,16 +125,15 @@
*
* @param string $name Editor name which is actually the folder name
* @param array $options editor options: $key => $val
+ * @param string $OnFailure a pre-validated editor that will be used if the required editor is failed to create
* @param bool $noHtml dohtml disabled
- * @param string $OnFailure a pre-validated editor that will be used if the required editor is failed to create
- * @param string Requested mode (or array of them)
*/
- function get($name = '', $options = null, $noHtml = false, $OnFailure = '', $mode = null)
+ function get($name = '', $options = null, $noHtml = false, $OnFailure = '')
{
- if (array_key_exists($name, $this->getList($noHtml, $mode)) && $editor = $this->_loadEditor($name, $options, $mode)) {
+ if (array_key_exists($name, $this->getList($noHtml)) && $editor = $this->_loadEditor($name, $options)) {
return $editor;
}
- $list = array_keys($this->getList($noHtml, $mode));
+ $list = array_keys($this->getList($noHtml));
if (empty($OnFailure) || !in_array($OnFailure, $list)) {
$OnFailure = $list[0];
}
@@ -147,10 +145,9 @@
* XoopsEditorHandler::getList()
*
* @param mixed $noHtml
- * @param string $mode Requested mode (or array of them)
* @return
*/
- function getList($noHtml = false, $mode = null)
+ function getList($noHtml = false)
{
/*
Do NOT use this method statically, please use
@@ -180,17 +177,7 @@
if (empty($config['order']))
continue;
$order[] = $config['order'];
- if (!isset($config['modes'])) {
- $config['modes'] = null;
- }
- if ($config['nohtml'] == false) {
- $config['modes'] = array('htm', 'html', 'htmlmixed', 'text/html');
- }
- $list[$item] = array(
- 'title' => $config['title'] ,
- 'nohtml' => $config['nohtml'],
- 'modes' => $config['modes']
- );
+ $list[$item] = array('title' => $config['title'] , 'nohtml' => $config['nohtml']);
}
}
array_multisort($order, $list);
@@ -205,10 +192,6 @@
foreach ($editors as $name) {
if (!empty($noHtml) && empty($list[$name]['nohtml']))
continue;
- if (!empty($mode) && is_string($mode) && !empty($list[$name]['modes']) && !in_array(strtolower($mode), $list[$name]['modes']))
- continue;
- if (!empty($mode) && is_array($mode) && !empty($list[$name]['modes']) && (count(array_intersect($mode, $list[$name]['modes'])) == 0))
- continue;
$_list[$name] = $list[$name]['title'];
}
return $_list;
@@ -251,7 +234,7 @@
* @param mixed $options
* @return
*/
- function _loadEditor($name, $options = null, $mode = null)
+ function _loadEditor($name, $options = null)
{
$editor = null;
if (empty($name) || !array_key_exists($name, $this->getList())) {
@@ -272,7 +255,7 @@
return $editor;
}
include_once $config['file'];
- $editor = new $config['class']($options, $mode);
+ $editor = new $config['class']($options);
return $editor;
}
}
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/form.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/form.php 2013-10-06 19:11:55 UTC (rev 12153)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/form.php 2013-10-06 23:36:44 UTC (rev 12154)
@@ -526,10 +526,10 @@
* A basic element validation method may contain something like this:
* <code>
* function renderValidationJS() {
- * $name = $this->getName();
- * return "if (myform.{$name}.value != 'valid') { " .
- * "myform.{$name}.focus(); window.alert( '$name is invalid' ); return false;" .
- * " }";
+ * $name = $this->getName();
+ * return "if (myform.{$name}.value != 'valid') { " .
+ * "myform.{$name}.focus(); window.alert( '$name is invalid' ); return false;" .
+ * " }";
* }
* </code>
*
@@ -558,66 +558,6 @@
}
/**
- * Renders the Javascript function needed for client-side for get content
- *
- * Additionally, each element class may provide its own "renderGetContentJS" method
- * that is supposed to return custom get content code for the element.
- *
- * The element get content code can assume that the JS "myform" variable points to the form.
- * Exemple:
- * <script type='text/javascript'>
- * var content[];
- * content = " . $form->renderGetContentJS(false) . "
- * </script>
- *
- * A basic element get content method may contain something like this:
- * <code>
- * function renderGetContentJS() {
- * $name = $this->getName();
- * return "document.getElementById('{$name}');";
- * }
- * </code>
- *
- * @param boolean $withtags Include the < javascript > tags in the returned string
- * @return string
- */
- function renderGetContentJS($withTags = false)
- {
- $formname = $this->getName();
- $js = '';
- if ($withTags) {
- $js .= "\n<!-- Start Form GetContent JavaScript //-->\n<script type='text/javascript'>\n<!--//\n";
- $js .= "function xoopsFormGetContent_{$formname}() {\n";
- } else {
- $js .= "(function() {\n";
- }
- //$js .= " var myform = window.document.{$formname};\n";
- $js .= " var content = new Object();\n";
- $elements = $this->getElements(true);
- foreach($elements as $elt) {
- if (method_exists($elt, 'renderGetContentJS') && ($elt->getName() != '')) {
- $js .= " content['" . $elt->getName() . "'] = " . $elt->renderGetContentJS() . ";\n";
- }
- }
- $js .= " Object.size = function(obj) {\n";
- $js .= " var size = 0, key;\n";
- $js .= " for (key in obj)\n";
- $js .= " {if (obj.hasOwnProperty(key)) size++;}\n";
- $js .= " return size;\n";
- $js .= " };\n";
- $js .= " return (Object.size(content) > 0) ? content : null;\n";
-
- if ($withTags) {
- $js .= "}\n";
- $js .= "//--></script>\n<!-- End Form GetContent JavaScript //-->\n";
- } else {
- $js .= "})()\n";
- }
-
- return $js;
- }
-
- /**
* assign to smarty form template instead of displaying directly
*
* @param object $ &$tpl reference to a {@link Smarty} object
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formcheckbox.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formcheckbox.php 2013-10-06 19:11:55 UTC (rev 12153)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formcheckbox.php 2013-10-06 23:36:44 UTC (rev 12154)
@@ -242,32 +242,4 @@
}
return '';
}
-
- /**
- * Render custom javascript get content code
- *
- * @seealso XoopsForm::renderGetContentJS
- */
- function renderGetContentJS()
- {
- // render custom validation code if any
- if (! empty($this->customGetContentCode)) {
- return implode(NWLINE, $this->customGetContentCode);
- // generate get content code if required
- } else {
- $eltname = $this->getName();
- return "(function(){
- var checkboxesChecked = [];
- var checkboxes = document.getElementsByName('{$eltname}[]');
- if (checkboxes.length) {
- for (var i = 0; i < checkboxes.length; i++) {
- if (checkboxes[i].checked == true) {
- checkboxesChecked.push(checkboxes[i].value);
- }
- }
- }
- return (checkboxesChecked.length > 0) ? checkboxesChecked : null;
- })()";
- }
- }
}
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formcolorpicker.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formcolorpicker.php 2013-10-06 19:11:55 UTC (rev 12153)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formcolorpicker.php 2013-10-06 23:36:44 UTC (rev 12154)
@@ -72,17 +72,4 @@
return "if ( !(new RegExp(\"^#[0-9a-fA-F]{6}\",\"i\").test(myform.{$eltname}.value)) ) { window.alert(\"{$eltmsg}\"); myform.{$eltname}.focus(); return false; }";
}
-
- /**
- * Returns custom get content Javascript
- *
- * @return string Element get content Javascript
- */
- function renderGetContentJS()
- {
- $eltname = $this->getName();
- return "(function(){
- return ((new RegExp('^#[0-9a-fA-F]{6}','i').test(document.getElementById('{$eltname}').value))) ? document.getElementById('{$eltname}').value : null;
- })()";
- }
}
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formdatetime.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formdatetime.php 2013-10-06 19:11:55 UTC (rev 12153)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formdatetime.php 2013-10-06 23:36:44 UTC (rev 12154)
@@ -38,15 +38,13 @@
* @param integer $value
* @param mixed $showtime
*/
- function __construct($caption, $name, $size = 15, $value = 0, $showtime = true)
+ function XoopsFormDateTime($caption, $name, $size = 15, $value = 0, $showtime = true)
{
- $this->XoopsFormElementTray($caption, ' ', $name);
+ $this->XoopsFormElementTray($caption, ' ');
$value = intval($value);
$value = ($value > 0) ? $value : time();
$datetime = getDate($value);
- $dateselect = new XoopsFormTextDateSelect('', $name . '[date]', $size, $value, $showtime);
- $this->addElement($dateselect);
-
+ $this->addElement(new XoopsFormTextDateSelect('', $name . '[date]', $size, $value, $showtime));
$timearray = array();
for ($i = 0; $i < 24; $i ++) {
for ($j = 0; $j < 60; $j = $j + 10) {
@@ -55,30 +53,9 @@
}
}
ksort($timearray);
+
$timeselect = new XoopsFormSelect('', $name . '[time]', $datetime['hours'] * 3600 + 600 * ceil($datetime['minutes'] / 10));
$timeselect->addOptionArray($timearray);
$this->addElement($timeselect);
}
-
- /**
- * Render custom javascript get content code
- *
- * @seealso XoopsForm::renderGetContentJS
- */
- function renderGetContentJS()
- {
- $eltname = $this->getName();
- // render custom validation code if any
- if (! empty($this->customGetContentCode)) {
- return implode(NWLINE, $this->customGetContentCode);
- // generate get content code if required
- } else {
- return "(function(){
- var dateTime = []
- dateTime.push(document.getElementById('{$eltname}[date]').value);
- dateTime.push(document.getElementById('{$eltname}[time]').value);
- return (dateTime.length > 0) ? dateTime : null;
- })()";
- }
- }
}
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formdhtmltextarea.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formdhtmltextarea.php 2013-10-06 19:11:55 UTC (rev 12153)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formdhtmltextarea.php 2013-10-06 23:36:44 UTC (rev 12154)
@@ -265,19 +265,4 @@
}
return parent::renderValidationJS();
}
-
- /**
- * XoopsFormDhtmlTextArea::renderGetContentJS()
- *
- * @return
- */
- function renderGetContentJS()
- {
- if ($this->htmlEditor && is_object($this->htmlEditor) && method_exists($this->htmlEditor, 'renderGetContentJS')) {
- if (! isset($this->htmlEditor->isEnabled) || $this->htmlEditor->isEnabled) {
- return $this->htmlEditor->renderGetContentJS();
- }
- }
- return parent::renderGetContentJS();
- }
}
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formeditor.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formeditor.php 2013-10-06 19:11:55 UTC (rev 12153)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formeditor.php 2013-10-06 23:36:44 UTC (rev 12154)
@@ -38,9 +38,8 @@
* @param array $configs configures: editor - editor identifier; name - textarea field name; width, height - dimensions for textarea; value - text content
* @param bool $noHtml use non-WYSIWYG eitor onfailure
* @param string $OnFailure editor to be used if current one failed
- * @param string Requested mode, useful for syntax highlighting editors*
*/
- function XoopsFormEditor($caption, $name, $configs = null, $nohtml = false, $OnFailure = '', $mode = null)
+ function XoopsFormEditor($caption, $name, $configs = null, $nohtml = false, $OnFailure = '')
{
// Backward compatibility: $name -> editor name; $configs['name'] -> textarea field name
if (! isset($configs['editor'])) {
@@ -50,19 +49,15 @@
} else {
$configs['name'] = $name;
}
- if (empty($mode) && !empty($configs['mode'])) {
- $mode = $configs['mode'];
- $configs['mode'] = null;
- }
$this->XoopsFormTextArea($caption, $name);
xoops_load('XoopsEditorHandler');
$editor_handler = XoopsEditorHandler::getInstance();
- $this->editor = $editor_handler->get($configs['editor'], $configs, $nohtml, $OnFailure, $mode);
+ $this->editor = $editor_handler->get($configs['editor'], $configs, $nohtml, $OnFailure);
}
/**
* renderValidationJS
- * override original renderValidationJS method
+ * TEMPORARY SOLUTION to 'override' original renderValidationJS method
* with custom XoopsEditor's renderValidationJS method
*/
function renderValidationJS()
@@ -82,27 +77,6 @@
}
/**
- * renderGetContentJS
- * 'override' original renderGetContentJS method
- * with custom XoopsEditor's renderGetContentJS method
- */
- function renderGetContentJS()
- {
- if (is_object($this->editor)) {
- if (method_exists($this->editor, 'renderGetContentJS')) {
- $this->editor->setName($this->getName());
- $this->editor->setCaption($this->getCaption());
- $this->editor->_required = $this->isRequired();
- $ret = $this->editor->renderGetContentJS();
- return $ret;
- } else {
- parent::renderGetContentJS();
- }
- }
- return false;
- }
-
- /**
* XoopsFormEditor::render()
*
* @return
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formelement.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formelement.php 2013-10-06 19:11:55 UTC (rev 12153)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formelement.php 2013-10-06 23:36:44 UTC (rev 12154)
@@ -434,37 +434,6 @@
}
/**
- * Render custom javascript get content code
- *
- * @seealso XoopsForm::renderGetContentJS
- */
- function renderGetContentJS()
- {
- // render custom get content code if any
- if (!empty($this->customGetContentCode)) {
- return implode(NWLINE, $this->customGetContentCode);
- // generate get content code if required
- } else if ($eltname = $this->getName()) {
- // $eltname = $this->getName();
- $eltcaption = $this->getCaption();
- $eltmsg = empty($eltcaption) ? sprintf(_FORM_ENTER, $eltname) : sprintf(_FORM_ENTER, $eltcaption);
- $eltmsg = str_replace(array(':' , '?' , '%'), '', $eltmsg);
- $eltmsg = str_replace('"', '\"', stripslashes($eltmsg));
- $eltmsg = strip_tags($eltmsg);
- echo $this->getFormType();
- switch ($this->getFormType()) {
- case 'checkbox':
- return "document.getElementById('{$eltname}').value";
- break;
- default:
- return "document.getElementById('{$eltname}').value";
- break;
- } // switch
- }
- return false;
- }
-
- /**
* Generates output for the element.
*
* This method is abstract and must be overwritten by the child classes.
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formfile.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formfile.php 2013-10-06 19:11:55 UTC (rev 12153)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formfile.php 2013-10-06 23:36:44 UTC (rev 12154)
@@ -40,7 +40,7 @@
* @param string $name "name" attribute
* @param int $maxfilesize Maximum size for an uploaded file
*/
- function __construct($caption, $name, $maxfilesize)
+ function XoopsFormFile($caption, $name, $maxfilesize)
{
$this->setCaption($caption);
$this->setName($name);
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formradio.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formradio.php 2013-10-06 19:11:55 UTC (rev 12153)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formradio.php 2013-10-06 23:36:44 UTC (rev 12154)
@@ -197,30 +197,4 @@
}
return $ret;
}
-
- /**
- * Render custom javascript get content code
- *
- * @seealso XoopsForm::renderGetContentJS
- */
- function renderGetContentJS()
- {
- // render custom validation code if any
- if (! empty($this->customGetContentCode)) {
- return implode("\n", $this->customGetContentCode);
- // generate validation code if required
- } else {
- $eltname = $this->getName();
- return "(function(){
- var radios = document.getElementsByName('{$eltname}');
- for(var i = 0; i < radios.length; i++){
- if(radios[i].checked){
- return radios[i].value;
- }
- }
- return null; // or undefined, or your preferred default for none checked
- })()";
- }
- return '';
- }
}
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formselect.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formselect.php 2013-10-06 19:11:55 UTC (rev 12153)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formselect.php 2013-10-06 23:36:44 UTC (rev 12154)
@@ -238,33 +238,4 @@
}
return '';
}
-
- /**
- * Render custom javascript get content code
- *
- * @seealso XoopsForm::renderGetContentJS
- */
- function renderGetContentJS()
- {
- // render custom validation code if any
- if (! empty($this->customGetContentCode)) {
- return implode("\n", $this->customGetContentCode);
- // generate validation code if required
- } else {
- $eltname = $this->getName();
- return "(function(){
- var selectSelected = [];
- var options = document.getElementById('{$eltname}') && document.getElementById('{$eltname}').options;
- var opt;
- for (var i=0, iLen=options.length; i<iLen; i++) {
- opt = options[i];
- if (opt.selected) {
- selectSelected.push(opt.value || opt.text);
- }
- }
- return (selectSelected.length > 0) ? selectSelected : null;
- })()";
- }
- return '';
- }
}
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formselecteditor.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formselecteditor.php 2013-10-06 19:11:55 UTC (rev 12153)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/xoopsform/formselecteditor.php 2013-10-06 23:36:44 UTC (rev 12154)
@@ -27,7 +27,6 @@
*/
class XoopsFormSelectEditor extends XoopsFormElementTray
{
- var $modes = null;
var $allowed_editors = array();
var $form;
var $value;
@@ -41,13 +40,10 @@
* @param string $name editor name
* @param string $value Pre-selected text value
* @param bool $noHtml dohtml disabled
- * @param array $allowed_editors
- * @param mixed $modes Requested mode (or array of them)
*/
- function XoopsFormSelectEditor(&$form, $name = 'editor', $value = null, $nohtml = false, $allowed_editors = array(), $modes = null)
+ function XoopsFormSelectEditor(&$form, $name = 'editor', $value = null, $nohtml = false, $allowed_editors = array())
{
$this->XoopsFormElementTray(_SELECT);
- $this->modes = $modes;
$this->allowed_editors = $allowed_editors;
$this->form = &$form;
$this->name = $name;
@@ -65,13 +61,12 @@
xoops_load('XoopsEditorHandler');
$editor_handler = XoopsEditorHandler::getInstance();
$editor_handler->allowed_editors = $this->allowed_editors;
- $editor_handler->modes = $this->modes;
$option_select = new XoopsFormSelect("", $this->name, $this->value);
$extra = 'onchange="if(this.options[this.selectedIndex].value.length > 0 ){
window.document.forms.' . $this->form->getName() . '.submit();
}"';
$option_select->setExtra($extra);
- $option_select->addOptionArray($editor_handler->getList($this->nohtml, $this->modes));
+ $option_select->addOptionArray($editor_handler->getList($this->nohtml));
$this->addElement($option_select);
return parent::render();
}
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/include/functions.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/include/functions.php 2013-10-06 19:11:55 UTC (rev 12153)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/include/functions.php 2013-10-06 23:36:44 UTC (rev 12154)
@@ -245,8 +245,7 @@
<meta name="copyright" content="' . htmlspecialchars($xoopsConfigMetaFooter['meta_copyright']) . '" />
<meta name="generator" content="XOOPS" />
<title>' . htmlspecialchars($xoopsConfig['sitename']) . '</title>
- <script type="text/javascript" src="' . XOOPS_URL . '/include/xoops.js"></script>
- <script type="text/javascript" src="' . XOOPS_URL . '/include/json2.js"></script>';
+ <script type="text/javascript" src="' . XOOPS_URL . '/include/xoops.js"></script>';
$themecss = xoops_getcss($xoopsConfig['theme_set']);
echo '<link rel="stylesheet" type="text/css" media="all" href="' . XOOPS_URL . '/xoops.css" />';
$language = xoops_getConfigOption('language');
Deleted: XoopsCore/branches/2.5.x/2.5.7/htdocs/include/json2.js
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/include/json2.js 2013-10-06 19:11:55 UTC (rev 12153)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/include/json2.js 2013-10-06 23:36:44 UTC (rev 12154)
@@ -1,486 +0,0 @@
-/*
- json2.js
- 2013-05-26
-
- Public Domain.
-
- NO WARRANTY EXPRESSED OR IMPLIED. USE AT YOUR OWN RISK.
-
- See http://www.JSON.org/js.html
-
-
- This code should be minified before deployment.
- See http://javascript.crockford.com/jsmin.html
-
- USE YOUR OWN COPY. IT IS EXTREMELY UNWISE TO LOAD CODE FROM SERVERS YOU DO
- NOT CONTROL.
-
-
- This file creates a global JSON object containing two methods: stringify
- and parse.
-
- JSON.stringify(value, replacer, space)
- value any JavaScript value, usually an object or array.
-
- replacer an optional parameter that determines how object
- values are stringified for objects. It can be a
- function or an array of strings.
-
- space an optional parameter that specifies the indentation
- of nested structures. If it is omitted, the text will
- be packed without extra whitespace. If it is a number,
- it will specify the number of spaces to indent at each
- level. If it is a string (such as '\t' or ' '),
- it contains the characters used to indent at each level.
-
- This method produces a JSON text from a JavaScript value.
-
- When an object value is found, if the object contains a toJSON
- method, its toJSON method will be called and the result will be
- stringified. A toJSON method does not serialize: it returns the
- value represented by the name/value pair that should be serialized,
- or undefined if nothing should be serialized. The toJSON method
- will be passed the key associated with the value, and this will be
- bound to the value
-
- For example, this would serialize Dates as ISO strings.
-
- Date.prototype.toJSON = function (key) {
- function f(n) {
- // Format integers to have at least two digits.
- return n < 10 ? '0' + n : n;
- }
-
- return this.getUTCFullYear() + '-' +
- f(this.getUTCMonth() + 1) + '-' +
- f(this.getUTCDate()) + 'T' +
- f(this.getUTCHours()) + ':' +
- f(this.getUTCMinutes()) + ':' +
- f(this.getUTCSeconds()) + 'Z';
- };
-
- You can provide an optional replacer method. It will be passed the
- key and value of each member, with this bound to the containing
- object. The value that is returned from your method will be
- serialized. If your method returns undefined, then the member will
- be excluded from the serialization.
-
- If the replacer parameter is an array of strings, then it will be
- used to select the members to be serialized. It filters the results
- such that only members with keys listed in the replacer array are
- stringified.
-
- Values that do not have JSON representations, such as undefined or
- functions, will not be serialized. Such values in objects will be
- dropped; in arrays they will be replaced with null. You can use
- a replacer function to replace those with JSON values.
- JSON.stringify(undefined) returns undefined.
-
- The optional space parameter produces a stringification of the
- value that is filled with line breaks and indentation to make it
- easier to read.
-
- If the space parameter is a non-empty string, then that string will
- be used for indentation. If the space parameter is a number, then
- the indentation will be that many spaces.
-
- Example:
-
- text = JSON.stringify(['e', {pluribus: 'unum'}]);
- // text is '["e",{"pluribus":"unum"}]'
-
-
- text = JSON.stringify(['e', {pluribus: 'unum'}], null, '\t');
- // text is '[\n\t"e",\n\t{\n\t\t"pluribus": "unum"\n\t}\n]'
-
- text = JSON.stringify([new Date()], function (key, value) {
- return this[key] instanceof Date ?
- 'Date(' + this[key] + ')' : value;
- });
- // text is '["Date(---current time---)"]'
-
-
- JSON.parse(text, reviver)
- This method parses a JSON text to produce an object or array.
- It can throw a SyntaxError exception.
-
- The optional reviver parameter is a function that can filter and
- transform the results. It receives each of the keys and values,
- and its return value is used instead of the original value.
- If it returns what it received, then the structure is not modified.
- If it returns undefined then the member is deleted.
-
- Example:
-
- // Parse the text. Values that look like ISO date strings will
- // be converted to Date objects.
-
- myData = JSON.parse(text, function (key, value) {
- var a;
- if (typeof value === 'string') {
- a =
-/^(\d{4})-(\d{2})-(\d{2})T(\d{2}):(\d{2}):(\d{2}(?:\.\d*)?)Z$/.exec(value);
- if (a) {
- return new Date(Date.UTC(+a[1], +a[2] - 1, +a[3], +a[4],
- +a[5], +a[6]));
- }
- }
- return value;
- });
-
- myData = JSON.parse('["Date(09/09/2001)"]', function (key, value) {
- var d;
- if (typeof value === 'string' &&
- value.slice(0, 5) === 'Date(' &&
- value.slice(-1) === ')') {
- d = new Date(value.slice(5, -1));
- if (d) {
- return d;
- }
- }
- return value;
- });
-
-
- This is a reference implementation. You are free to copy, modify, or
- redistribute.
-*/
-
-/*jslint evil: true, regexp: true */
-
-/*members "", "\b", "\t", "\n", "\f", "\r", "\"", JSON, "\\", apply,
- call, charCodeAt, getUTCDate, getUTCFullYear, getUTCHours,
- getUTCMinutes, getUTCMonth, getUTCSeconds, hasOwnProperty, join,
- lastIndex, length, parse, prototype, push, replace, slice, stringify,
- test, toJSON, toString, valueOf
-*/
-
-
-// Create a JSON object only if one does not already exist. We create the
-// methods in a closure to avoid creating global variables.
-
-if (typeof JSON !== 'object') {
- JSON = {};
-}
-
-(function () {
- 'use strict';
-
- function f(n) {
- // Format integers to have at least two digits.
- return n < 10 ? '0' + n : n;
- }
-
- if (typeof Date.prototype.toJSON !== 'function') {
-
- Date.prototype.toJSON = function () {
-
- return isFinite(this.valueOf())
- ? this.getUTCFullYear() + '-' +
- f(this.getUTCMonth() + 1) + '-' +
- f(this.getUTCDate()) + 'T' +
- f(this.getUTCHours()) + ':' +
- f(this.getUTCMinutes()) + ':' +
- f(this.getUTCSeconds()) + 'Z'
- : null;
- };
-
- String.prototype.toJSON =
- Number.prototype.toJSON =
- Boolean.prototype.toJSON = function () {
- return this.valueOf();
- };
- }
-
- var cx = /[\u0000\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\uffff]/g,
- escapable = /[\\\"\x00-\x1f\x7f-\x9f\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\uffff]/g,
- gap,
- indent,
- meta = { // table of character substitutions
- '\b': '\\b',
- '\t': '\\t',
- '\n': '\\n',
- '\f': '\\f',
- '\r': '\\r',
- '"' : '\\"',
- '\\': '\\\\'
- },
- rep;
-
-
- function quote(string) {
-
-// If the string contains no control characters, no quote characters, and no
-// backslash characters, then we can safely slap some quotes around it.
-// Otherwise we must also replace the offending characters with safe escape
-// sequences.
-
- escapable.lastIndex = 0;
- return escapable.test(string) ? '"' + string.replace(escapable, function (a) {
- var c = meta[a];
- return typeof c === 'string'
- ? c
- : '\\u' + ('0000' + a.charCodeAt(0).toString(16)).slice(-4);
- }) + '"' : '"' + string + '"';
- }
-
-
- function str(key, holder) {
-
-// Produce a string from holder[key].
-
- var i, // The loop counter.
- k, // The member key.
- v, // The member value.
- length,
- mind = gap,
- partial,
- value = holder[key];
-
-// If the value has a toJSON method, call it to obtain a replacement value.
-
- if (value && typeof value === 'object' &&
- typeof value.toJSON === 'function') {
- value = value.toJSON(key);
- }
-
-// If we were called with a replacer function, then call the replacer to
-// obtain a replacement value.
-
- if (typeof rep === 'function') {
- value = rep.call(holder, key, value);
- }
-
-// What happens next depends on the value's type.
-
- switch (typeof value) {
- case 'string':
- return quote(value);
-
- case 'number':
-
-// JSON numbers must be finite. Encode non-finite numbers as null.
-
- return isFinite(value) ? String(value) : 'null';
-
- case 'boolean':
- case 'null':
-
-// If the value is a boolean or null, convert it to a string. Note:
-// typeof null does not produce 'null'. The case is included here in
-// the remote chance that this gets fixed someday.
-
- return String(value);
-
-// If the type is 'object', we might be dealing with an object or an array or
-// null.
-
- case 'object':
-
-// Due to a specification blunder in ECMAScript, typeof null is 'object',
-// so watch out for that case.
-
- if (!value) {
- return 'null';
- }
-
-// Make an array to hold the partial results of stringifying this object value.
-
- gap += indent;
- partial = [];
-
-// Is the value an array?
-
- if (Object.prototype.toString.apply(value) === '[object Array]') {
-
-// The value is an array. Stringify every element. Use null as a placeholder
-// for non-JSON values.
-
- length = value.length;
- for (i = 0; i < length; i += 1) {
- partial[i] = str(i, value) || 'null';
- }
-
-// Join all of the elements together, separated with commas, and wrap them in
-// brackets.
-
- v = partial.length === 0
- ? '[]'
- : gap
- ? '[\n' + gap + partial.join(',\n' + gap) + '\n' + mind + ']'
- : '[' + partial.join(',') + ']';
- gap = mind;
- return v;
- }
-
-// If the replacer is an array, use it to select the members to be stringified.
-
- if (rep && typeof rep === 'object') {
- length = rep.length;
- for (i = 0; i < length; i += 1) {
- if (typeof rep[i] === 'string') {
- k = rep[i];
- v = str(k, value);
- if (v) {
- partial.push(quote(k) + (gap ? ': ' : ':') + v);
- }
- }
- }
- } else {
-
-// Otherwise, iterate through all of the keys in the object.
-
- for (k in value) {
- if (Object.prototype.hasOwnProperty.call(value, k)) {
- v = str(k, value);
- if (v) {
- partial.push(quote(k) + (gap ? ': ' : ':') + v);
- }
- }
- }
- }
-
-// Join all of the member texts together, separated with commas,
-// and wrap them in braces.
-
- v = partial.length === 0
- ? '{}'
- : gap
- ? '{\n' + gap + partial.join(',\n' + gap) + '\n' + mind + '}'
- : '{' + partial.join(',') + '}';
- gap = mind;
- return v;
- }
- }
-
-// If the JSON object does not yet have a stringify method, give it one.
-
- if (typeof JSON.stringify !== 'function') {
- JSON.stringify = function (value, replacer, space) {
-
-// The stringify method takes a value and an optional replacer, and an optional
-// space parameter, and returns a JSON text. The replacer can be a function
-// that can replace values, or an array of strings that will select the keys.
-// A default replacer method can be provided. Use of the space parameter can
-// produce text that is more easily readable.
-
- var i;
- gap = '';
- indent = '';
-
-// If the space parameter is a number, make an indent string containing that
-// many spaces.
-
- if (typeof space === 'number') {
- for (i = 0; i < space; i += 1) {
- indent += ' ';
- }
-
-// If the space parameter is a string, it will be used as the indent string.
-
- } else if (typeof space === 'string') {
- indent = space;
- }
-
-// If there is a replacer, it must be a function or an array.
-// Otherwise, throw an error.
-
- rep = replacer;
- if (replacer && typeof replacer !== 'function' &&
- (typeof replacer !== 'object' ||
- typeof replacer.length !== 'number')) {
- throw new Error('JSON.stringify');
- }
-
-// Make a fake root object containing our value under the key of ''.
-// Return the result of stringifying the value.
-
- return str('', {'': value});
- };
- }
-
-
-// If the JSON object does not yet have a parse method, give it one.
-
- if (typeof JSON.parse !== 'function') {
- JSON.parse = function (text, reviver) {
-
-// The parse method takes a text and an optional reviver function, and returns
-// a JavaScript value if the text is a valid JSON text.
-
- var j;
-
- function walk(holder, key) {
-
-// The walk method is used to recursively walk the resulting structure so
-// that modifications can be made.
-
- var k, v, value = holder[key];
- if (value && typeof value === 'object') {
- for (k in value) {
- if (Object.prototype.hasOwnProperty.call(value, k)) {
- v = walk(value, k);
- if (v !== undefined) {
- value[k] = v;
- } else {
- delete value[k];
- }
- }
- }
- }
- return reviver.call(holder, key, value);
- }
-
-
-// Parsing happens in four stages. In the first stage, we replace certain
-// Unicode characters with escape sequences. JavaScript handles many characters
-// incorrectly, either silently deleting them, or treating them as line endings.
-
- text = String(text);
- cx.lastIndex = 0;
- if (cx.test(text)) {
- text = text.replace(cx, function (a) {
- return '\\u' +
- ('0000' + a.charCodeAt(0).toString(16)).slice(-4);
- });
- }
-
-// In the second stage, we run the text against regular expressions that look
-// for non-JSON patterns. We are especially concerned with '()' and 'new'
-// because they can cause invocation, and '=' because it can cause mutation.
-// But just to be safe, we want to reject all unexpected forms.
-
-// We split the second stage into 4 regexp operations in order to work around
-// crippling inefficiencies in IE's and Safari's regexp engines. First we
-// replace the JSON backslash pairs with '@' (a non-JSON character). Second, we
-// replace all simple value tokens with ']' characters. Third, we delete all
-// open brackets that follow a colon or comma or that begin the text. Finally,
-// we look to see that the remaining characters are only whitespace or ']' or
-// ',' or ':' or '{' or '}'. If that is so, then the text is safe for eval.
-
- if (/^[\],:{}\s]*$/
- .test(text.replace(/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g, '@')
- .replace(/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g, ']')
- .replace(/(?:^|:|,)(?:\s*\[)+/g, ''))) {
-
-// In the third stage we use the eval function to compile the text into a
-// JavaScript structure. The '{' operator is subject to a syntactic ambiguity
-// in JavaScript: it can begin a block or an object literal. We wrap the text
-// in parens to eliminate the ambiguity.
-
- j = eval('(' + text + ')');
-
-// In the optional fourth stage, we recursively walk the new structure, passing
-// each name/value pair to a reviver function for possible transformation.
-
- return typeof reviver === 'function'
- ? walk({'': j}, '')
- : j;
- }
-
-// If the text is not JSON parseable, then a SyntaxError is thrown.
-
- throw new SyntaxError('JSON.parse');
- };
- }
-}());
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/include/site-closed.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/include/site-closed.php 2013-10-06 19:11:55 UTC (rev 12153)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/include/site-closed.php 2013-10-06 23:36:44 UTC (rev 12154)
@@ -46,8 +46,6 @@
'plugins' => array()));
$xoTheme->addScript('/include/xoops.js', array(
'type' => 'text/javascript'));
- $xoTheme->addScript('/include/json2.js', array(
- 'type' => 'text/javascript'));
$xoopsTpl =& $xoTheme->template;
$xoopsTpl->assign(array(
'xoops_theme' => $xoopsConfig['theme_set'] ,
|
|
From: <be...@us...> - 2013-10-06 19:12:00
|
Revision: 12153
http://sourceforge.net/p/xoops/svn/12153
Author: beckmi
Date: 2013-10-06 19:11:55 +0000 (Sun, 06 Oct 2013)
Log Message:
-----------
Updating Smarty to 2.6.28
Modified Paths:
--------------
XoopsCore/branches/2.5.x/2.5.7/docs/changelog.250.txt
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/Smarty.class.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/Smarty_Compiler.class.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/debug.tpl
Modified: XoopsCore/branches/2.5.x/2.5.7/docs/changelog.250.txt
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/docs/changelog.250.txt 2013-10-06 18:36:28 UTC (rev 12152)
+++ XoopsCore/branches/2.5.x/2.5.7/docs/changelog.250.txt 2013-10-06 19:11:55 UTC (rev 12153)
@@ -46,6 +46,7 @@
- jGrowl to 1.2.13 (mamba)
- jQuery Form to 3.42.0 (mamba)
- HTML Purifier to 4.5.0 (mamba)
+ - Smarty to 2.6.28 (mamba)
===============================
2013/04/21: Version 2.5.6 Final
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/Smarty.class.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/Smarty.class.php 2013-10-06 18:36:28 UTC (rev 12152)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/Smarty.class.php 2013-10-06 19:11:55 UTC (rev 12153)
@@ -27,7 +27,7 @@
* @author Monte Ohrt <monte at ohrt dot com>
* @author Andrei Zmievski <an...@ph...>
* @package Smarty
- * @version 2.6.27
+ * @version 2.6.28
*/
/* $Id$ */
@@ -35,7 +35,7 @@
/**
* DIR_SEP isn't used anymore, but third party apps might
*/
-if (!defined('DIR_SEP')) {
+if(!defined('DIR_SEP')) {
define('DIR_SEP', DIRECTORY_SEPARATOR);
}
@@ -465,7 +465,7 @@
*
* @var string
*/
- var $_version = '2.6.27';
+ var $_version = '2.6.28';
/**
* current template inclusion depth
@@ -576,11 +576,11 @@
* assigns values to template variables
*
* @param array|string $tpl_var the template variable name(s)
- * @param mixed $value the value to assign
+ * @param mixed $value the value to assign
*/
function assign($tpl_var, $value = null)
{
- if (is_array($tpl_var)) {
+ if (is_array($tpl_var)){
foreach ($tpl_var as $key => $val) {
if ($key != '') {
$this->_tpl_vars[$key] = $val;
@@ -596,7 +596,7 @@
* assigns values to template variables by reference
*
* @param string $tpl_var the template variable name
- * @param mixed $value the referenced value to assign
+ * @param mixed $value the referenced value to assign
*/
function assign_by_ref($tpl_var, &$value)
{
@@ -608,7 +608,7 @@
* appends values to template variables
*
* @param array|string $tpl_var the template variable name(s)
- * @param mixed $value the value to append
+ * @param mixed $value the value to append
*/
function append($tpl_var, $value=null, $merge=false)
{
@@ -616,11 +616,11 @@
// $tpl_var is an array, ignore $value
foreach ($tpl_var as $_key => $_val) {
if ($_key != '') {
- if (!@is_array($this->_tpl_vars[$_key])) {
+ if(!@is_array($this->_tpl_vars[$_key])) {
settype($this->_tpl_vars[$_key],'array');
}
- if ($merge && is_array($_val)) {
- foreach ($_val as $_mkey => $_mval) {
+ if($merge && is_array($_val)) {
+ foreach($_val as $_mkey => $_mval) {
$this->_tpl_vars[$_key][$_mkey] = $_mval;
}
} else {
@@ -630,11 +630,11 @@
}
} else {
if ($tpl_var != '' && isset($value)) {
- if (!@is_array($this->_tpl_vars[$tpl_var])) {
+ if(!@is_array($this->_tpl_vars[$tpl_var])) {
settype($this->_tpl_vars[$tpl_var],'array');
}
- if ($merge && is_array($value)) {
- foreach ($value as $_mkey => $_mval) {
+ if($merge && is_array($value)) {
+ foreach($value as $_mkey => $_mval) {
$this->_tpl_vars[$tpl_var][$_mkey] = $_mval;
}
} else {
@@ -648,16 +648,16 @@
* appends values to template variables by reference
*
* @param string $tpl_var the template variable name
- * @param mixed $value the referenced value to append
+ * @param mixed $value the referenced value to append
*/
function append_by_ref($tpl_var, &$value, $merge=false)
{
if ($tpl_var != '' && isset($value)) {
- if (!@is_array($this->_tpl_vars[$tpl_var])) {
+ if(!@is_array($this->_tpl_vars[$tpl_var])) {
settype($this->_tpl_vars[$tpl_var],'array');
}
if ($merge && is_array($value)) {
- foreach ($value as $_key => $_val) {
+ foreach($value as $_key => $_val) {
$this->_tpl_vars[$tpl_var][$_key] = &$value[$_key];
}
} else {
@@ -685,7 +685,7 @@
/**
* Registers custom function to be used in templates
*
- * @param string $function the name of the template function
+ * @param string $function the name of the template function
* @param string $function_impl the name of the PHP function to register
*/
function register_function($function, $function_impl, $cacheable=true, $cache_attrs=null)
@@ -708,10 +708,10 @@
/**
* Registers object to be used in templates
*
- * @param string $object name of template object
- * @param object &$object_impl the referenced PHP object to register
- * @param null|array $allowed list of allowed methods (empty = all)
- * @param boolean $smarty_args smarty argument format, else traditional
+ * @param string $object name of template object
+ * @param object &$object_impl the referenced PHP object to register
+ * @param null|array $allowed list of allowed methods (empty = all)
+ * @param boolean $smarty_args smarty argument format, else traditional
* @param null|array $block_functs list of methods that are block format
*/
function register_object($object, &$object_impl, $allowed = array(), $smarty_args = true, $block_methods = array())
@@ -736,7 +736,7 @@
/**
* Registers block function to be used in templates
*
- * @param string $block name of template block
+ * @param string $block name of template block
* @param string $block_impl PHP function to register
*/
function register_block($block, $block_impl, $cacheable=true, $cache_attrs=null)
@@ -758,7 +758,7 @@
/**
* Registers compiler function
*
- * @param string $function name of template function
+ * @param string $function name of template function
* @param string $function_impl name of PHP function to register
*/
function register_compiler_function($function, $function_impl, $cacheable=true)
@@ -780,7 +780,7 @@
/**
* Registers modifier to be used in templates
*
- * @param string $modifier name of template modifier
+ * @param string $modifier name of template modifier
* @param string $modifier_impl name of PHP function to register
*/
function register_modifier($modifier, $modifier_impl)
@@ -802,8 +802,8 @@
/**
* Registers a resource to fetch a template
*
- * @param string $type name of resource
- * @param array $functions array of functions to handle resource
+ * @param string $type name of resource
+ * @param array $functions array of functions to handle resource
*/
function register_resource($type, $functions)
{
@@ -927,10 +927,10 @@
/**
* clear cached content for the given template and cache id
*
- * @param string $tpl_file name of template file
- * @param string $cache_id name of cache_id
- * @param string $compile_id name of compile_id
- * @param string $exp_time expiration time
+ * @param string $tpl_file name of template file
+ * @param string $cache_id name of cache_id
+ * @param string $compile_id name of compile_id
+ * @param string $exp_time expiration time
* @return boolean
*/
function clear_cache($tpl_file = null, $cache_id = null, $compile_id = null, $exp_time = null)
@@ -953,7 +953,6 @@
'auto_id' => $_auto_id,
'exp_time' => $exp_time);
require_once(SMARTY_CORE_DIR . 'core.rm_auto.php');
-
return smarty_core_rm_auto($_params, $this);
}
@@ -963,7 +962,7 @@
/**
* clear the entire contents of cache (all templates)
*
- * @param string $exp_time expire time
+ * @param string $exp_time expire time
* @return boolean results of {@link smarty_core_rm_auto()}
*/
function clear_all_cache($exp_time = null)
@@ -975,9 +974,9 @@
/**
* test to see if valid cache exists for this template
*
- * @param string $tpl_file name of template file
- * @param string $cache_id
- * @param string $compile_id
+ * @param string $tpl_file name of template file
+ * @param string $cache_id
+ * @param string $compile_id
* @return string|false results of {@link _read_cache_file()}
*/
function is_cached($tpl_file, $cache_id = null, $compile_id = null)
@@ -994,7 +993,6 @@
'compile_id' => $compile_id
);
require_once(SMARTY_CORE_DIR . 'core.read_cache_file.php');
-
return smarty_core_read_cache_file($_params, $this);
}
@@ -1013,9 +1011,9 @@
* or all compiled template files if one is not specified.
* This function is for advanced use only, not normally needed.
*
- * @param string $tpl_file
- * @param string $compile_id
- * @param string $exp_time
+ * @param string $tpl_file
+ * @param string $compile_id
+ * @param string $exp_time
* @return boolean results of {@link smarty_core_rm_auto()}
*/
function clear_compiled_tpl($tpl_file = null, $compile_id = null, $exp_time = null)
@@ -1029,40 +1027,37 @@
'exp_time' => $exp_time,
'extensions' => array('.inc', '.php'));
require_once(SMARTY_CORE_DIR . 'core.rm_auto.php');
-
return smarty_core_rm_auto($_params, $this);
}
/**
* Checks whether requested template exists.
*
- * @param string $tpl_file
+ * @param string $tpl_file
* @return boolean
*/
function template_exists($tpl_file)
{
$_params = array('resource_name' => $tpl_file, 'quiet'=>true, 'get_source'=>false);
-
return $this->_fetch_resource_info($_params);
}
/**
* Returns an array containing template variables
*
- * @param string $name
- * @param string $type
+ * @param string $name
+ * @param string $type
* @return array
*/
function &get_template_vars($name=null)
{
- if (!isset($name)) {
+ if(!isset($name)) {
return $this->_tpl_vars;
- } elseif (isset($this->_tpl_vars[$name])) {
+ } elseif(isset($this->_tpl_vars[$name])) {
return $this->_tpl_vars[$name];
} else {
// var non-existant, return valid reference
$_tmp = null;
-
return $_tmp;
}
}
@@ -1070,20 +1065,19 @@
/**
* Returns an array containing config variables
*
- * @param string $name
- * @param string $type
+ * @param string $name
+ * @param string $type
* @return array
*/
function &get_config_vars($name=null)
{
- if (!isset($name) && is_array($this->_config[0])) {
+ if(!isset($name) && is_array($this->_config[0])) {
return $this->_config[0]['vars'];
- } elseif (isset($this->_config[0]['vars'][$name])) {
+ } else if(isset($this->_config[0]['vars'][$name])) {
return $this->_config[0]['vars'][$name];
} else {
// var non-existant, return valid reference
$_tmp = null;
-
return $_tmp;
}
}
@@ -1091,7 +1085,7 @@
/**
* trigger Smarty error
*
- * @param string $error_msg
+ * @param string $error_msg
* @param integer $error_type
*/
function trigger_error($error_msg, $error_type = E_USER_WARNING)
@@ -1116,9 +1110,9 @@
/**
* executes & returns or displays the template results
*
- * @param string $resource_name
- * @param string $cache_id
- * @param string $compile_id
+ * @param string $resource_name
+ * @param string $cache_id
+ * @param string $compile_id
* @param boolean $display
*/
function fetch($resource_name, $cache_id = null, $compile_id = null, $display = false)
@@ -1144,7 +1138,7 @@
$this->debugging = true;
}
} else {
- $this->debugging = (bool) ($this->request_use_auto_globals ? @$_COOKIE['SMARTY_DEBUG'] : @$GLOBALS['HTTP_COOKIE_VARS']['SMARTY_DEBUG']);
+ $this->debugging = (bool)($this->request_use_auto_globals ? @$_COOKIE['SMARTY_DEBUG'] : @$GLOBALS['HTTP_COOKIE_VARS']['SMARTY_DEBUG']);
}
}
@@ -1195,7 +1189,8 @@
if ($display) {
- if ($this->debugging) {
+ if ($this->debugging)
+ {
// capture time for debugging info
$_params = array();
require_once(SMARTY_CORE_DIR . 'core.get_microtime.php');
@@ -1225,13 +1220,11 @@
error_reporting($_smarty_old_error_level);
// restore initial cache_info
$this->_cache_info = array_pop($_cache_info);
-
return true;
} else {
error_reporting($_smarty_old_error_level);
// restore initial cache_info
$this->_cache_info = array_pop($_cache_info);
-
return $_smarty_results;
}
} else {
@@ -1273,7 +1266,7 @@
$_smarty_results = ob_get_contents();
ob_end_clean();
- foreach ((array) $this->_plugins['outputfilter'] as $_output_filter) {
+ foreach ((array)$this->_plugins['outputfilter'] as $_output_filter) {
$_smarty_results = call_user_func_array($_output_filter[0], array($_smarty_results, &$this));
}
}
@@ -1310,7 +1303,6 @@
echo smarty_core_display_debug_console($_params, $this);
}
error_reporting($_smarty_old_error_level);
-
return;
} else {
error_reporting($_smarty_old_error_level);
@@ -1334,7 +1326,7 @@
/**
* return a reference to a registered object
*
- * @param string $name
+ * @param string $name
* @return object
*/
function &get_registered_object($name) {
@@ -1354,7 +1346,7 @@
*/
function clear_config($var = null)
{
- if (!isset($var)) {
+ if(!isset($var)) {
// clear all values
$this->_config = array(array('vars' => array(),
'files' => array()));
@@ -1366,23 +1358,22 @@
/**
* get filepath of requested plugin
*
- * @param string $type
- * @param string $name
+ * @param string $type
+ * @param string $name
* @return string|false
*/
function _get_plugin_filepath($type, $name)
{
$_params = array('type' => $type, 'name' => $name);
require_once(SMARTY_CORE_DIR . 'core.assemble_plugin_filepath.php');
-
return smarty_core_assemble_plugin_filepath($_params, $this);
}
/**
* test if resource needs compiling
*
- * @param string $resource_name
- * @param string $compile_path
+ * @param string $resource_name
+ * @param string $compile_path
* @return boolean
*/
function _is_compiled($resource_name, $compile_path)
@@ -1414,8 +1405,8 @@
/**
* compile the template
*
- * @param string $resource_name
- * @param string $compile_path
+ * @param string $resource_name
+ * @param string $compile_path
* @return boolean
*/
function _compile_resource($resource_name, $compile_path)
@@ -1450,9 +1441,9 @@
/**
* compile the given source
*
- * @param string $resource_name
- * @param string $source_content
- * @param string $compiled_content
+ * @param string $resource_name
+ * @param string $source_content
+ * @param string $compiled_content
* @return boolean
*/
function _compile_source($resource_name, &$source_content, &$compiled_content, $cache_include_path=null)
@@ -1464,6 +1455,7 @@
require_once($this->compiler_file);
}
+
$smarty_compiler = new $this->compiler_class;
$smarty_compiler->template_dir = $this->template_dir;
@@ -1494,6 +1486,7 @@
}
$smarty_compiler->_cache_include = $cache_include_path;
+
$_results = $smarty_compiler->_compile_file($resource_name, $source_content, $compiled_content);
if ($smarty_compiler->_cache_serial) {
@@ -1513,7 +1506,7 @@
/**
* Get the compile path for this resource
*
- * @param string $resource_name
+ * @param string $resource_name
* @return string results of {@link _get_auto_filename()}
*/
function _get_compile_path($resource_name)
@@ -1528,18 +1521,18 @@
*
* sets $source_content to the source of the template, and
* $resource_timestamp to its time stamp
- * @param string $resource_name
- * @param string $source_content
- * @param integer $resource_timestamp
- * @param boolean $get_source
- * @param boolean $quiet
+ * @param string $resource_name
+ * @param string $source_content
+ * @param integer $resource_timestamp
+ * @param boolean $get_source
+ * @param boolean $quiet
* @return boolean
*/
function _fetch_resource_info(&$params)
{
- if (!isset($params['get_source'])) { $params['get_source'] = true; }
- if (!isset($params['quiet'])) { $params['quiet'] = false; }
+ if(!isset($params['get_source'])) { $params['get_source'] = true; }
+ if(!isset($params['quiet'])) { $params['quiet'] = false; }
$_return = false;
$_params = array('resource_name' => $params['resource_name']) ;
@@ -1596,28 +1589,27 @@
if (!$params['quiet']) {
$this->trigger_error('unable to read resource: "' . $params['resource_name'] . '"');
}
- } elseif ($_return && $this->security) {
+ } else if ($_return && $this->security) {
require_once(SMARTY_CORE_DIR . 'core.is_secure.php');
if (!smarty_core_is_secure($_params, $this)) {
if (!$params['quiet'])
$this->trigger_error('(secure mode) accessing "' . $params['resource_name'] . '" is not allowed');
$params['source_content'] = null;
$params['resource_timestamp'] = null;
-
return false;
}
}
-
return $_return;
}
+
/**
* parse out the type and name from the resource
*
- * @param string $resource_base_path
- * @param string $resource_name
- * @param string $resource_type
- * @param string $resource_name
+ * @param string $resource_base_path
+ * @param string $resource_name
+ * @param string $resource_type
+ * @param string $resource_name
* @return boolean
*/
@@ -1632,7 +1624,7 @@
$params['resource_type'] = $this->default_resource_type;
$params['resource_name'] = $_resource_name_parts[0];
} else {
- if (strlen($_resource_name_parts[0]) == 1) {
+ if(strlen($_resource_name_parts[0]) == 1) {
// 1 char is not resource type, but part of filepath
$params['resource_type'] = $this->default_resource_type;
$params['resource_name'] = $params['resource_name'];
@@ -1646,27 +1638,23 @@
if (!preg_match('/^([\/\\\\]|[a-zA-Z]:[\/\\\\])/', $params['resource_name'])) {
// relative pathname to $params['resource_base_path']
// use the first directory where the file is found
- foreach ((array) $params['resource_base_path'] as $_curr_path) {
+ foreach ((array)$params['resource_base_path'] as $_curr_path) {
$_fullpath = $_curr_path . DIRECTORY_SEPARATOR . $params['resource_name'];
if (file_exists($_fullpath) && is_file($_fullpath)) {
$params['resource_name'] = $_fullpath;
-
return true;
}
// didn't find the file, try include_path
$_params = array('file_path' => $_fullpath);
require_once(SMARTY_CORE_DIR . 'core.get_include_path.php');
- if (smarty_core_get_include_path($_params, $this)) {
+ if(smarty_core_get_include_path($_params, $this)) {
$params['resource_name'] = $_params['new_file_path'];
-
return true;
}
}
-
return false;
} else {
/* absolute path */
-
return file_exists($params['resource_name']);
}
} elseif (empty($this->_plugins['resource'][$params['resource_type']])) {
@@ -1682,9 +1670,9 @@
/**
* Handle modifiers
*
- * @param string|null $modifier_name
- * @param array|null $map_array
- * @return string result of modifiers
+ * @param string|null $modifier_name
+ * @param array|null $map_array
+ * @return string result of modifiers
*/
function _run_mod_handler()
{
@@ -1698,21 +1686,19 @@
$_args[0] = $_val;
$_var[$_key] = call_user_func_array($_func_name, $_args);
}
-
return $_var;
}
/**
* Remove starting and ending quotes from the string
*
- * @param string $string
+ * @param string $string
* @return string
*/
function _dequote($string)
{
if ((substr($string, 0, 1) == "'" || substr($string, 0, 1) == '"') &&
substr($string, -1) == substr($string, 0, 1))
-
return substr($string, 1, -1);
else
return $string;
@@ -1722,7 +1708,7 @@
/**
* read in a file
*
- * @param string $filename
+ * @param string $filename
* @return string
*/
function _read_file($filename)
@@ -1733,7 +1719,6 @@
$contents .= fread($fd, 8192);
}
fclose($fd);
-
return $contents;
} else {
return false;
@@ -1743,9 +1728,9 @@
/**
* get a concrete filename for automagically created content
*
- * @param string $auto_base
- * @param string $auto_source
- * @param string $auto_id
+ * @param string $auto_base
+ * @param string $auto_source
+ * @param string $auto_id
* @return string
* @staticvar string|null
* @staticvar string|null
@@ -1755,14 +1740,14 @@
$_compile_dir_sep = $this->use_sub_dirs ? DIRECTORY_SEPARATOR : '^';
$_return = $auto_base . DIRECTORY_SEPARATOR;
- if (isset($auto_id)) {
+ if(isset($auto_id)) {
// make auto_id safe for directory names
$auto_id = str_replace('%7C',$_compile_dir_sep,(urlencode($auto_id)));
// split into separate directories
$_return .= $auto_id . $_compile_dir_sep;
}
- if (isset($auto_source)) {
+ if(isset($auto_source)) {
// make source name safe for filename
$_filename = urlencode(basename($auto_source));
$_crc32 = sprintf('%08X', crc32($auto_source));
@@ -1779,13 +1764,13 @@
/**
* unlink a file, possibly using expiration time
*
- * @param string $resource
+ * @param string $resource
* @param integer $exp_time
*/
function _unlink($resource, $exp_time = null)
{
- if (isset($exp_time)) {
- if (time() - @filemtime($resource) >= $exp_time) {
+ if(isset($exp_time)) {
+ if(time() - @filemtime($resource) >= $exp_time) {
return @unlink($resource);
}
} else {
@@ -1796,12 +1781,11 @@
/**
* returns an auto_id for auto-file-functions
*
- * @param string $cache_id
- * @param string $compile_id
+ * @param string $cache_id
+ * @param string $compile_id
* @return string|null
*/
- function _get_auto_id($cache_id=null, $compile_id=null)
- {
+ function _get_auto_id($cache_id=null, $compile_id=null) {
if (isset($cache_id))
return (isset($compile_id)) ? $cache_id . '|' . $compile_id : $cache_id;
elseif(isset($compile_id))
@@ -1813,17 +1797,17 @@
/**
* trigger Smarty plugin error
*
- * @param string $error_msg
- * @param string $tpl_file
+ * @param string $error_msg
+ * @param string $tpl_file
* @param integer $tpl_line
- * @param string $file
+ * @param string $file
* @param integer $line
* @param integer $error_type
*/
function _trigger_fatal_error($error_msg, $tpl_file = null, $tpl_line = null,
$file = null, $line = null, $error_type = E_USER_ERROR)
{
- if (isset($file) && isset($line)) {
+ if(isset($file) && isset($line)) {
$info = ' ('.basename($file).", line $line)";
} else {
$info = '';
@@ -1840,14 +1824,12 @@
* callback function for preg_replace, to call a non-cacheable block
* @return string
*/
- function _process_compiled_include_callback($match)
- {
+ function _process_compiled_include_callback($match) {
$_func = '_smarty_tplfunc_'.$match[2].'_'.$match[3];
ob_start();
$_func($this);
$_ret = ob_get_contents();
ob_end_clean();
-
return $_ret;
}
@@ -1918,13 +1900,11 @@
/* return next set of cache_attrs */
$_return = current($_cache_attrs);
next($_cache_attrs);
-
return $_return;
} else {
/* add a reference to a new set of cache_attrs */
$_cache_attrs[] = array();
-
return $_cache_attrs[count($_cache_attrs)-1];
}
@@ -1958,23 +1938,25 @@
/**
* Extracts the filter name from the given callback
*
- * @param callback $function
+ * @param callback $function
* @return string
*/
- function _get_filter_name($function)
- {
- if (is_array($function)) {
- $_class_name = (is_object($function[0]) ?
- get_class($function[0]) : $function[0]);
+ function _get_filter_name($function)
+ {
+ if (is_array($function)) {
+ $_class_name = (is_object($function[0]) ?
+ get_class($function[0]) : $function[0]);
+ return $_class_name . '_' . $function[1];
+ }
+ else {
+ return $function;
+ }
+ }
- return $_class_name . '_' . $function[1];
- } else {
- return $function;
- }
- }
-
/**#@-*/
}
/* vim: set expandtab: */
+
+?>
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/Smarty_Compiler.class.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/Smarty_Compiler.class.php 2013-10-06 18:36:28 UTC (rev 12152)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/Smarty_Compiler.class.php 2013-10-06 19:11:55 UTC (rev 12153)
@@ -32,8 +32,8 @@
* Template compiling class
* @package Smarty
*/
-class Smarty_Compiler extends Smarty
-{
+class Smarty_Compiler extends Smarty {
+
// internal vars
/**#@+
* @access private
@@ -162,7 +162,7 @@
. '(?:\s*,\s*' . $this->_obj_single_param_regexp . ')*)?\)';
$this->_obj_start_regexp = '(?:' . $this->_dvar_regexp . '(?:' . $this->_obj_ext_regexp . ')+)';
$this->_obj_call_regexp = '(?:' . $this->_obj_start_regexp . '(?:' . $this->_obj_params_regexp . ')?(?:' . $this->_dvar_math_regexp . '(?:' . $this->_num_const_regexp . '|' . $this->_dvar_math_var_regexp . ')*)?)';
-
+
// matches valid modifier syntax:
// |foo
// |@foo
@@ -217,9 +217,9 @@
* compile a resource
*
* sets $compiled_content to the compiled source
- * @param string $resource_name
- * @param string $source_content
- * @param string $compiled_content
+ * @param string $resource_name
+ * @param string $source_content
+ * @param string $compiled_content
* @return true
*/
function _compile_file($resource_name, $source_content, &$compiled_content)
@@ -263,11 +263,11 @@
/* replace special blocks by "{php}" */
$source_content = preg_replace_callback($search, create_function ('$matches', "return '"
- . $this->_quote_replace($this->left_delimiter) . 'php'
- . "' . str_repeat(\"\n\", substr_count('\$matches[1]', \"\n\")) .'"
- . $this->_quote_replace($this->right_delimiter)
- . "';")
- , $source_content);
+ . $this->_quote_replace($this->left_delimiter) . 'php'
+ . "' . str_repeat(\"\n\", substr_count('\$matches[1]', \"\n\")) .'"
+ . $this->_quote_replace($this->right_delimiter)
+ . "';")
+ , $source_content);
/* Gather all template tags. */
preg_match_all("~{$ldq}\s*(.*?)\s*{$rdq}~s", $source_content, $_match);
@@ -290,10 +290,10 @@
if ($this->php_handling == SMARTY_PHP_PASSTHRU) {
/* echo php contents */
$text_blocks[$curr_tb] = str_replace('%%%SMARTYSP'.$curr_sp.'%%%', '<?php echo \''.str_replace("'", "\'", $sp_match[1][$curr_sp]).'\'; ?>'."\n", $text_blocks[$curr_tb]);
- } elseif ($this->php_handling == SMARTY_PHP_QUOTE) {
+ } else if ($this->php_handling == SMARTY_PHP_QUOTE) {
/* quote php tags */
$text_blocks[$curr_tb] = str_replace('%%%SMARTYSP'.$curr_sp.'%%%', htmlspecialchars($sp_match[1][$curr_sp]), $text_blocks[$curr_tb]);
- } elseif ($this->php_handling == SMARTY_PHP_REMOVE) {
+ } else if ($this->php_handling == SMARTY_PHP_REMOVE) {
/* remove php tags */
$text_blocks[$curr_tb] = str_replace('%%%SMARTYSP'.$curr_sp.'%%%', '', $text_blocks[$curr_tb]);
} else {
@@ -304,7 +304,7 @@
}
}
}
-
+
/* Compile the template tags into PHP code. */
$compiled_tags = array();
for ($i = 0, $for_max = count($template_tags); $i < $for_max; $i++) {
@@ -315,7 +315,6 @@
if (count($this->_tag_stack)>0) {
list($_open_tag, $_line_no) = end($this->_tag_stack);
$this->_syntax_error("unclosed tag \{$_open_tag} (opened line $_line_no).", E_USER_ERROR, __FILE__, __LINE__);
-
return;
}
@@ -334,7 +333,7 @@
for ($j = $i + 1; $j < $for_max; $j++) {
/* remove leading and trailing whitespaces of each line */
$text_blocks[$j] = preg_replace('![\t ]*[\r\n]+[\t ]*!', '', $text_blocks[$j]);
- if ($compiled_tags[$j] == '{/strip}') {
+ if ($compiled_tags[$j] == '{/strip}') {
/* remove trailing whitespaces from the last text_block */
$text_blocks[$j] = rtrim($text_blocks[$j]);
}
@@ -350,9 +349,9 @@
}
}
$compiled_content = '';
-
+
$tag_guard = '%%%SMARTYOTG' . md5(uniqid(rand(), true)) . '%%%';
-
+
/* Interleave the compiled contents and text blocks to get the final result. */
for ($i = 0, $for_max = count($compiled_tags); $i < $for_max; $i++) {
if ($compiled_tags[$i] == '') {
@@ -362,7 +361,7 @@
// replace legit PHP tags with placeholder
$text_blocks[$i] = str_replace('<?', $tag_guard, $text_blocks[$i]);
$compiled_tags[$i] = str_replace('<?', $tag_guard, $compiled_tags[$i]);
-
+
$compiled_content .= $text_blocks[$i] . $compiled_tags[$i];
}
$compiled_content .= str_replace('<?', $tag_guard, $text_blocks[$i]);
@@ -372,8 +371,8 @@
$compiled_content = preg_replace("~(?<!')language\s*=\s*[\"\']?\s*php\s*[\"\']?~", "<?php echo 'language=php' ?>\n", $compiled_content);
// recover legit tags
- $compiled_content = str_replace($tag_guard, '<?', $compiled_content);
-
+ $compiled_content = str_replace($tag_guard, '<?', $compiled_content);
+
// remove \n from the end of the file, if any
if (strlen($compiled_content) && (substr($compiled_content, -1) == "\n") ) {
$compiled_content = substr($compiled_content, 0, -1);
@@ -424,14 +423,13 @@
}
$compiled_content = $template_header . $compiled_content;
-
return true;
}
/**
* Compile a template tag
*
- * @param string $template_tag
+ * @param string $template_tag
* @return string
*/
function _compile_tag($template_tag)
@@ -439,7 +437,7 @@
/* Matched comment. */
if (substr($template_tag, 0, 1) == '*' && substr($template_tag, -1) == '*')
return '';
-
+
/* Split tag into two three parts: command, command modifiers and the arguments. */
if(! preg_match('~^(?:(' . $this->_num_const_regexp . '|' . $this->_obj_call_regexp . '|' . $this->_var_regexp
. '|\/?' . $this->_reg_obj_regexp . '|\/?' . $this->_func_regexp . ')(' . $this->_mod_regexp . '*))
@@ -447,7 +445,7 @@
~xs', $template_tag, $match)) {
$this->_syntax_error("unrecognized tag: $template_tag", E_USER_ERROR, __FILE__, __LINE__);
}
-
+
$tag_command = $match[1];
$tag_modifier = isset($match[2]) ? $match[2] : null;
$tag_args = isset($match[3]) ? $match[3] : null;
@@ -455,7 +453,6 @@
if (preg_match('~^' . $this->_num_const_regexp . '|' . $this->_obj_call_regexp . '|' . $this->_var_regexp . '$~', $tag_command)) {
/* tag name is a variable or object */
$_return = $this->_parse_var_props($tag_command . $tag_modifier);
-
return "<?php echo $_return; ?>" . $this->_additional_newline;
}
@@ -473,7 +470,6 @@
case 'if':
$this->_push_tag('if');
-
return $this->_compile_if_tag($tag_args);
case 'else':
@@ -482,7 +478,6 @@
$this->_syntax_error('unexpected {else}', E_USER_ERROR, __FILE__, __LINE__);
else
$this->_push_tag('else');
-
return '<?php else: ?>';
case 'elseif':
@@ -491,12 +486,10 @@
$this->_syntax_error('unexpected {elseif}', E_USER_ERROR, __FILE__, __LINE__);
if ($_open_tag == 'if')
$this->_push_tag('elseif');
-
return $this->_compile_if_tag($tag_args, true);
case '/if':
$this->_pop_tag('if');
-
return '<?php endif; ?>';
case 'capture':
@@ -513,12 +506,10 @@
case 'section':
$this->_push_tag('section');
-
return $this->_compile_section_start($tag_args);
case 'sectionelse':
$this->_push_tag('sectionelse');
-
return "<?php endfor; else: ?>";
break;
@@ -531,13 +522,11 @@
case 'foreach':
$this->_push_tag('foreach');
-
return $this->_compile_foreach_start($tag_args);
break;
case 'foreachelse':
$this->_push_tag('foreachelse');
-
return "<?php endforeach; else: ?>";
case '/foreach':
@@ -554,18 +543,15 @@
$this->_pop_tag('strip');
if (--$this->_strip_depth==0) { /* outermost closing {/strip} */
$this->_additional_newline = "\n";
-
return '{' . $tag_command . '}';
}
} else {
$this->_push_tag('strip');
if ($this->_strip_depth++==0) { /* outermost opening {strip} */
$this->_additional_newline = "";
-
return '{' . $tag_command . '}';
}
}
-
return '';
case 'php':
@@ -576,20 +562,16 @@
determins the type of folded tag that was found */
switch (count($block)) {
case 2: /* comment */
-
return '';
case 3: /* literal */
-
return "<?php echo '" . strtr($block[2], array("'"=>"\'", "\\"=>"\\\\")) . "'; ?>" . $this->_additional_newline;
case 4: /* php */
if ($this->security && !$this->security_settings['PHP_TAGS']) {
$this->_syntax_error("(secure mode) php tags not permitted", E_USER_WARNING, __FILE__, __LINE__);
-
return;
}
-
return '<?php ' . $block[3] .' ?>';
}
break;
@@ -600,10 +582,10 @@
default:
if ($this->_compile_compiler_tag($tag_command, $tag_args, $output)) {
return $output;
- } elseif ($this->_compile_block_tag($tag_command, $tag_args, $tag_modifier, $output)) {
+ } else if ($this->_compile_block_tag($tag_command, $tag_args, $tag_modifier, $output)) {
return $output;
- } elseif ($this->_compile_custom_tag($tag_command, $tag_args, $tag_modifier, $output)) {
- return $output;
+ } else if ($this->_compile_custom_tag($tag_command, $tag_args, $tag_modifier, $output)) {
+ return $output;
} else {
$this->_syntax_error("unrecognized tag '$tag_command'", E_USER_ERROR, __FILE__, __LINE__);
}
@@ -611,13 +593,14 @@
}
}
+
/**
* compile the custom compiler tag
*
* sets $output to the compiled custom compiler tag
- * @param string $tag_command
- * @param string $tag_args
- * @param string $output
+ * @param string $tag_command
+ * @param string $tag_args
+ * @param string $output
* @return boolean
*/
function _compile_compiler_tag($tag_command, $tag_args, &$output)
@@ -664,7 +647,7 @@
if ($found) {
if ($have_function) {
$output = call_user_func_array($plugin_func, array($tag_args, &$this));
- if ($output != '') {
+ if($output != '') {
$output = '<?php ' . $this->_push_cacheable_state('compiler', $tag_command)
. $output
. $this->_pop_cacheable_state('compiler', $tag_command) . ' ?>';
@@ -672,7 +655,6 @@
} else {
$this->_syntax_error($message, E_USER_WARNING, __FILE__, __LINE__);
}
-
return true;
} else {
return false;
@@ -684,10 +666,10 @@
* compile block function tag
*
* sets $output to compiled block function tag
- * @param string $tag_command
- * @param string $tag_args
- * @param string $tag_modifier
- * @param string $output
+ * @param string $tag_command
+ * @param string $tag_args
+ * @param string $tag_modifier
+ * @param string $output
* @return boolean
*/
function _compile_block_tag($tag_command, $tag_args, $tag_modifier, &$output)
@@ -734,9 +716,8 @@
if (!$found) {
return false;
- } elseif (!$have_function) {
+ } else if (!$have_function) {
$this->_syntax_error($message, E_USER_WARNING, __FILE__, __LINE__);
-
return true;
}
@@ -773,12 +754,13 @@
return true;
}
+
/**
* compile custom function tag
*
- * @param string $tag_command
- * @param string $tag_args
- * @param string $tag_modifier
+ * @param string $tag_command
+ * @param string $tag_args
+ * @param string $tag_modifier
* @return string
*/
function _compile_custom_tag($tag_command, $tag_args, $tag_modifier, &$output)
@@ -819,9 +801,8 @@
if (!$found) {
return false;
- } elseif (!$have_function) {
+ } else if (!$have_function) {
$this->_syntax_error($message, E_USER_WARNING, __FILE__, __LINE__);
-
return true;
}
@@ -835,11 +816,11 @@
$arg_list = $this->_compile_arg_list('function', $tag_command, $attrs, $_cache_attrs);
$output = $this->_compile_plugin_call('function', $tag_command).'(array('.implode(',', $arg_list)."), \$this)";
- if ($tag_modifier != '') {
+ if($tag_modifier != '') {
$this->_parse_modifiers($output, $tag_modifier);
}
- if ($output != '') {
+ if($output != '') {
$output = '<?php ' . $_cacheable_state . $_cache_attrs . 'echo ' . $output . ';'
. $this->_pop_cacheable_state('function', $tag_command) . "?>" . $this->_additional_newline;
}
@@ -850,9 +831,9 @@
/**
* compile a registered object tag
*
- * @param string $tag_command
- * @param array $attrs
- * @param string $tag_modifier
+ * @param string $tag_command
+ * @param array $attrs
+ * @param string $tag_modifier
* @return string
*/
function _compile_registered_object_tag($tag_command, $attrs, $tag_modifier)
@@ -867,10 +848,10 @@
list($object, $obj_comp) = explode('->', $tag_command);
$arg_list = array();
- if (count($attrs)) {
+ if(count($attrs)) {
$_assign_var = false;
foreach ($attrs as $arg_name => $arg_value) {
- if ($arg_name == 'assign') {
+ if($arg_name == 'assign') {
$_assign_var = $arg_value;
unset($attrs['assign']);
continue;
@@ -881,9 +862,9 @@
}
}
- if ($this->_reg_objects[$object][2]) {
+ if($this->_reg_objects[$object][2]) {
// smarty object argument format
- $args = "array(".implode(',', (array) $arg_list)."), \$this";
+ $args = "array(".implode(',', (array)$arg_list)."), \$this";
} else {
// traditional argument format
$args = implode(',', array_values($attrs));
@@ -895,13 +876,13 @@
$prefix = '';
$postfix = '';
$newline = '';
- if (!is_object($this->_reg_objects[$object][0])) {
+ if(!is_object($this->_reg_objects[$object][0])) {
$this->_trigger_fatal_error("registered '$object' is not an object" , $this->_current_file, $this->_current_line_no, __FILE__, __LINE__);
- } elseif (!empty($this->_reg_objects[$object][1]) && !in_array($obj_comp, $this->_reg_objects[$object][1])) {
+ } elseif(!empty($this->_reg_objects[$object][1]) && !in_array($obj_comp, $this->_reg_objects[$object][1])) {
$this->_trigger_fatal_error("'$obj_comp' is not a registered component of object '$object'", $this->_current_file, $this->_current_line_no, __FILE__, __LINE__);
- } elseif (method_exists($this->_reg_objects[$object][0], $obj_comp)) {
+ } elseif(method_exists($this->_reg_objects[$object][0], $obj_comp)) {
// method
- if (in_array($obj_comp, $this->_reg_objects[$object][3])) {
+ if(in_array($obj_comp, $this->_reg_objects[$object][3])) {
// block method
if ($start_tag) {
$prefix = "\$this->_tag_stack[] = array('$obj_comp', $args); ";
@@ -923,12 +904,12 @@
$return = "\$this->_reg_objects['$object'][0]->$obj_comp";
}
- if ($return != null) {
- if ($tag_modifier != '') {
+ if($return != null) {
+ if($tag_modifier != '') {
$this->_parse_modifiers($return, $tag_modifier);
}
- if (!empty($_assign_var)) {
+ if(!empty($_assign_var)) {
$output = "\$this->assign('" . $this->_dequote($_assign_var) ."', $return);";
} else {
$output = 'echo ' . $return . ';';
@@ -944,7 +925,7 @@
/**
* Compile {insert ...} tag
*
- * @param string $tag_args
+ * @param string $tag_args
* @return string
*/
function _compile_insert_tag($tag_args)
@@ -955,7 +936,7 @@
if (empty($name)) {
return $this->_syntax_error("missing insert name", E_USER_ERROR, __FILE__, __LINE__);
}
-
+
if (!preg_match('~^\w+$~', $name)) {
return $this->_syntax_error("'insert: 'name' must be an insert function name", E_USER_ERROR, __FILE__, __LINE__);
}
@@ -974,7 +955,7 @@
$this->_add_plugin('insert', $name, $delayed_loading);
- $_params = "array('args' => array(".implode(', ', (array) $arg_list)."))";
+ $_params = "array('args' => array(".implode(', ', (array)$arg_list)."))";
return "<?php require_once(SMARTY_CORE_DIR . 'core.run_insert_handler.php');\necho smarty_core_run_insert_handler($_params, \$this); ?>" . $this->_additional_newline;
}
@@ -982,7 +963,7 @@
/**
* Compile {include ...} tag
*
- * @param string $tag_args
+ * @param string $tag_args
* @return string
*/
function _compile_include_tag($tag_args)
@@ -998,7 +979,7 @@
if ($arg_name == 'file') {
$include_file = $arg_value;
continue;
- } elseif ($arg_name == 'assign') {
+ } else if ($arg_name == 'assign') {
$assign_var = $arg_value;
continue;
}
@@ -1016,7 +997,8 @@
$output .=
"\$_smarty_tpl_vars = \$this->_tpl_vars;\n";
- $_params = "array('smarty_include_tpl_file' => " . $include_file . ", 'smarty_include_vars' => array(".implode(',', (array) $arg_list)."))";
+
+ $_params = "array('smarty_include_tpl_file' => " . $include_file . ", 'smarty_include_vars' => array(".implode(',', (array)$arg_list)."))";
$output .= "\$this->_smarty_include($_params);\n" .
"\$this->_tpl_vars = \$_smarty_tpl_vars;\n" .
"unset(\$_smarty_tpl_vars);\n";
@@ -1034,7 +1016,7 @@
/**
* Compile {include ...} tag
*
- * @param string $tag_args
+ * @param string $tag_args
* @return string
*/
function _compile_include_php_tag($tag_args)
@@ -1049,8 +1031,8 @@
$once_var = (empty($attrs['once']) || $attrs['once']=='false') ? 'false' : 'true';
$arg_list = array();
- foreach ($attrs as $arg_name => $arg_value) {
- if ($arg_name != 'file' AND $arg_name != 'once' AND $arg_name != 'assign') {
+ foreach($attrs as $arg_name => $arg_value) {
+ if($arg_name != 'file' AND $arg_name != 'once' AND $arg_name != 'assign') {
if(is_bool($arg_value))
$arg_value = $arg_value ? 'true' : 'false';
$arg_list[] = "'$arg_name' => $arg_value";
@@ -1062,10 +1044,11 @@
return "<?php require_once(SMARTY_CORE_DIR . 'core.smarty_include_php.php');\nsmarty_core_smarty_include_php($_params, \$this); ?>" . $this->_additional_newline;
}
+
/**
* Compile {section ...} tag
*
- * @param string $tag_args
+ * @param string $tag_args
* @return string
*/
function _compile_section_start($tag_args)
@@ -1085,14 +1068,14 @@
foreach ($attrs as $attr_name => $attr_value) {
switch ($attr_name) {
case 'loop':
- $output .= "{$section_props}['loop'] = is_array(\$_loop=$attr_value) ? count(\$_loop) : max(0, (int) \$_loop); unset(\$_loop);\n";
+ $output .= "{$section_props}['loop'] = is_array(\$_loop=$attr_value) ? count(\$_loop) : max(0, (int)\$_loop); unset(\$_loop);\n";
break;
case 'show':
if (is_bool($attr_value))
$show_attr_value = $attr_value ? 'true' : 'false';
else
- $show_attr_value = "(bool) $attr_value";
+ $show_attr_value = "(bool)$attr_value";
$output .= "{$section_props}['show'] = $show_attr_value;\n";
break;
@@ -1102,11 +1085,11 @@
case 'max':
case 'start':
- $output .= "{$section_props}['$attr_name'] = (int) $attr_value;\n";
+ $output .= "{$section_props}['$attr_name'] = (int)$attr_value;\n";
break;
case 'step':
- $output .= "{$section_props}['$attr_name'] = ((int) $attr_value) == 0 ? 1 : (int) $attr_value;\n";
+ $output .= "{$section_props}['$attr_name'] = ((int)$attr_value) == 0 ? 1 : (int)$attr_value;\n";
break;
default:
@@ -1166,10 +1149,11 @@
return $output;
}
+
/**
* Compile {foreach ...} tag.
*
- * @param string $tag_args
+ * @param string $tag_args
* @return string
*/
function _compile_foreach_start($tag_args)
@@ -1224,11 +1208,12 @@
return $output;
}
+
/**
* Compile {capture} .. {/capture} tags
*
- * @param boolean $start true if this is the {capture} tag
- * @param string $tag_args
+ * @param boolean $start true if this is the {capture} tag
+ * @param string $tag_args
* @return string
*/
@@ -1240,7 +1225,7 @@
$buffer = isset($attrs['name']) ? $attrs['name'] : "'default'";
$assign = isset($attrs['assign']) ? $attrs['assign'] : null;
$append = isset($attrs['append']) ? $attrs['append'] : null;
-
+
$output = "<?php ob_start(); ?>";
$this->_capture_stack[] = array($buffer, $assign, $append);
} else {
@@ -1261,8 +1246,8 @@
/**
* Compile {if ...} tag
*
- * @param string $tag_args
- * @param boolean $elseif if true, uses elseif instead of if
+ * @param string $tag_args
+ * @param boolean $elseif if true, uses elseif instead of if
* @return string
*/
function _compile_if_tag($tag_args, $elseif = false)
@@ -1279,15 +1264,16 @@
$tokens = $match[0];
- if (empty($tokens)) {
+ if(empty($tokens)) {
$_error_msg = $elseif ? "'elseif'" : "'if'";
- $_error_msg .= ' statement requires arguments';
+ $_error_msg .= ' statement requires arguments';
$this->_syntax_error($_error_msg, E_USER_ERROR, __FILE__, __LINE__);
}
-
+
+
// make sure we have balanced parenthesis
$token_count = array_count_values($tokens);
- if (isset($token_count['(']) && $token_count['('] != $token_count[')']) {
+ if(isset($token_count['(']) && $token_count['('] != $token_count[')']) {
$this->_syntax_error("unbalanced parenthesis in if statement", E_USER_ERROR, __FILE__, __LINE__);
}
@@ -1382,8 +1368,8 @@
if ($is_arg_start != 0) {
if (preg_match('~^' . $this->_func_regexp . '$~', $tokens[$is_arg_start-1])) {
$is_arg_start--;
- }
- }
+ }
+ }
} else
$is_arg_start = $i-1;
/* Construct the argument for 'is' expression, so it knows
@@ -1392,7 +1378,6 @@
/* Pass all tokens from next one until the end to the
'is' expression parsing function. The function will
-
return modified tokens, where the first one is the result
of the 'is' expression and the rest are the tokens it
didn't touch. */
@@ -1407,19 +1392,19 @@
break;
default:
- if (preg_match('~^' . $this->_func_regexp . '$~', $token) ) {
+ if(preg_match('~^' . $this->_func_regexp . '$~', $token) ) {
// function call
if($this->security &&
!in_array($token, $this->security_settings['IF_FUNCS'])) {
$this->_syntax_error("(secure mode) '$token' not allowed in if statement", E_USER_ERROR, __FILE__, __LINE__);
}
- } elseif (preg_match('~^' . $this->_var_regexp . '$~', $token) && (strpos('+-*/^%&|', substr($token, -1)) === false) && isset($tokens[$i+1]) && $tokens[$i+1] == '(') {
+ } elseif(preg_match('~^' . $this->_var_regexp . '$~', $token) && (strpos('+-*/^%&|', substr($token, -1)) === false) && isset($tokens[$i+1]) && $tokens[$i+1] == '(') {
// variable function call
- $this->_syntax_error("variable function call '$token' not allowed in if statement", E_USER_ERROR, __FILE__, __LINE__);
- } elseif (preg_match('~^' . $this->_obj_call_regexp . '|' . $this->_var_regexp . '(?:' . $this->_mod_regexp . '*)$~', $token)) {
+ $this->_syntax_error("variable function call '$token' not allowed in if statement", E_USER_ERROR, __FILE__, __LINE__);
+ } elseif(preg_match('~^' . $this->_obj_call_regexp . '|' . $this->_var_regexp . '(?:' . $this->_mod_regexp . '*)$~', $token)) {
// object or variable
$token = $this->_parse_var_props($token);
- } elseif (is_numeric($token)) {
+ } elseif(is_numeric($token)) {
// number, skip it
} else {
$this->_syntax_error("unidentified token '$token'", E_USER_ERROR, __FILE__, __LINE__);
@@ -1434,8 +1419,8 @@
return '<?php if ('.implode(' ', $tokens).'): ?>';
}
- function _compile_arg_list($type, $name, $attrs, &$cache_code)
- {
+
+ function _compile_arg_list($type, $name, $attrs, &$cache_code) {
$arg_list = array();
if (isset($type) && isset($name)
@@ -1465,15 +1450,14 @@
$arg_list[] = "'$arg_name' => $arg_value";
}
}
-
return $arg_list;
}
/**
* Parse is expression
*
- * @param string $is_arg
- * @param array $tokens
+ * @param string $is_arg
+ * @param array $tokens
* @return array
*/
function _parse_is_expr($is_arg, $tokens)
@@ -1530,10 +1514,11 @@
return $tokens;
}
+
/**
* Parse attribute string
*
- * @param string $tag_args
+ * @param string $tag_args
* @return array
*/
function _parse_attrs($tag_args)
@@ -1581,13 +1566,13 @@
boolean value. */
if (preg_match('~^(on|yes|true)$~', $token)) {
$token = 'true';
- } elseif (preg_match('~^(off|no|false)$~', $token)) {
+ } else if (preg_match('~^(off|no|false)$~', $token)) {
$token = 'false';
- } elseif ($token == 'null') {
+ } else if ($token == 'null') {
$token = 'null';
- } elseif (preg_match('~^' . $this->_num_const_regexp . '|0[xX][0-9a-fA-F]+$~', $token)) {
+ } else if (preg_match('~^' . $this->_num_const_regexp . '|0[xX][0-9a-fA-F]+$~', $token)) {
/* treat integer literally */
- } elseif (!preg_match('~^' . $this->_obj_call_regexp . '|' . $this->_var_regexp . '(?:' . $this->_mod_regexp . ')*$~', $token)) {
+ } else if (!preg_match('~^' . $this->_obj_call_regexp . '|' . $this->_var_regexp . '(?:' . $this->_mod_regexp . ')*$~', $token)) {
/* treat as a string, double-quote it escaping quotes */
$token = '"'.addslashes($token).'"';
}
@@ -1601,8 +1586,8 @@
$last_token = $token;
}
- if ($state != 0) {
- if ($state == 1) {
+ if($state != 0) {
+ if($state == 1) {
$this->_syntax_error("expecting '=' after attribute name '$last_token'", E_USER_ERROR, __FILE__, __LINE__);
} else {
$this->_syntax_error("missing attribute value", E_USER_ERROR, __FILE__, __LINE__);
@@ -1622,7 +1607,7 @@
*/
function _parse_vars_props(&$tokens)
{
- foreach ($tokens as $key => $val) {
+ foreach($tokens as $key => $val) {
$tokens[$key] = $this->_parse_var_props($val);
}
}
@@ -1631,77 +1616,77 @@
* compile single variable and section properties token into
* PHP code
*
- * @param string $val
- * @param string $tag_attrs
+ * @param string $val
+ * @param string $tag_attrs
* @return string
*/
function _parse_var_props($val)
{
$val = trim($val);
- if (preg_match('~^(' . $this->_obj_call_regexp . '|' . $this->_dvar_regexp . ')(' . $this->_mod_regexp . '*)$~', $val, $match)) {
+ if(preg_match('~^(' . $this->_obj_call_regexp . '|' . $this->_dvar_regexp . ')(' . $this->_mod_regexp . '*)$~', $val, $match)) {
// $ variable or object
$return = $this->_parse_var($match[1]);
$modifiers = $match[2];
if (!empty($this->default_modifiers) && !preg_match('~(^|\|)smarty:nodefaults($|\|)~',$modifiers)) {
- $_default_mod_string = implode('|',(array) $this->default_modifiers);
+ $_default_mod_string = implode('|',(array)$this->default_modifiers);
$modifiers = empty($modifiers) ? $_default_mod_string : $_default_mod_string . '|' . $modifiers;
}
$this->_parse_mo...
[truncated message content] |
|
From: <al...@us...> - 2013-10-06 18:36:32
|
Revision: 12152
http://sourceforge.net/p/xoops/svn/12152
Author: alain91
Date: 2013-10-06 18:36:28 +0000 (Sun, 06 Oct 2013)
Log Message:
-----------
save working version
Modified Paths:
--------------
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/include/common.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/kernel/object.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/mainfile.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/avatars/preloads/core.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/banners/preloads/core.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/comments/preloads/core.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/images/preloads/core.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/logger/preloads/core.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/menus/preloads/core.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/notifications/preloads/core.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/page/preloads/core.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/pdf/preloads/core.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/protector/preloads/core.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/publisher/preloads/core.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/qrcode/preloads/core.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/search/preloads/core.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/smilies/preloads/core.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/system/class/extension.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/system/class/module.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/system/menu.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/system/themes/default/default.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/system/themes/default/menu.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/userconfigs/preloads/core.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/xlanguage/preloads/core.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/xoops_lib/Xoops/Locale.php
Modified: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/include/common.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/include/common.php 2013-10-06 15:59:26 UTC (rev 12151)
+++ XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/include/common.php 2013-10-06 18:36:28 UTC (rev 12152)
@@ -269,4 +269,4 @@
//Creates 'system_modules_active' cache file if it has been deleted.
$xoops->getActiveModules();
-$xoops->preload()->triggerEvent('core.include.common.end');
+$xoopsPreload->triggerEvent('core.include.common.end');
Modified: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/kernel/object.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/kernel/object.php 2013-10-06 15:59:26 UTC (rev 12151)
+++ XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/kernel/object.php 2013-10-06 18:36:28 UTC (rev 12152)
@@ -676,7 +676,8 @@
*/
public function __construct(XoopsDatabase $db = null, $table = '', $className = '', $keyName = '', $identifierName = '')
{
- $db = XoopsDatabaseFactory::getDatabaseConnection();
+ if ($db == null)
+ $db = XoopsDatabaseFactory::getDatabaseConnection();
$table = $db->prefix($table);
parent::__construct($db);
$this->table = $table;
@@ -722,7 +723,7 @@
*/
public function loadHandler($name, $args = null)
{
- static $handlers;
+ static $handlers = array();
if (!isset($handlers[$name])) {
$xmf = XoopsModelFactory::getInstance();
$handlers[$name] = $xmf->loadHandler($this, $name, $args);
Modified: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/mainfile.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/mainfile.php 2013-10-06 15:59:26 UTC (rev 12151)
+++ XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/mainfile.php 2013-10-06 18:36:28 UTC (rev 12152)
@@ -23,13 +23,13 @@
// XOOPS Physical Paths
// Physical path to the XOOPS documents (served) directory WITHOUT trailing slash
- define("XOOPS_ROOT_PATH", "D:\MesApp\EasyPHP-2.0b1\www\xoops\htdocs");
+ define("XOOPS_ROOT_PATH", "D:\MesApp\EasyPHP\www\xoops\htdocs");
// For forward compatibility
// Physical path to the XOOPS library directory WITHOUT trailing slash
- define("XOOPS_PATH", "D:\MesApp\EasyPHP-2.0b1\www\xoops\htdocs\xoops_lib");
+ define("XOOPS_PATH", "D:\MesApp\EasyPHP\www\xoops\htdocs\xoops_lib");
// Physical path to the XOOPS datafiles (writable) directory WITHOUT trailing slash
- define("XOOPS_VAR_PATH", "D:\MesApp\EasyPHP-2.0b1\www\xoops\htdocs\xoops_data");
+ define("XOOPS_VAR_PATH", "D:\MesApp\EasyPHP\www\xoops\htdocs\xoops_data");
// Alias of XOOPS_PATH, for compatibility, temporary solution
define("XOOPS_TRUST_PATH", XOOPS_PATH);
Modified: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/avatars/preloads/core.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/avatars/preloads/core.php 2013-10-06 15:59:26 UTC (rev 12151)
+++ XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/avatars/preloads/core.php 2013-10-06 18:36:28 UTC (rev 12152)
@@ -29,13 +29,16 @@
*/
class AvatarsCorePreload extends XoopsPreloadItem
{
- public static function eventCoreIncludeCommonEnd($args)
+ public static function initialize()
{
$path = dirname(dirname(__FILE__));
XoopsLoad::addMap(array(
- 'avatars' => $path . '/class/helper.php',
- ));
+ 'avatars' => $path . '/class/helper.php',
+ 'avatarsavatar' => $path . '/class/avatar.php',
+ 'avatarsuserlink' => $path . '/class/userlink.php',
+ ));
}
+
public static function eventCoreUserinfoButton($args)
{
$link = 'modules/avatars/editavatar.php';
@@ -44,3 +47,4 @@
$args[0][] = array( 'link' => $link, 'title' => $title, 'icon' => $icon);
}
}
+AvatarsCorePreload::initialize();
Modified: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/banners/preloads/core.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/banners/preloads/core.php 2013-10-06 15:59:26 UTC (rev 12151)
+++ XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/banners/preloads/core.php 2013-10-06 18:36:28 UTC (rev 12152)
@@ -31,13 +31,17 @@
*/
class BannersCorePreload extends XoopsPreloadItem
{
- public static function eventCoreIncludeCommonEnd($args)
+ public static function initialize()
{
$path = dirname(dirname(__FILE__));
XoopsLoad::addMap(array(
'banners' => $path . '/class/helper.php',
+ 'bannersbanner' => $path . '/class/banner.php',
+ 'bannersclient' => $path . '/class/bannerclient.php',
+ 'bannersrender' => $path . '/class/bannerrender.php',
));
}
+
public static function eventCoreBannerDisplay($args)
{
require_once dirname(dirname(__FILE__)) . '/class/bannerrender.php';
@@ -45,3 +49,4 @@
$args[0] = $render->displayBanner();
}
}
+BannersCorePreload::initialize();
Modified: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/comments/preloads/core.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/comments/preloads/core.php 2013-10-06 15:59:26 UTC (rev 12151)
+++ XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/comments/preloads/core.php 2013-10-06 18:36:28 UTC (rev 12152)
@@ -27,7 +27,7 @@
*/
class CommentsCorePreload extends XoopsPreloadItem
{
- public static function eventCoreIncludeCommonEnd($args)
+ public static function initialize()
{
$path = dirname(dirname(__FILE__));
XoopsLoad::addMap(array(
@@ -84,3 +84,4 @@
}
}
}
+CommentsCorePreload::initialize();
Modified: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/images/preloads/core.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/images/preloads/core.php 2013-10-06 15:59:26 UTC (rev 12151)
+++ XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/images/preloads/core.php 2013-10-06 18:36:28 UTC (rev 12152)
@@ -29,7 +29,7 @@
*/
class ImagesCorePreload extends XoopsPreloadItem
{
- public static function eventCoreIncludeCommonEnd($args)
+ public static function initialize()
{
$path = dirname(dirname(__FILE__));
XoopsLoad::addMap(array(
@@ -62,3 +62,4 @@
Xoops::getInstance()->redirect("modules/images/imagemanager.php?{$uri}", 0);
}
}
+ImagesCorePreload::initialize();
Modified: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/logger/preloads/core.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/logger/preloads/core.php 2013-10-06 15:59:26 UTC (rev 12151)
+++ XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/logger/preloads/core.php 2013-10-06 18:36:28 UTC (rev 12152)
@@ -30,10 +30,14 @@
{
public static $registry = array();
+ public static function initialize()
+ {
+ $path = dirname(dirname(__FILE__));
+ XoopsLoad::addMap(array('logger' => $path . '/class/logger.php'));
+ }
+
public static function eventCoreIncludeCommonStart($args)
{
- //Load may fail is cache was erased
- XoopsLoad::addMap(array('logger' => dirname(dirname(__FILE__)) . '/class/logger.php'));
Logger::getInstance()->enable();//until we get a db connection debug is enabled
Logger::getInstance()->startTime();
Logger::getInstance()->startTime('XOOPS Boot');
@@ -46,7 +50,6 @@
*/
public static function eventCoreDatabaseNoconn($args)
{
- if (!class_exists('logger')) return;
/* @var $db XoopsDatabase */
$db = $args[0];
Logger::getInstance()->addQuery('', $db->error(), $db->errno());
@@ -54,7 +57,6 @@
public static function eventCoreDatabaseNodb($args)
{
- if (!class_exists('logger')) return;
/* @var $db XoopsDatabase */
$db = $args[0];
Logger::getInstance()->addQuery('', $db->error(), $db->errno());
@@ -114,8 +116,6 @@
public static function eventCoreIncludeCommonEnd($args)
{
- XoopsLoad::addMap(array('logger' => dirname(dirname(__FILE__)) . '/class/logger.php'));
-
$logger = Logger::getInstance();
$logger->stopTime('XOOPS Boot');
$logger->startTime('Module init');
@@ -222,3 +222,4 @@
Logger::getInstance()->addExtra($args[0], $args[1]);
}
}
+LoggerCorePreload::initialize();
Modified: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/menus/preloads/core.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/menus/preloads/core.php 2013-10-06 15:59:26 UTC (rev 12151)
+++ XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/menus/preloads/core.php 2013-10-06 18:36:28 UTC (rev 12152)
@@ -29,7 +29,7 @@
*/
class MenusCorePreload extends XoopsPreloadItem
{
- public static function eventCoreIncludeCommonEnd($args)
+ public static function initialize()
{
$path = dirname(dirname(__FILE__));
XoopsLoad::addMap(array(
@@ -39,3 +39,4 @@
));
}
}
+MenusCorePreload::initialize();
Modified: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/notifications/preloads/core.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/notifications/preloads/core.php 2013-10-06 15:59:26 UTC (rev 12151)
+++ XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/notifications/preloads/core.php 2013-10-06 18:36:28 UTC (rev 12152)
@@ -27,7 +27,7 @@
*/
class NotificationsCorePreload extends XoopsPreloadItem
{
- public static function eventCoreIncludeCommonEnd($args)
+ public static function initialize()
{
$path = dirname(dirname(__FILE__));
XoopsLoad::addMap(array(
@@ -153,3 +153,4 @@
}
}
}
+NotificationsCorePreload::initialize();
Modified: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/page/preloads/core.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/page/preloads/core.php 2013-10-06 15:59:26 UTC (rev 12151)
+++ XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/page/preloads/core.php 2013-10-06 18:36:28 UTC (rev 12152)
@@ -24,7 +24,7 @@
class PageCorePreload extends XoopsPreloadItem
{
- public static function eventCoreIncludeCommonEnd($args)
+ public static function initialize()
{
$path = dirname(dirname(__FILE__));
XoopsLoad::addMap(array(
@@ -32,3 +32,4 @@
));
}
}
+PageCorePreload::initialize();
Modified: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/pdf/preloads/core.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/pdf/preloads/core.php 2013-10-06 15:59:26 UTC (rev 12151)
+++ XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/pdf/preloads/core.php 2013-10-06 18:36:28 UTC (rev 12152)
@@ -29,9 +29,11 @@
class PdfCorePreload extends XoopsPreloadItem
{
- public static function eventCoreIncludeCommonEnd($args)
+ public static function initialize($args)
{
- XoopsLoad::addMap(array('pdf' => dirname(dirname(__FILE__)) . '/class/pdf.php'));
+ $path = dirname(dirname(__FILE__));
+ XoopsLoad::addMap(array('pdf' => $path . '/class/pdf.php'));
}
}
+PdfCorePreload::initialize();
Modified: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/protector/preloads/core.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/protector/preloads/core.php 2013-10-06 15:59:26 UTC (rev 12151)
+++ XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/protector/preloads/core.php 2013-10-06 18:36:28 UTC (rev 12152)
@@ -31,12 +31,7 @@
*/
class ProtectorCorePreload extends XoopsPreloadItem
{
- /**
- * @static
- *
- * @param $args
- */
- public static function eventCoreIncludeCommonStart($args)
+ public static function initialize()
{
$xoops = Xoops::getInstance();
include $xoops->path('modules/protector/include/precheck.inc.php');
@@ -78,3 +73,4 @@
}
}
}
+ProtectorCorePreload::initialize();
Modified: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/publisher/preloads/core.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/publisher/preloads/core.php 2013-10-06 15:59:26 UTC (rev 12151)
+++ XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/publisher/preloads/core.php 2013-10-06 18:36:28 UTC (rev 12152)
@@ -28,7 +28,7 @@
*/
class PublisherCorePreload extends XoopsPreloadItem
{
- public static function eventCoreIncludeCommonEnd($args)
+ public static function initialize()
{
$path = dirname(dirname(__FILE__));
XoopsLoad::addMap(array(
@@ -41,3 +41,4 @@
));
}
}
+PublisherCorePreload::initialize();
Modified: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/qrcode/preloads/core.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/qrcode/preloads/core.php 2013-10-06 15:59:26 UTC (rev 12151)
+++ XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/qrcode/preloads/core.php 2013-10-06 18:36:28 UTC (rev 12152)
@@ -29,9 +29,10 @@
class QrcodeCorePreload extends XoopsPreloadItem
{
- public static function eventCoreIncludeCommonEnd($args)
+ public static function initialize()
{
XoopsLoad::addMap(array('xoops_qrcode' => dirname(dirname(__FILE__)) . '/class/xoops_qrcode.php'));
}
}
+QrcodeCorePreload::initialize();
Modified: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/search/preloads/core.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/search/preloads/core.php 2013-10-06 15:59:26 UTC (rev 12151)
+++ XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/search/preloads/core.php 2013-10-06 18:36:28 UTC (rev 12152)
@@ -27,7 +27,7 @@
*/
class SearchCorePreload extends XoopsPreloadItem
{
- public static function eventCoreIncludeCommonEnd($args)
+ public static function initialize()
{
$path = dirname(dirname(__FILE__));
XoopsLoad::addMap(array(
@@ -35,3 +35,4 @@
));
}
}
+SearchCorePreload::initialize();
Modified: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/smilies/preloads/core.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/smilies/preloads/core.php 2013-10-06 15:59:26 UTC (rev 12151)
+++ XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/smilies/preloads/core.php 2013-10-06 18:36:28 UTC (rev 12152)
@@ -29,11 +29,12 @@
*/
class SmiliesCorePreload extends XoopsPreloadItem
{
- public static function eventCoreIncludeCommonEnd($args)
+ public static function initialize()
{
$path = dirname(dirname(__FILE__));
XoopsLoad::addMap(array(
'smilies' => $path . '/class/helper.php',
+ 'smiliessmiley' => $path . '/class/smiley.php',
));
}
@@ -78,3 +79,4 @@
return true;
}
}
+SmiliesCorePreload::initialize();
Modified: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/system/class/extension.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/system/class/extension.php 2013-10-06 15:59:26 UTC (rev 12151)
+++ XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/system/class/extension.php 2013-10-06 18:36:28 UTC (rev 12152)
@@ -74,7 +74,10 @@
if (round($module->getInfo('version'), 2) != $extension->getVar('version')) {
$module->setInfo('warning_update', true);
}
- $sadmin = $moduleperm_handler->checkRight('module_admin', $module->getInfo('mid'), $xoops->user->getGroups());
+ $groups = array();
+ if (is_object($xoops->user))
+ $groups = $xoops->user->getGroups();
+ $sadmin = $moduleperm_handler->checkRight('module_admin', $module->getInfo('mid'), $groups);
if ($sadmin && ($module->getVar('hasnotification') || is_array($module->getInfo('config')) || is_array($module->getInfo('comments')))) {
$module->setInfo('link_pref', XOOPS_URL . '/modules/system/admin.php?fct=preferences&op=showmod&mod=' . $module->getInfo('mid'));
}
Modified: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/system/class/module.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/system/class/module.php 2013-10-06 15:59:26 UTC (rev 12151)
+++ XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/system/class/module.php 2013-10-06 18:36:28 UTC (rev 12152)
@@ -103,8 +103,11 @@
if ($module->getVar('isactive')) {
$module->setInfo('options', $module->getAdminMenu());
}
-
- $sadmin = $moduleperm_handler->checkRight('module_admin', $module->getVar('mid'), $xoops->user->getGroups());
+
+ $groups = array();
+ if (is_object($xoops->user))
+ $groups = $xoops->user->getGroups();
+ $sadmin = $moduleperm_handler->checkRight('module_admin', $module->getVar('mid'), $groups);
if ($sadmin && ($module->getVar('hasnotification') || is_array($module->getInfo('config')) || is_array($module->getInfo('comments')))) {
$module->setInfo('link_pref', XOOPS_URL . '/modules/system/admin.php?fct=preferences&op=showmod&mod=' . $module->getVar('mid'));
}
Modified: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/system/menu.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/system/menu.php 2013-10-06 15:59:26 UTC (rev 12151)
+++ XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/system/menu.php 2013-10-06 18:36:28 UTC (rev 12152)
@@ -22,7 +22,9 @@
defined('XOOPS_ROOT_PATH') or die('Restricted access');
$xoops = Xoops::getInstance();
-$groups = $xoops->user->getGroups();
+$groups = array();
+if (is_object($xoops->user))
+ $groups = $xoops->user->getGroups();
$all_ok = false;
if (!in_array(XOOPS_GROUP_ADMIN, $groups)) {
Modified: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/system/themes/default/default.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/system/themes/default/default.php 2013-10-06 15:59:26 UTC (rev 12151)
+++ XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/system/themes/default/default.php 2013-10-06 18:36:28 UTC (rev 12152)
@@ -57,7 +57,7 @@
$system_module = new SystemModule();
$system_extension = new SystemExtension();
- $adminmenu = null;
+ $adminmenu = array();
include dirname(__FILE__) . '/menu.php';
if (!$xoops->isModule() || 'system' == $xoops->module->getVar('dirname', 'n')) {
$modpath = XOOPS_URL . '/admin.php';
Modified: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/system/themes/default/menu.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/system/themes/default/menu.php 2013-10-06 15:59:26 UTC (rev 12151)
+++ XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/system/themes/default/menu.php 2013-10-06 18:36:28 UTC (rev 12152)
@@ -27,7 +27,10 @@
*/
$xoops = Xoops::getInstance();
-$groups = $xoops->user->getGroups();
+$groups = array();
+if (is_object($xoops->user))
+ $groups = $xoops->user->getGroups();
+
$all_ok = false;
if (!in_array(XOOPS_GROUP_ADMIN, $groups)) {
$sysperm_handler = $xoops->getHandlerGroupperm();
Modified: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/userconfigs/preloads/core.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/userconfigs/preloads/core.php 2013-10-06 15:59:26 UTC (rev 12151)
+++ XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/userconfigs/preloads/core.php 2013-10-06 18:36:28 UTC (rev 12152)
@@ -29,7 +29,7 @@
*/
class UserconfigsCorePreload extends XoopsPreloadItem
{
- public static function eventCoreIncludeCommonEnd($args)
+ public static function initialize()
{
$path = dirname(dirname(__FILE__));
XoopsLoad::addMap(array(
@@ -46,3 +46,4 @@
}
}
}
+UserconfigsCorePreload::initialize();
Modified: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/xlanguage/preloads/core.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/xlanguage/preloads/core.php 2013-10-06 15:59:26 UTC (rev 12151)
+++ XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/xlanguage/preloads/core.php 2013-10-06 18:36:28 UTC (rev 12152)
@@ -27,10 +27,8 @@
*/
class XlanguageCorePreload extends XoopsPreloadItem
{
- /**
- * @param array $args
- */
- public static function eventCoreIncludeCommonEnd($args)
+
+ public static function initialize()
{
if (XoopsLoad::fileExists($hnd_file = dirname(dirname(__FILE__)) . '/api.php')) {
include_once $hnd_file;
@@ -46,3 +44,4 @@
xlanguage_select_show(explode('|', $xoops->registry()->get('XLANGUAGE_THEME_OPTIONS')));
}
}
+XlanguageCorePreload::initialize();
Modified: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/xoops_lib/Xoops/Locale.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/xoops_lib/Xoops/Locale.php 2013-10-06 15:59:26 UTC (rev 12151)
+++ XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/xoops_lib/Xoops/Locale.php 2013-10-06 18:36:28 UTC (rev 12152)
@@ -50,10 +50,11 @@
/**
* @param mixed $domain string: Module dirname; global language file will be loaded if $domain is set to 'global' or not specified
+ * @param string $locale Locale to be loaded, current language content will be loaded if not specified
*
* @return boolean
*/
- public static function loadLocale($domain = 'xoops')
+ public static function loadLocale($domain = 'xoops', $locale = null)
{
$xoops = Xoops::getInstance();
// expanded domain to multiple categories, e.g. module:system, framework:filter, etc.
@@ -62,7 +63,10 @@
} else {
$path = (is_array($domain)) ? array_shift($domain) : "modules/{$domain}";
}
- $locales = self::getUserLocales();
+ if (!isset($locale))
+ $locales = self::getUserLocales();
+ else
+ $locales = array($locale);
foreach ($locales as $locale) {
$fullPath = $xoops->path("{$path}/locale/{$locale}/locale.php");
$fullPath2 = $xoops->path("{$path}/locale/{$locale}/{$locale}.php");
|
|
From: <be...@us...> - 2013-10-06 15:59:29
|
Revision: 12151
http://sourceforge.net/p/xoops/svn/12151
Author: beckmi
Date: 2013-10-06 15:59:26 +0000 (Sun, 06 Oct 2013)
Log Message:
-----------
fixing a link in Reviews tab
Modified Paths:
--------------
XoopsModules/wfdownloads/trunk/wfdownloads/templates/admin/wfdownloads_admin_reviewslist.html
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/templates/admin/wfdownloads_admin_reviewslist.html
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/templates/admin/wfdownloads_admin_reviewslist.html 2013-10-06 14:22:53 UTC (rev 12150)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/templates/admin/wfdownloads_admin_reviewslist.html 2013-10-06 15:59:26 UTC (rev 12151)
@@ -43,7 +43,7 @@
<tr class="<{cycle values='even, odd'}>">
<td><{$review_waiting.review_id}></td>
<td>
- <a href='download.php?op=download.edit&lid=<{$review_waiting.lid}>'><{$review_waiting.download_title}></a>
+ <a href='downloads.php?op=download.edit&lid=<{$review_waiting.lid}>'><{$review_waiting.download_title}></a>
</td>
<td>
<a href='?op=review.edit&review_id=<{$review_waiting.review_id}>'><{$review_waiting.title}></a>
@@ -94,7 +94,7 @@
<tr class="<{cycle values='even, odd'}>">
<td><{$review_published.review_id}></td>
<td>
- <a href='download.php?op=download.edit&lid=<{$review_published.lid}>'><{$review_published.download_title}></a>
+ <a href='downloads.php?op=download.edit&lid=<{$review_published.lid}>'><{$review_published.download_title}></a>
</td>
<td>
<a href='?op=review.edit&review_id=<{$review_published.review_id}>'><{$review_published.title}></a>
|
|
From: <luc...@us...> - 2013-10-06 14:22:57
|
Revision: 12150
http://sourceforge.net/p/xoops/svn/12150
Author: luciorota
Date: 2013-10-06 14:22:53 +0000 (Sun, 06 Oct 2013)
Log Message:
-----------
remove a new bug
Modified Paths:
--------------
XoopsModules/wfdownloads/trunk/wfdownloads/admin/downloads.php
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/admin/downloads.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/admin/downloads.php 2013-10-06 08:03:40 UTC (rev 12149)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/admin/downloads.php 2013-10-06 14:22:53 UTC (rev 12150)
@@ -76,7 +76,6 @@
// Added Formulize module support (2006/05/04) jpc - start
if (!wfdownloads_checkModule('formulize')) {
$sform = $download->getAdminForm($title);
- $sform->display();
} elseif ((isset($_POST['submit_category']) && !empty($_POST['submit_category'])) || $lid) {
$fid = $category->getVar('formulize_fid');
$customArray = array();
|
|
From: <be...@us...> - 2013-10-06 08:03:47
|
Revision: 12149
http://sourceforge.net/p/xoops/svn/12149
Author: beckmi
Date: 2013-10-06 08:03:40 +0000 (Sun, 06 Oct 2013)
Log Message:
-----------
Fixing form View for a modified download
Modified Paths:
--------------
XoopsModules/wfdownloads/trunk/wfdownloads/admin/reportsmodifications.php
XoopsModules/wfdownloads/trunk/wfdownloads/class/modification.php
XoopsModules/wfdownloads/trunk/wfdownloads/language/english/admin.php
XoopsModules/wfdownloads/trunk/wfdownloads/module.css
XoopsModules/wfdownloads/trunk/wfdownloads/templates/admin/wfdownloads_admin_reportsmodificationslist.html
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/admin/reportsmodifications.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/admin/reportsmodifications.php 2013-10-06 04:36:15 UTC (rev 12148)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/admin/reportsmodifications.php 2013-10-06 08:03:40 UTC (rev 12149)
@@ -162,7 +162,7 @@
case "limitations":
case "versiontypes":
$tempArray = $wfdownloads->getConfig($key);
- $content = $tempArray[$modification->getVar($key)];
+ $content = isset($tempArray[$modification->getVar($key)]) ? $tempArray[$modification->getVar($key)] : '';
break;
case "cid":
$category_list = $wfdownloads->getHandler('category')->getObjects(new Criteria('cid', $modification->getVar($key)));
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/class/modification.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/class/modification.php 2013-10-06 04:36:15 UTC (rev 12148)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/class/modification.php 2013-10-06 08:03:40 UTC (rev 12149)
@@ -34,6 +34,54 @@
$this->initVar('modifysubmitter', XOBJ_DTYPE_INT, 0);
$this->initVar('requestdate', XOBJ_DTYPE_INT, 0);
+
+
+//
+// $this->wfdownloads = WfdownloadsWfdownloads::getInstance();
+// $this->db = XoopsDatabaseFactory::getDatabaseConnection();
+ $this->initVar('lid', XOBJ_DTYPE_INT);
+ $this->initVar('cid', XOBJ_DTYPE_INT, 0);
+ $this->initVar('title', XOBJ_DTYPE_TXTBOX, '');
+ $this->initVar('url', XOBJ_DTYPE_URL, 'http://');
+ $this->initVar('filename', XOBJ_DTYPE_TXTBOX, '');
+ $this->initVar('filetype', XOBJ_DTYPE_TXTBOX, '');
+ $this->initVar('homepage', XOBJ_DTYPE_URL, 'http://');
+ $this->initVar('version', XOBJ_DTYPE_TXTBOX, '');
+ $this->initVar('size', XOBJ_DTYPE_INT, 0);
+ $this->initVar('platform', XOBJ_DTYPE_TXTBOX, '');
+ $this->initVar('screenshot', XOBJ_DTYPE_TXTBOX, '');
+ $this->initVar('screenshot2', XOBJ_DTYPE_TXTBOX, '');
+ $this->initVar('screenshot3', XOBJ_DTYPE_TXTBOX, '');
+ $this->initVar('screenshot4', XOBJ_DTYPE_TXTBOX, '');
+ $this->initVar('submitter', XOBJ_DTYPE_INT);
+ $this->initVar('publisher', XOBJ_DTYPE_TXTBOX, '');
+ $this->initVar('status', XOBJ_DTYPE_INT, 0);
+ $this->initVar('date', XOBJ_DTYPE_INT);
+ $this->initVar('hits', XOBJ_DTYPE_INT, 0);
+ $this->initVar('rating', XOBJ_DTYPE_OTHER, 0.0);
+ $this->initVar('votes', XOBJ_DTYPE_INT, 0);
+ $this->initVar('comments', XOBJ_DTYPE_INT, 0);
+ $this->initVar('license', XOBJ_DTYPE_TXTBOX, '');
+ $this->initVar('mirror', XOBJ_DTYPE_TXTBOX, '');
+ $this->initVar('price', XOBJ_DTYPE_TXTBOX, 0);
+ $this->initVar('paypalemail', XOBJ_DTYPE_TXTBOX, '');
+ $this->initVar('features', XOBJ_DTYPE_TXTAREA, '');
+ $this->initVar('requirements', XOBJ_DTYPE_TXTAREA, '');
+ $this->initVar('homepagetitle', XOBJ_DTYPE_TXTBOX, '');
+ $this->initVar('forumid', XOBJ_DTYPE_INT, 0);
+ $this->initVar('limitations', XOBJ_DTYPE_TXTBOX, '');
+ $this->initVar('versiontypes', XOBJ_DTYPE_TXTBOX, '');
+ $this->initVar('dhistory', XOBJ_DTYPE_TXTAREA, '');
+ $this->initVar('published', XOBJ_DTYPE_INT, 0); // published time or 0
+ $this->initVar('expired', XOBJ_DTYPE_INT, 0);
+ $this->initVar('updated', XOBJ_DTYPE_INT, 0); // uploaded time or 0
+ $this->initVar('offline', XOBJ_DTYPE_INT, 0);
+ $this->initVar('summary', XOBJ_DTYPE_TXTAREA, '');
+ $this->initVar('description', XOBJ_DTYPE_TXTAREA, '');
+// $this->initVar('ipaddress', XOBJ_DTYPE_TXTBOX, '');
+// $this->initVar('notifypub', XOBJ_DTYPE_INT, 0);
+
+
//Obsolete
unset($this->vars['ipaddress']);
unset($this->vars['notifypub']);
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/language/english/admin.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/language/english/admin.php 2013-10-06 04:36:15 UTC (rev 12148)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/language/english/admin.php 2013-10-06 08:03:40 UTC (rev 12149)
@@ -278,6 +278,7 @@
define('_AM_WFDOWNLOADS_MOD_LIMITATIONS', "Software limitations");
define('_AM_WFDOWNLOADS_MOD_VERSIONTYPES', "Release status");
define('_AM_WFDOWNLOADS_MOD_DHISTORY', "Download history");
+define('_AM_WFDOWNLOADS_MOD_SCREENSHOTS', "Screenshot");
define('_AM_WFDOWNLOADS_MOD_SCREENSHOT', "Screenshot 1");
define('_AM_WFDOWNLOADS_MOD_SCREENSHOT2', "Screenshot 2");
define('_AM_WFDOWNLOADS_MOD_SCREENSHOT3', "Screenshot 3");
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/module.css
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/module.css 2013-10-06 04:36:15 UTC (rev 12148)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/module.css 2013-10-06 08:03:40 UTC (rev 12149)
@@ -449,7 +449,7 @@
padding: 10px 10px 10px 10px;
border: 1px #000000 solid;
border-collapse: collapse;
- border-spacing: 0px;
+ border-spacing: 0;
}
tr.wfdownloads_mirrors_end {
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/templates/admin/wfdownloads_admin_reportsmodificationslist.html
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/templates/admin/wfdownloads_admin_reportsmodificationslist.html 2013-10-06 04:36:15 UTC (rev 12148)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/templates/admin/wfdownloads_admin_reportsmodificationslist.html 2013-10-06 08:03:40 UTC (rev 12149)
@@ -126,7 +126,7 @@
<{foreach item=modification from=$modifications}>
<tr>
<td><{$modification.requestid}></td>
- <td><{$modification.title}>$modification->getVar('title')</td>
+ <td><{$modification.title}></td>
<td><{$modification.submitter_uname}></td>
<td><{$modification.formatted_date}></td>
<td><a href='?op=modification.show&requestid=<{$modification.requestid}>'><{$smarty.const._AM_WFDOWNLOADS_MOD_VIEW}></a></td>
|
|
From: <be...@us...> - 2013-10-06 04:36:22
|
Revision: 12148
http://sourceforge.net/p/xoops/svn/12148
Author: beckmi
Date: 2013-10-06 04:36:15 +0000 (Sun, 06 Oct 2013)
Log Message:
-----------
Few English changes
Modified Paths:
--------------
XoopsModules/wfdownloads/trunk/wfdownloads/language/english/admin.php
XoopsModules/wfdownloads/trunk/wfdownloads/language/english/main.php
XoopsModules/wfdownloads/trunk/wfdownloads/language/english/modinfo.php
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/language/english/admin.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/language/english/admin.php 2013-10-06 04:10:39 UTC (rev 12147)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/language/english/admin.php 2013-10-06 04:36:15 UTC (rev 12148)
@@ -41,7 +41,7 @@
// Other Options
define('_AM_WFDOWNLOADS_TEXTOPTIONS', "Text options");
define('_AM_WFDOWNLOADS_ALLOWHTML', " Allow HTML tags");
-define('_AM_WFDOWNLOADS_ALLOWSMILEY', " Allow smiley icons");
+define('_AM_WFDOWNLOADS_ALLOWSMILEY', " Allow Smiley icons");
define('_AM_WFDOWNLOADS_ALLOWXCODE', " Allow XOOPS codes");
define('_AM_WFDOWNLOADS_ALLOWIMAGES', " Allow images");
define('_AM_WFDOWNLOADS_ALLOWBREAK', " Use XOOPS line break conversion");
@@ -88,7 +88,7 @@
define('_AM_WFDOWNLOADS_CCATEGORY_CREATED', "New Category created and database updated successfully");
define('_AM_WFDOWNLOADS_CCATEGORY_MODIFIED', "Selected category modified and database updated successfully");
define('_AM_WFDOWNLOADS_CCATEGORY_DELETED', "Selected category deleted and database updated successfully");
-define('_AM_WFDOWNLOADS_CCATEGORY_AREUSURE', "WARNING: Are you sure you want to delete this category and ALL its files and comments?");
+define('_AM_WFDOWNLOADS_CCATEGORY_AREUSURE', "WARNING: Are you sure to delete this category and ALL its files and comments?");
define('_AM_WFDOWNLOADS_CCATEGORY_NOEXISTS', "You must create a category before you can add a new file");
define('_AM_WFDOWNLOADS_FCATEGORY_GROUPPROMPT', "Category access permissions");
define('_AM_WFDOWNLOADS_FCATEGORY_TITLE', "Category title");
@@ -134,7 +134,7 @@
define('_AM_WFDOWNLOADS_DOWN_UPLOADPATH', "Current upload path: ");
define('_AM_WFDOWNLOADS_DOWN_UPLOADPATHDSC', "Note. Upload path *MUST* contain the full server path of your upload folder.");
define('_AM_WFDOWNLOADS_DOWN_SPHPINI', "<b>Information taken from PHP ini file:</b>");
-define('_AM_WFDOWNLOADS_DOWN_METAVERSION', "<b>Wfdownloads meta version:</b> ");
+define('_AM_WFDOWNLOADS_DOWN_METAVERSION', "<b>Downloads meta version:</b> ");
define('_AM_WFDOWNLOADS_DOWN_SAFEMODESTATUS', "Safe mode status: ");
define('_AM_WFDOWNLOADS_DOWN_REGISTERGLOBALS', "Register globals: ");
define('_AM_WFDOWNLOADS_DOWN_SERVERUPLOADSTATUS', "Server uploads status: ");
@@ -174,7 +174,7 @@
define('_AM_WFDOWNLOADS_MINDEX_ACTION', "Action");
define('_AM_WFDOWNLOADS_MINDEX_NODOWNLOADSFOUND', "NOTICE: there are no downloads that match these criteria");
define('_AM_WFDOWNLOADS_MINDEX_PAGE', "<b>Page:<b> ");
-define('_AM_WFDOWNLOADS_MINDEX_PAGEINFOTXT', "<ul><li>Wfdownloads main page details.</li><li>You can easily change the image logo, heading, main index header and footer text to suit your own look</li></ul><br /><br />Note: The Logo image chosen will be used throughout Wfdownloads.");
+define('_AM_WFDOWNLOADS_MINDEX_PAGEINFOTXT', "<ul><li>Downloads main page details.</li><li>You can easily change the image logo, heading, main index header and footer text to suit your own look</li></ul><br /><br />Note: The Logo image chosen will be used throughout this module.");
// Submitted Files
define('_AM_WFDOWNLOADS_SUB_SUBMITTEDFILES', "Submitted files");
define('_AM_WFDOWNLOADS_SUB_FILESWAITINGINFO', "Waiting files information");
@@ -268,7 +268,7 @@
define('_AM_WFDOWNLOADS_MOD_TITLE', "Download title");
define('_AM_WFDOWNLOADS_MOD_LID', "Download ID");
define('_AM_WFDOWNLOADS_MOD_CID', "Category");
-define('_AM_WFDOWNLOADS_MOD_URL', "Remote Url");
+define('_AM_WFDOWNLOADS_MOD_URL', "Remote URL");
define('_AM_WFDOWNLOADS_MOD_MIRROR', "Download mirror");
define('_AM_WFDOWNLOADS_MOD_SIZE', "Download size");
define('_AM_WFDOWNLOADS_MOD_PUBLISHER', "Publisher");
@@ -278,7 +278,7 @@
define('_AM_WFDOWNLOADS_MOD_LIMITATIONS', "Software limitations");
define('_AM_WFDOWNLOADS_MOD_VERSIONTYPES', "Release status");
define('_AM_WFDOWNLOADS_MOD_DHISTORY', "Download history");
-define('_AM_WFDOWNLOADS_MOD_SCREENSHOT', "Screenshot image");
+define('_AM_WFDOWNLOADS_MOD_SCREENSHOT', "Screenshot 1");
define('_AM_WFDOWNLOADS_MOD_SCREENSHOT2', "Screenshot 2");
define('_AM_WFDOWNLOADS_MOD_SCREENSHOT3', "Screenshot 3");
define('_AM_WFDOWNLOADS_MOD_SCREENSHOT4', "Screenshot 4");
@@ -466,7 +466,7 @@
define('_AM_WFDOWNLOADS_DB_MSG_CREATE_TABLE_ERR', "Error creating table %s");
define('_AM_WFDOWNLOADS_DB_MSG_NEWFIELD', "Successfully added field %s");
define('_AM_WFDOWNLOADS_DB_MSG_NEWFIELD_ERR', "Error adding field %s");
-define('_AM_WFDOWNLOADS_DB_NEEDUPDATE', "Your database is out-of-date. Please upgrade your database tables!<br><b>Note: The SmartFactory strongly recommends you to backup all Wfdownloads tables before running this upgrade script.</b><br>");
+define('_AM_WFDOWNLOADS_DB_NEEDUPDATE', "Your database is out-of-date. Please upgrade your database tables!<br><b>Note: The XOOPS Team strongly recommends you to backup all the module tables before running this upgrade script.</b><br>");
define('_AM_WFDOWNLOADS_DB_NOUPDATE', "Your database is up-to-date. No updates are necessary.");
define('_AM_WFDOWNLOADS_DB_UPDATE_DB', "Updating database");
define('_AM_WFDOWNLOADS_DB_UPDATE_ERR', "Errors updating to version %s");
@@ -527,7 +527,7 @@
define('_AM_WFDOWNLOADS_FFS_EDITDOWNLOADTITLE', "Modify download");
define('_AM_WFDOWNLOADS_FFS_BACK', "Back");
define('_AM_WFDOWNLOADS_FFS_RELOAD', "Reload");
-define('_AM_WFDOWNLOADS_CATEGORYC', "Category: "); // _MD to reuse the category form
+define('_AM_WFDOWNLOADS_CATEGORYC', "Category: "); // _MD to reuse the category form
define('_AM_WFDOWNLOADS_FFS_SUBMITCATEGORYHEAD', "Which category of file do you want to submit?");
define('_AM_WFDOWNLOADS_FFS_DOWNLOADDETAILS', "Download details:");
define('_AM_WFDOWNLOADS_FFS_DOWNLOADCUSTOMDETAILS', "Custom details:");
@@ -619,7 +619,7 @@
define('_AM_WFDOWNLOADS_CLONE_INVALIDNAME', "ERROR: Invalid module name, please try another one!");
define('_AM_WFDOWNLOADS_CLONE_EXISTS', "ERROR: Module name already taken, please try another one!");
define('_AM_WFDOWNLOADS_CLONE_CONGRAT', "Congratulations! %s was sucessfully created! <br />You may want to make changes in language files.");
-define('_AM_WFDOWNLOADS_CLONE_IMAGEFAIL', "Atention, we failed creating the new module logo. Please consider modifying images/module_logo.png manually!");
+define('_AM_WFDOWNLOADS_CLONE_IMAGEFAIL', "Attention, we failed creating the new module logo. Please consider modifying images/module_logo.png manually!");
define('_AM_WFDOWNLOADS_CLONE_FAIL', "Sorry, we failed in creating the new clone. Maybe you need to temporally set write permissions (CHMOD 777) to 'modules' folder and try again.");
// admin/categories.php
define('_AM_WFDOWNLOADS_FCATEGORY_ID', "ID");
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/language/english/main.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/language/english/main.php 2013-10-06 04:10:39 UTC (rev 12147)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/language/english/main.php 2013-10-06 04:36:15 UTC (rev 12148)
@@ -136,17 +136,17 @@
define('_MD_WFDOWNLOADS_DOYOUAGREE', "Do you agree to the above terms?");
define('_MD_WFDOWNLOADS_DISCLAIMERAGREEMENT', "Disclaimer");
define('_MD_WFDOWNLOADS_DUPLOADSCRSHOT', "Upload screenshot image");
-define('_MD_WFDOWNLOADS_RESOURCEID', "Resource id#");
+define('_MD_WFDOWNLOADS_RESOURCEID', "Resource ID#");
define('_MD_WFDOWNLOADS_REPORTER', "Original reporter");
define('_MD_WFDOWNLOADS_DATEREPORTED', "Date reported");
define('_MD_WFDOWNLOADS_RESOURCEREPORTED', "Resource reported broken");
-define('_MD_WFDOWNLOADS_BROWSETOTOPIC', "<b>Browse downloads by alphabetical listing</b>");
+define('_MD_WFDOWNLOADS_BROWSETOTOPIC', "<b>Browse downloads in alphabetical order</b>");
define('_MD_WFDOWNLOADS_WEBMASTERACKNOW', "Broken report acknowledged");
define('_MD_WFDOWNLOADS_WEBMASTERCONFIRM', "Broken report confirmed");
define('_MD_WFDOWNLOADS_DELETE', "Delete");
define('_MD_WFDOWNLOADS_DISPLAYING', "Displayed by: ");
define('_MD_WFDOWNLOADS_LEGENDTEXTNEW', "New today");
-define('_MD_WFDOWNLOADS_LEGENDTEXTNEWTHREE', "New 3 days");
+define('_MD_WFDOWNLOADS_LEGENDTEXTNEWTHREE', "New last 3 days");
define('_MD_WFDOWNLOADS_LEGENDTEXTTHISWEEK', "New this week");
define('_MD_WFDOWNLOADS_LEGENDTEXTNEWLAST', "Over 1 week");
define('_MD_WFDOWNLOADS_THISFILEDOESNOTEXIST', "ERROR: this file does not exist!");
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/language/english/modinfo.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/language/english/modinfo.php 2013-10-06 04:10:39 UTC (rev 12147)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/language/english/modinfo.php 2013-10-06 04:36:15 UTC (rev 12148)
@@ -124,7 +124,7 @@
define('_MI_WFDOWNLOADS_MAINIMGDIR', "Main images directory");
define('_MI_WFDOWNLOADS_USETHUMBS', "[thumbnails] Use thumbnails");
define('_MI_WFDOWNLOADS_USETHUMBSDSC',
- "Supported file types: JPG, GIF, PNG. <br />Wfdownloads will use thumbnails for images (category & screenshots). <br />Set to '" . _NO
+ "Supported file types: JPG, GIF, PNG. <br />Module will use thumbnails for images (category & screenshots). <br />Set to '" . _NO
. "' to use original image if the server does not support this option.");
define('_MI_WFDOWNLOADS_DATEFORMAT', "Timestamp");
define('_MI_WFDOWNLOADS_DATEFORMATDSC', "Default Timestamp for module front end. <br />More info here: <a href='http://www.php.net/manual/en/function.date.php'>http://www.php.net/manual/en/function.date.php</a>");
@@ -249,9 +249,9 @@
EVENT WILL XOOPS BE LIABLE FOR ANY INDIRECT, PUNITIVE, SPECIAL,
INCIDENTAL OR CONSEQUENTIAL DAMAGES, HOWEVER THEY MAY ARISE AND EVEN IF
XOOPS HAS BEEN PREVIOUSLY ADVISED OF THE POSSIBILITY OF SUCH DAMAGES..");
-define('_MI_WFDOWNLOADS_AUTHOR_CREDITSTEXT', "The SmartFactory Team would like to thank the following people for their help and support during the development phase of this module: <br /><br />tom, mking, paco1969, mharoun, Talis, m0nty, steenlnielsen, Clubby, Geronimo, bd_csmc, herko, LANG, Stewdio, tedsmith, veggieryan, carnuke, MadFish, Kiang<br />and anyone else who has contributed to either directly or indirectly.");
+define('_MI_WFDOWNLOADS_AUTHOR_CREDITSTEXT', "The XOOPS Team would like to thank the following people for their help and support during the development phase of this module: <br /><br />tom, mking, paco1969, mharoun, Talis, m0nty, steenlnielsen, Clubby, Geronimo, bd_csmc, herko, LANG, Stewdio, tedsmith, veggieryan, carnuke, MadFish, Kiang, SmartFactory team<br />and anyone else who has contributed to either directly or indirectly.");
define('_MI_WFDOWNLOADS_AUTHOR_BUGFIXES', "Bug Fix History");
-define('_MI_WFDOWNLOADS_COPYRIGHTIMAGE', "Images copyright WF-Project/SmartFactory and may only be used with permission");
+define('_MI_WFDOWNLOADS_COPYRIGHTIMAGE', "Images copyright XOOPS, WF-Project/SmartFactory and may only be used with permission");
// mirror defines
define('_MI_WFDOWNLOADS_MIRROR_USEIMAGES', "Display mirror logos"); // not implemented yet
define('_MI_WFDOWNLOADS_MIRROR_USEIMAGESDSC', "Select '" . _YES . "' to display logo for each mirror."); // not implemented yet
@@ -293,8 +293,8 @@
define('_MI_WFDOWNLOADS_MENU_REVIEWS', "Reviews");
define('_MI_WFDOWNLOADS_MENU_MIRRORS', "Mirrors");
define('_MI_WFDOWNLOADS_MENU_BROKENS', "Brokens");
-define('_MI_WFDOWNLOADS_MENU_REPORTSMODIFICATIONS', "Broken Reports & Modifications");
-define('_MI_WFDOWNLOADS_MENU_IMAGES', "Module images");
+define('_MI_WFDOWNLOADS_MENU_REPORTSMODIFICATIONS', "Broken & Modified");
+define('_MI_WFDOWNLOADS_MENU_IMAGES', "Images");
define('_MI_WFDOWNLOADS_MENU_MIMETYPES', "MIME types");
define('_MI_WFDOWNLOADS_MENU_RATINGS', "Ratings & Votes");
define('_MI_WFDOWNLOADS_MENU_PERMISSIONS', "Permissions");
|
|
From: <be...@us...> - 2013-10-06 04:10:48
|
Revision: 12147
http://sourceforge.net/p/xoops/svn/12147
Author: beckmi
Date: 2013-10-06 04:10:39 +0000 (Sun, 06 Oct 2013)
Log Message:
-----------
Code formatting
Modified Paths:
--------------
XoopsModules/wfdownloads/trunk/wfdownloads/admin/clone.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/downloads.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/images.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/import.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/index.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/indexpage.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/mimetypes.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/mirrors.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/permissions.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/ratings.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/reportsmodifications.php
XoopsModules/wfdownloads/trunk/wfdownloads/admin/reviews.php
XoopsModules/wfdownloads/trunk/wfdownloads/blocks/top.php
XoopsModules/wfdownloads/trunk/wfdownloads/blocks/top_by_cat.php
XoopsModules/wfdownloads/trunk/wfdownloads/brokenfile.php
XoopsModules/wfdownloads/trunk/wfdownloads/class/category.php
XoopsModules/wfdownloads/trunk/wfdownloads/class/dbupdater.php
XoopsModules/wfdownloads/trunk/wfdownloads/class/mirror.php
XoopsModules/wfdownloads/trunk/wfdownloads/class/modification.php
XoopsModules/wfdownloads/trunk/wfdownloads/class/object.php
XoopsModules/wfdownloads/trunk/wfdownloads/class/rating.php
XoopsModules/wfdownloads/trunk/wfdownloads/class/request.php
XoopsModules/wfdownloads/trunk/wfdownloads/class/review.php
XoopsModules/wfdownloads/trunk/wfdownloads/class/uploader.php
XoopsModules/wfdownloads/trunk/wfdownloads/class/wfdownloads_lists.php
XoopsModules/wfdownloads/trunk/wfdownloads/class/xoopstree.php
XoopsModules/wfdownloads/trunk/wfdownloads/footer.php
XoopsModules/wfdownloads/trunk/wfdownloads/include/directorychecker.php
XoopsModules/wfdownloads/trunk/wfdownloads/include/filechecker.php
XoopsModules/wfdownloads/trunk/wfdownloads/include/functions.php
XoopsModules/wfdownloads/trunk/wfdownloads/include/module.php
XoopsModules/wfdownloads/trunk/wfdownloads/include/search.inc.php
XoopsModules/wfdownloads/trunk/wfdownloads/index.php
XoopsModules/wfdownloads/trunk/wfdownloads/js/jquery-latest.js
XoopsModules/wfdownloads/trunk/wfdownloads/js/thickbox-compressed.js
XoopsModules/wfdownloads/trunk/wfdownloads/language/english/main.php
XoopsModules/wfdownloads/trunk/wfdownloads/language/english/modinfo.php
XoopsModules/wfdownloads/trunk/wfdownloads/mirror.php
XoopsModules/wfdownloads/trunk/wfdownloads/module.css
XoopsModules/wfdownloads/trunk/wfdownloads/newlist.php
XoopsModules/wfdownloads/trunk/wfdownloads/ratefile.php
XoopsModules/wfdownloads/trunk/wfdownloads/review.php
XoopsModules/wfdownloads/trunk/wfdownloads/rss.php
XoopsModules/wfdownloads/trunk/wfdownloads/singlefile.php
XoopsModules/wfdownloads/trunk/wfdownloads/submit.php
XoopsModules/wfdownloads/trunk/wfdownloads/templates/admin/wfdownloads_admin_categorieslist.html
XoopsModules/wfdownloads/trunk/wfdownloads/templates/admin/wfdownloads_admin_downloadslist.html
XoopsModules/wfdownloads/trunk/wfdownloads/templates/admin/wfdownloads_admin_mimetypeslist.html
XoopsModules/wfdownloads/trunk/wfdownloads/templates/admin/wfdownloads_admin_mirrorslist.html
XoopsModules/wfdownloads/trunk/wfdownloads/templates/admin/wfdownloads_admin_ratingslist.html
XoopsModules/wfdownloads/trunk/wfdownloads/templates/admin/wfdownloads_admin_reportsmodificationslist.html
XoopsModules/wfdownloads/trunk/wfdownloads/templates/admin/wfdownloads_admin_reviewslist.html
XoopsModules/wfdownloads/trunk/wfdownloads/templates/wfdownloads_common_breadcrumb.html
XoopsModules/wfdownloads/trunk/wfdownloads/templates/wfdownloads_common_letterschoice.html
XoopsModules/wfdownloads/trunk/wfdownloads/templates/wfdownloads_download.html
XoopsModules/wfdownloads/trunk/wfdownloads/templates/wfdownloads_index.html
XoopsModules/wfdownloads/trunk/wfdownloads/templates/wfdownloads_singlefile.html
XoopsModules/wfdownloads/trunk/wfdownloads/templates/wfdownloads_viewcat.html
XoopsModules/wfdownloads/trunk/wfdownloads/thickbox.css
XoopsModules/wfdownloads/trunk/wfdownloads/topten.php
XoopsModules/wfdownloads/trunk/wfdownloads/viewcat.php
XoopsModules/wfdownloads/trunk/wfdownloads/visit.php
XoopsModules/wfdownloads/trunk/wfdownloads/xoops_version.php
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/admin/clone.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/admin/clone.php 2013-10-06 04:04:07 UTC (rev 12146)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/admin/clone.php 2013-10-06 04:10:39 UTC (rev 12147)
@@ -1,164 +1,171 @@
-<?php
-/*
- You may not change or alter any portion of this comment or credits
- of supporting developers from this source code or any supporting source code
- which is considered copyrighted (c) material of the original comment or credit authors.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- */
-/**
- * Wfdownloads module
- *
- * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
- * @license GNU GPL 2 or later (http://www.gnu.org/licenses/gpl-2.0.html)
- * @package wfdownload
- * @since 3.23
- * @author Xoops Development Team
- * @version svn:$id$
- */
-$currentFile = basename(__FILE__);
-include_once dirname(__FILE__) . '/admin_header.php';
-
-if (@$_POST['op'] == 'submit') {
- if (!$GLOBALS['xoopsSecurity']->check()) {
- redirect_header($currentFile, 3, implode('<br />', $GLOBALS['xoopsSecurity']->getErrors()));
- exit();
- }
-
- $cloneDirname = $_POST['clonedirname'];
-
- // Check if name is valid
- if (empty($cloneDirname) || preg_match('/[^a-zA-Z0-9\_\-]/', $cloneDirname)) {
- redirect_header($currentFile, 3, sprintf(_AM_WFDOWNLOADS_CLONE_INVALIDNAME, $cloneDirname));
- exit();
- }
- // Check wether the cloned module exists or not
- if ($cloneDirname && is_dir(XOOPS_ROOT_PATH . '/modules/' . $cloneDirname)) {
- redirect_header($currentFile, 3, sprintf(_AM_WFDOWNLOADS_CLONE_EXISTS, $cloneDirname));
- }
-
- $patterns = array(
- strtolower(WFDOWNLOADS_DIRNAME) => strtolower($cloneDirname),
- strtoupper(WFDOWNLOADS_DIRNAME) => strtoupper($cloneDirname),
- ucfirst(strtolower(WFDOWNLOADS_DIRNAME)) => ucfirst(strtolower($cloneDirname))
- );
-
- $patKeys = array_keys($patterns);
- $patValues = array_values($patterns);
- wfdownloads_cloneFileDir(WFDOWNLOADS_ROOT_PATH);
- $logocreated = wfdownloads_createLogo(strtolower($cloneDirname));
-
- $message = "";
- if (is_dir(XOOPS_ROOT_PATH . '/modules/' . strtolower($cloneDirname))) {
- $message .= sprintf(_AM_WFDOWNLOADS_CLONE_CONGRAT, "<a href='" . XOOPS_URL . "/modules/system/admin.php?fct=modulesadmin&op=installlist'>" . ucfirst(strtolower($cloneDirname)) . "</a>") . "<br />\n";
- if (!$logocreated) {
- $message .= _AM_WFDOWNLOADS_CLONE_IMAGEFAIL;
- }
- } else {
- $message .= _AM_WFDOWNLOADS_CLONE_FAIL;
- }
-
- wfdownloads_xoops_cp_header();
- $indexAdmin = new ModuleAdmin();
- echo $indexAdmin->addNavigation($currentFile);
- echo $message;
- include 'admin_footer.php';
- exit();
-
-} else {
- wfdownloads_xoops_cp_header();
- $indexAdmin = new ModuleAdmin();
- echo $indexAdmin->addNavigation($currentFile);
- include_once XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
- $form = new XoopsThemeForm(sprintf(_AM_WFDOWNLOADS_CLONE_TITLE, $wfdownloads->getModule()->getVar('name', 'E')), 'clone', $currentFile, 'post', true);
- $cloneDirname_text = new XoopsFormText(_AM_WFDOWNLOADS_CLONE_NAME, 'clonedirname', 20, 20, '');
- $cloneDirname_text->setDescription(_AM_WFDOWNLOADS_CLONE_NAME_DSC);
- $form->addElement($cloneDirname_text, true);
- $form->addElement(new XoopsFormHidden('op', 'submit'));
- $form->addElement(new XoopsFormButton('', '', _SUBMIT, 'submit'));
- $form->display();
- include 'admin_footer.php';
- exit();
-}
-
-// recursive clonning script
-function wfdownloads_cloneFileDir($path)
-{
- global $patKeys;
- global $patValues;
-
- $newPath = str_replace($patKeys[0], $patValues[0], $path);
-
- if (is_dir($path)) {
- // create new dir
- mkdir($newPath);
- // check all files in dir, and process it
- if ($handle = opendir($path)) {
- while ($file = readdir($handle)) {
- if ($file != '.' && $file != '..' && $file != '.svn') {
- wfdownloads_cloneFileDir("{$path}/{$file}");
- }
- }
- closedir($handle);
- }
- } else {
- if (preg_match('/(.jpg|.gif|.png|.zip|.ttf)$/i', $path)) {
- // image
- copy($path, $newPath);
- } else {
- // file, read it
- $content = file_get_contents($path);
- $content = str_replace($patKeys, $patValues, $content);
- file_put_contents($newPath, $content);
- }
- }
-}
-
-function wfdownloads_createLogo($dirname)
-{
- $wfdownloads = WfdownloadsWfdownloads::getInstance();
- // Check extension/functions
- if (!extension_loaded("gd")) {
- return false;
- } else {
- $required_functions = array(
- "imagecreatetruecolor",
- "imagecolorallocate",
- "imagefilledrectangle",
- "imagejpeg",
- "imagedestroy",
- "imageftbbox"
- );
- foreach ($required_functions as $func) {
- if (!function_exists($func)) {
- return false;
- }
- }
- }
- // Check original image/font
- if (!file_exists($imageBase = XOOPS_ROOT_PATH . "/modules/" . $dirname . "/images/module_logo.png")) {
- return false;
- }
- if (!file_exists($font = XOOPS_ROOT_PATH . "/modules/" . $wfdownloads->getModule()->dirname() . "/images/VeraBd.ttf")) {
- return false;
- }
- // Create image
- $imageModule = imagecreatefrompng($imageBase);
- // Erase old text
- $greyColor = imagecolorallocate($imageModule, 237, 237, 237);
- imagefilledrectangle($imageModule, 5, 35, 85, 46, $greyColor);
- // Write text
- $textColor = imagecolorallocate($imageModule, 0, 0, 0);
- $space_to_border = (80 - strlen($dirname) * 6.5) / 2;
- imagefttext($imageModule, 8.5, 0, $space_to_border, 45, $textColor, $font, ucfirst($dirname), array());
- // Set transparency color
- $whiteColor = imagecolorallocatealpha($imageModule, 255, 255, 255, 127);
- imagefill($imageModule, 0, 0, $whiteColor);
- imagecolortransparent($imageModule, $whiteColor);
- // Save new image
- imagepng($imageModule, XOOPS_ROOT_PATH . "/modules/" . $dirname . "/images/module_logo.png");
- imagedestroy($imageModule);
- return true;
-}
+<?php
+/*
+ You may not change or alter any portion of this comment or credits
+ of supporting developers from this source code or any supporting source code
+ which is considered copyrighted (c) material of the original comment or credit authors.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ */
+/**
+ * Wfdownloads module
+ *
+ * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license GNU GPL 2 or later (http://www.gnu.org/licenses/gpl-2.0.html)
+ * @package wfdownload
+ * @since 3.23
+ * @author Xoops Development Team
+ * @version svn:$id$
+ */
+$currentFile = basename(__FILE__);
+include_once dirname(__FILE__) . '/admin_header.php';
+
+if (@$_POST['op'] == 'submit') {
+ if (!$GLOBALS['xoopsSecurity']->check()) {
+ redirect_header($currentFile, 3, implode('<br />', $GLOBALS['xoopsSecurity']->getErrors()));
+ exit();
+ }
+
+ $cloneDirname = $_POST['clonedirname'];
+
+ // Check if name is valid
+ if (empty($cloneDirname) || preg_match('/[^a-zA-Z0-9\_\-]/', $cloneDirname)) {
+ redirect_header($currentFile, 3, sprintf(_AM_WFDOWNLOADS_CLONE_INVALIDNAME, $cloneDirname));
+ exit();
+ }
+ // Check wether the cloned module exists or not
+ if ($cloneDirname && is_dir(XOOPS_ROOT_PATH . '/modules/' . $cloneDirname)) {
+ redirect_header($currentFile, 3, sprintf(_AM_WFDOWNLOADS_CLONE_EXISTS, $cloneDirname));
+ }
+
+ $patterns = array(
+ strtolower(WFDOWNLOADS_DIRNAME) => strtolower($cloneDirname),
+ strtoupper(WFDOWNLOADS_DIRNAME) => strtoupper($cloneDirname),
+ ucfirst(strtolower(WFDOWNLOADS_DIRNAME)) => ucfirst(strtolower($cloneDirname))
+ );
+
+ $patKeys = array_keys($patterns);
+ $patValues = array_values($patterns);
+ wfdownloads_cloneFileDir(WFDOWNLOADS_ROOT_PATH);
+ $logocreated = wfdownloads_createLogo(strtolower($cloneDirname));
+
+ $message = "";
+ if (is_dir(XOOPS_ROOT_PATH . '/modules/' . strtolower($cloneDirname))) {
+ $message .= sprintf(
+ _AM_WFDOWNLOADS_CLONE_CONGRAT,
+ "<a href='" . XOOPS_URL . "/modules/system/admin.php?fct=modulesadmin&op=installlist'>" . ucfirst(strtolower($cloneDirname)) . "</a>"
+ ) . "<br />\n";
+ if (!$logocreated) {
+ $message .= _AM_WFDOWNLOADS_CLONE_IMAGEFAIL;
+ }
+ } else {
+ $message .= _AM_WFDOWNLOADS_CLONE_FAIL;
+ }
+
+ wfdownloads_xoops_cp_header();
+ $indexAdmin = new ModuleAdmin();
+ echo $indexAdmin->addNavigation($currentFile);
+ echo $message;
+ include 'admin_footer.php';
+ exit();
+
+} else {
+ wfdownloads_xoops_cp_header();
+ $indexAdmin = new ModuleAdmin();
+ echo $indexAdmin->addNavigation($currentFile);
+ include_once XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
+ $form = new XoopsThemeForm(sprintf(
+ _AM_WFDOWNLOADS_CLONE_TITLE,
+ $wfdownloads->getModule()->getVar('name', 'E')
+ ), 'clone', $currentFile, 'post', true);
+ $cloneDirname_text = new XoopsFormText(_AM_WFDOWNLOADS_CLONE_NAME, 'clonedirname', 20, 20, '');
+ $cloneDirname_text->setDescription(_AM_WFDOWNLOADS_CLONE_NAME_DSC);
+ $form->addElement($cloneDirname_text, true);
+ $form->addElement(new XoopsFormHidden('op', 'submit'));
+ $form->addElement(new XoopsFormButton('', '', _SUBMIT, 'submit'));
+ $form->display();
+ include 'admin_footer.php';
+ exit();
+}
+
+// recursive clonning script
+function wfdownloads_cloneFileDir($path)
+{
+ global $patKeys;
+ global $patValues;
+
+ $newPath = str_replace($patKeys[0], $patValues[0], $path);
+
+ if (is_dir($path)) {
+ // create new dir
+ mkdir($newPath);
+ // check all files in dir, and process it
+ if ($handle = opendir($path)) {
+ while ($file = readdir($handle)) {
+ if ($file != '.' && $file != '..' && $file != '.svn') {
+ wfdownloads_cloneFileDir("{$path}/{$file}");
+ }
+ }
+ closedir($handle);
+ }
+ } else {
+ if (preg_match('/(.jpg|.gif|.png|.zip|.ttf)$/i', $path)) {
+ // image
+ copy($path, $newPath);
+ } else {
+ // file, read it
+ $content = file_get_contents($path);
+ $content = str_replace($patKeys, $patValues, $content);
+ file_put_contents($newPath, $content);
+ }
+ }
+}
+
+function wfdownloads_createLogo($dirname)
+{
+ $wfdownloads = WfdownloadsWfdownloads::getInstance();
+ // Check extension/functions
+ if (!extension_loaded("gd")) {
+ return false;
+ } else {
+ $required_functions = array(
+ "imagecreatetruecolor",
+ "imagecolorallocate",
+ "imagefilledrectangle",
+ "imagejpeg",
+ "imagedestroy",
+ "imageftbbox"
+ );
+ foreach ($required_functions as $func) {
+ if (!function_exists($func)) {
+ return false;
+ }
+ }
+ }
+ // Check original image/font
+ if (!file_exists($imageBase = XOOPS_ROOT_PATH . "/modules/" . $dirname . "/images/module_logo.png")) {
+ return false;
+ }
+ if (!file_exists($font = XOOPS_ROOT_PATH . "/modules/" . $wfdownloads->getModule()->dirname() . "/images/VeraBd.ttf")) {
+ return false;
+ }
+ // Create image
+ $imageModule = imagecreatefrompng($imageBase);
+ // Erase old text
+ $greyColor = imagecolorallocate($imageModule, 237, 237, 237);
+ imagefilledrectangle($imageModule, 5, 35, 85, 46, $greyColor);
+ // Write text
+ $textColor = imagecolorallocate($imageModule, 0, 0, 0);
+ $space_to_border = (80 - strlen($dirname) * 6.5) / 2;
+ imagefttext($imageModule, 8.5, 0, $space_to_border, 45, $textColor, $font, ucfirst($dirname), array());
+ // Set transparency color
+ $whiteColor = imagecolorallocatealpha($imageModule, 255, 255, 255, 127);
+ imagefill($imageModule, 0, 0, $whiteColor);
+ imagecolortransparent($imageModule, $whiteColor);
+ // Save new image
+ imagepng($imageModule, XOOPS_ROOT_PATH . "/modules/" . $dirname . "/images/module_logo.png");
+ imagedestroy($imageModule);
+
+ return true;
+}
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/admin/downloads.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/admin/downloads.php 2013-10-06 04:04:07 UTC (rev 12146)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/admin/downloads.php 2013-10-06 04:10:39 UTC (rev 12147)
@@ -47,8 +47,8 @@
// Allowed mimetypes list
echo "<fieldset><legend style='font-weight: bold; color: #900;'>" . _AM_WFDOWNLOADS_FILE_ALLOWEDAMIME . "</legend>\n";
echo "<div style='padding: 8px;'>\n";
- $criteria = new Criteria("mime_admin", true);
- $mimetypes = $wfdownloads->getHandler('mimetype')->getList($criteria);
+ $criteria = new Criteria("mime_admin", true);
+ $mimetypes = $wfdownloads->getHandler('mimetype')->getList($criteria);
$allowMimetypes = implode(' | ', $mimetypes);
echo $allowMimetypes;
echo "</div>\n";
@@ -60,14 +60,14 @@
exit();
}
$cid = $download->getVar('cid');
- if(!$category = $wfdownloads->getHandler('category')->get($cid)) {
+ if (!$category = $wfdownloads->getHandler('category')->get($cid)) {
redirect_header($currentFile, 4, _AM_WFDOWNLOADS_DOWN_ERROR_CATEGORYNOTFOUND);
exit();
}
$title = preg_replace("/{category}/", $category->getVar('title'), _AM_WFDOWNLOADS_FFS_EDITDOWNLOADTITLE);
} else {
$download = $wfdownloads->getHandler('download')->create();
- $cid = WfdownloadsRequest::getInt('cid', 0, 'POST');
+ $cid = WfdownloadsRequest::getInt('cid', 0, 'POST');
$category = $wfdownloads->getHandler('category')->get($cid);
$download->setVar('cid', $cid);
$title = preg_replace("/{category}/", $category->getVar('title'), _AM_WFDOWNLOADS_FFS_DOWNLOADTITLE);
@@ -78,23 +78,29 @@
$sform = $download->getAdminForm($title);
$sform->display();
} elseif ((isset($_POST['submit_category']) && !empty($_POST['submit_category'])) || $lid) {
- $fid = $category->getVar('formulize_fid');
+ $fid = $category->getVar('formulize_fid');
$customArray = array();
- if($fid) {
+ if ($fid) {
include_once XOOPS_ROOT_PATH . "/modules/formulize/include/formdisplay.php";
include_once XOOPS_ROOT_PATH . "/modules/formulize/include/functions.php";
- $customArray['fid'] = $fid;
+ $customArray['fid'] = $fid;
$customArray['formulize_mgr'] =& xoops_getmodulehandler('elements', 'formulize');
- $customArray['groups'] = $xoopsUser ? $xoopsUser->getGroups() : array(0=>XOOPS_GROUP_ANONYMOUS);
- $customArray['prevEntry'] = getEntryValues($download->getVar('formulize_idreq'), $customArray['formulize_mgr'], $customArray['groups'], $fid);
- $customArray['entry'] = $download->getVar('formulize_idreq');
- $customArray['go_back'] = "";
- $customArray['parentLinks'] = "";
- if (wfdownloads_checkModule('formulize') < 300)
+ $customArray['groups'] = $xoopsUser ? $xoopsUser->getGroups() : array(0 => XOOPS_GROUP_ANONYMOUS);
+ $customArray['prevEntry'] = getEntryValues(
+ $download->getVar('formulize_idreq'),
+ $customArray['formulize_mgr'],
+ $customArray['groups'],
+ $fid
+ );
+ $customArray['entry'] = $download->getVar('formulize_idreq');
+ $customArray['go_back'] = "";
+ $customArray['parentLinks'] = "";
+ if (wfdownloads_checkModule('formulize') < 300) {
$owner = getEntryOwner($entry);
- else
+ } else {
$owner = getEntryOwner($entry, $fid);
- $ownerGroups = $member_handler->getGroupsByUser($owner, false);
+ }
+ $ownerGroups = $member_handler->getGroupsByUser($owner, false);
$customArray['owner_groups'] = $ownerGroups;
}
$sform = $download->getAdminForm($title, $customArray);
@@ -155,15 +161,19 @@
$uids[] = $regvotes[$i]->getVar('ratinguser');
}
- $criteria = new Criteria("ratinguser", "(".implode(',', $uids).")", "IN");
+ $criteria = new Criteria("ratinguser", "(" . implode(',', $uids) . ")", "IN");
$criteria->setGroupby("ratinguser");
$userratings = $wfdownloads->getHandler('rating')->getUserAverage($criteria);
foreach (array_keys($regvotes) as $i) {
$formatted_date = formatTimestamp($regvotes[$i]->getVar('ratingtimestamp'), _DATESTRING);
- $useravgrating = isset($userratings[$regvotes[$i]->getVar('ratinguser')]) ? $userratings[$regvotes[$i]->getVar('ratinguser')]["avg"] : 0;
- $uservotes = isset($userratings[$regvotes[$i]->getVar('ratinguser')]) ? $userratings[$regvotes[$i]->getVar('ratinguser')]["count"] : 0;
- $ratinguname = XoopsUser :: getUnameFromId($regvotes[$i]->getVar('ratinguser'));
+ $useravgrating = isset($userratings[$regvotes[$i]->getVar('ratinguser')]) ? $userratings[$regvotes[$i]->getVar(
+ 'ratinguser'
+ )]["avg"] : 0;
+ $uservotes = isset($userratings[$regvotes[$i]->getVar('ratinguser')]) ? $userratings[$regvotes[$i]->getVar(
+ 'ratinguser'
+ )]["count"] : 0;
+ $ratinguname = XoopsUser :: getUnameFromId($regvotes[$i]->getVar('ratinguser'));
echo "
<tr><td class='head'>$ratinguname</td>\n
@@ -173,7 +183,8 @@
<td class='even'>$uservotes</th>\n
<td class='even'>$formatted_date</th>\n
<td class='even'>\n
- <a href='{$currentFile}?op=vote.delete&lid={$lid}&rid=" . $regvotes[$i]->getVar('ratingid') . "'>" . $imagearray['deleteimg'] . "</a>\n
+ <a href='{$currentFile}?op=vote.delete&lid={$lid}&rid=" . $regvotes[$i]->getVar('ratingid') . "'>"
+ . $imagearray['deleteimg'] . "</a>\n
</th></tr>\n
";
}
@@ -195,14 +206,14 @@
if ($votesanon == 0) {
echo "<tr><td colspan='7' class='even'><b>" . _AM_WFDOWNLOADS_VOTE_NOUNREGVOTES . "</b></td></tr>";
} else {
- $criteria = new Criteria('ratinguser', 0);
- $userratings = $wfdownloads->getHandler('rating')->getUserAverage($criteria);
+ $criteria = new Criteria('ratinguser', 0);
+ $userratings = $wfdownloads->getHandler('rating')->getUserAverage($criteria);
$anonymousVotes = $wfdownloads->getHandler('rating')->getObjects($anonymousCriteria);
foreach (array_keys($anonymousVotes) as $i) {
$formatted_date = formatTimestamp($anonymousVotes[$i]->getVar('ratingtimestamp'), _DATESTRING);
- $useravgrating = isset($userratings['avg']) ? $userratings["avg"] : 0;
- $uservotes = isset($userratings['count']) ? $userratings["count"] : 0;
+ $useravgrating = isset($userratings['avg']) ? $userratings["avg"] : 0;
+ $uservotes = isset($userratings['count']) ? $userratings["count"] : 0;
$ratinguname = $GLOBALS['xoopsConfig']['anonymous'];
@@ -214,7 +225,8 @@
<td class='even'>$uservotes</th>\n
<td class='even'>$formatted_date</th>\n
<td class='even'>\n
- <a href='{$currentFile}?op=vote.delete&lid={$lid}&rid=" . $anonymousVotes[$i]->getVar('ratingid') . "'>" . $imagearray['deleteimg'] . "</a>\n
+ <a href='{$currentFile}?op=vote.delete&lid={$lid}&rid=" . $anonymousVotes[$i]->getVar('ratingid') . "'>"
+ . $imagearray['deleteimg'] . "</a>\n
</th></tr>\n
";
}
@@ -227,38 +239,38 @@
case "download.save" :
case "addDownload" :
- $lid = WfdownloadsRequest::getInt('lid', 0, 'POST');
- $cid = WfdownloadsRequest::getInt('cid', 0, 'POST');
+ $lid = WfdownloadsRequest::getInt('lid', 0, 'POST');
+ $cid = WfdownloadsRequest::getInt('cid', 0, 'POST');
$status = WfdownloadsRequest::getInt('status', 2, 'POST');
if ($lid > 0) {
$thisIsANewRecord = false; /* Added by Lankford on 2007/3/21 */
- $download = $wfdownloads->getHandler('download')->get($lid);
+ $download = $wfdownloads->getHandler('download')->get($lid);
} else {
$thisIsANewRecord = true; /* Added by Lankford on 2007/3/21 */
- $download = $wfdownloads->getHandler('download')->create();
+ $download = $wfdownloads->getHandler('download')->create();
}
// Define URL
if (empty($_FILES['userfile']['name'])) {
if ($_POST['url'] && $_POST['url'] != "" && $_POST['url'] != "http://") {
- $url = ($_POST['url'] != "http://") ? $_POST['url'] : '';
+ $url = ($_POST['url'] != "http://") ? $_POST['url'] : '';
$filename = '';
$filetype = '';
} else {
- $url = ($_POST["url"] != "http://") ? $_POST['url'] : '';
+ $url = ($_POST["url"] != "http://") ? $_POST['url'] : '';
$filename = $_POST['filename'];
$filetype = $_POST['filetype'];
}
- $size = (empty($_POST['size']) || !is_numeric($_POST['size'])) ? 0 : (int)$_POST["size"];
+ $size = (empty($_POST['size']) || !is_numeric($_POST['size'])) ? 0 : (int)$_POST["size"];
$title = trim($_POST['title']);
$download->setVar('filename', $filename);
$download->setVar('filetype', $filetype);
} else {
- $down = wfdownloads_uploading($_FILES, $wfdownloads->getConfig('uploaddir'), '', $currentFile, 0, false, true);
- $url = ($_POST['url'] != "http://") ? $_POST["url"] : '';
- $size = $down['size'];
+ $down = wfdownloads_uploading($_FILES, $wfdownloads->getConfig('uploaddir'), '', $currentFile, 0, false, true);
+ $url = ($_POST['url'] != "http://") ? $_POST["url"] : '';
+ $size = $down['size'];
$title = $_FILES['userfile']['name'];
- $ext = rtrim(strrchr($title, '.'), '.');
+ $ext = rtrim(strrchr($title, '.'), '.');
$title = str_replace($ext, '', $title);
$title = (isset($_POST['title_checkbox']) && $_POST['title_checkbox'] == 1) ? $title : trim($_POST['title']);
@@ -268,7 +280,7 @@
$download->setVar('filetype', $filetype);
}
// Get data from form
- $screenshot = ($_POST['screenshot'] != 'blank.png') ? $_POST['screenshot'] : '';
+ $screenshot = ($_POST['screenshot'] != 'blank.png') ? $_POST['screenshot'] : '';
$screenshot2 = ($_POST['screenshot2'] != 'blank.png') ? $_POST['screenshot2'] : '';
$screenshot3 = ($_POST['screenshot3'] != 'blank.png') ? $_POST['screenshot3'] : '';
$screenshot4 = ($_POST['screenshot4'] != 'blank.png') ? $_POST['screenshot4'] : '';
@@ -287,15 +299,17 @@
// If both conditions are true, then trigger all three notifications related to modified records.
if (!$thisIsANewRecord and ($download->getVar('version') != $version)) {
// Trigger the three events related to modified files (one for the file, category, and global event categories respectively)
- $tags = array();
- $tags['FILE_NAME'] = $title;
- $tags['FILE_URL'] = WFDOWNLOADS_URL . "/singlefile.php?cid={$cid}&lid={$lid}";
- $category = $wfdownloads->getHandler('category')->get($cid);
- $tags['FILE_VERSION'] = $version;
+ $tags = array();
+ $tags['FILE_NAME'] = $title;
+ $tags['FILE_URL'] = WFDOWNLOADS_URL . "/singlefile.php?cid={$cid}&lid={$lid}";
+ $category = $wfdownloads->getHandler('category')->get($cid);
+ $tags['FILE_VERSION'] = $version;
$tags['CATEGORY_NAME'] = $category->getVar('title');
- $tags['CATEGORY_URL'] = WFDOWNLOADS_URL . "/viewcat.php?cid='{$cid}";
+ $tags['CATEGORY_URL'] = WFDOWNLOADS_URL . "/viewcat.php?cid='{$cid}";
- if ($wfdownloads->getConfig('autoapprove') == _WFDOWNLOADS_AUTOAPPROVE_DOWNLOAD || $wfdownloads->getConfig('autoapprove') == _WFDOWNLOADS_AUTOAPPROVE_BOTH) {
+ if ($wfdownloads->getConfig('autoapprove') == _WFDOWNLOADS_AUTOAPPROVE_DOWNLOAD
+ || $wfdownloads->getConfig('autoapprove') == _WFDOWNLOADS_AUTOAPPROVE_BOTH
+ ) {
// Then this change will be automatically approved, so the notification needs to go out.
$notification_handler->triggerEvent('global', 0, 'filemodified', $tags);
$notification_handler->triggerEvent('category', $cid, 'filemodified', $tags);
@@ -330,12 +344,12 @@
$versiontypes = (isset($_POST['versiontypes'])) ? $_POST['versiontypes'] : '';
$download->setVar('versiontypes', $versiontypes);
- $dhistory = (isset($_POST['dhistory'])) ? $_POST['dhistory'] : '';
+ $dhistory = (isset($_POST['dhistory'])) ? $_POST['dhistory'] : '';
$dhistoryhistory = (isset($_POST['dhistoryaddedd'])) ? $_POST['dhistoryaddedd'] : '';
if ($lid > 0 && !empty($dhistoryhistory)) {
$dhistory = $dhistory . "\n\n";
- $time = time();
+ $time = time();
$dhistory .= _AM_WFDOWNLOADS_FILE_HISTORYVERS . $version . _AM_WFDOWNLOADS_FILE_HISTORDATE . formatTimestamp($time, _DATESTRING) . "\n\n";
$dhistory .= $dhistoryhistory;
}
@@ -351,7 +365,7 @@
$offline = ($_POST['offline'] == 1) ? 1 : 0;
$download->setVar('offline', $offline);
- $approved = (isset($_POST['approved']) && $_POST['approved'] == true) ? true : false;
+ $approved = (isset($_POST['approved']) && $_POST['approved'] == true) ? true : false;
$notifypub = (isset($_POST['notifypub']) && $_POST['notifypub'] == true);
$expiredate = 0;
@@ -359,7 +373,7 @@
$publishdate = time();
} else {
$publishdate = $_POST['was_published'];
- $expiredate = $_POST['was_expired'];
+ $expiredate = $_POST['was_expired'];
}
if ($approved == 1 && empty($publishdate)) {
$publishdate = time();
@@ -390,35 +404,45 @@
// Added Formulize module support (2006/05/04) jpc - start
if (wfdownloads_checkModule('formulize')) {
$fid = $category->getVar('formulize_fid');
- if($fid) {
+ if ($fid) {
include_once XOOPS_ROOT_PATH . "/modules/formulize/include/formread.php";
include_once XOOPS_ROOT_PATH . "/modules/formulize/include/functions.php";
$formulize_mgr =& xoops_getmodulehandler('elements', 'formulize');
if ($lid) {
$entries[$fid][0] = $download->getVar('formulize_idreq');
- if($entries[$fid][0]) {
- if (wfdownloads_checkModule('formulize') < 300)
+ if ($entries[$fid][0]) {
+ if (wfdownloads_checkModule('formulize') < 300) {
$owner = getEntryOwner($entries[$fid][0]);
- else
+ } else {
$owner = getEntryOwner($entries[$fid][0], $fid);
+ }
} else {
print "no idreq";
$entries[$fid][0] = "";
- $owner = "";
+ $owner = "";
}
$cid = $download->getVar('cid');
} else {
- $entries[$fid][0] = "";
- $owner = "";
+ $entries[$fid][0] = "";
+ $owner = "";
}
$ownerGroups =& $member_handler->getGroupsByUser($owner, false);
- $uid = !empty($xoopsUser) ? $xoopsUser->getVar('uid') : 0;
- $groups = $xoopsUser ? $xoopsUser->getGroups() : array(0=>XOOPS_GROUP_ANONYMOUS);
- $entries = handleSubmission($formulize_mgr, $entries, $uid, $owner, $fid, $ownerGroups, $groups, "new"); // "new" causes xoops token check to be skipped, since Wfdownloads should be doing that
- if(!$owner) {
- $id_req = $entries[$fid][0];
- $download->setVar('formulize_idreq', $id_req);
- }
+ $uid = !empty($xoopsUser) ? $xoopsUser->getVar('uid') : 0;
+ $groups = $xoopsUser ? $xoopsUser->getGroups() : array(0 => XOOPS_GROUP_ANONYMOUS);
+ $entries = handleSubmission(
+ $formulize_mgr,
+ $entries,
+ $uid,
+ $owner,
+ $fid,
+ $ownerGroups,
+ $groups,
+ "new"
+ ); // "new" causes xoops token check to be skipped, since Wfdownloads should be doing that
+ if (!$owner) {
+ $id_req = $entries[$fid][0];
+ $download->setVar('formulize_idreq', $id_req);
+ }
}
}
// Added Formulize module support (2006/05/04) jpc - end
@@ -426,26 +450,26 @@
$newid = (int)$download->getVar('lid');
// Send notifications
if (!$lid) {
- $tags = array();
- $tags['FILE_NAME'] = $title;
- $tags['FILE_URL'] = WFDOWNLOADS_URL . "/singlefile.php?cid={$cid}&lid={$newid}";
+ $tags = array();
+ $tags['FILE_NAME'] = $title;
+ $tags['FILE_URL'] = WFDOWNLOADS_URL . "/singlefile.php?cid={$cid}&lid={$newid}";
$tags['CATEGORY_NAME'] = $category->getVar('title');
- $tags['CATEGORY_URL'] = WFDOWNLOADS_URL . "/viewcat.php?cid={$cid}";
+ $tags['CATEGORY_URL'] = WFDOWNLOADS_URL . "/viewcat.php?cid={$cid}";
$notification_handler->triggerEvent('global', 0, 'new_file', $tags);
$notification_handler->triggerEvent('category', $cid, 'new_file', $tags);
}
if ($lid && $approved && $notifypub) {
- $tags = array();
- $tags['FILE_NAME'] = $title;
- $tags['FILE_URL'] = WFDOWNLOADS_URL . "/singlefile.php?cid={$cid}&lid={$lid}";
- $category = $wfdownloads->getHandler('category')->get($cid);
+ $tags = array();
+ $tags['FILE_NAME'] = $title;
+ $tags['FILE_URL'] = WFDOWNLOADS_URL . "/singlefile.php?cid={$cid}&lid={$lid}";
+ $category = $wfdownloads->getHandler('category')->get($cid);
$tags['CATEGORY_NAME'] = $category->getVar('title');
- $tags['CATEGORY_URL'] = WFDOWNLOADS_URL . '/viewcat.php?cid=' . $cid;
+ $tags['CATEGORY_URL'] = WFDOWNLOADS_URL . '/viewcat.php?cid=' . $cid;
$notification_handler->triggerEvent('global', 0, 'new_file', $tags);
$notification_handler->triggerEvent('category', $cid, 'new_file', $tags);
$notification_handler->triggerEvent('file', $lid, 'approve', $tags);
}
- $message = (!$lid) ? _AM_WFDOWNLOADS_FILE_NEWFILEUPLOAD : _AM_WFDOWNLOADS_FILE_FILEMODIFIEDUPDATE ;
+ $message = (!$lid) ? _AM_WFDOWNLOADS_FILE_NEWFILEUPLOAD : _AM_WFDOWNLOADS_FILE_FILEMODIFIEDUPDATE;
$message = ($lid && !$_POST['was_published'] && $approved) ? _AM_WFDOWNLOADS_FILE_FILEAPPROVED : $message;
redirect_header($currentFile, 1, $message);
@@ -453,7 +477,7 @@
case "download.delete" :
$lid = WfdownloadsRequest::getInt('lid', 0);
- $ok = WfdownloadsRequest::getBool('ok', false, 'POST');
+ $ok = WfdownloadsRequest::getBool('ok', false, 'POST');
if (!$download = $wfdownloads->getHandler('download')->get($lid)) {
redirect_header($currentFile, 4, _AM_WFDOWNLOADS_ERROR_DOWNLOADNOTFOUND);
exit();
@@ -475,7 +499,12 @@
}
} else {
wfdownloads_xoops_cp_header();
- xoops_confirm(array('op' => 'download.delete', 'lid' => $lid, 'ok' => true, 'title' => $title), $currentFile, _AM_WFDOWNLOADS_FILE_REALLYDELETEDTHIS . "<br /><br>" . $title, _DELETE);
+ xoops_confirm(
+ array('op' => 'download.delete', 'lid' => $lid, 'ok' => true, 'title' => $title),
+ $currentFile,
+ _AM_WFDOWNLOADS_FILE_REALLYDELETEDTHIS . "<br /><br>" . $title,
+ _DELETE
+ );
xoops_cp_footer();
}
break;
@@ -492,7 +521,7 @@
// Added Formulize module support (2006/05/04) jpc - start
case "patch_formulize" :
if (wfdownloads_checkModule('formulize')) {
- if(!isset($_POST['patch_formulize'])) {
+ if (!isset($_POST['patch_formulize'])) {
print "<form action=\"{$currentFile}?op=patch_formulize\" method=post>";
print "<input type = submit name=patch_formulize value=\"Apply Patch for Formulize\">";
print "</form>";
@@ -500,9 +529,12 @@
global $xoopsDB;
$sqls[] = "ALTER TABLE " . $xoopsDB->prefix("wfdownloads_cat") . " ADD formulize_fid int(5) NOT NULL default '0';";
$sqls[] = "ALTER TABLE " . $xoopsDB->prefix("wfdownloads_downloads") . " ADD formulize_idreq int(5) NOT NULL default '0';";
- foreach($sqls as $sql)
- if(!$result = $xoopsDB->queryF($sql))
- exit("Error patching for Formulize.<br>SQL dump:<br>" . $sql . "<br>Please contact <a hre...@fr...>Freeform Solutions</a> for assistance.");
+ foreach ($sqls as $sql) {
+ if (!$result = $xoopsDB->queryF($sql)) {
+ exit("Error patching for Formulize.<br>SQL dump:<br>" . $sql
+ . "<br>Please contact <a hre...@fr...>Freeform Solutions</a> for assistance.");
+ }
+ }
print "Patching for Formulize completed.";
}
}
@@ -524,14 +556,14 @@
exit();
}
// Trigger notify
- $title = $download->getVar('title');
- $cid = $download->getVar('cid');
- $category = $wfdownloads->getHandler('category')->get($cid);
- $tags = array();
- $tags['FILE_NAME'] = $title;
- $tags['FILE_URL'] = WFDOWNLOADS_URL . "/singlefile.php?cid={$cid}&lid={$lid}";
+ $title = $download->getVar('title');
+ $cid = $download->getVar('cid');
+ $category = $wfdownloads->getHandler('category')->get($cid);
+ $tags = array();
+ $tags['FILE_NAME'] = $title;
+ $tags['FILE_URL'] = WFDOWNLOADS_URL . "/singlefile.php?cid={$cid}&lid={$lid}";
$tags['CATEGORY_NAME'] = $category->getVar('title');
- $tags['CATEGORY_URL'] = WFDOWNLOADS_URL . "/viewcat.php?cid={$cid}";
+ $tags['CATEGORY_URL'] = WFDOWNLOADS_URL . "/viewcat.php?cid={$cid}";
$notification_handler->triggerEvent('global', 0, 'new_file', $tags);
$notification_handler->triggerEvent('category', $cid, 'new_file', $tags);
if ($download->getVar('notifypub')) {
@@ -543,29 +575,31 @@
case "downloads.list" :
case "downloads.filter" :
default :
- $filter_title_condition = WfdownloadsRequest::getString('filter_title_condition', '=');
- $filter_title = WfdownloadsRequest::getString('filter_title', '');
+ $filter_title_condition = WfdownloadsRequest::getString('filter_title_condition', '=');
+ $filter_title = WfdownloadsRequest::getString('filter_title', '');
$filter_category_title_condition = WfdownloadsRequest::getString('filter_category_title_condition', '=');
- $filter_category_title = WfdownloadsRequest::getString('filter_category_title', '');
- $filter_poster = WfdownloadsRequest::getArray('filter_poster', null);
- $filter_date = WfdownloadsRequest::getArray('filter_date', null);
- $filter_date_condition = WfdownloadsRequest::getString('filter_date_condition', '<');
+ $filter_category_title = WfdownloadsRequest::getString('filter_category_title', '');
+ $filter_poster = WfdownloadsRequest::getArray('filter_poster', null);
+ $filter_date = WfdownloadsRequest::getArray('filter_date', null);
+ $filter_date_condition = WfdownloadsRequest::getString('filter_date_condition', '<');
if ($op == 'downloads.filter') {
- if ($filter_title == '' && $filter_category_title == '' && is_null($filter_poster)) $op = 'downloads.list';
+ if ($filter_title == '' && $filter_category_title == '' && is_null($filter_poster)) {
+ $op = 'downloads.list';
+ }
}
include_once XOOPS_ROOT_PATH . '/class/pagenav.php';
$categories = $wfdownloads->getHandler('category')->getObjects();
- $start_published = WfdownloadsRequest::getInt('start_published', 0);
- $start_new = WfdownloadsRequest::getInt('start_new', 0);
+ $start_published = WfdownloadsRequest::getInt('start_published', 0);
+ $start_new = WfdownloadsRequest::getInt('start_new', 0);
$start_autopublished = WfdownloadsRequest::getInt('start_autopublished', 0);
- $start_expired = WfdownloadsRequest::getInt('start_expired', 0);
- $start_offline = WfdownloadsRequest::getInt('start_offline', 0);
+ $start_expired = WfdownloadsRequest::getInt('start_expired', 0);
+ $start_offline = WfdownloadsRequest::getInt('start_offline', 0);
- $totalcats = wfdownloads_categoriesCount();
+ $totalcats = wfdownloads_categoriesCount();
$categories = $wfdownloads->getHandler('category')->getObjects(null, true, false);
$totalDownloadsCount = $wfdownloads->getHandler('download')->getCount();
@@ -615,15 +649,15 @@
$criteria->setOrder('DESC');
$criteria->setStart($start_published);
$criteria->setLimit($wfdownloads->getConfig('admin_perpage'));
- $publishedDownloads = $wfdownloads->getHandler('download')->getActiveDownloads($criteria);
+ $publishedDownloads = $wfdownloads->getHandler('download')->getActiveDownloads($criteria);
$publishedDownloadsCount = $wfdownloads->getHandler('download')->getActiveCount();
$GLOBALS['xoopsTpl']->assign('published_downloads_count', $publishedDownloadsCount);
if ($publishedDownloadsCount > 0) {
foreach ($publishedDownloads as $publishedDownload) {
- $publishedDownload_array = $publishedDownload->toArray();
- $publishedDownload_array['title_html'] = $myts->htmlSpecialChars(trim($publishedDownload_array['title']));
- $publishedDownload_array['category_title'] = $categories[$publishedDownload_array['cid']]['title'];
- $publishedDownload_array['submitter_uname'] = XoopsUserUtility::getUnameFromId($publishedDownload_array['submitter']);
+ $publishedDownload_array = $publishedDownload->toArray();
+ $publishedDownload_array['title_html'] = $myts->htmlSpecialChars(trim($publishedDownload_array['title']));
+ $publishedDownload_array['category_title'] = $categories[$publishedDownload_array['cid']]['title'];
+ $publishedDownload_array['submitter_uname'] = XoopsUserUtility::getUnameFromId($publishedDownload_array['submitter']);
$publishedDownload_array['published_timestamp'] = formatTimestamp($publishedDownload_array['published'], _DATESTRING);
$GLOBALS['xoopsTpl']->append('published_downloads', $publishedDownload_array);
}
@@ -634,9 +668,9 @@
$GLOBALS['xoopsTpl']->assign('filter_title_condition', $filter_title_condition);
$GLOBALS['xoopsTpl']->assign('filter_category_title', $filter_category_title);
$GLOBALS['xoopsTpl']->assign('filter_category_title_condition', $filter_category_title_condition);
- $poster_select = new XoopsFormSelectUser(null, 'filter_poster', true, $filter_poster, 2, true);
+ $poster_select = new XoopsFormSelectUser(null, 'filter_poster', true, $filter_poster, 2, true);
$GLOBALS['xoopsTpl']->assign('filter_poster_select', $poster_select->render());
- $date_select = new XoopsFormDateTime (null, 'filter_date', 15, time(), false);
+ $date_select = new XoopsFormDateTime (null, 'filter_date', 15, time(), false);
$GLOBALS['xoopsTpl']->assign('filter_date_select', $date_select->render());
$GLOBALS['xoopsTpl']->assign('filter_date_condition', $filter_date_condition);
@@ -646,23 +680,23 @@
$criteria->add(new Criteria('published', 0));
$criteria->setStart($start_new);
$criteria->setLimit($wfdownloads->getConfig('admin_perpage'));
- $newDownloads = $wfdownloads->getHandler('download')->getObjects($criteria);
+ $newDownloads = $wfdownloads->getHandler('download')->getObjects($criteria);
$newDownloadsCount = $wfdownloads->getHandler('download')->getCount($criteria);
$GLOBALS['xoopsTpl']->assign('new_downloads_count', $newDownloadsCount);
if ($newDownloadsCount > 0) {
foreach ($newDownloads as $newDownload) {
- $newDownload_array = $newDownload->toArray();
- $newDownload_array['rating'] = number_format($newDownload_array['rating'], 2);
- $newDownload_array['title_html'] = $myts->htmlSpecialChars($newDownload_array['title']);
- $newDownload_array['category_title'] = $categories[$newDownload_array['cid']]['title'];
- $url = urldecode($myts->htmlSpecialChars($newDownload_array['url']));
- $homepage = $myts->htmlSpecialChars($newDownload_array['homepage']);
- $version = $myts->htmlSpecialChars($newDownload_array['version']);
- $size = $myts->htmlSpecialChars($newDownload_array['size']);
- $platform = $myts->htmlSpecialChars($newDownload_array['platform']);
- $logourl = $myts->htmlSpecialChars($newDownload_array['screenshot']);
+ $newDownload_array = $newDownload->toArray();
+ $newDownload_array['rating'] = number_format($newDownload_array['rating'], 2);
+ $newDownload_array['title_html'] = $myts->htmlSpecialChars($newDownload_array['title']);
+ $newDownload_array['category_title'] = $categories[$newDownload_array['cid']]['title'];
+ $url = urldecode($myts->htmlSpecialChars($newDownload_array['url']));
+ $homepage = $myts->htmlSpecialChars($newDownload_array['homepage']);
+ $version = $myts->htmlSpecialChars($newDownload_array['version']);
+ $size = $myts->htmlSpecialChars($newDownload_array['size']);
+ $platform = $myts->htmlSpecialChars($newDownload_array['platform']);
+ $logourl = $myts->htmlSpecialChars($newDownload_array['screenshot']);
$newDownload_array['submitter_uname'] = XoopsUserUtility::getUnameFromId($newDownload_array['submitter']);
- $newDownload_array['date_timestamp'] = formatTimestamp($newDownload_array['date'], _DATESTRING);
+ $newDownload_array['date_timestamp'] = formatTimestamp($newDownload_array['date'], _DATESTRING);
$GLOBALS['xoopsTpl']->append('new_downloads', $newDownload_array);
}
}
@@ -676,20 +710,22 @@
$criteria->setOrder("ASC");
$criteria->setStart($start_autopublished);
$criteria->setLimit($wfdownloads->getConfig('admin_perpage'));
- $autopublishedDownloads = $wfdownloads->getHandler('download')->getObjects($criteria);
+ $autopublishedDownloads = $wfdownloads->getHandler('download')->getObjects($criteria);
$autopublishedDownloadsCount = $wfdownloads->getHandler('download')->getCount($criteria);
$GLOBALS['xoopsTpl']->assign('autopublished_downloads_count', $autopublishedDownloadsCount);
if ($autopublishedDownloadsCount > 0) {
foreach ($autopublishedDownloads as $autopublishedDownload) {
- $autopublishedDownload_array = $autopublishedDownload->toArray();
- $autopublishedDownload_array['title_html'] = $myts->htmlSpecialChars(trim($autopublishedDownload_array['title']));
- $autopublishedDownload_array['category_title'] = $categories[$autopublishedDownload_array['cid']]['title'];
- $autopublishedDownload_array['submitter_uname'] = XoopsUserUtility::getUnameFromId($autopublishedDownload_array['submitter']);
+ $autopublishedDownload_array = $autopublishedDownload->toArray();
+ $autopublishedDownload_array['title_html'] = $myts->htmlSpecialChars(trim($autopublishedDownload_array['title']));
+ $autopublishedDownload_array['category_title'] = $categories[$autopublishedDownload_array['cid']]['title'];
+ $autopublishedDownload_array['submitter_uname'] = XoopsUserUtility::getUnameFromId($autopublishedDownload_array['submitter']);
$autopublishedDownload_array['published_timestamp'] = formatTimestamp($autopublishedDownload_array['published'], _DATESTRING);
$GLOBALS['xoopsTpl']->append('autopublished_downloads', $autopublishedDownload_array);
}
}
- $pagenav = new XoopsPageNav($autopublishedDownloadsCount, $wfdownloads->getConfig('admin_perpage'), $start_autopublished, 'start_autopublished');
+ $pagenav = new XoopsPageNav($autopublishedDownloadsCount, $wfdownloads->getConfig(
+ 'admin_perpage'
+ ), $start_autopublished, 'start_autopublished');
$GLOBALS['xoopsTpl']->assign('autopublished_downloads_pagenav', $pagenav->renderNav());
// Expired downloads
@@ -700,15 +736,15 @@
$criteria->setOrder('ASC');
$criteria->setStart($start_expired);
$criteria->setLimit($wfdownloads->getConfig('admin_perpage'));
- $expired_downloads = $wfdownloads->getHandler('download')->getObjects($criteria);
+ $expired_downloads = $wfdownloads->getHandler('download')->getObjects($criteria);
$expiredDownloadsCount = $wfdownloads->getHandler('download')->getCount($criteria);
$GLOBALS['xoopsTpl']->assign('expired_downloads_count', $expiredDownloadsCount);
- if ($expiredDownloadsCount > 0) {
+ if ($expiredDownloadsCount > 0) {
foreach ($expired_downloads as $expired_download) {
- $expired_download_array = $expired_download->toArray();
- $expired_download_array['title_html'] = $myts->htmlSpecialChars(trim($expired_download_array['title']));
- $expired_download_array['category_title'] = $categories[$expired_download_array['cid']]['title'];
- $expired_download_array['submitter_uname'] = XoopsUserUtility::getUnameFromId($expired_download_array['submitter']);
+ $expired_download_array = $expired_download->toArray();
+ $expired_download_array['title_html'] = $myts->htmlSpecialChars(trim($expired_download_array['title']));
+ $expired_download_array['category_title'] = $categories[$expired_download_array['cid']]['title'];
+ $expired_download_array['submitter_uname'] = XoopsUserUtility::getUnameFromId($expired_download_array['submitter']);
$expired_download_array['published_timestamp'] = formatTimestamp($expired_download_array['published'], _DATESTRING);
$GLOBALS['xoopsTpl']->append('expired_downloads', $expired_download_array);
}
@@ -723,15 +759,15 @@
$criteria->setStart($start_offline);
$criteria->setLimit($wfdownloads->getConfig('admin_perpage'));
$offlineDownloadsCount = $wfdownloads->getHandler('download')->getCount($criteria);
- $offlineDownloads = $wfdownloads->getHandler('download')->getObjects($criteria);
+ $offlineDownloads = $wfdownloads->getHandler('download')->getObjects($criteria);
$offlineDownloadsCount = $wfdownloads->getHandler('download')->getCount($criteria);
$GLOBALS['xoopsTpl']->assign('offline_downloads_count', $offlineDownloadsCount);
if ($offlineDownloadsCount > 0) {
foreach ($offlineDownloads as $offlineDownload) {
- $offlineDownload_array = $offlineDownload->toArray();
- $offlineDownload_array['title_html'] = $myts->htmlSpecialChars(trim($offlineDownload_array['title']));
- $offlineDownload_array['category_title'] = $categories[$offlineDownload_array['cid']]['title'];
- $offlineDownload_array['submitter_uname'] = XoopsUserUtility::getUnameFromId($offlineDownload_array['submitter']);
+ $offlineDownload_array = $offlineDownload->toArray();
+ $offlineDownload_array['title_html'] = $myts->htmlSpecialChars(trim($offlineDownload_array['title']));
+ $offlineDownload_array['category_title'] = $categories[$offlineDownload_array['cid']]['title'];
+ $offlineDownload_array['submitter_uname'] = XoopsUserUtility::getUnameFromId($offlineDownload_array['submitter']);
$offlineDownload_array['published_timestamp'] = formatTimestamp($offlineDownload_array['published'], _DATESTRING);
$GLOBALS['xoopsTpl']->append('offline_downloads', $offlineDownload_array);
@@ -749,7 +785,7 @@
case "ip_logs.list" :
$lid = WfdownloadsRequest::getInt('lid', 0);
- if(!$lid) {
+ if (!$lid) {
header('Location index.php');
}
@@ -769,15 +805,15 @@
}
$criteria->setSort('date');
$criteria->setOrder('DESC');
- $ip_logs = $wfdownloads->getHandler('ip_log')->getObjects($criteria);
+ $ip_logs = $wfdownloads->getHandler('ip_log')->getObjects($criteria);
$ip_logs_count = $wfdownloads->getHandler('ip_log')->getCount($criteria);
$GLOBALS['xoopsTpl']->assign('ip_logs_count', $ip_logs_count);
unset($criteria);
// Get download info
if ($lid != 0) {
- $download = $wfdownloads->getHandler('download')->get($lid);
- $download_array = $download->toArray();
+ $download = $wfdownloads->getHandler('download')->get($lid);
+ $download_array = $download->toArray();
$download_array['log_title'] = sprintf(_AM_WFDOWNLOADS_LOG_FOR_LID, $download_array['title']);
$GLOBALS['xoopsTpl']->assign('download', $download_array);
}
@@ -785,23 +821,25 @@
// Get all logged users
$uidArray = array();
- foreach($ip_logs as $ip_log) {
- if($ip_log->getVar('uid')!= 0 && $ip_log->getVar('uid') != '') {
+ foreach ($ip_logs as $ip_log) {
+ if ($ip_log->getVar('uid') != 0 && $ip_log->getVar('uid') != '') {
$uidArray[] = $ip_log->getVar('uid');
}
}
$criteria = new CriteriaCompo();
- if(!empty($uidArray)) {
+ if (!empty($uidArray)) {
$criteria->add(new Criteria('uid', '(' . implode(', ', $uidArray) . ')', 'IN'));
}
$userList = $member_handler->getUserList($criteria);
- if(empty($ip_logs)){
+ if (empty($ip_logs)) {
// NOP
} else {
- foreach($ip_logs as $ip_log){
- $ip_log_array = $ip_log->toArray();
- $ip_log_array['uname'] = XoopsUserUtility::getUnameFromId($ip_log_array['uid']);//($ip_log_array['uid'] != 0) ? $userList[$ip_log_array['uid']] : _AM_WFDOWNLOADS_ANONYMOUS;
- $ip_log_array['date_timestamp'] = formatTimestamp($ip_log_array['date']);
+ foreach ($ip_logs as $ip_log) {
+ $ip_log_array = $ip_log->toArray();
+ $ip_log_array['uname'] = XoopsUserUtility::getUnameFro...
[truncated message content] |
|
From: <be...@us...> - 2013-10-06 04:04:13
|
Revision: 12146
http://sourceforge.net/p/xoops/svn/12146
Author: beckmi
Date: 2013-10-06 04:04:07 +0000 (Sun, 06 Oct 2013)
Log Message:
-----------
change of loaded language file in menu.php
Modified Paths:
--------------
XoopsModules/wfdownloads/trunk/wfdownloads/admin/menu.php
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/admin/menu.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/admin/menu.php 2013-10-06 03:55:59 UTC (rev 12145)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/admin/menu.php 2013-10-06 04:04:07 UTC (rev 12146)
@@ -24,7 +24,7 @@
$module = $module_handler->getByDirname(basename(dirname(dirname(__FILE__))));
$pathIcon32 = '../../' . $module->getInfo('icons32');
-xoops_loadLanguage('admin', $module->dirname());
+xoops_loadLanguage('modinfo', $module->dirname());
$adminmenu = array();
$i=0;
|
|
From: <be...@us...> - 2013-10-06 03:56:06
|
Revision: 12145
http://sourceforge.net/p/xoops/svn/12145
Author: beckmi
Date: 2013-10-06 03:55:59 +0000 (Sun, 06 Oct 2013)
Log Message:
-----------
fixing apostrophes
Modified Paths:
--------------
XoopsModules/wfdownloads/trunk/wfdownloads/language/english/admin.php
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/language/english/admin.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/language/english/admin.php 2013-10-06 02:28:47 UTC (rev 12144)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/language/english/admin.php 2013-10-06 03:55:59 UTC (rev 12145)
@@ -203,11 +203,13 @@
define('_AM_WFDOWNLOADS_MIME_NOMIMEINFO', "No MIME types selected");
define('_AM_WFDOWNLOADS_MIME_FINDMIMETYPE', "Find MIME type information");
define('_AM_WFDOWNLOADS_MIME_EXTFIND', "Search file extension");
-define('_AM_WFDOWNLOADS_MIME_INFOTEXT', "<ul><li>New MIME types can be created, edited or deleted easily via this form</li>
+define(
+ '_AM_WFDOWNLOADS_MIME_INFOTEXT',
+ "<ul><li>New MIME types can be created, edited or deleted easily via this form</li>
<li>Looking for a new MIME type via an external website.</li>
<li>View displayed MIME types for Admin and user uploads.</li>
- <li>Change MIME type upload status.</li></ul>
- ");
+ <li>Change MIME type upload status.</li></ul>"
+);
// Mime type Buttons
define('_AM_WFDOWNLOADS_MIME_CREATE', "Create");
define('_AM_WFDOWNLOADS_MIME_CLEAR', "Reset");
@@ -586,7 +588,7 @@
//directories
define('_AM_WFDOWNLOADS_AVAILABLE', "<span style='color:green;'>Available. </span>");
define('_AM_WFDOWNLOADS_NOTAVAILABLE', "<span style='color:red;'>is not available. </span>");
-define('_AM_WFDOWNLOADS_NOTWRITABLE', "<span style='color:red;'>'.' should have permission ( %1$d ), but it has ( %2$d )'. '</span>");
+define('_AM_WFDOWNLOADS_NOTWRITABLE', '<span style="color:red;"> should have permission ( %1$d ), but it has ( %2$d )</span>');
define('_AM_WFDOWNLOADS_CREATETHEDIR', "Create it");
define('_AM_WFDOWNLOADS_SETMPERM', "Set the permission");
define('_AM_WFDOWNLOADS_DIRCREATED', "The directory has been created");
@@ -627,4 +629,4 @@
define('_AM_WFDOWNLOADS_MOD_DOXCODE', "Allow XOOPS BBcode");
define('_AM_WFDOWNLOADS_MOD_DOIMAGE', "Allow XOOPS Images");
define('_AM_WFDOWNLOADS_MOD_DOBR', "Convert line breaks");
-define('_AM_WFDOWNLOADS_MOD_FORMULIZE_IDREQ', "Formulize Form ID");
\ No newline at end of file
+define('_AM_WFDOWNLOADS_MOD_FORMULIZE_IDREQ', "Formulize Form ID");
|
|
From: <ce...@us...> - 2013-10-06 02:28:53
|
Revision: 12144
http://sourceforge.net/p/xoops/svn/12144
Author: cesag
Date: 2013-10-06 02:28:47 +0000 (Sun, 06 Oct 2013)
Log Message:
-----------
Standardization of English language files (cesag)
Modified Paths:
--------------
XoopsModules/wfdownloads/trunk/wfdownloads/docs/changelog.txt
XoopsModules/wfdownloads/trunk/wfdownloads/language/english/admin.php
XoopsModules/wfdownloads/trunk/wfdownloads/language/english/blocks.php
XoopsModules/wfdownloads/trunk/wfdownloads/language/english/common.php
XoopsModules/wfdownloads/trunk/wfdownloads/language/english/directorychecker.php
XoopsModules/wfdownloads/trunk/wfdownloads/language/english/filechecker.php
XoopsModules/wfdownloads/trunk/wfdownloads/language/english/main.php
XoopsModules/wfdownloads/trunk/wfdownloads/language/english/modinfo.php
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/docs/changelog.txt
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/docs/changelog.txt 2013-10-06 00:59:14 UTC (rev 12143)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/docs/changelog.txt 2013-10-06 02:28:47 UTC (rev 12144)
@@ -1,4 +1,5 @@
<b><u>=> Version 3.23 Beta (2013-10-05)</u></b>
+- standardization of English language files (cesag)
- fixed: typos in english folder (cesag)
- module standardization: header.php, admin/admin_header.php, xoops_version.php
- module standardization: standardize directories/files names/structures
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/language/english/admin.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/language/english/admin.php 2013-10-06 00:59:14 UTC (rev 12143)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/language/english/admin.php 2013-10-06 02:28:47 UTC (rev 12144)
@@ -21,658 +21,610 @@
// %%%%%% Module NMDe 'MyDownloads' (Admin) %%%%%
// Buttons
-define("_AM_WFDOWNLOADS_BMODIFY","Modify");
-define("_AM_WFDOWNLOADS_BDELETE","Delete");
-define("_AM_WFDOWNLOADS_BADD","Add");
-define("_AM_WFDOWNLOADS_BAPPROVE","Approve");
-define("_AM_WFDOWNLOADS_BIGNORE","Ignore");
-define("_AM_WFDOWNLOADS_BCANCEL","Cancel");
-define("_AM_WFDOWNLOADS_BSAVE","Save");
-define("_AM_WFDOWNLOADS_BRESET","Reset");
-define("_AM_WFDOWNLOADS_BMOVE","Move files");
-define("_AM_WFDOWNLOADS_BUPLOAD","Upload");
-define("_AM_WFDOWNLOADS_BDELETEIMAGE","Delete selected image");
-define("_AM_WFDOWNLOADS_BRETURN","Return to where you were!");
-define("_AM_WFDOWNLOADS_DBERROR","Database access error: please report this error to the XOOPS website");
+define('_AM_WFDOWNLOADS_BMODIFY', "Modify");
+define('_AM_WFDOWNLOADS_BDELETE', "Delete");
+define('_AM_WFDOWNLOADS_BADD', "Add");
+define('_AM_WFDOWNLOADS_BAPPROVE', "Approve");
+define('_AM_WFDOWNLOADS_BIGNORE', "Ignore");
+define('_AM_WFDOWNLOADS_BCANCEL', "Cancel");
+define('_AM_WFDOWNLOADS_BSAVE', "Save");
+define('_AM_WFDOWNLOADS_BRESET', "Reset");
+define('_AM_WFDOWNLOADS_BMOVE', "Move files");
+define('_AM_WFDOWNLOADS_BUPLOAD', "Upload");
+define('_AM_WFDOWNLOADS_BDELETEIMAGE', "Delete selected image");
+define('_AM_WFDOWNLOADS_BRETURN', "Return to where you were!");
+define('_AM_WFDOWNLOADS_DBERROR', "Database access error: please report this error to the XOOPS website");
//Banned Users
-define("_AM_WFDOWNLOADS_NONBANNED","Not Banned");
-define("_AM_WFDOWNLOADS_BANNED","Banned");
-define("_AM_WFDOWNLOADS_EDITBANNED","Edit Banned Users");
+define('_AM_WFDOWNLOADS_NONBANNED', "Not Banned");
+define('_AM_WFDOWNLOADS_BANNED', "Banned");
+define('_AM_WFDOWNLOADS_EDITBANNED', "Edit Banned Users");
// Other Options
-define("_AM_WFDOWNLOADS_TEXTOPTIONS","Text options");
-define("_AM_WFDOWNLOADS_ALLOWHTML"," Allow HTML tags");
-define("_AM_WFDOWNLOADS_ALLOWSMILEY"," Allow smiley icons");
-define("_AM_WFDOWNLOADS_ALLOWXCODE"," Allow XOOPS codes");
-define("_AM_WFDOWNLOADS_ALLOWIMAGES"," Allow images");
-define("_AM_WFDOWNLOADS_ALLOWBREAK"," Use XOOPS line break conversion");
-define("_AM_WFDOWNLOADS_UPLOADFILE","File uploaded successfully");
-define("_AM_WFDOWNLOADS_NOMENUITEMS","No menu items within the menu");
-
+define('_AM_WFDOWNLOADS_TEXTOPTIONS', "Text options");
+define('_AM_WFDOWNLOADS_ALLOWHTML', " Allow HTML tags");
+define('_AM_WFDOWNLOADS_ALLOWSMILEY', " Allow smiley icons");
+define('_AM_WFDOWNLOADS_ALLOWXCODE', " Allow XOOPS codes");
+define('_AM_WFDOWNLOADS_ALLOWIMAGES', " Allow images");
+define('_AM_WFDOWNLOADS_ALLOWBREAK', " Use XOOPS line break conversion");
+define('_AM_WFDOWNLOADS_UPLOADFILE', "File uploaded successfully");
+define('_AM_WFDOWNLOADS_NOMENUITEMS', "No menu items within the menu");
// Admin Bread crumb
-define("_AM_WFDOWNLOADS_PREFS","Preferences");
-define("_AM_WFDOWNLOADS_PERMISSIONS","Permissions");
-define("_AM_WFDOWNLOADS_BINDEX","Main index");
-define("_AM_WFDOWNLOADS_BLOCKADMIN","Blocks");
-define("_AM_WFDOWNLOADS_GOMODULE","Go to module");
-define("_AM_WFDOWNLOADS_BHELP","Help");
-define("_AM_WFDOWNLOADS_ABOUT","About");
+define('_AM_WFDOWNLOADS_PREFS', "Preferences");
+define('_AM_WFDOWNLOADS_PERMISSIONS', "Permissions");
+define('_AM_WFDOWNLOADS_BINDEX', "Main index");
+define('_AM_WFDOWNLOADS_BLOCKADMIN', "Blocks");
+define('_AM_WFDOWNLOADS_GOMODULE', "Go to module");
+define('_AM_WFDOWNLOADS_BHELP', "Help");
+define('_AM_WFDOWNLOADS_ABOUT', "About");
// Admin Summary
-define("_AM_WFDOWNLOADS_SCATEGORY","Categories: %s");
-define("_AM_WFDOWNLOADS_SFILES","Downloads: %s");
-define("_AM_WFDOWNLOADS_SNEWFILESVAL","New/waiting downloads: %s");
-define("_AM_WFDOWNLOADS_SMODREQUEST","Modifications: %s");
-define("_AM_WFDOWNLOADS_SREVIEWS","Reviews: %s");
-define("_AM_WFDOWNLOADS_SMIRRORS","Mirrors: %s");
+define('_AM_WFDOWNLOADS_SCATEGORY', "Categories: %s");
+define('_AM_WFDOWNLOADS_SFILES', "Downloads: %s");
+define('_AM_WFDOWNLOADS_SNEWFILESVAL', "New/waiting downloads: %s");
+define('_AM_WFDOWNLOADS_SMODREQUEST', "Modifications: %s");
+define('_AM_WFDOWNLOADS_SREVIEWS', "Reviews: %s");
+define('_AM_WFDOWNLOADS_SMIRRORS', "Mirrors: %s");
// Admin Main Menu
-define("_AM_WFDOWNLOADS_MCATEGORY","Categories management");
-define("_AM_WFDOWNLOADS_INDEXPAGE","Index page management");
-define("_AM_WFDOWNLOADS_MUPLOADS","Images upload");
-define("_AM_WFDOWNLOADS_MMIMETYPES","MIME types management");
-define("_AM_WFDOWNLOADS_MCOMMENTS","Comments");
-define("_AM_WFDOWNLOADS_MVOTEDATA","Vote data");
+define('_AM_WFDOWNLOADS_MCATEGORY', "Categories management");
+define('_AM_WFDOWNLOADS_INDEXPAGE', "Index page management");
+define('_AM_WFDOWNLOADS_MUPLOADS', "Images upload");
+define('_AM_WFDOWNLOADS_MMIMETYPES', "MIME types management");
+define('_AM_WFDOWNLOADS_MCOMMENTS', "Comments");
+define('_AM_WFDOWNLOADS_MVOTEDATA', "Vote data");
// waiting reviews
-define("_AM_WFDOWNLOADS_AREVIEWS","Reviews management");
-define("_AM_WFDOWNLOADS_AREVIEWS_WAITING","Reviews waiting for validation");
-define("_AM_WFDOWNLOADS_AREVIEWS_INFO","Reviews information");
-define("_AM_WFDOWNLOADS_AREVIEWS_APPROVE","Approve new review without validation");
-define("_AM_WFDOWNLOADS_AREVIEWS_APPROVED","Review has been approved.");
-define("_AM_WFDOWNLOADS_AREVIEWS_EDIT","Edit new review and then approve");
-define("_AM_WFDOWNLOADS_AREVIEWS_DELETE","Delete the new review information");
-
+define('_AM_WFDOWNLOADS_AREVIEWS', "Reviews management");
+define('_AM_WFDOWNLOADS_AREVIEWS_WAITING', "Reviews waiting for validation");
+define('_AM_WFDOWNLOADS_AREVIEWS_INFO', "Reviews information");
+define('_AM_WFDOWNLOADS_AREVIEWS_APPROVE', "Approve new review without validation");
+define('_AM_WFDOWNLOADS_AREVIEWS_APPROVED', "Review has been approved.");
+define('_AM_WFDOWNLOADS_AREVIEWS_EDIT', "Edit new review and then approve");
+define('_AM_WFDOWNLOADS_AREVIEWS_DELETE', "Delete the new review information");
// Catgeory defines
-define("_AM_WFDOWNLOADS_CCATEGORY_CREATENEW","Create new category");
-define("_AM_WFDOWNLOADS_CCATEGORY_MODIFY","Modify category");
-define("_AM_WFDOWNLOADS_CCATEGORY_MOVE","Move category files");
-define("_AM_WFDOWNLOADS_CCATEGORY_MODIFY_TITLE","Category title");
-define("_AM_WFDOWNLOADS_CCATEGORY_MODIFY_FAILED","Failed moving files: cannot move to this category");
-define("_AM_WFDOWNLOADS_CCATEGORY_MODIFY_FAILEDT","Failed moving files: cannot find this category");
-define("_AM_WFDOWNLOADS_CCATEGORY_MODIFY_MOVED","Files moved successfully");
-define("_AM_WFDOWNLOADS_CCATEGORY_CREATED","New Category created and database updated successfully");
-define("_AM_WFDOWNLOADS_CCATEGORY_MODIFIED","Selected category modified and database updated successfully");
-define("_AM_WFDOWNLOADS_CCATEGORY_DELETED","Selected category deleted and database updated successfully");
-define("_AM_WFDOWNLOADS_CCATEGORY_AREUSURE","WARNING: Are you sure you want to delete this category and ALL its files and comments?");
-define("_AM_WFDOWNLOADS_CCATEGORY_NOEXISTS","You must create a category before you can add a new file");
-define("_AM_WFDOWNLOADS_FCATEGORY_GROUPPROMPT","Category access permissions");
-define("_AM_WFDOWNLOADS_FCATEGORY_TITLE","Category title");
-define("_AM_WFDOWNLOADS_FCATEGORY_WEIGHT","Category weight");
-define("_AM_WFDOWNLOADS_FCATEGORY_SUBCATEGORY","As subcategory of");
-define("_AM_WFDOWNLOADS_FCATEGORY_CIMAGE","Category image");
-define("_AM_WFDOWNLOADS_FCATEGORY_DESCRIPTION","Category description");
-define("_AM_WFDOWNLOADS_FCATEGORY_SUMMARY","Category summary");
-define("_AM_WFDOWNLOADS_CCATEGORY_CHILDASPARENT","You cannot set a child's category as the category parent");
-
+define('_AM_WFDOWNLOADS_CCATEGORY_CREATENEW', "Create new category");
+define('_AM_WFDOWNLOADS_CCATEGORY_MODIFY', "Modify category");
+define('_AM_WFDOWNLOADS_CCATEGORY_MOVE', "Move category files");
+define('_AM_WFDOWNLOADS_CCATEGORY_MODIFY_TITLE', "Category title");
+define('_AM_WFDOWNLOADS_CCATEGORY_MODIFY_FAILED', "Failed moving files: cannot move to this category");
+define('_AM_WFDOWNLOADS_CCATEGORY_MODIFY_FAILEDT', "Failed moving files: cannot find this category");
+define('_AM_WFDOWNLOADS_CCATEGORY_MODIFY_MOVED', "Files moved successfully");
+define('_AM_WFDOWNLOADS_CCATEGORY_CREATED', "New Category created and database updated successfully");
+define('_AM_WFDOWNLOADS_CCATEGORY_MODIFIED', "Selected category modified and database updated successfully");
+define('_AM_WFDOWNLOADS_CCATEGORY_DELETED', "Selected category deleted and database updated successfully");
+define('_AM_WFDOWNLOADS_CCATEGORY_AREUSURE', "WARNING: Are you sure you want to delete this category and ALL its files and comments?");
+define('_AM_WFDOWNLOADS_CCATEGORY_NOEXISTS', "You must create a category before you can add a new file");
+define('_AM_WFDOWNLOADS_FCATEGORY_GROUPPROMPT', "Category access permissions");
+define('_AM_WFDOWNLOADS_FCATEGORY_TITLE', "Category title");
+define('_AM_WFDOWNLOADS_FCATEGORY_WEIGHT', "Category weight");
+define('_AM_WFDOWNLOADS_FCATEGORY_SUBCATEGORY', "As subcategory of");
+define('_AM_WFDOWNLOADS_FCATEGORY_CIMAGE', "Category image");
+define('_AM_WFDOWNLOADS_FCATEGORY_DESCRIPTION', "Category description");
+define('_AM_WFDOWNLOADS_FCATEGORY_SUMMARY', "Category summary");
+define('_AM_WFDOWNLOADS_CCATEGORY_CHILDASPARENT', "You cannot set a child's category as the category parent");
// Index page Defines
-define("_AM_WFDOWNLOADS_IPAGE_UPDATED","Index page modified and database updated successfully!");
-define("_AM_WFDOWNLOADS_IPAGE_INFORMATION","Index page information");
-define("_AM_WFDOWNLOADS_IPAGE_MODIFY","Modify index page");
-define("_AM_WFDOWNLOADS_IPAGE_CIMAGE","Select index image");
-define("_AM_WFDOWNLOADS_IPAGE_CTITLE","Index title");
-define("_AM_WFDOWNLOADS_IPAGE_CHEADING","Index heading");
-define("_AM_WFDOWNLOADS_IPAGE_CHEADINGA","Index heading alignment");
-define("_AM_WFDOWNLOADS_IPAGE_CFOOTER","Index footer");
-define("_AM_WFDOWNLOADS_IPAGE_CFOOTERA","Index footer alignment");
-define("_AM_WFDOWNLOADS_IPAGE_CLEFT","Align left");
-define("_AM_WFDOWNLOADS_IPAGE_CCENTER","Align center");
-define("_AM_WFDOWNLOADS_IPAGE_CRIGHT","Align right");
-
+define('_AM_WFDOWNLOADS_IPAGE_UPDATED', "Index page modified and database updated successfully!");
+define('_AM_WFDOWNLOADS_IPAGE_INFORMATION', "Index page information");
+define('_AM_WFDOWNLOADS_IPAGE_MODIFY', "Modify index page");
+define('_AM_WFDOWNLOADS_IPAGE_CIMAGE', "Select index image");
+define('_AM_WFDOWNLOADS_IPAGE_CTITLE', "Index title");
+define('_AM_WFDOWNLOADS_IPAGE_CHEADING', "Index heading");
+define('_AM_WFDOWNLOADS_IPAGE_CHEADINGA', "Index heading alignment");
+define('_AM_WFDOWNLOADS_IPAGE_CFOOTER', "Index footer");
+define('_AM_WFDOWNLOADS_IPAGE_CFOOTERA', "Index footer alignment");
+define('_AM_WFDOWNLOADS_IPAGE_CLEFT', "Align left");
+define('_AM_WFDOWNLOADS_IPAGE_CCENTER', "Align center");
+define('_AM_WFDOWNLOADS_IPAGE_CRIGHT', "Align right");
// Permissions defines
-define("_AM_WFDOWNLOADS_PERM_MANAGEMENT","Permissions management");
-define("_AM_WFDOWNLOADS_PERM_PERMSNOTE","Please be aware that even if you've set correct viewing permissions here, a group might not see the articles or blocks if you don't also grant that group permissions to access the module. To do that, go to <b>System admin > Groups</b>, choose the appropriate group and click the checkboxes to grant its members the access.");
-define("_AM_WFDOWNLOADS_PERM_CPERMISSIONS","Category permissions");
-define("_AM_WFDOWNLOADS_PERM_CSELECTPERMISSIONS","Select categories that each group is allowed to view");
-define("_AM_WFDOWNLOADS_PERM_CNOCATEGORY","Cannot set permissions: No categories have been created yet!");
-define("_AM_WFDOWNLOADS_PERM_FPERMISSIONS","File permissions");
-define("_AM_WFDOWNLOADS_PERM_FNOFILES","Cannot set permissions: no files have been created yet!");
-define("_AM_WFDOWNLOADS_PERM_FSELECTPERMISSIONS","Select the files that each group is allowed to view");
-
+define('_AM_WFDOWNLOADS_PERM_MANAGEMENT', "Permissions management");
+define('_AM_WFDOWNLOADS_PERM_PERMSNOTE', "Please be aware that even if you've set correct viewing permissions here, a group might not see the articles or blocks if you don't also grant that group permissions to access the module. To do that, go to <b>System admin > Groups</b>, choose the appropriate group and click the checkboxes to grant its members the access.");
+define('_AM_WFDOWNLOADS_PERM_CPERMISSIONS', "Category permissions");
+define('_AM_WFDOWNLOADS_PERM_CSELECTPERMISSIONS', "Select categories that each group is allowed to view");
+define('_AM_WFDOWNLOADS_PERM_CNOCATEGORY', "Cannot set permissions: No categories have been created yet!");
+define('_AM_WFDOWNLOADS_PERM_FPERMISSIONS', "File permissions");
+define('_AM_WFDOWNLOADS_PERM_FNOFILES', "Cannot set permissions: no files have been created yet!");
+define('_AM_WFDOWNLOADS_PERM_FSELECTPERMISSIONS', "Select the files that each group is allowed to view");
// Upload defines
-
-define("_AM_WFDOWNLOADS_DOWN_IMAGEUPLOAD","Image successfully uploaded to the server");
-define("_AM_WFDOWNLOADS_DOWN_NOIMAGEEXIST","Error: No file was selected for uploading. Please try again!");
-define("_AM_WFDOWNLOADS_DOWN_IMAGEEXIST","Image already exists in upload area!");
-define("_AM_WFDOWNLOADS_DOWN_FILEDELETED","File has been deleted.");
-define("_AM_WFDOWNLOADS_DOWN_FILEERRORDELETE","Error deleting file: file not found on the server.");
-define("_AM_WFDOWNLOADS_DOWN_NOFILEERROR","Error deleting file: No file selected for deleting.");
-define("_AM_WFDOWNLOADS_DOWN_DELETEFILE","WARNING: Are you sure you want to delete this image file?");
-define("_AM_WFDOWNLOADS_DOWN_IMAGEINFO","Server status");
-define("_AM_WFDOWNLOADS_DOWN_NOTSET","Upload path not set");
-define("_AM_WFDOWNLOADS_DOWN_SERVERPATH","Server path to XOOPS root: ");
-define("_AM_WFDOWNLOADS_DOWN_UPLOADPATH","Current upload path: ");
-define("_AM_WFDOWNLOADS_DOWN_UPLOADPATHDSC","Note. Upload path *MUST* contain the full server path of your upload folder.");
-define("_AM_WFDOWNLOADS_DOWN_SPHPINI","<b>Information taken from PHP ini file:</b>");
-define("_AM_WFDOWNLOADS_DOWN_METAVERSION","<b>Wfdownloads meta version:</b> ");
-define("_AM_WFDOWNLOADS_DOWN_SAFEMODESTATUS","Safe mode status: ");
-define("_AM_WFDOWNLOADS_DOWN_REGISTERGLOBALS","Register globals: ");
-define("_AM_WFDOWNLOADS_DOWN_SERVERUPLOADSTATUS","Server uploads status: ");
-define("_AM_WFDOWNLOADS_DOWN_MAXUPLOADSIZE","Max upload size permitted: ");
-define("_AM_WFDOWNLOADS_DOWN_MAXPOSTSIZE","Max post size permitted: ");
-define("_AM_WFDOWNLOADS_DOWN_SAFEMODEPROBLEMS"," (This may cause problems)");
-define("_AM_WFDOWNLOADS_DOWN_GDLIBSTATUS","GD library support: ");
-define("_AM_WFDOWNLOADS_DOWN_GDLIBVERSION","GD Library version: ");
-define("_AM_WFDOWNLOADS_DOWN_GDON","<b>Enabled</b> (Thumbsnails available)");
-define("_AM_WFDOWNLOADS_DOWN_GDOFF","<b>Disabled</b> (No thumbnails available)");
-define("_AM_WFDOWNLOADS_DOWN_OFF","<b>OFF</b>");
-define("_AM_WFDOWNLOADS_DOWN_ON","<b>ON</b>");
-define("_AM_WFDOWNLOADS_DOWN_CATIMAGE","Category images");
-define("_AM_WFDOWNLOADS_DOWN_SCREENSHOTS","Screenshot images");
-define("_AM_WFDOWNLOADS_DOWN_MAINIMAGEDIR","Main images");
-define("_AM_WFDOWNLOADS_DOWN_FCATIMAGE","Category image path");
-define("_AM_WFDOWNLOADS_DOWN_FSCREENSHOTS","Screenshot image path");
-define("_AM_WFDOWNLOADS_DOWN_FMAINIMAGEDIR","Main image path");
-define("_AM_WFDOWNLOADS_DOWN_FUPLOADIMAGETO","Upload image: ");
-define("_AM_WFDOWNLOADS_DOWN_FUPLOADPATH","Upload path");
-define("_AM_WFDOWNLOADS_DOWN_FUPLOADURL","Upload URL");
-define("_AM_WFDOWNLOADS_DOWN_FOLDERSELECTION","Select upload destination");
-define("_AM_WFDOWNLOADS_DOWN_FSHOWSELECTEDIMAGE","Display selected image");
-define("_AM_WFDOWNLOADS_DOWN_FUPLOADIMAGE","Upload new image to selected destination");
-
+define('_AM_WFDOWNLOADS_DOWN_IMAGEUPLOAD', "Image successfully uploaded to the server");
+define('_AM_WFDOWNLOADS_DOWN_NOIMAGEEXIST', "Error: No file was selected for uploading. Please try again!");
+define('_AM_WFDOWNLOADS_DOWN_IMAGEEXIST', "Image already exists in upload area!");
+define('_AM_WFDOWNLOADS_DOWN_FILEDELETED', "File has been deleted.");
+define('_AM_WFDOWNLOADS_DOWN_FILEERRORDELETE', "Error deleting file: file not found on the server.");
+define('_AM_WFDOWNLOADS_DOWN_NOFILEERROR', "Error deleting file: No file selected for deleting.");
+define('_AM_WFDOWNLOADS_DOWN_DELETEFILE', "WARNING: Are you sure you want to delete this image file?");
+define('_AM_WFDOWNLOADS_DOWN_IMAGEINFO', "Server status");
+define('_AM_WFDOWNLOADS_DOWN_NOTSET', "Upload path not set");
+define('_AM_WFDOWNLOADS_DOWN_SERVERPATH', "Server path to XOOPS root: ");
+define('_AM_WFDOWNLOADS_DOWN_UPLOADPATH', "Current upload path: ");
+define('_AM_WFDOWNLOADS_DOWN_UPLOADPATHDSC', "Note. Upload path *MUST* contain the full server path of your upload folder.");
+define('_AM_WFDOWNLOADS_DOWN_SPHPINI', "<b>Information taken from PHP ini file:</b>");
+define('_AM_WFDOWNLOADS_DOWN_METAVERSION', "<b>Wfdownloads meta version:</b> ");
+define('_AM_WFDOWNLOADS_DOWN_SAFEMODESTATUS', "Safe mode status: ");
+define('_AM_WFDOWNLOADS_DOWN_REGISTERGLOBALS', "Register globals: ");
+define('_AM_WFDOWNLOADS_DOWN_SERVERUPLOADSTATUS', "Server uploads status: ");
+define('_AM_WFDOWNLOADS_DOWN_MAXUPLOADSIZE', "Max upload size permitted: ");
+define('_AM_WFDOWNLOADS_DOWN_MAXPOSTSIZE', "Max post size permitted: ");
+define('_AM_WFDOWNLOADS_DOWN_SAFEMODEPROBLEMS', " (This may cause problems)");
+define('_AM_WFDOWNLOADS_DOWN_GDLIBSTATUS', "GD library support: ");
+define('_AM_WFDOWNLOADS_DOWN_GDLIBVERSION', "GD Library version: ");
+define('_AM_WFDOWNLOADS_DOWN_GDON', "<b>Enabled</b> (Thumbsnails available)");
+define('_AM_WFDOWNLOADS_DOWN_GDOFF', "<b>Disabled</b> (No thumbnails available)");
+define('_AM_WFDOWNLOADS_DOWN_OFF', "<b>OFF</b>");
+define('_AM_WFDOWNLOADS_DOWN_ON', "<b>ON</b>");
+define('_AM_WFDOWNLOADS_DOWN_CATIMAGE', "Category images");
+define('_AM_WFDOWNLOADS_DOWN_SCREENSHOTS', "Screenshot images");
+define('_AM_WFDOWNLOADS_DOWN_MAINIMAGEDIR', "Main images");
+define('_AM_WFDOWNLOADS_DOWN_FCATIMAGE', "Category image path");
+define('_AM_WFDOWNLOADS_DOWN_FSCREENSHOTS', "Screenshot image path");
+define('_AM_WFDOWNLOADS_DOWN_FMAINIMAGEDIR', "Main image path");
+define('_AM_WFDOWNLOADS_DOWN_FUPLOADIMAGETO', "Upload image: ");
+define('_AM_WFDOWNLOADS_DOWN_FUPLOADPATH', "Upload path");
+define('_AM_WFDOWNLOADS_DOWN_FUPLOADURL', "Upload URL");
+define('_AM_WFDOWNLOADS_DOWN_FOLDERSELECTION', "Select upload destination");
+define('_AM_WFDOWNLOADS_DOWN_FSHOWSELECTEDIMAGE', "Display selected image");
+define('_AM_WFDOWNLOADS_DOWN_FUPLOADIMAGE', "Upload new image to selected destination");
// Main Index defines
-define("_AM_WFDOWNLOADS_MINDEX_DOWNSUMMARY","Module admin summary");
-define("_AM_WFDOWNLOADS_MINDEX_PUBLISHEDDOWN","Published downloads");
-define("_AM_WFDOWNLOADS_MINDEX_AUTOPUBLISHEDDOWN","Auto published downloads");
-define("_AM_WFDOWNLOADS_MINDEX_AUTOEXPIRE","Auto expire downloads");
-define("_AM_WFDOWNLOADS_MINDEX_OFFLINEDOWN","Offline downloads");
-define("_AM_WFDOWNLOADS_MINDEX_ID","ID");
-define("_AM_WFDOWNLOADS_MINDEX_TITLE","Download title");
-define("_AM_WFDOWNLOADS_MINDEX_POSTER","Poster");
-define("_AM_WFDOWNLOADS_MINDEX_SUBMITTED","Submission date");
-define("_AM_WFDOWNLOADS_MINDEX_ONLINESTATUS","Online status");
-define("_AM_WFDOWNLOADS_MINDEX_PUBLISHED","Published");
-define("_AM_WFDOWNLOADS_MINDEX_ACTION","Action");
-define("_AM_WFDOWNLOADS_MINDEX_NODOWNLOADSFOUND","NOTICE: there are no downloads that match these criteria");
-define("_AM_WFDOWNLOADS_MINDEX_PAGE","<b>Page:<b> ");
-define('_AM_WFDOWNLOADS_MINDEX_PAGEINFOTXT','<ul><li>Wfdownloads main page details.</li><li>You can easily change the image logo, heading, main index header and footer text to suit your own look</li></ul><br /><br />Note: The Logo image chosen will be used throughout Wfdownloads.');
-
+define('_AM_WFDOWNLOADS_MINDEX_DOWNSUMMARY', "Module admin summary");
+define('_AM_WFDOWNLOADS_MINDEX_PUBLISHEDDOWN', "Published downloads");
+define('_AM_WFDOWNLOADS_MINDEX_AUTOPUBLISHEDDOWN', "Auto published downloads");
+define('_AM_WFDOWNLOADS_MINDEX_AUTOEXPIRE', "Auto expire downloads");
+define('_AM_WFDOWNLOADS_MINDEX_OFFLINEDOWN', "Offline downloads");
+define('_AM_WFDOWNLOADS_MINDEX_ID', "ID");
+define('_AM_WFDOWNLOADS_MINDEX_TITLE', "Download title");
+define('_AM_WFDOWNLOADS_MINDEX_POSTER', "Poster");
+define('_AM_WFDOWNLOADS_MINDEX_SUBMITTED', "Submission date");
+define('_AM_WFDOWNLOADS_MINDEX_ONLINESTATUS', "Online status");
+define('_AM_WFDOWNLOADS_MINDEX_PUBLISHED', "Published");
+define('_AM_WFDOWNLOADS_MINDEX_ACTION', "Action");
+define('_AM_WFDOWNLOADS_MINDEX_NODOWNLOADSFOUND', "NOTICE: there are no downloads that match these criteria");
+define('_AM_WFDOWNLOADS_MINDEX_PAGE', "<b>Page:<b> ");
+define('_AM_WFDOWNLOADS_MINDEX_PAGEINFOTXT', "<ul><li>Wfdownloads main page details.</li><li>You can easily change the image logo, heading, main index header and footer text to suit your own look</li></ul><br /><br />Note: The Logo image chosen will be used throughout Wfdownloads.");
// Submitted Files
-define("_AM_WFDOWNLOADS_SUB_SUBMITTEDFILES","Submitted files");
-define("_AM_WFDOWNLOADS_SUB_FILESWAITINGINFO","Waiting files information");
-define("_AM_WFDOWNLOADS_SUB_FILESWAITINGVALIDATION","Files waiting for validation: ");
-define("_AM_WFDOWNLOADS_SUB_APPROVEWAITINGFILE","<b>Approve</b> new file information without validation.");
-define("_AM_WFDOWNLOADS_SUB_EDITWAITINGFILE","<b>Edit</b> new file information and then approve.");
-define("_AM_WFDOWNLOADS_SUB_DELETEWAITINGFILE","<b>Delete</b> the new file information.");
-define("_AM_WFDOWNLOADS_SUB_NOFILESWAITING","There are no files that match these criteria");
-define("_AM_WFDOWNLOADS_SUB_NEWFILECREATED","New file data created and database updated successfully");
-
+define('_AM_WFDOWNLOADS_SUB_SUBMITTEDFILES', "Submitted files");
+define('_AM_WFDOWNLOADS_SUB_FILESWAITINGINFO', "Waiting files information");
+define('_AM_WFDOWNLOADS_SUB_FILESWAITINGVALIDATION', "Files waiting for validation: ");
+define('_AM_WFDOWNLOADS_SUB_APPROVEWAITINGFILE', "<b>Approve</b> new file information without validation.");
+define('_AM_WFDOWNLOADS_SUB_EDITWAITINGFILE', "<b>Edit</b> new file information and then approve.");
+define('_AM_WFDOWNLOADS_SUB_DELETEWAITINGFILE', "<b>Delete</b> the new file information.");
+define('_AM_WFDOWNLOADS_SUB_NOFILESWAITING', "There are no files that match these criteria");
+define('_AM_WFDOWNLOADS_SUB_NEWFILECREATED', "New file data created and database updated successfully");
// Mime types
-define("_AM_WFDOWNLOADS_MIME_ID","ID");
-define("_AM_WFDOWNLOADS_MIME_EXT","EXT");
-define("_AM_WFDOWNLOADS_MIME_NAME","Application type");
-define("_AM_WFDOWNLOADS_MIME_ADMIN","Admin");
-define("_AM_WFDOWNLOADS_MIME_USER","User");
+define('_AM_WFDOWNLOADS_MIME_ID', "ID");
+define('_AM_WFDOWNLOADS_MIME_EXT', "EXT");
+define('_AM_WFDOWNLOADS_MIME_NAME', "Application type");
+define('_AM_WFDOWNLOADS_MIME_ADMIN', "Admin");
+define('_AM_WFDOWNLOADS_MIME_USER', "User");
// Mime type Form
-define("_AM_WFDOWNLOADS_MIME_CREATEF","Create MIME type");
-define("_AM_WFDOWNLOADS_MIME_MODIFYF","Modify MIME type");
-define("_AM_WFDOWNLOADS_MIME_EXTF","File extension");
-define("_AM_WFDOWNLOADS_MIME_NAMEF","Application type/name");
-define("_AM_WFDOWNLOADS_MIME_TYPEF","MIME types");
-define("_AM_WFDOWNLOADS_MIME_ADMINF","Allowed admin MIME types/extension");
-define("_AM_WFDOWNLOADS_MIME_ADMINFINFO","<b>MIME types/extensions that are available for admin uploads</b>");
-define("_AM_WFDOWNLOADS_MIME_USERF","Allowed user MIME types/extensions");
-define("_AM_WFDOWNLOADS_MIME_USERFINFO","<b>MIME types/extensions that are available for user uploads</b>");
-define("_AM_WFDOWNLOADS_MIME_NOMIMEINFO","No MIME types selected");
-define("_AM_WFDOWNLOADS_MIME_FINDMIMETYPE","Find MIME type information");
-define("_AM_WFDOWNLOADS_MIME_EXTFIND","Search file extension");
-define("_AM_WFDOWNLOADS_MIME_INFOTEXT","<ul><li>New MIME types can be created, edited or deleted easily via this form</li>
+define('_AM_WFDOWNLOADS_MIME_CREATEF', "Create MIME type");
+define('_AM_WFDOWNLOADS_MIME_MODIFYF', "Modify MIME type");
+define('_AM_WFDOWNLOADS_MIME_EXTF', "File extension");
+define('_AM_WFDOWNLOADS_MIME_NAMEF', "Application type/name");
+define('_AM_WFDOWNLOADS_MIME_TYPEF', "MIME types");
+define('_AM_WFDOWNLOADS_MIME_ADMINF', "Allowed admin MIME types/extension");
+define('_AM_WFDOWNLOADS_MIME_ADMINFINFO', "<b>MIME types/extensions that are available for admin uploads</b>");
+define('_AM_WFDOWNLOADS_MIME_USERF', "Allowed user MIME types/extensions");
+define('_AM_WFDOWNLOADS_MIME_USERFINFO', "<b>MIME types/extensions that are available for user uploads</b>");
+define('_AM_WFDOWNLOADS_MIME_NOMIMEINFO', "No MIME types selected");
+define('_AM_WFDOWNLOADS_MIME_FINDMIMETYPE', "Find MIME type information");
+define('_AM_WFDOWNLOADS_MIME_EXTFIND', "Search file extension");
+define('_AM_WFDOWNLOADS_MIME_INFOTEXT', "<ul><li>New MIME types can be created, edited or deleted easily via this form</li>
<li>Looking for a new MIME type via an external website.</li>
<li>View displayed MIME types for Admin and user uploads.</li>
<li>Change MIME type upload status.</li></ul>
");
// Mime type Buttons
-define("_AM_WFDOWNLOADS_MIME_CREATE","Create");
-define("_AM_WFDOWNLOADS_MIME_CLEAR","Reset");
-define("_AM_WFDOWNLOADS_MIME_CANCEL","Cancel");
-define("_AM_WFDOWNLOADS_MIME_MODIFY","Modify");
-define("_AM_WFDOWNLOADS_MIME_DELETE","Delete");
-define("_AM_WFDOWNLOADS_MIME_FINDIT","Get extension!");
+define('_AM_WFDOWNLOADS_MIME_CREATE', "Create");
+define('_AM_WFDOWNLOADS_MIME_CLEAR', "Reset");
+define('_AM_WFDOWNLOADS_MIME_CANCEL', "Cancel");
+define('_AM_WFDOWNLOADS_MIME_MODIFY', "Modify");
+define('_AM_WFDOWNLOADS_MIME_DELETE', "Delete");
+define('_AM_WFDOWNLOADS_MIME_FINDIT', "Get extension!");
// Mime type Database
-define("_AM_WFDOWNLOADS_MIME_DELETETHIS","Delete selected MIME type?");
-define("_AM_WFDOWNLOADS_MIME_MIMEDELETED","MIME type %s has been deleted");
-define("_AM_WFDOWNLOADS_MIME_CREATED","MIME type information created");
-define("_AM_WFDOWNLOADS_MIME_MODIFIED","MIME type information modified");
+define('_AM_WFDOWNLOADS_MIME_DELETETHIS', "Delete selected MIME type?");
+define('_AM_WFDOWNLOADS_MIME_MIMEDELETED', "MIME type %s has been deleted");
+define('_AM_WFDOWNLOADS_MIME_CREATED', "MIME type information created");
+define('_AM_WFDOWNLOADS_MIME_MODIFIED', "MIME type information modified");
// Vote Information
-define("_AM_WFDOWNLOADS_VOTE_RATINGINFOMATION","Voting information");
-define("_AM_WFDOWNLOADS_VOTE_TOTALVOTES","Total votes: ");
-define("_AM_WFDOWNLOADS_VOTE_REGUSERVOTES","Registered user votes: %s");
-define("_AM_WFDOWNLOADS_VOTE_ANONUSERVOTES","Anonymous user votes: %s");
-define("_AM_WFDOWNLOADS_VOTE_USER","User");
-define("_AM_WFDOWNLOADS_VOTE_IP","IP address");
-define("_AM_WFDOWNLOADS_VOTE_USERAVG","Average user rating");
-define("_AM_WFDOWNLOADS_VOTE_TOTALRATE","Total ratings");
-define("_AM_WFDOWNLOADS_VOTE_DATE","Submitted");
-define("_AM_WFDOWNLOADS_VOTE_RATING","Rating");
-define("_AM_WFDOWNLOADS_VOTE_NOREGVOTES","No registered user votes");
-define("_AM_WFDOWNLOADS_VOTE_NOUNREGVOTES","No unregistered user votes");
-define("_AM_WFDOWNLOADS_VOTE_VOTEDELETED","Vote data deleted.");
-define("_AM_WFDOWNLOADS_VOTE_ID","ID");
-define("_AM_WFDOWNLOADS_VOTE_FILETITLE","File title");
-define("_AM_WFDOWNLOADS_VOTE_DISPLAYVOTES","Voting data information");
-define("_AM_WFDOWNLOADS_VOTE_NOVOTES","No User Votes to display");
-define("_AM_WFDOWNLOADS_VOTE_DELETE","No User Votes to display");
-define("_AM_WFDOWNLOADS_VOTE_DELETEDSC","<b>Deletes</b> the chosen vote information from the database.");
-
+define('_AM_WFDOWNLOADS_VOTE_RATINGINFOMATION', "Voting information");
+define('_AM_WFDOWNLOADS_VOTE_TOTALVOTES', "Total votes: ");
+define('_AM_WFDOWNLOADS_VOTE_REGUSERVOTES', "Registered user votes: %s");
+define('_AM_WFDOWNLOADS_VOTE_ANONUSERVOTES', "Anonymous user votes: %s");
+define('_AM_WFDOWNLOADS_VOTE_USER', "User");
+define('_AM_WFDOWNLOADS_VOTE_IP', "IP address");
+define('_AM_WFDOWNLOADS_VOTE_USERAVG', "Average user rating");
+define('_AM_WFDOWNLOADS_VOTE_TOTALRATE', "Total ratings");
+define('_AM_WFDOWNLOADS_VOTE_DATE', "Submitted");
+define('_AM_WFDOWNLOADS_VOTE_RATING', "Rating");
+define('_AM_WFDOWNLOADS_VOTE_NOREGVOTES', "No registered user votes");
+define('_AM_WFDOWNLOADS_VOTE_NOUNREGVOTES', "No unregistered user votes");
+define('_AM_WFDOWNLOADS_VOTE_VOTEDELETED', "Vote data deleted.");
+define('_AM_WFDOWNLOADS_VOTE_ID', "ID");
+define('_AM_WFDOWNLOADS_VOTE_FILETITLE', "File title");
+define('_AM_WFDOWNLOADS_VOTE_DISPLAYVOTES', "Voting data information");
+define('_AM_WFDOWNLOADS_VOTE_NOVOTES', "No User Votes to display");
+define('_AM_WFDOWNLOADS_VOTE_DELETE', "No User Votes to display");
+define('_AM_WFDOWNLOADS_VOTE_DELETEDSC', "<b>Deletes</b> the chosen vote information from the database.");
// Modifications
/*
-define("_AM_WFDOWNLOADS_MOD_TOTMODREQUESTS","Total modification requests: ");
-define("_AM_WFDOWNLOADS_MOD_MODREQUESTS","Modified files");
-define("_AM_WFDOWNLOADS_MOD_MODREQUESTSINFO","Modified files information");
-define("_AM_WFDOWNLOADS_MOD_MODID","ID");
-define("_AM_WFDOWNLOADS_MOD_MODTITLE","Title");
-define("_AM_WFDOWNLOADS_MOD_MODPOSTER","Original poster: ");
-define("_AM_WFDOWNLOADS_MOD_DATE","Submitted");
-define("_AM_WFDOWNLOADS_MOD_NOMODREQUEST","There are no requests that match these criteria");
-define("_AM_WFDOWNLOADS_MOD_MODIFYSUBMIT","Submitter");
-define("_AM_WFDOWNLOADS_MOD_ORIGINAL","Orginal download details");
-define("_AM_WFDOWNLOADS_MOD_REQDELETED","Modification request removed from the database");
-define("_AM_WFDOWNLOADS_MOD_REQUPDATED","Selected download modified and database updated successfully");
-
+define('_AM_WFDOWNLOADS_MOD_TOTMODREQUESTS', "Total modification requests: ");
+define('_AM_WFDOWNLOADS_MOD_MODREQUESTS', "Modified files");
+define('_AM_WFDOWNLOADS_MOD_MODREQUESTSINFO', "Modified files information");
+define('_AM_WFDOWNLOADS_MOD_MODID', "ID");
+define('_AM_WFDOWNLOADS_MOD_MODTITLE', "Title");
+define('_AM_WFDOWNLOADS_MOD_MODPOSTER', "Original poster: ");
+define('_AM_WFDOWNLOADS_MOD_DATE', "Submitted");
+define('_AM_WFDOWNLOADS_MOD_NOMODREQUEST', "There are no requests that match these criteria");
+define('_AM_WFDOWNLOADS_MOD_MODIFYSUBMIT', "Submitter");
+define('_AM_WFDOWNLOADS_MOD_ORIGINAL', "Orginal download details");
+define('_AM_WFDOWNLOADS_MOD_REQDELETED', "Modification request removed from the database");
+define('_AM_WFDOWNLOADS_MOD_REQUPDATED', "Selected download modified and database updated successfully");
*/
-define("_AM_WFDOWNLOADS_MOD_TOTMODREQUESTS","Modifications waiting");
-define("_AM_WFDOWNLOADS_MOD_MODREQUESTS","Modified files");
-define("_AM_WFDOWNLOADS_MOD_MODREQUESTSINFO","Modifications information");
-define("_AM_WFDOWNLOADS_MOD_MODID","ID");
-define("_AM_WFDOWNLOADS_MOD_MODTITLE","Title");
-define("_AM_WFDOWNLOADS_MOD_MODPOSTER","Original poster: ");
-define("_AM_WFDOWNLOADS_MOD_DATE","Submitted");
-define("_AM_WFDOWNLOADS_MOD_NOMODREQUEST","There are no requests that match these criteria");
-define("_AM_WFDOWNLOADS_MOD_TITLE","Download title");
-define("_AM_WFDOWNLOADS_MOD_LID","Download ID");
-define("_AM_WFDOWNLOADS_MOD_CID","Category");
-define("_AM_WFDOWNLOADS_MOD_URL","Remote Url");
-define("_AM_WFDOWNLOADS_MOD_MIRROR","Download mirror");
-define("_AM_WFDOWNLOADS_MOD_SIZE","Download size");
-define("_AM_WFDOWNLOADS_MOD_PUBLISHER","Publisher");
-define("_AM_WFDOWNLOADS_MOD_LICENSE","Software licence");
-define("_AM_WFDOWNLOADS_MOD_FEATURES","Key features");
-define("_AM_WFDOWNLOADS_MOD_FORUMID","Forum");
-define("_AM_WFDOWNLOADS_MOD_LIMITATIONS","Software limitations");
-define("_AM_WFDOWNLOADS_MOD_VERSIONTYPES","Release status");
-define("_AM_WFDOWNLOADS_MOD_DHISTORY","Download history");
-define("_AM_WFDOWNLOADS_MOD_SCREENSHOT","Screenshot image");
-define("_AM_WFDOWNLOADS_MOD_SCREENSHOT2","Screenshot 2");
-define("_AM_WFDOWNLOADS_MOD_SCREENSHOT3","Screenshot 3");
-define("_AM_WFDOWNLOADS_MOD_SCREENSHOT4","Screenshot 4");
-define("_AM_WFDOWNLOADS_MOD_HOMEPAGE","Home Page");
-define("_AM_WFDOWNLOADS_MOD_HOMEPAGETITLE","Home page title");
-define("_AM_WFDOWNLOADS_MOD_VERSION","Version");
-define("_AM_WFDOWNLOADS_MOD_SHOTIMAGE","Screenshot image");
-define("_AM_WFDOWNLOADS_MOD_FILESIZE","File size");
-define("_AM_WFDOWNLOADS_MOD_PLATFORM","Software platform");
-define("_AM_WFDOWNLOADS_MOD_PRICE","Price");
-define("_AM_WFDOWNLOADS_MOD_LICENCE","Software licence");
-define("_AM_WFDOWNLOADS_MOD_DESCRIPTION","Description");
-define("_AM_WFDOWNLOADS_MOD_REQUIREMENTS","Requirements");
-define("_AM_WFDOWNLOADS_MOD_MODIFYSUBMITTER","Submitter");
-define("_AM_WFDOWNLOADS_MOD_MODIFYSUBMIT","Submitter");
-define("_AM_WFDOWNLOADS_MOD_PROPOSED","Proposed download details");
-define("_AM_WFDOWNLOADS_MOD_ORIGINAL","Original download details");
-define("_AM_WFDOWNLOADS_MOD_REQDELETED","Modification request removed from the database");
-define("_AM_WFDOWNLOADS_MOD_REQUPDATED","Selected download Modified and database updated successfully");
-define("_AM_WFDOWNLOADS_MOD_VIEW","View");
-define("_AM_WFDOWNLOADS_MOD_FILENAME","Local file name: ");
-define("_AM_WFDOWNLOADS_MOD_FILETYPE","Local file type: ");
-define("_AM_WFDOWNLOADS_MOD_STATUS","Status: ");
-define("_AM_WFDOWNLOADS_MOD_RATING","Rating: ");
-define("_AM_WFDOWNLOADS_MOD_HITS","Hits: ");
-define("_AM_WFDOWNLOADS_MOD_VOTES","Votes: ");
-define("_AM_WFDOWNLOADS_MOD_COMMENTS","Comments: ");
-define("_AM_WFDOWNLOADS_MOD_PUBLISHED","Published: ");
-define("_AM_WFDOWNLOADS_MOD_EXPIRED","Expired: ");
-define("_AM_WFDOWNLOADS_MOD_UPDATED","Updated: ");
-define("_AM_WFDOWNLOADS_MOD_OFFLINE","Offline: ");
-define("_AM_WFDOWNLOADS_MOD_REQUESTDATE","Request date: ");
-define("_AM_WFDOWNLOADS_MOD_IPADDRESS","IP address: ");
-define("_AM_WFDOWNLOADS_MOD_NOTIFYPUB","Notify: ");
-define("_AM_WFDOWNLOADS_MOD_PAYPALEMAIL","PayPal email: ");
-define("_AM_WFDOWNLOADS_MOD_SUMMARY","Summary: ");
-
+define('_AM_WFDOWNLOADS_MOD_TOTMODREQUESTS', "Modifications waiting");
+define('_AM_WFDOWNLOADS_MOD_MODREQUESTS', "Modified files");
+define('_AM_WFDOWNLOADS_MOD_MODREQUESTSINFO', "Modifications information");
+define('_AM_WFDOWNLOADS_MOD_MODID', "ID");
+define('_AM_WFDOWNLOADS_MOD_MODTITLE', "Title");
+define('_AM_WFDOWNLOADS_MOD_MODPOSTER', "Original poster: ");
+define('_AM_WFDOWNLOADS_MOD_DATE', "Submitted");
+define('_AM_WFDOWNLOADS_MOD_NOMODREQUEST', "There are no requests that match these criteria");
+define('_AM_WFDOWNLOADS_MOD_TITLE', "Download title");
+define('_AM_WFDOWNLOADS_MOD_LID', "Download ID");
+define('_AM_WFDOWNLOADS_MOD_CID', "Category");
+define('_AM_WFDOWNLOADS_MOD_URL', "Remote Url");
+define('_AM_WFDOWNLOADS_MOD_MIRROR', "Download mirror");
+define('_AM_WFDOWNLOADS_MOD_SIZE', "Download size");
+define('_AM_WFDOWNLOADS_MOD_PUBLISHER', "Publisher");
+define('_AM_WFDOWNLOADS_MOD_LICENSE', "Software licence");
+define('_AM_WFDOWNLOADS_MOD_FEATURES', "Key features");
+define('_AM_WFDOWNLOADS_MOD_FORUMID', "Forum");
+define('_AM_WFDOWNLOADS_MOD_LIMITATIONS', "Software limitations");
+define('_AM_WFDOWNLOADS_MOD_VERSIONTYPES', "Release status");
+define('_AM_WFDOWNLOADS_MOD_DHISTORY', "Download history");
+define('_AM_WFDOWNLOADS_MOD_SCREENSHOT', "Screenshot image");
+define('_AM_WFDOWNLOADS_MOD_SCREENSHOT2', "Screenshot 2");
+define('_AM_WFDOWNLOADS_MOD_SCREENSHOT3', "Screenshot 3");
+define('_AM_WFDOWNLOADS_MOD_SCREENSHOT4', "Screenshot 4");
+define('_AM_WFDOWNLOADS_MOD_HOMEPAGE', "Home Page");
+define('_AM_WFDOWNLOADS_MOD_HOMEPAGETITLE', "Home page title");
+define('_AM_WFDOWNLOADS_MOD_VERSION', "Version");
+define('_AM_WFDOWNLOADS_MOD_SHOTIMAGE', "Screenshot image");
+define('_AM_WFDOWNLOADS_MOD_FILESIZE', "File size");
+define('_AM_WFDOWNLOADS_MOD_PLATFORM', "Software platform");
+define('_AM_WFDOWNLOADS_MOD_PRICE', "Price");
+define('_AM_WFDOWNLOADS_MOD_LICENCE', "Software licence");
+define('_AM_WFDOWNLOADS_MOD_DESCRIPTION', "Description");
+define('_AM_WFDOWNLOADS_MOD_REQUIREMENTS', "Requirements");
+define('_AM_WFDOWNLOADS_MOD_MODIFYSUBMITTER', "Submitter");
+define('_AM_WFDOWNLOADS_MOD_MODIFYSUBMIT', "Submitter");
+define('_AM_WFDOWNLOADS_MOD_PROPOSED', "Proposed download details");
+define('_AM_WFDOWNLOADS_MOD_ORIGINAL', "Original download details");
+define('_AM_WFDOWNLOADS_MOD_REQDELETED', "Modification request removed from the database");
+define('_AM_WFDOWNLOADS_MOD_REQUPDATED', "Selected download Modified and database updated successfully");
+define('_AM_WFDOWNLOADS_MOD_VIEW', "View");
+define('_AM_WFDOWNLOADS_MOD_FILENAME', "Local file name: ");
+define('_AM_WFDOWNLOADS_MOD_FILETYPE', "Local file type: ");
+define('_AM_WFDOWNLOADS_MOD_STATUS', "Status: ");
+define('_AM_WFDOWNLOADS_MOD_RATING', "Rating: ");
+define('_AM_WFDOWNLOADS_MOD_HITS', "Hits: ");
+define('_AM_WFDOWNLOADS_MOD_VOTES', "Votes: ");
+define('_AM_WFDOWNLOADS_MOD_COMMENTS', "Comments: ");
+define('_AM_WFDOWNLOADS_MOD_PUBLISHED', "Published: ");
+define('_AM_WFDOWNLOADS_MOD_EXPIRED', "Expired: ");
+define('_AM_WFDOWNLOADS_MOD_UPDATED', "Updated: ");
+define('_AM_WFDOWNLOADS_MOD_OFFLINE', "Offline: ");
+define('_AM_WFDOWNLOADS_MOD_REQUESTDATE', "Request date: ");
+define('_AM_WFDOWNLOADS_MOD_IPADDRESS', "IP address: ");
+define('_AM_WFDOWNLOADS_MOD_NOTIFYPUB', "Notify: ");
+define('_AM_WFDOWNLOADS_MOD_PAYPALEMAIL', "PayPal email: ");
+define('_AM_WFDOWNLOADS_MOD_SUMMARY', "Summary: ");
//Reviews defines
-define("_AM_WFDOWNLOADS_REV_SNEWMNAMEDESC","Approve review");
-define("_AM_WFDOWNLOADS_REV_ID","ID");
-define("_AM_WFDOWNLOADS_REV_TITLE","Download title");
-define("_AM_WFDOWNLOADS_REV_REVIEWTITLE","Review title");
-define("_AM_WFDOWNLOADS_REV_POSTER","Reviewer");
-define("_AM_WFDOWNLOADS_REV_SUBMITDATE","Date");
-define("_AM_WFDOWNLOADS_REV_FTITLE","Review title");
-define("_AM_WFDOWNLOADS_REV_FRATING","Review rating");
-define("_AM_WFDOWNLOADS_REV_FDESCRIPTION","Review description");
-define("_AM_WFDOWNLOADS_REV_FAPPROVE","Review approve");
-define("_AM_WFDOWNLOADS_REV_ACTION","Action");
-define("_AM_WFDOWNLOADS_REV_NOWAITINGREVIEWS","No waiting reviews found");
-define("_AM_WFDOWNLOADS_REVIEW_APPROVETHIS","Approve review");
-define("_AM_WFDOWNLOADS_REV_NOPUBLISHEDREVIEWS","No published reviews found");
-define("_AM_WFDOWNLOADS_REV_REVIEW_UPDATED","Selected review modified and database updated successfully");
-define("_AM_WFDOWNLOADS_REV_REVIEW_TOTAL","Total reviews");
-define("_AM_WFDOWNLOADS_REV_REVIEW_WAITING","Waiting reviews");
-define("_AM_WFDOWNLOADS_REV_REVIEW_PUBLISHED","Published reviews");
-
+define('_AM_WFDOWNLOADS_REV_SNEWMNAMEDESC', "Approve review");
+define('_AM_WFDOWNLOADS_REV_ID', "ID");
+define('_AM_WFDOWNLOADS_REV_TITLE', "Download title");
+define('_AM_WFDOWNLOADS_REV_REVIEWTITLE', "Review title");
+define('_AM_WFDOWNLOADS_REV_POSTER', "Reviewer");
+define('_AM_WFDOWNLOADS_REV_SUBMITDATE', "Date");
+define('_AM_WFDOWNLOADS_REV_FTITLE', "Review title");
+define('_AM_WFDOWNLOADS_REV_FRATING', "Review rating");
+define('_AM_WFDOWNLOADS_REV_FDESCRIPTION', "Review description");
+define('_AM_WFDOWNLOADS_REV_FAPPROVE', "Review approve");
+define('_AM_WFDOWNLOADS_REV_ACTION', "Action");
+define('_AM_WFDOWNLOADS_REV_NOWAITINGREVIEWS', "No waiting reviews found");
+define('_AM_WFDOWNLOADS_REVIEW_APPROVETHIS', "Approve review");
+define('_AM_WFDOWNLOADS_REV_NOPUBLISHEDREVIEWS', "No published reviews found");
+define('_AM_WFDOWNLOADS_REV_REVIEW_UPDATED', "Selected review modified and database updated successfully");
+define('_AM_WFDOWNLOADS_REV_REVIEW_TOTAL', "Total reviews");
+define('_AM_WFDOWNLOADS_REV_REVIEW_WAITING', "Waiting reviews");
+define('_AM_WFDOWNLOADS_REV_REVIEW_PUBLISHED', "Published reviews");
//File management
-define("_AM_WFDOWNLOADS_FILE_SUBMITTERID","Submitter user ID: <br /><br />Leave this as it is, unless you want to change who submitted the download");
-define("_AM_WFDOWNLOADS_FILE_ID","File ID");
-define("_AM_WFDOWNLOADS_FILE_IP","Uploader's IP address");
-define("_AM_WFDOWNLOADS_FILE_ALLOWEDAMIME","<div style='padding-top: 4px; padding-bottom: 4px;'><b>Allowed admin file extensions</b></div>");
-define("_AM_WFDOWNLOADS_FILE_MODIFYFILE","Modify file information");
-define("_AM_WFDOWNLOADS_FILE_CREATENEWFILE","Create new file");
-define("_AM_WFDOWNLOADS_FILE_TITLE","File title");
-define("_AM_WFDOWNLOADS_FILE_DLURL","Remote URL");
-define("_AM_WFDOWNLOADS_FILE_FILENAME","Local file name <br /><br /><span style='font-weight: normal;'>Note: if using local file as download, then you must also enter the correct file type below!</span>");
-define("_AM_WFDOWNLOADS_FILE_FILETYPE","File type");
-define("_AM_WFDOWNLOADS_FILE_MIRRORURL","File mirror");
-define("_AM_WFDOWNLOADS_FILE_SUMMARY","File summary");
-define("_AM_WFDOWNLOADS_FILE_DESCRIPTION","File description");
-define("_AM_WFDOWNLOADS_FILE_DUPLOAD"," Upload file");
-define("_AM_WFDOWNLOADS_FILE_CATEGORY","Select category");
-define("_AM_WFDOWNLOADS_FILE_HOMEPAGETITLE","Home page title");
-define("_AM_WFDOWNLOADS_FILE_HOMEPAGE","Home page");
-define("_AM_WFDOWNLOADS_FILE_SIZE","File size (in Bytes)");
-define("_AM_WFDOWNLOADS_FILE_VERSION","File version");
-define("_AM_WFDOWNLOADS_FILE_VERSIONTYPES","Release status");
-define("_AM_WFDOWNLOADS_FILE_PUBLISHER","File publisher");
-define("_AM_WFDOWNLOADS_FILE_PLATFORM","Software platform");
-define("_AM_WFDOWNLOADS_FILE_LICENCE","Software licence");
-define("_AM_WFDOWNLOADS_FILE_LIMITATIONS","Software limitations");
-define("_AM_WFDOWNLOADS_FILE_PRICE","Price");
-define("_AM_WFDOWNLOADS_FILE_KEYFEATURES","Key features <br /><br /><span style='font-weight: normal;'>Separate each key feature with a |</span>");
-define("_AM_WFDOWNLOADS_FILE_REQUIREMENTS","System requirements <br /><br /><span style='font-weight: normal;'>Separate each requirement with |</span>");
-define("_AM_WFDOWNLOADS_FILE_HISTORY","Download history edit <br /><br /><span style='font-weight: normal;'>Add new download history and only use this field to if you need to edit the previous history.</span>");
-define("_AM_WFDOWNLOADS_FILE_HISTORYD","Add new download history <br /><br /><span style='font-weight: normal;'>The version number and date will be added automatically</span>");
-define("_AM_WFDOWNLOADS_FILE_HISTORYVERS","<b>Version</b>");
-define("_AM_WFDOWNLOADS_FILE_HISTORDATE"," <b>Updated</b> ");
-define("_AM_WFDOWNLOADS_FILE_FILESSTATUS"," Set download offline <br /><br /><span style='font-weight: normal;'>Download will not be viewable to all users.</span>");
-define("_AM_WFDOWNLOADS_FILE_SETASUPDATED"," Set download status as updated <br /><br /><span style='font-weight: normal;'>Download will display updated icon.</span>");
-define("_AM_WFDOWNLOADS_FILE_SHOTIMAGE","Select screenshot image <br /><br /><span style='font-weight: normal;'>Note that screenshots will only be displayed if activated in module preferences.</span>");
-define("_AM_WFDOWNLOADS_FILE_DISCUSSINFORUM","Add discuss in this forum?");
-define("_AM_WFDOWNLOADS_FILE_PUBLISHDATE","Download publish date");
-define("_AM_WFDOWNLOADS_FILE_EXPIREDATE","Download expire date");
-define("_AM_WFDOWNLOADS_FILE_CLEARPUBLISHDATE","<br /><br />Remove publish date");
-define("_AM_WFDOWNLOADS_FILE_CLEAREXPIREDATE","<br /><br />Remove expire date");
-define("_AM_WFDOWNLOADS_FILE_PUBLISHDATESET"," Publish date set: ");
-define("_AM_WFDOWNLOADS_FILE_SETDATETIMEPUBLISH"," Set the date/time of publish");
-define("_AM_WFDOWNLOADS_FILE_SETDATETIMEEXPIRE"," Set the date/time of expire");
-define("_AM_WFDOWNLOADS_FILE_SETPUBLISHDATE","<b>Set publish date</b>");
-define("_AM_WFDOWNLOADS_FILE_SETNEWPUBLISHDATE","<b>Set new publish date:</b> <br />published");
-define("_AM_WFDOWNLOADS_FILE_SETPUBDATESETS","<b>Publish date set:</b> <br />publishes on date");
-define("_AM_WFDOWNLOADS_FILE_EXPIREDATESET"," Expire date set: ");
-define("_AM_WFDOWNLOADS_FILE_SETEXPIREDATE","<b>Set expire date</b>");
-define("_AM_WFDOWNLOADS_FILE_MUSTBEVALID","Screenshot image must be a valid image file under %s directory (ex. shot.gif). Leave it blank if there is no image file.");
-define("_AM_WFDOWNLOADS_FILE_EDITAPPROVE","Approve download:");
-define("_AM_WFDOWNLOADS_FILE_NEWFILEUPLOAD","New file created and database updated successfully");
-define("_AM_WFDOWNLOADS_FILE_FILEMODIFIEDUPDATE","Selected file modified and database updated successfully");
-define("_AM_WFDOWNLOADS_FILE_REALLYDELETEDTHIS","Are you sure to delete the selected file?");
-define("_AM_WFDOWNLOADS_FILE_FILEWASDELETED","File %s successfully deleted from the database!");
-define("_AM_WFDOWNLOADS_FILE_USE_UPLOAD_TITLE"," Use upload file name for file title.");
-define("_AM_WFDOWNLOADS_FILE_FILEAPPROVED","File approved and database updated successfully");
-define("_AM_WFDOWNLOADS_FILE_CREATENEWSSTORY","<b>Create news story from download</b>");
-define("_AM_WFDOWNLOADS_FILE_SUBMITNEWS","Submit new file as news item?");
-define("_AM_WFDOWNLOADS_FILE_NEWSCATEGORY","Select news category to submit news:");
-define("_AM_WFDOWNLOADS_FILE_NEWSTITLE","News title:<div style='padding-top: 4px; padding-bottom: 4px;'><span style='font-weight: normal;'>Leave blank to use file title</span></div>");
-
+define('_AM_WFDOWNLOADS_FILE_SUBMITTERID', "Submitter user ID: <br /><br />Leave this as it is, unless you want to change who submitted the download");
+define('_AM_WFDOWNLOADS_FILE_ID', "File ID");
+define('_AM_WFDOWNLOADS_FILE_IP', "Uploader's IP address");
+define('_AM_WFDOWNLOADS_FILE_ALLOWEDAMIME', "<div style='padding-top: 4px; padding-bottom: 4px;'><b>Allowed admin file extensions</b></div>");
+define('_AM_WFDOWNLOADS_FILE_MODIFYFILE', "Modify file information");
+define('_AM_WFDOWNLOADS_FILE_CREATENEWFILE', "Create new file");
+define('_AM_WFDOWNLOADS_FILE_TITLE', "File title");
+define('_AM_WFDOWNLOADS_FILE_DLURL', "Remote URL");
+define('_AM_WFDOWNLOADS_FILE_FILENAME', "Local file name <br /><br /><span style='font-weight: normal;'>Note: if using local file as download, then you must also enter the correct file type below!</span>");
+define('_AM_WFDOWNLOADS_FILE_FILETYPE', "File type");
+define('_AM_WFDOWNLOADS_FILE_MIRRORURL', "File mirror");
+define('_AM_WFDOWNLOADS_FILE_SUMMARY', "File summary");
+define('_AM_WFDOWNLOADS_FILE_DESCRIPTION', "File description");
+define('_AM_WFDOWNLOADS_FILE_DUPLOAD', " Upload file");
+define('_AM_WFDOWNLOADS_FILE_CATEGORY', "Select category");
+define('_AM_WFDOWNLOADS_FILE_HOMEPAGETITLE', "Home page title");
+define('_AM_WFDOWNLOADS_FILE_HOMEPAGE', "Home page");
+define('_AM_WFDOWNLOADS_FILE_SIZE', "File size (in Bytes)");
+define('_AM_WFDOWNLOADS_FILE_VERSION', "File version");
+define('_AM_WFDOWNLOADS_FILE_VERSIONTYPES', "Release status");
+define('_AM_WFDOWNLOADS_FILE_PUBLISHER', "File publisher");
+define('_AM_WFDOWNLOADS_FILE_PLATFORM', "Software platform");
+define('_AM_WFDOWNLOADS_FILE_LICENCE', "Software licence");
+define('_AM_WFDOWNLOADS_FILE_LIMITATIONS', "Software limitations");
+define('_AM_WFDOWNLOADS_FILE_PRICE', "Price");
+define('_AM_WFDOWNLOADS_FILE_KEYFEATURES', "Key features <br /><br /><span style='font-weight: normal;'>Separate each key feature with a |</span>");
+define('_AM_WFDOWNLOADS_FILE_REQUIREMENTS', "System requirements <br /><br /><span style='font-weight: normal;'>Separate each requirement with |</span>");
+define('_AM_WFDOWNLOADS_FILE_HISTORY', "Download history edit <br /><br /><span style='font-weight: normal;'>Add new download history and only use this field to if you need to edit the previous history.</span>");
+define('_AM_WFDOWNLOADS_FILE_HISTORYD', "Add new download history <br /><br /><span style='font-weight: normal;'>The version number and date will be added automatically</span>");
+define('_AM_WFDOWNLOADS_FILE_HISTORYVERS', "<b>Version</b>");
+define('_AM_WFDOWNLOADS_FILE_HISTORDATE', " <b>Updated</b> ");
+define('_AM_WFDOWNLOADS_FILE_FILESSTATUS', " Set download offline <br /><br /><span style='font-weight: normal;'>Download will not be viewable to all users.</span>");
+define('_AM_WFDOWNLOADS_FILE_SETASUPDATED', " Set download status as updated <br /><br /><span style='font-weight: normal;'>Download will display updated icon.</span>");
+define('_AM_WFDOWNLOADS_FILE_SHOTIMAGE', "Select screenshot image <br /><br /><span style='font-weight: normal;'>Note that screenshots will only be displayed if activated in module preferences.</span>");
+define('_AM_WFDOWNLOADS_FILE_DISCUSSINFORUM', "Add discuss in this forum?");
+define('_AM_WFDOWNLOADS_FILE_PUBLISHDATE', "Download publish date");
+define('_AM_WFDOWNLOADS_FILE_EXPIREDATE', "Download expire date");
+define('_AM_WFDOWNLOADS_FILE_CLEARPUBLISHDATE', "<br /><br />Remove publish date");
+define('_AM_WFDOWNLOADS_FILE_CLEAREXPIREDATE', "<br /><br />Remove expire date");
+define('_AM_WFDOWNLOADS_FILE_PUBLISHDATESET', " Publish date set: ");
+define('_AM_WFDOWNLOADS_FILE_SETDATETIMEPUBLISH', " Set the date/time of publish");
+define('_AM_WFDOWNLOADS_FILE_SETDATETIMEEXPIRE', " Set the date/time of expire");
+define('_AM_WFDOWNLOADS_FILE_SETPUBLISHDATE', "<b>Set publish date</b>");
+define('_AM_WFDOWNLOADS_FILE_SETNEWPUBLISHDATE', "<b>Set new publish date:</b> <br />published");
+define('_AM_WFDOWNLOADS_FILE_SETPUBDATESETS', "<b>Publish date set:</b> <br />publishes on date");
+define('_AM_WFDOWNLOADS_FILE_EXPIREDATESET', " Expire date set: ");
+define('_AM_WFDOWNLOADS_FILE_SETEXPIREDATE', "<b>Set expire date</b>");
+define('_AM_WFDOWNLOADS_FILE_MUSTBEVALID', "Screenshot image must be a valid image file under %s directory (ex. shot.gif). Leave it blank if there is no image file.");
+define('_AM_WFDOWNLOADS_FILE_EDITAPPROVE', "Approve download:");
+define('_AM_WFDOWNLOADS_FILE_NEWFILEUPLOAD', "New file created and database updated successfully");
+define('_AM_WFDOWNLOADS_FILE_FILEMODIFIEDUPDATE', "Selected file modified and database updated successfully");
+define('_AM_WFDOWNLOADS_FILE_REALLYDELETEDTHIS', "Are you sure to delete the selected file?");
+define('_AM_WFDOWNLOADS_FILE_FILEWASDELETED', "File %s successfully deleted from the database!");
+define('_AM_WFDOWNLOADS_FILE_USE_UPLOAD_TITLE', " Use upload file name for file title.");
+define('_AM_WFDOWNLOADS_FILE_FILEAPPROVED', "File approved and database updated successfully");
+define('_AM_WFDOWNLOADS_FILE_CREATENEWSSTORY', "<b>Create news story from download</b>");
+define('_AM_WFDOWNLOADS_FILE_SUBMITNEWS', "Submit new file as news item?");
+define('_AM_WFDOWNLOADS_FILE_NEWSCATEGORY', "Select news category to submit news:");
+define('_AM_WFDOWNLOADS_FILE_NEWSTITLE', "News title:<div style='padding-top: 4px; padding-bottom: 4px;'><span style='font-weight: normal;'>Leave blank to use file title</span></div>");
// Broken downloads defines
-define("_AM_WFDOWNLOADS_SBROKENSUBMIT","Brokens reports: %s");
-define("_AM_WFDOWNLOADS_BROKEN_FILE","Broken reports");
-define("_AM_WFDOWNLOADS_BROKEN_FILEIGNORED","Broken report ignored and successfully removed from the database!");
-define("_AM_WFDOWNLOADS_BROKEN_NOWACK","Acknowledged status changed and database updated!");
-define("_AM_WFDOWNLOADS_BROKEN_NOWCON","Confirmed status changed and database updated!");
-define("_AM_WFDOWNLOADS_BROKEN_REPORTINFO","Broken reports information");
-define("_AM_WFDOWNLOADS_BROKEN_REPORTSNO","Broken reports waiting");
-define("_AM_WFDOWNLOADS_BROKEN_IGNOREDESC","<b>Ignores</b> the report and only deletes the broken file report.");
-define("_AM_WFDOWNLOADS_BROKEN_IGNORE_ALT","Ignore and delete the broken file report");
-define("_AM_WFDOWNLOADS_BROKEN_DELETEDESC","<b>Deletes</b> the reported download data and broken file reports for the file.");
-define("_AM_WFDOWNLOADS_BROKEN_DELETE_ALT","Delete the reported download data and broken file report");
-define("_AM_WFDOWNLOADS_BROKEN_EDITDESC","<b>Edit</b> download to correct the problem.");
-define("_AM_WFDOWNLOADS_BROKEN_EDIT_ALT","Edit download to correct the problem");
-define("_AM_WFDOWNLOADS_BROKEN_ACKDESC","<b>Acknowledged</b> Set acknowledged state of broken file report.");
-define("_AM_WFDOWNLOADS_BROKEN_ACK_ALT","Acknowledge state of broken file report");
-define("_AM_WFDOWNLOADS_BROKEN_CONFIRMDESC","<b>Confirmed</b> Set confirmed state of broken file report.");
-define("_AM_WFDOWNLOADS_BROKEN_CONFIRM_ALT","Confirm state of broken file report");
-
-define("_AM_WFDOWNLOADS_BROKEN_ID","ID");
-define("_AM_WFDOWNLOADS_BROKEN_TITLE","Download title");
-define("_AM_WFDOWNLOADS_BROKEN_REPORTER","Reporter");
-define("_AM_WFDOWNLOADS_BROKEN_FILESUBMITTER","Download submitter");
-define("_AM_WFDOWNLOADS_BROKEN_DATESUBMITTED","Report date");
-define("_AM_WFDOWNLOADS_BROKEN_ACTION","Action");
-define("_AM_WFDOWNLOADS_BROKEN_NOFILEMATCH","There are no broken reports that match these criteria");
-define("_AM_WFDOWNLOADS_BROKENFILEDELETED","Download description removed from database and broken report removed");
-define("_AM_WFDOWNLOADS_BROKEN_DOWNLOAD_DONT_EXISTS","The file no longer exists");
-
+define('_AM_WFDOWNLOADS_SBROKENSUBMIT', "Brokens reports: %s");
+define('_AM_WFDOWNLOADS_BROKEN_FILE', "Broken reports");
+define('_AM_WFDOWNLOADS_BROKEN_FILEIGNORED', "Broken report ignored and successfully removed from the database!");
+define('_AM_WFDOWNLOADS_BROKEN_NOWACK', "Acknowledged status changed and database updated!");
+define('_AM_WFDOWNLOADS_BROKEN_NOWCON', "Confirmed status changed and database updated!");
+define('_AM_WFDOWNLOADS_BROKEN_REPORTINFO', "Broken reports information");
+define('_AM_WFDOWNLOADS_BROKEN_REPORTSNO', "Broken reports waiting");
+define('_AM_WFDOWNLOADS_BROKEN_IGNOREDESC', "<b>Ignores</b> the report and only deletes the broken file report.");
+define('_AM_WFDOWNLOADS_BROKEN_IGNORE_ALT', "Ignore and delete the broken file report");
+define('_AM_WFDOWNLOADS_BROKEN_DELETEDESC', "<b>Deletes</b> the reported download data and broken file reports for the file.");
+define('_AM_WFDOWNLOADS_BROKEN_DELETE_ALT', "Delete the reported download data and broken file report");
+define('_AM_WFDOWNLOADS_BROKEN_EDITDESC', "<b>Edit</b> download to correct the problem.");
+define('_AM_WFDOWNLOADS_BROKEN_EDIT_ALT', "Edit download to correct the problem");
+define('_AM_WFDOWNLOADS_BROKEN_ACKDESC', "<b>Acknowledged</b> Set acknowledged state of broken file report.");
+define('_AM_WFDOWNLOADS_BROKEN_ACK_ALT', "Acknowledge state of broken file report");
+define('_AM_WFDOWNLOADS_BROKEN_CONFIRMDESC', "<b>Confirmed</b> Set confirmed state of broken file report.");
+define('_AM_WFDOWNLOADS_BROKEN_CONFIRM_ALT', "Confirm state of broken file report");
+define('_AM_WFDOWNLOADS_BROKEN_ID', "ID");
+define('_AM_WFDOWNLOADS_BROKEN_TITLE', "Download title");
+define('_AM_WFDOWNLOADS_BROKEN_REPORTER', "Reporter");
+define('_AM_WFDOWNLOADS_BROKEN_FILESUBMITTER', "Download submitter");
+define('_AM_WFDOWNLOADS_BROKEN_DATESUBMITTED', "Report date");
+define('_AM_WFDOWNLOADS_BROKEN_ACTION', "Action");
+define('_AM_WFDOWNLOADS_BROKEN_NOFILEMATCH', "There are no broken reports that match these criteria");
+define('_AM_WFDOWNLOADS_BROKENFILEDELETED', "Download description removed from database and broken report removed");
+define('_AM_WFDOWNLOADS_BROKEN_DOWNLOAD_DONT_EXISTS', "The file no longer exists");
// About defines
-define("_AM_WFDOWNLOADS_BY","by");
-
+define('_AM_WFDOWNLOADS_BY', "by");
//block defines
-define("_AM_WFDOWNLOADS_BADMIN","Block administration");
-define("_AM_WFDOWNLOADS_BLKDESC","Description");
-define("_AM_WFDOWNLOADS_TITLE","Title");
-define("_AM_WFDOWNLOADS_SIDE","Alignment");
-define("_AM_WFDOWNLOADS_WEIGHT","Weight");
-define("_AM_WFDOWNLOADS_VISIBLE","Visible");
-define("_AM_WFDOWNLOADS_ACTION","Action");
-define("_AM_WFDOWNLOADS_SBLEFT","Left");
-define("_AM_WFDOWNLOADS_SBRIGHT","Right");
-define("_AM_WFDOWNLOADS_CBLEFT","Center left");
-define("_AM_WFDOWNLOADS_CBRIGHT","Center right");
-define("_AM_WFDOWNLOADS_CBCENTER","Center middle");
-define("_AM_WFDOWNLOADS_ACTIVERIGHTS","Active rights");
-define("_AM_WFDOWNLOADS_ACCESSRIGHTS","Access rights");
-
+define('_AM_WFDOWNLOADS_BADMIN', "Block administration");
+define('_AM_WFDOWNLOADS_BLKDESC', "Description");
+define('_AM_WFDOWNLOADS_TITLE', "Title");
+define('_AM_WFDOWNLOADS_SIDE', "Alignment");
+define('_AM_WFDOWNLOADS_WEIGHT', "Weight");
+define('_AM_WFDOWNLOADS_VISIBLE', "Visible");
+define('_AM_WFDOWNLOADS_ACTION', "Action");
+define('_AM_WFDOWNLOADS_SBLEFT', "Left");
+define('_AM_WFDOWNLOADS_SBRIGHT', "Right");
+define('_AM_WFDOWNLOADS_CBLEFT', "Center left");
+define('_AM_WFDOWNLOADS_CBRIGHT', "Center right");
+define('_AM_WFDOWNLOADS_CBCENTER', "Center middle");
+define('_AM_WFDOWNLOADS_ACTIVERIGHTS', "Active rights");
+define('_AM_WFDOWNLOADS_ACCESSRIGHTS', "Access rights");
//image admin icon
-define("_AM_WFDOWNLOADS_ICO_EDIT","Edit this item");
-define("_AM_WFDOWNLOADS_ICO_DELETE","Delete this item");
-define("_AM_WFDOWNLOADS_ICO_ONLINE","Online");
-define("_AM_WFDOWNLOADS_ICO_OFFLINE","Offline");
-define("_AM_WFDOWNLOADS_ICO_APPROVED","Approved");
-define("_AM_WFDOWNLOADS_ICO_NOTAPPROVED","Not approved");
-
-define("_AM_WFDOWNLOADS_ICO_LINK","Related link");
-define("_AM_WFDOWNLOADS_ICO_URL","Add related URL");
-define("_AM_WFDOWNLOADS_ICO_ADD","Add");
-define("_AM_WFDOWNLOADS_ICO_APPROVE","Approve");
-define("_AM_WFDOWNLOADS_ICO_STATS","Stats");
-
-define("_AM_WFDOWNLOADS_ICO_IGNORE","Ignore");
-define("_AM_WFDOWNLOADS_ICO_ACK","Broken report acknowledged");
-define("_AM_WFDOWNLOADS_ICO_REPORT","Acknowledge broken report?");
-define("_AM_WFDOWNLOADS_ICO_CONFIRM","Broken report confirmed");
-define("_AM_WFDOWNLOADS_ICO_CONBROKEN","Confirm broken report?");
-
-define("_AM_WFDOWNLOADS_DB_IMPORT","Import");
-define("_AM_WFDOWNLOADS_DB_CURRENTVER","Current version: <span class='currentVer'>%s</span>");
-define("_AM_WFDOWNLOADS_DB_DBVER","Database Version %s");
-define("_AM_WFDOWNLOADS_DB_MSG_ADD_DATA","Data added in table %s");
-define("_AM_WFDOWNLOADS_DB_MSG_ADD_DATA_ERR","Error adding data in table %s");
-define("_AM_WFDOWNLOADS_DB_MSG_CHGFIELD","Changing field %s in table %s");
-define("_AM_WFDOWNLOADS_DB_MSG_CHGFIELD_ERR","Error changing field %s in table %s");
-define("_AM_WFDOWNLOADS_DB_MSG_CREATE_TABLE","Table %s created");
-define("_AM_WFDOWNLOADS_DB_MSG_CREATE_TABLE_ERR","Error creating table %s");
-define("_AM_WFDOWNLOADS_DB_MSG_NEWFIELD","Successfully added field %s");
-define("_AM_WFDOWNLOADS_DB_MSG_NEWFIELD_ERR","Error adding field %s");
-define("_AM_WFDOWNLOADS_DB_NEEDUPDATE","Your database is out-of-date. Please upgrade your database tables!<br><b>Note: The SmartFactory strongly recommends you to backup all Wfdownloads tables before running...
[truncated message content] |
|
From: <ce...@us...> - 2013-10-06 00:59:17
|
Revision: 12143
http://sourceforge.net/p/xoops/svn/12143
Author: cesag
Date: 2013-10-06 00:59:14 +0000 (Sun, 06 Oct 2013)
Log Message:
-----------
Fixed: date was not right in lang_diff.txt
Modified Paths:
--------------
XoopsModules/wfdownloads/trunk/wfdownloads/docs/lang_diff.txt
Modified: XoopsModules/wfdownloads/trunk/wfdownloads/docs/lang_diff.txt
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/docs/lang_diff.txt 2013-10-06 00:49:47 UTC (rev 12142)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/docs/lang_diff.txt 2013-10-06 00:59:14 UTC (rev 12143)
@@ -10,7 +10,7 @@
x renamed
---------------------------------------
-3.23 Beta 1 2012-10-05
+3.23 Beta 1 2013-10-05
---------------------------------------
x _MD_WFDOWNLOADS__MD_WFDOWNLOADS_FILENOTOPEN
|
8 messages has been excluded from this view by a project administrator.
