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: <be...@us...> - 2015-07-13 16:02:17
|
Revision: 13102 http://sourceforge.net/p/xoops/svn/13102 Author: beckmi Date: 2015-07-13 16:02:16 +0000 (Mon, 13 Jul 2015) Log Message: ----------- adding 2.4.5-rc2 to Archives Added Paths: ----------- Archives/XoopsCore-releases/2.4.5-rc2/ |
From: <be...@us...> - 2015-07-13 16:01:24
|
Revision: 13101 http://sourceforge.net/p/xoops/svn/13101 Author: beckmi Date: 2015-07-13 16:01:21 +0000 (Mon, 13 Jul 2015) Log Message: ----------- adding 2.4.5 to Archives Added Paths: ----------- Archives/XoopsCore-releases/2.4.5/ Index: Archives/XoopsCore-releases/2.4.5 =================================================================== --- XoopsCore/releases/2.4.5 2010-07-10 16:40:00 UTC (rev 4932) +++ Archives/XoopsCore-releases/2.4.5 2015-07-13 16:01:21 UTC (rev 13101) Property changes on: Archives/XoopsCore-releases/2.4.5 ___________________________________________________________________ Added: svn:ignore ## -0,0 +1,2 ## +.project +* Added: svn:mergeinfo ## -0,0 +1 ## +/XoopsCore/branches/2.4.x/2.4.5:4927-4928,4931 \ No newline at end of property |
From: <be...@us...> - 2015-07-13 16:00:50
|
Revision: 13100 http://sourceforge.net/p/xoops/svn/13100 Author: beckmi Date: 2015-07-13 16:00:49 +0000 (Mon, 13 Jul 2015) Log Message: ----------- adding 2.4.0-beta1 to Archives Added Paths: ----------- Archives/XoopsCore-releases/2.4.0-beta1/ |
From: <be...@us...> - 2015-07-13 15:59:07
|
Revision: 13099 http://sourceforge.net/p/xoops/svn/13099 Author: beckmi Date: 2015-07-13 15:59:05 +0000 (Mon, 13 Jul 2015) Log Message: ----------- adding 2.4.0 to Archives Added Paths: ----------- Archives/XoopsCore-releases/2.4.0/ |
From: <be...@us...> - 2015-07-13 15:58:12
|
Revision: 13098 http://sourceforge.net/p/xoops/svn/13098 Author: beckmi Date: 2015-07-13 15:58:10 +0000 (Mon, 13 Jul 2015) Log Message: ----------- adding 2.3.3 to Archives Added Paths: ----------- Archives/XoopsCore-releases/2.3.3/ |
From: <be...@us...> - 2015-07-13 15:57:28
|
Revision: 13097 http://sourceforge.net/p/xoops/svn/13097 Author: beckmi Date: 2015-07-13 15:57:25 +0000 (Mon, 13 Jul 2015) Log Message: ----------- Added Paths: ----------- Archives/XoopsCore-releases/2.3.1/ |
From: <be...@us...> - 2015-07-13 15:56:53
|
Revision: 13096 http://sourceforge.net/p/xoops/svn/13096 Author: beckmi Date: 2015-07-13 15:56:52 +0000 (Mon, 13 Jul 2015) Log Message: ----------- adding 2.3.0 to Archives Added Paths: ----------- Archives/XoopsCore-releases/2.3.0/ |
From: <txm...@us...> - 2015-07-03 12:44:49
|
Revision: 13095 http://sourceforge.net/p/xoops/svn/13095 Author: txmodxoops Date: 2015-07-03 12:44:44 +0000 (Fri, 03 Jul 2015) Log Message: ----------- Fixed small bugs Refactoring Updated Modified Paths: -------------- XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/admin/about.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/admin/building.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/admin/fields.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/admin/footer.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/admin/header.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/admin/index.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/admin/menu.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/admin/modules.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/admin/morefiles.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/admin/settings.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/admin/tables.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/assets/css/admin/style.css XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/assets/js/functions.js XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/SplClassLoader.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/autoload.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/building.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/fieldattributes.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/fieldelements.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/fieldkey.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/fieldnull.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/fields.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/fieldtype.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/TDMCreateAbstract.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/TDMCreateArchitecture.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/TDMCreateFile.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/TDMCreateHtmlSmartyCodes.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/TDMCreateMoreFiles.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/TDMCreateStructure.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/TDMCreateTableFields.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/admin/AdminAbout.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/admin/AdminFooter.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/admin/AdminHeader.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/admin/AdminIndex.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/admin/AdminMenu.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/admin/AdminObjects.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/admin/AdminPages.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/admin/AdminPermissions.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/admin/AdminPhpCode.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/blocks/BlocksFiles.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/classes/ClassFiles.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/classes/ClassFormElements.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/classes/ClassHelper.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/css/CssStyles.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/docs/DocsChangelog.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/docs/DocsFiles.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/include/IncludeCommentFunctions.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/include/IncludeComments.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/include/IncludeCommon.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/include/IncludeFunctions.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/include/IncludeInstall.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/include/IncludeJquery.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/include/IncludeNotifications.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/include/IncludeSearch.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/include/IncludeUpdate.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/language/LanguageAdmin.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/language/LanguageBlocks.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/language/LanguageDefines.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/language/LanguageHelp.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/language/LanguageMailTpl.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/language/LanguageMain.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/language/LanguageModinfo.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/sql/SqlFile.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/templates/admin/TemplatesAdminAbout.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/templates/admin/TemplatesAdminFooter.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/templates/admin/TemplatesAdminHeader.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/templates/admin/TemplatesAdminIndex.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/templates/admin/TemplatesAdminPages.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/templates/admin/TemplatesAdminPermissions.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/templates/blocks/TemplatesBlocks.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/templates/user/TemplatesUserBreadcrumbs.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/templates/user/TemplatesUserBroken.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/templates/user/TemplatesUserDisqusComments.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/templates/user/TemplatesUserFacebookComments.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/templates/user/TemplatesUserFooter.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/templates/user/TemplatesUserHeader.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/templates/user/TemplatesUserIndex.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/templates/user/TemplatesUserPages.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/templates/user/TemplatesUserPagesList.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/templates/user/TemplatesUserPdf.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/templates/user/TemplatesUserPrint.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/templates/user/TemplatesUserRate.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/templates/user/TemplatesUserRss.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/templates/user/TemplatesUserSearch.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/templates/user/TemplatesUserSingle.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/templates/user/TemplatesUserSubmit.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/user/UserBroken.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/user/UserFooter.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/user/UserHeader.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/user/UserIndex.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/user/UserListTag.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/user/UserNotificationUpdate.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/user/UserObjects.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/user/UserPages.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/user/UserPdf.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/user/UserPrint.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/user/UserRate.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/user/UserRss.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/user/UserSearch.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/user/UserSingle.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/user/UserSubmit.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/user/UserViewTag.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/user/UserVisit.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/user/UserXoopsVersion.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/form/TDMCreateFormRadio.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/form/TDMCreateFormRaw.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/form/TDMCreateFormTab.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/form/TDMCreateFormTabTray.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/form/TDMCreateThemeForm.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/helper.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/html/TDMCreateFormLabel.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/logoGenerator.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/modules.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/morefiles.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/session.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/settings.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/tables.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/include/common.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/include/functions.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/include/install.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/include/update.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/language/english/admin.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/language/english/modinfo.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/sql/mysql.sql XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/templates/admin/tdmcreate_settings.tpl XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/templates/admin/tdmcreate_tables.tpl XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/xoops_version.php Added Paths: ----------- XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/TDMCreatePhpCode.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/templates/user/TemplatesUserCategories.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/templates/user/TemplatesUserCategoriesList.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/templates/user/TemplatesUserMoreFiles.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/language/lang.diff Modified: XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/admin/about.php =================================================================== --- XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/admin/about.php 2015-07-01 10:38:11 UTC (rev 13094) +++ XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/admin/about.php 2015-07-03 12:44:44 UTC (rev 13095) @@ -1,4 +1,5 @@ <?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 @@ -9,19 +10,21 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. */ /** - * tdmcreate module + * tdmcreate module. * * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/ * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html) - * @package tdmcreate + * * @since 2.5.0 + * * @author Txmod Xoops http://www.txmodxoops.org + * * @version $Id: about.php 11084 2013-02-23 15:44:20Z timgno $ */ -include __DIR__ . '/header.php'; +include __DIR__.'/header.php'; $templateMain = 'tdmcreate_about.tpl'; $GLOBALS['xoopsTpl']->assign('navigation', $adminMenu->addNavigation('about.php')); -$about = $adminMenu->renderAbout('7LFE862PGJN88', false); +$about = $adminMenu->renderAbout('7LFE862PGJN88', false); $aboutRes = TDMCreate_MakeDonationForm($about); $GLOBALS['xoopsTpl']->assign('about', $aboutRes); -include __DIR__ . '/footer.php'; +include __DIR__.'/footer.php'; Modified: XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/admin/building.php =================================================================== --- XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/admin/building.php 2015-07-01 10:38:11 UTC (rev 13094) +++ XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/admin/building.php 2015-07-03 12:44:44 UTC (rev 13095) @@ -1,4 +1,5 @@ <?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 @@ -9,26 +10,29 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. */ /** - * tdmcreate module + * tdmcreate module. * * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/ * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html) - * @package tdmcreate + * * @since 2.5.0 + * * @author Txmod Xoops http://www.txmodxoops.org + * * @version $Id: building.php 12258 2014-01-02 09:33:29Z timgno $ */ -include __DIR__ . '/header.php'; -$op = XoopsRequest::getString('op', 'default'); -$mid = XoopsRequest::getInt('mod_id'); +include __DIR__.'/header.php'; +$op = XoopsRequest::getString('op', 'default'); +$mid = XoopsRequest::getInt('mod_id'); $moduleObj = $tdmcreate->getHandler('modules')->get($mid); +$cachePath = XOOPS_VAR_PATH.'/caches/tdmcreate_cache'; // Clear cache -if (file_exists($cacheFile1 = TDMC_CLASSES_PATH . '/cache/classpaths.cache') && - file_exists($cacheFile2 = TDMC_CLASSES_PATH . '/files/cache/classpaths.cache')) { - if (unlink($cacheFile1) && unlink($cacheFile2)) { - redirect_header('building.php?op=build', 5, _AM_TDMCREATE_BUILDING_DELETED_CACHE_FILES); - } +if (file_exists($cache = $cachePath.'/classpaths.cache')) { + unlink($cache); } +if (!file_exists($indexFile = $cachePath.'/index.html')) { + copy('index.html', $indexFile); +} // Switch option switch ($op) { case 'build': @@ -37,8 +41,8 @@ // Get var module dirname $moduleDirname = $moduleObj->getVar('mod_dirname'); // Directories for copy from to - $fromDir = TDMC_UPLOAD_REPOSITORY_PATH . '/' . strtolower($moduleDirname); - $toDir = XOOPS_ROOT_PATH . '/modules/' . strtolower($moduleDirname); + $fromDir = TDMC_UPLOAD_REPOSITORY_PATH.'/'.strtolower($moduleDirname); + $toDir = XOOPS_ROOT_PATH.'/modules/'.strtolower($moduleDirname); if (isset($moduleDirname)) { // Clear this module if it's in repository if (is_dir($fromDir)) { @@ -50,11 +54,11 @@ } } // Structure - include_once TDMC_CLASSES_PATH . '/files/TDMCreateArchitecture.php'; + include_once TDMC_CLASSES_PATH.'/files/TDMCreateArchitecture.php'; $handler = TDMCreateArchitecture::getInstance(); // Creation of the structure of folders and files - $base_architecture = $handler->createBaseFoldersFiles($moduleObj); - if (false !== $base_architecture) { + $baseArchitecture = $handler->createBaseFoldersFiles($moduleObj); + if (false !== $baseArchitecture) { $GLOBALS['xoopsTpl']->assign('base_architecture', true); } else { $GLOBALS['xoopsTpl']->assign('base_architecture', false); @@ -65,8 +69,8 @@ foreach ($files as $file) { if ($file) { $build['list'] = $file; - } - $GLOBALS['xoopsTpl']->append('builds', $build); + $GLOBALS['xoopsTpl']->append('builds', $build); + } } unset($build); // Directory to saved all files @@ -87,10 +91,10 @@ redirect_header('modules.php?op=new', 2, _AM_TDMCREATE_NOTMODULES); } unset($nbModules); - include_once TDMC_PATH . '/class/building.php'; + include_once TDMC_PATH.'/class/building.php'; $handler = TDMCreateBuilding::getInstance(); - $form = $handler->getForm(); + $form = $handler->getForm(); $GLOBALS['xoopsTpl']->assign('form', $form->render()); break; } -include __DIR__ . '/footer.php'; +include __DIR__.'/footer.php'; Modified: XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/admin/fields.php =================================================================== --- XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/admin/fields.php 2015-07-01 10:38:11 UTC (rev 13094) +++ XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/admin/fields.php 2015-07-03 12:44:44 UTC (rev 13095) @@ -1,4 +1,5 @@ -<?php +<?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 @@ -9,16 +10,18 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. */ /** - * tdmcreate module + * tdmcreate module. * * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/ * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html) - * @package tdmcreate + * * @since 2.5.0 + * * @author Txmod Xoops http://www.txmodxoops.org + * * @version $Id: 1.91 fields.php 12258 2014-01-02 09:33:29Z timgno $ */ -include __DIR__ . '/header.php'; +include __DIR__.'/header.php'; // Recovered value of arguments op in the URL $ $op = XoopsRequest::getString('op', 'list'); // Get fields Variables @@ -27,187 +30,167 @@ $fieldNumb = XoopsRequest::getInt('field_numb'); $fieldName = XoopsRequest::getString('field_name', ''); // switch op -switch ($op) -{ - case 'list': +switch ($op) { + case 'list': default: $start = XoopsRequest::getInt('start', 0); - $limit = XoopsRequest::getInt('limit', $tdmcreate->getConfig('tables_adminpager')); - // Define main template - $templateMain = 'tdmcreate_fields.tpl'; - $GLOBALS['xoTheme']->addStylesheet( 'modules/tdmcreate/assets/css/admin/style.css' ); - $GLOBALS['xoTheme']->addScript('browse.php?Frameworks/jquery/plugins/jquery.ui.js'); - $GLOBALS['xoTheme']->addScript('modules/tdmcreate/assets/js/functions.js'); - $GLOBALS['xoTheme']->addScript('modules/tdmcreate/assets/js/sortable.js'); - $GLOBALS['xoopsTpl']->assign('navigation', $adminMenu->addNavigation('fields.php')); - $adminMenu->addItemButton(_AM_TDMCREATE_ADD_TABLE, 'tables.php?op=new', 'add'); - $GLOBALS['xoopsTpl']->assign('buttons', $adminMenu->renderButton()); - $GLOBALS['xoopsTpl']->assign('tdmc_url', TDMC_URL); - $GLOBALS['xoopsTpl']->assign('tdmc_icons_url', TDMC_ICONS_URL); - $GLOBALS['xoopsTpl']->assign('tdmc_upload_url', TDMC_UPLOAD_URL); - $GLOBALS['xoopsTpl']->assign('tdmc_upload_imgtab_url', TDMC_UPLOAD_IMGTAB_URL); - $GLOBALS['xoopsTpl']->assign('modPathIcon16', $modPathIcon16); - $GLOBALS['xoopsTpl']->assign('sysPathIcon32', $sysPathIcon32); - // Redirect if there aren't modules - $modulesCount = $tdmcreate->getHandler('modules')->getCountModules(); - if ( $modulesCount == 0 ) { - redirect_header('modules.php?op=new', 2, _AM_TDMCREATE_NOTMODULES ); - } - unset($modulesCount); - // Redirect if there aren't tables - $tablesCount = $tdmcreate->getHandler('tables')->getCountTables(); - if ($tablesCount == 0) { - redirect_header('tables.php?op=new', 2, _AM_TDMCREATE_NOTTABLES ); - } - // Get the list of tables - $tablesAll = $tdmcreate->getHandler('tables')->getAllTables($start, $limit); - if ($tablesCount > 0) - { - $tlid = 1; - foreach (array_keys($tablesAll) as $tid) - { - // Display tables list - $table = $tablesAll[$tid]->getValues(); - $talid = array('lid' => $tlid); - $table = array_merge($table, $talid); + $limit = XoopsRequest::getInt('limit', $tdmcreate->getConfig('tables_adminpager')); + // Define main template + $templateMain = 'tdmcreate_fields.tpl'; + $GLOBALS['xoTheme']->addStylesheet('modules/tdmcreate/assets/css/admin/style.css'); + $GLOBALS['xoTheme']->addScript('browse.php?Frameworks/jquery/plugins/jquery.ui.js'); + $GLOBALS['xoTheme']->addScript('modules/tdmcreate/assets/js/functions.js'); + $GLOBALS['xoTheme']->addScript('modules/tdmcreate/assets/js/sortable.js'); + $GLOBALS['xoopsTpl']->assign('navigation', $adminMenu->addNavigation('fields.php')); + $adminMenu->addItemButton(_AM_TDMCREATE_ADD_TABLE, 'tables.php?op=new', 'add'); + $GLOBALS['xoopsTpl']->assign('buttons', $adminMenu->renderButton()); + $GLOBALS['xoopsTpl']->assign('modPathIcon16', TDMC_URL.'/'.$modPathIcon16); + // Redirect if there aren't modules + $modulesCount = $tdmcreate->getHandler('modules')->getCountModules(); + if ($modulesCount == 0) { + redirect_header('modules.php?op=new', 2, _AM_TDMCREATE_NOTMODULES); + } + unset($modulesCount); + // Redirect if there aren't tables + $tablesCount = $tdmcreate->getHandler('tables')->getCountTables(); + if ($tablesCount == 0) { + redirect_header('tables.php?op=new', 2, _AM_TDMCREATE_NOTTABLES); + } + // Get the list of tables + $tablesAll = $tdmcreate->getHandler('tables')->getAllTables($start, $limit); + if ($tablesCount > 0) { + $tlid = 1; + foreach (array_keys($tablesAll) as $tid) { + // Display tables list + $table = $tablesAll[$tid]->getValues(); + $talid = array('lid' => $tlid); + $table = array_merge($table, $talid); // Get the list of fields - $fieldsCount = $tdmcreate->getHandler('fields')->getCountFields(); - $fieldsAll = $tdmcreate->getHandler('fields')->getAllFieldsByModuleAndTableId($table['mid'], $tid); - // Display fields list - $fields = array(); - $lid = 1; - if ( $fieldsCount > 0 ) - { - foreach (array_keys($fieldsAll) as $fid) - { - $field = $fieldsAll[$fid]->getValues(); - $falid = array('lid' => $lid); - $fields[] = array_merge($field, $falid); - unset($field); - ++$lid; - } - } - ++$tlid; - unset($lid); - $table['fields'] = $fields; - $GLOBALS['xoopsTpl']->append('tables_list', $table); - unset($table); - } - unset($tlid); - unset($fields); - if ( $tablesCount > $limit ) { - include_once XOOPS_ROOT_PATH . '/class/pagenav.php'; - $pagenav = new XoopsPageNav($tablesCount, $limit, $start, 'start', 'op=list&limit=' . $limit); - $GLOBALS['xoopsTpl']->assign('pagenav', $pagenav->renderNav(4)); - } - } else { - $GLOBALS['xoopsTpl']->assign('error', _AM_TDMCREATE_THEREARENT_FIELDS); - } - break; - - case 'new': - // Define main template - $templateMain = 'tdmcreate_fields.tpl'; - $GLOBALS['xoTheme']->addStylesheet( 'modules/tdmcreate/assets/css/admin/style.css' ); - $GLOBALS['xoopsTpl']->assign('navigation', $adminMenu->addNavigation('fields.php')); - $adminMenu->addItemButton(_AM_TDMCREATE_TABLES_LIST, 'tables.php', 'list'); - $adminMenu->addItemButton(_AM_TDMCREATE_FIELDS_LIST, 'fields.php', 'list'); - $GLOBALS['xoopsTpl']->assign('buttons', $adminMenu->renderButton()); - // Form Add - $fieldsObj =& $tdmcreate->getHandler('fields')->create(); - $form = $fieldsObj->getFormNew($fieldMid, $fieldTid, $fieldNumb, $fieldName); - $GLOBALS['xoopsTpl']->assign('form', $form->render()); - break; - - case 'save': - // - if ( !$GLOBALS['xoopsSecurity']->check() ) { + $fieldsCount = $tdmcreate->getHandler('fields')->getCountFields(); + $fieldsAll = $tdmcreate->getHandler('fields')->getAllFieldsByModuleAndTableId($table['mid'], $tid); + // Display fields list + $fields = array(); + $lid = 1; + if ($fieldsCount > 0) { + foreach (array_keys($fieldsAll) as $fid) { + $field = $fieldsAll[$fid]->getValues(); + $falid = array('lid' => $lid); + $fields[] = array_merge($field, $falid); + unset($field); + ++$lid; + } + } + ++$tlid; + unset($lid); + $table['fields'] = $fields; + $GLOBALS['xoopsTpl']->append('tables_list', $table); + unset($table); + } + unset($tlid); + unset($fields); + if ($tablesCount > $limit) { + include_once XOOPS_ROOT_PATH.'/class/pagenav.php'; + $pagenav = new XoopsPageNav($tablesCount, $limit, $start, 'start', 'op=list&limit='.$limit); + $GLOBALS['xoopsTpl']->assign('pagenav', $pagenav->renderNav(4)); + } + } else { + $GLOBALS['xoopsTpl']->assign('error', _AM_TDMCREATE_THEREARENT_FIELDS); + } + break; + + case 'new': + // Define main template + $templateMain = 'tdmcreate_fields.tpl'; + $GLOBALS['xoTheme']->addStylesheet('modules/tdmcreate/assets/css/admin/style.css'); + $GLOBALS['xoopsTpl']->assign('navigation', $adminMenu->addNavigation('fields.php')); + $adminMenu->addItemButton(_AM_TDMCREATE_TABLES_LIST, 'tables.php', 'list'); + $adminMenu->addItemButton(_AM_TDMCREATE_FIELDS_LIST, 'fields.php', 'list'); + $GLOBALS['xoopsTpl']->assign('buttons', $adminMenu->renderButton()); + // Form Add + $fieldsObj = &$tdmcreate->getHandler('fields')->create(); + $form = $fieldsObj->getFormNew($fieldMid, $fieldTid, $fieldNumb, $fieldName); + $GLOBALS['xoopsTpl']->assign('form', $form->render()); + break; + + case 'save': + // + if (!$GLOBALS['xoopsSecurity']->check()) { redirect_header('fields.php', 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors())); - } - $fieldId = XoopsRequest::getInt('field_id'); - // Fields Handler - $fields = $tdmcreate->getHandler('fields'); - $fieldOrder = 1; - // Set Variables - foreach($_POST['field_id'] as $key => $value) - { - if(isset($value)){ - $fieldsObj =& $fields->get($value); - } else { - $fieldsObj =& $fields->create(); - } - $order = $fieldsObj->isNew() ? $fieldOrder : $_GET['field_order'][$key]; - // Set Data - $fieldsObj->setVar( 'field_mid', $fieldMid ); - $fieldsObj->setVar( 'field_tid', $fieldTid ); - $fieldsObj->setVar( 'field_order', $order ); - $fieldsObj->setVar( 'field_name', $_POST['field_name'][$key]); - $fieldsObj->setVar( 'field_type', $_POST['field_type'][$key]); - $fieldsObj->setVar( 'field_value', $_POST['field_value'][$key]); - $fieldsObj->setVar( 'field_attribute', $_POST['field_attribute'][$key]); - $fieldsObj->setVar( 'field_null', $_POST['field_null'][$key]); - $fieldsObj->setVar( 'field_default', $_POST['field_default'][$key]); - $fieldsObj->setVar( 'field_key', $_POST['field_key'][$key]); - $fieldsObj->setVar( 'field_element', $_POST['field_element'][$key]); - $fieldsObj->setVar( 'field_parent', (1 == $_REQUEST['field_parent'][$key]) ? 1 : 0); - $fieldsObj->setVar( 'field_admin', (1 == $_REQUEST['field_admin'][$key]) ? 1 : 0); - $fieldsObj->setVar( 'field_inlist', (1 == $_REQUEST['field_inlist'][$key]) ? 1 : 0); - $fieldsObj->setVar( 'field_inform', (1 == $_REQUEST['field_inform'][$key]) ? 1 : 0); - $fieldsObj->setVar( 'field_user', (1 == $_REQUEST['field_user'][$key]) ? 1 : 0); - $fieldsObj->setVar( 'field_thead', (1 == $_REQUEST['field_thead'][$key]) ? 1 : 0); - $fieldsObj->setVar( 'field_tbody', (1 == $_REQUEST['field_tbody'][$key]) ? 1 : 0); - $fieldsObj->setVar( 'field_tfoot', (1 == $_REQUEST['field_tfoot'][$key]) ? 1 : 0); - $fieldsObj->setVar( 'field_block', (1 == $_REQUEST['field_block'][$key]) ? 1 : 0); - $fieldsObj->setVar( 'field_main', ($key == $_REQUEST['field_main'] ? 1 : 0)); - $fieldsObj->setVar( 'field_search', (1 == $_REQUEST['field_search'][$key]) ? 1 : 0); - $fieldsObj->setVar( 'field_required', (1 == $_REQUEST['field_required'][$key]) ? 1 : 0); - // Insert Data - $tdmcreate->getHandler('fields')->insert($fieldsObj); - ++$fieldOrder; - } - unset($fieldOrder); - // Get table name from field table id - $tables =& $tdmcreate->getHandler('tables')->get($fieldTid); - $tableName = $tables->getVar('table_name'); - // Set field elements - if ($fieldsObj->isNew()) { - // Fields Elements Handler - /*$fieldelementObj =& $tdmcreate->getHandler('fieldelements')->create(); - $fieldelementObj->setVar( 'fieldelement_mid', $fieldMid ); - $fieldelementObj->setVar( 'fieldelement_tid', $fieldTid ); - $fieldelementObj->setVar( 'fieldelement_name', 'Table : '.ucfirst($tableName) ); - $fieldelementObj->setVar( 'fieldelement_value', 'XoopsFormTables-'.ucfirst($tableName) ); - // Insert new field element id for table name - if (!$tdmcreate->getHandler('fieldelements')->insert($fieldelementObj) ) { - $GLOBALS['xoopsTpl']->assign('error', $fieldelementObj->getHtmlErrors() . ' Field element'); - }*/ - redirect_header('fields.php', 2, sprintf(_AM_TDMCREATE_FIELDS_FORM_SAVED_OK, $tableName)); - } else { - // Needed code from table name by field_tid - redirect_header('fields.php', 2, sprintf(_AM_TDMCREATE_FIELDS_FORM_UPDATED_OK, $tableName)); - } + } + $fieldId = XoopsRequest::getInt('field_id'); + // Fields Handler + $fields = $tdmcreate->getHandler('fields'); + $fieldOrder = 1; + // Set Variables + foreach ($_POST['field_id'] as $key => $value) { + if (isset($value)) { + $fieldsObj = &$fields->get($value); + } else { + $fieldsObj = &$fields->create(); + } + $order = $fieldsObj->isNew() ? $fieldOrder : $_GET['field_order'][$key]; + // Set Data + $fieldsObj->setVar('field_mid', $fieldMid); + $fieldsObj->setVar('field_tid', $fieldTid); + $fieldsObj->setVar('field_order', $order); + $fieldsObj->setVar('field_name', $_POST['field_name'][$key]); + $fieldsObj->setVar('field_type', $_POST['field_type'][$key]); + $fieldsObj->setVar('field_value', $_POST['field_value'][$key]); + $fieldsObj->setVar('field_attribute', $_POST['field_attribute'][$key]); + $fieldsObj->setVar('field_null', $_POST['field_null'][$key]); + $fieldsObj->setVar('field_default', $_POST['field_default'][$key]); + $fieldsObj->setVar('field_key', $_POST['field_key'][$key]); + $fieldsObj->setVar('field_element', $_POST['field_element'][$key]); + $fieldsObj->setVar('field_parent', (1 == $_REQUEST['field_parent'][$key]) ? 1 : 0); + $fieldsObj->setVar('field_admin', (1 == $_REQUEST['field_admin'][$key]) ? 1 : 0); + $fieldsObj->setVar('field_inlist', (1 == $_REQUEST['field_inlist'][$key]) ? 1 : 0); + $fieldsObj->setVar('field_inform', (1 == $_REQUEST['field_inform'][$key]) ? 1 : 0); + $fieldsObj->setVar('field_user', (1 == $_REQUEST['field_user'][$key]) ? 1 : 0); + $fieldsObj->setVar('field_thead', (1 == $_REQUEST['field_thead'][$key]) ? 1 : 0); + $fieldsObj->setVar('field_tbody', (1 == $_REQUEST['field_tbody'][$key]) ? 1 : 0); + $fieldsObj->setVar('field_tfoot', (1 == $_REQUEST['field_tfoot'][$key]) ? 1 : 0); + $fieldsObj->setVar('field_block', (1 == $_REQUEST['field_block'][$key]) ? 1 : 0); + $fieldsObj->setVar('field_main', ($key == $_REQUEST['field_main'] ? 1 : 0)); + $fieldsObj->setVar('field_search', (1 == $_REQUEST['field_search'][$key]) ? 1 : 0); + $fieldsObj->setVar('field_required', (1 == $_REQUEST['field_required'][$key]) ? 1 : 0); + // Insert Data + $tdmcreate->getHandler('fields')->insert($fieldsObj); + ++$fieldOrder; + } + unset($fieldOrder); + // Get table name from field table id + $tables = &$tdmcreate->getHandler('tables')->get($fieldTid); + $tableName = $tables->getVar('table_name'); + // Set field elements + if ($fieldsObj->isNew()) { + // Fields Elements Handler + redirect_header('fields.php', 2, sprintf(_AM_TDMCREATE_FIELDS_FORM_SAVED_OK, $tableName)); + } else { + // Needed code from table name by field_tid + redirect_header('fields.php', 2, sprintf(_AM_TDMCREATE_FIELDS_FORM_UPDATED_OK, $tableName)); + } // - $GLOBALS['xoopsTpl']->assign('error', $fieldsObj->getHtmlErrors()); - $form = $fieldsObj->getForm(null, $fieldTid); - $GLOBALS['xoopsTpl']->assign('form', $form->render()); - break; - - case 'edit': - // Define main template - $templateMain = 'tdmcreate_fields.tpl'; - $GLOBALS['xoopsTpl']->assign('navigation', $adminMenu->addNavigation('fields.php')); - $adminMenu->addItemButton(_AM_TDMCREATE_ADD_TABLE, 'tables.php?op=new', 'add'); - $adminMenu->addItemButton(_AM_TDMCREATE_TABLES_LIST, 'tables.php', 'list'); - $adminMenu->addItemButton(_AM_TDMCREATE_FIELDS_LIST, 'fields.php', 'list'); - $GLOBALS['xoopsTpl']->assign('buttons', $adminMenu->renderButton()); - // Form Edit - $fieldId = XoopsRequest::getInt('field_id'); - $fieldsObj = $tdmcreate->getHandler('fields')->get( $fieldId ); - $form = $fieldsObj->getFormEdit($fieldMid, $fieldTid); - $GLOBALS['xoopsTpl']->assign('form', $form->render()); - break; - - case 'order': + $GLOBALS['xoopsTpl']->assign('error', $fieldsObj->getHtmlErrors()); + $form = $fieldsObj->getForm(null, $fieldTid); + $GLOBALS['xoopsTpl']->assign('form', $form->render()); + break; + + case 'edit': + // Define main template + $templateMain = 'tdmcreate_fields.tpl'; + $GLOBALS['xoopsTpl']->assign('navigation', $adminMenu->addNavigation('fields.php')); + $adminMenu->addItemButton(_AM_TDMCREATE_ADD_TABLE, 'tables.php?op=new', 'add'); + $adminMenu->addItemButton(_AM_TDMCREATE_TABLES_LIST, 'tables.php', 'list'); + $adminMenu->addItemButton(_AM_TDMCREATE_FIELDS_LIST, 'fields.php', 'list'); + $GLOBALS['xoopsTpl']->assign('buttons', $adminMenu->renderButton()); + // Form Edit + $fieldId = XoopsRequest::getInt('field_id'); + $fieldsObj = $tdmcreate->getHandler('fields')->get($fieldId); + $form = $fieldsObj->getFormEdit($fieldMid, $fieldTid); + $GLOBALS['xoopsTpl']->assign('form', $form->render()); + break; + + case 'order': // Initialize fields handler $fieldsObj = $tdmcreate->getHandler('fields'); if (isset($_POST['forder'])) { @@ -228,67 +211,67 @@ exit; break; - case 'delete': - $tablesObj =& $tdmcreate->getHandler('tables')->get($fieldTid); - if (isset($_REQUEST['ok']) && $_REQUEST['ok'] == 1) { - if ( !$GLOBALS['xoopsSecurity']->check() ) { - redirect_header('fields.php', 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors())); - } - if ($tdmcreate->getHandler('tables')->delete($tablesObj)) { - redirect_header('fields.php', 3, _AM_TDMCREATE_FORMDELOK); - } else { - echo $tablesObj->getHtmlErrors(); - } - } else { - xoops_confirm(array('ok' => 1, 'field_tid' => $fieldTid, 'op' => 'delete'), $_SERVER['REQUEST_URI'], sprintf(_AM_TDMCREATE_FORMSUREDEL, $tablesObj->getVar('table_name'))); - } - break; - - case 'display': + case 'delete': + $tablesObj = &$tdmcreate->getHandler('tables')->get($fieldTid); + if (isset($_REQUEST['ok']) && $_REQUEST['ok'] == 1) { + if (!$GLOBALS['xoopsSecurity']->check()) { + redirect_header('fields.php', 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors())); + } + if ($tdmcreate->getHandler('tables')->delete($tablesObj)) { + redirect_header('fields.php', 3, _AM_TDMCREATE_FORMDELOK); + } else { + echo $tablesObj->getHtmlErrors(); + } + } else { + xoops_confirm(array('ok' => 1, 'field_tid' => $fieldTid, 'op' => 'delete'), $_SERVER['REQUEST_URI'], sprintf(_AM_TDMCREATE_FORMSUREDEL, $tablesObj->getVar('table_name'))); + } + break; + + case 'display': $fieldId = tdmcreate_CleanVars($_POST, 'field_id', 0, 'int'); if ($fieldId > 0) { $fieldsObj = $tdmcreate->getHandler('fields')->get($fieldId); - if (isset($_POST['field_parent'])) { - $field_parent = $fieldsObj->getVar('field_parent'); - $fieldsObj->setVar('field_parent', !$field_parent); - } - if (isset($_POST['field_inlist'])) { - $field_inlist = $fieldsObj->getVar('field_inlist'); - $fieldsObj->setVar('field_inlist', !$field_inlist); - } - if (isset($_POST['field_inform'])) { - $field_inform = $fieldsObj->getVar('field_inform'); - $fieldsObj->setVar('field_inform', !$field_inform); - } - if (isset($_POST['field_admin'])) { - $field_admin = $fieldsObj->getVar('field_admin'); - $fieldsObj->setVar('field_admin', !$field_admin); - } - if (isset($_POST['field_user'])) { - $field_user = $fieldsObj->getVar('field_user'); - $fieldsObj->setVar('field_user', !$field_user); - } - if (isset($_POST['field_block'])) { - $field_block = $fieldsObj->getVar('field_block'); - $fieldsObj->setVar('field_block', !$field_block); - } - if (isset($_POST['field_main'])) { - $field_main = $fieldsObj->getVar('field_main'); - $fieldsObj->setVar('field_main', !$field_main); - } - if (isset($_POST['field_search'])) { - $field_search = $fieldsObj->getVar('field_search'); - $fieldsObj->setVar('field_search', !$field_search); - } - if (isset($_POST['field_required'])) { - $field_required = $fieldsObj->getVar('field_required'); - $fieldsObj->setVar('field_required', !$field_required); - } + if (isset($_POST['field_parent'])) { + $field_parent = $fieldsObj->getVar('field_parent'); + $fieldsObj->setVar('field_parent', !$field_parent); + } + if (isset($_POST['field_inlist'])) { + $field_inlist = $fieldsObj->getVar('field_inlist'); + $fieldsObj->setVar('field_inlist', !$field_inlist); + } + if (isset($_POST['field_inform'])) { + $field_inform = $fieldsObj->getVar('field_inform'); + $fieldsObj->setVar('field_inform', !$field_inform); + } + if (isset($_POST['field_admin'])) { + $field_admin = $fieldsObj->getVar('field_admin'); + $fieldsObj->setVar('field_admin', !$field_admin); + } + if (isset($_POST['field_user'])) { + $field_user = $fieldsObj->getVar('field_user'); + $fieldsObj->setVar('field_user', !$field_user); + } + if (isset($_POST['field_block'])) { + $field_block = $fieldsObj->getVar('field_block'); + $fieldsObj->setVar('field_block', !$field_block); + } + if (isset($_POST['field_main'])) { + $field_main = $fieldsObj->getVar('field_main'); + $fieldsObj->setVar('field_main', !$field_main); + } + if (isset($_POST['field_search'])) { + $field_search = $fieldsObj->getVar('field_search'); + $fieldsObj->setVar('field_search', !$field_search); + } + if (isset($_POST['field_required'])) { + $field_required = $fieldsObj->getVar('field_required'); + $fieldsObj->setVar('field_required', !$field_required); + } if ($tdmcreate->getHandler('fields')->insert($fieldsObj)) { redirect_header('fields.php', 3, _AM_TDMCREATE_TOGGLE_SUCCESS); } $GLOBALS['xoopsTpl']->assign('error', $fieldsObj->getHtmlErrors()); - } - break; + } + break; } -include __DIR__ . '/footer.php'; \ No newline at end of file +include __DIR__.'/footer.php'; Modified: XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/admin/footer.php =================================================================== --- XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/admin/footer.php 2015-07-01 10:38:11 UTC (rev 13094) +++ XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/admin/footer.php 2015-07-03 12:44:44 UTC (rev 13095) @@ -1,4 +1,5 @@ <?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 @@ -9,13 +10,15 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. */ /** - * tdmcreate module + * tdmcreate module. * * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/ * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html) - * @package tdmcreate + * * @since 2.5.0 + * * @author Txmod Xoops http://www.txmodxoops.org + * * @version $Id: footer.php 12207 2013-10-23 02:46:52Z beckmi $ */ $GLOBALS['xoopsTpl']->assign('module_name', $GLOBALS['xoopsModule']->getVar('name')); Modified: XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/admin/header.php =================================================================== --- XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/admin/header.php 2015-07-01 10:38:11 UTC (rev 13094) +++ XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/admin/header.php 2015-07-03 12:44:44 UTC (rev 13095) @@ -1,4 +1,5 @@ <?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 @@ -9,32 +10,34 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. */ /** - * tdmcreate module + * tdmcreate module. * * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/ * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html) - * @package tdmcreate + * * @since 2.5.0 + * * @author Txmod Xoops http://www.txmodxoops.org + * * @version $Id: header.php 12258 2014-01-02 09:33:29Z timgno $ */ -include_once dirname(dirname(dirname(__DIR__))) . '/include/cp_header.php'; -include_once dirname(__DIR__) . '/include/common.php'; +include_once dirname(dirname(dirname(__DIR__))).'/include/cp_header.php'; +include_once dirname(__DIR__).'/include/common.php'; // $thisDirname = $GLOBALS['xoopsModule']->getVar('dirname'); // Link System Icons $sysPathIcon16 = $GLOBALS['xoopsModule']->getInfo('sysicons16'); $sysPathIcon32 = $GLOBALS['xoopsModule']->getInfo('sysicons32'); // Link Local Icons -$modPathIcon16 = $GLOBALS['xoopsModule']->getInfo('modicons16'); -$modPathIcon32 = $GLOBALS['xoopsModule']->getInfo('modicons32'); +$modPathIcon16 = $GLOBALS['xoopsModule']->getInfo('modicons16'); +$modPathIcon32 = $GLOBALS['xoopsModule']->getInfo('modicons32'); $pathModuleAdmin = $GLOBALS['xoopsModule']->getInfo('dirmoduleadmin'); // TDMCreate Instance $tdmcreate = TDMCreateHelper::getInstance(); // MyTextSanitizer -$myts =& MyTextSanitizer::getInstance(); +$myts = &MyTextSanitizer::getInstance(); if (!isset($xoopsTpl) || !is_object($xoopsTpl)) { - include_once(XOOPS_ROOT_PATH . "/class/template.php"); + include_once XOOPS_ROOT_PATH.'/class/template.php'; $xoopsTpl = new XoopsTpl(); } // System Icons @@ -48,10 +51,10 @@ xoops_loadLanguage('modinfo', $thisDirname); xoops_loadLanguage('main', $thisDirname); // Locad admin menu class -if (file_exists($GLOBALS['xoops']->path($pathModuleAdmin . '/moduleadmin.php'))) { - include_once $GLOBALS['xoops']->path($pathModuleAdmin . '/moduleadmin.php'); +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); + redirect_header('../../../admin.php', 5, _AM_MODULEADMIN_MISSING, false); } xoops_cp_header(); $adminMenu = new ModuleAdmin(); Modified: XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/admin/index.php =================================================================== --- XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/admin/index.php 2015-07-01 10:38:11 UTC (rev 13094) +++ XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/admin/index.php 2015-07-03 12:44:44 UTC (rev 13095) @@ -1,4 +1,5 @@ <?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 @@ -9,42 +10,46 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. */ /** - * tdmcreate module + * tdmcreate module. * * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/ * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html) - * @package tdmcreate + * * @since 2.5.0 + * * @author Txmod Xoops http://www.txmodxoops.org + * * @version $Id: index.php 11084 2013-02-23 15:44:20Z timgno $ */ -include __DIR__ . '/header.php'; +include __DIR__.'/header.php'; +$countSettings = $tdmcreate->getHandler('settings')->getCount(); $countModules = $tdmcreate->getHandler('modules')->getCount(); -$countTables = $tdmcreate->getHandler('tables')->getCount(); -$countFields = $tdmcreate->getHandler('fields')->getCount(); -$countFiles = $tdmcreate->getHandler('morefiles')->getCount(); +$countTables = $tdmcreate->getHandler('tables')->getCount(); +$countFields = $tdmcreate->getHandler('fields')->getCount(); +$countFiles = $tdmcreate->getHandler('morefiles')->getCount(); unset($criteria); $templateMain = 'tdmcreate_index.tpl'; $adminMenu->addInfoBox(_AM_TDMCREATE_ADMIN_NUMMODULES); -$adminMenu->addInfoBoxLine(_AM_TDMCREATE_ADMIN_NUMMODULES, '<label>' . _AM_TDMCREATE_THEREARE_NUMMODULES . '</label>', $countModules, 'Green'); -$adminMenu->addInfoBoxLine(_AM_TDMCREATE_ADMIN_NUMMODULES, '<label>' . _AM_TDMCREATE_THEREARE_NUMTABLES . '</label>', $countTables, 'Orange'); -$adminMenu->addInfoBoxLine(_AM_TDMCREATE_ADMIN_NUMMODULES, '<label>' . _AM_TDMCREATE_THEREARE_NUMFIELDS . '</label>', $countFields, 'Gray'); -$adminMenu->addInfoBoxLine(_AM_TDMCREATE_ADMIN_NUMMODULES, '<label>' . _AM_TDMCREATE_THEREARE_NUMFILES . '</label>', $countFiles, 'Red'); +$adminMenu->addInfoBoxLine(_AM_TDMCREATE_ADMIN_NUMMODULES, '<label>'._AM_TDMCREATE_THEREARE_NUMSETTINGS.'</label>', $countSettings, 'Blue'); +$adminMenu->addInfoBoxLine(_AM_TDMCREATE_ADMIN_NUMMODULES, '<label>'._AM_TDMCREATE_THEREARE_NUMMODULES.'</label>', $countModules, 'Green'); +$adminMenu->addInfoBoxLine(_AM_TDMCREATE_ADMIN_NUMMODULES, '<label>'._AM_TDMCREATE_THEREARE_NUMTABLES.'</label>', $countTables, 'Orange'); +$adminMenu->addInfoBoxLine(_AM_TDMCREATE_ADMIN_NUMMODULES, '<label>'._AM_TDMCREATE_THEREARE_NUMFIELDS.'</label>', $countFields, 'Gray'); +$adminMenu->addInfoBoxLine(_AM_TDMCREATE_ADMIN_NUMMODULES, '<label>'._AM_TDMCREATE_THEREARE_NUMFILES.'</label>', $countFiles, 'Red'); // Upload Folders $folder = array( - TDMC_UPLOAD_PATH, - TDMC_UPLOAD_REPOSITORY_PATH, - TDMC_UPLOAD_IMGMOD_PATH, - TDMC_UPLOAD_IMGTAB_PATH + TDMC_UPLOAD_PATH, + TDMC_UPLOAD_REPOSITORY_PATH, + TDMC_UPLOAD_IMGMOD_PATH, + TDMC_UPLOAD_IMGTAB_PATH, ); // Uploads Folders Created -foreach (array_keys( $folder) as $i) { +foreach (array_keys($folder) as $i) { $adminMenu->addConfigBoxLine($folder[$i], 'folder'); $adminMenu->addConfigBoxLine(array($folder[$i], '777'), 'chmod'); } $GLOBALS['xoopsTpl']->assign('navigation', $adminMenu->addNavigation('index.php')); $GLOBALS['xoopsTpl']->assign('index', $adminMenu->renderIndex()); -include __DIR__ . '/footer.php'; +include __DIR__.'/footer.php'; Modified: XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/admin/menu.php =================================================================== --- XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/admin/menu.php 2015-07-01 10:38:11 UTC (rev 13094) +++ XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/admin/menu.php 2015-07-03 12:44:44 UTC (rev 13095) @@ -1,4 +1,5 @@ <?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 @@ -9,50 +10,53 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. */ /** - * tdmcreate module + * tdmcreate module. * * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/ * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html) - * @package tdmcreate + * * @since 2.5.0 + * * @author Txmod Xoops http://www.txmodxoops.org + * * @version $Id: menu.php 11084 2013-02-23 15:44:20Z timgno $ */ -$module_handler =& xoops_gethandler('module'); -$xoopsModule =& XoopsModule::getByDirname('TDMCreate'); -$moduleInfo =& $module_handler->get($xoopsModule->getVar('mid')); -$sysPathIcon32 = $moduleInfo->getInfo('sysicons32'); -$adminmenu = array(); -$i = 1; +$module_handler = &xoops_gethandler('module'); +$xoopsModule = &XoopsModule::getByDirname('TDMCreate'); +$moduleInfo = &$module_handler->get($xoopsModule->getVar('mid')); +$sysPathIcon32 = $moduleInfo->getInfo('sysicons32'); +$modPathIcon32 = $moduleInfo->getInfo('modicons32'); +$adminmenu = array(); +$i = 1; $adminmenu[$i]['title'] = _MI_TDMCREATE_ADMENU1; -$adminmenu[$i]['link'] = 'admin/index.php'; -$adminmenu[$i]['icon'] = $sysPathIcon32 . '/dashboard.png'; -$i++; +$adminmenu[$i]['link'] = 'admin/index.php'; +$adminmenu[$i]['icon'] = $sysPathIcon32.'/dashboard.png'; +++$i; $adminmenu[$i]['title'] = _MI_TDMCREATE_ADMENU2; -$adminmenu[$i]['link'] = 'admin/settings.php'; -$adminmenu[$i]['icon'] = 'assets/icons/32/settings.png'; -$i++; +$adminmenu[$i]['link'] = 'admin/settings.php'; +$adminmenu[$i]['icon'] = $modPathIcon32.'/settings.png'; +++$i; $adminmenu[$i]['title'] = _MI_TDMCREATE_ADMENU3; -$adminmenu[$i]['link'] = 'admin/modules.php'; -$adminmenu[$i]['icon'] = 'assets/icons/32/addmodule.png'; -$i++; +$adminmenu[$i]['link'] = 'admin/modules.php'; +$adminmenu[$i]['icon'] = $modPathIcon32.'/addmodule.png'; +++$i; $adminmenu[$i]['title'] = _MI_TDMCREATE_ADMENU4; -$adminmenu[$i]['link'] = 'admin/tables.php'; -$adminmenu[$i]['icon'] = 'assets/icons/32/addtable.png'; -$i++; +$adminmenu[$i]['link'] = 'admin/tables.php'; +$adminmenu[$i]['icon'] = $modPathIcon32.'/addtable.png'; +++$i; $adminmenu[$i]['title'] = _MI_TDMCREATE_ADMENU5; -$adminmenu[$i]['link'] = 'admin/fields.php'; -$adminmenu[$i]['icon'] = 'assets/icons/32/fields.png'; -$i++; +$adminmenu[$i]['link'] = 'admin/fields.php'; +$adminmenu[$i]['icon'] = $modPathIcon32.'/fields.png'; +++$i; $adminmenu[$i]['title'] = _MI_TDMCREATE_ADMENU6; -$adminmenu[$i]['link'] = 'admin/morefiles.php'; -$adminmenu[$i]['icon'] = 'assets/icons/32/files.png'; -$i++; +$adminmenu[$i]['link'] = 'admin/morefiles.php'; +$adminmenu[$i]['icon'] = $modPathIcon32.'/files.png'; +++$i; $adminmenu[$i]['title'] = _MI_TDMCREATE_ADMENU7; -$adminmenu[$i]['link'] = 'admin/building.php'; -$adminmenu[$i]['icon'] = 'assets/icons/32/builder.png'; -$i++; +$adminmenu[$i]['link'] = 'admin/building.php'; +$adminmenu[$i]['icon'] = $modPathIcon32.'/builder.png'; +++$i; $adminmenu[$i]['title'] = _MI_TDMCREATE_ABOUT; -$adminmenu[$i]['link'] = 'admin/about.php'; -$adminmenu[$i]['icon'] = $sysPathIcon32 . '/about.png'; +$adminmenu[$i]['link'] = 'admin/about.php'; +$adminmenu[$i]['icon'] = $sysPathIcon32.'/about.png'; unset($i); Modified: XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/admin/modules.php =================================================================== --- XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/admin/modules.php 2015-07-01 10:38:11 UTC (rev 13094) +++ XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/admin/modules.php 2015-07-03 12:44:44 UTC (rev 13095) @@ -1,4 +1,5 @@ <?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 @@ -9,16 +10,18 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. */ /** - * tdmcreate module + * tdmcreate module. * * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/ * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html) - * @package tdmcreate + * * @since 2.5.5 + * * @author Txmod Xoops <su...@tx...> + * * @version $Id: 1.59 modules.php 11297 2013-03-24 10:58:10Z timgno $ */ -include __DIR__ . '/header.php'; +include __DIR__.'/header.php'; // Recovered value of argument op in the URL $ $op = XoopsRequest::getString('op', 'list'); // @@ -36,12 +39,10 @@ $GLOBALS['xoopsTpl']->assign('navigation', $adminMenu->addNavigation('modules.php')); $adminMenu->addItemButton(_AM_TDMCREATE_ADD_MODULE, 'modules.php?op=new', 'add'); $GLOBALS['xoopsTpl']->assign('buttons', $adminMenu->renderButton()); - $GLOBALS['xoopsTpl']->assign('tdmc_url', TDMC_URL); $GLOBALS['xoopsTpl']->assign('tdmc_upload_imgmod_url', TDMC_UPLOAD_IMGMOD_URL); - $GLOBALS['xoopsTpl']->assign('modPathIcon16', $modPathIcon16); - $GLOBALS['xoopsTpl']->assign('sysPathIcon32', $sysPathIcon32); + $GLOBALS['xoopsTpl']->assign('modPathIcon16', TDMC_URL.'/'.$modPathIcon16); $modulesCount = $tdmcreate->getHandler('modules')->getCountModules(); - $modulesAll = $tdmcreate->getHandler('modules')->getAllModules($start, $limit); + $modulesAll = $tdmcreate->getHandler('modules')->getAllModules($start, $limit); // Redirect if there aren't modules if (0 == $modulesCount) { redirect_header('modules.php?op=new', 2, _AM_TDMCREATE_NOTMODULES); @@ -54,8 +55,8 @@ unset($module); } if ($modulesCount > $limit) { - include_once XOOPS_ROOT_PATH . '/class/pagenav.php'; - $pagenav = new XoopsPageNav($modulesCount, $limit, $start, 'start', 'op=list&limit=' . $limit); + include_once XOOPS_ROOT_PATH.'/class/pagenav.php'; + $pagenav = new XoopsPageNav($modulesCount, $limit, $start, 'start', 'op=list&limit='.$limit); $GLOBALS['xoopsTpl']->assign('pagenav', $pagenav->renderNav(4)); } } else { @@ -71,8 +72,8 @@ $adminMenu->addItemButton(_AM_TDMCREATE_MODULES_LIST, 'modules.php', 'list'); $GLOBALS['xoopsTpl']->assign('buttons', $adminMenu->renderButton()); - $modulesObj =& $tdmcreate->getHandler('modules')->create(); - $form = $modulesObj->getForm(); + $modulesObj = &$tdmcreate->getHandler('modules')->create(); + $form = $modulesObj->getForm(); $GLOBALS['xoopsTpl']->assign('form', $form->render()); break; @@ -81,37 +82,37 @@ redirect_header('modules.php', 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors())); } if (isset($modId)) { - $modulesObj =& $tdmcreate->getHandler('modules')->get($modId); + $modulesObj = &$tdmcreate->getHandler('modules')->get($modId); } else { - $modulesObj =& $tdmcreate->getHandler('modules')->create(); + $modulesObj = &$tdmcreate->getHandler('modules')->create(); } $moduleDirname = preg_replace('/[^a-zA-Z0-9]\s+/', '', strtolower($_POST['mod_dirname'])); //Form module save $modulesObj->setVars(array( - 'mod_name' => $_POST['mod_name'], - 'mod_dirname' => $moduleDirname, - 'mod_version' => $_POST['mod_version'], - 'mod_since' => $_POST['mod_since'], - 'mod_min_php' => $_POST['mod_min_php'], - 'mod_min_xoops' => $_POST['mod_min_xoops'], - 'mod_min_admin' => $_POST['mod_min_admin'], - 'mod_min_mysql' => $_POST['mod_min_mysql'], - 'mod_description' => $_POST['mod_description'], - 'mod_author' => $_POST['mod_author'], - 'mod_author_mail' => $_POST['mod_author_mail'], - 'mod_author_website_url' => $_POST['mod_author_website_url'], + 'mod_name' => $_POST['mod_name'], + 'mod_dirname' => $moduleDirname, + 'mod_version' => $_POST['mod_version'], + 'mod_since' => $_POST['mod_since'], + 'mod_min_php' => $_POST['mod_min_php'], + 'mod_min_xoops' => $_POST['mod_min_xoops'], + 'mod_min_admin' => $_POST['mod_min_admin'], + 'mod_min_mysql' => $_POST['mod_min_mysql'], + 'mod_description' => $_POST['mod_description'], + 'mod_author' => $_POST['mod_author'], + 'mod_author_mail' => $_POST['mod_author_mail'], + 'mod_author_website_url' => $_POST['mod_author_website_url'], 'mod_author_website_name' => $_POST['mod_author_website_name'], - 'mod_credits' => $_POST['mod_credits'], - 'mod_license' => $_POST['mod_license'], - 'mod_release_info' => $_POST['mod_release_info'], - 'mod_release_file' => $_POST['mod_release_file'], - 'mod_manual' => $_POST['mod_... [truncated message content] |
From: <be...@us...> - 2015-07-01 10:38:13
|
Revision: 13094 http://sourceforge.net/p/xoops/svn/13094 Author: beckmi Date: 2015-07-01 10:38:11 +0000 (Wed, 01 Jul 2015) Log Message: ----------- forking luciorota's version Added Paths: ----------- XoopsModules/xnews/branches/mamba/ |
From: <wis...@us...> - 2015-06-29 18:11:29
|
Revision: 13093 http://sourceforge.net/p/xoops/svn/13093 Author: wishcraft Date: 2015-06-29 18:11:25 +0000 (Mon, 29 Jun 2015) Log Message: ----------- Intial planning for Email Ticketter with secondary raise to MantisBT for second level support and faults! Added Paths: ----------- XoopsModules/please/ XoopsModules/please/trunk/ XoopsModules/please/trunk/admin/ XoopsModules/please/trunk/blocks/ XoopsModules/please/trunk/class/ XoopsModules/please/trunk/class/IncomingMail.php XoopsModules/please/trunk/class/Mailbox.php XoopsModules/please/trunk/class/imap.php XoopsModules/please/trunk/class/pop3.php XoopsModules/please/trunk/crons/ XoopsModules/please/trunk/image/ XoopsModules/please/trunk/include/ XoopsModules/please/trunk/include/common.php XoopsModules/please/trunk/include/functions.php XoopsModules/please/trunk/index.php XoopsModules/please/trunk/language/ XoopsModules/please/trunk/language/english/ XoopsModules/please/trunk/language/english/admin.php XoopsModules/please/trunk/language/english/blocks.php XoopsModules/please/trunk/language/english/errors.php XoopsModules/please/trunk/language/english/mail_template/ XoopsModules/please/trunk/language/english/main.php XoopsModules/please/trunk/language/english/modinfo.php XoopsModules/please/trunk/mantis.php XoopsModules/please/trunk/preloads/ XoopsModules/please/trunk/preloads/sef.php XoopsModules/please/trunk/sql/ XoopsModules/please/trunk/sql/mysqli.sql XoopsModules/please/trunk/templates/ XoopsModules/please/trunk/templates/admin/ XoopsModules/please/trunk/templates/blocks/ XoopsModules/please/trunk/templates/salts.php.tpl XoopsModules/please/trunk/xoops_version.php Added: XoopsModules/please/trunk/class/IncomingMail.php =================================================================== --- XoopsModules/please/trunk/class/IncomingMail.php (rev 0) +++ XoopsModules/please/trunk/class/IncomingMail.php 2015-06-29 18:11:25 UTC (rev 13093) @@ -0,0 +1,86 @@ +<?php +/** + * Please Email Ticketer of Batch Group & User Emails + * + * 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. + * + * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/ + * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html) + * @author Simon Roberts (wishcraft) <wis...@us...> + * @subpackage please + * @description Email Ticking for Support/Faults/Management of Batch Group & User managed emails tickets + * @version 1.0.5 + * @link https://sourceforge.net/projects/chronolabs/files/XOOPS%202.5/Modules/please + * @link https://sourceforge.net/projects/chronolabs/files/XOOPS%202.6/Modules/please + * @link https://sourceforge.net/p/xoops/svn/HEAD/tree/XoopsModules/please + * @link http://internetfounder.wordpress.com + */ + +namespace PhpImap; + +/** + * @see https://github.com/barbushin/php-imap + * @author Barbushin Sergey http://linkedin.com/in/barbushin + */ +class IncomingMail { + + public $id; + public $date; + public $subject; + + public $fromName; + public $fromAddress; + + public $to = array(); + public $toString; + public $cc = array(); + public $replyTo = array(); + + public $textPlain; + public $textHtml; + /** @var IncomingMailAttachment[] */ + protected $attachments = array(); + + public function addAttachment(IncomingMailAttachment $attachment) { + $this->attachments[$attachment->id] = $attachment; + } + + /** + * @return IncomingMailAttachment[] + */ + public function getAttachments() { + return $this->attachments; + } + + /** + * Get array of internal HTML links placeholders + * @return array attachmentId => link placeholder + */ + public function getInternalLinksPlaceholders() { + return preg_match_all('/=["\'](ci?d:([\w\.%*@-]+))["\']/i', $this->textHtml, $matches) ? array_combine($matches[2], $matches[1]) : array(); + + } + + public function replaceInternalLinks($baseUri) { + $baseUri = rtrim($baseUri, '\\/') . '/'; + $fetchedHtml = $this->textHtml; + foreach($this->getInternalLinksPlaceholders() as $attachmentId => $placeholder) { + if(isset($this->attachments[$attachmentId])) { + $fetchedHtml = str_replace($placeholder, $baseUri . basename($this->attachments[$attachmentId]->filePath), $fetchedHtml); + } + } + return $fetchedHtml; + } +} + +class IncomingMailAttachment { + + public $id; + public $name; + public $filePath; +} Added: XoopsModules/please/trunk/class/Mailbox.php =================================================================== --- XoopsModules/please/trunk/class/Mailbox.php (rev 0) +++ XoopsModules/please/trunk/class/Mailbox.php 2015-06-29 18:11:25 UTC (rev 13093) @@ -0,0 +1,624 @@ +<?php +/** + * Please Email Ticketer of Batch Group & User Emails + * + * 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. + * + * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/ + * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html) + * @author Simon Roberts (wishcraft) <wis...@us...> + * @subpackage please + * @description Email Ticking for Support/Faults/Management of Batch Group & User managed emails tickets + * @version 1.0.5 + * @link https://sourceforge.net/projects/chronolabs/files/XOOPS%202.5/Modules/please + * @link https://sourceforge.net/projects/chronolabs/files/XOOPS%202.6/Modules/please + * @link https://sourceforge.net/p/xoops/svn/HEAD/tree/XoopsModules/please + * @link http://internetfounder.wordpress.com + */ + +namespace PhpImap; + +use stdClass; + +/** + * @see https://github.com/barbushin/php-imap + * @author Barbushin Sergey http://linkedin.com/in/barbushin + */ +class Mailbox { + + protected $imapPath; + protected $imapLogin; + protected $imapPassword; + protected $imapOptions = 0; + protected $imapRetriesNum = 0; + protected $imapParams = array(); + protected $serverEncoding; + protected $attachmentsDir; + + public function __construct($imapPath, $login, $password, $attachmentsDir = null, $serverEncoding = 'UTF-8') { + $this->imapPath = $imapPath; + $this->imapLogin = $login; + $this->imapPassword = $password; + $this->serverEncoding = strtoupper($serverEncoding); + if($attachmentsDir) { + if(!is_dir($attachmentsDir)) { + throw new Exception('Directory "' . $attachmentsDir . '" not found'); + } + $this->attachmentsDir = rtrim(realpath($attachmentsDir), '\\/'); + } + } + + /** + * Set custom connection arguments of imap_open method. See http://php.net/imap_open + * @param int $options + * @param int $retriesNum + * @param array $params + */ + public function setConnectionArgs($options = 0, $retriesNum = 0, array $params = null) { + $this->imapOptions = $options; + $this->imapRetriesNum = $retriesNum; + $this->imapParams = $params; + } + + /** + * Get IMAP mailbox connection stream + * @param bool $forceConnection Initialize connection if it's not initialized + * @return null|resource + */ + public function getImapStream($forceConnection = true) { + static $imapStream; + if($forceConnection) { + if($imapStream && (!is_resource($imapStream) || !imap_ping($imapStream))) { + $this->disconnect(); + $imapStream = null; + } + if(!$imapStream) { + $imapStream = $this->initImapStream(); + } + } + return $imapStream; + } + + protected function initImapStream() { + $imapStream = @imap_open($this->imapPath, $this->imapLogin, $this->imapPassword, $this->imapOptions, $this->imapRetriesNum, $this->imapParams); + if(!$imapStream) { + throw new Exception('Connection error: ' . imap_last_error()); + } + return $imapStream; + } + + protected function disconnect() { + $imapStream = $this->getImapStream(false); + if($imapStream && is_resource($imapStream)) { + imap_close($imapStream, CL_EXPUNGE); + } + } + + /** + * Get information about the current mailbox. + * + * Returns the information in an object with following properties: + * Date - current system time formatted according to RFC2822 + * Driver - protocol used to access this mailbox: POP3, IMAP, NNTP + * Mailbox - the mailbox name + * Nmsgs - number of mails in the mailbox + * Recent - number of recent mails in the mailbox + * + * @return stdClass + */ + public function checkMailbox() { + return imap_check($this->getImapStream()); + } + + /** + * Creates a new mailbox specified by mailbox. + * + * @return bool + */ + + public function createMailbox() { + return imap_createmailbox($this->getImapStream(), imap_utf7_encode($this->imapPath)); + } + + /** + * Gets status information about the given mailbox. + * + * This function returns an object containing status information. + * The object has the following properties: messages, recent, unseen, uidnext, and uidvalidity. + * + * @return stdClass if the box doesn't exist + */ + + public function statusMailbox() { + return imap_status($this->getImapStream(), $this->imapPath, SA_ALL); + } + + + /** + * Gets listing the folders + * + * This function returns an object containing listing the folders. + * The object has the following properties: messages, recent, unseen, uidnext, and uidvalidity. + * + * @return array listing the folders + */ + + public function getListingFolders() { + $folders = imap_list($this->getImapStream(), $this->imapPath, "*"); + foreach ($folders as $key => $folder) + { + $folder = str_replace($this->imapPath, "", imap_utf7_decode($folder)); + $folders[$key] = $folder; + } + return $folders; + } + + + /** + * This function performs a search on the mailbox currently opened in the given IMAP stream. + * For example, to match all unanswered mails sent by Mom, you'd use: "UNANSWERED FROM mom". + * Searches appear to be case insensitive. This list of criteria is from a reading of the UW + * c-client source code and may be incomplete or inaccurate (see also RFC2060, section 6.4.4). + * + * @param string $criteria String, delimited by spaces, in which the following keywords are allowed. Any multi-word arguments (e.g. FROM "joey smith") must be quoted. Results will match all criteria entries. + * ALL - return all mails matching the rest of the criteria + * ANSWERED - match mails with the \\ANSWERED flag set + * BCC "string" - match mails with "string" in the Bcc: field + * BEFORE "date" - match mails with Date: before "date" + * BODY "string" - match mails with "string" in the body of the mail + * CC "string" - match mails with "string" in the Cc: field + * DELETED - match deleted mails + * FLAGGED - match mails with the \\FLAGGED (sometimes referred to as Important or Urgent) flag set + * FROM "string" - match mails with "string" in the From: field + * KEYWORD "string" - match mails with "string" as a keyword + * NEW - match new mails + * OLD - match old mails + * ON "date" - match mails with Date: matching "date" + * RECENT - match mails with the \\RECENT flag set + * SEEN - match mails that have been read (the \\SEEN flag is set) + * SINCE "date" - match mails with Date: after "date" + * SUBJECT "string" - match mails with "string" in the Subject: + * TEXT "string" - match mails with text "string" + * TO "string" - match mails with "string" in the To: + * UNANSWERED - match mails that have not been answered + * UNDELETED - match mails that are not deleted + * UNFLAGGED - match mails that are not flagged + * UNKEYWORD "string" - match mails that do not have the keyword "string" + * UNSEEN - match mails which have not been read yet + * + * @return array Mails ids + */ + public function searchMailbox($criteria = 'ALL') { + $mailsIds = imap_search($this->getImapStream(), $criteria, SE_UID, $this->serverEncoding); + return $mailsIds ? $mailsIds : array(); + } + + /** + * Save mail body. + * @return bool + */ + public function saveMail($mailId, $filename = 'email.eml') { + return imap_savebody($this->getImapStream(), $filename, $mailId, "", FT_UID); + } + + /** + * Marks mails listed in mailId for deletion. + * @return bool + */ + public function deleteMail($mailId) { + return imap_delete($this->getImapStream(), $mailId, FT_UID); + } + + public function moveMail($mailId, $mailBox) { + return imap_mail_move($this->getImapStream(), $mailId, $mailBox, CP_UID) && $this->expungeDeletedMails(); + } + + /** + * Deletes all the mails marked for deletion by imap_delete(), imap_mail_move(), or imap_setflag_full(). + * @return bool + */ + public function expungeDeletedMails() { + return imap_expunge($this->getImapStream()); + } + + /** + * Add the flag \Seen to a mail. + * @return bool + */ + public function markMailAsRead($mailId) { + return $this->setFlag(array($mailId), '\\Seen'); + } + + /** + * Remove the flag \Seen from a mail. + * @return bool + */ + public function markMailAsUnread($mailId) { + return $this->clearFlag(array($mailId), '\\Seen'); + } + + /** + * Add the flag \Flagged to a mail. + * @return bool + */ + public function markMailAsImportant($mailId) { + return $this->setFlag(array($mailId), '\\Flagged'); + } + + /** + * Add the flag \Seen to a mails. + * @return bool + */ + public function markMailsAsRead(array $mailId) { + return $this->setFlag($mailId, '\\Seen'); + } + + /** + * Remove the flag \Seen from some mails. + * @return bool + */ + public function markMailsAsUnread(array $mailId) { + return $this->clearFlag($mailId, '\\Seen'); + } + + /** + * Add the flag \Flagged to some mails. + * @return bool + */ + public function markMailsAsImportant(array $mailId) { + return $this->setFlag($mailId, '\\Flagged'); + } + + /** + * Causes a store to add the specified flag to the flags set for the mails in the specified sequence. + * + * @param array $mailsIds + * @param string $flag which you can set are \Seen, \Answered, \Flagged, \Deleted, and \Draft as defined by RFC2060. + * @return bool + */ + public function setFlag(array $mailsIds, $flag) { + return imap_setflag_full($this->getImapStream(), implode(',', $mailsIds), $flag, ST_UID); + } + + /** + * Cause a store to delete the specified flag to the flags set for the mails in the specified sequence. + * + * @param array $mailsIds + * @param string $flag which you can set are \Seen, \Answered, \Flagged, \Deleted, and \Draft as defined by RFC2060. + * @return bool + */ + public function clearFlag(array $mailsIds, $flag) { + return imap_clearflag_full($this->getImapStream(), implode(',', $mailsIds), $flag, ST_UID); + } + + /** + * Fetch mail headers for listed mails ids + * + * Returns an array of objects describing one mail header each. The object will only define a property if it exists. The possible properties are: + * subject - the mails subject + * from - who sent it + * to - recipient + * date - when was it sent + * message_id - Mail-ID + * references - is a reference to this mail id + * in_reply_to - is a reply to this mail id + * size - size in bytes + * uid - UID the mail has in the mailbox + * msgno - mail sequence number in the mailbox + * recent - this mail is flagged as recent + * flagged - this mail is flagged + * answered - this mail is flagged as answered + * deleted - this mail is flagged for deletion + * seen - this mail is flagged as already read + * draft - this mail is flagged as being a draft + * + * @param array $mailsIds + * @return array + */ + public function getMailsInfo(array $mailsIds) { + $mails = imap_fetch_overview($this->getImapStream(), implode(',', $mailsIds), FT_UID); + if(is_array($mails) && count($mails)) + { + foreach($mails as &$mail) + { + if(isset($mail->subject)) { + $mail->subject = $this->decodeMimeStr($mail->subject, $this->serverEncoding); + } + if(isset($mail->from)) { + $mail->from = $this->decodeMimeStr($mail->from, $this->serverEncoding); + } + if(isset($mail->to)) { + $mail->to = $this->decodeMimeStr($mail->to, $this->serverEncoding); + } + } + } + return $mails; + } + + /** + * Get information about the current mailbox. + * + * Returns an object with following properties: + * Date - last change (current datetime) + * Driver - driver + * Mailbox - name of the mailbox + * Nmsgs - number of messages + * Recent - number of recent messages + * Unread - number of unread messages + * Deleted - number of deleted messages + * Size - mailbox size + * + * @return object Object with info | FALSE on failure + */ + + public function getMailboxInfo() { + return imap_mailboxmsginfo($this->getImapStream()); + } + + /** + * Gets mails ids sorted by some criteria + * + * Criteria can be one (and only one) of the following constants: + * SORTDATE - mail Date + * SORTARRIVAL - arrival date (default) + * SORTFROM - mailbox in first From address + * SORTSUBJECT - mail subject + * SORTTO - mailbox in first To address + * SORTCC - mailbox in first cc address + * SORTSIZE - size of mail in octets + * + * @param int $criteria + * @param bool $reverse + * @return array Mails ids + */ + public function sortMails($criteria = SORTARRIVAL, $reverse = true) { + return imap_sort($this->getImapStream(), $criteria, $reverse, SE_UID); + } + + /** + * Get mails count in mail box + * @return int + */ + public function countMails() { + return imap_num_msg($this->getImapStream()); + } + + /** + * Retrieve the quota settings per user + * @return array - FALSE in the case of call failure + */ + protected function getQuota() { + return imap_get_quotaroot($this->getImapStream(), 'INBOX'); + } + + /** + * Return quota limit in KB + * @return int - FALSE in the case of call failure + */ + public function getQuotaLimit() { + $quota = $this->getQuota(); + if(is_array($quota)) { + $quota = $quota['STORAGE']['limit']; + } + return $quota; + } + + /** + * Return quota usage in KB + * @return int - FALSE in the case of call failure + */ + public function getQuotaUsage() { + $quota = $this->getQuota(); + if(is_array($quota)) { + $quota = $quota['STORAGE']['usage']; + } + return $quota; + } + + /** + * Get mail data + * + * @param $mailId + * @return IncomingMail + */ + public function getMail($mailId) { + $head = imap_rfc822_parse_headers(imap_fetchheader($this->getImapStream(), $mailId, FT_UID)); + + $mail = new IncomingMail(); + $mail->id = $mailId; + $mail->date = date('Y-m-d H:i:s', isset($head->date) ? strtotime(preg_replace('/\(.*?\)/', '', $head->date)) : time()); + $mail->subject = isset($head->subject) ? $this->decodeMimeStr($head->subject, $this->serverEncoding) : null; + $mail->fromName = isset($head->from[0]->personal) ? $this->decodeMimeStr($head->from[0]->personal, $this->serverEncoding) : null; + $mail->fromAddress = strtolower($head->from[0]->mailbox . '@' . $head->from[0]->host); + + if(isset($head->to)) { + $toStrings = array(); + foreach($head->to as $to) { + if(!empty($to->mailbox) && !empty($to->host)) { + $toEmail = strtolower($to->mailbox . '@' . $to->host); + $toName = isset($to->personal) ? $this->decodeMimeStr($to->personal, $this->serverEncoding) : null; + $toStrings[] = $toName ? "$toName <$toEmail>" : $toEmail; + $mail->to[$toEmail] = $toName; + } + } + $mail->toString = implode(', ', $toStrings); + } + + if(isset($head->cc)) { + foreach($head->cc as $cc) { + $mail->cc[strtolower($cc->mailbox . '@' . $cc->host)] = isset($cc->personal) ? $this->decodeMimeStr($cc->personal, $this->serverEncoding) : null; + } + } + + if(isset($head->reply_to)) { + foreach($head->reply_to as $replyTo) { + $mail->replyTo[strtolower($replyTo->mailbox . '@' . $replyTo->host)] = isset($replyTo->personal) ? $this->decodeMimeStr($replyTo->personal, $this->serverEncoding) : null; + } + } + + $mailStructure = imap_fetchstructure($this->getImapStream(), $mailId, FT_UID); + + if(empty($mailStructure->parts)) { + $this->initMailPart($mail, $mailStructure, 0); + } + else { + foreach($mailStructure->parts as $partNum => $partStructure) { + $this->initMailPart($mail, $partStructure, $partNum + 1); + } + } + + return $mail; + } + + protected function initMailPart(IncomingMail $mail, $partStructure, $partNum) { + $data = $partNum ? imap_fetchbody($this->getImapStream(), $mail->id, $partNum, FT_UID) : imap_body($this->getImapStream(), $mail->id, FT_UID); + + if($partStructure->encoding == 1) { + $data = imap_utf8($data); + } + elseif($partStructure->encoding == 2) { + $data = imap_binary($data); + } + elseif($partStructure->encoding == 3) { + $data = imap_base64($data); + } + elseif($partStructure->encoding == 4) { + $data = imap_qprint($data); + } + + $params = array(); + if(!empty($partStructure->parameters)) { + foreach($partStructure->parameters as $param) { + $params[strtolower($param->attribute)] = $param->value; + } + } + if(!empty($partStructure->dparameters)) { + foreach($partStructure->dparameters as $param) { + $paramName = strtolower(preg_match('~^(.*?)\*~', $param->attribute, $matches) ? $matches[1] : $param->attribute); + if(isset($params[$paramName])) { + $params[$paramName] .= $param->value; + } + else { + $params[$paramName] = $param->value; + } + } + } + + // attachments + $attachmentId = $partStructure->ifid + ? trim($partStructure->id, " <>") + : (isset($params['filename']) || isset($params['name']) ? mt_rand() . mt_rand() : null); + + if($attachmentId) { + if(empty($params['filename']) && empty($params['name'])) { + $fileName = $attachmentId . '.' . strtolower($partStructure->subtype); + } + else { + $fileName = !empty($params['filename']) ? $params['filename'] : $params['name']; + $fileName = $this->decodeMimeStr($fileName, $this->serverEncoding); + $fileName = $this->decodeRFC2231($fileName, $this->serverEncoding); + } + $attachment = new IncomingMailAttachment(); + $attachment->id = $attachmentId; + $attachment->name = $fileName; + if($this->attachmentsDir) { + $replace = array( + '/\s/' => '_', + '/[^0-9a-zа-яіїє_\.]/iu' => '', + '/_+/' => '_', + '/(^_)|(_$)/' => '', + ); + $fileSysName = preg_replace('~[\\\\/]~', '', $mail->id . '_' . $attachmentId . '_' . preg_replace(array_keys($replace), $replace, $fileName)); + $attachment->filePath = $this->attachmentsDir . DIRECTORY_SEPARATOR . $fileSysName; + file_put_contents($attachment->filePath, $data); + } + $mail->addAttachment($attachment); + } + else { + if(!empty($params['charset'])) { + $data = $this->convertStringEncoding($data, $params['charset'], $this->serverEncoding); + } + if($partStructure->type == 0 && $data) { + if(strtolower($partStructure->subtype) == 'plain') { + $mail->textPlain .= $data; + } + else { + $mail->textHtml .= $data; + } + } + elseif($partStructure->type == 2 && $data) { + $mail->textPlain .= trim($data); + } + } + if(!empty($partStructure->parts)) { + foreach($partStructure->parts as $subPartNum => $subPartStructure) { + if($partStructure->type == 2 && $partStructure->subtype == 'RFC822') { + $this->initMailPart($mail, $subPartStructure, $partNum); + } + else { + $this->initMailPart($mail, $subPartStructure, $partNum . '.' . ($subPartNum + 1)); + } + } + } + } + + protected function decodeMimeStr($string, $charset = 'utf-8') { + $newString = ''; + $elements = imap_mime_header_decode($string); + for($i = 0; $i < count($elements); $i++) { + if($elements[$i]->charset == 'default') { + $elements[$i]->charset = 'iso-8859-1'; + } + $newString .= $this->convertStringEncoding($elements[$i]->text, $elements[$i]->charset, $charset); + } + return $newString; + } + + function isUrlEncoded($string) { + $hasInvalidChars = preg_match( '#[^%a-zA-Z0-9\-_\.\+]#', $string ); + $hasEscapedChars = preg_match( '#%[a-zA-Z0-9]{2}#', $string ); + return !$hasInvalidChars && $hasEscapedChars; + } + + protected function decodeRFC2231($string, $charset = 'utf-8') { + if(preg_match("/^(.*?)'.*?'(.*?)$/", $string, $matches)) { + $encoding = $matches[1]; + $data = $matches[2]; + if($this->isUrlEncoded($data)) { + $string = $this->convertStringEncoding(urldecode($data), $encoding, $charset); + } + } + return $string; + } + + /** + * Converts a string from one encoding to another. + * @param string $string + * @param string $fromEncoding + * @param string $toEncoding + * @return string Converted string if conversion was successful, or the original string if not + */ + protected function convertStringEncoding($string, $fromEncoding, $toEncoding) { + $convertedString = null; + if($string && $fromEncoding != $toEncoding) { + $convertedString = @iconv($fromEncoding, $toEncoding . '//IGNORE', $string); + if(!$convertedString && extension_loaded('mbstring')) { + $convertedString = @mb_convert_encoding($string, $toEncoding, $fromEncoding); + } + } + return $convertedString ?: $string; + } + + public function __destruct() { + $this->disconnect(); + } +} + +class Exception extends \Exception { + +} Added: XoopsModules/please/trunk/class/imap.php =================================================================== --- XoopsModules/please/trunk/class/imap.php (rev 0) +++ XoopsModules/please/trunk/class/imap.php 2015-06-29 18:11:25 UTC (rev 13093) @@ -0,0 +1,705 @@ +<?php +/** + * Please Email Ticketer of Batch Group & User Emails + * + * 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. + * + * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/ + * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html) + * @author Simon Roberts (wishcraft) <wis...@us...> + * @subpackage please + * @description Email Ticking for Support/Faults/Management of Batch Group & User managed emails tickets + * @version 1.0.5 + * @link https://sourceforge.net/projects/chronolabs/files/XOOPS%202.5/Modules/please + * @link https://sourceforge.net/projects/chronolabs/files/XOOPS%202.6/Modules/please + * @link https://sourceforge.net/p/xoops/svn/HEAD/tree/XoopsModules/please + * @link http://internetfounder.wordpress.com + */ + +/** + * The Imap PHP class provides a wrapper for commonly used PHP IMAP functions. + * + * This class was originally written by Josh Grochowski, and was reformatted and + * documented by Jeff Geerling. + * + * Usage examples can be found in the included README file, and all methods + * should have adequate documentation to get you started. + * + * Quick Start: + * @code + * include 'path/to/Imap/JJG/Imap.php'; + * use \JJG\Imap as Imap; + * $mailbox = new Imap($host, $user, $pass, $port, $ssl, $folder); + * $mailbox->getMailboxInfo(); + * @endcode + * + * Minimum requirements: PHP 5.3.x, php5-imap + * + * @version 1.0-beta2 + * @author Josh Grochowski (josh[at]kastang[dot]com). + * @author Jeff Geerling (geerlingguy). + */ + +namespace JJG; + +class Imap { + + private $host; + private $user; + private $pass; + private $port; + private $folder; + private $ssl; + + private $baseAddress; + private $address; + private $mailbox; + + /** + * Called when the Imap object is created. + * + * Sample of a complete address: {imap.gmail.com:993/imap/ssl}INBOX + * + * @param $host (string) + * The IMAP hostname. Example: imap.gmail.com + * @param $port (int) + * Example: 933 + * @param $ssl (bool) + * TRUE to use SSL, FALSE for no SSL. + * @param $folder (string) + * IMAP Folder to open. + * @param $user (string) + * Username used for connection. Gmail uses full use...@gm..., but + * many providers simply use username. + * @param $pass (string) + * Account password. + * + * @return (empty) + */ + public function __construct($host, $user, $pass, $port, $ssl = true, $folder = 'INBOX') { + if ((!isset($host)) || (!isset($user)) || (!isset($pass)) || (!isset($port))) { + throw new Exception("Error: All Constructor values require a non NULL input."); + } + + $this->host = $host; + $this->user = $user; + $this->pass = $pass; + $this->port = $port; + $this->folder = $folder; + $this->ssl = $ssl; + + $this->changeLoginInfo($host, $user, $pass, $port, $ssl, $folder); + } + + /** + * Change IMAP folders and reconnect to the server. + * + * @param $folderName + * The name of the folder to change to. + * + * @return (empty) + */ + public function changeFolder($folderName) { + if ($this->ssl) { + $address = '{' . $this->host . ':' . $this->port . '/imap/ssl}' . $folderName; + } else { + $address = '{' . $this->host . ':' . $this->port . '/imap}' . $folderName; + } + + $this->address = $address; + $this->reconnect(); + } + + /** + * Log into an IMAP server. + * + * This method is called on the initialization of the class (see + * __construct()), and whenever you need to log into a different account. + * + * Please see __construct() for parameter info. + * + * @return (empty) + * + * @throws Exception when IMAP can't connect. + */ + public function changeLoginInfo($host, $user, $pass, $port, $ssl, $folder) { + if ($ssl) { + $baseAddress = '{' . $host . ':' . $port . '/imap/ssl}'; + $address = $baseAddress . $folder; + } else { + $baseAddress = '{' . $host . ':' . $port . '/imap}'; + $address = $baseAddress . $folder; + } + + // Set the new address and the base address. + $this->baseAddress = $baseAddress; + $this->address = $address; + + // Open new IMAP connection + if ($mailbox = imap_open($address, $user, $pass)) { + $this->mailbox = $mailbox; + } else { + throw new Exception("Error: " . imap_last_error()); + } + } + + /** + * Returns an associative array with detailed information about a given + * message. + * + * @param $messageId (int) + * Message id. + * + * @return Associative array with keys (strings unless otherwise noted): + * raw_header + * to + * from + * cc + * bcc + * reply_to + * sender + * date_sent + * subject + * deleted (bool) + * answered (bool) + * draft (bool) + * body + * original_encoding + * size (int) + * auto_response (bool) + * + * @throws Exception when message with given id can't be found. + */ + public function getMessage($messageId) { + $this->tickle(); + + // Get message details. + $details = imap_headerinfo($this->mailbox, $messageId); + if ($details) { + // Get the raw headers. + $raw_header = imap_fetchheader($this->mailbox, $messageId); + + // Detect whether the message is an autoresponse. + $autoresponse = $this->detectAutoresponder($raw_header); + + // Get some basic variables. + $deleted = ($details->Deleted == 'D'); + $answered = ($details->Answered == 'A'); + $draft = ($details->Draft == 'X'); + + // Get the message body. + $body = imap_fetchbody($this->mailbox, $messageId, 1.2); + if (!strlen($body) > 0) { + $body = imap_fetchbody($this->mailbox, $messageId, 1); + } + + // Get the message body encoding. + $encoding = $this->getEncodingType($messageId); + + // Decode body into plaintext (8bit, 7bit, and binary are exempt). + if ($encoding == 'BASE64') { + $body = $this->decodeBase64($body); + } + elseif ($encoding == 'QUOTED-PRINTABLE') { + $body = $this->decodeQuotedPrintable($body); + } + elseif ($encoding == '8BIT') { + $body = $this->decode8Bit($body); + } + elseif ($encoding == '7BIT') { + $body = $this->decode7Bit($body); + } + + // Build the message. + $message = array( + 'raw_header' => $raw_header, + 'to' => $details->toaddress, + 'from' => $details->fromaddress, + 'cc' => isset($details->ccaddress) ? $details->ccaddress : '', + 'bcc' => isset($details->bccaddress) ? $details->bccaddress : '', + 'reply_to' => isset($details->reply_toaddress) ? $details->reply_toaddress : '', + 'sender' => $details->senderaddress, + 'date_sent' => $details->date, + 'subject' => $details->subject, + 'deleted' => $deleted, + 'answered' => $answered, + 'draft' => $draft, + 'body' => $body, + 'original_encoding' => $encoding, + 'size' => $details->Size, + 'auto_response' => $autoresponse, + ); + } + else { + throw new Exception("Message could not be found: " . imap_last_error()); + } + + return $message; + } + + /** + * Deletes an email matching the specified $messageId. + * + * @param $messageId (int) + * Message id. + * @param $immediate (bool) + * Set TRUE if message should be deleted immediately. Otherwise, message + * will not be deleted until disconnect() is called. Normally, this is a + * bad idea, as other message ids will change if a message is deleted. + * + * @return (empty) + * + * @throws Exception when message can't be deleted. + */ + public function deleteMessage($messageId, $immediate = FALSE) { + $this->tickle(); + + // Mark message for deletion. + if (!imap_delete($this->mailbox, $messageId)) { + throw new Exception("Message could not be deleted: " . imap_last_error()); + } + + // Immediately delete the message if $immediate is TRUE. + if ($immediate) { + imap_expunge($this->mailbox); + } + } + + /** + * Moves an email into the given mailbox. + * + * @param $messageId (int) + * Message id. + * @param $folder (string) + * The name of the folder (mailbox) into which messages should be moved. + * $folder could either be the folder name or 'INBOX.foldername'. + * + * @return (bool) + * Returns TRUE on success, FALSE on failure. + */ + public function moveMessage($messageId, $folder) { + $messageRange = $messageId . ':' . $messageId; + return imap_mail_move($this->mailbox, $messageRange, '{sslmail.webguyz.net:143/imap}Questionable'); + } + + /** + * Returns an associative array with email subjects and message ids for all + * messages in the active $folder. + * + * @return Associative array with message id as key and subject as value. + */ + public function getMessageIds() { + $this->tickle(); + + // Fetch overview of mailbox. + $number_messages = imap_num_msg($this->mailbox); + if ($number_messages) { + $overviews = imap_fetch_overview($this->mailbox, "1:" . imap_num_msg($this->mailbox), 0); + } + else { + $overviews = array(); + } + $messageArray = array(); + + // Loop through message overviews, build message array. + foreach($overviews as $overview) { + $messageArray[$overview->msgno] = $overview->subject; + } + + return $messageArray; + } + + /** + * Return an associative array containing the number of recent, unread, and + * total messages. + * + * @return Associative array with keys: + * unread + * recent + * total + */ + public function getCurrentMailboxInfo() { + $this->tickle(); + + // Get general mailbox information. + $info = imap_status($this->mailbox, $this->address, SA_ALL); + $mailInfo = array( + 'unread' => $info->unseen, + 'recent' => $info->recent, + 'total' => $info->messages, + ); + return $mailInfo; + } + + /** + * Return an array of objects containing mailbox information. + * + * @return Array of mailbox names. + */ + public function getMailboxInfo() { + $this->tickle(); + + // Get all mailbox information. + $mailboxInfo = imap_getmailboxes($this->mailbox, $this->baseAddress, '*'); + $mailboxes = array(); + foreach ($mailboxInfo as $mailbox) { + // Remove baseAddress from mailbox name. + $mailboxes[] = array( + 'mailbox' => $mailbox->name, + 'name' => str_replace($this->baseAddress, '', $mailbox->name), + ); + } + + return $mailboxes; + } + + /** + * Decodes Base64-encoded text. + * + * @param $text (string) + * Base64 encoded text to convert. + * + * @return (string) + * Decoded text. + */ + public function decodeBase64($text) { + $this->tickle(); + return imap_base64($text); + } + + /** + * Decodes quoted-printable text. + * + * @param $text (string) + * Quoted printable text to convert. + * + * @return (string) + * Decoded text. + */ + public function decodeQuotedPrintable($text) { + return quoted_printable_decode($text); + } + + /** + * Decodes 8-Bit text. + * + * @param $text (string) + * 8-Bit text to convert. + * + * @return (string) + * Decoded text. + */ + public function decode8Bit($text) { + return quoted_printable_decode(imap_8bit($text)); + } + + /** + * Decodes 7-Bit text. + * + * PHP seems to think that most emails are 7BIT-encoded, therefore this + * decoding method assumes that text passed through may actually be base64- + * encoded, quoted-printable encoded, or just plain text. Instead of passing + * the email directly through a particular decoding function, this method + * runs through a bunch of common encoding schemes to try to decode everything + * and simply end up with something *resembling* plain text. + * + * Results are not guaranteed, but it's pretty good at what it does. + * + * @param $text (string) + * 7-Bit text to convert. + * + * @return (string) + * Decoded text. + */ + public function decode7Bit($text) { + // If there are no spaces on the first line, assume that the body is + // actually base64-encoded, and decode it. + $lines = explode("\r\n", $text); + $first_line_words = explode(' ', $lines[0]); + if ($first_line_words[0] == $lines[0]) { + $text = base64_decode($text); + } + + // Manually convert common encoded characters into their UTF-8 equivalents. + $characters = array( + '=20' => ' ', // space. + '=2C' => ',', // comma. + '=E2=80=99' => "'", // single quote. + '=0A' => "\r\n", // line break. + '=0D' => "\r\n", // carriage return. + '=A0' => ' ', // non-breaking space. + '=B9' => '$sup1', // 1 superscript. + '=C2=A0' => ' ', // non-breaking space. + "=\r\n" => '', // joined line. + '=E2=80=A6' => '…', // ellipsis. + '=E2=80=A2' => '•', // bullet. + '=E2=80=93' => '–', // en dash. + '=E2=80=94' => '—', // em dash. + ); + + // Loop through the encoded characters and replace any that are found. + foreach ($characters as $key => $value) { + $text = str_replace($key, $value, $text); + } + + return $text; + } + + /** + * Strips quotes (older messages) from a message body. + * + * This function removes any lines that begin with a quote character (>). + * Note that quotes in reply bodies will also be removed by this function, + * so only use this function if you're okay with this behavior. + * + * @param $message (string) + * The message to be cleaned. + * @param $plain_text_output (bool) + * Set to TRUE to also run the text through strip_tags() (helpful for + * cleaning up HTML emails). + * + * @return (string) + * Same as message passed in, but with all quoted text removed. + * + * @see http://stackoverflow.com/a/12611562/100134 + */ + public function cleanReplyEmail($message, $plain_text_output = FALSE) { + // Strip markup if $plain_text_output is set. + if ($plain_text_output) { + $message = strip_tags($message); + } + + // Remove quoted lines (lines that begin with '>'). + $message = preg_replace("/(^\w.+:\n)?(^>.*(\n|$))+/mi", '', $message); + + // Remove lines beginning with 'On' and ending with 'wrote:' (matches + // Mac OS X Mail, Gmail). + $message = preg_replace("/^(On).*(wrote:).*$/sm", '', $message); + + // Remove lines like '----- Original Message -----' (some other clients). + // Also remove lines like '--- On ... wrote:' (some other clients). + $message = preg_replace("/^---.*$/mi", '', $message); + + // Remove lines like '____________' (some other clients). + $message = preg_replace("/^____________.*$/mi", '', $message); + + // Remove blocks of text with formats like: + // - 'From: Sent: To: Subject:' + // - 'From: To: Sent: Subject:' + // - 'From: Date: To: Reply-to: Subject:' + $message = preg_replace("/From:.*^(To:).*^(Subject:).*/sm", '', $message); + + // Remove any remaining whitespace. + $message = trim($message); + + return $message; + } + + /** + * Takes in a string of email addresses and returns an array of addresses + * as objects. For example, passing in 'John Doe <jo...@sa...>' + * returns the following array: + * + * Array ( + * [0] => stdClass Object ( + * [mailbox] => johndoe + * [host] => sample.com + * [personal] => John Doe + * ) + * ) + * + * You can pass in a string with as many addresses as you'd like, and each + * address will be parsed into a new object in the returned array. + * + * @param $addresses (string) + * String of one or more email addresses to be parsed. + * + * @return (array) + * Array of parsed email addresses, as objects. + * + * @see imap_rfc822_parse_adrlist(). + */ + public function parseAddresses($addresses) { + return imap_rfc822_parse_adrlist($addresses, '#'); + } + + /** + * Create an email address to RFC822 specifications. + * + * @param $username (string) + * Name before the @ sign in an email address (example: 'johndoe'). + * @param $host (string) + * Address after the @ sign in an email address (example: 'sample.com'). + * @param $name (string) + * Name of the entity (example: 'John Doe'). + * + * @return (string) Email Address in the following format: + * 'John Doe <jo...@sa...>' + */ + public function createAddress($username, $host, $name) { + return imap_rfc822_write_address($username, $host, $name); + } + + /** + * Returns structured information for a given message id. + * + * @param $messageId + * Message id for which structure will be returned. + * + * @return (object) + * See imap_fetchstructure() return values for details. + * + * @see imap_fetchstructure(). + */ + public function getStructure($messageId) { + return imap_fetchstructure($this->mailbox, $messageId); + } + + /** + * Returns the primary body type for a given message id. + * + * @param $messageId (int) + * Message id. + * @param $numeric (bool) + * Set to true for a numerical body type. + * + * @return (mixed) + * Integer value of body type if numeric, string if not numeric. + */ + public function getBodyType($messageId, $numeric = false) { + // See imap_fetchstructure() documentation for explanation. + $types = array( + 0 => 'Text', + 1 => 'Multipart', + 2 => 'Message', + 3 => 'Application', + 4 => 'Audio', + 5 => 'Image', + 6 => 'Video', + 7 => 'Other', + ); + + // Get the structure of the message. + $structure = $this->getStructure($messageId); + + // Return a number or a string, depending on the $numeric value. + if ($numeric) { + return $structure->type; + } else { + return $types[$structure->type]; + } + } + + /** + * Returns the encoding type of a given $messageId. + * + * @param $messageId (int) + * Message id. + * @param $numeric (bool) + * Set to true for a numerical encoding type. + * + * @return (mixed) + * Integer value of body type if numeric, string if not numeric. + */ + public function getEncodingType($messageId, $numeric = false) { + // See imap_fetchstructure() documentation for explanation. + $encodings = array( + 0 => '7BIT', + 1 => '8BIT', + 2 => 'BINARY', + 3 => 'BASE64', + 4 => 'QUOTED-PRINTABLE', + 5 => 'OTHER', + ); + + // Get the structure of the message. + $structure = $this->getStructure($messageId); + + // Return a number or a string, depending on the $numeric value. + if ($numeric) { + return $structure->encoding; + } else { + return $encodings[$structure->encoding]; + } + } + + /** + * Closes an active IMAP connection. + * + * @return (empty) + */ + public function disconnect() { + // Close the connection, deleting all messages marked for deletion. + imap_close($this->mailbox, CL_EXPUNGE); + } + + /** + * Reconnect to the IMAP server. + * + * @return (empty) + * + * @throws Exception when IMAP can't reconnect. + */ + private function reconnect() { + $this->mailbox = imap_open($this->address, $this->user, $this->pass); + if (!$this->mailbox) { + throw new Exception("Reconnection Failure: " . imap_last_error()); + } + } + + /** + * Checks to see if the connection is alive. If not, reconnects to server. + * + * @return (empty) + */ + private function tickle() { + if (!imap_ping($this->mailbox)) { + $this->reconnect; + } + } + + /** + * Determines whether the given message is from an auto-responder. + * + * This method checks whether the header contains any auto response headers as + * outlined in RFC 3834, and also checks to see if the subject line contains + * certain strings set by different email providers to indicate an automatic + * response. + * + * @see http://tools.ietf.org/html/rfc3834 + * + * @param $header (string) + * Message header as returned by imap_fetchheader(). + * + * @return (bool) + * TRUE if this message comes from an autoresponder. + */ + private function detectAutoresponder($header) { + $autoresponder_strings = array( + 'X-Autoresponse:', // Other email servers. + 'X-Autorespond:', // LogSat server. + 'Subject: Auto Response', // Yahoo mail. + 'Out of office', // Generic. + 'Out of the office', // Generic. + 'out of the office', // Generic. + 'Auto-reply', // Generic. + 'Autoreply', // Generic. + 'autoreply', // Generic. + ); + + // Check for presence of different autoresponder strings. + foreach ($autoresponder_strings as $string) { + if (strpos($header, $string) !== false) { + return true; + } + } + + return false; + } + +} Property changes on: XoopsModules/please/trunk/class/imap.php ___________________________________________________________________ Added: svn:executable ## -0,0 +1 ## +* \ No newline at end of property Added: XoopsModules/please/trunk/class/pop3.php =================================================================== --- XoopsModules/please/trunk/class/pop3.php (rev 0) +++ XoopsModules/please/trunk/class/pop3.php 2015-06-29 18:11:25 UTC (rev 13093) @@ -0,0 +1,419 @@ +<?php +/** + * Please Email Ticketer of Batch Group & User Emails + * + * 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. + * + * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/ + * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html) + * @author Simon Roberts (wishcraft) <wis...@us...> + * @subpackage please + * @description Email Ticking for Support/Faults/Management of Batch Group & User managed emails tickets + * @version 1.0.5 + * @link https://sourceforge.net/projects/chronolabs/files/XOOPS%202.5/Modules/please + * @link https://sourceforge.net/projects/chronolabs/files/XOOPS%202.6/Modules/please + * @link https://sourceforge.net/p/xoops/svn/HEAD/tree/XoopsModules/please + * @link http://internetfounder.wordpress.com + */ + +/** + * PHPMailer POP-Before-SMTP Authentication Class. + * PHP Version 5 + * @package PHPMailer + * @link https://github.com/PHPMailer/PHPMailer/ + * @author Marcus Bointon (Synchro/coolbru) <php...@sy...> + * @author Jim Jagielski (jimjag) <ji...@gm...> + * @author Andy Prevost (codeworxtech) <cod...@us...> + * @author Brent R. Matzelle (original founder) + * @copyright 2012 - 2014 Marcus Bointon + * @copyright 2010 - 2012 Jim Jagielski + * @copyright 2004 - 2009 Andy Prevost + * @license http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License + * @note This program is distributed in the hope that it will be useful - WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. + */ + +/** + * PHPMailer POP-Before-SMTP Authentication Class. + * Specifically for PHPMailer to use for RFC1939 POP-before-SMTP authentication. + * Does not support APOP. + * @package PHPMailer + * @author Richard Davey (original author) <ri...@co...> + * @author Marcus Bointon (Synchro/coolbru) <php...@sy...> + * @author Jim Jagielski (jimjag) <ji...@gm...> + * @author Andy Prevost (codeworxtech) <cod...@us...> + */ +class POP3 +{ + /** + * The POP3 PHPMailer Version number. + * @type string + * @access public + */ + public $Version = '5.2.10'; + + /** + * Default POP3 port number. + * @type integer + * @access public + */ + public $POP3_PORT = 110; + + /** + * Default timeout in seconds. + * @type integer + * @access public + */ + public $POP3_TIMEOUT = 30; + + /** + * POP3 Carriage Return + Line Feed. + * @type string + * @access public + * @deprecated Use the constant instead + */ + public $CRLF = "\r\n"; + + /** + * Debug display level. + * Options: 0 = no, 1+ = yes + * @type integer + * @access public + */ + public $do_debug = 0; + + /** + * POP3 mail server hostname. + * @type string + * @access public + */ + public $host; + + /** + * POP3 port number. + * @type integer + * @access public + */ + public $port; + + /** + * POP3 Timeout Value in seconds. + * @type integer + * @access public + */ + public $tval; + + /** + * POP3 username + * @type string + * @access public + */ + public $username; + + /** + * POP3 password. + * @type string + * @access public + */ + public $password; + + /** + * Resource handle for the POP3 connection socket. + * @type resource + * @access private + */ + private $pop_conn; + + /** + * Are we connected? + * @type boolean + * @access private + */ + private $connected = false; + + /** + * Error container. + * @type array + * @access private + */ + private $errors = array(); + + /** + * Line break constant + */ + const CRLF = "\r\n"; + + /** + * Simple static wrapper for all-in-one POP before SMTP + * @param $host + * @param integer|boolean $port The port number to connect to + * @param integer|boolean $timeout The timeout value + * @param string $username + * @param string $password + * @param integer $debug_level + * @return boolean + */ + public static function popBeforeSmtp( + $host, + $port = false, + $timeout = false, + $username = '', + $password = '', + $debug_level = 0 + ) { + $pop = new POP3; + return $pop->authorise($host, $port, $timeout, $username, $password, $debug_level); + } + + /** + * Authenticate with a POP3 server. + * A connect, login, disconnect sequence + * appropriate for POP-before SMTP authorisation. + * @access public + * @param string $host The hostname to connect to + * @param integer|boolean $port The port number to connect to + * @param integer|boolean $timeout The timeout value + * @param string $username + * @param string $password + * @param integer $debug_level + * @return boolean + */ + public function authorise($host, $port = false, $timeout = false, $username = '', $password = '', $debug_level = 0) + { + $this->host = $host; + // If no port value provided, use default + if (false === $port) { + $this->port = $this->POP3_PORT; + } else { + $this->port = (integer)$port; + } + // If no timeout value provided, use default + if (false === $timeout) { + $this->tval = $this->POP3_TIMEOUT; + } else { + $this->tval = (integer)$timeout; + } + $this->do_debug = $debug_level; + $this->username = $username; + $this->password = $password; + // Reset the error log + $this->errors = array(); + // connect + $result = $this->connect($this->host, $this->port, $this->tval); + if ($result) { + $login_result = $this->login($this->username, $this->password); + if ($login_result) { + $this->disconnect(); + return true; + } + } + // We need to disconnect regardless of whether the login succeeded + $this->disconnect(); + return false; + } + + /** + * Connect to a POP3 server. + * @access public + * @param string $host + * @param integer|boolean $port + * @param integer $tval + * @return boolean + */ + public function connect($host, $port = false, $tval = 30) + { + // Are we already connected? + if ($this->connected) { + return true; + } + + //On Windows this will raise a PHP Warning error if the hostname doesn't exist. + //Rather than suppress it with @fsockopen, capture it cleanly instead + set_error_handler(array($this, 'catchWarning')); + + if (false === $port) { + $port = $this->POP3_PORT; + } + + // connect to the POP3 server + $this->pop_conn = fsockopen( + $host, // POP3 Host + $port, // Port # + $errno, // Error Number + $errstr, // Error Message + $tval + ); // Timeout (seconds) + // Restore the error handler + restore_error_handler(); + + // Did we connect? + if (false === $this->pop_conn) { + // It would appear not... + $this->setError(array( + 'error' => "Failed to connect to server $host on port $port", + 'errno' => $errno, + 'errstr' => $errstr + )); + return false; + } + + // Increase the stream time-out + stream_set_timeout($this->pop_conn, $tval, 0); + + // Get the POP3 server response + $pop3_response = $this->getResponse(); + // Check for the +OK + if ($this->checkResponse($pop3_response)) { + // The connection is established and the POP3 server is talking + $this->connected = true; + return true; + } + return false; + } + + /** + * Log in to the POP3 server. + * Does not support APOP (RFC 2828, 4949). + * @access public + * @param string $username + * @param string $password + * @return boolean + */ + public function login($username = '', $password = '') + { + if (!$this->connected) { + $this->setError('Not connected to POP3 server'); + } + if (empty($username)) { + $username = $this->username; + } + if (empty($password)) { + $password = $this->password; + } + + // Send the Username + $this->sendString("USER $username" . self::CRLF); + $pop3_response = $this->getResponse(); + if ($this->checkResponse($pop3_response)) { + // Send the Password + $this->sendString("PASS $password" . self::CRLF); + $pop3_response = $this->getResponse(); + if ($this->checkResponse($pop3_response)) { + return true; + } + } + return false; + } + + /** + * Disconnect from the POP3 server. + * @access public + */ + public function disconnect() + { + $this->sendString('QUIT'); + //The QUIT command may cause the daemon to exit, which will kill our connection + //So ignore errors here + try { + @fclose($this->pop_conn); + } catch (Exception $e) { + //Do nothing + }; + } + + /** + * Get a response from the POP3 server. + * $size is the maximum number of bytes to retrieve + * @param integer $size + * @return string + * @access private + */ + private function getResponse($size = 128) + { + $response = fgets($this->pop_conn, $size); + if ($this->do_debug >= 1) { + echo "Server -> Client: $response"; + } + return $response; + } + + /** + * Send raw data to the POP3 server. + * @param string $string + * @return integer + * @access private + */ + private function sendString($string) + { + if ($this->pop_conn) { + if ($this->do_debug >= 2) { //Show client messages when debug >= 2 + echo "Client -> Server: $string"; + } + return fwrite($this->pop_conn, $string, strlen($string)); + } + return 0; + } + + /** + * Checks the POP3 server response. + * Looks for for +OK or -ERR. + * @param string $string + * @return boolean + * @access private + */ + private function checkResponse($string) + { + if (substr($string, 0, 3) !== '+OK') { + $this->setError(array( + 'error' => "Server reported an error: $string", + 'errno' => 0, + 'errstr' => '' + )); + return false; + } else { + return true; + } + } + + /** + * Add an error to the internal error store. + * Also display debug output if it's enabled. + * @param $error + */ + private function setError($error) + { + $this->errors[] = $error; + if ($this->do_debug >= 1) { + echo '<pre>'; + foreach ($this->errors as $error) { + print_r($error); + } + echo '</pre>'; + } + } + + /** + * POP3 connection error handler. + * @param integer $errno + * @param string $errstr + * @param string $errfile + * @param integer $errline + * @access private + */ + private function catchWarning($errno, $errstr, $errfile, $errline) + { + $this->setError(array( + 'error' => "Connecting to the POP3 server raised a PHP warning: ", + 'errno' => $errno, + 'errstr' => $errstr, + ... [truncated message content] |
From: <be...@us...> - 2015-06-20 20:30:32
|
Revision: 13092 http://sourceforge.net/p/xoops/svn/13092 Author: beckmi Date: 2015-06-20 20:30:30 +0000 (Sat, 20 Jun 2015) Log Message: ----------- added possibility to include full icon URL in module's menu.php Modified Paths: -------------- XoopsCore/branches/2.5.x/2.5.8/docs/changelog.250.txt XoopsCore/branches/2.5.x/2.5.8/htdocs/Frameworks/moduleclasses/moduleadmin/moduleadmin.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/themes/default/default.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/themes/zetadigme/zetadigme.php Modified: XoopsCore/branches/2.5.x/2.5.8/docs/changelog.250.txt =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/docs/changelog.250.txt 2015-06-16 21:08:34 UTC (rev 13091) +++ XoopsCore/branches/2.5.x/2.5.8/docs/changelog.250.txt 2015-06-20 20:30:30 UTC (rev 13092) @@ -19,6 +19,8 @@ - patch from Xoops 2.5.6 XoopsFormSelectUser is not compatible with some old modules like xNews (luciorota) - fix "setExtra" in moduleadmin.php, Admin buttons can now use "onClick" assignments (mamba) - updated XOOPS copyright to 2015, changed links to http://xoops.org (mamba) +- replaced intval() with (int) (mamba) +- added possibility to include full icon URL in module's menu.php (mamba) Security fixes Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/Frameworks/moduleclasses/moduleadmin/moduleadmin.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/Frameworks/moduleclasses/moduleadmin/moduleadmin.php 2015-06-16 21:08:34 UTC (rev 13091) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/Frameworks/moduleclasses/moduleadmin/moduleadmin.php 2015-06-20 20:30:30 UTC (rev 13092) @@ -132,7 +132,10 @@ foreach (array_keys( $this->_obj->adminmenu) as $i) { if ($this->_obj->adminmenu[$i]['link'] != 'admin/index.php') { $ret .= "<a href=\"../" . $this->_obj->adminmenu[$i]['link'] . "\" title=\"" . (isset($this->_obj->adminmenu[$i]['desc']) ? $this->_obj->adminmenu[$i]['desc'] : '') . "\">"; - $ret .= "<img src=\"" . $path . $this->_obj->adminmenu[$i]['icon']. "\" alt=\"" . $this->_obj->adminmenu[$i]['title'] . "\" />"; + //$ret .= "<img src=\"" . $path . $this->_obj->adminmenu[$i]['icon']. "\" alt=\"" . $this->_obj->adminmenu[$i]['title'] . "\" />"; + //mb for direct URL access to icons in modules Admin + $ret .= "<img src=\"" . ((filter_var($this->_obj->adminmenu[$i]['icon'], FILTER_VALIDATE_URL)) ? $this->_obj->adminmenu[$i]['icon'] : $path . $this->_obj->adminmenu[$i]['icon']) . "\" alt=\"" . $this->_obj->adminmenu[$i]['title'] . "\" />"; + $ret .= "<span>" . $this->_obj->adminmenu[$i]['title'] . "</span>"; $ret .= "</a>"; } @@ -177,9 +180,12 @@ $ret = "<div class=\"aligncenter\">\n"; } $ret .= "<div class=\"xo-buttons\">\n"; - foreach (array_keys( $this -> _itemButton) as $i) { - $ret .= "<a class='ui-corner-all tooltip' href='" . $this -> _itemButton[$i]['link'] . "' title='" . $this -> _itemButton[$i]['title'] . "' " . $this -> _itemButton[$i]['extra']. ">"; - $ret .= "<img src='" . $path . $this -> _itemButton[$i]['icon'] . "' title='" . $this -> _itemButton[$i]['title'] . "' alt='" . $this -> _itemButton[$i]['title'] . "' />" . $this -> _itemButton[$i]['title'] ; + foreach (array_keys($this->_itemButton) as $i) { + $ret .= "<a class='ui-corner-all tooltip' href='" . $this->_itemButton[$i]['link'] . "' title='" . $this->_itemButton[$i]['title'] . "' " . $this->_itemButton[$i]['extra'] . ">"; + $ret .= "<img src='" + //. $path . $this -> _itemButton[$i]['icon'] + //mb for direct URL access to icons in modules Admin + . ((filter_var($this->_itemButton[$i]['icon'], FILTER_VALIDATE_URL)) ? $this->_itemButton[$i]['icon'] : $path . $this->_itemButton[$i]['icon']) . "' title='" . $this->_itemButton[$i]['title'] . "' alt='" . $this->_itemButton[$i]['title'] . "' />" . $this->_itemButton[$i]['title']; $ret .= "</a>\n"; $ret .= $delimeter; } Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/themes/default/default.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/themes/default/default.php 2015-06-16 21:08:34 UTC (rev 13091) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/themes/default/default.php 2015-06-20 20:30:30 UTC (rev 13092) @@ -135,7 +135,9 @@ $mod_options = $xoopsModule->getAdminMenu(); foreach (array_keys($mod_options) as $item) { $mod_options[$item]['link'] = empty($mod_options[$item]['absolute']) ? XOOPS_URL . "/modules/{$moddir}/" . $mod_options[$item]['link'] : $mod_options[$item]['link']; - $mod_options[$item]['icon'] = empty($mod_options[$item]['icon']) ? '' : XOOPS_URL . "/modules/{$moddir}/" . $mod_options[$item]['icon']; +// $mod_options[$item]['icon'] = empty($mod_options[$item]['icon']) ? '' : XOOPS_URL . "/modules/{$moddir}/" . $mod_options[$item]['icon']; + //mb for direct URL access to icons in modules Admin + $mod_options[$item]['icon'] = empty($mod_options[$item]['icon']) ? '' : (filter_var($mod_options[$item]['icon'], FILTER_VALIDATE_URL) ? $mod_options[$item]['icon'] : (XOOPS_URL . "/modules/{$moddir}/" . $mod_options[$item]['icon'])); } } Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/themes/zetadigme/zetadigme.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/themes/zetadigme/zetadigme.php 2015-06-16 21:08:34 UTC (rev 13091) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/themes/zetadigme/zetadigme.php 2015-06-20 20:30:30 UTC (rev 13092) @@ -174,7 +174,9 @@ $mod_options = $xoopsModule->getAdminMenu(); foreach (array_keys($mod_options) as $item) { $mod_options[$item]['link'] = empty($mod_options[$item]['absolute']) ? XOOPS_URL . "/modules/{$moddir}/" . $mod_options[$item]['link'] : $mod_options[$item]['link']; - $mod_options[$item]['icon'] = empty($mod_options[$item]['icon']) ? '' : XOOPS_URL . "/modules/{$moddir}/" . $mod_options[$item]['icon']; + //$mod_options[$item]['icon'] = empty($mod_options[$item]['icon']) ? '' : XOOPS_URL . "/modules/{$moddir}/" . $mod_options[$item]['icon']; + //mb for direct URL access to icons in modules Admin + $mod_options[$item]['icon'] = empty($mod_options[$item]['icon']) ? '' : (filter_var($mod_options[$item]['icon'], FILTER_VALIDATE_URL) ? $mod_options[$item]['icon'] : (XOOPS_URL . "/modules/{$moddir}/" . $mod_options[$item]['icon'])); } } $tpl->assign('mod_options', $mod_options); |
From: <be...@us...> - 2015-06-16 21:08:37
|
Revision: 13091 http://sourceforge.net/p/xoops/svn/13091 Author: beckmi Date: 2015-06-16 21:08:34 +0000 (Tue, 16 Jun 2015) Log Message: ----------- Replacing floatval() with (float) Modified Paths: -------------- XoopsCore/branches/2.5.x/2.5.8/htdocs/class/model/write.php XoopsCore/branches/2.5.x/2.5.8/htdocs/include/functions.php XoopsCore/branches/2.5.x/2.5.8/htdocs/kernel/object.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/class/thumbs/phpthumb.class.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/class/thumbs/phpthumb.filters.php Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/class/model/write.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/class/model/write.php 2015-06-16 20:44:29 UTC (rev 13090) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/class/model/write.php 2015-06-16 21:08:34 UTC (rev 13091) @@ -217,7 +217,7 @@ break; case XOBJ_DTYPE_FLOAT: - $cleanv = floatval($cleanv); + $cleanv = (float)($cleanv); break; case XOBJ_DTYPE_DECIMAL: Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/include/functions.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/include/functions.php 2015-06-16 20:44:29 UTC (rev 13090) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/include/functions.php 2015-06-16 21:08:34 UTC (rev 13091) @@ -392,7 +392,7 @@ $timeoffset = $xoopsConfig['default_TZ']; } } - $usertimestamp = (int)($time) + (floatval($timeoffset) - $xoopsConfig['server_TZ']) * 3600; + $usertimestamp = (int)($time) + ((float)($timeoffset) - $xoopsConfig['server_TZ']) * 3600; return $usertimestamp; } Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/kernel/object.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/kernel/object.php 2015-06-16 20:44:29 UTC (rev 13090) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/kernel/object.php 2015-06-16 21:08:34 UTC (rev 13091) @@ -768,7 +768,7 @@ $cleanv = !is_string($cleanv) ? (int)($cleanv) : strtotime($cleanv); break; case XOBJ_DTYPE_FLOAT: - $cleanv = floatval($cleanv); + $cleanv = (float)($cleanv); break; case XOBJ_DTYPE_DECIMAL: $cleanv = doubleval($cleanv); Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/class/thumbs/phpthumb.class.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/class/thumbs/phpthumb.class.php 2015-06-16 20:44:29 UTC (rev 13090) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/class/thumbs/phpthumb.class.php 2015-06-16 21:08:34 UTC (rev 13091) @@ -1866,7 +1866,7 @@ case 'gam': @list($amount) = explode('|', $parameter); - $amount = min(max(floatval($amount), 0.001), 10); + $amount = min(max((float)($amount), 0.001), 10); if (number_format($amount, 3) != '1.000') { if ($this->ImageMagickSwitchAvailable('gamma')) { $commandline .= ' -gamma '.escapeshellarg($amount); @@ -1938,7 +1938,7 @@ @list($band, $method, $threshold) = explode('|', $parameter); $band = ($band ? preg_replace('#[^RGBA\\*]#', '', strtoupper($band)) : '*'); $method = ((strlen($method) > 0) ? (int)($method) : 2); - $threshold = ((strlen($threshold) > 0) ? min(max(floatval($threshold), 0), 100) : 0.1); + $threshold = ((strlen($threshold) > 0) ? min(max((float)($threshold), 0), 100) : 0.1); $band = preg_replace('#[^RGBA\\*]#', '', strtoupper($band)); @@ -1999,7 +1999,7 @@ case 'wb': if ($this->ImageMagickSwitchAvailable(array('channel', 'contrast-stretch'))) { @list($threshold) = explode('|', $parameter); - $threshold = (!empty($threshold) ? min(max(floatval($threshold), 0), 100) : 0.1); + $threshold = (!empty($threshold) ? min(max((float)($threshold), 0), 100) : 0.1); $threshold = preg_replace('#[^0-9\\.]#', '', $threshold); // should be unneccesary, but just to be double-sure //$commandline .= ' -channel R -contrast-stretch '.escapeshellarg($threshold.'%'); // doesn't work on Windows because most versions of PHP do not properly //$commandline .= ' -channel G -contrast-stretch '.escapeshellarg($threshold.'%'); // escape special characters (such as %) and just replace them with spaces @@ -2226,7 +2226,7 @@ $rotate_angle = 0; if ($this->ra) { - $rotate_angle = floatval($this->ra); + $rotate_angle = (float)($this->ra); } else { @@ -2646,7 +2646,7 @@ @list($band, $method, $threshold) = explode('|', $parameter, 3); $band = ($band ? preg_replace('#[^RGBA\\*]#', '', strtoupper($band)) : '*'); $method = ((strlen($method) > 0) ? (int)($method) : 2); - $threshold = ((strlen($threshold) > 0) ? floatval($threshold) : 0.1); + $threshold = ((strlen($threshold) > 0) ? (float)($threshold) : 0.1); $phpthumbFilters->HistogramStretch($this->gdimg_output, $band, $method, $threshold); break; Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/class/thumbs/phpthumb.filters.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/class/thumbs/phpthumb.filters.php 2015-06-16 20:44:29 UTC (rev 13090) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/class/thumbs/phpthumb.filters.php 2015-06-16 21:08:34 UTC (rev 13091) @@ -561,7 +561,7 @@ // pixel in the image could throw off the whole system. Instead, count up/down // from the limit and allow <threshold> (default = 0.1%) of brightest/darkest // pixels to be clipped to min/max - $threshold = floatval($threshold) / 100; + $threshold = (float)($threshold) / 100; $clip_threshold = ImageSX($gdimg) * ImageSX($gdimg) * $threshold; //if ($min >= 0) { // $range_min = min($min, 255); |
From: <be...@us...> - 2015-06-16 20:44:33
|
Revision: 13090 http://sourceforge.net/p/xoops/svn/13090 Author: beckmi Date: 2015-06-16 20:44:29 +0000 (Tue, 16 Jun 2015) Log Message: ----------- Replacing intval() with (int) Modified Paths: -------------- XoopsCore/branches/2.5.x/2.5.8/htdocs/Frameworks/art/functions.cache.php XoopsCore/branches/2.5.x/2.5.8/htdocs/admin.php XoopsCore/branches/2.5.x/2.5.8/htdocs/banners.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/cache/file.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/cache/xoopscache.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/captcha/image/scripts/image.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/captcha/xoopscaptcha.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/commentrenderer.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/criteria.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/logger/render.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/model/joint.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/model/write.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/pagenav.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/smarty/plugins/function.html_select_time.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/smarty/xoops_plugins/function.block.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/smarty/xoops_plugins/function.xoInboxCount.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/smarty/xoops_plugins/function.xoPageNav.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/theme_blocks.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/uploader.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/userutility.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xml/rpc/xmlrpcparser.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xml/rpc/xmlrpctag.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xml/rpc/xoopsapi.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopsblock.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopscomments.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/xoopsemotions/xoopsemotions.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/xoopsimagemanager/xoopsimagebrowser.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopsform/formdatetime.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopsform/formdhtmltextarea.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopsform/formfile.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopsform/formpassword.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopsform/formselect.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopsform/formtext.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopsform/formtextarea.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopsform/formtextdateselect.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopsform/grouppermform.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopslocal.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopssecurity.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopsstory.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopstopic.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopstree.php XoopsCore/branches/2.5.x/2.5.8/htdocs/edituser.php XoopsCore/branches/2.5.x/2.5.8/htdocs/imagemanager.php XoopsCore/branches/2.5.x/2.5.8/htdocs/include/comment_delete.php XoopsCore/branches/2.5.x/2.5.8/htdocs/include/comment_edit.php XoopsCore/branches/2.5.x/2.5.8/htdocs/include/comment_form.php XoopsCore/branches/2.5.x/2.5.8/htdocs/include/comment_new.php XoopsCore/branches/2.5.x/2.5.8/htdocs/include/comment_post.php XoopsCore/branches/2.5.x/2.5.8/htdocs/include/comment_reply.php XoopsCore/branches/2.5.x/2.5.8/htdocs/include/comment_view.php XoopsCore/branches/2.5.x/2.5.8/htdocs/include/commentform.inc.php XoopsCore/branches/2.5.x/2.5.8/htdocs/include/common.php XoopsCore/branches/2.5.x/2.5.8/htdocs/include/findusers.php XoopsCore/branches/2.5.x/2.5.8/htdocs/include/functions.php XoopsCore/branches/2.5.x/2.5.8/htdocs/include/notification_functions.php XoopsCore/branches/2.5.x/2.5.8/htdocs/include/old_functions.php XoopsCore/branches/2.5.x/2.5.8/htdocs/install/include/createconfigform.php XoopsCore/branches/2.5.x/2.5.8/htdocs/install/include/functions.php XoopsCore/branches/2.5.x/2.5.8/htdocs/install/include/modulesadmin.php XoopsCore/branches/2.5.x/2.5.8/htdocs/kernel/avatar.php XoopsCore/branches/2.5.x/2.5.8/htdocs/kernel/block.php XoopsCore/branches/2.5.x/2.5.8/htdocs/kernel/comment.php XoopsCore/branches/2.5.x/2.5.8/htdocs/kernel/config.php XoopsCore/branches/2.5.x/2.5.8/htdocs/kernel/configcategory.php XoopsCore/branches/2.5.x/2.5.8/htdocs/kernel/configitem.php XoopsCore/branches/2.5.x/2.5.8/htdocs/kernel/configoption.php XoopsCore/branches/2.5.x/2.5.8/htdocs/kernel/group.php XoopsCore/branches/2.5.x/2.5.8/htdocs/kernel/groupperm.php XoopsCore/branches/2.5.x/2.5.8/htdocs/kernel/image.php XoopsCore/branches/2.5.x/2.5.8/htdocs/kernel/imagecategory.php XoopsCore/branches/2.5.x/2.5.8/htdocs/kernel/imageset.php XoopsCore/branches/2.5.x/2.5.8/htdocs/kernel/imagesetimg.php XoopsCore/branches/2.5.x/2.5.8/htdocs/kernel/module.php XoopsCore/branches/2.5.x/2.5.8/htdocs/kernel/notification.php XoopsCore/branches/2.5.x/2.5.8/htdocs/kernel/object.php XoopsCore/branches/2.5.x/2.5.8/htdocs/kernel/online.php XoopsCore/branches/2.5.x/2.5.8/htdocs/kernel/privmessage.php XoopsCore/branches/2.5.x/2.5.8/htdocs/kernel/session.php XoopsCore/branches/2.5.x/2.5.8/htdocs/kernel/tplfile.php XoopsCore/branches/2.5.x/2.5.8/htdocs/kernel/tplset.php XoopsCore/branches/2.5.x/2.5.8/htdocs/kernel/user.php XoopsCore/branches/2.5.x/2.5.8/htdocs/misc.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/pm/admin/prune.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/pm/class/message.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/pm/readpmsg.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/pm/viewpmsg.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/profile/activate.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/profile/admin/field.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/profile/admin/step.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/profile/admin/user.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/profile/admin/visibility.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/profile/class/field.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/profile/class/profile.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/profile/edituser.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/profile/index.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/profile/register.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/profile/search.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/profile/user.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/profile/userinfo.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/avatars/main.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/blocksadmin/main.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/comments/main.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/groupperm.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/images/main.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/mailusers/main.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/modulesadmin/modulesadmin.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/preferences/main.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/users/main.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/blocks/system_blocks.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/class/avatar.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/class/block.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/class/thumbs/phpThumb.config.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/class/thumbs/phpThumb.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/class/thumbs/phpthumb.bmp.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/class/thumbs/phpthumb.class.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/class/thumbs/phpthumb.filters.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/class/thumbs/phpthumb.functions.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/class/thumbs/phpthumb.gif.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/menu.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/themes/default/menu.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/themes/zetadigme/menu.php XoopsCore/branches/2.5.x/2.5.8/htdocs/readpmsg.php XoopsCore/branches/2.5.x/2.5.8/htdocs/search.php XoopsCore/branches/2.5.x/2.5.8/htdocs/themes/xbootstrap/modules/publisher/xoops_and_module_changes/class/pagenav.php XoopsCore/branches/2.5.x/2.5.8/htdocs/themes/xbootstrap/modules/publisher/xoops_and_module_changes/modules/publisher/class/item.php XoopsCore/branches/2.5.x/2.5.8/htdocs/userinfo.php XoopsCore/branches/2.5.x/2.5.8/htdocs/viewpmsg.php XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/admin/center.php XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/class/protector.php XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/filters_disabled/postcommon_post_register_moratorium.php XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/include/postcheck_functions.php XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/module_icon.php XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/oninstall.php XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/onupdate.php Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/Frameworks/art/functions.cache.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/Frameworks/art/functions.cache.php 2015-06-13 22:09:36 UTC (rev 13089) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/Frameworks/art/functions.cache.php 2015-06-16 20:44:29 UTC (rev 13090) @@ -59,7 +59,7 @@ { global $xoopsModule; - $name = ($name) ? $name : strval(time()); + $name = ($name) ? $name : (string)(time()); $dirname = ($dirname) ? $dirname : (is_object($xoopsModule) ? $xoopsModule->getVar("dirname", "n") : "system"); xoops_load('XoopsCache'); Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/admin.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/admin.php 2015-06-13 22:09:36 UTC (rev 13089) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/admin.php 2015-06-16 20:44:29 UTC (rev 13090) @@ -100,7 +100,7 @@ for ($i = 0; $i < $count; ++$i) { $_items[$i]['title'] = XoopsLocal::convert_encoding($_items[$i]['title'], _CHARSET, 'UTF-8'); $_items[$i]['description'] = XoopsLocal::convert_encoding($_items[$i]['description'], _CHARSET, 'UTF-8'); - $items[strval(strtotime($_items[$i]['pubdate'])) . "-" . strval($cnt++)] = $_items[$i]; + $items[(string)(strtotime($_items[$i]['pubdate'])) . "-" . (string)($cnt++)] = $_items[$i]; } } else { echo $rss2parser->getErrors(); Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/banners.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/banners.php 2015-06-13 22:09:36 UTC (rev 13089) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/banners.php 2015-06-16 20:44:29 UTC (rev 13090) @@ -237,8 +237,8 @@ { global $xoopsDB, $xoopsConfig; if ($_SESSION['banner_login'] != "" && $_SESSION['banner_pass'] != "") { - $cid = intval($cid); - $bid = intval($bid); + $cid = (int)($cid); + $bid = (int)($bid); if ($result2 = $xoopsDB->query(sprintf("SELECT name, email, passwd FROM %s WHERE cid=%u AND login=%s", $xoopsDB->prefix("bannerclient"), $cid, $xoopsDB->quoteString($_SESSION['banner_login'])))) { list ($name, $email, $passwd) = $xoopsDB->fetchRow($result2); if ($_SESSION['banner_pass'] == $passwd) { @@ -294,8 +294,8 @@ { global $xoopsDB; if ($_SESSION['banner_login'] != "" && $_SESSION['banner_pass'] != "" && $url != "") { - $cid = intval($cid); - $bid = intval($bid); + $cid = (int)($cid); + $bid = (int)($bid); $sql = sprintf("SELECT passwd FROM %s WHERE cid=%u AND login=%s", $xoopsDB->prefix("bannerclient"), $cid, $xoopsDB->quoteString($_SESSION['banner_login'])); if ($result = $xoopsDB->query($sql)) { list ($passwd) = $xoopsDB->fetchRow($result); @@ -318,7 +318,7 @@ function clickbanner($bid) { global $xoopsDB; - $bid = intval($bid); + $bid = (int)($bid); if ($bid > 0) { $bresult = $xoopsDB->query("SELECT clickurl FROM " . $xoopsDB->prefix("banner") . " WHERE bid={$bid}"); list ($clickurl) = $xoopsDB->fetchRow($bresult); Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/class/cache/file.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/class/cache/file.php 2015-06-13 22:09:36 UTC (rev 13089) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/class/cache/file.php 2015-06-16 20:44:29 UTC (rev 13090) @@ -196,7 +196,7 @@ } $cachetime = $this->file->read(11); - if ($cachetime !== false && intval($cachetime) < time()) { + if ($cachetime !== false && (int)($cachetime) < time()) { $this->file->close(); $this->file->delete(); Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/class/cache/xoopscache.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/class/cache/xoopscache.php 2015-06-13 22:09:36 UTC (rev 13089) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/class/cache/xoopscache.php 2015-06-16 20:44:29 UTC (rev 13090) @@ -247,7 +247,7 @@ if (!$duration) { $duration = $settings['duration']; } - $duration = is_numeric($duration) ? intval($duration) : strtotime($duration) - time(); + $duration = is_numeric($duration) ? (int)($duration) : strtotime($duration) - time(); if ($duration < 1) { return false; @@ -394,7 +394,7 @@ if (empty($key)) { return false; } - $key = str_replace(array('/', '.'), '_', strval($key)); + $key = str_replace(array('/', '.'), '_', (string)($key)); return $key; } Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/class/captcha/image/scripts/image.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/class/captcha/image/scripts/image.php 2015-06-13 22:09:36 UTC (rev 13089) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/class/captcha/image/scripts/image.php 2015-06-16 20:44:29 UTC (rev 13090) @@ -78,7 +78,7 @@ if ($this->mode == "bmp") { $this->config["num_chars"] = 4; - $this->code = rand( pow(10, $this->config["num_chars"] - 1), intval( str_pad("9", $this->config["num_chars"], "9") ) ); + $this->code = rand( pow(10, $this->config["num_chars"] - 1), (int)( str_pad("9", $this->config["num_chars"], "9") ) ); } else { $raw_code = md5(uniqid(mt_rand(), 1)); if (!empty($this->config["skip_characters"])) { @@ -229,7 +229,7 @@ imagedestroy($oImage); $this->height = $MaxCharHeight + 2; - $this->spacing = intval( ($this->config["num_chars"] * $MaxCharWidth) / $this->config["num_chars"] ); + $this->spacing = (int)( ($this->config["num_chars"] * $MaxCharWidth) / $this->config["num_chars"] ); $this->width = ($this->config["num_chars"] * $MaxCharWidth) + ($this->spacing/2); } Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/class/captcha/xoopscaptcha.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/class/captcha/xoopscaptcha.php 2015-06-13 22:09:36 UTC (rev 13089) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/class/captcha/xoopscaptcha.php 2015-06-16 20:44:29 UTC (rev 13090) @@ -420,7 +420,7 @@ */ function getCode() { - return strval($this->code); + return (string)($this->code); } /** Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/class/commentrenderer.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/class/commentrenderer.php 2015-06-13 22:09:36 UTC (rev 13089) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/class/commentrenderer.php 2015-06-16 20:44:29 UTC (rev 13090) @@ -339,7 +339,7 @@ // Start edit by voltan function _getPosterName($poster_id, $poster_user, $poster_website) { - $poster['id'] = intval($poster_id); + $poster['id'] = (int)($poster_id); if ($poster['id'] > 0) { $com_poster =& $this->_memberHandler->getUser($poster_id); if (is_object($com_poster)) { @@ -374,7 +374,7 @@ // Start edit by voltan function _getPosterArray($poster_id, $poster_user, $poster_website) { - $poster['id'] = intval($poster_id); + $poster['id'] = (int)($poster_id); if ($poster['id'] > 0) { $com_poster =& $this->_memberHandler->getUser($poster['id']); if (is_object($com_poster)) { Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/class/criteria.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/class/criteria.php 2015-06-13 22:09:36 UTC (rev 13089) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/class/criteria.php 2015-06-16 20:44:29 UTC (rev 13090) @@ -121,7 +121,7 @@ */ function setLimit($limit = 0) { - $this->limit = intval($limit); + $this->limit = (int)($limit); } /** @@ -139,7 +139,7 @@ */ function setStart($start = 0) { - $this->start = intval($start); + $this->start = (int)($start); } /** Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/class/logger/render.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/class/logger/render.php 2015-06-13 22:09:36 UTC (rev 13089) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/class/logger/render.php 2015-06-16 20:44:29 UTC (rev 13090) @@ -146,7 +146,7 @@ $ret .= '<table id="xo-logger-blocks" class="outer"><tr><th colspan="2">' . _LOGGER_BLOCKS . '</th></tr>'; foreach ($this->blocks as $b) { if ($b['cached']) { - $ret .= '<tr><td class="' . $class . '"><strong>' . $b['name'] . ':</strong> ' . sprintf(_LOGGER_CACHED, intval($b['cachetime'])) . '</td></tr>'; + $ret .= '<tr><td class="' . $class . '"><strong>' . $b['name'] . ':</strong> ' . sprintf(_LOGGER_CACHED, (int)($b['cachetime'])) . '</td></tr>'; } else { $ret .= '<tr><td class="' . $class . '"><strong>' . $b['name'] . ':</strong> ' . _LOGGER_NOT_CACHED . '</td></tr>'; } Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/class/model/joint.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/class/model/joint.php 2015-06-13 22:09:36 UTC (rev 13089) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/class/model/joint.php 2015-06-16 20:44:29 UTC (rev 13090) @@ -144,7 +144,7 @@ return false; } $myrow = $this->handler->db->fetchArray($result); - return intval($myrow["count"]); + return (int)($myrow["count"]); } /** Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/class/model/write.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/class/model/write.php 2015-06-13 22:09:36 UTC (rev 13089) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/class/model/write.php 2015-06-16 20:44:29 UTC (rev 13090) @@ -73,8 +73,8 @@ continue; } $cleanv = xoops_convert_encode($cleanv); - if (isset($v['maxlength']) && strlen($cleanv) > intval($v['maxlength'])) { - $errors[] = sprintf(_XOBJ_ERR_SHORTERTHAN, $k, intval($v['maxlength'])); + if (isset($v['maxlength']) && strlen($cleanv) > (int)($v['maxlength'])) { + $errors[] = sprintf(_XOBJ_ERR_SHORTERTHAN, $k, (int)($v['maxlength'])); continue; } if (!$v['not_gpc']) { @@ -107,8 +107,8 @@ $errors[] = sprintf(_XOBJ_ERR_REQUIRED, $k); continue; } - if (isset($v['maxlength']) && strlen($cleanv) > intval($v['maxlength'])) { - $errors[] = sprintf(_XOBJ_ERR_SHORTERTHAN, $k, intval($v['maxlength'])); + if (isset($v['maxlength']) && strlen($cleanv) > (int)($v['maxlength'])) { + $errors[] = sprintf(_XOBJ_ERR_SHORTERTHAN, $k, (int)($v['maxlength'])); continue; } if (!$v['not_gpc']) { @@ -213,7 +213,7 @@ break; case XOBJ_DTYPE_INT: - $cleanv = intval($cleanv); + $cleanv = (int)($cleanv); break; case XOBJ_DTYPE_FLOAT: @@ -251,7 +251,7 @@ case XOBJ_DTYPE_STIME: case XOBJ_DTYPE_MTIME: case XOBJ_DTYPE_LTIME: - $cleanv = !is_string($cleanv) ? intval($cleanv) : strtotime($cleanv); + $cleanv = !is_string($cleanv) ? (int)($cleanv) : strtotime($cleanv); break; default: Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/class/pagenav.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/class/pagenav.php 2015-06-13 22:09:36 UTC (rev 13089) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/class/pagenav.php 2015-06-16 20:44:29 UTC (rev 13090) @@ -48,9 +48,9 @@ */ function XoopsPageNav($total_items, $items_perpage, $current_start, $start_name = "start", $extra_arg = "") { - $this->total = intval($total_items); - $this->perpage = intval($items_perpage); - $this->current = intval($current_start); + $this->total = (int)($total_items); + $this->perpage = (int)($items_perpage); + $this->current = (int)($current_start); $this->extra = $extra_arg; if ($extra_arg != '' && (substr($extra_arg, - 5) != '&' || substr($extra_arg, - 1) != '&')) { $this->extra = '&' . $extra_arg; @@ -79,7 +79,7 @@ $ret .= '<a class="xo-pagarrow" href="' . $this->url . $prev . $this->extra . '"><u>«</u></a> '; } $counter = 1; - $current_page = intval(floor(($this->current + $this->perpage) / $this->perpage)); + $current_page = (int)(floor(($this->current + $this->perpage) / $this->perpage)); while ($counter <= $total_pages) { if ($counter == $current_page) { $ret .= '<strong class="xo-pagact" >(' . $counter . ')</strong> '; @@ -122,7 +122,7 @@ $ret = '<form name="pagenavform">'; $ret .= '<select name="pagenavselect" onchange="location=this.options[this.options.selectedIndex].value;">'; $counter = 1; - $current_page = intval(floor(($this->current + $this->perpage) / $this->perpage)); + $current_page = (int)(floor(($this->current + $this->perpage) / $this->perpage)); while ($counter <= $total_pages) { if ($counter == $current_page) { $ret .= '<option value="' . $this->url . (($counter - 1) * $this->perpage) . $this->extra . '" selected="selected">' . $counter . '</option>'; @@ -163,7 +163,7 @@ $ret .= '<td class="pagno"></a></td><td><img src="' . XOOPS_URL . '/images/blank.gif" width="6" alt="" /></td>'; } $counter = 1; - $current_page = intval(floor(($this->current + $this->perpage) / $this->perpage)); + $current_page = (int)(floor(($this->current + $this->perpage) / $this->perpage)); while ($counter <= $total_pages) { if ($counter == $current_page) { $ret .= '<td class="pagact"><strong>' . $counter . '</strong></td>'; Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/class/smarty/plugins/function.html_select_time.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/class/smarty/plugins/function.html_select_time.php 2015-06-13 22:09:36 UTC (rev 13089) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/class/smarty/plugins/function.html_select_time.php 2015-06-16 20:44:29 UTC (rev 13090) @@ -111,7 +111,7 @@ $all_minutes = range(0, 59); for ($i = 0, $for_max = count($all_minutes); $i < $for_max; $i+= $minute_interval) $minutes[] = sprintf('%02d', $all_minutes[$i]); - $selected = intval(floor(strftime('%M', $time) / $minute_interval) * $minute_interval); + $selected = (int)(floor(strftime('%M', $time) / $minute_interval) * $minute_interval); $html_result .= '<select name='; if (null !== $field_array) { $html_result .= '"' . $field_array . '[' . $prefix . 'Minute]"'; @@ -138,7 +138,7 @@ $all_seconds = range(0, 59); for ($i = 0, $for_max = count($all_seconds); $i < $for_max; $i+= $second_interval) $seconds[] = sprintf('%02d', $all_seconds[$i]); - $selected = intval(floor(strftime('%S', $time) / $second_interval) * $second_interval); + $selected = (int)(floor(strftime('%S', $time) / $second_interval) * $second_interval); $html_result .= '<select name='; if (null !== $field_array) { $html_result .= '"' . $field_array . '[' . $prefix . 'Second]"'; Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/class/smarty/xoops_plugins/function.block.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/class/smarty/xoops_plugins/function.block.php 2015-06-13 22:09:36 UTC (rev 13089) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/class/smarty/xoops_plugins/function.block.php 2015-06-16 20:44:29 UTC (rev 13090) @@ -35,9 +35,9 @@ $display_none = (isset($params['display']) && $params['display'] == 'none') ? true : false; $options = (isset($params['options'])) ? $params['options'] : false; $groups = (isset($params['groups'])) ? explode('|', $params['groups']) : false; - $cache = (isset($params['cache'])) ? intval($params['cache']) : false; + $cache = (isset($params['cache'])) ? (int)($params['cache']) : false; - $block_id = intval($params['id']); + $block_id = (int)($params['id']); static $block_objs; if (!isset($block_objs[$block_id])) { @@ -79,7 +79,7 @@ $xoopsLogger =& XoopsLogger::getInstance(); $template =& $GLOBALS['xoopsTpl']; - $bcachetime = intval($blockObj->getVar('bcachetime')); + $bcachetime = (int)($blockObj->getVar('bcachetime')); if (empty($bcachetime)) { $template->caching = 0; } else { Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/class/smarty/xoops_plugins/function.xoInboxCount.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/class/smarty/xoops_plugins/function.xoInboxCount.php 2015-06-13 22:09:36 UTC (rev 13089) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/class/smarty/xoops_plugins/function.xoInboxCount.php 2015-06-16 20:44:29 UTC (rev 13090) @@ -13,7 +13,7 @@ } $time = time(); if (isset($_SESSION['xoops_inbox_count']) && @$_SESSION['xoops_inbox_count_expire'] > $time) { - $count = intval($_SESSION['xoops_inbox_count']); + $count = (int)($_SESSION['xoops_inbox_count']); } else { $pm_handler =& xoops_gethandler('privmessage'); @@ -22,7 +22,7 @@ $criteria = new CriteriaCompo(new Criteria('read_msg', 0)); $criteria->add(new Criteria('to_userid', $xoopsUser->getVar('uid'))); - $count = intval($pm_handler->getCount($criteria)); + $count = (int)($pm_handler->getCount($criteria)); $_SESSION['xoops_inbox_count'] = $count; $_SESSION['xoops_inbox_count_expire'] = $time + 60; } Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/class/smarty/xoops_plugins/function.xoPageNav.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/class/smarty/xoops_plugins/function.xoPageNav.php 2015-06-13 22:09:36 UTC (rev 13089) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/class/smarty/xoops_plugins/function.xoPageNav.php 2015-06-16 20:44:29 UTC (rev 13090) @@ -23,13 +23,13 @@ if ($pageSize < 1) { $pageSize = 10; } - $pagesCount = intval($itemsCount / $pageSize); + $pagesCount = (int)($itemsCount / $pageSize); if ($itemsCount <= $pageSize || $pagesCount < 2) { return ''; } $str = ''; - $currentPage = intval($offset / $pageSize) + 1; - $lastPage = intval($itemsCount / $pageSize) + 1; + $currentPage = (int)($offset / $pageSize) + 1; + $lastPage = (int)($itemsCount / $pageSize) + 1; $minPage = min(1, ceil($currentPage - $linksCount / 2)); $maxPage = max($lastPage, floor($currentPage + $linksCount / 2)); Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/class/theme_blocks.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/class/theme_blocks.php 2015-06-13 22:09:36 UTC (rev 13089) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/class/theme_blocks.php 2015-06-16 20:44:29 UTC (rev 13090) @@ -172,7 +172,7 @@ 'weight' => $xobject->getVar('weight') , 'lastmod' => $xobject->getVar('last_modified')); - $bcachetime = intval($xobject->getVar('bcachetime')); + $bcachetime = (int)($xobject->getVar('bcachetime')); if (empty($bcachetime)) { $template->caching = 0; } else { Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/class/uploader.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/class/uploader.php 2015-06-13 22:09:36 UTC (rev 13089) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/class/uploader.php 2015-06-16 20:44:29 UTC (rev 13090) @@ -130,7 +130,7 @@ $maxUploadInBytes = $this->return_bytes(ini_get('upload_max_filesize')); $maxPostInBytes = $this->return_bytes(ini_get('post_max_size')); $memoryLimitInBytes = $this->return_bytes(ini_get('memory_limit')); - if (intval($maxFileSize) > 0) { + if ((int)($maxFileSize) > 0) { $maxFileSizeInBytes = $this->return_bytes($maxFileSize); $newMaxFileSize = min($maxFileSizeInBytes, $maxUploadInBytes, $maxPostInBytes, $memoryLimitInBytes); } else { @@ -139,10 +139,10 @@ $this->maxFileSize = $newMaxFileSize; if (isset($maxWidth)) { - $this->maxWidth = intval($maxWidth); + $this->maxWidth = (int)($maxWidth); } if (isset($maxHeight)) { - $this->maxHeight = intval($maxHeight); + $this->maxHeight = (int)($maxHeight); } if (isset($randomFilename)) { $this->randomFilename = $randomFilename; @@ -210,7 +210,7 @@ return false; } else if (is_array($_FILES[$media_name]['name']) && isset($index)) { - $index = intval($index); + $index = (int)($index); $this->mediaName = (get_magic_quotes_gpc()) ? stripslashes($_FILES[$media_name]['name'][$index]) : $_FILES[$media_name]['name'][$index]; if ($this->randomFilename) { $unique = uniqid(time()); @@ -240,7 +240,7 @@ } } $this->errors = array(); - if (intval($this->mediaSize) < 0) { + if ((int)($this->mediaSize) < 0) { $this->setErrors(_ER_UP_INVALIDFILESIZE); return false; @@ -271,7 +271,7 @@ */ function setTargetFileName($value) { - $this->targetFileName = strval(trim($value)); + $this->targetFileName = (string)(trim($value)); } /** @@ -281,7 +281,7 @@ */ function setPrefix($value) { - $this->prefix = strval(trim($value)); + $this->prefix = (string)(trim($value)); } /** Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/class/userutility.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/class/userutility.php 2015-06-13 22:09:36 UTC (rev 13089) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/class/userutility.php 2015-06-16 20:44:29 UTC (rev 13090) @@ -300,7 +300,7 @@ static function getUnameFromId($userid, $usereal = false, $linked = false) { $myts =& MyTextSanitizer::getInstance(); - $userid = intval($userid); + $userid = (int)($userid); $username = ''; if ($userid > 0) { $member_handler = &xoops_gethandler('member'); Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xml/rpc/xmlrpcparser.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xml/rpc/xmlrpcparser.php 2015-06-13 22:09:36 UTC (rev 13089) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xml/rpc/xmlrpcparser.php 2015-06-16 20:44:29 UTC (rev 13090) @@ -335,7 +335,7 @@ */ function handleCharacterData(&$parser, &$data) { - $parser->setTempValue(intval($data)); + $parser->setTempValue((int)($data)); } } @@ -409,7 +409,7 @@ */ function handleCharacterData(&$parser, &$data) { - $parser->setTempValue(strval($data)); + $parser->setTempValue((string)($data)); } } Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xml/rpc/xmlrpctag.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xml/rpc/xmlrpctag.php 2015-06-13 22:09:36 UTC (rev 13089) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xml/rpc/xmlrpctag.php 2015-06-16 20:44:29 UTC (rev 13090) @@ -141,7 +141,7 @@ */ function setFault($fault = true) { - $this->_fault = (intval($fault) > 0) ? true : false; + $this->_fault = ((int)($fault) > 0) ? true : false; } /** @@ -173,7 +173,7 @@ function XoopsXmlRpcFault($code, $extra = null) { $this->setFault(true); - $this->_code = intval($code); + $this->_code = (int)($code); $this->_extra = isset($extra) ? trim($extra) : ''; } @@ -239,7 +239,7 @@ */ function XoopsXmlRpcInt($value) { - $this->_value = intval($value); + $this->_value = (int)($value); } /** @@ -314,7 +314,7 @@ */ function XoopsXmlRpcString($value) { - $this->_value = strval($value); + $this->_value = (string)($value); } /** @@ -342,7 +342,7 @@ if (!is_numeric($value)) { $this->_value = strtotime($value); } else { - $this->_value = intval($value); + $this->_value = (int)($value); } } Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xml/rpc/xoopsapi.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xml/rpc/xoopsapi.php 2015-06-13 22:09:36 UTC (rev 13089) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xml/rpc/xoopsapi.php 2015-06-16 20:44:29 UTC (rev 13090) @@ -81,7 +81,7 @@ include_once XOOPS_ROOT_PATH.'/modules/news/class/class.newsstory.php'; $story = new NewsStory(); $error = false; - if (intval($this->params[4]) > 0) { + if ((int)($this->params[4]) > 0) { if (!$this->_checkAdmin()) { // non admin users cannot publish $error = true; @@ -100,7 +100,7 @@ } if (!$error) { if (isset($post['categories']) && !empty($post['categories'][0])) { - $story->setTopicId(intval($post['categories'][0]['categoryId'])); + $story->setTopicId((int)($post['categories'][0]['categoryId'])); } else { $story->setTopicId(1); } @@ -280,10 +280,10 @@ $this->response->add(new XoopsXmlRpcFault(104)); } else { include_once XOOPS_ROOT_PATH.'/modules/news/class/class.newsstory.php'; - if (isset($this->params[4]) && intval($this->params[4]) > 0) { - $stories =& NewsStory::getAllPublished(intval($this->params[3]), 0, $this->params[4]); + if (isset($this->params[4]) && (int)($this->params[4]) > 0) { + $stories =& NewsStory::getAllPublished((int)($this->params[3]), 0, $this->params[4]); } else { - $stories =& NewsStory::getAllPublished(intval($this->params[3])); + $stories =& NewsStory::getAllPublished((int)($this->params[3])); } $scount = count($stories); $ret = array(); Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopsblock.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopsblock.php 2015-06-13 22:09:36 UTC (rev 13089) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopsblock.php 2015-06-16 20:44:29 UTC (rev 13090) @@ -70,7 +70,7 @@ if (is_array($id)) { $this->assignVars($id); } else { - $this->load(intval($id)); + $this->load((int)($id)); } } } @@ -82,7 +82,7 @@ */ function load($id) { - $id = intval($id); + $id = (int)($id); $sql = 'SELECT * FROM ' . $this->db->prefix('newblocks') . ' WHERE bid = ' . $id; $arr = $this->db->fetchArray($this->db->query($sql)); $this->assignVars($arr); @@ -467,7 +467,7 @@ */ static function getByModule($moduleid, $asobject = true) { - $moduleid = intval($moduleid); + $moduleid = (int)($moduleid); $db =& XoopsDatabaseFactory::getDatabaseConnection(); if ($asobject == true) { $sql = $sql = "SELECT * FROM " . $db->prefix("newblocks") . " WHERE mid=" . $moduleid; @@ -500,7 +500,7 @@ */ function getAllByGroupModule($groupid, $module_id = 0, $toponlyblock = false, $visible = null, $orderby = 'b.weight, m.block_id', $isactive = 1) { - $isactive = intval($isactive); + $isactive = (int)($isactive); $db =& XoopsDatabaseFactory::getDatabaseConnection(); $ret = array(); if (isset($groupid)) { @@ -508,8 +508,8 @@ if (is_array($groupid)) { $sql .= ' AND gperm_groupid IN (' . implode(',', $groupid) . ')'; } else { - if (intval($groupid) > 0) { - $sql .= ' AND gperm_groupid=' . intval($groupid); + if ((int)($groupid) > 0) { + $sql .= ' AND gperm_groupid=' . (int)($groupid); } } $result = $db->query($sql); @@ -524,11 +524,11 @@ $sql = 'SELECT b.* FROM ' . $db->prefix('newblocks') . ' b, ' . $db->prefix('block_module_link') . ' m WHERE m.block_id=b.bid'; $sql .= ' AND b.isactive=' . $isactive; if (isset($visible)) { - $sql .= ' AND b.visible=' . intval($visible); + $sql .= ' AND b.visible=' . (int)($visible); } if (!isset($module_id)) { } elseif (!empty($module_id)) { - $sql .= ' AND m.module_id IN (0,' . intval($module_id); + $sql .= ' AND m.module_id IN (0,' . (int)($module_id); if ($toponlyblock) { $sql .= ',-1'; } @@ -585,13 +585,13 @@ $non_grouped = array_diff($bids, $grouped); if (!empty($non_grouped)) { $sql = 'SELECT b.* FROM ' . $db->prefix('newblocks') . ' b, ' . $db->prefix('block_module_link') . ' m WHERE m.block_id=b.bid'; - $sql .= ' AND b.isactive=' . intval($isactive); + $sql .= ' AND b.isactive=' . (int)($isactive); if (isset($visible)) { - $sql .= ' AND b.visible=' . intval($visible); + $sql .= ' AND b.visible=' . (int)($visible); } if (!isset($module_id)) { } elseif (!empty($module_id)) { - $sql .= ' AND m.module_id IN (0,' . intval($module_id); + $sql .= ' AND m.module_id IN (0,' . (int)($module_id); if ($toponlyblock) { $sql .= ',-1'; } @@ -626,8 +626,8 @@ */ function countSimilarBlocks($moduleId, $funcNum, $showFunc = null) { - $funcNum = intval($funcNum); - $moduleId = intval($moduleId); + $funcNum = (int)($funcNum); + $moduleId = (int)($moduleId); if ($funcNum < 1 || $moduleId < 1) { // invalid query return 0; Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopscomments.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopscomments.php 2015-06-13 22:09:36 UTC (rev 13089) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopscomments.php 2015-06-16 20:44:29 UTC (rev 13090) @@ -69,7 +69,7 @@ if (is_array($id)) { $this->assignVars($id); } else { - $this->load(intval($id)); + $this->load((int)($id)); } } } @@ -81,7 +81,7 @@ */ function load($id) { - $id = intval($id); + $id = (int)($id); $sql = "SELECT * FROM " . $this->ctable . " WHERE comment_id=" . $id; $arr = $this->db->fetchArray($this->db->query($sql)); $this->assignVars($arr); @@ -244,12 +244,12 @@ if ($order == 1) { echo " selected='selected'"; } - echo ">" . _NEWESTFIRST . "</option></select><input type='hidden' name='item_id' value='" . intval($item_id) . "' /><input type='submit' value='" . _CM_REFRESH . "' />"; + echo ">" . _NEWESTFIRST . "</option></select><input type='hidden' name='item_id' value='" . (int)($item_id) . "' /><input type='submit' value='" . _CM_REFRESH . "' />"; if ($xoopsConfig['anonpost'] == 1 || $xoopsUser) { if ($mode != "flat" || $mode != "nocomments" || $mode != "thread") { $mode = "flat"; } - echo " <input type='button' onclick='location=\"newcomment.php?item_id=" . intval($item_id) . "&order=" . intval($order) . "&mode=" . $mode . "\"' value='" . _CM_POSTCOMMENT . "' />"; + echo " <input type='button' onclick='location=\"newcomment.php?item_id=" . (int)($item_id) . "&order=" . (int)($order) . "&mode=" . $mode . "\"' value='" . _CM_POSTCOMMENT . "' />"; } echo "</td></tr></table></form>"; } @@ -297,13 +297,13 @@ $ip_image = "<img src='" . XOOPS_URL . "/images/icons/ip.gif' alt='' />"; } if ($adminview || ($xoopsUser && $this->getVar("user_id") == $xoopsUser->getVar("uid"))) { - $edit_image = "<a href='editcomment.php?comment_id=" . $this->getVar("comment_id") . "&mode=" . $mode . "&order=" . intval($order) . "'><img src='" . XOOPS_URL . "/images/icons/edit.gif' alt='" . _EDIT . "' /></a>"; + $edit_image = "<a href='editcomment.php?comment_id=" . $this->getVar("comment_id") . "&mode=" . $mode . "&order=" . (int)($order) . "'><img src='" . XOOPS_URL . "/images/icons/edit.gif' alt='" . _EDIT . "' /></a>"; } if ($xoopsConfig['anonpost'] || $xoopsUser) { - $reply_image = "<a href='replycomment.php?comment_id=" . $this->getVar("comment_id") . "&mode=" . $mode . "&order=" . intval($order) . "'><img src='" . XOOPS_URL . "/images/icons/reply.gif' alt='" . _REPLY . "' /></a>"; + $reply_image = "<a href='replycomment.php?comment_id=" . $this->getVar("comment_id") . "&mode=" . $mode . "&order=" . (int)($order) . "'><img src='" . XOOPS_URL . "/images/icons/reply.gif' alt='" . _REPLY . "' /></a>"; } if ($adminview) { - $delete_image = "<a href='deletecomment.php?comment_id=" . $this->getVar("comment_id") . "&mode=" . $mode . "&order=" . intval($order) . "'><img src='" . XOOPS_URL . "/images/icons/delete.gif' alt='" . _DELETE . "' /></a>"; + $delete_image = "<a href='deletecomment.php?comment_id=" . $this->getVar("comment_id") . "&mode=" . $mode . "&order=" . (int)($order) . "'><img src='" . XOOPS_URL . "/images/icons/delete.gif' alt='" . _DELETE . "' /></a>"; } if ($poster) { Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/xoopsemotions/xoopsemotions.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/xoopsemotions/xoopsemotions.php 2015-06-13 22:09:36 UTC (rev 13089) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/xoopsemotions/xoopsemotions.php 2015-06-16 20:44:29 UTC (rev 13090) @@ -63,7 +63,7 @@ $smile_url = $uploader->getSavedFileName(); $smile_code = $myts->stripSlashesGPC($_POST['smile_code']); $smile_desc = $myts->stripSlashesGPC($_POST['smile_desc']); - $smile_display = intval($_POST['smile_display']) > 0 ? 1 : 0; + $smile_display = (int)($_POST['smile_display']) > 0 ? 1 : 0; $newid = $db->genId($db->prefix('smilies')."_id_seq"); $sql = sprintf("INSERT INTO %s (id, code, smile_url, emotion, display) VALUES (%d, %s, %s, %s, %d)", $db->prefix('smiles'), $newid, $db->quoteString($smile_code), $db->quoteString($smile_url), $db->quoteString($smile_desc), $smile_display); if (!$db->query($sql)) { Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/xoopsimagemanager/xoopsimagebrowser.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/xoopsimagemanager/xoopsimagebrowser.php 2015-06-13 22:09:36 UTC (rev 13089) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/xoopsimagemanager/xoopsimagebrowser.php 2015-06-16 20:44:29 UTC (rev 13090) @@ -78,15 +78,15 @@ } if (isset($_GET["image_id"])) { - $image_id = intval($_GET["image_id"]); + $image_id = (int)($_GET["image_id"]); } if (isset($_GET["imgcat_id"])) { - $imgcat_id = intval($_GET["imgcat_id"]); + $imgcat_id = (int)($_GET["imgcat_id"]); } if (isset($imgcat_id)) { - $imgcat_id = intval($imgcat_id); + $imgcat_id = (int)($imgcat_id); } $target = htmlspecialchars($target); @@ -129,7 +129,7 @@ if (!$GLOBALS["xoopsSecurity"]->check()) { redirect_header($current_file . "?target=" . $target, 3, implode("<br />", $GLOBALS["xoopsSecurity"]->getErrors())); } - $imgcat =& $imgcat_handler->get(intval($imgcat_id)); + $imgcat =& $imgcat_handler->get((int)($imgcat_id)); if (!is_object($imgcat)) { redirect_header($current_file . "?target=" . $target, 3); } @@ -308,7 +308,7 @@ if (!$GLOBALS["xoopsSecurity"]->check()) { redirect_header($current_file . "?target=" . $target, 3, implode("<br />", $GLOBALS["xoopsSecurity"]->getErrors())); } - $imgcat_id = intval($imgcat_id); + $imgcat_id = (int)($imgcat_id); if ($imgcat_id <= 0) { redirect_header($current_file . "?target=" . $target, 3); } @@ -358,7 +358,7 @@ if (!$GLOBALS["xoopsSecurity"]->check()) { redirect_header($current_file . "?target=" . $target, 3, implode("<br />", $GLOBALS["xoopsSecurity"]->getErrors())); } - $image_id = intval($image_id); + $image_id = (int)($image_id); if ($image_id <= 0) { redirect_header($current_file . "?target=" . $target, 3); } @@ -448,7 +448,7 @@ //list images - start if ($op == 'listimg') { - $imgcat_id = intval($imgcat_id); + $imgcat_id = (int)($imgcat_id); if ($imgcat_id <= 0) { redirect_header($current_file . '?target=' . $target, 1); } @@ -461,7 +461,7 @@ $criteria = new Criteria('imgcat_id', $imgcat_id); $imgcount = $image_handler->getCount($criteria); - $start = isset($_GET['start']) ? intval($_GET['start']) : 0; + $start = isset($_GET['start']) ? (int)($_GET['start']) : 0; $criteria->setStart($start); $criteria->setLimit(20); $images =& $image_handler->getObjects($criteria, true, false); Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopsform/formdatetime.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopsform/formdatetime.php 2015-06-13 22:09:36 UTC (rev 13089) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopsform/formdatetime.php 2015-06-16 20:44:29 UTC (rev 13090) @@ -41,7 +41,7 @@ function XoopsFormDateTime($caption, $name, $size = 15, $value = 0, $showtime = true) { $this->XoopsFormElementTray($caption, ' '); - $value = intval($value); + $value = (int)($value); $value = ($value > 0) ? $value : time(); $datetime = getDate($value); $this->addElement(new XoopsFormTextDateSelect('', $name . '[date]', $size, $value, $showtime)); Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopsform/formdhtmltextarea.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopsform/formdhtmltextarea.php 2015-06-13 22:09:36 UTC (rev 13089) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopsform/formdhtmltextarea.php 2015-06-16 20:44:29 UTC (rev 13090) @@ -161,7 +161,7 @@ $GLOBALS['xoTheme']->addScript('/class/textsanitizer/image/image.js', array('type' => 'text/javascript')); } $button = // "<br />" . -"<input " . " id='" . $this->getName() . "_preview_button'" . " type='button' " . " value='" . _PREVIEW . "' " . " onclick=\"form_instantPreview('" . XOOPS_URL . "', '" . $this->getName() . "','" . XOOPS_URL . "/images', " . intval($this->doHtml) . ", '" . $GLOBALS['xoopsSecurity']->createToken() . "')\"" . " />"; +"<input " . " id='" . $this->getName() . "_preview_button'" . " type='button' " . " value='" . _PREVIEW . "' " . " onclick=\"form_instantPreview('" . XOOPS_URL . "', '" . $this->getName() . "','" . XOOPS_URL . "/images', " . (int)($this->doHtml) . ", '" . $GLOBALS['xoopsSecurity']->createToken() . "')\"" . " />"; $ret .= "<br />" . "<div id='" . $this->getName() . "_hidden' style='display: block;'> " . " <fieldset>" . " <legend>" . $button . "</legend>" . " <div id='" . $this->getName() . "_hidden_data'>" . _XOOPS_FORM_PREVIEW_CONTENT . "</div>" . " </fieldset>" . "</div>"; } // Load javascript Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopsform/formfile.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopsform/formfile.php 2015-06-13 22:09:36 UTC (rev 13089) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopsform/formfile.php 2015-06-16 20:44:29 UTC (rev 13090) @@ -44,7 +44,7 @@ { $this->setCaption($caption); $this->setName($name); - $this->_maxFileSize = intval($maxfilesize); + $this->_maxFileSize = (int)($maxfilesize); } /** Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopsform/formpassword.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopsform/formpassword.php 2015-06-13 22:09:36 UTC (rev 13089) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopsform/formpassword.php 2015-06-16 20:44:29 UTC (rev 13090) @@ -73,8 +73,8 @@ { $this->setCaption($caption); $this->setName($name); - $this->_size = intval($size); - $this->_maxlength = intval($maxlength); + $this->_size = (int)($size); + $this->_maxlength = (int)($maxlength); $this->setValue($value); $this->autoComplete = ! empty($autoComplete); } Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopsform/formselect.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopsform/formselect.php 2015-06-13 22:09:36 UTC (rev 13089) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopsform/formselect.php 2015-06-16 20:44:29 UTC (rev 13090) @@ -81,7 +81,7 @@ $this->setCaption($caption); $this->setName($name); $this->_multiple = $multiple; - $this->_size = intval($size); + $this->_size = (int)($size); if (isset($value)) { $this->setValue($value); } Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopsform/formtext.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopsform/formtext.php 2015-06-13 22:09:36 UTC (rev 13089) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopsform/formtext.php 2015-06-16 20:44:29 UTC (rev 13090) @@ -62,8 +62,8 @@ { $this->setCaption($caption); $this->setName($name); - $this->_size = intval($size); - $this->_maxlength = intval($maxlength); + $this->_size = (int)($size); + $this->_maxlength = (int)($maxlength); $this->setValue($value); } Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopsform/formtextarea.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopsform/formtextarea.php 2015-06-13 22:09:36 UTC (rev 13089) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopsform/formtextarea.php 2015-06-16 20:44:29 UTC (rev 13090) @@ -64,8 +64,8 @@ { $this->setCaption($caption); $this->setName($name); - $this->_rows = intval($rows); - $this->_cols = intval($cols); + $this->_rows = (int)($rows); + $this->_cols = (int)($cols); $this->setValue($value); } Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopsform/formtextdateselect.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopsform/formtextdateselect.php 2015-06-13 22:09:36 UTC (rev 13089) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopsform/formtextdateselect.php 2015-06-16 20:44:29 UTC (rev 13090) @@ -35,7 +35,7 @@ */ function XoopsFormTextDateSelect($caption, $name, $size = 15, $value = 0) { - $value = !is_numeric($value) ? time() : intval($value); + $value = !is_numeric($value) ? time() : (int)($value); $value = ($value == 0) ? time() : $value; $this->XoopsFormText($caption, $name, $size, 25, $value); } Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopsform/grouppermform.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopsform/grouppermform.php 2015-06-13 22:09:36 UTC (rev 13089) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopsform/grouppermform.php 2015-06-16 20:44:29 UTC (rev 13090) @@ -69,7 +69,7 @@ function XoopsGroupPermForm($title, $modid, $permname, $permdesc, $url = '', $anonymous = true) { $this->XoopsForm($title, 'groupperm_form', XOOPS_URL . '/modules/system/admin/groupperm.php', 'post'); - $this->_modid = intval($modid); + $this->_modid = (int)($modid); $this->_permName = $permname; $this->_permDesc = $permdesc; $this->addElement(new XoopsFormHidden('modid', $this->_modid)); Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopslocal.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopslocal.php 2015-06-13 22:09:36 UTC (rev 13089) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopslocal.php 2015-06-16 20:44:29 UTC (rev 13090) @@ -133,11 +133,11 @@ if ($format == 'rss' || $format == 'r') { $TIME_ZONE = ''; if (isset($GLOBALS['xoopsConfig']['server_TZ'])) { - $server_TZ = abs(intval($GLOBALS['xoopsConfig']['server_TZ'] * 3600.0)); + $server_TZ = abs((int)($GLOBALS['xoopsConfig']['server_TZ'] * 3600.0)); $prefix = ($GLOBALS['xoopsConfig']['server_TZ'] < 0) ? ' -' : ' +'; $TIME_ZONE = $prefix . date('Hi', $server_TZ); } - $date = gmdate('D, d M Y H:i:s', intval($time)) . $TIME_ZONE; + $date = gmdate('D, d M Y H:i:s', (int)($time)) . $TIME_ZONE; return $date; } Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopssecurity.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopssecurity.php 2015-06-13 22:09:36 UTC (rev 13089) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopssecurity.php 2015-06-16 20:44:29 UTC (rev 13090) @@ -69,7 +69,7 @@ } $token_data = array( 'id' => $token_id , - 'expire' => time() + intval($timeout)); + 'expire' => time() + (int)($timeout)); array_push($_SESSION[$name . '_SESSION'], $token_data); return md5($token_id . $_SERVER['HTTP_USER_AGENT'] . XOOPS_DB_PREFIX); Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopsstory.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopsstory.php 2015-06-13 22:09:36 UTC (rev 13089) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopsstory.php 2015-06-16 20:44:29 UTC (rev 13090) @@ -65,7 +65,7 @@ if ( is_array($storyid) ) { $this->makeStory($storyid); } elseif ($storyid != -1) { - $this->getStory(intval($storyid)); + $this->getStory((int)($storyid)); } } @@ -74,7 +74,7 @@ */ function setStoryId($value) { - $this->storyid = intval($value); + $this->storyid = (int)($value); } /** @@ -82,7 +82,7 @@ */ function setTopicId($value) { - $this->topicid = intval($value); + $this->topicid = (int)($value); } /** @@ -90,7 +90,7 @@ */ function setUid($value) { - $this->uid = intval($value); + $this->uid = (int)($value); } /** @@ -122,7 +122,7 @@ */ function setPublished($value) { - $this->published = intval($value); + $this->published = (int)($value); } /** @@ -130,7 +130,7 @@ */ function setExpired($value) { - $this->e... [truncated message content] |
From: <txm...@us...> - 2015-06-13 22:09:39
|
Revision: 13089 http://sourceforge.net/p/xoops/svn/13089 Author: txmodxoops Date: 2015-06-13 22:09:36 +0000 (Sat, 13 Jun 2015) Log Message: ----------- Merged modifies (With Goffy) Modified Paths: -------------- XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/admin/fields.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/admin/index.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/admin/tables.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/language/english/admin.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/language/english/modinfo.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/xoops_version.php Modified: XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/admin/fields.php =================================================================== --- XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/admin/fields.php 2015-06-13 14:20:13 UTC (rev 13088) +++ XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/admin/fields.php 2015-06-13 22:09:36 UTC (rev 13089) @@ -172,7 +172,7 @@ // Set field elements if ($fieldsObj->isNew()) { // Fields Elements Handler - $fieldelementObj =& $tdmcreate->getHandler('fieldelements')->create(); + /*$fieldelementObj =& $tdmcreate->getHandler('fieldelements')->create(); $fieldelementObj->setVar( 'fieldelement_mid', $fieldMid ); $fieldelementObj->setVar( 'fieldelement_tid', $fieldTid ); $fieldelementObj->setVar( 'fieldelement_name', 'Table : '.ucfirst($tableName) ); @@ -180,7 +180,7 @@ // Insert new field element id for table name if (!$tdmcreate->getHandler('fieldelements')->insert($fieldelementObj) ) { $GLOBALS['xoopsTpl']->assign('error', $fieldelementObj->getHtmlErrors() . ' Field element'); - } + }*/ redirect_header('fields.php', 2, sprintf(_AM_TDMCREATE_FIELDS_FORM_SAVED_OK, $tableName)); } else { // Needed code from table name by field_tid Modified: XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/admin/index.php =================================================================== --- XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/admin/index.php 2015-06-13 14:20:13 UTC (rev 13088) +++ XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/admin/index.php 2015-06-13 22:09:36 UTC (rev 13089) @@ -19,16 +19,17 @@ * @version $Id: index.php 11084 2013-02-23 15:44:20Z timgno $ */ include __DIR__ . '/header.php'; -$criteria = new CriteriaCompo(); -$count_modules = $tdmcreate->getHandler('modules')->getCount($criteria); -$count_tables = $tdmcreate->getHandler('tables')->getCount($criteria); -$count_fields = $tdmcreate->getHandler('fields')->getCount($criteria); +$countModules = $tdmcreate->getHandler('modules')->getCount(); +$countTables = $tdmcreate->getHandler('tables')->getCount(); +$countFields = $tdmcreate->getHandler('fields')->getCount(); +$countFiles = $tdmcreate->getHandler('morefiles')->getCount(); unset($criteria); $templateMain = 'tdmcreate_index.tpl'; $adminMenu->addInfoBox(_AM_TDMCREATE_ADMIN_NUMMODULES); -$adminMenu->addInfoBoxLine(_AM_TDMCREATE_ADMIN_NUMMODULES, '<label>' . _AM_TDMCREATE_THEREARE_NUMMODULES . '</label>', $count_modules, 'Green'); -$adminMenu->addInfoBoxLine(_AM_TDMCREATE_ADMIN_NUMMODULES, '<label>' . _AM_TDMCREATE_THEREARE_NUMTABLES . '</label>', $count_tables, 'Orange'); -$adminMenu->addInfoBoxLine(_AM_TDMCREATE_ADMIN_NUMMODULES, '<label>' . _AM_TDMCREATE_THEREARE_NUMFIELDS . '</label>', $count_fields, 'Gray'); +$adminMenu->addInfoBoxLine(_AM_TDMCREATE_ADMIN_NUMMODULES, '<label>' . _AM_TDMCREATE_THEREARE_NUMMODULES . '</label>', $countModules, 'Green'); +$adminMenu->addInfoBoxLine(_AM_TDMCREATE_ADMIN_NUMMODULES, '<label>' . _AM_TDMCREATE_THEREARE_NUMTABLES . '</label>', $countTables, 'Orange'); +$adminMenu->addInfoBoxLine(_AM_TDMCREATE_ADMIN_NUMMODULES, '<label>' . _AM_TDMCREATE_THEREARE_NUMFIELDS . '</label>', $countFields, 'Gray'); +$adminMenu->addInfoBoxLine(_AM_TDMCREATE_ADMIN_NUMMODULES, '<label>' . _AM_TDMCREATE_THEREARE_NUMFILES . '</label>', $countFiles, 'Red'); // Upload Folders $folder = array( Modified: XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/admin/tables.php =================================================================== --- XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/admin/tables.php 2015-06-13 14:20:13 UTC (rev 13088) +++ XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/admin/tables.php 2015-06-13 22:09:36 UTC (rev 13089) @@ -22,7 +22,7 @@ // Recovered value of arguments op in the URL $ $op = XoopsRequest::getString('op', 'list'); // -$mod_id = XoopsRequest::getInt('mod_id'); +$modId = XoopsRequest::getInt('mod_id'); // Request vars $tableId = XoopsRequest::getInt('table_id'); $tableMid = XoopsRequest::getInt('table_mid'); @@ -186,6 +186,16 @@ if ($tablesObj->isNew()) { $tableTid = $GLOBALS['xoopsDB']->getInsertId(); $tableAction = '&field_mid=' . $tableMid . '&field_tid=' . $tableTid . '&field_numb=' . $tableNumbFields . '&field_name=' . $tableFieldname; + // Fields Elements Handler + $fieldelementObj =& $tdmcreate->getHandler('fieldelements')->create(); + $fieldelementObj->setVar( 'fieldelement_mid', $tableMid ); + $fieldelementObj->setVar( 'fieldelement_tid', $tableTid ); + $fieldelementObj->setVar( 'fieldelement_name', 'Table : '.ucfirst($_POST['table_name']) ); + $fieldelementObj->setVar( 'fieldelement_value', 'XoopsFormTables-'.ucfirst($_POST['table_name']) ); + // Insert new field element id for table name + if (!$tdmcreate->getHandler('fieldelements')->insert($fieldelementObj) ) { + $GLOBALS['xoopsTpl']->assign('error', $fieldelementObj->getHtmlErrors() . ' Field element'); + } redirect_header('fields.php?op=new' . $tableAction, 5, sprintf(_AM_TDMCREATE_TABLE_FORM_CREATED_OK, $_POST['table_name'])); } else { redirect_header('tables.php', 5, sprintf(_AM_TDMCREATE_TABLE_FORM_UPDATED_OK, $_POST['table_name'])); @@ -238,9 +248,18 @@ redirect_header('tables.php', 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors())); } if ($tdmcreate->getHandler('tables')->delete($tablesObj)) { + // Delete items in table fieldelements - idea by goffy + $fieldelements = $tdmcreate->getHandler('fieldelements')->getAllFieldElementsByModuleAndTableId($tableMid, $tableId); + foreach (array_keys($fieldelements) as $fe) { + $fieldelementsObj =& $tdmcreate->getHandler('fieldelements')->get($fieldelements[$fe]->getVar('fieldelement_id')); + if (!$tdmcreate->getHandler('fieldelements')->delete($fieldelementsObj)) { + $GLOBALS['xoopsTpl']->assign('error', $fieldelementsObj->getHtmlErrors()); + } + unset($fieldelementsObj); + } redirect_header('tables.php', 3, _AM_TDMCREATE_FORMDELOK); } else { - echo $tablesObj->getHtmlErrors(); + $GLOBALS['xoopsTpl']->assign('error', $tablesObj->getHtmlErrors()); } } else { xoops_confirm(array('ok' => 1, 'table_id' => $tableId, 'op' => 'delete'), $_SERVER['REQUEST_URI'], sprintf(_AM_TDMCREATE_FORMSUREDEL, $tablesObj->getVar('table_name'))); Modified: XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/language/english/admin.php =================================================================== --- XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/language/english/admin.php 2015-06-13 14:20:13 UTC (rev 13088) +++ XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/language/english/admin.php 2015-06-13 22:09:36 UTC (rev 13089) @@ -30,6 +30,7 @@ define('_AM_TDMCREATE_THEREARE_NUMMODULES', "There are <span class='red bold'>%s</span> modules stored in the Database"); define('_AM_TDMCREATE_THEREARE_NUMTABLES', "There are <span class='red bold'>%s</span> tables stored in the Database"); define('_AM_TDMCREATE_THEREARE_NUMFIELDS', "There are <span class='red bold'>%s</span> fields stored in the Database"); +define('_AM_TDMCREATE_THEREARE_NUMFILES', "There are <span class='red bold'>%s</span> more files stored in the Database"); // General define('_AM_TDMCREATE_FORMOK', "Successfully saved"); define('_AM_TDMCREATE_FORMDELOK', "Successfully deleted"); Modified: XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/language/english/modinfo.php =================================================================== --- XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/language/english/modinfo.php 2015-06-13 14:20:13 UTC (rev 13088) +++ XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/language/english/modinfo.php 2015-06-13 22:09:36 UTC (rev 13089) @@ -89,3 +89,4 @@ define('_MI_TDMCREATE_CONFIG_MODULES_ADMINPAGER', "Modules adminpager"); define('_MI_TDMCREATE_CONFIG_TABLES_ADMINPAGER', "Tables adminpager"); define('_MI_TDMCREATE_CONFIG_FIELDS_ADMINPAGER', "Fields adminpager"); +define('_MI_TDMCREATE_CONFIG_MOREFILES_ADMINPAGER', "More Files adminpager"); Modified: XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/xoops_version.php =================================================================== --- XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/xoops_version.php 2015-06-13 14:20:13 UTC (rev 13088) +++ XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/xoops_version.php 2015-06-13 22:09:36 UTC (rev 13089) @@ -27,7 +27,7 @@ $modversion['author'] = "Xoops TDM"; $modversion['author_website_url'] = "http://www.xoops.org/"; $modversion['author_website_name'] = "Xoops Team Developers Module"; -$modversion['credits'] = "Mamba(Xoops), Timgno(Txmod Xoops)"; +$modversion['credits'] = "Mamba(Xoops), Timgno(Txmod Xoops), Goffy(German Xoops)"; $modversion['help'] = "page=help"; $modversion['license'] = "GNU GPL 2.0 or later"; $modversion['license_url'] = "www.gnu.org/licenses/gpl-2.0.html/"; |
From: <txm...@us...> - 2015-06-13 14:20:15
|
Revision: 13088 http://sourceforge.net/p/xoops/svn/13088 Author: txmodxoops Date: 2015-06-13 14:20:13 +0000 (Sat, 13 Jun 2015) Log Message: ----------- Fix Refacoring More Files Updated Modified Paths: -------------- XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/assets/css/admin/style.css XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/TDMCreateArchitecture.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/TDMCreateTableFields.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/admin/AdminMenu.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/language/LanguageModinfo.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/templates/admin/TemplatesAdminPages.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/templates/user/TemplatesUserIndex.php Added Paths: ----------- XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/TDMCreateMoreFiles.php Removed Paths: ------------- XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/templates/TDMCreateHtmlSmartyCodes.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/templates/user/TemplatesUserMoreFiles.php Modified: XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/assets/css/admin/style.css =================================================================== --- XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/assets/css/admin/style.css 2015-06-12 21:33:08 UTC (rev 13087) +++ XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/assets/css/admin/style.css 2015-06-13 14:20:13 UTC (rev 13088) @@ -95,6 +95,14 @@ min-width: 80px; } +tr.files td { + margin: 0; + padding: 5px; + border-bottom: 1px solid #ccc; + background-color:rgba(100,110,80,0.3); + vertical-align: middle; +} + /*#show_rows { margin: 0; padding: 0; width: 60%; } #sortable tr { margin: 0 3px 3px 3px; padding: 0.4em; padding-left: 1.5em; font-size: 1.1em; height: 16px; }*/ Modified: XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/TDMCreateArchitecture.php =================================================================== --- XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/TDMCreateArchitecture.php 2015-06-12 21:33:08 UTC (rev 13087) +++ XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/TDMCreateArchitecture.php 2015-06-13 14:20:13 UTC (rev 13088) @@ -216,10 +216,11 @@ $moduleDirname = $module->getVar('mod_dirname'); $icon32 = 'assets/icons/32'; $tables = $this->tdmcfile->getTableTables($modId); + $files = $this->tdmcfile->getTableMoreFiles($modId); $ret = array(); // $table = array(); - foreach (array_keys($tables) as $t) { + foreach(array_keys($tables) as $t) { $tableMid = $tables[$t]->getVar('table_mid'); $tableId = $tables[$t]->getVar('table_id'); $tableName = $tables[$t]->getVar('table_name'); @@ -283,7 +284,17 @@ $userTemplatesPagesList->write($module, $table); $ret[] = $userTemplatesPagesList->renderFile($moduleDirname . '_' . $tableName . '_list' . '.tpl'); } - } + + } + foreach(array_keys($files) as $t) { + $fileName = $files[$t]->getVar('file_name'); + $fileExtension = $files[$t]->getVar('file_extension'); + $fileInfolder = $files[$t]->getVar('file_infolder'); + // More File + $moreFiles = TDMCreateMoreFiles::getInstance(); + $moreFiles->write($module, $fileName, $fileInfolder, $fileExtension); + $ret[] = $moreFiles->render(); + } // Language Modinfo File $languageModinfo = LanguageModinfo::getInstance(); $languageModinfo->write($module, $table, $tables, 'modinfo.php'); Added: XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/TDMCreateMoreFiles.php =================================================================== --- XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/TDMCreateMoreFiles.php (rev 0) +++ XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/TDMCreateMoreFiles.php 2015-06-13 14:20:13 UTC (rev 13088) @@ -0,0 +1,251 @@ +<?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. + */ +/** + * tdmcreate module + * + * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/ + * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html) + * @package tdmcreate + * @since 2.5.0 + * @author Txmod Xoops http://www.txmodxoops.org + * @version $Id: TDMCreateMoreFiles.php 12258 2014-01-02 09:33:29Z timgno $ + */ +defined('XOOPS_ROOT_PATH') or die('Restricted access'); +/** + * Class TDMCreateMoreFiles + */ +class TDMCreateMoreFiles extends TDMCreateFile +{ + // + private $folder; + // + private $extension; + /* + * @public function constructor + * @param null + */ + /** + * + */ + public function __construct() + { + parent::__construct(); + $this->tdmcfile = TDMCreateFile::getInstance(); + } + + /* + * @static function &getInstance + * @param null + */ + /** + * @return TDMCreateMoreFiles + */ + public static function &getInstance() + { + static $instance = false; + if (!$instance) { + $instance = new self(); + } + + return $instance; + } + + /* + * @public function write + * @param string $module + * @param string $filename + */ + /** + * @param $module + * @param $filename + * @return string + */ + public function write($module, $filename, $folder, $extension) + { + $this->setModule($module); + $this->extension = $extension; + $this->setFileName($filename . '.' . $extension); + if(strstr($folder, 'user')){ + $this->folder = '/'; + } else { + $this->folder = $folder; + } + } + + /* + * @private function getMoreFilesFilePhp + * @param $header + */ + /** + * @param $header + * @return string + */ + private function getMoreFilesFilePhp($header) + { + $ret = <<<EOT +<?php +{$header}\n +EOT; + + return $ret; + } + + /* + * @private function getMoreFilesFileTpl + * @param $header + */ + /** + * @param $header + * @return string + */ + private function getMoreFilesFileTpl() + { + $ret = <<<EOT +<div class="panel"> + Pleace! put your template code here +</div>\n +EOT; + + return $ret; + } + + /* + * @private function getMoreFilesFileHtml + * @param $header + */ + /** + * @param $header + * @return string + */ + private function getMoreFilesFileHtml() + { + $ret = <<<EOT +<div class="panel"> + Pleace! put your Html code here +</div>\n +EOT; + + return $ret; + } + + /* + * @private function getMoreFilesFileText + * @param null + */ + /** + * @param null + * @return string + */ + private function getMoreFilesFileText() + { + $ret = <<<EOT +Pleace! put your text code here\n +EOT; + + return $ret; + } + + /* + * @private function getMoreFilesFileSql + * @param null + */ + /** + * @param null + * @return string + */ + private function getMoreFilesFileSql() + { + $ret = <<<EOT +Pleace! put your sql code here\n +EOT; + + return $ret; + } + + /* + * @private function getMoreFilesFileCss + * @param $header + */ + /** + * @param $header + * @return string + */ + private function getMoreFilesFileCss($header) + { + $ret = <<<EOT +@charset "UTF-8"; +{$header}\n\nPleace! put your sql code here\n +EOT; + + return $ret; + } + + /* + * @private function getMoreFilesFileDefault + * @param null + */ + /** + * @param null + * @return string + */ + private function getMoreFilesFileDefault() + { + $ret = <<<EOT +\n +EOT; + + return $ret; + } + + /* + * @public function renderFile + * @param string $filename + */ + /** + * @param $filename + * @return bool|string + */ + public function renderFile() + { + $module = $this->getModule(); + $filename = $this->getFileName(); + $moduleDirname = $module->getVar('mod_dirname'); + $header = $this->getHeaderFilesComments($module, $filename, 0); + switch($this->extension) { + case 'php': + $content = $this->getMoreFilesFilePhp($header); + break; + case 'tpl': + $content = $this->getMoreFilesFileTpl(); + break; + case 'html': + $content = $this->getMoreFilesFileHtml(); + break; + case 'text': + $content = $this->getMoreFilesFileText(); + break; + case 'sql': + $content = $this->getMoreFilesFileSql(); + break; + case 'css': + $content = $this->getMoreFilesFileCss($header); + break; + default: + $content = $this->getMoreFilesFileDefault(); + break; + } + + // + $this->tdmcfile->create($moduleDirname, $this->folder, $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED); + + return $this->tdmcfile->renderFile(); + } +} Modified: XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/TDMCreateTableFields.php =================================================================== --- XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/TDMCreateTableFields.php 2015-06-12 21:33:08 UTC (rev 13087) +++ XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/TDMCreateTableFields.php 2015-06-13 14:20:13 UTC (rev 13088) @@ -108,4 +108,21 @@ return $fieldElements; } + + /** + * @public function getTableMoreFiles + * @param $mId + * @return mixed + */ + public function getTableMoreFiles($mId, $sort = 'file_id ASC, file_name', $order = 'ASC') + { + $criteria = new CriteriaCompo(); + $criteria->add(new Criteria('file_mid', $mId)); // $mId = module Id + $criteria->setSort($sort); + $criteria->setOrder($order); + $morefiles = $this->tdmcreate->getHandler('morefiles')->getObjects($criteria); + unset($criteria); + + return $morefiles; + } } Modified: XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/admin/AdminMenu.php =================================================================== --- XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/admin/AdminMenu.php 2015-06-12 21:33:08 UTC (rev 13087) +++ XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/admin/AdminMenu.php 2015-06-13 14:20:13 UTC (rev 13088) @@ -170,7 +170,7 @@ $content = $this->getHeaderFilesComments($module, $filename); $content .= $this->getAdminMenuHeader(); $content .= $this->getAdminMenuDashboard($language, $menu); - $tables = $this->getTableTables($module->getVar('mod_id'), 'table_order ASC, table_name'); + $tables = $this->getTableTables($module->getVar('mod_id'), 'table_order'); foreach (array_keys($tables) as $t) { $tablePermissions = $tables[$t]->getVar('table_permissions'); if (1 == $tables[$t]->getVar('table_admin')) { Modified: XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/language/LanguageModinfo.php =================================================================== --- XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/language/LanguageModinfo.php 2015-06-12 21:33:08 UTC (rev 13087) +++ XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/language/LanguageModinfo.php 2015-06-13 14:20:13 UTC (rev 13088) @@ -106,7 +106,7 @@ */ private function getLanguageMenu($module, $language, $table) { - $tables = $this->getTableTables($module->getVar('mod_id'), 'table_order ASC, table_name'); + $tables = $this->getTableTables($module->getVar('mod_id'), 'table_order'); $menu = 1; $ret = $this->defines->getAboveHeadDefines('Admin Menu'); $ret .= $this->defines->getDefine($language, "ADMENU{$menu}", "Dashboard"); Deleted: XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/templates/TDMCreateHtmlSmartyCodes.php =================================================================== --- XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/templates/TDMCreateHtmlSmartyCodes.php 2015-06-12 21:33:08 UTC (rev 13087) +++ XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/templates/TDMCreateHtmlSmartyCodes.php 2015-06-13 14:20:13 UTC (rev 13088) @@ -1,489 +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. - */ -/** - * tdmcreate module - * - * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/ - * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html) - * @package tdmcreate - * @since 2.5.0 - * @author Txmod Xoops http://www.txmodxoops.org - * @version $Id: htmlsmartycodes.php 12258 2014-01-02 09:33:29Z timgno $ - */ -defined('XOOPS_ROOT_PATH') or die('Restricted access'); - -/** - * Class TDMCreateHtmlSmartyCodes - */ -class TDMCreateHtmlSmartyCodes extends TDMCreateFile -{ - /* - * @public function constructor - * @param null - */ - /** - * - */ - public function __construct() - { - parent::__construct(); - } - - /* - * @static function &getInstance - * @param null - */ - /** - * @return TDMCreateHtmlSmartyCodes - */ - public static function &getInstance() - { - static $instance = false; - if (!$instance) { - $instance = new self(); - } - - return $instance; - } - - /* - * @public function getHtmlDiv - * @param string $class - * @param string $content - */ - /** - * @param string $class - * @param string $content - * @return string - */ - public function getHtmlDiv($class = 'bnone', $content = '') - { - $ret = <<<EOT - <div class='{$class}'> - {$content} - </div> -EOT; - - return $ret; - } - - /* - * @public function getHtmlSpan - * @param string $class - * @param string $content - */ - /** - * @param string $class - * @param string $content - * @return string - */ - public function getHtmlSpan($class = 'bnone', $content = '') - { - $ret = <<<EOT - <span class='{$class}'> - {$content} - </span> -EOT; - - return $ret; - } - - /* - * @public function getHtmlParagraph - * @param string $class - * @param string $content - */ - /** - * @param string $class - * @param string $content - * @return string - */ - public function getHtmlParagraph($class = 'bnone', $content = '') - { - $ret = <<<EOT - <p class='{$class}'> - {$content} - </p> -EOT; - - return $ret; - } - - /* - * @public function getHtmlAnchor - * @param string $class - * @param string $url - * @param string $target - * @param string $content - */ - /** - * @param string $class - * @param string $url - * @param string $target - * @param string $content - * @return string - */ - public function getHtmlAnchor($class = 'bnone', $url = 'http://', $target = '_top', $content = '') - { - $ret = <<<EOT - <a class='{$class}' href='{$url}' target='{$target}'> - {$content} - </a> -EOT; - - return $ret; - } - - /* - * @public function getHtmlImage - * @param string $class - * @param string $src - * @param string $alt - */ - /** - * @param string $class - * @param string $src - * @param string $alt - * @return string - */ - public function getHtmlImage($class = 'bnone', $src = 'blank.gif', $alt = 'blank.gif') - { - $ret = <<<EOT - <img class='{$class}' src='{$src}' alt='{$alt}' /> -EOT; - - return $ret; - } - - /* - * @public function getHtmlTable - * @param string $class - * @param string $content - */ - /** - * @param string $class - * @param string $content - * @return string - */ - public function getHtmlTable($class = 'bnone', $content = '') - { - $ret = <<<EOT - <table class='{$class}'> - {$content} - </table> -EOT; - - return $ret; - } - - /* - * @public function getHtmlTableThead - * @param string $class - * @param string $content - */ - /** - * @param string $class - * @param string $content - * @return string - */ - public function getHtmlTableThead($class = 'bnone', $content = '') - { - $ret = <<<EOT - <thead class='{$class}'> - {$content} - </thead> -EOT; - - return $ret; - } - - /* - * @public function getHtmlTableTbody - * @param string $class - * @param string $content - */ - /** - * @param string $class - * @param string $content - * @return string - */ - public function getHtmlTableTbody($class = 'bnone', $content = '') - { - $ret = <<<EOT - <tbody class='{$class}'> - {$content} - </tbody> -EOT; - - return $ret; - } - - /* - * @public function getHtmlTableTfoot - * @param string $class - * @param string $content - */ - /** - * @param string $class - * @param string $content - * @return string - */ - public function getHtmlTableTfoot($class = 'bnone', $content = '') - { - $ret = <<<EOT - <tfoot class='{$class}'> - {$content} - </tfoot> -EOT; - - return $ret; - } - - /* - * @public function getHtmlTableHead - * @param string $class - * @param string $content - */ - /** - * @param string $class - * @param string $content - * @return string - */ - public function getHtmlTableHead($class = 'bnone', $content = '') - { - $ret = <<<EOT - <th class='{$class}'>{$content}</th> -EOT; - - return $ret; - } - - /* - * @public function getHtmlTableRow - * @param string $class - * @param string $content - */ - /** - * @param string $class - * @param string $content - * @return string - */ - public function getHtmlTableRow($class = 'bnone', $content = '') - { - $ret = <<<EOT - <tr class='{$class}'> - {$content} - </tr> -EOT; - - return $ret; - } - - /* - * @public function getHtmlTableData - * @param string $class - * @param string $content - */ - /** - * @param string $class - * @param string $content - * @return string - */ - public function getHtmlTableData($class = 'bnone', $content = '') - { - $ret = <<<EOT - <td class='{$class}'>{$content}</td> -EOT; - - return $ret; - } - - /* - * @public function getSmartyConst - * @param string $language - * @param mixed $fieldName - */ - /** - * @param $language - * @param $fieldName - * @return string - */ - public function getSmartyConst($language, $fieldName) - { - $ret = <<<EOT - <{\$smarty.const.{$language}{$fieldName}}> -EOT; - - return $ret; - } - - /* - * @public function getSmartyTableFieldNameEmptyData - * @param string $tableName - * @param string $fieldName - */ - /** - * @param string $tableName - * @param string $fieldName - * @return string - */ - public function getSmartyTableFieldNameEmptyData($tableName = '', $fieldName = '') - { - $ret = <<<EOT - <{\${$tableName}.{$fieldName}}> -EOT; - - return $ret; - } - - /* - * @public function getSmartyTableField - * @param string $tableFieldname - * @param string $fieldName - */ - /** - * @param string $tableFieldname - * @param string $fieldName - * @return string - */ - public function getSmartyTableFieldData($tableFieldname = '', $fieldName = '') - { - $ret = <<<EOT - <{\${$tableFieldname}.{$fieldName}}> -EOT; - - return $ret; - } - - /* - * @public function getSmartyIncludeFile - * @param string $name - */ - /** - * @param $moduleDirname - * @param string $tableName - * @return string - */ - public function getSmartyIncludeFile($moduleDirname, $tableName = 'header') - { - $ret = <<<EOT - <{include file='db:{$moduleDirname}_{$tableName}.html'}> -EOT; - - return $ret; - } - - /* - * @public function getSmartyConditions - * @param string $condition - * @param string $operator - * @param string $type - * @param string $content_if - * @param mixed $content_else - */ - /** - * @param string $condition - * @param string $operator - * @param string $type - * @param string $content_if - * @param bool $content_else - * @return string - */ - public function getSmartyConditions($condition = '', $operator = '==', $type = '1', $content_if = '', $content_else = false) - { - if (!$content_else) { - $ret = <<<EOT - <{if ${$condition} {$operator} {$type}'}> - {$content_if} - <{/if}> -EOT; - } else { - $ret = <<<EOT - <{if ${$condition} {$operator} {$type}'}> - {$content_if} - <{else}> - {$content_else} - <{/if}> -EOT; - } - - return $ret; - } - - /* - * @public function getSmartyForeach - * @param string $item - * @param string $from - * @param string $content - */ - /** - * @param string $item - * @param string $from - * @param string $content - * @return string - */ - public function getSmartyForeach($item = 'item', $from = 'from', $content = 'content') - { - $ret = <<<EOT - <{foreach item={$item} from=${$from}}> - {$content} - <{/foreach}> -EOT; - - return $ret; - } - - /* - * @public function getSmartyForeachQuery - * @param string $item - * @param string $from - * @param string $content - */ - /** - * @param string $item - * @param string $from - * @param string $content - * @return string - */ - public function getSmartyForeachQuery($item = 'item', $from = 'from', $content = 'content') - { - $ret = <<<EOT - <{foreachq item={$item} from=${$from}}> - {$content} - <{/foreachq}> -EOT; - - return $ret; - } - - /* - * @public function getSmartySection - * @param string $name - * @param string $loop - * @param string $content - */ - /** - * @param string $name - * @param string $loop - * @param string $content - * @return string - */ - public function getSmartySection($name = 'name', $loop = 'loop', $content = 'content') - { - $ret = <<<EOT - <{section name={$name} loop=${$loop}}> - {$content} - <{/section}> -EOT; - - return $ret; - } -} Modified: XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/templates/admin/TemplatesAdminPages.php =================================================================== --- XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/templates/admin/TemplatesAdminPages.php 2015-06-12 21:33:08 UTC (rev 13087) +++ XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/templates/admin/TemplatesAdminPages.php 2015-06-13 14:20:13 UTC (rev 13088) @@ -298,7 +298,7 @@ $moduleDirname = $module->getVar('mod_dirname'); $tableFieldname = $table->getVar('table_fieldname'); $language = $this->getLanguage($moduleDirname, 'AM'); - $fields = $this->getTableFields($table->getVar('table_mid'), $table->getVar('table_id'), 'field_order ASC'); + $fields = $this->getTableFields($table->getVar('table_mid'), $table->getVar('table_id'), 'field_order'); $content = $this->getTemplatesAdminPagesHeader($moduleDirname, $table, $fields, $language); // Verify if table_fieldname is not empty if (!empty($tableFieldname)) { Modified: XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/templates/user/TemplatesUserIndex.php =================================================================== --- XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/templates/user/TemplatesUserIndex.php 2015-06-12 21:33:08 UTC (rev 13087) +++ XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/templates/user/TemplatesUserIndex.php 2015-06-13 14:20:13 UTC (rev 13088) @@ -110,7 +110,7 @@ <ul class="menu"> <li><a href="<{\${$moduleDirname}_url}>"><{\$smarty.const.{$language}INDEX}></a></li>\n EOT; - $tables = $this->getTableTables($module->getVar('mod_id'), 'table_order ASC'); + $tables = $this->getTableTables($module->getVar('mod_id'), 'table_order'); foreach (array_keys($tables) as $i) { $tableName = $tables[$i]->getVar('table_name'); $stuTableName = strtoupper($tableName); Deleted: XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/templates/user/TemplatesUserMoreFiles.php =================================================================== --- XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/templates/user/TemplatesUserMoreFiles.php 2015-06-12 21:33:08 UTC (rev 13087) +++ XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/templates/user/TemplatesUserMoreFiles.php 2015-06-13 14:20:13 UTC (rev 13088) @@ -1,122 +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. - */ -/** - * tdmcreate module - * - * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/ - * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html) - * @package tdmcreate - * @since 2.5.0 - * @author Txmod Xoops http://www.txmodxoops.org - * @version $Id: TemplatesUserMoreFiles.php 12258 2014-01-02 09:33:29Z timgno $ - */ -defined('XOOPS_ROOT_PATH') or die('Restricted access'); - -/** - * Class TemplatesUserMoreFiles - */ -class TemplatesUserMoreFiles extends TDMCreateFile -{ - // - private $folder; - // - private $extension; - /* - * @public function constructor - * @param null - */ - /** - * - */ - public function __construct() - { - parent::__construct(); - $this->tdmcfile = TDMCreateFile::getInstance(); - } - - /* - * @static function &getInstance - * @param null - */ - /** - * @return TemplatesUserMoreFiles - */ - public static function &getInstance() - { - static $instance = false; - if (!$instance) { - $instance = new self(); - } - - return $instance; - } - - /* - * @public function write - * @param string $module - * @param string $filename - */ - /** - * @param $module - * @param $filename - * @return string - */ - public function write($module, $folder = '', $filename, $extension) - { - $this->setModule($module); - $this->setFileName($filename); - if($folder != ''){ - $this->folder = 'templates/'.$folder; - } else { - $this->folder = 'templates'; - } - $this->extension = $extension; - } - - /* - * @private function getTemplatesUserMoreFile - * @param null - */ - /** - * @param null - * @return string - */ - private function getTemplatesUserMoreFile() - { - $ret = <<<EOT -<div class="panel"> - Pleace! Enter here your template code here -</div> -EOT; - - return $ret; - } - - /* - * @public function renderFile - * @param string $filename - */ - /** - * @param $filename - * @return bool|string - */ - public function renderFile() - { - $module = $this->getModule(); - $filename = $this->getFileName(); - $moduleDirname = $module->getVar('mod_dirname'); - $content = $this->getTemplatesUserMoreFile(); - // - $this->tdmcfile->create($moduleDirname, $this->folder, $filename . '.' . $this->extension, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED); - - return $this->tdmcfile->renderFile(); - } -} |
From: <txm...@us...> - 2015-06-12 21:33:11
|
Revision: 13087 http://sourceforge.net/p/xoops/svn/13087 Author: txmodxoops Date: 2015-06-12 21:33:08 +0000 (Fri, 12 Jun 2015) Log Message: ----------- Added morefiles.php and more for extra custom files Updated Modified Paths: -------------- XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/admin/menu.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/fieldattributes.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/fields.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/TDMCreateArchitecture.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/admin/AdminPages.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/classes/ClassFiles.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/classes/ClassFormElements.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/language/LanguageAdmin.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/templates/admin/TemplatesAdminPages.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/modules.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/tables.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/language/english/admin.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/language/english/modinfo.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/sql/mysql.sql XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/xoops_version.php Added Paths: ----------- XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/admin/morefiles.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/assets/icons/32/files.png XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/templates/user/TemplatesUserMoreFiles.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/morefiles.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/templates/admin/tdmcreate_morefiles.tpl Modified: XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/admin/menu.php =================================================================== --- XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/admin/menu.php 2015-06-10 16:08:35 UTC (rev 13086) +++ XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/admin/menu.php 2015-06-12 21:33:08 UTC (rev 13087) @@ -45,10 +45,14 @@ $adminmenu[$i]['icon'] = 'assets/icons/32/fields.png'; $i++; $adminmenu[$i]['title'] = _MI_TDMCREATE_ADMENU6; +$adminmenu[$i]['link'] = 'admin/morefiles.php'; +$adminmenu[$i]['icon'] = 'assets/icons/32/files.png'; +$i++; +$adminmenu[$i]['title'] = _MI_TDMCREATE_ADMENU7; $adminmenu[$i]['link'] = 'admin/building.php'; $adminmenu[$i]['icon'] = 'assets/icons/32/builder.png'; $i++; -$adminmenu[$i]['title'] = _MI_TDMCREATE_ADMENU7; +$adminmenu[$i]['title'] = _MI_TDMCREATE_ABOUT; $adminmenu[$i]['link'] = 'admin/about.php'; $adminmenu[$i]['icon'] = $sysPathIcon32 . '/about.png'; unset($i); Added: XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/admin/morefiles.php =================================================================== --- XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/admin/morefiles.php (rev 0) +++ XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/admin/morefiles.php 2015-06-12 21:33:08 UTC (rev 13087) @@ -0,0 +1,140 @@ +<?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. + */ +/** + * tdmcreate module + * + * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/ + * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html) + * @package tdmcreate + * @since 2.5.5 + * @author Txmod Xoops <su...@tx...> + * @version $Id: 1.59 morefiles.php 11297 2013-03-24 10:58:10Z timgno $ + */ +include __DIR__ . '/header.php'; +// Recovered value of argument op in the URL $ +$op = XoopsRequest::getString('op', 'list'); +// +$fileId = XoopsRequest::getInt('file_id'); +// +switch ($op) { + case 'list': + default: + $start = XoopsRequest::getInt('start', 0); + $limit = XoopsRequest::getInt('limit', $tdmcreate->getConfig('morefiles_adminpager')); + // Define main template + $templateMain = 'tdmcreate_morefiles.tpl'; + $GLOBALS['xoTheme']->addScript('modules/tdmcreate/assets/js/functions.js'); + $GLOBALS['xoTheme']->addStylesheet('modules/tdmcreate/assets/css/admin/style.css'); + $GLOBALS['xoopsTpl']->assign('navigation', $adminMenu->addNavigation('morefiles.php')); + $adminMenu->addItemButton(_AM_TDMCREATE_ADD_MORE_FILE, 'morefiles.php?op=new', 'add'); + $GLOBALS['xoopsTpl']->assign('buttons', $adminMenu->renderButton()); + $GLOBALS['xoopsTpl']->assign('tdmc_url', TDMC_URL); + $GLOBALS['xoopsTpl']->assign('tdmc_upload_imgfile_url', TDMC_UPLOAD_IMGMOD_URL); + $GLOBALS['xoopsTpl']->assign('modPathIcon16', $modPathIcon16); + $GLOBALS['xoopsTpl']->assign('sysPathIcon32', $sysPathIcon32); + $modulesCount = $tdmcreate->getHandler('modules')->getCountModules(); + // Redirect if there aren't modules + if (0 == $modulesCount) { + redirect_header('modules.php?op=new', 2, _AM_TDMCREATE_NOT_MODULES); + } + $morefilesCount = $tdmcreate->getHandler('morefiles')->getCountMoreFiles(); + $morefilesAll = $tdmcreate->getHandler('morefiles')->getAllMoreFiles($start, $limit); + // Display morefiles list + if ($morefilesCount > 0) { + foreach (array_keys($morefilesAll) as $i) { + $files = $morefilesAll[$i]->getValues(); + $GLOBALS['xoopsTpl']->append('files_list', $files); + unset($files); + } + if ($morefilesCount > $limit) { + include_once XOOPS_ROOT_PATH . '/class/pagenav.php'; + $pagenav = new XoopsPageNav($morefilesCount, $limit, $start, 'start', 'op=list&limit=' . $limit); + $GLOBALS['xoopsTpl']->assign('pagenav', $pagenav->renderNav(4)); + } + } else { + $GLOBALS['xoopsTpl']->assign('error', _AM_TDMCREATE_THEREARENT_MODULES); + } + break; + + case 'new': + // Define main template + $templateMain = 'tdmcreate_morefiles.tpl'; + $GLOBALS['xoTheme']->addScript('modules/tdmcreate/assets/js/functions.js'); + $GLOBALS['xoopsTpl']->assign('navigation', $adminMenu->addNavigation('morefiles.php')); + $adminMenu->addItemButton(_AM_TDMCREATE_MORE_FILES_LIST, 'morefiles.php', 'list'); + $GLOBALS['xoopsTpl']->assign('buttons', $adminMenu->renderButton()); + + $morefilesObj =& $tdmcreate->getHandler('morefiles')->create(); + $form = $morefilesObj->getForm(); + $GLOBALS['xoopsTpl']->assign('form', $form->render()); + break; + + case 'save': + if (!$GLOBALS['xoopsSecurity']->check()) { + redirect_header('morefiles.php', 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors())); + } + if (isset($fileId)) { + $morefilesObj =& $tdmcreate->getHandler('morefiles')->get($fileId); + } else { + $morefilesObj =& $tdmcreate->getHandler('morefiles')->create(); + } + // Form file save + $morefilesObj->setVars(array( + 'file_mid' => $_POST['file_mid'], + 'file_name' => $_POST['file_name'], + 'file_extension' => $_POST['file_extension'], + 'file_infolder' => $_POST['file_infolder'])); + + if ($tdmcreate->getHandler('morefiles')->insert($morefilesObj)) { + if ($morefilesObj->isNew()) { + redirect_header('morefiles.php', 5, sprintf(_AM_TDMCREATE_FILE_FORM_CREATED_OK, $_POST['file_name'])); + } else { + redirect_header('morefiles.php', 5, sprintf(_AM_TDMCREATE_FILE_FORM_UPDATED_OK, $_POST['file_name'])); + } + } + + $GLOBALS['xoopsTpl']->assign('error', $morefilesObj->getHtmlErrors()); + $form =& $morefilesObj->getForm(); + $GLOBALS['xoopsTpl']->assign('form', $form->render()); + break; + + case 'edit': + // Define main template + $templateMain = 'tdmcreate_morefiles.tpl'; + $GLOBALS['xoTheme']->addScript('modules/tdmcreate/assets/js/functions.js'); + $GLOBALS['xoopsTpl']->assign('navigation', $adminMenu->addNavigation('morefiles.php')); + $adminMenu->addItemButton(_AM_TDMCREATE_ADD_MODULE, 'morefiles.php?op=new', 'add'); + $adminMenu->addItemButton(_AM_TDMCREATE_MORE_FILES_LIST, 'morefiles.php', 'list'); + $GLOBALS['xoopsTpl']->assign('buttons', $adminMenu->renderButton()); + + $morefilesObj = $tdmcreate->getHandler('morefiles')->get($fileId); + $form = $morefilesObj->getForm(); + $GLOBALS['xoopsTpl']->assign('form', $form->render()); + break; + + case 'delete': + $morefilesObj =& $tdmcreate->getHandler('morefiles')->get($fileId); + if (isset($_REQUEST['ok']) && 1 == $_REQUEST['ok']) { + if (!$GLOBALS['xoopsSecurity']->check()) { + redirect_header('morefiles.php', 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors())); + } + if ($tdmcreate->getHandler('morefiles')->delete($morefilesObj)) { + redirect_header('morefiles.php', 3, _AM_TDMCREATE_FORM_DELETED_OK); + } else { + $GLOBALS['xoopsTpl']->assign('error', $morefilesObj->getHtmlErrors()); + } + } else { + xoops_confirm(array('ok' => 1, 'file_id' => $fileId, 'op' => 'delete'), $_SERVER['REQUEST_URI'], sprintf(_AM_TDMCREATE_FORM_SURE_DELETE, $morefilesObj->getVar('file_name'))); + } + break; +} + +include __DIR__ . '/footer.php'; Added: XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/assets/icons/32/files.png =================================================================== (Binary files differ) Index: XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/assets/icons/32/files.png =================================================================== --- XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/assets/icons/32/files.png 2015-06-10 16:08:35 UTC (rev 13086) +++ XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/assets/icons/32/files.png 2015-06-12 21:33:08 UTC (rev 13087) Property changes on: XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/assets/icons/32/files.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Modified: XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/fieldattributes.php =================================================================== --- XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/fieldattributes.php 2015-06-10 16:08:35 UTC (rev 13086) +++ XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/fieldattributes.php 2015-06-12 21:33:08 UTC (rev 13087) @@ -14,9 +14,9 @@ * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/ * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html) * @package tdmcreate - * @since 2.5.5 - * @author Txmod Xoops <su...@tx...> - * @version $Id: 1.91 fieldattributes.php 11297 2014-05-14 10:58:10Z timgno $ + * @since 2.5.7 + * @author Txmod Xoops <web...@tx...> - <http://www.txmodxoops.org/> + * @version $Id: 1.91 fieldattributes.php 13027 2015-02-14 12:18:10Z timgno $ */ defined('XOOPS_ROOT_PATH') or die('Restricted access'); Modified: XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/fields.php =================================================================== --- XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/fields.php 2015-06-10 16:08:35 UTC (rev 13086) +++ XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/fields.php 2015-06-12 21:33:08 UTC (rev 13087) @@ -15,8 +15,8 @@ * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/ * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html) * @package tdmcreate - * @since 2.5.0 - * @author Txmod Xoops http://www.txmodxoops.org + * @since 2.5.7 + * @author Txmod Xoops <web...@tx...> - <http://www.txmodxoops.org/> * @version $Id: 1.91 fields.php 12258 2014-01-02 09:33:29Z timgno $ */ defined('XOOPS_ROOT_PATH') or die('Restricted access'); Modified: XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/TDMCreateArchitecture.php =================================================================== --- XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/TDMCreateArchitecture.php 2015-06-10 16:08:35 UTC (rev 13086) +++ XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/TDMCreateArchitecture.php 2015-06-12 21:33:08 UTC (rev 13087) @@ -93,15 +93,15 @@ } // $indexFile = XOOPS_UPLOAD_PATH . '/index.html'; - $cache1 = TDMC_CLASSES_PATH . '/cache'; - $cache2 = TDMC_CLASSES_PATH . '/files/cache'; $stlModuleAuthor = str_replace(' ', '', strtolower($module->getVar('mod_author'))); $this->structure->setModuleName($module->getVar('mod_dirname')); $uploadPath = $this->structure->getUploadPath(); // Creation of "module" folder in the Directory repository $this->structure->makeDir($uploadPath . '/' . $this->structure->getModuleName()); - // Copied of index.html file in "root module" folder - //$this->structure->copyFile('', $indexFile, 'index.html'); + if (1 != $module->getVar('mod_user')) { + // Copied of index.html file in "root module" folder + $this->structure->copyFile('', $indexFile, 'index.html'); + } if (1 == $module->getVar('mod_admin')) { // Creation of "admin" folder and index.html file $this->structure->makeDirAndCopyFile('admin', $indexFile, 'index.html'); Modified: XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/admin/AdminPages.php =================================================================== --- XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/admin/AdminPages.php 2015-06-10 16:08:35 UTC (rev 13086) +++ XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/admin/AdminPages.php 2015-06-12 21:33:08 UTC (rev 13087) @@ -82,12 +82,13 @@ { $ucfModuleDirname = ucfirst($moduleDirname); $ucfTableName = ucfirst($tableName); + $ccFieldId = $this->tdmcfile->getCamelCase($fieldId, false, true); $ret = <<<EOT include __DIR__ . '/header.php'; //It recovered the value of argument op in URL$ \$op = XoopsRequest::getString('op', 'list'); // Request {$fieldId} -\${$fieldId} = XoopsRequest::getInt('{$fieldId}'); +\${$ccFieldId} = XoopsRequest::getInt('{$fieldId}'); // Switch options switch (\$op) {\n @@ -200,13 +201,14 @@ */ private function getAdminPagesSave($moduleDirname, $tableName, $language, $fields, $fieldId, $fieldMain) { - $ret = <<<EOT + $ccFieldId = $this->tdmcfile->getCamelCase($fieldId, false, true); + $ret = <<<EOT case 'save': if ( !\$GLOBALS['xoopsSecurity']->check() ) { redirect_header('{$tableName}.php', 3, implode(',', \$GLOBALS['xoopsSecurity']->getErrors())); } - if (isset(\${$fieldId})) { - \${$tableName}Obj =& \${$tableName}Handler->get(\${$fieldId}); + if (isset(\${$ccFieldId})) { + \${$tableName}Obj =& \${$tableName}Handler->get(\${$ccFieldId}); } else { \${$tableName}Obj =& \${$tableName}Handler->create(); } @@ -277,6 +279,7 @@ $stuTableName = strtoupper($tableName); $stuTableSoleName = strtoupper($tableSoleName); $stuTableFieldname = strtoupper($tableFieldname); + $ccFieldId = $this->tdmcfile->getCamelCase($fieldId, false, true); $ret = <<<EOT case 'edit': \$templateMain = '{$moduleDirname}_admin_{$tableName}.tpl'; @@ -285,7 +288,7 @@ \$GLOBALS['xoopsTpl']->assign('navigation', \$adminMenu->addNavigation('{$tableName}.php')); \$GLOBALS['xoopsTpl']->assign('buttons', \$adminMenu->renderButton()); // Get Form - \${$tableName}Obj = \${$tableName}Handler->get(\${$fieldId}); + \${$tableName}Obj = \${$tableName}Handler->get(\${$ccFieldId}); \$form = \${$tableName}Obj->getForm(); \$GLOBALS['xoopsTpl']->assign('form', \$form->render()); break;\n @@ -304,9 +307,10 @@ */ private function getAdminPagesDelete($tableName, $language, $fieldId, $fieldMain) { - $ret = <<<EOT + $ccFieldId = $this->tdmcfile->getCamelCase($fieldId, false, true); + $ret = <<<EOT case 'delete': - \${$tableName}Obj =& \${$tableName}Handler->get(\${$fieldId}); + \${$tableName}Obj =& \${$tableName}Handler->get(\${$ccFieldId}); if (isset(\$_REQUEST['ok']) && 1 == \$_REQUEST['ok']) { if ( !\$GLOBALS['xoopsSecurity']->check() ) { redirect_header('{$tableName}.php', 3, implode(', ', \$GLOBALS['xoopsSecurity']->getErrors())); @@ -314,10 +318,10 @@ if (\${$tableName}Handler->delete(\${$tableName}Obj)) { redirect_header('{$tableName}.php', 3, {$language}FORM_DELETE_OK); } else { - echo \${$tableName}Obj->getHtmlErrors(); + \$GLOBALS['xoopsTpl']->assign('error', \${$tableName}Obj->getHtmlErrors()); } } else { - xoops_confirm(array('ok' => 1, '{$fieldId}' => \${$fieldId}, 'op' => 'delete'), \$_SERVER['REQUEST_URI'], sprintf({$language}FORM_SURE_DELETE, \${$tableName}Obj->getVar('{$fieldMain}'))); + xoops_confirm(array('ok' => 1, '{$fieldId}' => \${$ccFieldId}, 'op' => 'delete'), \$_SERVER['REQUEST_URI'], sprintf({$language}FORM_SURE_DELETE, \${$tableName}Obj->getVar('{$fieldMain}'))); } break;\n EOT; @@ -336,17 +340,17 @@ private function getAdminPagesUpdate($moduleDirname, $tableName, $fieldId, $fieldName) { $stuModuleName = strtoupper($moduleDirname); + $ccFieldId = $this->tdmcfile->getCamelCase($fieldId, false, true); $ret = <<<EOT case 'update': - if (isset(\${$fieldId})) { - \${$tableName}Obj =& \${$tableName}Handler->get(\${$fieldId}); + if (isset(\${$ccFieldId})) { + \${$tableName}Obj =& \${$tableName}Handler->get(\${$ccFieldId}); } - \${$tableName}Obj->setVar("\${$fieldName}", \$_POST["\${$fieldName}"]); - + \${$tableName}Obj->setVar('{$fieldName}', \$_POST['{$fieldName}']); if (\${$tableName}Handler->insert(\${$tableName}Obj)) { - redirect_header("\${$tableName}.php", 3, _AM_{$stuModuleName}_FORM_OK); + redirect_header('{$tableName}.php', 3, _AM_{$stuModuleName}_FORM_OK); } - echo \${$tableName}Obj->getHtmlErrors(); + \$GLOBALS['xoopsTpl']->assign('error', \${$tableName}Obj->getHtmlErrors()); break;\n EOT; Modified: XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/classes/ClassFiles.php =================================================================== --- XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/classes/ClassFiles.php 2015-06-10 16:08:35 UTC (rev 13086) +++ XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/classes/ClassFiles.php 2015-06-12 21:33:08 UTC (rev 13087) @@ -658,7 +658,7 @@ public function &getInsertId() { return \$this->db->getInsertId(); - }\n\n + }\n\n EOT; return $ret; Modified: XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/classes/ClassFormElements.php =================================================================== --- XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/classes/ClassFormElements.php 2015-06-10 16:08:35 UTC (rev 13086) +++ XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/classes/ClassFormElements.php 2015-06-12 21:33:08 UTC (rev 13087) @@ -617,7 +617,34 @@ return $ret; } + + /* + * @private function getXoopsFormTag + * @param string $moduleDirname + * @param string $fieldId + * @param string $required + */ + /** + * @param $moduleDirname + * @param $fieldId + * @param string $required + * @return string + */ + private function getXoopsFormTag($moduleDirname, $fieldId, $required = 'false') + { + $ret = <<<EOT + // Use tag module + \$dirTag = is_dir(XOOPS_ROOT_PATH . '/modules/tag') ? true : false; + if ((\$this->{$moduleDirname}->getConfig('usetag') == 1) && \$dirTag){ + \$tagId = \$this->isNew() ? 0 : \$this->getVar('{$fieldId}'); + include_once XOOPS_ROOT_PATH.'/modules/tag/include/formtag.php'; + \$form->addElement(new XoopsFormTag('tag', 60, 255, \$tagId, 0){$required}); + }\n +EOT; + return $ret; + } + /* * @public function renderElements * @param null @@ -707,7 +734,11 @@ $ret .= $this->getXoopsFormTextDateSelect($language, $moduleDirname, $fieldName, $required); break; default: - // If we want to hide XoopsFormHidden() or field id + // If we use tag module + if (1 == $table->getVar('table_tag')) { + $ret .= $this->getXoopsFormTag($moduleDirname, $fieldId, $required); + } + // If we want to hide XoopsFormHidden() or field id if ((0 == $f) && (1 == $table->getVar('table_autoincrement'))) { $ret .= $this->getXoopsFormHidden($fieldName); } Modified: XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/language/LanguageAdmin.php =================================================================== --- XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/language/LanguageAdmin.php 2015-06-10 16:08:35 UTC (rev 13086) +++ XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/language/LanguageAdmin.php 2015-06-12 21:33:08 UTC (rev 13087) @@ -174,7 +174,7 @@ $fieldNameDesc = substr($fieldElementName, strrpos($fieldElementName, ':'), strlen($fieldElementName)); $fieldNameDesc = str_replace(': ', '', $fieldNameDesc); } else { - $fieldNameDesc = ucfirst($rpFieldName); + $fieldNameDesc = strstr($rpFieldName, '_') ? str_replace('_', ' ', ucfirst($rpFieldName)) : ucfirst($rpFieldName); } // $ret .= $this->defines->getDefine($language, $tableSoleName . '_' . $rpFieldName, $fieldNameDesc); @@ -259,6 +259,7 @@ public function render() { $module = $this->getModule(); + $table = $this->getTable(); $tables = $this->getTables(); $filename = $this->getFileName(); $moduleDirname = $module->getVar('mod_dirname'); @@ -267,9 +268,11 @@ if (is_array($tables)) { $content .= $this->getLanguageAdminIndex($language, $tables); $content .= $this->getLanguageAdminPages($language, $tables); - $content .= $this->getLanguageAdminClass($language, $tables); - $content .= $this->getLanguageAdminPermissions($language); + $content .= $this->getLanguageAdminClass($language, $tables); } + if (1 == $table->getVar('table_permissions')) { + $content .= $this->getLanguageAdminPermissions($language); + } $content .= $this->getLanguageAdminFoot($language); // $this->tdmcfile->create($moduleDirname, 'language/english', $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED); Modified: XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/templates/admin/TemplatesAdminPages.php =================================================================== --- XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/templates/admin/TemplatesAdminPages.php 2015-06-10 16:08:35 UTC (rev 13086) +++ XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/templates/admin/TemplatesAdminPages.php 2015-06-12 21:33:08 UTC (rev 13087) @@ -298,7 +298,7 @@ $moduleDirname = $module->getVar('mod_dirname'); $tableFieldname = $table->getVar('table_fieldname'); $language = $this->getLanguage($moduleDirname, 'AM'); - $fields = $this->getTableFields($table->getVar('table_mid'), $table->getVar('table_id')); + $fields = $this->getTableFields($table->getVar('table_mid'), $table->getVar('table_id'), 'field_order ASC'); $content = $this->getTemplatesAdminPagesHeader($moduleDirname, $table, $fields, $language); // Verify if table_fieldname is not empty if (!empty($tableFieldname)) { Added: XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/templates/user/TemplatesUserMoreFiles.php =================================================================== --- XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/templates/user/TemplatesUserMoreFiles.php (rev 0) +++ XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/templates/user/TemplatesUserMoreFiles.php 2015-06-12 21:33:08 UTC (rev 13087) @@ -0,0 +1,122 @@ +<?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. + */ +/** + * tdmcreate module + * + * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/ + * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html) + * @package tdmcreate + * @since 2.5.0 + * @author Txmod Xoops http://www.txmodxoops.org + * @version $Id: TemplatesUserMoreFiles.php 12258 2014-01-02 09:33:29Z timgno $ + */ +defined('XOOPS_ROOT_PATH') or die('Restricted access'); + +/** + * Class TemplatesUserMoreFiles + */ +class TemplatesUserMoreFiles extends TDMCreateFile +{ + // + private $folder; + // + private $extension; + /* + * @public function constructor + * @param null + */ + /** + * + */ + public function __construct() + { + parent::__construct(); + $this->tdmcfile = TDMCreateFile::getInstance(); + } + + /* + * @static function &getInstance + * @param null + */ + /** + * @return TemplatesUserMoreFiles + */ + public static function &getInstance() + { + static $instance = false; + if (!$instance) { + $instance = new self(); + } + + return $instance; + } + + /* + * @public function write + * @param string $module + * @param string $filename + */ + /** + * @param $module + * @param $filename + * @return string + */ + public function write($module, $folder = '', $filename, $extension) + { + $this->setModule($module); + $this->setFileName($filename); + if($folder != ''){ + $this->folder = 'templates/'.$folder; + } else { + $this->folder = 'templates'; + } + $this->extension = $extension; + } + + /* + * @private function getTemplatesUserMoreFile + * @param null + */ + /** + * @param null + * @return string + */ + private function getTemplatesUserMoreFile() + { + $ret = <<<EOT +<div class="panel"> + Pleace! Enter here your template code here +</div> +EOT; + + return $ret; + } + + /* + * @public function renderFile + * @param string $filename + */ + /** + * @param $filename + * @return bool|string + */ + public function renderFile() + { + $module = $this->getModule(); + $filename = $this->getFileName(); + $moduleDirname = $module->getVar('mod_dirname'); + $content = $this->getTemplatesUserMoreFile(); + // + $this->tdmcfile->create($moduleDirname, $this->folder, $filename . '.' . $this->extension, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED); + + return $this->tdmcfile->renderFile(); + } +} Modified: XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/modules.php =================================================================== --- XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/modules.php 2015-06-10 16:08:35 UTC (rev 13086) +++ XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/modules.php 2015-06-12 21:33:08 UTC (rev 13087) @@ -16,8 +16,8 @@ * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html) * @package tdmcreate * @since 2.5.7 - * @author TDM TEAM DEV MODULE - * @version $Id: modules.php 13040 2015-04-25 15:12:12Z timgno $ + * @author Txmod Xoops <web...@tx...> - <http://www.txmodxoops.org/> + * @version $Id: 1.91 modules.php 13040 2015-04-25 15:12:12Z timgno $ */ defined('XOOPS_ROOT_PATH') or die('Restricted access'); include __DIR__ . '/autoload.php'; Added: XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/morefiles.php =================================================================== --- XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/morefiles.php (rev 0) +++ XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/morefiles.php 2015-06-12 21:33:08 UTC (rev 13087) @@ -0,0 +1,261 @@ +<?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. + */ + +/** + * morefiles class + * + * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/ + * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html) + * @package tdmcreate + * @since 2.5.7 + * @author Txmod Xoops <web...@tx...> - <http://www.txmodxoops.org/> + * @version $Id: morefiles.php 13080 2015-06-12 10:12:32Z timgno $ + */ +defined('XOOPS_ROOT_PATH') or die('Restricted access'); +include __DIR__ . '/autoload.php'; +/* +* @Class TDMCreateMoreFiles +* @extends XoopsObject +*/ + +/** + * Class TDMCreateMoreFiles + */ +class TDMCreateMoreFiles extends XoopsObject +{ + /** + * Tdmcreate + * + * @var mixed + */ + private $tdmcreate; + + /** + * Settings + * + * @var mixed + */ + private $settings; + + /* + * @public function constructor class + * @param null + */ + /** + * + */ + public function __construct() + { + $this->tdmcreate = TDMCreateHelper::getInstance(); + // + $this->initVar('file_id', XOBJ_DTYPE_INT); + $this->initVar('file_mid', XOBJ_DTYPE_INT); + $this->initVar('file_name', XOBJ_DTYPE_TXTBOX); + $this->initVar('file_extension', XOBJ_DTYPE_TXTBOX); + $this->initVar('file_infolder', XOBJ_DTYPE_TXTBOX); + } + + /** + * @param string $method + * @param array $args + * + * @return mixed + */ + public function __call($method, $args) + { + $arg = isset($args[0]) ? $args[0] : null; + + return $this->getVar($method, $arg); + } + + /* + * @static function &getInstance + * @param null + */ + /** + * @return TDMCreateMoreFiles + */ + public static function &getInstance() + { + static $instance = false; + if (!$instance) { + $instance = new self(); + } + + return $instance; + } + + /* + * @public function getForm + * @param mixed $action + */ + /** + * @param bool $action + * @return XoopsThemeForm + */ + public function getForm($action = false) + { + // + if ($action === false) { + $action = $_SERVER['REQUEST_URI']; + } + // + $isNew = $this->isNew(); + $title = $isNew ? sprintf(_AM_TDMCREATE_MORE_FILES_NEW) : sprintf(_AM_TDMCREATE_MORE_FILES_EDIT); + // + xoops_load('XoopsFormLoader'); + // + $form = new XoopsThemeForm($title, 'morefilesform', $action, 'post', true); + $form->setExtra('enctype="multipart/form-data"'); + // + $modules = $this->tdmcreate->getHandler('modules')->getObjects(null); + $modulesSelect = new XoopsFormSelect(_AM_TDMCREATE_MORE_FILES_MODULES, 'file_mid', $this->getVar('file_mid')); + $modulesSelect->addOption('', _AM_TDMCREATE_MORE_FILES_MODULE_SELECT); + foreach ($modules as $mod) { + //$modulesSelect->addOptionArray(); + $modulesSelect->addOption($mod->getVar('mod_id'), $mod->getVar('mod_name')); + } + $form->addElement($modulesSelect, true); + // + $modName = new XoopsFormText(_AM_TDMCREATE_MORE_FILES_NAME, 'file_name', 50, 255, $this->getVar('file_name')); + $modName->setDescription(_AM_TDMCREATE_MORE_FILES_NAME_DESC); + $form->addElement($modName, true); + // + $fileEstension = new XoopsFormText(_AM_TDMCREATE_MORE_FILES_EXTENSION, 'file_extension', 50, 255, $this->getVar('file_extension')); + $fileEstension->setDescription(_AM_TDMCREATE_MORE_FILES_EXTENSION_DESC); + $form->addElement($fileEstension, true); + // + $fileInfolder = new XoopsFormText(_AM_TDMCREATE_MORE_FILES_INFOLDER, 'file_infolder', 50, 255, $this->getVar('file_infolder')); + $fileInfolder->setDescription(_AM_TDMCREATE_MORE_FILES_INFOLDER_DESC); + $form->addElement($fileInfolder, true); + // + $form->addElement(new XoopsFormHidden('op', 'save')); + $form->addElement(new XoopsFormButton(_REQUIRED . ' <sup class="red bold">*</sup>', 'submit', _SUBMIT, 'submit')); + + return $form; + } + + /** + * Get Values + */ + public function getValues($keys = null, $format = null, $maxDepth = null) + { + $ret = parent::getValues($keys, $format, $maxDepth); + // Values + $ret['id'] = $this->getVar('file_id'); + $ret['mid'] = $this->tdmcreate->getHandler('modules')->get($this->getVar('file_mid'))->getVar('mod_name'); + $ret['name'] = $this->getVar('file_name'); + $ret['extension'] = $this->getVar('file_extension'); + $ret['infolder'] = $this->getVar('file_infolder'); + + return $ret; + } +} + +/* +* @Class TDMCreateMoreFilesHandler +* @extends XoopsPersistableObjectHandler +*/ + +/** + * Class TDMCreateMoreFilesHandler + */ +class TDMCreateMoreFilesHandler extends XoopsPersistableObjectHandler +{ + /* + * @public function constructor class + * @param mixed $db + */ + /** + * @param null|object $db + */ + public function __construct(&$db) + { + parent::__construct($db, 'tdmcreate_morefiles', 'tdmcreatemorefiles', 'file_id', 'file_name'); + } + + /** + * @param bool $isNew + * + * @return object + */ + public function &create($isNew = true) + { + return parent::create($isNew); + } + + /** + * retrieve a field + * + * @param int $i field id + * @param null $fields + * @return mixed reference to the <a href='psi_element://TDMCreateFields'>TDMCreateFields</a> object + * object + */ + public function &get($i = null, $fields = null) + { + return parent::get($i, $fields); + } + + /** + * get inserted id + * + * @param null + * @return integer reference to the {@link TDMCreateTables} object + */ + public function &getInsertId() + { + return $this->db->getInsertId(); + } + + /** + * insert a new field in the database + * + * @param object $field reference to the {@link TDMCreateFields} object + * @param bool $force + * + * @return bool FALSE if failed, TRUE if already present and unchanged or successful + */ + public function &insert(&$field, $force = false) + { + if (!parent::insert($field, $force)) { + return false; + } + + return true; + } + + /** + * Get Count Modules + */ + public function getCountMoreFiles($start = 0, $limit = 0, $sort = 'file_id ASC, file_name', $order = 'ASC') + { + $criteria = new CriteriaCompo(); + $criteria->setSort($sort); + $criteria->setOrder($order); + $criteria->setStart($start); + $criteria->setLimit($limit); + return parent::getCount($criteria); + } + + /** + * Get All Modules + */ + public function getAllMoreFiles($start = 0, $limit = 0, $sort = 'file_id ASC, file_name', $order = 'ASC') + { + $criteria = new CriteriaCompo(); + $criteria->setSort($sort); + $criteria->setOrder($order); + $criteria->setStart($start); + $criteria->setLimit($limit); + return parent::getAll($criteria); + } +} Modified: XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/tables.php =================================================================== --- XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/tables.php 2015-06-10 16:08:35 UTC (rev 13086) +++ XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/tables.php 2015-06-12 21:33:08 UTC (rev 13087) @@ -16,7 +16,7 @@ * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html) * @package tdmcreate * @since 2.5.7 - * @author Txmod Xoops <su...@tx...> + * @author Txmod Xoops <web...@tx...> - <http://www.txmodxoops.org/> * @version $Id: 1.91 tables.php 11297 2013-03-24 10:58:10Z timgno $ */ defined('XOOPS_ROOT_PATH') or die('Restricted access'); @@ -153,7 +153,7 @@ $tableMid = $this->getVar('table_mid'); $title = $isNew ? sprintf(_AM_TDMCREATE_TABLE_NEW) : sprintf(_AM_TDMCREATE_TABLE_EDIT); - xoops_load('xoopsformloader'); + xoops_load('XoopsFormLoader'); $form = new XoopsThemeForm($title, 'tableform', $action, 'post', true); $form->setExtra('enctype="multipart/form-data"'); // Modified: XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/language/english/admin.php =================================================================== --- XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/language/english/admin.php 2015-06-10 16:08:35 UTC (rev 13086) +++ XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/language/english/admin.php 2015-06-12 21:33:08 UTC (rev 13087) @@ -202,13 +202,13 @@ define('_AM_TDMCREATE_TABLE_AUTO_INCREMENT_DESC', "Check this option if table have the Auto Increment ID"); // v1.59 define('_AM_TDMCREATE_TABLE_EXIST', "The name specified for this table is already in use"); -define('_AM_TDMCREATE_TABLE_BLOCKS', "Add in Block file"); +define('_AM_TDMCREATE_TABLE_BLOCKS', "Add in Block Files"); define('_AM_TDMCREATE_TABLE_BLOCKS_DESC', "(blocks: random, latest, today)"); -define('_AM_TDMCREATE_TABLE_ADMIN', "Add in Admin Panel"); -define('_AM_TDMCREATE_TABLE_USER', "Add in User Side"); +define('_AM_TDMCREATE_TABLE_ADMIN', "Add in Admin Files"); +define('_AM_TDMCREATE_TABLE_USER', "Add in User Files"); define('_AM_TDMCREATE_TABLE_SUBMENU', "Add in Submenu"); -define('_AM_TDMCREATE_TABLE_SEARCH', "Add in Search file"); -define('_AM_TDMCREATE_TABLE_COMMENTS', "Add in Comments file"); +define('_AM_TDMCREATE_TABLE_SEARCH', "Add in Search Files"); +define('_AM_TDMCREATE_TABLE_COMMENTS', "Add in Comments Files"); // Added in version 1.39 define('_AM_TDMCREATE_TABLE_NOTIFICATIONS', "Add in Notifications file"); define('_AM_TDMCREATE_TABLE_PERMISSIONS', "Add in Permissions file"); @@ -371,10 +371,33 @@ // define('_AM_TDMCREATE_BUILDING_DIRECTORY', "Files created in the directory <span class='bold'>uploads/tdmcreate/repository/</span> of the module <span class='bold green'>%s</span>"); define('_AM_TDMCREATE_FIELD_PARAMETERS_LIST', "<b>Parameters List</b>"); -// v1.91 +// Added in version v1.91 define('_AM_TDMCREATE_ABOUT_MAKE_DONATION', "Make a Donation to support this module"); define('_AM_TDMCREATE_IMPORTANT', "Main Settings"); define('_AM_TDMCREATE_OPTIONS_CHECK', "Options Settings"); define('_AM_TDMCREATE_CREATE_IMAGE', "Create Image Logo"); define('_AM_TDMCREATE_NOT_IMPORTANT', "Secondary Settings"); -define('_AM_TDMCREATE_BUILDING_DELETED_CACHE_FILES', "Cache Files Are Deleted Succefully"); \ No newline at end of file +define('_AM_TDMCREATE_BUILDING_DELETED_CACHE_FILES', "Cache Files Are Deleted Succefully"); +// Admin More Files +define('_AM_TDMCREATE_ADD_MORE_FILE', "Add More File"); +define('_AM_TDMCREATE_MORE_FILES_LIST', "More Files List"); +define('_AM_TDMCREATE_FILE_FORM_CREATED_OK', "The file <b class='green'>%s</b> is successfully created"); +define('_AM_TDMCREATE_FILE_FORM_UPDATED_OK', "The file <b class='green'>%s</b> is successfully updated"); +// Class More Files +define('_AM_TDMCREATE_MORE_FILES_NEW', "New More File"); +define('_AM_TDMCREATE_MORE_FILES_EDIT', "Edit More File"); +define('_AM_TDMCREATE_MORE_FILES_MODULES', "Choose a module"); +define('_AM_TDMCREATE_MORE_FILES_MODULE_SELECT', "Select a Module"); +define('_AM_TDMCREATE_MORE_FILES_NAME', "File Name"); +define('_AM_TDMCREATE_MORE_FILES_NAME_DESC', "Create file name without extension"); +define('_AM_TDMCREATE_MORE_FILES_EXTENSION', "Extension File"); +define('_AM_TDMCREATE_MORE_FILES_EXTENSION_DESC', "Create extension of this file without dot"); +define('_AM_TDMCREATE_MORE_FILES_INFOLDER', "File in the folder"); +define('_AM_TDMCREATE_MORE_FILES_INFOLDER_DESC', "Insert this file in a folder (Type: admin, user, class, include, templates, ...)"); +// Template More Files +define('_AM_TDMCREATE_FILE_ID', "Id"); +define('_AM_TDMCREATE_FILE_NAME_LIST', "File Name"); +define('_AM_TDMCREATE_FILE_MID_LIST', "Module Name"); +define('_AM_TDMCREATE_FILE_EXTENSION_LIST', "Extension Type"); +define('_AM_TDMCREATE_FILE_INFOLDER_LIST', "In Folder"); +define('_AM_TDMCREATE_FORM_ACTION', "Action"); \ No newline at end of file Modified: XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/language/english/modinfo.php =================================================================== --- XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/language/english/modinfo.php 2015-06-10 16:08:35 UTC (rev 13086) +++ XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/language/english/modinfo.php 2015-06-12 21:33:08 UTC (rev 13087) @@ -27,8 +27,9 @@ define('_MI_TDMCREATE_ADMENU3', "Modules"); define('_MI_TDMCREATE_ADMENU4', "Tables"); define('_MI_TDMCREATE_ADMENU5', "Fields"); -define('_MI_TDMCREATE_ADMENU6', "Building"); -define('_MI_TDMCREATE_ADMENU7', "About"); +define('_MI_TDMCREATE_ADMENU6', "More Files"); +define('_MI_TDMCREATE_ADMENU7', "Building"); +define('_MI_TDMCREATE_ABOUT', "About"); // 1.37 define('_MI_TDMCREATE_CONFIG_EDITOR', "Editor"); define('_MI_TDMCREATE_CONFIG_EDITOR_DESC', "Select an editor for the description"); Modified: XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/sql/mysql.sql =================================================================== --- XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/sql/mysql.sql 2015-06-10 16:08:35 UTC (rev 13086) +++ XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/sql/mysql.sql 2015-06-12 21:33:08 UTC (rev 13087) @@ -316,3 +316,16 @@ (13, 0, 0, 'UploadImage', 'XoopsFormUploadImage'), (14, 0, 0, 'UploadFile', 'XoopsFormUploadFile'), (15, 0, 0, 'TextDateSelect', 'XoopsFormTextDateSelect'); + +# +# Table structure for table `tdmcreate_morefiles` 5 +# + +CREATE TABLE `tdmcreate_morefiles` ( + `file_id` INT(5) UNSIGNED NOT NULL AUTO_INCREMENT, + `file_mid` INT(5) UNSIGNED NOT NULL DEFAULT '0', + `file_name` VARCHAR(100) NOT NULL DEFAULT '', + `file_extension` VARCHAR(5) NOT NULL DEFAULT '.php', + `file_infolder` VARCHAR(50) NOT NULL DEFAULT '', + PRIMARY KEY (`file_id`) +)ENGINE =InnoDB; \ No newline at end of file Added: XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/templates/admin/tdmcreate_morefiles.tpl =================================================================== --- XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/templates/admin/tdmcreate_morefiles.tpl (rev 0) +++ XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/templates/admin/tdmcreate_morefiles.tpl 2015-06-12 21:33:08 UTC (rev 13087) @@ -0,0 +1,47 @@ +<!-- Header --> +<{includeq file="db:tdmcreate_header.tpl"}> +<!-- Display files list --> +<{if $files_list}> + <table class='outer width100'> + <tr> + <th class='center'><{$smarty.const._AM_TDMCREATE_FILE_ID}></th> + <th class='center'><{$smarty.const._AM_TDMCREATE_FILE_MID_LIST}></th> + <th class='center'><{$smarty.const._AM_TDMCREATE_FILE_NAME_LIST}></th> + <th class='center'><{$smarty.const._AM_TDMCREATE_FILE_EXTENSION_LIST}></th> + <th class='center'><{$smarty.const._AM_TDMCREATE_FILE_INFOLDER_LIST}></th> + <th class='center width5'><{$smarty.const._AM_TDMCREATE_FORM_ACTION}></th> + </tr> + <{foreach item=file from=$files_list key=file_id}> + <tr id="file<{$file.id}>" class="files"> + <td class='center bold width5'><{$file.id}></td> + <td class='center bold'><{$file.mid}></td> + <td class='center bold green'><{$file.name}></td> + <td class='center'><{$file.extension}></td> + <td class='center'><{$file.infolder}></td> + <td class='xo-actions txtcenter width5'> + <a href="morefiles.php?op=edit&file_id=<{$file.id}>" title="<{$smarty.const._EDIT}>"> + <img src="<{xoModuleIcons16 edit.png}>" alt="<{$smarty.const._EDIT}>" /> + </a> + <a href="morefiles.php?op=delete&file_id=<{$file.id}>" title="<{$smarty.const._DELETE}>"> + <img src="<{xoModuleIcons16 delete.png}>" alt="<{$smarty.const._DELETE}>" /> + </a> + </td> + </tr> + <{/foreach}> + </table><br /><br /> + <!-- Display files navigation --> + <div class="clear"> </div> + <{if $pagenav}><div class="xo-pagenav floatright"><{$pagenav}></div><div class="clear spacer"></div><{/if}> +<{else}> <!-- Display file images on edit page --> + <!-- Display file form (add,edit) --> + <{if $form}> + <div class="spacer"><{$form}></div> + <{/if}> +<{/if}> +<{if $error}> +<div class="errorMsg"> + <strong><{$error}></strong> +</div> +<{/if}> +<!-- Footer --> +<{includeq file="db:tdmcreate_footer.tpl"}> Modified: XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/xoops_version.php =================================================================== --- XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/xoops_version.php 2015-06-10 16:08:35 UTC (rev 13086) +++ XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/xoops_version.php 2015-06-12 21:33:08 UTC (rev 13087) @@ -79,19 +79,23 @@ $modversion['templates'][] = array( 'file' => 'tdmcreate_tables.tpl', 'description' => '', 'type' => 'admin' ); $modversion['templates'][] = array( 'file' => 'tdmcreate_tables_item.tpl', 'description' => '', 'type' => 'admin' ); $modversion['templates'][] = array( 'file' => 'tdmcreate_settings.tpl', 'description' => '', 'type' => 'admin' ); +$modversion['templates'][] = array( 'file' => 'tdmcreate_morefiles.tpl', 'description' => '', 'type' => 'admin' ); // Mysql file $modversion['sqlfile']['mysql'] = "sql/mysql.sql"; // Tables -$modversion['tables'][1] = "tdmcreate_settings"; -$modversion['tables'][2] = "tdmcreate_modules"; -$modversion['tables'][3] = "tdmcreate_tables"; -$modversion['tables'][4] = "tdmcreate_fields"; -$modversion['tables'][5] = "tdmcreate_languages"; -$modversion['tables'][6] = "tdmcreate_fieldtype"; -$modversion['tables'][7] = "tdmcreate_fieldattributes"; -$modversion['tables'][8] = "tdmcreate_fieldnull"; -$modversion['tables'][9] = "tdmcreate_fieldkey"; -$modversion['tables'][10] = "tdmcreate_fieldelements"; +$i = 1; +$modversion['tables'][$i] = "tdmcreate_settings"; +$modversion['tables'][$i] = "tdmcreate_modules"; +$modversion['tables'][$i] = "tdmcreate_tables"; +$modversion['tables'][$i] = "tdmcreate_fields"; +$modversion['tables'][$i] = "tdmcreate_languages"; +$modversion['tables'][$i] = "tdmcreate_fieldtype"; +$modversion['tables'][$i] = "tdmcreate_fieldattributes"; +$modversion['tables'][$i] = "tdmcreate_fieldnull"; +$modversion['tables'][$i] = "tdmcreate_fieldkey"; +$modversion['tables'][$i] = "tdmcreate_fieldelements"; +$modversion['tables'][$i] = "tdmcreate_morefiles"; +unset($i); // Scripts to run upon installation or update $modversion['onInstall'] = "include/install.php"; $modversion['onUpdate'] = "include/update.php"; @@ -153,6 +157,13 @@ $modversion['config'][$i]['valuetype'] = "int"; $modversion['config'][$i]['default'] = 10; $i++; +$modversion['config'][$i]['name'] = "morefiles_adminpager"; +$modversion['config'][$i]['title'] = "_MI_TDMCREATE_CONFIG_MOREFILES_ADMINPAGER"; +$modversion['config'][$i]['description'] = "_MI_TDMCREATE_CONFIG_"; +$modversion['config'][$i]['formtype'] = "textbox"; +$modversion['config'][$i]['valuetype'] = "int"; +$modversion['config'][$i]['default'] = 10; +$i++; $modversion['config'][$i]['name'] = "break" . $i; $modversion['config'][$i]['title'] = "_MI_TDMCREATE_CONFIG_BREAK_REQUIRED"; $modversion['config'][$i]['description'] = "_MI_TDMCREATE_CONFIG_"; |
From: <txm...@us...> - 2015-06-10 16:08:37
|
Revision: 13086 http://sourceforge.net/p/xoops/svn/13086 Author: txmodxoops Date: 2015-06-10 16:08:35 +0000 (Wed, 10 Jun 2015) Log Message: ----------- Fix added more files Modified Paths: -------------- XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/fieldelements.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/fields.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/TDMCreateArchitecture.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/include/IncludeFunctions.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/user/UserIndex.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/user/UserXoopsVersion.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/logoGenerator.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/modules.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/include/common.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/language/english/admin.php Added Paths: ----------- XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/templates/user/TemplatesUserDisqusComments.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/templates/user/TemplatesUserFacebookComments.php Modified: XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/fieldelements.php =================================================================== --- XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/fieldelements.php 2015-06-09 17:53:59 UTC (rev 13085) +++ XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/fieldelements.php 2015-06-10 16:08:35 UTC (rev 13086) @@ -98,4 +98,58 @@ { parent::__construct($db, 'tdmcreate_fieldelements', 'tdmcreatefieldelements', 'fieldelement_id', 'fieldelement_name'); } + + /** + * Get Count Fields + */ + public function getCountFieldElements($start = 0, $limit = 0, $sort = 'fieldelement_id ASC, fieldelement_name', $order = 'ASC') + { + $criteria = new CriteriaCompo(); + $criteria->setSort($sort); + $criteria->setOrder($order); + $criteria->setStart($start); + $criteria->setLimit($limit); + return parent::getCount($criteria); + } + + /** + * Get Objects Fields + */ + public function getObjectsFieldElements($start = 0, $limit = 0, $sort = 'fieldelement_id ASC, fieldelement_name', $order = 'ASC') + { + $criteria = new CriteriaCompo(); + $criteria->setSort($sort); + $criteria->setOrder($order); + $criteria->setStart($start); + $criteria->setLimit($limit); + return parent::getObjects($criteria); + } + + /** + * Get All Fields + */ + public function getAllFieldElements($start = 0, $limit = 0, $sort = 'fieldelement_id ASC, fieldelement_name', $order = 'ASC') + { + $criteria = new CriteriaCompo(); + $criteria->setSort($sort); + $criteria->setOrder($order); + $criteria->setStart($start); + $criteria->setLimit($limit); + return parent::getAll($criteria); + } + + /** + * Get All Fields By Module & Table Id + */ + public function getAllFieldElementsByModuleAndTableId($modId, $tabId, $start = 0, $limit = 0, $sort = 'fieldelement_id ASC, fieldelement_name', $order = 'ASC') + { + $criteria = new CriteriaCompo(); + $criteria->add(new Criteria('fieldelement_mid', $modId)); + $criteria->add(new Criteria('fieldelement_tid', $tabId)); + $criteria->setSort($sort); + $criteria->setOrder($order); + $criteria->setStart($start); + $criteria->setLimit($limit); + return parent::getAll($criteria); + } } Modified: XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/fields.php =================================================================== --- XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/fields.php 2015-06-09 17:53:59 UTC (rev 13085) +++ XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/fields.php 2015-06-10 16:08:35 UTC (rev 13086) @@ -35,6 +35,24 @@ * @var mixed */ private $tdmcreate; + + /** + * Options + */ + public $options = array( + 'parent', + 'admin', + 'inlist', + 'inform', + 'user', + 'thead', + 'tbody', + 'tfoot', + 'block', + 'main', + 'search', + 'required' + ); /* * @public function constructor class @@ -46,7 +64,6 @@ public function __construct() { $this->tdmcreate = TDMCreateHelper::getInstance(); - $this->tdmcreate = TDMCreateHelper::getInstance(); $this->initVar('field_id', XOBJ_DTYPE_INT); $this->initVar('field_mid', XOBJ_DTYPE_INT); $this->initVar('field_tid', XOBJ_DTYPE_INT); @@ -120,7 +137,7 @@ $form->setExtra('enctype="multipart/form-data"'); // New Object HtmlTable - $form->addElement(new TDMCreateFormLabel('<table border="0" cellspacing="1" class="outer width100">')); + $form->addElement(new TDMCreateFormLabel('<table cellspacing="1" class="outer width100">')); $form->addElement(new TDMCreateFormLabel('<thead class="center">')); $form->addElement(new TDMCreateFormLabel('<tr class="head"><th colspan="9">' . $title . '</th></tr>')); $form->addElement(new TDMCreateFormLabel('<tr class="head width5">')); @@ -156,8 +173,8 @@ $fieldsForm = TDMCreateFields::getInstance(); $form = $fieldsForm->getHeaderForm($action); // Get handler tables - $table_obj = $this->tdmcreate->getHandler('tables'); // Changed by goffy - $tableAutoincrement = $table_obj->get($fieldTid)->getVar('table_autoincrement'); // Added by goffy + $tableObj = $this->tdmcreate->getHandler('tables'); // Changed by goffy + $tableAutoincrement = $tableObj->get($fieldTid)->getVar('table_autoincrement'); // Added by goffy // Loop for fields number $class = 'even'; for ($i = 1; $i <= $fieldNumb; ++$i) { @@ -242,11 +259,7 @@ $checkFieldParent = new XoopsFormCheckBox(' ', 'field_parent[' . $i . ']', $field_parent); $checkFieldParent->addOption(1, _AM_TDMCREATE_FIELD_PARENT); $parametersTray->addElement($checkFieldParent); - /*$field_parent = (1 == $tableAutoincrement) ? 2 : 1; - $checkFieldParent = new TDMCreateFormRadio('', 'field_parent', $field_parent); - $checkFieldParent->addOption($i, _AM_TDMCREATE_FIELD_PARENT ); - $parametersTray->addElement($checkFieldParent);*/ - + $field_admin = 0; $checkFieldAdmin = new XoopsFormCheckBox(' ', 'field_admin[' . $i . ']', $field_admin); $checkFieldAdmin->addOption(1, _AM_TDMCREATE_FIELD_ADMIN); @@ -287,11 +300,6 @@ $checkFieldBlock->addOption(1, _AM_TDMCREATE_FIELD_BLOCK); $parametersTray->addElement($checkFieldBlock); - $fieldMain = (1 == $tableAutoincrement) ? 2 : 1; - $checkFieldMain = new TDMCreateFormRadio('', 'field_main', $fieldMain); - $checkFieldMain->addOption($i, _AM_TDMCREATE_FIELD_MAINFIELD); - $parametersTray->addElement($checkFieldMain); - $field_search = 0; $check_field_search = new XoopsFormCheckBox(' ', 'field_search[' . $i . ']', $field_search); $check_field_search->addOption(1, _AM_TDMCREATE_FIELD_SEARCH); @@ -301,6 +309,11 @@ $checkFieldRequired = new XoopsFormCheckBox(' ', 'field_required[' . $i . ']', $field_required); $checkFieldRequired->addOption(1, _AM_TDMCREATE_FIELD_REQUIRED); $parametersTray->addElement($checkFieldRequired); + + $fieldMain = (1 == $tableAutoincrement) ? 2 : 1; + $checkFieldMain = new TDMCreateFormRadio('', 'field_main', $fieldMain); + $checkFieldMain->addOption($i, _AM_TDMCREATE_FIELD_MAIN); + $parametersTray->addElement($checkFieldMain); // $form->addElement(new TDMCreateFormLabel('<td><div class="portlet"><div class="portlet-header">' . _AM_TDMCREATE_FIELD_PARAMETERS_LIST . '</div><div class="portlet-content">' . $parametersTray->render() . '</div></div></td></tr>')); } @@ -392,6 +405,15 @@ $fieldElementsSelect->addOptionArray($this->tdmcreate->getHandler('fieldelements')->getList($criteriaTable)); unset($criteriaElement, $criteriaTable); $parametersTray->addElement($fieldElementsSelect); + + // Options + /*$moduleOption = $this->getOptions(); + $checkbox = new XoopsFormCheckbox(' ', 'fields_option[' . $id . ']', $moduleOption, '<br />'); + $checkbox->setDescription(_AM_TDMCREATE_OPTIONS_DESC); + foreach ($this->options as $option) { + $checkbox->addOption($option, self::getDefinedLanguage('_AM_TDMCREATE_FIELD_' . strtoupper($option))); + } + $parametersTray->addElement($checkbox);*/ $checkFieldParent = new XoopsFormCheckBox(' ', 'field_parent[' . $id . ']', $field->getVar('field_parent')); $checkFieldParent->addOption(1, _AM_TDMCREATE_FIELD_PARENT); @@ -428,19 +450,20 @@ $checkFieldBlock = new XoopsFormCheckBox('', 'field_block[' . $id . ']', $field->getVar('field_block')); $checkFieldBlock->addOption(1, _AM_TDMCREATE_FIELD_BLOCK); $parametersTray->addElement($checkFieldBlock); - - $fieldMain = (1 == $field->getVar('field_main')) ? $id : 1; - $checkFieldMain = new TDMCreateFormRadio('', 'field_main', $fieldMain); - $checkFieldMain->addOption($id, _AM_TDMCREATE_FIELD_MAINFIELD); - $parametersTray->addElement($checkFieldMain); - - $check_field_search = new XoopsFormCheckBox(' ', 'field_search[' . $id . ']', $field->getVar('field_search')); + + $check_field_search = new XoopsFormCheckBox(' ', 'field_search[' . $id . ']', $field->getVar('field_search')); $check_field_search->addOption(1, _AM_TDMCREATE_FIELD_SEARCH); $parametersTray->addElement($check_field_search); $checkFieldRequired = new XoopsFormCheckBox(' ', 'field_required[' . $id . ']', $field->getVar('field_required')); $checkFieldRequired->addOption(1, _AM_TDMCREATE_FIELD_REQUIRED); $parametersTray->addElement($checkFieldRequired); + + $fieldMain = (1 == $field->getVar('field_main')) ? $id : 1; + $checkFieldMain = new TDMCreateFormRadio('', 'field_main', $fieldMain); + $checkFieldMain->addOption($id, _AM_TDMCREATE_FIELD_MAIN); + $parametersTray->addElement($checkFieldMain); + // $form->addElement(new TDMCreateFormLabel('<td><div class="portlet"><div class="portlet-header">' . _AM_TDMCREATE_FIELD_PARAMETERS_LIST . '</div><div class="portlet-content">' . $parametersTray->render() . '</div></div></td></tr>')); } } @@ -504,6 +527,75 @@ return $ret; } + + /** + * Get Options + */ + /** + * @param $key + * + * @return string + */ + public function getOptions() + { + $ret = array(); + // + if ($this->getVar('field_parent') == 1) { + array_push($ret, 'parent'); + } + if ($this->getVar('field_admin') == 1) { + array_push($ret, 'admin'); + } + if ($this->getVar('field_inlist') == 1) { + array_push($ret, 'inlist'); + } + if ($this->getVar('field_inform') == 1) { + array_push($ret, 'inform'); + } + if ($this->getVar('field_user') == 1) { + array_push($ret, 'user'); + } + if ($this->getVar('field_thead') == 1) { + array_push($ret, 'thead'); + } + if ($this->getVar('field_tbody') == 1) { + array_push($ret, 'tbody'); + } + if ($this->getVar('field_tfoot') == 1) { + array_push($ret, 'tfoot'); + } + if ($this->getVar('field_block') == 1) { + array_push($ret, 'block'); + } + if ($this->getVar('field_main') == 1) { + array_push($ret, 'main'); + } + if ($this->getVar('field_search') == 1) { + array_push($ret, 'search'); + } + if ($this->getVar('field_required') == 1) { + array_push($ret, 'required'); + } + + return $ret; + } + + /** + * Get Defined Language + */ + /** + * @param $lang + * + * @return string + */ + private static function getDefinedLanguage($lang) + { + if (defined($lang)) { + return constant($lang); + } + + return $lang; + } } /* Modified: XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/TDMCreateArchitecture.php =================================================================== --- XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/TDMCreateArchitecture.php 2015-06-09 17:53:59 UTC (rev 13085) +++ XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/TDMCreateArchitecture.php 2015-06-10 16:08:35 UTC (rev 13086) @@ -134,12 +134,12 @@ // If file exists if (!file_exists($logoGifFrom)) { // Rename file - $copyFile = TDMC_IMAGE_LOGOS_URL . '/xoopsdevelopmentteam_logo.gif'; + $copyFile = TDMC_IMAGES_LOGOS_URL . '/xoopsdevelopmentteam_logo.gif'; $copyNewFile = $logoGifFrom; copy($copyFile, $copyNewFile); } else { // Copy file - $copyFile = TDMC_IMAGE_LOGOS_URL . '/' . $stlModuleAuthor . '_logo.gif'; + $copyFile = TDMC_IMAGES_LOGOS_URL . '/' . $stlModuleAuthor . '_logo.gif'; $copyNewFile = $logoGifFrom; copy($copyFile, $copyNewFile); } Modified: XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/include/IncludeFunctions.php =================================================================== --- XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/include/IncludeFunctions.php 2015-06-09 17:53:59 UTC (rev 13085) +++ XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/include/IncludeFunctions.php 2015-06-10 16:08:35 UTC (rev 13086) @@ -414,10 +414,10 @@ $moduleDirname = $module->getVar('mod_dirname'); $tableName = $table->getVar('table_name'); $content = $this->getHeaderFilesComments($module, $filename); - $content .= $this->getFunctionBlock($moduleDirname); - if(1 == $table->getVar('table_blocks')) { - $content .= $this->getFunctionCleanVars($moduleDirname); + if(1 == $table->getVar('table_blocks')) { + $content .= $this->getFunctionBlock($moduleDirname); } + $content .= $this->getFunctionCleanVars($moduleDirname); if(1 == $table->getVar('table_permissions')) { $content .= $this->getFunctionGetMyItemIds($moduleDirname, $tableName); } Added: XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/templates/user/TemplatesUserDisqusComments.php =================================================================== --- XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/templates/user/TemplatesUserDisqusComments.php (rev 0) +++ XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/templates/user/TemplatesUserDisqusComments.php 2015-06-10 16:08:35 UTC (rev 13086) @@ -0,0 +1,110 @@ +<?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. + */ +/** + * tdmcreate module + * + * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/ + * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html) + * @package tdmcreate + * @since 2.5.0 + * @author Txmod Xoops http://www.txmodxoops.org + * @version $Id: TemplatesUserDisqusComments.php 12258 2014-01-02 09:33:29Z timgno $ + */ +defined('XOOPS_ROOT_PATH') or die('Restricted access'); + +/** + * Class TemplatesUserDisqusComments + */ +class TemplatesUserDisqusComments extends TDMCreateFile +{ + /* + * @public function constructor + * @param null + */ + /** + * + */ + public function __construct() + { + parent::__construct(); + $this->tdmcfile = TDMCreateFile::getInstance(); + } + + /* + * @static function &getInstance + * @param null + */ + /** + * @return TemplatesUserDisqusComments + */ + public static function &getInstance() + { + static $instance = false; + if (!$instance) { + $instance = new self(); + } + + return $instance; + } + + /* + * @public function write + * @param string $module + * @param string $filename + */ + /** + * @param $module + * @param $filename + * @return string + */ + public function write($module, $filename) + { + $this->setModule($module); + $this->setFileName($filename); + } + + /* + * @private function getTemplatesCommentCode + * @param null + */ + /** + * @param null + * @return string + */ + private function getTemplatesCommentCode() + { + $ret = <<<EOT +Pleace! Enter here your comments code +EOT; + + return $ret; + } + + /* + * @public function renderFile + * @param string $filename + */ + /** + * @param $filename + * @return bool|string + */ + public function renderFile() + { + $module = $this->getModule(); + $filename = $this->getFileName(); + $moduleDirname = $module->getVar('mod_dirname'); + $content = $this->getTemplatesCommentCode(); + // + $this->tdmcfile->create($moduleDirname, 'templates', $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED); + + return $this->tdmcfile->renderFile(); + } +} Added: XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/templates/user/TemplatesUserFacebookComments.php =================================================================== --- XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/templates/user/TemplatesUserFacebookComments.php (rev 0) +++ XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/templates/user/TemplatesUserFacebookComments.php 2015-06-10 16:08:35 UTC (rev 13086) @@ -0,0 +1,110 @@ +<?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. + */ +/** + * tdmcreate module + * + * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/ + * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html) + * @package tdmcreate + * @since 2.5.0 + * @author Txmod Xoops http://www.txmodxoops.org + * @version $Id: TemplatesUserFacebookComments.php 12258 2014-01-02 09:33:29Z timgno $ + */ +defined('XOOPS_ROOT_PATH') or die('Restricted access'); + +/** + * Class TemplatesUserFacebookComments + */ +class TemplatesUserFacebookComments extends TDMCreateFile +{ + /* + * @public function constructor + * @param null + */ + /** + * + */ + public function __construct() + { + parent::__construct(); + $this->tdmcfile = TDMCreateFile::getInstance(); + } + + /* + * @static function &getInstance + * @param null + */ + /** + * @return TemplatesUserFacebookComments + */ + public static function &getInstance() + { + static $instance = false; + if (!$instance) { + $instance = new self(); + } + + return $instance; + } + + /* + * @public function write + * @param string $module + * @param string $filename + */ + /** + * @param $module + * @param $filename + * @return string + */ + public function write($module, $filename) + { + $this->setModule($module); + $this->setFileName($filename); + } + + /* + * @private function getTemplatesCommentCode + * @param null + */ + /** + * @param null + * @return string + */ + private function getTemplatesCommentCode() + { + $ret = <<<EOT +Pleace! Enter here your comments code +EOT; + + return $ret; + } + + /* + * @public function renderFile + * @param string $filename + */ + /** + * @param $filename + * @return bool|string + */ + public function renderFile() + { + $module = $this->getModule(); + $filename = $this->getFileName(); + $moduleDirname = $module->getVar('mod_dirname'); + $content = $this->getTemplatesCommentCode(); + // + $this->tdmcfile->create($moduleDirname, 'templates', $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED); + + return $this->tdmcfile->renderFile(); + } +} Modified: XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/user/UserIndex.php =================================================================== --- XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/user/UserIndex.php 2015-06-09 17:53:59 UTC (rev 13085) +++ XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/user/UserIndex.php 2015-06-10 16:08:35 UTC (rev 13086) @@ -137,11 +137,11 @@ if(in_array(1, $fieldParentId)) { $ret .= <<<EOT \${$tableName}Count = \${$tableName}Handler->getCount{$ucfTableName}(); -// -include_once XOOPS_ROOT_PATH . '/class/tree.php'; -\$mytree = new XoopsObjectTree(\${$tableName}All, '{$fieldId}', '{$fieldParent}'); +// If there are {$tableName} if (\${$tableName}Count > 0) { \${$tableName}All = \${$tableName}Handler->getAll{$ucfTableName}(); + include_once XOOPS_ROOT_PATH . '/class/tree.php'; + \$mytree = new XoopsObjectTree(\${$tableName}All, '{$fieldId}', '{$fieldParent}'); foreach (array_keys(\${$tableName}All) as \${$tableFieldname}) { \${$tableSoleName} = \${$tableName}All[\${$tableFieldname}]->getValues(); Modified: XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/user/UserXoopsVersion.php =================================================================== --- XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/user/UserXoopsVersion.php 2015-06-09 17:53:59 UTC (rev 13085) +++ XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/user/UserXoopsVersion.php 2015-06-10 16:08:35 UTC (rev 13086) @@ -795,11 +795,19 @@ 'default' => 0); \$modversion['config'][] = array( - 'name' => "fbcomments", - 'title' => "{$language}FBCOMMENTS", - 'description' => "{$language}FBCOMMENTS_DESC", + 'name' => "facebook_comments", + 'title' => "{$language}FACEBOOK_COMMENTS", + 'description' => "{$language}FACEBOOK_COMMENTS_DESC", 'formtype' => "yesno", 'valuetype' => "int", + 'default' => 0); + +\$modversion['config'][] = array( + 'name' => "disqus_comments", + 'title' => "{$language}DISQUS_COMMENTS", + 'description' => "{$language}DISQUS_COMMENTS_DESC", + 'formtype' => "yesno", + 'valuetype' => "int", 'default' => 0);\n EOT; Modified: XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/logoGenerator.php =================================================================== --- XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/logoGenerator.php 2015-06-09 17:53:59 UTC (rev 13085) +++ XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/logoGenerator.php 2015-06-10 16:08:35 UTC (rev 13086) @@ -48,7 +48,7 @@ } } } - if (!file_exists($imageBase = TDMC_IMAGE_LOGOS_PATH . "/empty.png") || + if (!file_exists($imageBase = TDMC_IMAGES_LOGOS_PATH . "/empty.png") || !file_exists($font = TDMC_FONTS_PATH . "/VeraBd.ttf") || !file_exists($iconFile = XOOPS_ICONS32_PATH . '/' . basename($logoIcon))) { return false; Modified: XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/modules.php =================================================================== --- XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/modules.php 2015-06-09 17:53:59 UTC (rev 13085) +++ XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/modules.php 2015-06-10 16:08:35 UTC (rev 13086) @@ -415,7 +415,7 @@ } } } - if (!file_exists($imageBase = TDMC_IMAGE_LOGOS_PATH . '/empty.png') || + if (!file_exists($imageBase = TDMC_IMAGES_LOGOS_PATH . '/empty.png') || !file_exists($font = TDMC_FONTS_PATH . '/VeraBd.ttf') || !file_exists($iconFile = XOOPS_ICONS32_PATH . '/' . basename($logoIcon)) ) { Modified: XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/include/common.php =================================================================== --- XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/include/common.php 2015-06-09 17:53:59 UTC (rev 13085) +++ XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/include/common.php 2015-06-10 16:08:35 UTC (rev 13086) @@ -33,8 +33,8 @@ define('TDMC_FONTS_URL', TDMC_URL . '/assets/fonts'); define('TDMC_IMAGE_PATH', TDMC_PATH . '/assets/images'); define('TDMC_IMAGE_URL', TDMC_URL . '/assets/images'); -define('TDMC_IMAGE_LOGOS_PATH', TDMC_PATH . '/assets/images/logos'); -define('TDMC_IMAGE_LOGOS_URL', TDMC_URL . '/assets/images/logos'); +define('TDMC_IMAGES_LOGOS_PATH', TDMC_PATH . '/assets/images/logos'); +define('TDMC_IMAGES_LOGOS_URL', TDMC_URL . '/assets/images/logos'); define('TDMC_ICONS_PATH', TDMC_PATH . '/assets/icons'); define('TDMC_ICONS_URL', TDMC_URL . '/assets/icons'); // Uploads Directories Modified: XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/language/english/admin.php =================================================================== --- XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/language/english/admin.php 2015-06-09 17:53:59 UTC (rev 13085) +++ XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/language/english/admin.php 2015-06-10 16:08:35 UTC (rev 13086) @@ -248,7 +248,7 @@ define('_AM_TDMCREATE_FIELD_ADMIN', "Admin: In Files"); define('_AM_TDMCREATE_FIELD_USER', "User: In Files"); define('_AM_TDMCREATE_FIELD_BLOCK', "Block: In Files"); -define('_AM_TDMCREATE_FIELD_MAINFIELD', "Table: Main Field"); +define('_AM_TDMCREATE_FIELD_MAIN', "Table: Main Field"); define('_AM_TDMCREATE_FIELD_SEARCH', "Search: Index"); define('_AM_TDMCREATE_FIELD_REQUIRED', "Field: Required"); define('_AM_TDMCREATE_ADMIN_SUBMIT', "Send"); |
From: <txm...@us...> - 2015-06-09 17:54:03
|
Revision: 13085 http://sourceforge.net/p/xoops/svn/13085 Author: txmodxoops Date: 2015-06-09 17:53:59 +0000 (Tue, 09 Jun 2015) Log Message: ----------- Added template list Added more fields in database Refactoring Fixed seceral bugs Updated existing files and renamed Neede a fresh installation Modified Paths: -------------- XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/admin/building.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/admin/fields.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/admin/modules.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/admin/settings.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/admin/tables.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/assets/js/sortable.js XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/autoload.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/fields.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/TDMCreateArchitecture.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/TDMCreateFile.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/TDMCreateHtmlSmartyCodes.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/TDMCreateTableFields.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/admin/AdminMenu.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/admin/AdminObjects.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/admin/AdminPages.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/admin/AdminPermissions.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/blocks/BlocksFiles.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/classes/ClassFiles.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/classes/ClassFormElements.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/css/CssStyles.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/include/IncludeCommon.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/include/IncludeFunctions.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/include/IncludeInstall.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/language/LanguageMain.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/language/LanguageModinfo.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/sql/SqlFile.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/templates/admin/TemplatesAdminPages.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/templates/blocks/TemplatesBlocks.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/templates/user/TemplatesUserBreadcrumbs.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/templates/user/TemplatesUserFooter.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/templates/user/TemplatesUserHeader.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/templates/user/TemplatesUserIndex.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/templates/user/TemplatesUserPages.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/user/UserFooter.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/user/UserHeader.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/user/UserIndex.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/user/UserPages.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/user/UserXoopsVersion.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/logoGenerator.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/modules.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/settings.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/tables.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/include/common.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/language/english/admin.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/language/english/help/help.html XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/sql/mysql.sql XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/templates/admin/tdmcreate_fields_item.tpl XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/templates/admin/tdmcreate_tables_item.tpl Added Paths: ----------- XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/templates/user/TemplatesUserPagesList.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/helper.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/session.php Removed Paths: ------------- XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/TDMCreateHelper.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/TDMCreateSession.php Modified: XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/admin/building.php =================================================================== --- XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/admin/building.php 2015-06-09 02:59:11 UTC (rev 13084) +++ XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/admin/building.php 2015-06-09 17:53:59 UTC (rev 13085) @@ -23,11 +23,11 @@ $mid = XoopsRequest::getInt('mod_id'); $moduleObj = $tdmcreate->getHandler('modules')->get($mid); // Clear cache -$cacheFile1 = TDMC_CLASSES_PATH . '/cache/classpaths.cache'; -$cacheFile2 = TDMC_CLASSES_PATH . '/files/cache/classpaths.cache'; -if (file_exists($cacheFile1) && file_exists($cacheFile2)) { - unlink($cacheFile1); - unlink($cacheFile2); +if (file_exists($cacheFile1 = TDMC_CLASSES_PATH . '/cache/classpaths.cache') && + file_exists($cacheFile2 = TDMC_CLASSES_PATH . '/files/cache/classpaths.cache')) { + if (unlink($cacheFile1) && unlink($cacheFile2)) { + redirect_header('building.php?op=build', 5, _AM_TDMCREATE_BUILDING_DELETED_CACHE_FILES); + } } // Switch option switch ($op) { Modified: XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/admin/fields.php =================================================================== --- XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/admin/fields.php 2015-06-09 02:59:11 UTC (rev 13084) +++ XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/admin/fields.php 2015-06-09 17:53:59 UTC (rev 13085) @@ -129,38 +129,41 @@ $fields = $tdmcreate->getHandler('fields'); $fieldOrder = 1; // Set Variables - foreach($_POST['field_id'] as $key => $value) + foreach($_POST['field_id'] as $key => $value) { if(isset($value)){ $fieldsObj =& $fields->get($value); } else { $fieldsObj =& $fields->create(); } - $order = $fieldsObj->isNew() ? $fieldOrder : XoopsRequest::getInt('field_order'); + $order = $fieldsObj->isNew() ? $fieldOrder : $_GET['field_order'][$key]; // Set Data $fieldsObj->setVar( 'field_mid', $fieldMid ); - $fieldsObj->setVar( 'field_tid', $fieldTid ); + $fieldsObj->setVar( 'field_tid', $fieldTid ); $fieldsObj->setVar( 'field_order', $order ); $fieldsObj->setVar( 'field_name', $_POST['field_name'][$key]); - $fieldsObj->setVar( 'field_type', $_POST['field_type'][$key]); + $fieldsObj->setVar( 'field_type', $_POST['field_type'][$key]); $fieldsObj->setVar( 'field_value', $_POST['field_value'][$key]); $fieldsObj->setVar( 'field_attribute', $_POST['field_attribute'][$key]); - $fieldsObj->setVar( 'field_null', $_POST['field_null'][$key]); - $fieldsObj->setVar( 'field_default', $_POST['field_default'][$key]); - $fieldsObj->setVar( 'field_key', $_POST['field_key'][$key]); - $fieldsObj->setVar( 'field_element', $_POST['field_element'][$key]); + $fieldsObj->setVar( 'field_null', $_POST['field_null'][$key]); + $fieldsObj->setVar( 'field_default', $_POST['field_default'][$key]); + $fieldsObj->setVar( 'field_key', $_POST['field_key'][$key]); + $fieldsObj->setVar( 'field_element', $_POST['field_element'][$key]); $fieldsObj->setVar( 'field_parent', (1 == $_REQUEST['field_parent'][$key]) ? 1 : 0); + $fieldsObj->setVar( 'field_admin', (1 == $_REQUEST['field_admin'][$key]) ? 1 : 0); $fieldsObj->setVar( 'field_inlist', (1 == $_REQUEST['field_inlist'][$key]) ? 1 : 0); $fieldsObj->setVar( 'field_inform', (1 == $_REQUEST['field_inform'][$key]) ? 1 : 0); - $fieldsObj->setVar( 'field_admin', (1 == $_REQUEST['field_admin'][$key]) ? 1 : 0); - $fieldsObj->setVar( 'field_user', (1 == $_REQUEST['field_user'][$key]) ? 1 : 0); - $fieldsObj->setVar( 'field_block', (1 == $_REQUEST['field_block'][$key]) ? 1 : 0); - $fieldsObj->setVar( 'field_main', ($key == $_REQUEST['field_main'] ? 1 : 0)); - $fieldsObj->setVar( 'field_search', (1 == $_REQUEST['field_search'][$key]) ? 1 : 0); + $fieldsObj->setVar( 'field_user', (1 == $_REQUEST['field_user'][$key]) ? 1 : 0); + $fieldsObj->setVar( 'field_thead', (1 == $_REQUEST['field_thead'][$key]) ? 1 : 0); + $fieldsObj->setVar( 'field_tbody', (1 == $_REQUEST['field_tbody'][$key]) ? 1 : 0); + $fieldsObj->setVar( 'field_tfoot', (1 == $_REQUEST['field_tfoot'][$key]) ? 1 : 0); + $fieldsObj->setVar( 'field_block', (1 == $_REQUEST['field_block'][$key]) ? 1 : 0); + $fieldsObj->setVar( 'field_main', ($key == $_REQUEST['field_main'] ? 1 : 0)); + $fieldsObj->setVar( 'field_search', (1 == $_REQUEST['field_search'][$key]) ? 1 : 0); $fieldsObj->setVar( 'field_required', (1 == $_REQUEST['field_required'][$key]) ? 1 : 0); // Insert Data $tdmcreate->getHandler('fields')->insert($fieldsObj); - $fieldOrder++; + ++$fieldOrder; } unset($fieldOrder); // Get table name from field table id Modified: XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/admin/modules.php =================================================================== --- XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/admin/modules.php 2015-06-09 02:59:11 UTC (rev 13084) +++ XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/admin/modules.php 2015-06-09 17:53:59 UTC (rev 13085) @@ -131,18 +131,19 @@ 'mod_website_url' => $_POST['mod_website_url'], 'mod_website_name' => $_POST['mod_website_name'], 'mod_release' => $_POST['mod_release'], - 'mod_status' => $_POST['mod_status'], - 'mod_admin' => ((1 == $_REQUEST['mod_admin']) ? 1 : 0), - 'mod_user' => ((1 == $_REQUEST['mod_user']) ? 1 : 0), - 'mod_blocks' => ((1 == $_REQUEST['mod_blocks']) ? 1 : 0), - 'mod_search' => ((1 == $_REQUEST['mod_search']) ? 1 : 0), - 'mod_comments' => ((1 == $_REQUEST['mod_comments']) ? 1 : 0), - 'mod_notifications' => ((1 == $_REQUEST['mod_notifications']) ? 1 : 0), - 'mod_permissions' => ((1 == $_REQUEST['mod_permissions']) ? 1 : 0), - 'mod_inroot_copy' => ((1 == $_REQUEST['mod_inroot_copy']) ? 1 : 0), + 'mod_status' => $_POST['mod_status'], 'mod_donations' => $_POST['mod_donations'], 'mod_subversion' => $_POST['mod_subversion']) ); + $moduleOption = XoopsRequest::getArray('module_option', array()); + $modulesObj->setVar('mod_admin', in_array('admin', $moduleOption)); + $modulesObj->setVar('mod_user', in_array('user', $moduleOption)); + $modulesObj->setVar('mod_blocks', in_array('blocks', $moduleOption)); + $modulesObj->setVar('mod_search', in_array('search', $moduleOption)); + $modulesObj->setVar('mod_comments', in_array('comments', $moduleOption)); + $modulesObj->setVar('mod_notifications', in_array('notifications', $moduleOption)); + $modulesObj->setVar('mod_permissions', in_array('permissions', $moduleOption)); + $modulesObj->setVar('mod_inroot_copy', in_array('inroot', $moduleOption)); if ($tdmcreate->getHandler('modules')->insert($modulesObj)) { if ($modulesObj->isNew()) { Modified: XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/admin/settings.php =================================================================== --- XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/admin/settings.php 2015-06-09 02:59:11 UTC (rev 13084) +++ XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/admin/settings.php 2015-06-09 17:53:59 UTC (rev 13085) @@ -75,18 +75,19 @@ 'set_website_url' => $_POST['set_website_url'], 'set_website_name' => $_POST['set_website_name'], 'set_release' => $_POST['set_release'], - 'set_status' => $_POST['set_status'], - 'set_admin' => ((1 == $_REQUEST['set_admin']) ? 1 : 0), - 'set_user' => ((1 == $_REQUEST['set_user']) ? 1 : 0), - 'set_blocks' => ((1 == $_REQUEST['set_blocks']) ? 1 : 0), - 'set_search' => ((1 == $_REQUEST['set_search']) ? 1 : 0), - 'set_comments' => ((1 == $_REQUEST['set_comments']) ? 1 : 0), - 'set_notifications' => ((1 == $_REQUEST['set_notifications']) ? 1 : 0), - 'set_permissions' => ((1 == $_REQUEST['set_permissions']) ? 1 : 0), - 'set_inroot_copy' => ((1 == $_REQUEST['set_inroot_copy']) ? 1 : 0), + 'set_status' => $_POST['set_status'], 'set_donations' => $_POST['set_donations'], 'set_subversion' => $_POST['set_subversion']) ); + $settingOption = XoopsRequest::getArray('setting_option', array()); + $settingsObj->setVar('set_admin', in_array('admin', $settingOption)); + $settingsObj->setVar('set_user', in_array('user', $settingOption)); + $settingsObj->setVar('set_blocks', in_array('blocks', $settingOption)); + $settingsObj->setVar('set_search', in_array('search', $settingOption)); + $settingsObj->setVar('set_comments', in_array('comments', $settingOption)); + $settingsObj->setVar('set_notifications', in_array('notifications', $settingOption)); + $settingsObj->setVar('set_permissions', in_array('permissions', $settingOption)); + $settingsObj->setVar('set_inroot_copy', in_array('inroot', $settingOption)); if ($tdmcreate->getHandler('settings')->insert($settingsObj)) { redirect_header('settings.php', 5, sprintf(_AM_TDMCREATE_MODULE_FORM_UPDATED_OK, $_POST['set_name'])); Modified: XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/admin/tables.php =================================================================== --- XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/admin/tables.php 2015-06-09 02:59:11 UTC (rev 13084) +++ XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/admin/tables.php 2015-06-09 17:53:59 UTC (rev 13085) @@ -133,7 +133,7 @@ $tablesObj =& $tables->create(); } $tableOrder = XoopsRequest::getInt('table_order'); - $order = $tablesObj->isNew() ? $tableOrder + 1 : $tableOrder; + $order = $tablesObj->isNew() ? $tableOrder + 1: $tableOrder; // Form save tables $tablesObj->setVars(array( 'table_mid' => $tableMid, @@ -159,27 +159,28 @@ } else { $tablesObj->setVar('table_image', $_POST['table_image']); } - $tablesObj->setVars(array( - 'table_autoincrement' => ((1 == $_REQUEST['table_autoincrement']) ? 1 : 0), - 'table_index' => ((1 == $_REQUEST['table_index']) ? 1 : 0), - 'table_blocks' => ((1 == $_REQUEST['table_blocks']) ? 1 : 0), - 'table_admin' => ((1 == $_REQUEST['table_admin']) ? 1 : 0), - 'table_user' => ((1 == $_REQUEST['table_user']) ? 1 : 0), - 'table_submenu' => ((1 == $_REQUEST['table_submenu']) ? 1 : 0), - 'table_submit' => ((1 == $_REQUEST['table_submit']) ? 1 : 0), - 'table_tag' => ((1 == $_REQUEST['table_tag']) ? 1 : 0), - 'table_broken' => ((1 == $_REQUEST['table_broken']) ? 1 : 0), - 'table_search' => ((1 == $_REQUEST['table_search']) ? 1 : 0), - 'table_comments' => ((1 == $_REQUEST['table_comments']) ? 1 : 0), - 'table_notifications' => ((1 == $_REQUEST['table_notifications']) ? 1 : 0), - 'table_permissions' => ((1 == $_REQUEST['table_permissions']) ? 1 : 0), - 'table_rate' => ((1 == $_REQUEST['table_rate']) ? 1 : 0), - 'table_print' => ((1 == $_REQUEST['table_print']) ? 1 : 0), - 'table_pdf' => ((1 == $_REQUEST['table_pdf']) ? 1 : 0), - 'table_rss' => ((1 == $_REQUEST['table_rss']) ? 1 : 0), - 'table_single' => ((1 == $_REQUEST['table_single']) ? 1 : 0), - 'table_visit' => ((1 == $_REQUEST['table_visit']) ? 1 : 0) - )); + $tablesObj->setVar( 'table_autoincrement', (1 == $_REQUEST['table_autoincrement']) ? 1 : 0 ); + // Options + $tableOption = XoopsRequest::getArray('table_option', array()); + $tablesObj->setVar('table_install', in_array('install', $tableOption)); + $tablesObj->setVar('table_index', in_array('index', $tableOption)); + $tablesObj->setVar('table_blocks', in_array('blocks', $tableOption)); + $tablesObj->setVar('table_admin', in_array('admin', $tableOption)); + $tablesObj->setVar('table_user', in_array('user', $tableOption)); + $tablesObj->setVar('table_submenu', in_array('submenu', $tableOption)); + $tablesObj->setVar('table_submit', in_array('submit', $tableOption)); + $tablesObj->setVar('table_tag', in_array('tag', $tableOption)); + $tablesObj->setVar('table_broken', in_array('broken', $tableOption)); + $tablesObj->setVar('table_search', in_array('search', $tableOption)); + $tablesObj->setVar('table_comments', in_array('comments', $tableOption)); + $tablesObj->setVar('table_notifications', in_array('notifications', $tableOption)); + $tablesObj->setVar('table_permissions', in_array('permissions', $tableOption)); + $tablesObj->setVar('table_rate', in_array('rate', $tableOption)); + $tablesObj->setVar('table_print', in_array('print', $tableOption)); + $tablesObj->setVar('table_pdf', in_array('pdf', $tableOption)); + $tablesObj->setVar('table_rss', in_array('rss', $tableOption)); + $tablesObj->setVar('table_single', in_array('single', $tableOption)); + $tablesObj->setVar('table_visit', in_array('visit', $tableOption)); // if ($tables->insert($tablesObj)) { if ($tablesObj->isNew()) { @@ -251,32 +252,32 @@ if ($modId > 0) { $modulesObj = $tdmcreate->getHandler('modules')->get($modId); if (isset($_POST['mod_admin'])) { - $mod_admin = $modulesObj->getVar('mod_admin'); - $modulesObj->setVar('mod_admin', !$mod_admin); + $modAdmin = $modulesObj->getVar('mod_admin'); + $modulesObj->setVar('mod_admin', !$modAdmin); } if (isset($_POST['mod_user'])) { $mod_user = $modulesObj->getVar('mod_user'); $modulesObj->setVar('mod_user', !$mod_user); } if (isset($_POST['mod_blocks'])) { - $mod_blocks = $modulesObj->getVar('mod_blocks'); - $modulesObj->setVar('mod_blocks', !$mod_blocks); + $modBlocks = $modulesObj->getVar('mod_blocks'); + $modulesObj->setVar('mod_blocks', !$modBlocks); } if (isset($_POST['mod_search'])) { - $mod_search = $modulesObj->getVar('mod_search'); - $modulesObj->setVar('mod_search', !$mod_search); + $modSearch = $modulesObj->getVar('mod_search'); + $modulesObj->setVar('mod_search', !$modSearch); } if (isset($_POST['mod_comments'])) { - $mod_comments = $modulesObj->getVar('mod_comments'); - $modulesObj->setVar('mod_comments', !$mod_comments); + $modComments = $modulesObj->getVar('mod_comments'); + $modulesObj->setVar('mod_comments', !$modComments); } if (isset($_POST['mod_notifications'])) { - $mod_notifications = $modulesObj->getVar('mod_notifications'); - $modulesObj->setVar('mod_notifications', !$mod_notifications); + $modNotifications = $modulesObj->getVar('mod_notifications'); + $modulesObj->setVar('mod_notifications', !$modNotifications); } if (isset($_POST['mod_permissions'])) { - $mod_permissions = $modulesObj->getVar('mod_permissions'); - $modulesObj->setVar('mod_permissions', !$mod_permissions); + $modPermissions = $modulesObj->getVar('mod_permissions'); + $modulesObj->setVar('mod_permissions', !$modPermissions); } if ($tdmcreate->getHandler('modules')->insert($modulesObj)) { redirect_header('modules.php', 3, _AM_TDMCREATE_TOGGLE_SUCCESS); @@ -288,32 +289,36 @@ if ($tableId > 0) { $tablesObj = $tdmcreate->getHandler('tables')->get($tableId); if (isset($_POST['table_admin'])) { - $table_admin = $tablesObj->getVar('table_admin'); - $tablesObj->setVar('table_admin', !$table_admin); + $tableAdmin = $tablesObj->getVar('table_admin'); + $tablesObj->setVar('table_admin', !$tableAdmin); } if (isset($_POST['table_user'])) { - $table_user = $tablesObj->getVar('table_user'); - $tablesObj->setVar('table_user', !$table_user); + $tableUser = $tablesObj->getVar('table_user'); + $tablesObj->setVar('table_user', !$tableUser); } if (isset($_POST['table_blocks'])) { - $table_blocks = $tablesObj->getVar('table_blocks'); - $tablesObj->setVar('table_blocks', !$table_blocks); + $tableBlocks = $tablesObj->getVar('table_blocks'); + $tablesObj->setVar('table_blocks', !$tableBlocks); } + if (isset($_POST['table_submenu'])) { + $tableSubmenu = $tablesObj->getVar('table_submenu'); + $tablesObj->setVar('table_submenu', !$tableSubmenu); + } if (isset($_POST['table_search'])) { - $table_search = $tablesObj->getVar('table_search'); - $tablesObj->setVar('table_search', !$table_search); + $tableSearch = $tablesObj->getVar('table_search'); + $tablesObj->setVar('table_search', !$tableSearch); } if (isset($_POST['table_comments'])) { - $table_comments = $tablesObj->getVar('table_comments'); - $tablesObj->setVar('table_comments', !$table_comments); + $tableComments = $tablesObj->getVar('table_comments'); + $tablesObj->setVar('table_comments', !$tableComments); } if (isset($_POST['table_notifications'])) { - $table_notifications = $tablesObj->getVar('table_notifications'); - $tablesObj->setVar('table_notifications', !$table_notifications); + $tableNotifications = $tablesObj->getVar('table_notifications'); + $tablesObj->setVar('table_notifications', !$tableNotifications); } if (isset($_POST['table_permissions'])) { - $table_permissions = $tablesObj->getVar('table_permissions'); - $tablesObj->setVar('table_permissions', !$table_permissions); + $tablePermissions = $tablesObj->getVar('table_permissions'); + $tablesObj->setVar('table_permissions', !$tablePermissions); } if ($tdmcreate->getHandler('tables')->insert($tablesObj)) { redirect_header('tables.php', 3, _AM_TDMCREATE_TOGGLE_SUCCESS); Modified: XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/assets/js/sortable.js =================================================================== --- XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/assets/js/sortable.js 2015-06-09 02:59:11 UTC (rev 13084) +++ XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/assets/js/sortable.js 2015-06-09 17:53:59 UTC (rev 13085) @@ -3,7 +3,7 @@ $(document).ready( function(){ /* Call the container items to reorder tables */ $('.table-list').sortable({ - accept: 'tdmc-tables', + accept: 'tables', opacity: 0.6, handle : '.move', cursor: 'move', @@ -19,8 +19,8 @@ } ).disableSelection(); /* Call the container items to reorder fields */ - $('.field-list').sortable({ - accept: 'tdmc-fields', + $('.field-list').sortable({ + accept: 'fields', opacity: 0.6, handle : '.move', cursor: 'move', Deleted: XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/TDMCreateHelper.php =================================================================== --- XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/TDMCreateHelper.php 2015-06-09 02:59:11 UTC (rev 13084) +++ XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/TDMCreateHelper.php 2015-06-09 17:53:59 UTC (rev 13085) @@ -1,220 +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. - */ -/** - * tdmcreate module - * - * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/ - * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html) - * @package tdmcreate - * @since 2.5.0 - * @author trabis <lus...@gm...> - * @version $Id: TDMCreateHelper.php 12258 2014-04-12 23:45:12Z timgno $ - */ -defined('XOOPS_ROOT_PATH') or die('Restricted access'); - -/** - * Class TDMCreateHelper - */ -class TDMCreateHelper -{ - /** - * @var string - */ - private $dirname; - /** - * @var string - */ - private $module; - /** - * @var string - */ - private $handler; - /** - * @var string - */ - private $config; - /** - * @var string - */ - private $debug; - /** - * @var array - */ - private $debugArray = array(); - - /* - * @protected function constructor class - * @param mixed $debug - */ - /** - * @param $debug - */ - public function __construct($debug) - { - $this->debug = $debug; - $this->dirname = basename(dirname(__DIR__)); - } - - /* - * @static function &getInstance - * @param mixed $debug - */ - /** - * @param bool $debug - * @return TDMCreateHelper - */ - public static function &getInstance($debug = false) - { - static $instance = false; - if (!$instance) { - $instance = new self($debug); - } - - return $instance; - } - - /* - * @static function getModule - * @param null - */ - /** - * @return string - */ - public function &getModule() - { - if ($this->module == null) { - $this->initModule(); - } - - return $this->module; - } - - /* - * @static function getConfig - * @param string $name - */ - /** - * @param null $name - * @return null|string - */ - public function getConfig($name = null) - { - if ($this->config == null) { - $this->initConfig(); - } - if (!$name) { - $this->addLog("Getting all config"); - - return $this->config; - } - if (!isset($this->config[$name])) { - $this->addLog("ERROR :: CONFIG '{$name}' does not exist"); - - return null; - } - $this->addLog("Getting config '{$name}' : " . $this->config[$name]); - - return $this->config[$name]; - } - - /* - * @static function setConfig - * @param string $name - * @param mixed $value - */ - /** - * @param null $name - * @param null $value - * @return mixed - */ - public function setConfig($name = null, $value = null) - { - if ($this->config == null) { - $this->initConfig(); - } - $this->config[$name] = $value; - $this->addLog("Setting config '{$name}' : " . $this->config[$name]); - - return $this->config[$name]; - } - - /* - * @static function getHandler - * @param string $name - */ - /** - * @param $name - * @return mixed - */ - public function &getHandler($name) - { - if (!isset($this->handler[$name . '_handler'])) { - $this->initHandler($name); - } - $this->addLog("Getting handler '{$name}'"); - - return $this->handler[$name . '_handler']; - } - - /* - * @static function initModule - * @param null - */ - public function initModule() - { - global $xoopsModule; - if (isset($xoopsModule) && is_object($xoopsModule) && $xoopsModule->getVar('dirname') == $this->dirname) { - $this->module = $xoopsModule; - } else { - $hModule = xoops_gethandler('module'); - $this->module = $hModule->getByDirname($this->dirname); - } - $this->addLog('INIT MODULE'); - } - - /* - * @static function initConfig - * @param null - */ - public function initConfig() - { - $this->addLog('INIT CONFIG'); - $hModConfig = xoops_gethandler('config'); - $this->config = $hModConfig->getConfigsByCat(0, $this->getModule()->getVar('mid')); - } - - /* - * @static function initHandler - * @param string $name - */ - /** - * @param $name - */ - public function initHandler($name) - { - $this->addLog('INIT ' . $name . ' HANDLER'); - $this->handler[$name . '_handler'] = xoops_getModuleHandler($name, $this->dirname); - } - - /* - * @static function addLog - * @param string $log - */ - /** - * @param $log - */ - public function addLog($log) - { - if ($this->debug && is_object($GLOBALS['xoopsLogger'])) { - $GLOBALS['xoopsLogger']->addExtra($this->module->name(), $log); - } - } -} Deleted: XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/TDMCreateSession.php =================================================================== --- XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/TDMCreateSession.php 2015-06-09 02:59:11 UTC (rev 13084) +++ XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/TDMCreateSession.php 2015-06-09 17:53:59 UTC (rev 13085) @@ -1,114 +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. - */ -/** - * TDMCreate class - * - * @copyright The XUUPS Project http://sourceforge.net/projects/xuups/ - * @license http://www.fsf.org/copyleft/gpl.html GNU public license - * @package TDMCreate - * @since 1.0 - * @author trabis <lus...@gm...> - * @author Harry Fuecks (PHP Anthology Volume II) - * @version $Id: 1.91 session.php 12453 2014-03-28 18:34:46Z timgno $ - */ -defined('XOOPS_ROOT_PATH') or die('Restricted access'); - -/** - * Class TDMCreateSession - */ -class TDMCreateSession -{ - /** - * Session constructor<br /> - * Starts the session with session_start() - * <strong>Note:</strong> that if the session has already started, - * session_start() does nothing - */ - public function __construct() - { - if (!isset($_SESSION)) { - session_start(); - } - } - - /* - * @static function &getInstance - * @param null - */ - /** - * @return TDMCreateSession - */ - public static function &getInstance() - { - static $_sess = false; - if (!isset($_sess)) { - $_sess = new self(); - } - - return $_sess; - } - - /** - * Sets a session variable - * - * @param string $name name of variable - * @param mixed $value value of variable - * - * @return void - * @access public - */ - public function setSession($name, $value) - { - $_SESSION[$name] = $value; - } - - /** - * Fetches a session variable - * - * @param string $name name of variable - * - * @return mixed value of session variable - * @access public - */ - public function getSession($name) - { - if (isset($_SESSION[$name])) { - return $_SESSION[$name]; - } else { - return false; - } - } - - /** - * Deletes a session variable - * - * @param string $name name of variable - * - * @return void - * @access public - */ - public function deleteSession($name) - { - unset($_SESSION[$name]); - } - - /** - * Destroys the whole session - * - * @return void - * @access public - */ - public function destroySession() - { - $_SESSION = array(); - session_destroy(); - } -} Modified: XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/autoload.php =================================================================== --- XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/autoload.php 2015-06-09 02:59:11 UTC (rev 13084) +++ XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/autoload.php 2015-06-09 17:53:59 UTC (rev 13085) @@ -43,11 +43,11 @@ foreach(new RecursiveIteratorIterator($directories) as $file) { if ($file->getFilename() == $classFilename) { $fullPath = $file->getRealPath(); - $pathCache[$class] = $fullPath; - require_once $fullPath; + $pathCache[$class] = $fullPath; + require_once $fullPath; break; } - } + } } $serialized_paths = serialize($pathCache); Modified: XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/fields.php =================================================================== --- XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/fields.php 2015-06-09 02:59:11 UTC (rev 13084) +++ XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/fields.php 2015-06-09 17:53:59 UTC (rev 13085) @@ -46,6 +46,7 @@ public function __construct() { $this->tdmcreate = TDMCreateHelper::getInstance(); + $this->tdmcreate = TDMCreateHelper::getInstance(); $this->initVar('field_id', XOBJ_DTYPE_INT); $this->initVar('field_mid', XOBJ_DTYPE_INT); $this->initVar('field_tid', XOBJ_DTYPE_INT); @@ -59,10 +60,13 @@ $this->initVar('field_key', XOBJ_DTYPE_TXTBOX); $this->initVar('field_element', XOBJ_DTYPE_TXTBOX); $this->initVar('field_parent', XOBJ_DTYPE_INT); + $this->initVar('field_admin', XOBJ_DTYPE_INT); $this->initVar('field_inlist', XOBJ_DTYPE_INT); $this->initVar('field_inform', XOBJ_DTYPE_INT); - $this->initVar('field_admin', XOBJ_DTYPE_INT); $this->initVar('field_user', XOBJ_DTYPE_INT); + $this->initVar('field_thead', XOBJ_DTYPE_INT); + $this->initVar('field_tbody', XOBJ_DTYPE_INT); + $this->initVar('field_tfoot', XOBJ_DTYPE_INT); $this->initVar('field_block', XOBJ_DTYPE_INT); $this->initVar('field_main', XOBJ_DTYPE_INT); $this->initVar('field_search', XOBJ_DTYPE_INT); @@ -242,7 +246,12 @@ $checkFieldParent = new TDMCreateFormRadio('', 'field_parent', $field_parent); $checkFieldParent->addOption($i, _AM_TDMCREATE_FIELD_PARENT ); $parametersTray->addElement($checkFieldParent);*/ - + + $field_admin = 0; + $checkFieldAdmin = new XoopsFormCheckBox(' ', 'field_admin[' . $i . ']', $field_admin); + $checkFieldAdmin->addOption(1, _AM_TDMCREATE_FIELD_ADMIN); + $parametersTray->addElement($checkFieldAdmin); + $field_inlist = 0; $checkFieldInList = new XoopsFormCheckBox(' ', 'field_inlist[' . $i . ']', $field_inlist); $checkFieldInList->addOption(1, _AM_TDMCREATE_FIELD_INLIST); @@ -253,15 +262,25 @@ $checkFieldInForm->addOption(1, _AM_TDMCREATE_FIELD_INFORM); $parametersTray->addElement($checkFieldInForm); - $field_admin = 0; - $checkFieldAdmin = new XoopsFormCheckBox(' ', 'field_admin[' . $i . ']', $field_admin); - $checkFieldAdmin->addOption(1, _AM_TDMCREATE_FIELD_ADMIN); - $parametersTray->addElement($checkFieldAdmin); - $field_user = 0; $checkFieldUser = new XoopsFormCheckBox(' ', 'field_user[' . $i . ']', $field_user); $checkFieldUser->addOption(1, _AM_TDMCREATE_FIELD_USER); $parametersTray->addElement($checkFieldUser); + + $field_thead = 0; + $checkFieldThead = new XoopsFormCheckBox(' ', 'field_thead[' . $i . ']', $field_thead); + $checkFieldThead->addOption(1, _AM_TDMCREATE_FIELD_THEAD); + $parametersTray->addElement($checkFieldThead); + + $field_tbody = 0; + $checkFieldTbody = new XoopsFormCheckBox(' ', 'field_tbody[' . $i . ']', $field_tbody); + $checkFieldTbody->addOption(1, _AM_TDMCREATE_FIELD_TBODY); + $parametersTray->addElement($checkFieldTbody); + + $field_tfoot = 0; + $checkFieldTfoot = new XoopsFormCheckBox(' ', 'field_tfoot[' . $i . ']', $field_tfoot); + $checkFieldTfoot->addOption(1, _AM_TDMCREATE_FIELD_TFOOT); + $parametersTray->addElement($checkFieldTfoot); $field_block = 0; $checkFieldBlock = new XoopsFormCheckBox('', 'field_block[' . $i . ']', $field_block); @@ -282,6 +301,7 @@ $checkFieldRequired = new XoopsFormCheckBox(' ', 'field_required[' . $i . ']', $field_required); $checkFieldRequired->addOption(1, _AM_TDMCREATE_FIELD_REQUIRED); $parametersTray->addElement($checkFieldRequired); + // $form->addElement(new TDMCreateFormLabel('<td><div class="portlet"><div class="portlet-header">' . _AM_TDMCREATE_FIELD_PARAMETERS_LIST . '</div><div class="portlet-content">' . $parametersTray->render() . '</div></div></td></tr>')); } } @@ -376,28 +396,36 @@ $checkFieldParent = new XoopsFormCheckBox(' ', 'field_parent[' . $id . ']', $field->getVar('field_parent')); $checkFieldParent->addOption(1, _AM_TDMCREATE_FIELD_PARENT); $parametersTray->addElement($checkFieldParent); - /*$field_parent = ($field->getVar('field_parent') == 1) ? $id : 1; - $checkFieldParent = new TDMCreateFormRadio('', 'field_parent', $field_parent); - $checkFieldParent->addOption($id, _AM_TDMCREATE_FIELD_PARENT ); - $parametersTray->addElement($checkFieldParent);*/ - + + $checkFieldAdmin = new XoopsFormCheckBox(' ', 'field_admin[' . $id . ']', $field->getVar('field_admin')); + $checkFieldAdmin->addOption(1, _AM_TDMCREATE_FIELD_ADMIN); + $parametersTray->addElement($checkFieldAdmin); + $checkFieldInList = new XoopsFormCheckBox(' ', 'field_inlist[' . $id . ']', $field->getVar('field_inlist')); $checkFieldInList->addOption(1, _AM_TDMCREATE_FIELD_INLIST); $parametersTray->addElement($checkFieldInList); $checkFieldInForm = new XoopsFormCheckBox(' ', 'field_inform[' . $id . ']', $field->getVar('field_inform')); $checkFieldInForm->addOption(1, _AM_TDMCREATE_FIELD_INFORM); - $parametersTray->addElement($checkFieldInForm); + $parametersTray->addElement($checkFieldInForm); - $checkFieldAdmin = new XoopsFormCheckBox(' ', 'field_admin[' . $id . ']', $field->getVar('field_admin')); - $checkFieldAdmin->addOption(1, _AM_TDMCREATE_FIELD_ADMIN); - $parametersTray->addElement($checkFieldAdmin); - $checkFieldUser = new XoopsFormCheckBox(' ', 'field_user[' . $id . ']', $field->getVar('field_user')); $checkFieldUser->addOption(1, _AM_TDMCREATE_FIELD_USER); $parametersTray->addElement($checkFieldUser); - - $checkFieldBlock = new XoopsFormCheckBox('', 'field_block[' . $id . ']', $field->getVar('field_block')); + + $checkFieldThead = new XoopsFormCheckBox(' ', 'field_thead[' . $id . ']', $field->getVar('field_thead')); + $checkFieldThead->addOption(1, _AM_TDMCREATE_FIELD_THEAD); + $parametersTray->addElement($checkFieldThead); + + $checkFieldTbody = new XoopsFormCheckBox(' ', 'field_tbody[' . $id . ']', $field->getVar('field_tbody')); + $checkFieldTbody->addOption(1, _AM_TDMCREATE_FIELD_TBODY); + $parametersTray->addElement($checkFieldTbody); + + $checkFieldTfoot = new XoopsFormCheckBox(' ', 'field_tfoot[' . $id . ']', $field->getVar('field_tfoot')); + $checkFieldTfoot->addOption(1, _AM_TDMCREATE_FIELD_TFOOT); + $parametersTray->addElement($checkFieldTfoot); + + $checkFieldBlock = new XoopsFormCheckBox('', 'field_block[' . $id . ']', $field->getVar('field_block')); $checkFieldBlock->addOption(1, _AM_TDMCREATE_FIELD_BLOCK); $parametersTray->addElement($checkFieldBlock); @@ -591,7 +619,7 @@ /** * Get All Fields By Module & Table Id */ - public function getAllFieldsByModuleAndTableId($modId, $tabId, $start = 0, $limit = 0, $sort = 'field_id ASC, field_name', $order = 'ASC') + public function getAllFieldsByModuleAndTableId($modId, $tabId, $start = 0, $limit = 0, $sort = 'field_order ASC, field_id, field_name', $order = 'ASC') { $criteria = new CriteriaCompo(); $criteria->add(new Criteria('field_mid', $modId)); Modified: XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/TDMCreateArchitecture.php =================================================================== --- XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/TDMCreateArchitecture.php 2015-06-09 02:59:11 UTC (rev 13084) +++ XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/TDMCreateArchitecture.php 2015-06-09 17:53:59 UTC (rev 13085) @@ -101,7 +101,7 @@ // Creation of "module" folder in the Directory repository $this->structure->makeDir($uploadPath . '/' . $this->structure->getModuleName()); // Copied of index.html file in "root module" folder - $this->structure->copyFile('', $indexFile, 'index.html'); + //$this->structure->copyFile('', $indexFile, 'index.html'); if (1 == $module->getVar('mod_admin')) { // Creation of "admin" folder and index.html file $this->structure->makeDirAndCopyFile('admin', $indexFile, 'index.html'); @@ -183,19 +183,20 @@ $this->structure->makeDirAndCopyFile('templates/admin', $indexFile, 'index.html'); } if ($table->getVar('table_name') != null) { - if (1 == $module->getVar('mod_blocks')) { + if ((1 == $module->getVar('mod_blocks')) && (1 == $table->getVar('table_blocks'))) { // Creation of "templates/blocks" folder and index.html file $this->structure->makeDirAndCopyFile('templates/blocks', $indexFile, 'index.html'); } // Creation of "sql" folder and index.html file $this->structure->makeDirAndCopyFile('sql', $indexFile, 'index.html'); - if (1 == $table->getVar('table_notifications')) { - // Creation of "language/english/mail_template" folder and index.html file - $this->structure->makeDirAndCopyFile('language/english/mail_template', $indexFile, 'index.html'); + if ((1 == $module->getVar('mod_notifications')) && (1 == $table->getVar('table_notifications'))) { if ($language != 'english') { // Creation of "language/local_language/mail_template" folder and index.html file $this->structure->makeDirAndCopyFile('language/' . $language . '/mail_template', $indexFile, 'index.html'); - } + } else { + // Creation of "language/english/mail_template" folder and index.html file + $this->structure->makeDirAndCopyFile('language/english/mail_template', $indexFile, 'index.html'); + } } } } @@ -277,6 +278,10 @@ $userTemplatesPages = TemplatesUserPages::getInstance(); $userTemplatesPages->write($module, $table); $ret[] = $userTemplatesPages->renderFile($moduleDirname . '_' . $tableName . '.tpl'); + // User List Templates File + $userTemplatesPagesList = TemplatesUserPagesList::getInstance(); + $userTemplatesPagesList->write($module, $table); + $ret[] = $userTemplatesPagesList->renderFile($moduleDirname . '_' . $tableName . '_list' . '.tpl'); } } // Language Modinfo File @@ -331,7 +336,7 @@ $ret[] = $classHelper->render(); // Include Functions File $includeFunctions = IncludeFunctions::getInstance(); - $includeFunctions->write($module, 'functions.php'); + $includeFunctions->write($module, $table, 'functions.php'); $ret[] = $includeFunctions->render(); // Creation of blocks language file if ($table->getVar('table_name') != null) { @@ -417,7 +422,7 @@ if (1 == $module->getVar('mod_admin')) { // Templates Index File $userTemplatesIndex = TemplatesUserIndex::getInstance(); - $userTemplatesIndex->write($module, $moduleDirname . '_index.tpl'); + $userTemplatesIndex->write($module, $table, $moduleDirname . '_index.tpl'); $ret[] = $userTemplatesIndex->render(); // Templates Footer File $userTemplatesFooter = TemplatesUserFooter::getInstance(); @@ -425,7 +430,7 @@ $ret[] = $userTemplatesFooter->render(); // Templates Header File $userTemplatesHeader = TemplatesUserHeader::getInstance(); - $userTemplatesHeader->write($module, $tables, $moduleDirname . '_header.tpl'); + $userTemplatesHeader->write($module, $table, $tables, $moduleDirname . '_header.tpl'); $ret[] = $userTemplatesHeader->render(); } // Creation of user files Modified: XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/TDMCreateFile.php =================================================================== --- XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/TDMCreateFile.php 2015-06-09 02:59:11 UTC (rev 13084) +++ XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/TDMCreateFile.php 2015-06-09 17:53:59 UTC (rev 13085) @@ -511,7 +511,7 @@ /** * {$name} module for xoops * - * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/ + * @copyright The XOOPS Project (http://xoops.org) * @license {$license} * @package {$dirname} * @since {$since} Modified: XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/TDMCreateHtmlSmartyCodes.php =================================================================== --- XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/TDMCreateHtmlSmartyCodes.php 2015-06-09 02:59:11 UTC (rev 13084) +++ XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/TDMCreateHtmlSmartyCodes.php 2015-06-09 17:53:59 UTC (rev 13085) @@ -16,7 +16,7 @@ * @package tdmcreate * @since 2.5.0 * @author Txmod Xoops http://www.txmodxoops.org - * @version $Id: htmlsmartycodes.php 12258 2014-01-02 09:33:29Z timgno $ + * @version $Id: TDMCreateHtmlSmartyCodes.php 12258 2014-01-02 09:33:29Z timgno $ */ defined('XOOPS_ROOT_PATH') or die('Restricted access'); @@ -380,7 +380,26 @@ return $ret; } + + /* + * @public function getSmartyIncludeFileList + * @param string $name + */ + /** + * @param $moduleDirname + * @param $tableName + * @param $tableFieldName + * @return string + */ + public function getSmartyIncludeFileList($moduleDirname, $tableName, $tableFieldName) + { + $ret = <<<EOT + <{include file='db:{$moduleDirname}_{$tableName}_list.tpl' {$tableFieldName}=\${$tableFieldName}[i]}> +EOT; + return $ret; + } + /* * @public function getSmartyConditions * @param string $condition Modified: XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/TDMCreateTableFields.php =================================================================== --- XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/TDMCreateTableFields.php 2015-06-09 02:59:11 UTC (rev 13084) +++ XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/TDMCreateTableFields.php 2015-06-09 17:53:59 UTC (rev 13085) @@ -33,16 +33,32 @@ $this->tdmcreate = TDMCreateHelper::getInstance(); } + /* + * @static function &getInstance + * + * @return TDMCreateFields + */ + public static function &getInstance() + { + static $instance = false; + if (!$instance) { + $instance = new self(); + } + + return $instance; + } + /** * @public function getTableTables * @param $mId * @return mixed */ - public function getTableTables($mId) + public function getTableTables($mId, $sort = 'table_id ASC, table_name', $order = 'ASC') { $criteria = new CriteriaCompo(); $criteria->add(new Criteria('table_mid', $mId)); // $mId = module Id - $criteria->setSort('table_order'); + $criteria->setSort($sort); + $criteria->setOrder($order); $tables = $this->tdmcreate->getHandler('tables')->getObjects($criteria); unset($criteria); @@ -55,15 +71,41 @@ * @param $tId * @return mixed */ - public function getTableFields($mId, $tId) + public function getTableFields($mId, $tId, $sort = 'field_id ASC, field_name', $order = 'ASC') { $criteria = new CriteriaCompo(); $criteria->add(new Criteria('field_mid', $mId)); // $mId = module Id $criteria->add(new Criteria('field_tid', $tId)); // $tId = table Id - $criteria->setSort('field_order'); + $criteria->setSort($sort); + $criteria->setOrder($order); $fields = $this->tdmcreate->getHandler('fields')->getObjects($criteria); unset($criteria); return $fields; } + + /** + * @public function getTableFieldElements + * @param $mId + * @param $tId + * @return mixed + */ + public function getTableFieldElements($mId = null, $tId = null, $sort = 'fieldelement_id ASC, fieldelement_name', $order = 'ASC') + { + $criteria = new CriteriaCompo(); + if($mId != null) { + $criteria->add(new Criteria('fieldelement_mid', $mId)); // $mId = module Id + $criteria->setSort($sort); + $criteria->setOrder($order); + } + if($tId != null) { + $criteria->add(new Criteria('fieldelement_tid', $tId)); // $tId = table Id + $criteria->setSort($sort); + $criteria->setOrder($order); + } + $fieldElements = $this->tdmcreate->getHandler('fieldelements')->getObjects($criteria); + unset($criteria); + + return $fieldElements; + } } Modified: XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/admin/AdminMenu.php =================================================================== --- XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/admin/AdminMenu.php 2015-06-09 02:59:11 UTC (rev 13084) +++ XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/admin/AdminMenu.php 2015-06-09 17:53:59 UTC (rev 13085) @@ -162,7 +162,7 @@ { $module = $this->getModule(); $table = $this->getTable(); - $tables = $this->getTables(); + //$tables = $this->getTables(); $filename = $this->getFileName(); $moduleDirname = $module->getVar('mod_dirname'); $language = $this->getLanguage($moduleDirname, 'MI', 'ADMENU'); @@ -170,7 +170,8 @@ $content = $this->getHeaderFilesComments($module, $filename); $content .= $this->getAdminMenuHeader(); $content .= $this->getAdminMenuDashboard($language, $menu); - foreach (array_keys($tables) as $t) { + $tables = $this->getTableTables($module->getVar('mod_id'), 'table_order ASC, table_name'); + foreach (array_keys($tables) as $t) { $tablePermissions = $tables[$t]->getVar('table_permissions'); if (1 == $tables[$t]->getVar('table_admin')) { ++$menu; @@ -185,7 +186,7 @@ EOT; } } - if (is_object($table) && 1 == $table->getVar('table_permissions')) { + if (1 == $table->getVar('table_permissions')) { ++$menu; $content .= <<<EOT \$adminmenu[\$i]['title'] = {$language}{$menu}; Modified: XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/admin/AdminObjects.php =================================================================== --- XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/admin/AdminObjects.php 2015-06-09 02:59:11 UTC (rev 13084) +++ XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/admin/AdminObjects.php 2015-06-09 17:53:59 UTC (rev 13085) @@ -101,8 +101,9 @@ \${$tableName}Obj->setVar('{$fieldName}', formatUrl(\$_REQUEST['{$fieldName}']));\n // Set Var {$fieldName} include_once XOOPS_ROOT_PATH.'/class/uploader.php'; - \$uploader = new XoopsMediaUploader({$stuModuleDirname}_UPLOAD_FILES_PATH . '/{$tableName}', \${$moduleDirname}->getConfig('mimetypes'), - \${$moduleDirname}->getConfig('maxsize'), null, null); + \$uploader = new XoopsMediaUploader({$stuModuleDirname}_UPLOAD_FILES_PATH . '/{$tableName}', + \${$moduleDirname}->getConfig('mimetypes'), + \${$moduleDirname}->getConfig('maxsize'), null, null); if (\$uploader->fetchMedia(\$_POST['xoops_upload_file'][0])) { \$uploader->fetchMedia(\$_POST['xoops_upload_file'][0]); if (!\$uploader->upload()) { @@ -132,9 +133,9 @@ \$uploaddir = XOOPS_ROOT_PATH . '/Frameworks/moduleclasses/icons/32'; \$uploader = new XoopsMediaUploader(\$uploaddir, \${$moduleDirname}->getConfig('mimetypes'), \${$moduleDirname}->getConfig('maxsize'), null, null); - if (\$uploader->fetchMedia(\$_POST['xoops_upload_file'][1])) { + if (\$uploader->fetchMedia(\$_POST['xoops_upload_file'][0])) { //\$uploader->setPrefix('{$fieldName}_'); - //\$uploader->fetchMedia(\$_POST['xoops_upload_file'][1]); + //\$uploader->fetchMedia(\$_POST['xoops_upload_file'][0]); if (!\$uploader->upload()) { \$errors = \$uploader->getErrors(); redirect_header('javascript:history.go(-1)', 3, \$errors); @@ -161,14 +162,14 @@ $ret = <<<EOT // Set Var {$fieldName} include_once XOOPS_ROOT_PATH.'/class/uploader.php'; - \$uploaddir = {$stuModuleDirname}_UPLOAD_PATH.'/images/{$tableName}'; - \$uploader = new XoopsMediaUploader(\$uploaddir, \${$moduleDirname}->getConfig('mimetypes'), - \${$moduleDirname}->getConfig('maxsize'), null, null); - if (\$uploader->fetchMedia(\$_POST['xoops_upload_file'][2])) { + \$uploader = new XoopsMediaUploader({$stuModuleDirname}_UPLOAD_IMAGE_PATH.'/{$tableName}', + \${$moduleDirname}->getConfig('mimetypes'), + \${$moduleDirname}->getConfig('maxsize'), null, null); + if (\$uploader->fetchMedia(\$_POST['xoops_upload_file'][0])) { \$extension = preg_replace( '/^.+\.([^.]+)$/sU' , '' , \$_FILES['attachedfile']['name']); \$imgName = str_replace(' ', '', \$_POST['{$fieldMain}']).'.'.\$extension; \$uploader->setPrefix(\$imgName); - \$uploader->fetchMedia(\$_POST['xoops_upload_file'][2]); + \$uploader->fetchMedia(\$_POST['xoops_upload_file'][0]); if (!\$uploader->upload()) { \$errors = \$uploader->getErrors(); redirect_header('javascript:history.go(-1)', 3, \$errors); @@ -195,12 +196,12 @@ $ret = <<<EOT // Set Var {$fieldName} include_once XOOPS_ROOT_PATH.'/class/uploader.php'; - \$uploaddir = {$stuModuleDirname}_UPLOAD_PATH.'/files/{$tableName}'; - \$uploader = new XoopsMediaUploader(\$uploaddir, \${$moduleDirname}->getConfig('mimetypes'), - \${$moduleDirname}->getConfig('maxsize'), null, null); - if (\$uploader->fetchMedia(\$_POST['xoops_upload_file'][3])) { + \$uploader = new XoopsMediaUploader({$stuModuleDirname}_UPLOAD_FILES_PATH.'/{$tableName}', + \${$moduleDirname}->getConfig('mimetypes'), + \${$moduleDirname}->getConfig('maxsize'), null, null); + if (\$uploader->fetchMedia(\$_POST['xoops_upload_file'][0])) { //\$uploader->setPrefix('{$fieldName}_') ; - //\$uploader->fetchMedia(\$_POST['xoops_upload_file'][3]); + //\$uploader->fetchMedia(\$_POST['xoops_upload_file'][0]); if (!\$uploader->upload()) { \$errors = \$uploader->getErrors(); redirect_header('javascript:history.go(-1)', 3, \$errors); Modified: XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/admin/AdminPages.php =================================================================== --- XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/admin/AdminPages.php 2015-06-09 02:59:11 UTC (rev 13084) +++ XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/admin/AdminPages.php 2015-06-09 17:53:59 UTC (rev 13085) @@ -221,7 +221,7 @@ case 6: $ret .= $this->adminobjects->getCheckBoxOrRadioYNSetVar($tableName, $fieldName); break; - case 11: + case 10: $ret .= $this->adminobjects->getImageListSetVar($moduleDirname, $tableName, $fieldName); break; case 12: Modifie... [truncated message content] |
From: <wis...@us...> - 2015-06-09 02:59:18
|
Revision: 13084 http://sourceforge.net/p/xoops/svn/13084 Author: wishcraft Date: 2015-06-09 02:59:11 +0000 (Tue, 09 Jun 2015) Log Message: ----------- Pre-release (dev-in-progress) for new signed 2.07 -- trunk Added Paths: ----------- XoopsModules/signed/trunk/ XoopsModules/signed/trunk/modules/ XoopsModules/signed/trunk/modules/index.html XoopsModules/signed/trunk/modules/signed/ XoopsModules/signed/trunk/modules/signed/.htaccess XoopsModules/signed/trunk/modules/signed/admin/ XoopsModules/signed/trunk/modules/signed/admin/about.php XoopsModules/signed/trunk/modules/signed/admin/admin.php XoopsModules/signed/trunk/modules/signed/admin/admin_footer.php XoopsModules/signed/trunk/modules/signed/admin/admin_header.php XoopsModules/signed/trunk/modules/signed/admin/events.php XoopsModules/signed/trunk/modules/signed/admin/index.html XoopsModules/signed/trunk/modules/signed/admin/menu.php XoopsModules/signed/trunk/modules/signed/admin/signatures.php XoopsModules/signed/trunk/modules/signed/api/ XoopsModules/signed/trunk/modules/signed/api/banned/ XoopsModules/signed/trunk/modules/signed/api/banned/.htaccess XoopsModules/signed/trunk/modules/signed/api/banned/index.php XoopsModules/signed/trunk/modules/signed/api/classes/ XoopsModules/signed/trunk/modules/signed/api/classes/.htaccess XoopsModules/signed/trunk/modules/signed/api/classes/index.php XoopsModules/signed/trunk/modules/signed/api/descriptions/ XoopsModules/signed/trunk/modules/signed/api/descriptions/.htaccess XoopsModules/signed/trunk/modules/signed/api/descriptions/index.php XoopsModules/signed/trunk/modules/signed/api/enumerators/ XoopsModules/signed/trunk/modules/signed/api/enumerators/.htaccess XoopsModules/signed/trunk/modules/signed/api/enumerators/index.php XoopsModules/signed/trunk/modules/signed/api/fields/ XoopsModules/signed/trunk/modules/signed/api/fields/.htaccess XoopsModules/signed/trunk/modules/signed/api/fields/index.php XoopsModules/signed/trunk/modules/signed/api/fieldtypes/ XoopsModules/signed/trunk/modules/signed/api/fieldtypes/.htaccess XoopsModules/signed/trunk/modules/signed/api/fieldtypes/index.php XoopsModules/signed/trunk/modules/signed/api/identifications/ XoopsModules/signed/trunk/modules/signed/api/identifications/.htaccess XoopsModules/signed/trunk/modules/signed/api/identifications/index.php XoopsModules/signed/trunk/modules/signed/api/index.php XoopsModules/signed/trunk/modules/signed/api/language/ XoopsModules/signed/trunk/modules/signed/api/language/.htaccess XoopsModules/signed/trunk/modules/signed/api/language/index.php XoopsModules/signed/trunk/modules/signed/api/languages/ XoopsModules/signed/trunk/modules/signed/api/languages/.htaccess XoopsModules/signed/trunk/modules/signed/api/languages/index.php XoopsModules/signed/trunk/modules/signed/api/processes/ XoopsModules/signed/trunk/modules/signed/api/processes/.htaccess XoopsModules/signed/trunk/modules/signed/api/processes/index.php XoopsModules/signed/trunk/modules/signed/api/prompts/ XoopsModules/signed/trunk/modules/signed/api/prompts/.htaccess XoopsModules/signed/trunk/modules/signed/api/prompts/index.php XoopsModules/signed/trunk/modules/signed/api/providers/ XoopsModules/signed/trunk/modules/signed/api/providers/.htaccess XoopsModules/signed/trunk/modules/signed/api/providers/index.php XoopsModules/signed/trunk/modules/signed/api/request/ XoopsModules/signed/trunk/modules/signed/api/request/.htaccess XoopsModules/signed/trunk/modules/signed/api/request/index.php XoopsModules/signed/trunk/modules/signed/api/sign/ XoopsModules/signed/trunk/modules/signed/api/sign/.htaccess XoopsModules/signed/trunk/modules/signed/api/sign/index.php XoopsModules/signed/trunk/modules/signed/api/signatures/ XoopsModules/signed/trunk/modules/signed/api/signatures/.htaccess XoopsModules/signed/trunk/modules/signed/api/signatures/index.php XoopsModules/signed/trunk/modules/signed/api/sites/ XoopsModules/signed/trunk/modules/signed/api/sites/.htaccess XoopsModules/signed/trunk/modules/signed/api/sites/index.php XoopsModules/signed/trunk/modules/signed/api/states/ XoopsModules/signed/trunk/modules/signed/api/states/.htaccess XoopsModules/signed/trunk/modules/signed/api/states/index.php XoopsModules/signed/trunk/modules/signed/api/validate.php XoopsModules/signed/trunk/modules/signed/api/validations/ XoopsModules/signed/trunk/modules/signed/api/validations/.htaccess XoopsModules/signed/trunk/modules/signed/api/validations/index.php XoopsModules/signed/trunk/modules/signed/api/verification/ XoopsModules/signed/trunk/modules/signed/api/verification/.htaccess XoopsModules/signed/trunk/modules/signed/api/verification/index.php XoopsModules/signed/trunk/modules/signed/api/verify/ XoopsModules/signed/trunk/modules/signed/api/verify/.htaccess XoopsModules/signed/trunk/modules/signed/api/verify/index.php XoopsModules/signed/trunk/modules/signed/class/ XoopsModules/signed/trunk/modules/signed/class/cache/ XoopsModules/signed/trunk/modules/signed/class/cache/apc.php XoopsModules/signed/trunk/modules/signed/class/cache/file.php XoopsModules/signed/trunk/modules/signed/class/cache/index.html XoopsModules/signed/trunk/modules/signed/class/cache/memcache.php XoopsModules/signed/trunk/modules/signed/class/cache/model.php XoopsModules/signed/trunk/modules/signed/class/cache/signedcache.php XoopsModules/signed/trunk/modules/signed/class/cache/xcache.php XoopsModules/signed/trunk/modules/signed/class/captcha/ XoopsModules/signed/trunk/modules/signed/class/captcha/index.html XoopsModules/signed/trunk/modules/signed/class/captcha/signedcaptcha.php XoopsModules/signed/trunk/modules/signed/class/cryptus/ XoopsModules/signed/trunk/modules/signed/class/cryptus/aesctr/ XoopsModules/signed/trunk/modules/signed/class/cryptus/aesctr/aes.class.php XoopsModules/signed/trunk/modules/signed/class/cryptus/aesctr/aesctr.class.php XoopsModules/signed/trunk/modules/signed/class/cryptus/aesctr/aesctr.php XoopsModules/signed/trunk/modules/signed/class/cryptus/aesctr/index.html XoopsModules/signed/trunk/modules/signed/class/cryptus/cryptus.php XoopsModules/signed/trunk/modules/signed/class/cryptus/index.html XoopsModules/signed/trunk/modules/signed/class/cryptus/mcrypt/ XoopsModules/signed/trunk/modules/signed/class/cryptus/mcrypt/index.html XoopsModules/signed/trunk/modules/signed/class/cryptus/mcrypt/mcrypt.php XoopsModules/signed/trunk/modules/signed/class/cryptus/mysql/ XoopsModules/signed/trunk/modules/signed/class/cryptus/mysql/index.html XoopsModules/signed/trunk/modules/signed/class/cryptus/mysql/mysql.php XoopsModules/signed/trunk/modules/signed/class/cryptus/openssl/ XoopsModules/signed/trunk/modules/signed/class/cryptus/openssl/index.html XoopsModules/signed/trunk/modules/signed/class/cryptus/openssl/openssl.php XoopsModules/signed/trunk/modules/signed/class/cryptus/rsa-openssl/ XoopsModules/signed/trunk/modules/signed/class/cryptus/rsa-openssl/index.html XoopsModules/signed/trunk/modules/signed/class/cryptus/rsa-openssl/rsa-openssl.php XoopsModules/signed/trunk/modules/signed/class/event_links.php XoopsModules/signed/trunk/modules/signed/class/events.php XoopsModules/signed/trunk/modules/signed/class/file/ XoopsModules/signed/trunk/modules/signed/class/file/index.html XoopsModules/signed/trunk/modules/signed/class/file/signedfile.php XoopsModules/signed/trunk/modules/signed/class/index.html XoopsModules/signed/trunk/modules/signed/class/mail/ XoopsModules/signed/trunk/modules/signed/class/mail/index.html XoopsModules/signed/trunk/modules/signed/class/mail/signedmultimailer.php XoopsModules/signed/trunk/modules/signed/class/mobile/ XoopsModules/signed/trunk/modules/signed/class/mobile/handlers/ XoopsModules/signed/trunk/modules/signed/class/mobile/handlers/index.html XoopsModules/signed/trunk/modules/signed/class/mobile/handlers/sms.cardboardfish.php XoopsModules/signed/trunk/modules/signed/class/mobile/index.html XoopsModules/signed/trunk/modules/signed/class/mobile/plugin/ XoopsModules/signed/trunk/modules/signed/class/mobile/plugin/index.html XoopsModules/signed/trunk/modules/signed/class/mobile/signedsmscontroller.php XoopsModules/signed/trunk/modules/signed/class/mobile/signedsmsmobile.php XoopsModules/signed/trunk/modules/signed/class/signatures.php XoopsModules/signed/trunk/modules/signed/class/signedapi.php XoopsModules/signed/trunk/modules/signed/class/signedarrays.php XoopsModules/signed/trunk/modules/signed/class/signedcanvas.php XoopsModules/signed/trunk/modules/signed/class/signedciphers.php XoopsModules/signed/trunk/modules/signed/class/signedcryptus.php XoopsModules/signed/trunk/modules/signed/class/signededitor/ XoopsModules/signed/trunk/modules/signed/class/signededitor/index.html XoopsModules/signed/trunk/modules/signed/class/signededitor/readme.txt XoopsModules/signed/trunk/modules/signed/class/signededitor/signededitor.php XoopsModules/signed/trunk/modules/signed/class/signedform/ XoopsModules/signed/trunk/modules/signed/class/signedform/form.php XoopsModules/signed/trunk/modules/signed/class/signedform/formbutton.php XoopsModules/signed/trunk/modules/signed/class/signedform/formbuttontray.php XoopsModules/signed/trunk/modules/signed/class/signedform/formcaptcha.php XoopsModules/signed/trunk/modules/signed/class/signedform/formcheckbox.php XoopsModules/signed/trunk/modules/signed/class/signedform/formcolorpicker.php XoopsModules/signed/trunk/modules/signed/class/signedform/formdatetime.php XoopsModules/signed/trunk/modules/signed/class/signedform/formdhtmltextarea.php XoopsModules/signed/trunk/modules/signed/class/signedform/formeditor.php XoopsModules/signed/trunk/modules/signed/class/signedform/formelement.php XoopsModules/signed/trunk/modules/signed/class/signedform/formelementtray.php XoopsModules/signed/trunk/modules/signed/class/signedform/formfile.php XoopsModules/signed/trunk/modules/signed/class/signedform/formhidden.php XoopsModules/signed/trunk/modules/signed/class/signedform/formhiddentoken.php XoopsModules/signed/trunk/modules/signed/class/signedform/formlabel.php XoopsModules/signed/trunk/modules/signed/class/signedform/formpassword.php XoopsModules/signed/trunk/modules/signed/class/signedform/formradio.php XoopsModules/signed/trunk/modules/signed/class/signedform/formradioyn.php XoopsModules/signed/trunk/modules/signed/class/signedform/formselect.php XoopsModules/signed/trunk/modules/signed/class/signedform/formselectcheckgroup.php XoopsModules/signed/trunk/modules/signed/class/signedform/formselectcountry.php XoopsModules/signed/trunk/modules/signed/class/signedform/formselecteditor.php XoopsModules/signed/trunk/modules/signed/class/signedform/formselectenumerator.php XoopsModules/signed/trunk/modules/signed/class/signedform/formselectmatchoption.php XoopsModules/signed/trunk/modules/signed/class/signedform/formselectmonths.php XoopsModules/signed/trunk/modules/signed/class/signedform/formselecttimezone.php XoopsModules/signed/trunk/modules/signed/class/signedform/formselectyears.php XoopsModules/signed/trunk/modules/signed/class/signedform/formtext.php XoopsModules/signed/trunk/modules/signed/class/signedform/formtextarea.php XoopsModules/signed/trunk/modules/signed/class/signedform/formtextdateselect.php XoopsModules/signed/trunk/modules/signed/class/signedform/index.html XoopsModules/signed/trunk/modules/signed/class/signedform/simpleform.php XoopsModules/signed/trunk/modules/signed/class/signedform/tableform.php XoopsModules/signed/trunk/modules/signed/class/signedform/themeform.php XoopsModules/signed/trunk/modules/signed/class/signedformloader.php XoopsModules/signed/trunk/modules/signed/class/signedlists.php XoopsModules/signed/trunk/modules/signed/class/signedlogger.php XoopsModules/signed/trunk/modules/signed/class/signedmailer.php XoopsModules/signed/trunk/modules/signed/class/signedmobile.php XoopsModules/signed/trunk/modules/signed/class/signedobject.php XoopsModules/signed/trunk/modules/signed/class/signedpackages.php XoopsModules/signed/trunk/modules/signed/class/signedprocesses.php XoopsModules/signed/trunk/modules/signed/class/signedprompts.php XoopsModules/signed/trunk/modules/signed/class/signedsecurity.php XoopsModules/signed/trunk/modules/signed/class/signedsession.php XoopsModules/signed/trunk/modules/signed/class/signedstorage.php XoopsModules/signed/trunk/modules/signed/class/uploader.php XoopsModules/signed/trunk/modules/signed/class/wideimage/ XoopsModules/signed/trunk/modules/signed/class/wideimage/Canvas.php XoopsModules/signed/trunk/modules/signed/class/wideimage/Coordinate.php XoopsModules/signed/trunk/modules/signed/class/wideimage/Exception.php XoopsModules/signed/trunk/modules/signed/class/wideimage/Font/ XoopsModules/signed/trunk/modules/signed/class/wideimage/Font/GDF.php XoopsModules/signed/trunk/modules/signed/class/wideimage/Font/PS.php XoopsModules/signed/trunk/modules/signed/class/wideimage/Font/TTF.php XoopsModules/signed/trunk/modules/signed/class/wideimage/Image.php XoopsModules/signed/trunk/modules/signed/class/wideimage/Mapper/ XoopsModules/signed/trunk/modules/signed/class/wideimage/Mapper/BMP.php XoopsModules/signed/trunk/modules/signed/class/wideimage/Mapper/GD.php XoopsModules/signed/trunk/modules/signed/class/wideimage/Mapper/GD2.php XoopsModules/signed/trunk/modules/signed/class/wideimage/Mapper/GIF.php XoopsModules/signed/trunk/modules/signed/class/wideimage/Mapper/JPEG.php XoopsModules/signed/trunk/modules/signed/class/wideimage/Mapper/PNG.php XoopsModules/signed/trunk/modules/signed/class/wideimage/Mapper/TGA.php XoopsModules/signed/trunk/modules/signed/class/wideimage/MapperFactory.php XoopsModules/signed/trunk/modules/signed/class/wideimage/Operation/ XoopsModules/signed/trunk/modules/signed/class/wideimage/Operation/AddNoise.php XoopsModules/signed/trunk/modules/signed/class/wideimage/Operation/ApplyConvolution.php XoopsModules/signed/trunk/modules/signed/class/wideimage/Operation/ApplyFilter.php XoopsModules/signed/trunk/modules/signed/class/wideimage/Operation/ApplyMask.php XoopsModules/signed/trunk/modules/signed/class/wideimage/Operation/AsGrayscale.php XoopsModules/signed/trunk/modules/signed/class/wideimage/Operation/AsNegative.php XoopsModules/signed/trunk/modules/signed/class/wideimage/Operation/AutoCrop.php XoopsModules/signed/trunk/modules/signed/class/wideimage/Operation/CopyChannelsPalette.php XoopsModules/signed/trunk/modules/signed/class/wideimage/Operation/CopyChannelsTrueColor.php XoopsModules/signed/trunk/modules/signed/class/wideimage/Operation/CorrectGamma.php XoopsModules/signed/trunk/modules/signed/class/wideimage/Operation/Crop.php XoopsModules/signed/trunk/modules/signed/class/wideimage/Operation/Flip.php XoopsModules/signed/trunk/modules/signed/class/wideimage/Operation/GetMask.php XoopsModules/signed/trunk/modules/signed/class/wideimage/Operation/Merge.php XoopsModules/signed/trunk/modules/signed/class/wideimage/Operation/Mirror.php XoopsModules/signed/trunk/modules/signed/class/wideimage/Operation/Resize.php XoopsModules/signed/trunk/modules/signed/class/wideimage/Operation/ResizeCanvas.php XoopsModules/signed/trunk/modules/signed/class/wideimage/Operation/Rotate.php XoopsModules/signed/trunk/modules/signed/class/wideimage/Operation/RoundCorners.php XoopsModules/signed/trunk/modules/signed/class/wideimage/Operation/Unsharp.php XoopsModules/signed/trunk/modules/signed/class/wideimage/OperationFactory.php XoopsModules/signed/trunk/modules/signed/class/wideimage/PaletteImage.php XoopsModules/signed/trunk/modules/signed/class/wideimage/TrueColorImage.php XoopsModules/signed/trunk/modules/signed/class/wideimage/WideImage.php XoopsModules/signed/trunk/modules/signed/class/wideimage/index.html XoopsModules/signed/trunk/modules/signed/class/wideimage/vendor/ XoopsModules/signed/trunk/modules/signed/class/wideimage/vendor/de77/ XoopsModules/signed/trunk/modules/signed/class/wideimage/vendor/de77/BMP.php XoopsModules/signed/trunk/modules/signed/class/wideimage/vendor/de77/TGA.php XoopsModules/signed/trunk/modules/signed/class/xcp/ XoopsModules/signed/trunk/modules/signed/class/xcp/.htaccess XoopsModules/signed/trunk/modules/signed/class/xcp/XCP-Logo.png XoopsModules/signed/trunk/modules/signed/class/xcp/XCP-Logo.psd XoopsModules/signed/trunk/modules/signed/class/xcp/XCP-Logo.xcf XoopsModules/signed/trunk/modules/signed/class/xcp/debug_base.php XoopsModules/signed/trunk/modules/signed/class/xcp/debug_enumerator.php XoopsModules/signed/trunk/modules/signed/class/xcp/debug_leaver.php XoopsModules/signed/trunk/modules/signed/class/xcp/index.php XoopsModules/signed/trunk/modules/signed/class/xcp/xcp.base.php XoopsModules/signed/trunk/modules/signed/class/xcp/xcp.class.php XoopsModules/signed/trunk/modules/signed/class/xcp/xcp.enumerator.php XoopsModules/signed/trunk/modules/signed/class/xcp/xcp.leaver.php XoopsModules/signed/trunk/modules/signed/class/xmlarray.php XoopsModules/signed/trunk/modules/signed/class/xmlwrapper.php XoopsModules/signed/trunk/modules/signed/crons/ XoopsModules/signed/trunk/modules/signed/crons/.htaccess XoopsModules/signed/trunk/modules/signed/crons/callbacks.php XoopsModules/signed/trunk/modules/signed/crons/expires.php XoopsModules/signed/trunk/modules/signed/crons/expiry.php XoopsModules/signed/trunk/modules/signed/crons/index.html XoopsModules/signed/trunk/modules/signed/crons/request.php XoopsModules/signed/trunk/modules/signed/css/ XoopsModules/signed/trunk/modules/signed/css/calendar-blue.css XoopsModules/signed/trunk/modules/signed/css/index.html XoopsModules/signed/trunk/modules/signed/css/signed.css XoopsModules/signed/trunk/modules/signed/css/style.css XoopsModules/signed/trunk/modules/signed/dojsonids.php XoopsModules/signed/trunk/modules/signed/dojsonoperations.php XoopsModules/signed/trunk/modules/signed/fonts/ XoopsModules/signed/trunk/modules/signed/fonts/index.html XoopsModules/signed/trunk/modules/signed/footer.php XoopsModules/signed/trunk/modules/signed/generator.php XoopsModules/signed/trunk/modules/signed/go/ XoopsModules/signed/trunk/modules/signed/go/.htaccess XoopsModules/signed/trunk/modules/signed/go/index.php XoopsModules/signed/trunk/modules/signed/header.php XoopsModules/signed/trunk/modules/signed/image/ XoopsModules/signed/trunk/modules/signed/image/icons/ XoopsModules/signed/trunk/modules/signed/image/icons/16/ XoopsModules/signed/trunk/modules/signed/image/icons/16/index.html XoopsModules/signed/trunk/modules/signed/image/icons/32/ XoopsModules/signed/trunk/modules/signed/image/icons/32/about.png XoopsModules/signed/trunk/modules/signed/image/icons/32/event.png XoopsModules/signed/trunk/modules/signed/image/icons/32/identity.png XoopsModules/signed/trunk/modules/signed/image/icons/32/index.html XoopsModules/signed/trunk/modules/signed/image/icons/32/security.png XoopsModules/signed/trunk/modules/signed/image/icons/index.html XoopsModules/signed/trunk/modules/signed/image/index.html XoopsModules/signed/trunk/modules/signed/image/signed.png XoopsModules/signed/trunk/modules/signed/image/watermark.gif XoopsModules/signed/trunk/modules/signed/image/watermark.php XoopsModules/signed/trunk/modules/signed/include/ XoopsModules/signed/trunk/modules/signed/include/blowfish-salt.php XoopsModules/signed/trunk/modules/signed/include/common.php XoopsModules/signed/trunk/modules/signed/include/configs.php XoopsModules/signed/trunk/modules/signed/include/constants.php XoopsModules/signed/trunk/modules/signed/include/form-edit-object.php XoopsModules/signed/trunk/modules/signed/include/form-generic-edit-form.php XoopsModules/signed/trunk/modules/signed/include/form-generic-form.php XoopsModules/signed/trunk/modules/signed/include/form-identification-edit-form.php XoopsModules/signed/trunk/modules/signed/include/form-identification-form.php XoopsModules/signed/trunk/modules/signed/include/form-object.php XoopsModules/signed/trunk/modules/signed/include/functions.php XoopsModules/signed/trunk/modules/signed/include/index.html XoopsModules/signed/trunk/modules/signed/include/language.php XoopsModules/signed/trunk/modules/signed/index.php XoopsModules/signed/trunk/modules/signed/js/ XoopsModules/signed/trunk/modules/signed/js/calendar.js XoopsModules/signed/trunk/modules/signed/js/color-picker.js XoopsModules/signed/trunk/modules/signed/js/formdhtmltextarea.js XoopsModules/signed/trunk/modules/signed/js/index.html XoopsModules/signed/trunk/modules/signed/js/json.validation.js XoopsModules/signed/trunk/modules/signed/js/layersmenu.js XoopsModules/signed/trunk/modules/signed/js/signed.js XoopsModules/signed/trunk/modules/signed/language/ XoopsModules/signed/trunk/modules/signed/language/english/ XoopsModules/signed/trunk/modules/signed/language/english/admin.php XoopsModules/signed/trunk/modules/signed/language/english/calendar.php XoopsModules/signed/trunk/modules/signed/language/english/captcha.php XoopsModules/signed/trunk/modules/signed/language/english/content.php XoopsModules/signed/trunk/modules/signed/language/english/countries.php XoopsModules/signed/trunk/modules/signed/language/english/errors.php XoopsModules/signed/trunk/modules/signed/language/english/formdhtmltextarea.php XoopsModules/signed/trunk/modules/signed/language/english/global.php XoopsModules/signed/trunk/modules/signed/language/english/help/ XoopsModules/signed/trunk/modules/signed/language/english/help/help.html XoopsModules/signed/trunk/modules/signed/language/english/help/index.html XoopsModules/signed/trunk/modules/signed/language/english/index.html XoopsModules/signed/trunk/modules/signed/language/english/mail.php XoopsModules/signed/trunk/modules/signed/language/english/mail_template/ XoopsModules/signed/trunk/modules/signed/language/english/mail_template/html/ XoopsModules/signed/trunk/modules/signed/language/english/mail_template/html/expired-identification.html XoopsModules/signed/trunk/modules/signed/language/english/mail_template/html/expired-signature.html XoopsModules/signed/trunk/modules/signed/language/english/mail_template/html/index.html XoopsModules/signed/trunk/modules/signed/language/english/mail_template/html/signature-email.html XoopsModules/signed/trunk/modules/signed/language/english/mail_template/html/update-request.html XoopsModules/signed/trunk/modules/signed/language/english/mail_template/html/verify-email.html XoopsModules/signed/trunk/modules/signed/language/english/mail_template/index.html XoopsModules/signed/trunk/modules/signed/language/english/mail_template/text/ XoopsModules/signed/trunk/modules/signed/language/english/mail_template/text/expired-identification.txt XoopsModules/signed/trunk/modules/signed/language/english/mail_template/text/expired-signature.txt XoopsModules/signed/trunk/modules/signed/language/english/mail_template/text/index.html XoopsModules/signed/trunk/modules/signed/language/english/mail_template/text/signature-email.txt XoopsModules/signed/trunk/modules/signed/language/english/mail_template/text/update-request.txt XoopsModules/signed/trunk/modules/signed/language/english/mail_template/text/verify-email.txt XoopsModules/signed/trunk/modules/signed/language/english/main.php XoopsModules/signed/trunk/modules/signed/language/english/modinfo.php XoopsModules/signed/trunk/modules/signed/language/english/months.php XoopsModules/signed/trunk/modules/signed/language/english/signedmailerlocal.php XoopsModules/signed/trunk/modules/signed/language/english/signedmobilelocal.php XoopsModules/signed/trunk/modules/signed/language/english/sms_template/ XoopsModules/signed/trunk/modules/signed/language/english/sms_template/index.html XoopsModules/signed/trunk/modules/signed/language/english/sms_template/verify-mobile.txt XoopsModules/signed/trunk/modules/signed/language/english/style.css XoopsModules/signed/trunk/modules/signed/language/english/timezone.php XoopsModules/signed/trunk/modules/signed/language/english/titles.php XoopsModules/signed/trunk/modules/signed/language/english/uploader.php XoopsModules/signed/trunk/modules/signed/language/index.html XoopsModules/signed/trunk/modules/signed/preloads/ XoopsModules/signed/trunk/modules/signed/preloads/api.php XoopsModules/signed/trunk/modules/signed/preloads/index.html XoopsModules/signed/trunk/modules/signed/request.php XoopsModules/signed/trunk/modules/signed/reset.php XoopsModules/signed/trunk/modules/signed/sql/ XoopsModules/signed/trunk/modules/signed/sql/index.html XoopsModules/signed/trunk/modules/signed/sql/mysql.sql XoopsModules/signed/trunk/modules/signed/templates/ XoopsModules/signed/trunk/modules/signed/templates/admin/ XoopsModules/signed/trunk/modules/signed/templates/admin/index.html XoopsModules/signed/trunk/modules/signed/templates/admin/signed_events.html XoopsModules/signed/trunk/modules/signed/templates/admin/signed_signatures.html XoopsModules/signed/trunk/modules/signed/templates/common/ XoopsModules/signed/trunk/modules/signed/templates/common/api.php XoopsModules/signed/trunk/modules/signed/templates/common/canvas.php XoopsModules/signed/trunk/modules/signed/templates/common/index.html XoopsModules/signed/trunk/modules/signed/templates/common/no-url.php XoopsModules/signed/trunk/modules/signed/templates/common/reset.php XoopsModules/signed/trunk/modules/signed/templates/common/start.php XoopsModules/signed/trunk/modules/signed/templates/common/update-identification.php XoopsModules/signed/trunk/modules/signed/templates/common/verify-email.php XoopsModules/signed/trunk/modules/signed/templates/common/verify-mobile.php XoopsModules/signed/trunk/modules/signed/templates/deployed/ XoopsModules/signed/trunk/modules/signed/templates/deployed/entity/ XoopsModules/signed/trunk/modules/signed/templates/deployed/entity/index.html XoopsModules/signed/trunk/modules/signed/templates/deployed/entity/send-email.php XoopsModules/signed/trunk/modules/signed/templates/deployed/entity/update-email.php XoopsModules/signed/trunk/modules/signed/templates/deployed/index.html XoopsModules/signed/trunk/modules/signed/templates/deployed/personal/ XoopsModules/signed/trunk/modules/signed/templates/deployed/personal/index.html XoopsModules/signed/trunk/modules/signed/templates/deployed/personal/send-email.php XoopsModules/signed/trunk/modules/signed/templates/deployed/personal/update-email.php XoopsModules/signed/trunk/modules/signed/templates/fields/ XoopsModules/signed/trunk/modules/signed/templates/fields/entity/ XoopsModules/signed/trunk/modules/signed/templates/fields/entity/generic-edit-form.php XoopsModules/signed/trunk/modules/signed/templates/fields/entity/generic-form.php XoopsModules/signed/trunk/modules/signed/templates/fields/entity/index.html XoopsModules/signed/trunk/modules/signed/templates/fields/identification/ XoopsModules/signed/trunk/modules/signed/templates/fields/identification/identification-edit-form.php XoopsModules/signed/trunk/modules/signed/templates/fields/identification/identification-form.php XoopsModules/signed/trunk/modules/signed/templates/fields/identification/index.html XoopsModules/signed/trunk/modules/signed/templates/fields/index.html XoopsModules/signed/trunk/modules/signed/templates/fields/personal/ XoopsModules/signed/trunk/modules/signed/templates/fields/personal/generic-edit-form.php XoopsModules/signed/trunk/modules/signed/templates/fields/personal/generic-form.php XoopsModules/signed/trunk/modules/signed/templates/fields/personal/index.html XoopsModules/signed/trunk/modules/signed/templates/help/ XoopsModules/signed/trunk/modules/signed/templates/help/entity/ XoopsModules/signed/trunk/modules/signed/templates/help/entity/finished.php XoopsModules/signed/trunk/modules/signed/templates/help/entity/index.html XoopsModules/signed/trunk/modules/signed/templates/help/entity/introduction.php XoopsModules/signed/trunk/modules/signed/templates/help/identification/ XoopsModules/signed/trunk/modules/signed/templates/help/identification/finished-update.php XoopsModules/signed/trunk/modules/signed/templates/help/identification/index.html XoopsModules/signed/trunk/modules/signed/templates/help/identification/needed.php XoopsModules/signed/trunk/modules/signed/templates/help/index.html XoopsModules/signed/trunk/modules/signed/templates/help/personal/ XoopsModules/signed/trunk/modules/signed/templates/help/personal/finished.php XoopsModules/signed/trunk/modules/signed/templates/help/personal/index.html XoopsModules/signed/trunk/modules/signed/templates/help/personal/introduction.php XoopsModules/signed/trunk/modules/signed/templates/index.html XoopsModules/signed/trunk/modules/signed/templates/signed_wrapper.html XoopsModules/signed/trunk/modules/signed/templates/update/ XoopsModules/signed/trunk/modules/signed/templates/update/identification/ XoopsModules/signed/trunk/modules/signed/templates/update/identification/identification-form.php XoopsModules/signed/trunk/modules/signed/templates/update/identification/index.html XoopsModules/signed/trunk/modules/signed/templates/update/index.html XoopsModules/signed/trunk/modules/signed/updator.php XoopsModules/signed/trunk/modules/signed/verifor.php XoopsModules/signed/trunk/modules/signed/xoops_version.php XoopsModules/signed/trunk/xoops_data/ XoopsModules/signed/trunk/xoops_data/.buildpath XoopsModules/signed/trunk/xoops_data/.htaccess XoopsModules/signed/trunk/xoops_data/.project XoopsModules/signed/trunk/xoops_data/.settings/ XoopsModules/signed/trunk/xoops_data/.settings/.jsdtscope XoopsModules/signed/trunk/xoops_data/.settings/org.eclipse.php.core.prefs XoopsModules/signed/trunk/xoops_data/.settings/org.eclipse.wst.jsdt.ui.superType.container XoopsModules/signed/trunk/xoops_data/.settings/org.eclipse.wst.jsdt.ui.superType.name XoopsModules/signed/trunk/xoops_data/caches/ XoopsModules/signed/trunk/xoops_data/caches/index.html XoopsModules/signed/trunk/xoops_data/caches/signed/ XoopsModules/signed/trunk/xoops_data/caches/signed/.htaccess XoopsModules/signed/trunk/xoops_data/caches/signed/index.html XoopsModules/signed/trunk/xoops_data/index.html XoopsModules/signed/trunk/xoops_data/readme.txt XoopsModules/signed/trunk/xoops_data/signed/ XoopsModules/signed/trunk/xoops_data/signed/calendar/ XoopsModules/signed/trunk/xoops_data/signed/calendar/.htaccess XoopsModules/signed/trunk/xoops_data/signed/calendar/expires/ XoopsModules/signed/trunk/xoops_data/signed/calendar/expires/index.html XoopsModules/signed/trunk/xoops_data/signed/calendar/expiry/ XoopsModules/signed/trunk/xoops_data/signed/calendar/expiry/index.html XoopsModules/signed/trunk/xoops_data/signed/calendar/generated/ XoopsModules/signed/trunk/xoops_data/signed/calendar/generated/index.html XoopsModules/signed/trunk/xoops_data/signed/calendar/index.html XoopsModules/signed/trunk/xoops_data/signed/logs/ XoopsModules/signed/trunk/xoops_data/signed/logs/.htaccess XoopsModules/signed/trunk/xoops_data/signed/logs/delivery/ XoopsModules/signed/trunk/xoops_data/signed/logs/delivery/index.html XoopsModules/signed/trunk/xoops_data/signed/logs/emails/ XoopsModules/signed/trunk/xoops_data/signed/logs/emails/index.html XoopsModules/signed/trunk/xoops_data/signed/logs/errors/ XoopsModules/signed/trunk/xoops_data/signed/logs/errors/index.html XoopsModules/signed/trunk/xoops_data/signed/logs/execution/ XoopsModules/signed/trunk/xoops_data/signed/logs/execution/index.html XoopsModules/signed/trunk/xoops_data/signed/logs/index.html XoopsModules/signed/trunk/xoops_data/signed/logs/polling/ XoopsModules/signed/trunk/xoops_data/signed/logs/polling/index.html XoopsModules/signed/trunk/xoops_data/signed/pathways/ XoopsModules/signed/trunk/xoops_data/signed/pathways/.htaccess XoopsModules/signed/trunk/xoops_data/signed/pathways/certificate/ XoopsModules/signed/trunk/xoops_data/signed/pathways/codes/ XoopsModules/signed/trunk/xoops_data/signed/pathways/dates/ XoopsModules/signed/trunk/xoops_data/signed/pathways/emails/ XoopsModules/signed/trunk/xoops_data/signed/pathways/index.html XoopsModules/signed/trunk/xoops_data/signed/pathways/names/ XoopsModules/signed/trunk/xoops_data/signed/pathways/request/ XoopsModules/signed/trunk/xoops_data/signed/pathways/serials/ XoopsModules/signed/trunk/xoops_data/signed/pathways/signed/ XoopsModules/signed/trunk/xoops_data/signed/respository/ XoopsModules/signed/trunk/xoops_data/signed/respository/.htaccess XoopsModules/signed/trunk/xoops_data/signed/respository/certificates/ XoopsModules/signed/trunk/xoops_data/signed/respository/certificates/index.html XoopsModules/signed/trunk/xoops_data/signed/respository/index.html XoopsModules/signed/trunk/xoops_data/signed/respository/signatures/ XoopsModules/signed/trunk/xoops_data/signed/respository/signatures/index.html XoopsModules/signed/trunk/xoops_data/signed/respository/signed/ XoopsModules/signed/trunk/xoops_data/signed/respository/signed/index.html XoopsModules/signed/trunk/xoops_data/signed/respository/validation/ XoopsModules/signed/trunk/xoops_data/signed/respository/validation/index.html XoopsModules/signed/trunk/xoops_data/signed/uploads/ XoopsModules/signed/trunk/xoops_data/signed/uploads/.htaccess XoopsModules/signed/trunk/xoops_data/signed/uploads/index.html XoopsModules/signed/trunk/xoops_data/signed/urls/ XoopsModules/signed/trunk/xoops_data/signed/urls/.htaccess XoopsModules/signed/trunk/xoops_data/signed/urls/index.html XoopsModules/signed/trunk/xoops_lib/ XoopsModules/signed/trunk/xoops_lib/.htaccess XoopsModules/signed/trunk/xoops_lib/index.html XoopsModules/signed/trunk/xoops_lib/modules/ XoopsModules/signed/trunk/xoops_lib/modules/index.html XoopsModules/signed/trunk/xoops_lib/modules/signed/ XoopsModules/signed/trunk/xoops_lib/modules/signed/processes/ XoopsModules/signed/trunk/xoops_lib/modules/signed/processes/.htaccess XoopsModules/signed/trunk/xoops_lib/modules/signed/processes/api-calls.txt XoopsModules/signed/trunk/xoops_lib/modules/signed/processes/apis-and-sites-available.txt XoopsModules/signed/trunk/xoops_lib/modules/signed/processes/banned-hostnames-for-urls-and-emails.txt XoopsModules/signed/trunk/xoops_lib/modules/signed/processes/banned-ips-for-urls-and-emails.txt XoopsModules/signed/trunk/xoops_lib/modules/signed/processes/certificate.txt XoopsModules/signed/trunk/xoops_lib/modules/signed/processes/emails-bcc.txt XoopsModules/signed/trunk/xoops_lib/modules/signed/processes/emails-cc.txt XoopsModules/signed/trunk/xoops_lib/modules/signed/processes/english/ XoopsModules/signed/trunk/xoops_lib/modules/signed/processes/english/class-entity.txt XoopsModules/signed/trunk/xoops_lib/modules/signed/processes/english/class-personal.txt XoopsModules/signed/trunk/xoops_lib/modules/signed/processes/english/descriptions-fields.txt XoopsModules/signed/trunk/xoops_lib/modules/signed/processes/english/email-template-types.txt XoopsModules/signed/trunk/xoops_lib/modules/signed/processes/english/enumerator-gender.txt XoopsModules/signed/trunk/xoops_lib/modules/signed/processes/english/enumerator-im-type.txt XoopsModules/signed/trunk/xoops_lib/modules/signed/processes/english/enumerator-suffix.txt XoopsModules/signed/trunk/xoops_lib/modules/signed/processes/english/enumerator-titled.txt XoopsModules/signed/trunk/xoops_lib/modules/signed/processes/english/fieldnames-countries.txt XoopsModules/signed/trunk/xoops_lib/modules/signed/processes/english/fieldnames-dates.txt XoopsModules/signed/trunk/xoops_lib/modules/signed/processes/english/fieldnames-emails.txt XoopsModules/signed/trunk/xoops_lib/modules/signed/processes/english/fieldnames-enumerators.txt XoopsModules/signed/trunk/xoops_lib/modules/signed/processes/english/fieldnames-images.txt XoopsModules/signed/trunk/xoops_lib/modules/signed/processes/english/fieldnames-logos.txt XoopsModules/signed/trunk/xoops_lib/modules/signed/processes/english/fieldnames-months.txt XoopsModules/signed/trunk/xoops_lib/modules/signed/processes/english/fieldnames-numeric.txt XoopsModules/signed/trunk/xoops_lib/modules/signed/processes/english/fieldnames-photos.txt XoopsModules/signed/trunk/xoops_lib/modules/signed/processes/english/fieldnames-strings.txt XoopsModules/signed/trunk/xoops_lib/modules/signed/processes/english/fieldnames-urls.txt XoopsModules/signed/trunk/xoops_lib/modules/signed/processes/english/fieldnames-years.txt XoopsModules/signed/trunk/xoops_lib/modules/signed/processes/english/fields-entity.txt XoopsModules/signed/trunk/xoops_lib/modules/signed/processes/english/fields-identification.txt XoopsModules/signed/trunk/xoops_lib/modules/signed/processes/english/fields-personal.txt XoopsModules/signed/trunk/xoops_lib/modules/signed/processes/english/identifications-entity.txt XoopsModules/signed/trunk/xoops_lib/modules/signed/processes/english/identifications-personal.txt XoopsModules/signed/trunk/xoops_lib/modules/signed/processes/english/language-files-entity.txt XoopsModules/signed/trunk/xoops_lib/modules/signed/processes/english/language-files-personal.txt XoopsModules/signed/trunk/xoops_lib/modules/signed/processes/english/prompts-entity.txt XoopsModules/signed/trunk/xoops_lib/modules/signed/processes/english/prompts-personal.txt XoopsModules/signed/trunk/xoops_lib/modules/signed/processes/english/prompts-request-entity.txt XoopsModules/signed/trunk/xoops_lib/modules/signed/processes/english/prompts-request-personal.txt XoopsModules/signed/trunk/xoops_lib/modules/signed/processes/english/provided-entity.txt XoopsModules/signed/trunk/xoops_lib/modules/signed/processes/english/provided-personal.txt XoopsModules/signed/trunk/xoops_lib/modules/signed/processes/english/request-states.txt XoopsModules/signed/trunk/xoops_lib/modules/signed/processes/english/resize-dimensions.txt XoopsModules/signed/trunk/xoops_lib/modules/signed/processes/english/signatures.txt XoopsModules/signed/trunk/xoops_lib/modules/signed/processes/english/upload-dimensions.txt XoopsModules/signed/trunk/xoops_lib/modules/signed/processes/english/validations-entity.txt XoopsModules/signed/trunk/xoops_lib/modules/signed/processes/english/validations-personal.txt XoopsModules/signed/trunk/xoops_lib/modules/signed/processes/english/watermark.gif XoopsModules/signed/trunk/xoops_lib/modules/signed/processes/index.html XoopsModules/signed/trunk/xoops_lib/modules/signed/processes/language-files.txt XoopsModules/signed/trunk/xoops_lib/modules/signed/processes/languages.txt XoopsModules/signed/trunk/xoops_lib/modules/signed/processes/paired-peer-review-services.txt XoopsModules/signed/trunk/xoops_lib/modules/signed/processes/si...@la....txt Added: XoopsModules/signed/trunk/modules/index.html =================================================================== --- XoopsModules/signed/trunk/modules/index.html (rev 0) +++ XoopsModules/signed/trunk/modules/index.html 2015-06-09 02:59:11 UTC (rev 13084) @@ -0,0 +1 @@ + <script>history.go(-1);</script> \ No newline at end of file Added: XoopsModules/signed/trunk/modules/signed/.htaccess =================================================================== --- XoopsModules/signed/trunk/modules/signed/.htaccess (rev 0) +++ XoopsModules/signed/trunk/modules/signed/.htaccess 2015-06-09 02:59:11 UTC (rev 13084) @@ -0,0 +1,10 @@ +<IfModule mod_rewrite.c> + + RewriteEngine On + RewriteRule ^=([a-zA-Z0-9]+)=/ $1.php + RewriteRule ^=([a-zA-Z0-9]+)=/finished/([a-zA-Z0-9]+).(.*?)$ $1.php?op=finished&serial=$2 + RewriteRule ^=([a-zA-Z0-9]+)=/index(.*?)?(.*?)$ $1.php?$3 + RewriteRule ^=([a-zA-Z0-9]+)=/index(.*?)$ $1.php + RewriteRule ^=([a-zA-Z0-9]+)=/?(.*?)$ $1.php?$2 + +</IfModule> Property changes on: XoopsModules/signed/trunk/modules/signed/.htaccess ___________________________________________________________________ Added: svn:executable ## -0,0 +1 ## +* \ No newline at end of property Added: XoopsModules/signed/trunk/modules/signed/admin/about.php =================================================================== --- XoopsModules/signed/trunk/modules/signed/admin/about.php (rev 0) +++ XoopsModules/signed/trunk/modules/signed/admin/about.php 2015-06-09 02:59:11 UTC (rev 13084) @@ -0,0 +1,34 @@ +<?php +/** + * Chronolabs Digital Signature Generation & API Services (Psuedo-legal correct binding measure) + * + * 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. + * + * @copyright Chronolabs Cooperative http://labs.coop + * @license General Software Licence (https://web.labs.coop/public/legal/general-software-license/10,3.html) + * @package signed + * @since 2.07 + * @author Simon Roberts <wis...@us...> + * @author Leshy Cipherhouse <le...@sl...> + * @subpackage administration + * @description Digital Signature Generation & API Services (Psuedo-legal correct binding measure) + * @link https://signed.labs.coop Digital Signature Generation & API Services (Psuedo-legal correct binding measure) + */ + + include_once dirname(__FILE__) . '/../../../include/cp_header.php'; + include '../../../class/xoopsformloader.php'; + include_once dirname(__FILE__) . '/admin_header.php'; + xoops_cp_header(); + + $aboutAdmin = new ModuleAdmin(); + + echo $aboutAdmin->addNavigation('about.php'); + echo $aboutAdmin->renderabout('-------------', false); + + include_once dirname(__FILE__) . '/admin_footer.php'; +?> \ No newline at end of file Property changes on: XoopsModules/signed/trunk/modules/signed/admin/about.php ___________________________________________________________________ Added: svn:executable ## -0,0 +1 ## +* \ No newline at end of property Added: XoopsModules/signed/trunk/modules/signed/admin/admin.php =================================================================== --- XoopsModules/signed/trunk/modules/signed/admin/admin.php (rev 0) +++ XoopsModules/signed/trunk/modules/signed/admin/admin.php 2015-06-09 02:59:11 UTC (rev 13084) @@ -0,0 +1,77 @@ +<?php +/** + * Chronolabs Digital Signature Generation & API Services (Psuedo-legal correct binding measure) + * + * 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. + * + * @copyright Chronolabs Cooperative http://labs.coop + * @license General Software Licence (https://web.labs.coop/public/legal/general-software-license/10,3.html) + * @package signed + * @since 2.07 + * @author Simon Roberts <wis...@us...> + * @author Leshy Cipherhouse <le...@sl...> + * @subpackage administration + * @description Digital Signature Generation & API Services (Psuedo-legal correct binding measure) + * @link https://signed.labs.coop Digital Signature Generation & API Services (Psuedo-legal correct binding measure) + */ + + include_once dirname(__FILE__) . '/admin_header.php'; + xoops_cp_header(); + + $indexAdmin = new ModuleAdmin(); + + echo $indexAdmin->addNavigation('admin.php'); + $signaturesHandler = xoops_getmodulehandler('signatures', 'signed'); + + $indexAdmin->addInfoBox(_SIGNED_AM_DASHBOARD); + $indexAdmin->addInfoBoxLine(_SIGNED_AM_DASHBOARD, "<infolabel>" ._SIGNED_AM_TOTAL. "</infolabel>", $signaturesHandler->getCount(new Criteria('1', '1')), 'Green'); + $indexAdmin->addInfoBoxLine(_SIGNED_AM_DASHBOARD, "<infolabel>" ._SIGNED_AM_PROGRESS. "</infolabel>", $signaturesHandler->getCount(new Criteria('state', 'progress')), 'Purple'); + $indexAdmin->addInfoBoxLine(_SIGNED_AM_DASHBOARD, "<infolabel>" ._SIGNED_AM_ACTIVE. "</infolabel>", $signaturesHandler->getCount(new Criteria('state', 'active')), 'Blue'); + $indexAdmin->addInfoBoxLine(_SIGNED_AM_DASHBOARD, "<infolabel>" ._SIGNED_AM_INACTIVE. "</infolabel>", $signaturesHandler->getCount(new Criteria('state', 'inactive'))."</infotext>", 'Orange'); + $criteria = new CriteriaCompo(new Criteria('state', 'active')); + $criteria->add(new Criteria('expires', time(), '>=')); + $criteria->add(new Criteria('expires', time() + (3600 * 24 * 7), '<=')); + $indexAdmin->addInfoBoxLine(_SIGNED_AM_DASHBOARD, "<infolabel>" ._SIGNED_AM_EXPIRE_NEXT_WEEK. "</infolabel>", $signaturesHandler->getCount($criteria), 'Red'); + $criteria = new CriteriaCompo(new Criteria('state', 'active')); + $criteria->add(new Criteria('expires', time(), '>=')); + $criteria->add(new Criteria('expires', time() + (3600 * 24 * 14), '<=')); + $indexAdmin->addInfoBoxLine(_SIGNED_AM_DASHBOARD, "<infolabel>" ._SIGNED_AM_EXPIRE_NEXT_FORTNIGHT. "</infolabel>", $signaturesHandler->getCount($criteria), 'Red'); + $criteria = new CriteriaCompo(new Criteria('1', '1')); + $criteria->add(new Criteria('expires', 0, '>')); + $criteria->add(new Criteria('expires', time(), '<=')); + $indexAdmin->addInfoBoxLine(_SIGNED_AM_DASHBOARD, "<infolabel>" ._SIGNED_AM_EXPIRED. "</infolabel>", $signaturesHandler->getCount($criteria), 'Red'); + $criteria = new CriteriaCompo(new Criteria('1', '1')); + $criteria->add(new Criteria('issued', time(), '<=')); + $criteria->add(new Criteria('issued', time() - (3600 * 24 * 7), '>=')); + $indexAdmin->addInfoBoxLine(_SIGNED_AM_DASHBOARD, "<infolabel>" ._SIGNED_AM_ISSUED_LAST_WEEK. "</infolabel>", $signaturesHandler->getCount($criteria), 'Green'); + $criteria = new CriteriaCompo(new Criteria('1', '1')); + $criteria->add(new Criteria('saved', time(), '<=')); + $criteria->add(new Criteria('saved', time() - (3600 * 24 * 7), '>=')); + $indexAdmin->addInfoBoxLine(_SIGNED_AM_DASHBOARD, "<infolabel>" ._SIGNED_AM_CREATED_LAST_WEEK. "</infolabel>", $signaturesHandler->getCount($criteria), 'Cyan'); + $criteria = new CriteriaCompo(new Criteria('1', '1')); + $criteria->add(new Criteria('used', time(), '<=')); + $criteria->add(new Criteria('used', time() - (3600 * 24 * 7), '>=')); + $indexAdmin->addInfoBoxLine(_SIGNED_AM_DASHBOARD, "<infolabel>" ._SIGNED_AM_ACCESSED_LAST_WEEK. "</infolabel>", $signaturesHandler->getCount($criteria), 'Black'); + $criteria = new CriteriaCompo(new Criteria('1', '1')); + $criteria->add(new Criteria('issued', time(), '<=')); + $criteria->add(new Criteria('issued', time() - (3600 * 24 * 14), '>=')); + $indexAdmin->addInfoBoxLine(_SIGNED_AM_DASHBOARD, "<infolabel>" ._SIGNED_AM_ISSUED_LAST_FORTNIGHT. "</infolabel>", $signaturesHandler->getCount($criteria), 'Green'); + $criteria = new CriteriaCompo(new Criteria('1', '1')); + $criteria->add(new Criteria('saved', time(), '<=')); + $criteria->add(new Criteria('saved', time() - (3600 * 24 * 14), '>=')); + $indexAdmin->addInfoBoxLine(_SIGNED_AM_DASHBOARD, "<infolabel>" ._SIGNED_AM_CREATED_LAST_FORTNIGHT. "</infolabel>", $signaturesHandler->getCount($criteria), 'Cyan'); + $criteria = new CriteriaCompo(new Criteria('1', '1')); + $criteria->add(new Criteria('used', time(), '<=')); + $criteria->add(new Criteria('used', time() - (3600 * 24 * 14), '>=')); + $indexAdmin->addInfoBoxLine(_SIGNED_AM_DASHBOARD, "<infolabel>" ._SIGNED_AM_ACCESSED_LAST_FORTNIGHT. "</infolabel>", $signaturesHandler->getCount($criteria), 'Black'); + + echo $indexAdmin->renderIndex(); + + include_once dirname(__FILE__) . '/admin_footer.php'; + +?> \ No newline at end of file Property changes on: XoopsModules/signed/trunk/modules/signed/admin/admin.php ___________________________________________________________________ Added: svn:executable ## -0,0 +1 ## +* \ No newline at end of property Added: XoopsModules/signed/trunk/modules/signed/admin/admin_footer.php =================================================================== --- XoopsModules/signed/trunk/modules/signed/admin/admin_footer.php (rev 0) +++ XoopsModules/signed/trunk/modules/signed/admin/admin_footer.php 2015-06-09 02:59:11 UTC (rev 13084) @@ -0,0 +1,26 @@ +<?php +/** + * Chronolabs Digital Signature Generation & API Services (Psuedo-legal correct binding measure) + * + * 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. + * + * @copyright Chronolabs Cooperative http://labs.coop + * @license General Software Licence (https://web.labs.coop/public/legal/general-software-license/10,3.html) + * @package signed + * @since 2.07 + * @author Simon Roberts <wis...@us...> + * @author Leshy Cipherhouse <le...@sl...> + * @subpackage administration + * @description Digital Signature Generation & API Services (Psuedo-legal correct binding measure) + * @link https://signed.labs.coop Digital Signature Generation & API Services (Psuedo-legal correct binding measure) + */ + + echo "<div class='adminfooter'>\n" . _SIGNED_AM_ADMIN_FOOTER . "\n" ."</div>"; + + xoops_cp_footer(); +?> \ No newline at end of file Property changes on: XoopsModules/signed/trunk/modules/signed/admin/admin_footer.php ___________________________________________________________________ Added: svn:executable ## -0,0 +1 ## +* \ No newline at end of property Added: XoopsModules/signed/trunk/modules/signed/admin/admin_header.php =================================================================== --- XoopsModules/signed/trunk/modules/signed/admin/admin_header.php (rev 0) +++ XoopsModules/signed/trunk/modules/signed/admin/admin_header.php 2015-06-09 02:59:11 UTC (rev 13084) @@ -0,0 +1,65 @@ +<?php +/** + * Chronolabs Digital Signature Generation & API Services (Psuedo-legal correct binding measure) + * + * 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. + * + * @copyright Chronolabs Cooperative http://labs.coop + * @license General Software Licence (https://web.labs.coop/public/legal/general-software-license/10,3.html) + * @package signed + * @since 2.07 + * @author Simon Roberts <wis...@us...> + * @author Leshy Cipherhouse <le...@sl...> + * @subpackage administration + * @description Digital Signature Generation & API Services (Psuedo-legal correct binding measure) + * @link https://signed.labs.coop Digital Signature Generation & API Services (Psuedo-legal correct binding measure) + */ + + + $path = dirname(dirname(dirname(dirname(__FILE__)))); + include_once $path . '/mainfile.php'; + include_once $path . '/include/cp_functions.php'; + require_once $path . '/include/cp_header.php'; + + global $xoopsModule; + $thisModuleDir = $GLOBALS['xoopsModule']->getVar('dirname'); + + // Load language files + xoops_loadLanguage('admin', $thisModuleDir); + xoops_loadLanguage('modinfo', $thisModuleDir); + xoops_loadLanguage('main', $thisModuleDir); + + xoops_load('pagenav'); + + $pathIcon16 = '../'.$xoopsModule->getInfo('icons16'); + $pathIcon32 = '../'.$xoopsModule->getInfo('icons32'); + $pathModuleAdmin = $xoopsModule->getInfo('dirmoduleadmin'); + + include_once $GLOBALS['xoops']->path($pathModuleAdmin.'/moduleadmin.php'); + + if ($xoopsUser) { + $moduleperm_handler =& xoops_gethandler('groupperm'); + if (!$moduleperm_handler->checkRight('module_admin', $xoopsModule->getVar('mid'), $xoopsUser->getGroups())) { + redirect_header(XOOPS_URL, 1, _NOPERM); + exit(); + } + } else { + redirect_header(XOOPS_URL . "/user.php", 1, _NOPERM); + exit(); + } + + if (!isset($xoopsTpl) || !is_object($xoopsTpl)) { + include_once(XOOPS_ROOT_PATH."/class/template.php"); + $xoopsTpl = new XoopsTpl(); + } + + if (!isset($GLOBALS['xoopsTpl']) || !is_object($GLOBALS['xoopsTpl'])) { + include_once XOOPS_ROOT_PATH . '/class/template.php'; + $GLOBALS['xoopsTpl'] = new XoopsTpl(); + } +?> \ No newline at end of file Property changes on: XoopsModules/signed/trunk/modules/signed/admin/admin_header.php ___________________________________________________________________ Added: svn:executable ## -0,0 +1 ## +* \ No newline at end of property Added: XoopsModules/signed/trunk/modules/signed/admin/events.php =================================================================== --- XoopsModules/signed/trunk/modules/signed/admin/events.php (rev 0) +++ XoopsModules/signed/trunk/modules/signed/admin/events.php 2015-06-09 02:59:11 UTC (rev 13084) @@ -0,0 +1,39 @@ +<?php +/** + * Private message + * + * 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. + * + * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/ + * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html) + * @package pm + * @since 2.3.0 + * @author Jan Pedersen + * @author Taiwen Jiang <ph...@us...> + * @version $Id: prune.php 12593 2014-06-14 16:04:02Z beckmi $ + */ + + include_once dirname(__FILE__) . '/admin_header.php'; + xoops_cp_header(); + + $indexAdmin = new ModuleAdmin(); + echo $indexAdmin->addNavigation('events.php'); + + $start = intval(isset($_REQUEST['start']) ? $_REQUEST['start'] : "0"); + $limit = intval(isset($_REQUEST['limit']) ? $_REQUEST['limit'] : "42"); + + $eventsHandler = xoops_getmodulehandler('events', 'signed'); + $pageNav = new XoopsPageNav($eventsHandler->getCount(new Criteria("1","1")), $limit, $start, 'start', 'limit='.$limit); + + $GLOBALS['xoopsTpl']->assign('pagenav', $pageNav->renderNav(5)); + $GLOBALS['xoopsTpl']->append('signatures', $eventsHandler->getAdminTabled($start, $limit)); + $GLOBALS['xoopsTpl']->display($GLOBALS['xoops']->path('/modules/signed/templates/admin/signed_events.html')); + + include_once dirname(__FILE__) . '/admin_footer.php'; + +?> \ No newline at end of file Property changes on: XoopsModules/signed/trunk/modules/signed/admin/events.php ___________________________________________________________________ Added: svn:executable ## -0,0 +1 ## +* \ No newline at end of property Added: XoopsModules/signed/trunk/modules/signed/admin/index.html =================================================================== --- XoopsModules/signed/trunk/modules/signed/admin/index.html (rev 0) +++ XoopsModules/signed/trunk/modules/signed/admin/index.html 2015-06-09 02:59:11 UTC (rev 13084) @@ -0,0 +1 @@ + <script>history.go(-1);</script> \ No newline at end of file Property changes on: XoopsModules/signed/trunk/modules/signed/admin/index.html ___________________________________________________________________ Added: svn:executable ## -0,0 +1 ## +* \ No newline at end of property Added: XoopsModules/signed/trunk/modules/signed/admin/menu.php =================================================================== --- XoopsModules/signed/trunk/modules/signed/admin/menu.php (rev 0) +++ XoopsModules/signed/trunk/modules/signed/admin/menu.php 2015-06-09 02:59:11 UTC (rev 13084) @@ -0,0 +1,58 @@ +<?php +/** + * Chronolabs Digital Signature Generation & API Services (Psuedo-legal correct binding measure) + * + * 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. + * + * @copyright Chronolabs Cooperative http://labs.coop + * @license General Software Licence (https://web.labs.coop/public/legal/general-software-license/10,3.html) + * @package signed + * @since 2.07 + * @author Simon Roberts <wis...@us...> + * @author Leshy Cipherhouse <le...@sl...> + * @subpackage administration + * @description Digital Signature Generation & API Services (Psuedo-legal correct binding measure) + * @link https://signed.labs.coop Digital Signature Generation & API Services (Psuedo-legal correct binding measure) + */ + + $path = dirname(dirname(dirname(dirname(__FILE__)))); + include_once $path . '/mainfile.php'; + + $dirname = basename(dirname(dirname(__FILE__))); + $module_handler = xoops_gethandler('module'); + $module = $module_handler->getByDirname($dirname); + $pathIcon32 = $module->getInfo('icons32'); + $pathModuleAdmin = $module->getInfo('dirmoduleadmin'); + $pathLanguage = $path . $pathModuleAdmin; + + if (!file_exists($fileinc = $pathLanguage . '/language/' . $GLOBALS['xoopsConfig']['language'] . '/' . 'main.php')) { + $fileinc = $pathLanguage . '/language/english/main.php'; + } + + include_once $fileinc; + + $adminmenu = array(); + + $i = 1; + $adminmenu[$i]['title'] = _SIGNED_MI_INDEX; + $adminmenu[$i]['link'] = "admin/admin.php"; + $adminmenu[$i]['icon'] = $pathIcon32.'/security.png' ; + ++$i; + $adminmenu[$i]['title'] = _SIGNED_MI_SIGNATURES; + $adminmenu[$i]['link'] = "admin/signatures.php"; + $adminmenu[$i]['icon'] = $pathIcon32.'/identity.png' ; + ++$i; + $adminmenu[$i]['title'] = _SIGNED_MI_EVENTS; + $adminmenu[$i]['link'] = "admin/events.php"; + $adminmenu[$i]['icon'] = $pathIcon32.'/event.png' ; + ++$i; + $adminmenu[$i]['title'] = _SIGNED_MI_ABOUT; + $adminmenu[$i]['link'] = 'admin/about.php'; + $adminmenu[$i]['icon'] = $pa... [truncated message content] |
From: <wis...@us...> - 2015-06-09 02:57:56
|
Revision: 13083 http://sourceforge.net/p/xoops/svn/13083 Author: wishcraft Date: 2015-06-09 02:57:55 +0000 (Tue, 09 Jun 2015) Log Message: ----------- cleaning for new signed 2.07 -- trunk Removed Paths: ------------- XoopsModules/signed/trunk/ |
From: <be...@us...> - 2015-06-06 21:59:47
|
Revision: 13082 http://sourceforge.net/p/xoops/svn/13082 Author: beckmi Date: 2015-06-06 21:59:41 +0000 (Sat, 06 Jun 2015) Log Message: ----------- Updating XOOPS copyright to 2015 Modified Paths: -------------- XoopsCore/branches/2.5.x/2.5.8/docs/changelog.250.txt XoopsCore/branches/2.5.x/2.5.8/extras/modules/system/admin/filemanager/jquery.php XoopsCore/branches/2.5.x/2.5.8/extras/modules/system/admin/filemanager/main.php XoopsCore/branches/2.5.x/2.5.8/extras/modules/system/admin/filemanager/xoops_version.php XoopsCore/branches/2.5.x/2.5.8/extras/modules/system/language/english/admin/filemanager.php XoopsCore/branches/2.5.x/2.5.8/extras/mysqli/mysqldatabase.php XoopsCore/branches/2.5.x/2.5.8/htdocs/Frameworks/art/functions.admin.php XoopsCore/branches/2.5.x/2.5.8/htdocs/Frameworks/art/functions.cache.php XoopsCore/branches/2.5.x/2.5.8/htdocs/Frameworks/art/functions.config.php XoopsCore/branches/2.5.x/2.5.8/htdocs/Frameworks/art/functions.ini.php XoopsCore/branches/2.5.x/2.5.8/htdocs/Frameworks/art/functions.locale.php XoopsCore/branches/2.5.x/2.5.8/htdocs/Frameworks/art/functions.php XoopsCore/branches/2.5.x/2.5.8/htdocs/Frameworks/art/functions.user.php XoopsCore/branches/2.5.x/2.5.8/htdocs/Frameworks/art/object.php XoopsCore/branches/2.5.x/2.5.8/htdocs/Frameworks/art/xoops_version.php XoopsCore/branches/2.5.x/2.5.8/htdocs/Frameworks/art/xoopsart.php XoopsCore/branches/2.5.x/2.5.8/htdocs/Frameworks/moduleclasses/moduleadmin/language/english/main.php XoopsCore/branches/2.5.x/2.5.8/htdocs/Frameworks/moduleclasses/moduleadmin/moduleadmin.php XoopsCore/branches/2.5.x/2.5.8/htdocs/Frameworks/moduleclasses/moduleadmin/xoops_version.php XoopsCore/branches/2.5.x/2.5.8/htdocs/admin.php XoopsCore/branches/2.5.x/2.5.8/htdocs/backend.php XoopsCore/branches/2.5.x/2.5.8/htdocs/banners.php XoopsCore/branches/2.5.x/2.5.8/htdocs/browse.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/auth/auth.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/auth/auth_ads.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/auth/auth_ldap.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/auth/auth_provisionning.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/auth/auth_xoops.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/auth/authfactory.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/cache/apc.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/cache/file.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/cache/memcache.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/cache/model.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/cache/xcache.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/cache/xoopscache.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/captcha/config.image.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/captcha/config.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/captcha/config.recaptcha.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/captcha/config.text.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/captcha/image/scripts/image.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/captcha/image.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/captcha/recaptcha.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/captcha/text.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/captcha/xoopscaptcha.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/commentrenderer.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/criteria.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/database/database.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/database/databasefactory.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/database/mysqldatabase.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/database/sqlutility.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/downloader.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/errorhandler.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/file/file.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/file/folder.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/file/xoopsfile.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/logger/render.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/logger/xoopslogger.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/logger.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/logger_render.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/mail/xoopsmultimailer.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/mimetypes.inc.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/model/joint.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/model/read.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/model/stats.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/model/sync.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/model/write.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/model/xoopsmodel.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/module.errorhandler.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/module.textsanitizer.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/pagenav.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/preload.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/smarty/xoops_plugins/compiler.foreachq.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/smarty/xoops_plugins/compiler.includeq.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/smarty/xoops_plugins/compiler.xoAdminIcons.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/smarty/xoops_plugins/compiler.xoAdminNav.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/smarty/xoops_plugins/compiler.xoAppUrl.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/smarty/xoops_plugins/compiler.xoImgUrl.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/smarty/xoops_plugins/compiler.xoModuleIcons16.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/smarty/xoops_plugins/compiler.xoModuleIcons32.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/smarty/xoops_plugins/compiler.xoModuleIconsBookmarks.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/smarty/xoops_plugins/function.xoMemberInfo.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/smarty/xoops_plugins/function.xoops_link.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/smarty/xoops_plugins/resource.db.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/tardownloader.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/template.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/textsanitizer/censor/censor.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/textsanitizer/censor/config.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/textsanitizer/config.custom.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/textsanitizer/config.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/textsanitizer/flash/config.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/textsanitizer/flash/flash.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/textsanitizer/iframe/iframe.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/textsanitizer/image/config.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/textsanitizer/image/image.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/textsanitizer/li/li.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/textsanitizer/mms/mms.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/textsanitizer/mp3/mp3.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/textsanitizer/rtsp/rtsp.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/textsanitizer/syntaxhighlight/config.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/textsanitizer/syntaxhighlight/syntaxhighlight.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/textsanitizer/textfilter/config.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/textsanitizer/textfilter/textfilter.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/textsanitizer/ul/ul.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/textsanitizer/wiki/config.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/textsanitizer/wiki/wiki.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/textsanitizer/wmp/wmp.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/textsanitizer/youtube/youtube.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/theme.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/theme_blocks.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/tree.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/uploader.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/userutility.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/utility/xoopsutility.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xml/rpc/bloggerapi.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xml/rpc/metaweblogapi.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xml/rpc/movabletypeapi.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xml/rpc/xmlrpcapi.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xml/rpc/xmlrpcparser.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xml/rpc/xmlrpctag.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xml/rpc/xoopsapi.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xml/rss/xmlrss2parser.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xml/themesetparser.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopsblock.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopscomments.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopseditor/dhtmltextarea/dhtmltextarea.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopseditor/dhtmltextarea/editor_registry.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopseditor/dhtmltextarea/language/english.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopseditor/sampleform.inc.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopseditor/textarea/editor_registry.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopseditor/textarea/language/english.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopseditor/textarea/textarea.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopseditor/tinymce/editor_registry.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopseditor/tinymce/formtinymce.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopseditor/tinymce/include/xoopscode.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopseditor/tinymce/include/xoopsemotions.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopseditor/tinymce/include/xoopsimagemanager.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopseditor/tinymce/include/xoopsmlcontent.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopseditor/tinymce/include/xoopsquote.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopseditor/tinymce/language/english.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopseditor/tinymce/settings.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/xoopsemotions/xoopsemotions.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/xoopsimagemanager/xoopsimagebrowser.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/xoopsimagemanager/xoopsimagemanager.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/xoopsmlcontent/xoopsmlcontent.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopseditor/tinymce/tinymce.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopseditor/xoopseditor.inc.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopseditor/xoopseditor.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopsfilterinput.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopsform/form.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopsform/formbutton.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopsform/formbuttontray.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopsform/formcaptcha.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopsform/formcheckbox.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopsform/formcolorpicker.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopsform/formdatetime.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopsform/formdhtmltextarea.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopsform/formeditor.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopsform/formelement.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopsform/formelementtray.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopsform/formfile.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopsform/formhidden.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopsform/formhiddentoken.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopsform/formlabel.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopsform/formpassword.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopsform/formradio.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopsform/formradioyn.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopsform/formselect.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopsform/formselectcheckgroup.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopsform/formselectcountry.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopsform/formselecteditor.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopsform/formselectgroup.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopsform/formselectlang.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopsform/formselectmatchoption.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopsform/formselecttheme.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopsform/formselecttimezone.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopsform/formtext.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopsform/formtextarea.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopsform/formtextdateselect.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopsform/grouppermform.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopsform/simpleform.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopsform/tableform.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopsform/themeform.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopsformloader.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopskernel.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopslists.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopsload.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopslocal.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopsmailer.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopsmodule.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopsobject.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopsrequest.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopssecurity.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopsstory.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopstopic.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopstree.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopsuser.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/zipdownloader.php XoopsCore/branches/2.5.x/2.5.8/htdocs/edituser.php XoopsCore/branches/2.5.x/2.5.8/htdocs/footer.php XoopsCore/branches/2.5.x/2.5.8/htdocs/header.php XoopsCore/branches/2.5.x/2.5.8/htdocs/image.php XoopsCore/branches/2.5.x/2.5.8/htdocs/imagemanager.php XoopsCore/branches/2.5.x/2.5.8/htdocs/include/checklogin.php XoopsCore/branches/2.5.x/2.5.8/htdocs/include/comment_constants.php XoopsCore/branches/2.5.x/2.5.8/htdocs/include/comment_delete.php XoopsCore/branches/2.5.x/2.5.8/htdocs/include/comment_edit.php XoopsCore/branches/2.5.x/2.5.8/htdocs/include/comment_form.php XoopsCore/branches/2.5.x/2.5.8/htdocs/include/comment_new.php XoopsCore/branches/2.5.x/2.5.8/htdocs/include/comment_post.php XoopsCore/branches/2.5.x/2.5.8/htdocs/include/comment_reply.php XoopsCore/branches/2.5.x/2.5.8/htdocs/include/comment_view.php XoopsCore/branches/2.5.x/2.5.8/htdocs/include/commentform.inc.php XoopsCore/branches/2.5.x/2.5.8/htdocs/include/common.php XoopsCore/branches/2.5.x/2.5.8/htdocs/include/cp_functions.php XoopsCore/branches/2.5.x/2.5.8/htdocs/include/cp_header.php XoopsCore/branches/2.5.x/2.5.8/htdocs/include/defines.php XoopsCore/branches/2.5.x/2.5.8/htdocs/include/findusers.php XoopsCore/branches/2.5.x/2.5.8/htdocs/include/formdhtmltextarea_preview.php XoopsCore/branches/2.5.x/2.5.8/htdocs/include/functions.encoding.php XoopsCore/branches/2.5.x/2.5.8/htdocs/include/functions.legacy.php XoopsCore/branches/2.5.x/2.5.8/htdocs/include/functions.php XoopsCore/branches/2.5.x/2.5.8/htdocs/include/license.php XoopsCore/branches/2.5.x/2.5.8/htdocs/include/mimetypes.inc.php XoopsCore/branches/2.5.x/2.5.8/htdocs/include/notification_constants.php XoopsCore/branches/2.5.x/2.5.8/htdocs/include/notification_functions.php XoopsCore/branches/2.5.x/2.5.8/htdocs/include/notification_select.php XoopsCore/branches/2.5.x/2.5.8/htdocs/include/notification_update.php XoopsCore/branches/2.5.x/2.5.8/htdocs/include/old_functions.php XoopsCore/branches/2.5.x/2.5.8/htdocs/include/old_theme_functions.php XoopsCore/branches/2.5.x/2.5.8/htdocs/include/registerform.php XoopsCore/branches/2.5.x/2.5.8/htdocs/include/searchform.php XoopsCore/branches/2.5.x/2.5.8/htdocs/include/site-closed.php XoopsCore/branches/2.5.x/2.5.8/htdocs/include/version.php XoopsCore/branches/2.5.x/2.5.8/htdocs/include/xoops13_header.php XoopsCore/branches/2.5.x/2.5.8/htdocs/include/xoopscodes.php XoopsCore/branches/2.5.x/2.5.8/htdocs/include/xoopslocal.php XoopsCore/branches/2.5.x/2.5.8/htdocs/index.php XoopsCore/branches/2.5.x/2.5.8/htdocs/install/class/dbmanager.php XoopsCore/branches/2.5.x/2.5.8/htdocs/install/class/installwizard.php XoopsCore/branches/2.5.x/2.5.8/htdocs/install/class/pathcontroller.php XoopsCore/branches/2.5.x/2.5.8/htdocs/install/cleanup.php XoopsCore/branches/2.5.x/2.5.8/htdocs/install/css/reset.css XoopsCore/branches/2.5.x/2.5.8/htdocs/install/include/common.inc.php XoopsCore/branches/2.5.x/2.5.8/htdocs/install/include/config.php XoopsCore/branches/2.5.x/2.5.8/htdocs/install/include/createconfigform.php XoopsCore/branches/2.5.x/2.5.8/htdocs/install/include/functions.php XoopsCore/branches/2.5.x/2.5.8/htdocs/install/include/install_tpl.php XoopsCore/branches/2.5.x/2.5.8/htdocs/install/include/license.dist.php XoopsCore/branches/2.5.x/2.5.8/htdocs/install/include/makedata.php XoopsCore/branches/2.5.x/2.5.8/htdocs/install/include/modulesadmin.php XoopsCore/branches/2.5.x/2.5.8/htdocs/install/include/page.php XoopsCore/branches/2.5.x/2.5.8/htdocs/install/index.php XoopsCore/branches/2.5.x/2.5.8/htdocs/install/language/english/install.php XoopsCore/branches/2.5.x/2.5.8/htdocs/install/page_configsave.php XoopsCore/branches/2.5.x/2.5.8/htdocs/install/page_configsite.php XoopsCore/branches/2.5.x/2.5.8/htdocs/install/page_dbconnection.php XoopsCore/branches/2.5.x/2.5.8/htdocs/install/page_dbsettings.php XoopsCore/branches/2.5.x/2.5.8/htdocs/install/page_end.php XoopsCore/branches/2.5.x/2.5.8/htdocs/install/page_langselect.php XoopsCore/branches/2.5.x/2.5.8/htdocs/install/page_modcheck.php XoopsCore/branches/2.5.x/2.5.8/htdocs/install/page_moduleinstaller.php XoopsCore/branches/2.5.x/2.5.8/htdocs/install/page_pathsettings.php XoopsCore/branches/2.5.x/2.5.8/htdocs/install/page_siteinit.php XoopsCore/branches/2.5.x/2.5.8/htdocs/install/page_start.php XoopsCore/branches/2.5.x/2.5.8/htdocs/install/page_tablescreate.php XoopsCore/branches/2.5.x/2.5.8/htdocs/install/page_tablesfill.php XoopsCore/branches/2.5.x/2.5.8/htdocs/install/page_theme.php XoopsCore/branches/2.5.x/2.5.8/htdocs/kernel/avatar.php XoopsCore/branches/2.5.x/2.5.8/htdocs/kernel/block.php XoopsCore/branches/2.5.x/2.5.8/htdocs/kernel/blockinstance.php XoopsCore/branches/2.5.x/2.5.8/htdocs/kernel/comment.php XoopsCore/branches/2.5.x/2.5.8/htdocs/kernel/config.php XoopsCore/branches/2.5.x/2.5.8/htdocs/kernel/configcategory.php XoopsCore/branches/2.5.x/2.5.8/htdocs/kernel/configitem.php XoopsCore/branches/2.5.x/2.5.8/htdocs/kernel/configoption.php XoopsCore/branches/2.5.x/2.5.8/htdocs/kernel/group.php XoopsCore/branches/2.5.x/2.5.8/htdocs/kernel/groupperm.php XoopsCore/branches/2.5.x/2.5.8/htdocs/kernel/handlerregistry.php XoopsCore/branches/2.5.x/2.5.8/htdocs/kernel/image.php XoopsCore/branches/2.5.x/2.5.8/htdocs/kernel/imagecategory.php XoopsCore/branches/2.5.x/2.5.8/htdocs/kernel/imageset.php XoopsCore/branches/2.5.x/2.5.8/htdocs/kernel/imagesetimg.php XoopsCore/branches/2.5.x/2.5.8/htdocs/kernel/member.php XoopsCore/branches/2.5.x/2.5.8/htdocs/kernel/module.php XoopsCore/branches/2.5.x/2.5.8/htdocs/kernel/notification.php XoopsCore/branches/2.5.x/2.5.8/htdocs/kernel/object.php XoopsCore/branches/2.5.x/2.5.8/htdocs/kernel/online.php XoopsCore/branches/2.5.x/2.5.8/htdocs/kernel/privmessage.php XoopsCore/branches/2.5.x/2.5.8/htdocs/kernel/session.php XoopsCore/branches/2.5.x/2.5.8/htdocs/kernel/tplfile.php XoopsCore/branches/2.5.x/2.5.8/htdocs/kernel/tplset.php XoopsCore/branches/2.5.x/2.5.8/htdocs/kernel/user.php XoopsCore/branches/2.5.x/2.5.8/htdocs/language/english/formdhtmltextarea.php XoopsCore/branches/2.5.x/2.5.8/htdocs/language/english/locale.php XoopsCore/branches/2.5.x/2.5.8/htdocs/language/english/logger.php XoopsCore/branches/2.5.x/2.5.8/htdocs/language/english/xoopsmailerlocal.php XoopsCore/branches/2.5.x/2.5.8/htdocs/lostpass.php XoopsCore/branches/2.5.x/2.5.8/htdocs/mainfile.dist.php XoopsCore/branches/2.5.x/2.5.8/htdocs/misc.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/pm/admin/about.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/pm/admin/admin.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/pm/admin/admin_footer.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/pm/admin/admin_header.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/pm/admin/header.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/pm/admin/menu.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/pm/admin/prune.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/pm/class/message.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/pm/include/install.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/pm/include/update.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/pm/index.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/pm/pmlite.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/pm/preloads/core.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/pm/preloads/system.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/pm/readpmsg.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/pm/viewpmsg.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/pm/xoops_version.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/profile/activate.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/profile/admin/about.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/profile/admin/admin_footer.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/profile/admin/admin_header.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/profile/admin/category.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/profile/admin/field.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/profile/admin/index.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/profile/admin/menu.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/profile/admin/permissions.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/profile/admin/step.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/profile/admin/user.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/profile/admin/visibility.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/profile/changemail.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/profile/changepass.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/profile/class/category.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/profile/class/field.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/profile/class/profile.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/profile/class/regstep.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/profile/class/visibility.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/profile/edituser.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/profile/footer.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/profile/header.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/profile/include/forms.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/profile/include/install.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/profile/include/update.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/profile/index.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/profile/lostpass.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/profile/preloads/core.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/profile/register.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/profile/search.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/profile/user.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/profile/userinfo.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/profile/xoops_version.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/protector/preloads/core.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/avatars/main.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/avatars/xoops_version.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/banners/main.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/banners/xoops_version.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/blocksadmin/main.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/blocksadmin/xoops_version.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/comments/admin_header.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/comments/comment_delete.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/comments/comment_edit.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/comments/comment_post.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/comments/main.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/comments/xoops_version.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/groups/main.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/groups/xoops_version.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/images/main.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/images/xoops_version.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/mailusers/main.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/mailusers/xoops_version.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/maintenance/main.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/maintenance/xoops_version.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/modulesadmin/main.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/modulesadmin/modulesadmin.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/modulesadmin/xoops_version.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/preferences/main.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/preferences/xoops_version.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/smilies/main.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/smilies/xoops_version.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/tplsets/jquery.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/tplsets/main.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/tplsets/xoops_version.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/userrank/main.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/userrank/xoops_version.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/users/jquery.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/users/main.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/users/users.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/users/xoops_version.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/blocks/system_blocks.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/class/avatar.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/class/banner.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/class/bannerclient.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/class/bannerfinish.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/class/block.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/class/blocklinkmodule.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/class/breadcrumb.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/class/cookie.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/class/cpanel.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/class/group.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/class/gui.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/class/maintenance.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/class/menu.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/class/smilies.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/class/userrank.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/class/users.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/constants.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/menu.css XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/header.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/help.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/include/functions.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/include/update.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/js/admin.js XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/js/module.js XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/language/english/admin/avatars.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/language/english/admin/banners.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/language/english/admin/blocksadmin.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/language/english/admin/comments.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/language/english/admin/images.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/language/english/admin/mailusers.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/language/english/admin/maintenance.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/language/english/admin/modulesadmin.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/language/english/admin/preferences.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/language/english/admin/smilies.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/language/english/admin/tplsets.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/language/english/admin/userrank.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/language/english/admin/users.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/language/english/admin.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/menu.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/preloads/core.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/themes/default/css/accordion.css XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/themes/default/css/buttonbar.css XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/themes/default/css/choosestyle.css XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/themes/default/css/content.css XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/themes/default/css/dark.css XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/themes/default/css/dashboard.css XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/themes/default/css/footer.css XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/themes/default/css/forms.css XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/themes/default/css/globalnav.css XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/themes/default/css/icons.css XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/themes/default/css/logger.css XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/themes/default/css/orange.css XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/themes/default/css/pagenav.css XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/themes/default/css/reset.css XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/themes/default/css/silver.css XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/themes/default/css/style.css XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/themes/default/css/tablesorter.css XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/themes/default/css/tabs.css XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/themes/default/css/toolbar.css XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/themes/default/css/tooltip.css XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/themes/default/default.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/themes/default/menu.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/themes/legacy/cp_functions.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/themes/legacy/legacy.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/themes/thadmin/thadmin.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/themes/zetadigme/css/reset.css XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/themes/zetadigme/css/tooltip.css XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/themes/zetadigme/menu.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/themes/zetadigme/zetadigme.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/xoops_version.php XoopsCore/branches/2.5.x/2.5.8/htdocs/notifications.php XoopsCore/branches/2.5.x/2.5.8/htdocs/pda.php XoopsCore/branches/2.5.x/2.5.8/htdocs/pmlite.php XoopsCore/branches/2.5.x/2.5.8/htdocs/readpmsg.php XoopsCore/branches/2.5.x/2.5.8/htdocs/register.php XoopsCore/branches/2.5.x/2.5.8/htdocs/search.php XoopsCore/branches/2.5.x/2.5.8/htdocs/themes/default/xo-info.php XoopsCore/branches/2.5.x/2.5.8/htdocs/themes/suico/css/baradmin.css XoopsCore/branches/2.5.x/2.5.8/htdocs/themes/suico/css/globalnav.css XoopsCore/branches/2.5.x/2.5.8/htdocs/themes/suico/css/layout-soup.css XoopsCore/branches/2.5.x/2.5.8/htdocs/themes/suico/css/print.css XoopsCore/branches/2.5.x/2.5.8/htdocs/themes/suico/css/reset.css XoopsCore/branches/2.5.x/2.5.8/htdocs/themes/suico/css/style.css XoopsCore/branches/2.5.x/2.5.8/htdocs/themes/suico/css/userbar.css XoopsCore/branches/2.5.x/2.5.8/htdocs/themes/suico/extras/function.xoMemberInfo.php XoopsCore/branches/2.5.x/2.5.8/htdocs/themes/suico/language/english/main.php XoopsCore/branches/2.5.x/2.5.8/htdocs/themes/suico/xo-info.php XoopsCore/branches/2.5.x/2.5.8/htdocs/themes/xbootstrap/modules/publisher/xoops_and_module_changes/class/pagenav.php XoopsCore/branches/2.5.x/2.5.8/htdocs/themes/xbootstrap/modules/publisher/xoops_and_module_changes/modules/publisher/blocks/search.php XoopsCore/branches/2.5.x/2.5.8/htdocs/themes/xbootstrap/modules/publisher/xoops_and_module_changes/modules/publisher/class/category.php XoopsCore/branches/2.5.x/2.5.8/htdocs/themes/xbootstrap/modules/publisher/xoops_and_module_changes/modules/publisher/class/item.php XoopsCore/branches/2.5.x/2.5.8/htdocs/themes/xbootstrap/modules/publisher/xoops_and_module_changes/modules/publisher/item.php XoopsCore/branches/2.5.x/2.5.8/htdocs/themes/xbootstrap/modules/publisher/xoops_and_module_changes/modules/publisher/search.php XoopsCore/branches/2.5.x/2.5.8/htdocs/themes/zetagenesis/xo-info.php XoopsCore/branches/2.5.x/2.5.8/htdocs/user.php XoopsCore/branches/2.5.x/2.5.8/htdocs/userinfo.php XoopsCore/branches/2.5.x/2.5.8/htdocs/viewpmsg.php XoopsCore/branches/2.5.x/2.5.8/htdocs/xmlrpc.php XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_data/data/secure.dist.php XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/admin/about.php XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/admin/admin_footer.php XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/admin/admin_header.php XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/modules/protector/admin/index.php XoopsCore/branches/2.5.x/2.5.8/upgrade/abstract.php XoopsCore/branches/2.5.x/2.5.8/upgrade/check_version.php XoopsCore/branches/2.5.x/2.5.8/upgrade/cnt-2.2.x-to-2.3.0/index.php XoopsCore/branches/2.5.x/2.5.8/upgrade/index.php XoopsCore/branches/2.5.x/2.5.8/upgrade/language.php XoopsCore/branches/2.5.x/2.5.8/upgrade/upd-2.0.18-to-2.3.0/index.php XoopsCore/branches/2.5.x/2.5.8/upgrade/upd-2.0.18-to-2.3.0/mainfile.dist.php XoopsCore/branches/2.5.x/2.5.8/upgrade/upd-2.0.18-to-2.3.0/pathcontroller.php XoopsCore/branches/2.5.x/2.5.8/upgrade/upd-2.0.18-to-2.3.0/settings_db.php XoopsCore/branches/2.5.x/2.5.8/upgrade/upd-2.0.18-to-2.3.0/settings_path.php XoopsCore/branches/2.5.x/2.5.8/upgrade/upd-2.3.0-to-2.3.1/index.php XoopsCore/branches/2.5.x/2.5.8/upgrade/upd-2.3.3-to-2.4.0/index.php XoopsCore/branches/2.5.x/2.5.8/upgrade/upd-2.3.3-to-2.4.0/license.dist.php XoopsCore/branches/2.5.x/2.5.8/upgrade/upd-2.4.0-to-2.4.1/index.php XoopsCore/branches/2.5.x/2.5.8/upgrade/upd-2.4.0-to-2.4.1/license.dist.php XoopsCore/branches/2.5.x/2.5.8/upgrade/upd-2.4.x-to-2.5.0/dbmanager.php XoopsCore/branches/2.5.x/2.5.8/upgrade/upd-2.4.x-to-2.5.0/index.php XoopsCore/branches/2.5.x/2.5.8/upgrade/upd-2.5.4-to-2.5.5/index.php XoopsCore/branches/2.5.x/2.5.8/upgrade/upd-2.5.5-to-2.5.6/index.php Modified: XoopsCore/branches/2.5.x/2.5.8/docs/changelog.250.txt =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/docs/changelog.250.txt 2015-06-06 21:50:17 UTC (rev 13081) +++ XoopsCore/branches/2.5.x/2.5.8/docs/changelog.250.txt 2015-06-06 21:59:41 UTC (rev 13082) @@ -17,7 +17,8 @@ - fixing a bug in xmlrpc.php (wppd/rgriffith) - remove addrFormat override in XoopsMultiMailer (rgriffith) - patch from Xoops 2.5.6 XoopsFormSelectUser is not compatible with some old modules like xNews (luciorota) -- fix "setExtra" in moduleadmin.php, Admin buttons can now use "onClick" assignments (mamba) +- fix "setExtra" in moduleadmin.php, Admin buttons can now use "onClick" assignments (mamba) +- updated XOOPS copyright to 2015, changed links to http://xoops.org (mamba) Security fixes Modified: XoopsCore/branches/2.5.x/2.5.8/extras/modules/system/admin/filemanager/jquery.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/extras/modules/system/admin/filemanager/jquery.php 2015-06-06 21:50:17 UTC (rev 13081) +++ XoopsCore/branches/2.5.x/2.5.8/extras/modules/system/admin/filemanager/jquery.php 2015-06-06 21:59:41 UTC (rev 13082) @@ -11,7 +11,7 @@ * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * - * @copyright (c) 2000-2014 XOOPS Project (www.xoops.org) + * @copyright (c) 2000-2015 XOOPS Project (www.xoops.org) * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html) * @author Maxime Cointin (AKA Kraven30) * @package system Modified: XoopsCore/branches/2.5.x/2.5.8/extras/modules/system/admin/filemanager/main.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/extras/modules/system/admin/filemanager/main.php 2015-06-06 21:50:17 UTC (rev 13081) +++ XoopsCore/branches/2.5.x/2.5.8/extras/modules/system/admin/filemanager/main.php 2015-06-06 21:59:41 UTC (rev 13082) @@ -9,7 +9,7 @@ * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * - * @copyright (c) 2000-2014 XOOPS Project (www.xoops.org) + * @copyright (c) 2000-2015 XOOPS Project (www.xoops.org) * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html) * @author Maxime Cointin (AKA Kraven30) * @package system Modified: XoopsCore/branches/2.5.x/2.5.8/extras/modules/system/admin/filemanager/xoops_version.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/extras/modules/system/admin/filemanager/xoops_version.php 2015-06-06 21:50:17 UTC (rev 13081) +++ XoopsCore/branches/2.5.x/2.5.8/extras/modules/system/admin/filemanager/xoops_version.php 2015-06-06 21:59:41 UTC (rev 13082) @@ -9,7 +9,7 @@ * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * - * @copyright (c) 2000-2014 XOOPS Project (www.xoops.org) + * @copyright (c) 2000-2015 XOOPS Project (www.xoops.org) * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html) * @author Maxime Cointin (AKA Kraven30) * @package system Modified: XoopsCore/branches/2.5.x/2.5.8/extras/modules/system/language/english/admin/filemanager.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/extras/modules/system/language/english/admin/filemanager.php 2015-06-06 21:50:17 UTC (rev 13081) +++ XoopsCore/branches/2.5.x/2.5.8/extras/modules/system/language/english/admin/filemanager.php 2015-06-06 21:59:41 UTC (rev 13082) @@ -1,6 +1,6 @@ <?php /** - * @copyright (c) 2000-2014 XOOPS Project (www.xoops.org) + * @copyright (c) 2000-2015 XOOPS Project (www.xoops.org) * @license http://www.fsf.org/copyleft/gpl.html GNU public license * _LANGCODE en * _CHARSET UTF-8 Modified: XoopsCore/branches/2.5.x/2.5.8/extras/mysqli/mysqldatabase.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/extras/mysqli/mysqldatabase.php 2015-06-06 21:50:17 UTC (rev 13081) +++ XoopsCore/branches/2.5.x/2.5.8/extras/mysqli/mysqldatabase.php 2015-06-06 21:59:41 UTC (rev 13082) @@ -9,7 +9,7 @@ * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * - * @copyright (c) 2000-2014 XOOPS Project (www.xoops.org) + * @copyright (c) 2000-2015 XOOPS Project (www.xoops.org) * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html) * @package class * @subpackage database @@ -27,7 +27,7 @@ * * @abstract * @author Kazumi Ono <on...@xo...> - * @copyright (c) 2000-2014 XOOPS Project (www.xoops.org) + * @copyright (c) 2000-2015 XOOPS Project (www.xoops.org) * @package class * @subpackage database */ @@ -444,7 +444,7 @@ * Safe Connection to a MySQL database. * * @author Kazumi Ono <on...@xo...> - * @copyright (c) 2000-2014 XOOPS Project (www.xoops.org) + * @copyright (c) 2000-2015 XOOPS Project (www.xoops.org) * @package kernel * @subpackage database */ @@ -472,7 +472,7 @@ * {@link query()} method for security reasons. * * @author Kazumi Ono <on...@xo...> - * @copyright (c) 2000-2014 XOOPS Project (www.xoops.org) + * @copyright (c) 2000-2015 XOOPS Project (www.xoops.org) * @package class * @subpackage database */ Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/Frameworks/art/functions.admin.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/Frameworks/art/functions.admin.php 2015-06-06 21:50:17 UTC (rev 13081) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/Frameworks/art/functions.admin.php 2015-06-06 21:59:41 UTC (rev 13082) @@ -2,7 +2,7 @@ /** * Module admin functions * - * @copyright (c) 2000-2014 XOOPS Project (www.xoops.org) + * @copyright (c) 2000-2015 XOOPS Project (www.xoops.org) * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html) * @author Taiwen Jiang <ph...@us...> * @since 1.00 Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/Frameworks/art/functions.cache.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/Frameworks/art/functions.cache.php 2015-06-06 21:50:17 UTC (rev 13081) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/Frameworks/art/functions.cache.php 2015-06-06 21:59:41 UTC (rev 13082) @@ -2,7 +2,7 @@ /** * Cache handlers * - * @copyright (c) 2000-2014 XOOPS Project (www.xoops.org) + * @copyright (c) 2000-2015 XOOPS Project (www.xoops.org) * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html) * @author Taiwen Jiang <ph...@us...> * @since 1.00 Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/Frameworks/art/functions.config.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/Frameworks/art/functions.config.php 2015-06-06 21:50:17 UTC (rev 13081) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/Frameworks/art/functions.config.php 2015-06-06 21:59:41 UTC (rev 13082) @@ -2,7 +2,7 @@ /** * Functions handling module configs * - * @copyright (c) 2000-2014 XOOPS Project (www.xoops.org) + * @copyright (c) 2000-2015 XOOPS Project (www.xoops.org) * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html) * @author Taiwen Jiang <ph...@us...> * @since 1.00 Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/Frameworks/art/functions.ini.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/Frameworks/art/functions.ini.php 2015-06-06 21:50:17 UTC (rev 13081) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/Frameworks/art/functions.ini.php 2015-06-06 21:59:41 UTC (rev 13082) @@ -2,7 +2,7 @@ /** * Initial functions * - * @copyright (c) 2000-2014 XOOPS Project (www.xoops.org) + * @copyright (c) 2000-2015 XOOPS Project (www.xoops.org) * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html) * @author Taiwen Jiang <ph...@us...> * @since 1.00 Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/Frameworks/art/functions.locale.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/Frameworks/art/functions.locale.php 2015-06-06 21:50:17 UTC (rev 13081) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/Frameworks/art/functions.locale.php 2015-06-06 21:59:41 UTC (rev 13082) @@ -12,7 +12,7 @@ /** * Xoops Localization class * - * @copyright (c) 2000-2014 XOOPS Project (www.xoops.org) + * @copyright (c) 2000-2015 XOOPS Project (www.xoops.org) * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html) * @author Taiwen Jiang <ph...@us...> * @since 1.00 Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/Frameworks/art/functions.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/Frameworks/art/functions.php 2015-06-06 21:50:17 UTC (rev 13081) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/Frameworks/art/functions.php 2015-06-06 21:59:41 UTC (rev 13082) @@ -2,7 +2,7 @@ /** * common functions * - * @copyright (c) 2000-2014 XOOPS Project (www.xoops.org) + * @copyright (c) 2000-2015 XOOPS Project (www.xoops.org) * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html) * @author Taiwen Jiang <ph...@us...> * @since 1.00 Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/Frameworks/art/functions.user.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/Frameworks/art/functions.user.php 2015-06-06 21:50:17 UTC (rev 13081) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/Frameworks/art/functions.user.php 2015-06-06 21:59:41 UTC (rev 13082) @@ -2,7 +2,7 @@ /** * user/member handlers * - * @copyright (c) 2000-2014 XOOPS Project (www.xoops.org) + * @copyright (c) 2000-2015 XOOPS Project (www.xoops.org) * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html) * @author Taiwen Jiang <ph...@us...> * @since 1.00 Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/Frameworks/art/object.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/Frameworks/art/object.php 2015-06-06 21:50:17 UTC (rev 13081) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/Frameworks/art/object.php 2015-06-06 21:59:41 UTC (rev 13082) @@ -4,7 +4,7 @@ * * For backward compatibility * - * @copyright (c) 2000-2014 XOOPS Project (www.xoops.org) + * @copyright (c) 2000-2015 XOOPS Project (www.xoops.org) * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html) * @author Taiwen Jiang <ph...@us...> * @since 1.00 @@ -20,7 +20,7 @@ * Art Object * * @author D.J. (phppp) - * @copyright (c) 2000-2014 XOOPS Project (www.xoops.org) + * @copyright (c) 2000-2015 XOOPS Project (www.xoops.org) * @package module::article * * {@link XoopsObject} @@ -47,7 +47,7 @@ * @package module::article * * @author D.J. (phppp) -* @copyright (c) 2000-2014 XOOPS Project (www.xoops.org) +* @copyright (c) 2000-2015 XOOPS Project (www.xoops.org) * * {@link XoopsPersistableObjectHandler} * Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/Frameworks/art/xoops_version.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/Frameworks/art/xoops_version.php 2015-06-06 21:50:17 UTC (rev 13081) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/Frameworks/art/xoops_version.php 2015-06-06 21:59:41 UTC (rev 13082) @@ -2,7 +2,7 @@ /** * Xoops Frameworks addon: art * - * @copyright (c) 2000-2014 XOOPS Project (www.xoops.org) + * @copyright (c) 2000-2015 XOOPS Project (www.xoops.org) * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html) * @author Taiwen Jiang <ph...@us...> * @since 1.00 Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/Frameworks/art/xoopsart.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/Frameworks/art/xoopsart.php 2015-06-06 21:50:17 UTC (rev 13081) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/Frameworks/art/xoopsart.php 2015-06-06 21:59:41 UTC (rev 13082) @@ -2,7 +2,7 @@ /** * Xoops Frameworks addon: art * - * @copyright (c) 2000-2014 XOOPS Project (www.xoops.org) + * @copyright (c) 2000-2015 XOOPS Project (www.xoops.org) * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html) * @author Taiwen Jiang <ph...@us...> * @since 1.00 Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/Frameworks/moduleclasses/moduleadmin/language/english/main.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/Frameworks/moduleclasses/moduleadmin/language/english/main.php 2015-06-06 21:50:17 UTC (rev 13081) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/Frameworks/moduleclasses/moduleadmin/language/english/main.php 2015-06-06 21:59:41 UTC (rev 13082) @@ -10,7 +10,7 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * * @copyright Grégory Mage (Aka Mage) - * @copyright (c) 2000-2014 XOOPS Project (www.xoops.org) + * @copyright (c) 2000-2015 XOOPS Project (www.xoops.org) * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html) * @author Grégory Mage (Aka Mage) */ Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/Frameworks/moduleclasses/moduleadmin/moduleadmin.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/Frameworks/moduleclasses/moduleadmin/moduleadmin.php 2015-06-06 21:50:17 UTC (rev 13081) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/Frameworks/moduleclasses/moduleadmin/moduleadmin.php 2015-06-06 21:59:41 UTC (rev 13082) @@ -10,7 +10,7 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * * @copyright Grégory Mage (Aka Mage) - * @copyright (c) 2000-2014 XOOPS Project (www.xoops.org) + * @copyright (c) 2000-2015 XOOPS Project (www.xoops.org) * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html) * @author Grégory Mage (Aka Mage) */ Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/Frameworks/moduleclasses/moduleadmin/xoops_version.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/Frameworks/moduleclasses/moduleadmin/xoops_version.php 2015-06-06 21:50:17 UTC (rev 13081) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/Frameworks/moduleclasses/moduleadmin/xoops_version.php 2015-06-06 21:59:41 UTC (rev 13082) @@ -10,7 +10,7 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * * @copyright Grégory Mage (Aka Mage) - * @copyright (c) 2000-2014 XOOPS Project (www.xoops.org) + * @copyright (c) 2000-2015 XOOPS Project (www.xoops.org) * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html) * @author Grégory Mage (Aka Mage) */ Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/admin.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/admin.php 2015-06-06 21:50:17 UTC (rev 13081) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/admin.php 2015-06-06 21:59:41 UTC (rev 13082) @@ -9,7 +9,7 @@ * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * - * @copyright (c) 2000-2014 XOOPS Project (www.xoops.org) + * @copyright (c) 2000-2015 XOOPS Project (www.xoops.org) * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html) * @version $Id$ */ Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/backend.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/backend.php 2015-06-06 21:50:17 UTC (rev 13081) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/backend.php 2015-06-06 21:59:41 UTC (rev 13082) @@ -9,7 +9,7 @@ * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * - * @copyright (c) 2000-2014 XOOPS Project (www.xoops.org) + * @copyright (c) 2000-2015 XOOPS Project (www.xoops.org) * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html) * @since 2.0.0 * @version $Id$ Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/banners.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/banners.php 2015-06-06 21:50:17 UTC (rev 13081) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/banners.php 2015-06-06 21:59:41 UTC (rev 13082) @@ -9,7 +9,7 @@ * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * - * @copyright (c) 2000-2014 XOOPS Project (www.xoops.org) + * @copyright (c) 2000-2015 XOOPS Project (www.xoops.org) * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html) * @since 2.0.0 * @author Kazumi Ono <web...@my...> Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/browse.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/browse.php 2015-06-06 21:50:17 UTC (rev 13081) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/browse.php 2015-06-06 21:59:41 UTC (rev 13082) @@ -9,7 +9,7 @@ * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * - * @copyright (c) 2000-2014 XOOPS Project (www.xoops.org) + * @copyright (c) 2000-2015 XOOPS Project (www.xoops.org) * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html) * @package core * @since 2.4.0 Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/class/auth/auth.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/class/auth/auth.php 2015-06-06 21:50:17 UTC (rev 13081) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/class/auth/auth.php 2015-06-06 21:59:41 UTC (rev 13082) @@ -9,7 +9,7 @@ * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * - * @copyright (c) 2000-2014 XOOPS Project (www.xoops.org) + * @copyright (c) 2000-2015 XOOPS Project (www.xoops.org) * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html) * @package kernel * @subpackage auth @@ -26,7 +26,7 @@ * @subpackage auth * @description Authentification base class * @author Pierre-Eric MENUET <pe...@fr...> - * @copyright (c) 2000-2014 XOOPS Project (www.xoops.org) + * @copyright (c) 2000-2015 XOOPS Project (www.xoops.org) */ class XoopsAuth { Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/class/auth/auth_ads.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/class/auth/auth_ads.php 2015-06-06 21:50:17 UTC (rev 13081) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/class/auth/auth_ads.php 2015-06-06 21:59:41 UTC (rev 13082) @@ -9,7 +9,7 @@ * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * - * @copyright (c) 2000-2014 XOOPS Project (www.xoops.org) + * @copyright (c) 2000-2015 XOOPS Project (www.xoops.org) * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html) * @package kernel * @subpackage auth @@ -26,7 +26,7 @@ * @subpackage auth * @description Authentification class for Active Directory * @author Pierre-Eric MENUET <pe...@fr...> - * @copyright (c) 2000-2014 XOOPS Project (www.xoops.org) + * @copyright (c) 2000-2015 XOOPS Project (www.xoops.org) */ include_once $GLOBALS['xoops']->path('class/auth/auth_ldap.php'); @@ -35,7 +35,7 @@ * * @package * @author John - * @copyright (c) 2000-2014 XOOPS Project (www.xoops.org) + * @copyright (c) 2000-2015 XOOPS Project (www.xoops.org) * @version $Id$ * @access public */ Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/class/auth/auth_ldap.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/class/auth/auth_ldap.php 2015-06-06 21:50:17 UTC (rev 13081) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/class/auth/auth_ldap.php 2015-06-06 21:59:41 UTC (rev 13082) @@ -25,7 +25,7 @@ * @subpackage auth * @description Authentification class for standard LDAP Server V2 or V3 * @author Pierre-Eric MENUET <pe...@fr...> - * @copyright (c) 2000-2014 XOOPS Project (www.xoops.org) + * @copyright (c) 2000-2015 XOOPS Project (www.xoops.org) */ if (file_exists($file = $GLOBALS['xoops']->path('class/auth/auth_provisionning.php'))) { include_once $file; @@ -42,7 +42,7 @@ * * @package * @author John - * @copyright (... [truncated message content] |
From: <be...@us...> - 2015-06-06 21:50:20
|
Revision: 13081 http://sourceforge.net/p/xoops/svn/13081 Author: beckmi Date: 2015-06-06 21:50:17 +0000 (Sat, 06 Jun 2015) Log Message: ----------- Update: XOOPS links point to http://xoops.org Modified Paths: -------------- XoopsCore/branches/2.5.x/2.5.8/htdocs/class/auth/auth_ldap.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopsfilterinput.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopsform/formselectuser.php XoopsCore/branches/2.5.x/2.5.8/htdocs/footer.php XoopsCore/branches/2.5.x/2.5.8/htdocs/install/css/reset.css XoopsCore/branches/2.5.x/2.5.8/htdocs/install/include/makedata.php XoopsCore/branches/2.5.x/2.5.8/htdocs/install/language/english/finish.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/themes/default/default.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/themes/default/xotpl/xo_accordion.html XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/themes/default/xotpl/xo_footer.html XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/themes/legacy/theme.html XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/themes/zetadigme/css/reset.css XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/themes/zetadigme/xotpl/xo_accordion.html XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/themes/zetadigme/xotpl/xo_footer.html XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/themes/zetadigme/xotpl/xo_footerstatic.html XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/themes/zetadigme/zetadigme.php XoopsCore/branches/2.5.x/2.5.8/htdocs/themes/suico/css/baradmin.css XoopsCore/branches/2.5.x/2.5.8/htdocs/themes/suico/css/globalnav.css XoopsCore/branches/2.5.x/2.5.8/htdocs/themes/suico/css/layout-soup.css XoopsCore/branches/2.5.x/2.5.8/htdocs/themes/suico/css/print.css XoopsCore/branches/2.5.x/2.5.8/htdocs/themes/suico/css/style.css XoopsCore/branches/2.5.x/2.5.8/htdocs/themes/suico/css/userbar.css XoopsCore/branches/2.5.x/2.5.8/htdocs/themes/suico/language/english/main.php XoopsCore/branches/2.5.x/2.5.8/htdocs/themes/suico/xotpl/xo_footerstatic.html XoopsCore/branches/2.5.x/2.5.8/htdocs/themes/xbootstrap/modules/publisher/xoops_and_module_changes/modules/publisher/item.php XoopsCore/branches/2.5.x/2.5.8/htdocs/themes/xbootstrap/modules/publisher/xoops_and_module_changes/modules/publisher/search.php XoopsCore/branches/2.5.x/2.5.8/htdocs/themes/zetagenesis/xotpl/xo_footerstatic.html XoopsCore/branches/2.5.x/2.5.8/htdocs/themes/zetagenesis/xotpl/xo_headerstatic.html Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/class/auth/auth_ldap.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/class/auth/auth_ldap.php 2015-06-03 12:38:08 UTC (rev 13080) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/class/auth/auth_ldap.php 2015-06-06 21:50:17 UTC (rev 13081) @@ -9,7 +9,7 @@ * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * - * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/ + * @copyright The XOOPS Project (http://xoops.org) * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html) * @package kernel * @subpackage auth Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopsfilterinput.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopsfilterinput.php 2015-06-03 12:38:08 UTC (rev 13080) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopsfilterinput.php 2015-06-06 21:50:17 UTC (rev 13081) @@ -26,7 +26,7 @@ * @author Richard Griffith <ri...@ge...> * @copyright 2005 Daniel Morris * @copyright 2005 - 2013 Open Source Matters, Inc. All rights reserved. - * @copyright 2011-2014 The XOOPS Project http://sourceforge.net/projects/xoops/ + * @copyright 2011-2014 The XOOPS Project (http://xoops.org) * @license GNU GPL 2 or later (http://www.gnu.org/licenses/gpl-2.0.html) * @version Release: 1.0 * @link http://xoops.org Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopsform/formselectuser.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopsform/formselectuser.php 2015-06-03 12:38:08 UTC (rev 13080) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopsform/formselectuser.php 2015-06-06 21:50:17 UTC (rev 13081) @@ -11,7 +11,7 @@ * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * - * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/ + * @copyright The XOOPS Project (http://xoops.org) * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html) * @package kernel * @subpackage form Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/footer.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/footer.php 2015-06-03 12:38:08 UTC (rev 13080) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/footer.php 2015-06-06 21:50:17 UTC (rev 13081) @@ -29,7 +29,7 @@ if ($xoopsOption['theme_use_smarty'] == 0) { // the old way - $footer = htmlspecialchars($xoopsConfigMetaFooter['footer']) . '<br /><div class="txtcenter small">Powered by XOOPS © <a href="http://xoops.sourceforge.net" rel="external" title="The XOOPS Project">The XOOPS Project</a></div>'; + $footer = htmlspecialchars($xoopsConfigMetaFooter['footer']) . '<br /><div class="txtcenter small">Powered by XOOPS © <a href="http://xoops.org" rel="external" title="The XOOPS Project">The XOOPS Project</a></div>'; if (isset($xoopsOption['template_main'])) { $xoopsTpl->caching = 0; $xoopsTpl->display('db:' . $xoopsOption['template_main']); Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/install/css/reset.css =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/install/css/reset.css 2015-06-03 12:38:08 UTC (rev 13080) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/install/css/reset.css 2015-06-06 21:50:17 UTC (rev 13081) @@ -7,7 +7,7 @@ * @package themes * @since 2.5.x * @author Kris <http://www.xoofoo.org/> - * @maintained The XOOPS Project http://sourceforge.net/projects/xoops/ + * @maintained The XOOPS Project (http://xoops.org) * * @version $Id */ Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/install/include/makedata.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/install/include/makedata.php 2015-06-03 12:38:08 UTC (rev 13080) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/install/include/makedata.php 2015-06-06 21:50:17 UTC (rev 13081) @@ -199,7 +199,7 @@ $dbm->insert('config', " VALUES (36, 0, 2, 'maxuname', '_MD_AM_MAXUNAME', '10', '_MD_AM_MAXUNAMEDSC', 'textbox', 'int', 3)"); $dbm->insert('config', " VALUES (37, 0, 1, 'bad_ips', '_MD_AM_BADIPS', '" . addslashes(serialize(array('127.0.0.1'))) . "', '_MD_AM_BADIPSDSC', 'textarea', 'array', 42)"); $dbm->insert('config', " VALUES (38, 0, 3, 'meta_keywords', '_MD_AM_METAKEY', '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', '_MD_AM_METAKEYDSC', 'textarea', 'text', 0)"); - $dbm->insert('config', " VALUES (39, 0, 3, 'footer', '_MD_AM_FOOTER', 'Powered by XOOPS © 2001-" . date('Y', time()) . " <a href=\"http://xoops.sourceforge.net\" rel=\"external\" title=\"The XOOPS Project\">The XOOPS Project</a>', '_MD_AM_FOOTERDSC', 'textarea', 'text', 20)"); + $dbm->insert('config', " VALUES (39, 0, 3, 'footer', '_MD_AM_FOOTER', 'Powered by XOOPS © 2001-" . date('Y', time()) . " <a href=\"http://xoops.org\" rel=\"external\" title=\"The XOOPS Project\">The XOOPS Project</a>', '_MD_AM_FOOTERDSC', 'textarea', 'text', 20)"); $dbm->insert('config', " VALUES (40, 0, 4, 'censor_enable', '_MD_AM_DOCENSOR', '0', '_MD_AM_DOCENSORDSC', 'yesno', 'int', 0)"); $dbm->insert('config', " VALUES (41, 0, 4, 'censor_words', '_MD_AM_CENSORWRD', '" . addslashes(serialize(array('fuck', 'shit'))) . "', '_MD_AM_CENSORWRDDSC', 'textarea', 'array', 1)"); $dbm->insert('config', " VALUES (42, 0, 4, 'censor_replace', '_MD_AM_CENSORRPLC', '#OOPS#', '_MD_AM_CENSORRPLCDSC', 'textbox', 'text', 2)"); Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/install/language/english/finish.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/install/language/english/finish.php 2015-06-03 12:38:08 UTC (rev 13080) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/install/language/english/finish.php 2015-06-06 21:50:17 UTC (rev 13081) @@ -8,7 +8,7 @@ "<h3>Your site</h3> <p>You can now access the <a href='../index.php'>home page of your site</a>.</p> <h3>Support</h3> -<p>Visit <a href='http://xoops.sourceforge.net/' rel='external'>The XOOPS Project</a></p> +<p>Visit <a href='http://xoops.org/' rel='external'>The XOOPS Project</a></p> <p><strong>ATTENTION :</strong> Your site currently contains the minimum functionality, if you want to add content: text pages, photo gallery, forum, links directory, ... You must first download from the <a href='http://www.xoops.org/modules/repository' rel='external' title='Choice and download modules'>library of your local support</a> and install these components, it is the same for <a href='http://www.xoops.org/modules/extgallery' rel='external' title='Select and Install new themes'>design (theme) Additional</a>.</p> "; Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/themes/default/default.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/themes/default/default.php 2015-06-03 12:38:08 UTC (rev 13080) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/themes/default/default.php 2015-06-06 21:50:17 UTC (rev 13081) @@ -250,7 +250,7 @@ //add OPTIONS/Links Menu Items $menu = array(); $menu[] = array( - 'link' => 'http://sourceforge.net/projects/xoops/', + 'link' => 'http://xoops.org', 'title' => _OXYGEN_XOOPSPROJECT, 'absolute' => 1); $menu[] = array( Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/themes/default/xotpl/xo_accordion.html =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/themes/default/xotpl/xo_accordion.html 2015-06-03 12:38:08 UTC (rev 13080) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/themes/default/xotpl/xo_accordion.html 2015-06-06 21:50:17 UTC (rev 13081) @@ -87,7 +87,7 @@ <div class="pane"> <table> <tr> - <td><a rel="external" href="http://sourceforge.net/projects/xoops"><{$smarty.const._OXYGEN_XOOPSPROJECT}></a></td> + <td><a rel="external" href="http://xoops.org"><{$smarty.const._OXYGEN_XOOPSPROJECT}></a></td> <td><a rel="external" href="http://xoops.org"><{$smarty.const._OXYGEN_WEBSITE}></a></td> </tr> <tr> @@ -117,4 +117,4 @@ $(this).next().slideDown("fast"); } }); -</script> \ No newline at end of file +</script> Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/themes/default/xotpl/xo_footer.html =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/themes/default/xotpl/xo_footer.html 2015-06-03 12:38:08 UTC (rev 13080) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/themes/default/xotpl/xo_footer.html 2015-06-06 21:50:17 UTC (rev 13081) @@ -1,5 +1,5 @@ <div id='xo-footer'> - <div id="xo-footer-body">Powered by <a class="tooltip" rel="external" href="http://sourceforge.net/projects/xoops/" title="Xoops Project"><{$xoops_version}></a> © 2001-<{$smarty.now|date_format:"%Y"}></div> + <div id="xo-footer-body">Powered by <a class="tooltip" rel="external" href="http://xoops.org" title="Xoops Project"><{$xoops_version}></a> © 2001-<{$smarty.now|date_format:"%Y"}></div> <div id="xo-footer-rss" ><a class="tooltip" rel="external" href="<{xoAppUrl backend.php}>" title="<{$smarty.const._OXYGEN_RSS}>"><img src="<{xoImgUrl img/feed.png}>" /></a></div> <div><{includeq file="$theme_tpl/xo_uptop.html"}></div> -</div> \ No newline at end of file +</div> Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/themes/legacy/theme.html =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/themes/legacy/theme.html 2015-06-03 12:38:08 UTC (rev 13080) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/themes/legacy/theme.html 2015-06-06 21:50:17 UTC (rev 13081) @@ -79,7 +79,7 @@ <tr> <td width='1%'><img src='<{xoImgUrl img/hbar_left.gif}>' width='16' height='23' alt="" /></td> <td width='99%' class='hbar_middle alignmiddle center'> - <div class='fontSmall'>Powered by <{$smarty.const.XOOPS_VERSION}> © 2001-<{$smarty.now|date_format:"%Y"}> <a href='http://xoops.sourceforge.net/' rel='external' title='The XOOPS Project'>The XOOPS Project</a></div> + <div class='fontSmall'>Powered by <{$smarty.const.XOOPS_VERSION}> © 2001-<{$smarty.now|date_format:"%Y"}> <a href='http://xoops.org/' rel='external' title='The XOOPS Project'>The XOOPS Project</a></div> </td> <td width='1%'><img src='<{xoImgUrl img/hbar_right.gif}>' width='10' height='23' alt="" /></td> </tr> @@ -88,4 +88,4 @@ </tr> </table> </body> -</html> \ No newline at end of file +</html> Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/themes/zetadigme/css/reset.css =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/themes/zetadigme/css/reset.css 2015-06-03 12:38:08 UTC (rev 13080) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/themes/zetadigme/css/reset.css 2015-06-06 21:50:17 UTC (rev 13081) @@ -5,7 +5,7 @@ * @package admin themes * @since 2.5.x * @author Kris <http://www.xoofoo.org/> - * @maintained The XOOPS Project http://sourceforge.net/projects/xoops/ + * @maintained The XOOPS Project (http://xoops.org) * * @version $Id */ Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/themes/zetadigme/xotpl/xo_accordion.html =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/themes/zetadigme/xotpl/xo_accordion.html 2015-06-03 12:38:08 UTC (rev 13080) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/themes/zetadigme/xotpl/xo_accordion.html 2015-06-06 21:50:17 UTC (rev 13081) @@ -135,7 +135,7 @@ <table> <tr> <td> - <a class="tooltip" rel="external" href="http://sourceforge.net/projects/xoops" title="<{$lang_xoops_xoopsproject}>"><{$lang_xoops_xoopsproject}></a> + <a class="tooltip" rel="external" href="http://xoops.org" title="<{$lang_xoops_xoopsproject}>"><{$lang_xoops_xoopsproject}></a> </td> <td> <a class="tooltip" rel="external" href="http://www.xoops.org/modules/xoopspartners" title="<{$lang_xoops_localsupport}>"><{$lang_xoops_localsupport}></a> Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/themes/zetadigme/xotpl/xo_footer.html =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/themes/zetadigme/xotpl/xo_footer.html 2015-06-03 12:38:08 UTC (rev 13080) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/themes/zetadigme/xotpl/xo_footer.html 2015-06-06 21:50:17 UTC (rev 13081) @@ -1 +1 @@ -<div id="xo-footer">Powered by <a rel="external" href="http://sourceforge.net/projects/xoops/" title="Xoops Project"><{$xoops_version}></a></div> +<div id="xo-footer">Powered by <a rel="external" href="http://xoops.org" title="Xoops Project"><{$xoops_version}></a></div> Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/themes/zetadigme/xotpl/xo_footerstatic.html =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/themes/zetadigme/xotpl/xo_footerstatic.html 2015-06-03 12:38:08 UTC (rev 13080) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/themes/zetadigme/xotpl/xo_footerstatic.html 2015-06-06 21:50:17 UTC (rev 13081) @@ -32,7 +32,7 @@ <li class="chat text"><a href="#" title="<{$smarty.const.THEME_UPTOP}>"><img src="<{xoImgUrl img/up.png}>" alt="<{$smarty.const.THEME_UPTOP}>" /></a></li> <li class="chat separate"> </li> - <li class="chat text">Powered by <a href="http://sourceforge.net/projects/xoops/" title="XOOPS Project HomePage"><{$xoops_version}></a></li> + <li class="chat text">Powered by <a href="http://xoops.org" title="XOOPS Project HomePage"><{$xoops_version}></a></li> <li class="chat separate"> </li> <li class="chat"><a href="<{xoAppUrl /user.php op=logout}>" title="<{$smarty.const._LOGOUT}>" ><img src="<{xoImgUrl img/logout.png}>" alt="<{$smarty.const._LOGOUT}>"/></a></li> <!-- for my message box --> Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/themes/zetadigme/zetadigme.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/themes/zetadigme/zetadigme.php 2015-06-03 12:38:08 UTC (rev 13080) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/themes/zetadigme/zetadigme.php 2015-06-06 21:50:17 UTC (rev 13081) @@ -298,8 +298,8 @@ 'absolute' => 1, 'icon' => XOOPS_ADMINTHEME_URL . '/zetadigme/icons/xoops.png'); $menu[] = array( - 'link' => 'http://sourceforge.net/projects/xoops/', - 'title' => 'Sourceforge', + 'link' => 'http://xoops.org', + 'title' => 'XOOPS', 'absolute' => 1); $tpl->append('navitems', array('link' => XOOPS_URL . '/admin.php','text' => _AD_INTERESTSITES, 'menu' => $menu)); //add OPTIONS/links for local support Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/themes/suico/css/baradmin.css =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/themes/suico/css/baradmin.css 2015-06-03 12:38:08 UTC (rev 13080) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/themes/suico/css/baradmin.css 2015-06-06 21:50:17 UTC (rev 13081) @@ -6,7 +6,7 @@ * @package themes * @since 2.5.x * @author Kris <http://www.xoofoo.org/> - * @maintained The XOOPS Project http://sourceforge.net/projects/xoops/ + * @maintained The XOOPS Project (http://xoops.org) * * @version $Id$ */ Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/themes/suico/css/globalnav.css =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/themes/suico/css/globalnav.css 2015-06-03 12:38:08 UTC (rev 13080) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/themes/suico/css/globalnav.css 2015-06-06 21:50:17 UTC (rev 13081) @@ -6,7 +6,7 @@ * @package themes * @since 2.5.x * @author Kris <http://www.xoofoo.org/> - * @maintained The XOOPS Project http://sourceforge.net/projects/xoops/ + * @maintained The XOOPS Project (http://xoops.org) * @thanks http://www.getintothis.com * @version $Id$ */ Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/themes/suico/css/layout-soup.css =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/themes/suico/css/layout-soup.css 2015-06-03 12:38:08 UTC (rev 13080) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/themes/suico/css/layout-soup.css 2015-06-06 21:50:17 UTC (rev 13081) @@ -6,7 +6,7 @@ * @package themes * @since 2.5.x * @author Kris <http://www.xoofoo.org/> - * @maintained The XOOPS Project http://sourceforge.net/projects/xoops/ + * @maintained The XOOPS Project (http://xoops.org) * * @version $Id$ */ Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/themes/suico/css/print.css =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/themes/suico/css/print.css 2015-06-03 12:38:08 UTC (rev 13080) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/themes/suico/css/print.css 2015-06-06 21:50:17 UTC (rev 13081) @@ -6,7 +6,7 @@ * @package themes * @since 2.5.x * @author Kris <http://www.xoofoo.org/> - * @maintained The XOOPS Project http://sourceforge.net/projects/xoops/ + * @maintained The XOOPS Project (http://xoops.org) * * @version $Id$ */ Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/themes/suico/css/style.css =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/themes/suico/css/style.css 2015-06-03 12:38:08 UTC (rev 13080) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/themes/suico/css/style.css 2015-06-06 21:50:17 UTC (rev 13081) @@ -6,7 +6,7 @@ * @package themes * @since 2.5.x * @author Kris <http://www.xoofoo.org/> - * @maintained The XOOPS Project http://sourceforge.net/projects/xoops/ + * @maintained The XOOPS Project (http://xoops.org) * * @version $Id$ */ Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/themes/suico/css/userbar.css =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/themes/suico/css/userbar.css 2015-06-03 12:38:08 UTC (rev 13080) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/themes/suico/css/userbar.css 2015-06-06 21:50:17 UTC (rev 13081) @@ -6,7 +6,7 @@ * @package themes * @since 2.5.x * @author Kris <http://www.xoofoo.org/> - * @maintained The XOOPS Project http://sourceforge.net/projects/xoops/ + * @maintained The XOOPS Project (http://xoops.org) * @thanks http://www.sohtanaka.com * @version $Id$ */ Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/themes/suico/language/english/main.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/themes/suico/language/english/main.php 2015-06-03 12:38:08 UTC (rev 13080) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/themes/suico/language/english/main.php 2015-06-06 21:50:17 UTC (rev 13081) @@ -7,7 +7,7 @@ * @package themes * @since 2.5.x * @author Kris <http://www.xoofoo.org/> - * @maintained The XOOPS Project http://sourceforge.net/projects/xoops/ + * @maintained The XOOPS Project (http://xoops.org) * * @version $Id */ Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/themes/suico/xotpl/xo_footerstatic.html =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/themes/suico/xotpl/xo_footerstatic.html 2015-06-03 12:38:08 UTC (rev 13080) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/themes/suico/xotpl/xo_footerstatic.html 2015-06-06 21:50:17 UTC (rev 13081) @@ -32,7 +32,7 @@ <li class="chat text"><a href="#" title="<{$smarty.const.THEME_UPTOP}>"><img src="<{xoImgUrl icons/footer/up.png}>" alt="<{$smarty.const.THEME_UPTOP}>" alt=""/></a></li> <li class="chat separate"> </li> - <li class="chat text">Powered by <a href="http://sourceforge.net/projects/xoops/" title="XOOPS Project HomePage"><{$xoops_version}></a></li> + <li class="chat text">Powered by <a href="http://xoops.org" title="XOOPS Project HomePage"><{$xoops_version}></a></li> <li class="chat separate"> </li> <li class="chat"><a href="<{xoAppUrl /user.php op=logout}>" title="<{$smarty.const._LOGOUT}>" ><img src="<{xoImgUrl icons/footer/logout.png}>" alt="<{$smarty.const._LOGOUT}>"/></a></li> <!-- for my message box --> Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/themes/xbootstrap/modules/publisher/xoops_and_module_changes/modules/publisher/item.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/themes/xbootstrap/modules/publisher/xoops_and_module_changes/modules/publisher/item.php 2015-06-03 12:38:08 UTC (rev 13080) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/themes/xbootstrap/modules/publisher/xoops_and_module_changes/modules/publisher/item.php 2015-06-06 21:50:17 UTC (rev 13081) @@ -40,9 +40,9 @@ exit(); } -$xoopsOption['template_main'] = 'publisher_item.html'; +$xoopsOption['template_main'] = 'publisher_item.tpl'; include_once XOOPS_ROOT_PATH . '/header.php'; -$xoTheme->addStylesheet(PUBLISHER_URL . '/css/jquery.popeye.style.css'); +$xoTheme->addStylesheet(PUBLISHER_URL . '/assets/css/jquery.popeye.style.css'); $xoTheme->addScript(XOOPS_URL . '/browse.php?Frameworks/jquery/jquery.js'); $xoTheme->addScript(PUBLISHER_URL . '/js/jquery.popeye-2.0.4.js'); //$xoTheme->addScript(PUBLISHER_URL . '/js/publisher.js'); @@ -218,8 +218,8 @@ if ($publisher->getConfig('perm_rating')) { $xoopsTpl->assign('rating_enabled', true); $item['ratingbar'] = publisher_ratingBar($itemid); - $xoTheme->addScript(PUBLISHER_URL . '/js/behavior.js'); - $xoTheme->addScript(PUBLISHER_URL . '/js/rating.js'); + $xoTheme->addScript(PUBLISHER_URL . '/assets/js/behavior.js'); + $xoTheme->addScript(PUBLISHER_URL . '/assets/js/rating.js'); } $xoopsTpl->assign('item', $item); Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/themes/xbootstrap/modules/publisher/xoops_and_module_changes/modules/publisher/search.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/themes/xbootstrap/modules/publisher/xoops_and_module_changes/modules/publisher/search.php 2015-06-03 12:38:08 UTC (rev 13080) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/themes/xbootstrap/modules/publisher/xoops_and_module_changes/modules/publisher/search.php 2015-06-06 21:50:17 UTC (rev 13081) @@ -43,7 +43,7 @@ } $xoopsConfig["module_cache"][$module_id] = 0; -$xoopsOption["template_main"] = 'publisher_search.html'; +$xoopsOption["template_main"] = 'publisher_search.tpl'; include XOOPS_ROOT_PATH . '/header.php'; $module_info_search = $publisher->getModule()->getInfo("search"); @@ -257,4 +257,3 @@ } include XOOPS_ROOT_PATH . "/footer.php"; -?> Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/themes/zetagenesis/xotpl/xo_footerstatic.html =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/themes/zetagenesis/xotpl/xo_footerstatic.html 2015-06-03 12:38:08 UTC (rev 13080) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/themes/zetagenesis/xotpl/xo_footerstatic.html 2015-06-06 21:50:17 UTC (rev 13081) @@ -32,7 +32,7 @@ <li class="chat text"><a href="#" title="<{$smarty.const.THEME_UPTOP}>"><img src="<{xoImgUrl icons/footer/up.png}>" alt="<{$smarty.const.THEME_UPTOP}>" alt=""/></a></li> <li class="chat separate"> </li> - <li class="chat text">Powered by <a href="http://sourceforge.net/projects/xoops/" title="XOOPS Project HomePage"><{$xoops_version}></a></li> + <li class="chat text">Powered by <a href="http://xoops.org" title="XOOPS Project HomePage"><{$xoops_version}></a></li> <li class="chat separate"> </li> <li class="chat"><a href="<{xoAppUrl /user.php op=logout}>" title="<{$smarty.const._LOGOUT}>" ><img src="<{xoImgUrl icons/footer/logout.png}>" alt="<{$smarty.const._LOGOUT}>"/></a></li> <!-- for my message box --> Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/themes/zetagenesis/xotpl/xo_headerstatic.html =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/themes/zetagenesis/xotpl/xo_headerstatic.html 2015-06-03 12:38:08 UTC (rev 13080) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/themes/zetagenesis/xotpl/xo_headerstatic.html 2015-06-06 21:50:17 UTC (rev 13081) @@ -32,7 +32,7 @@ <li class="chat text"><a href="#" title="<{$smarty.const.THEME_UPTOP}>"><img src="<{xoImgUrl icons/footer/up.png}>" alt="<{$smarty.const.THEME_UPTOP}>" alt=""/></a></li> <li class="chat separate"> </li> - <li class="chat text">Powered by <a href="http://sourceforge.net/projects/xoops/" title="XOOPS Project HomePage"><{$xoops_version}></a></li> + <li class="chat text">Powered by <a href="http://xoops.org" title="XOOPS Project HomePage"><{$xoops_version}></a></li> <li class="chat separate"> </li> <li class="chat"><a href="<{xoAppUrl /user.php op=logout}>" title="<{$smarty.const._LOGOUT}>" ><img src="<{xoImgUrl icons/footer/logout.png}>" alt="<{$smarty.const._LOGOUT}>"/></a></li> <!-- for my message box --> |
From: <txm...@us...> - 2015-06-03 12:38:10
|
Revision: 13080 http://sourceforge.net/p/xoops/svn/13080 Author: txmodxoops Date: 2015-06-03 12:38:08 +0000 (Wed, 03 Jun 2015) Log Message: ----------- Added jquery ui tabs Modified Paths: -------------- XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/fields.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/modules.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/tables.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/language/english/admin.php Modified: XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/fields.php =================================================================== --- XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/fields.php 2015-06-03 10:51:58 UTC (rev 13079) +++ XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/fields.php 2015-06-03 12:38:08 UTC (rev 13080) @@ -8,6 +8,7 @@ but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. */ + /** * tdmcreatereate module * Modified: XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/modules.php =================================================================== --- XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/modules.php 2015-06-03 10:51:58 UTC (rev 13079) +++ XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/modules.php 2015-06-03 12:38:08 UTC (rev 13080) @@ -17,7 +17,6 @@ * @package tdmcreate * @since 2.5.7 * @author TDM TEAM DEV MODULE - * @version $Id: modules.php 12209 2013-10-23 02:49:09Z beckmi $ * @version $Id: modules.php 13040 2015-04-25 15:12:12Z timgno $ */ defined('XOOPS_ROOT_PATH') or die('Restricted access'); @@ -185,36 +184,38 @@ // $form = new XoopsThemeForm($title, 'moduleform', $action, 'post', true); $form->setExtra('enctype="multipart/form-data"'); + // + $tabTray = new TDMCreateFormTabTray('', 'uniqueid', xoops_getModuleOption('jquery_theme', 'system')); + // + $tab1 = new TDMCreateFormTab(_AM_TDMCREATE_IMPORTANT, 'important'); // - $form->insertBreak('<div class="center"><b>' . _AM_TDMCREATE_MODULE_IMPORTANT . '</b></div>', 'head'); - // $modName = $isNew ? $set['name'] : $this->getVar('mod_name'); $modName = new XoopsFormText(_AM_TDMCREATE_MODULE_NAME, 'mod_name', 50, 255, $modName); $modName->setDescription(_AM_TDMCREATE_MODULE_NAME_DESC); - $form->addElement($modName, true); + $tab1->addElement($modName, true); // $modDirname = $isNew ? $set['dirname'] : $this->getVar('mod_dirname'); $modDirname = new XoopsFormText(_AM_TDMCREATE_MODULE_DIRNAME, 'mod_dirname', 25, 255, $modDirname); $modDirname->setDescription(_AM_TDMCREATE_MODULE_DIRNAME_DESC); - $form->addElement($modDirname, true); + $tab1->addElement($modDirname, true); // $modVersion = $isNew ? $set['version'] : $this->getVar('mod_version'); - $form->addElement(new XoopsFormText(_AM_TDMCREATE_MODULE_VERSION, 'mod_version', 10, 25, $modVersion), true); + $tab1->addElement(new XoopsFormText(_AM_TDMCREATE_MODULE_VERSION, 'mod_version', 10, 25, $modVersion), true); // $modSince = $isNew ? $set['since'] : $this->getVar('mod_since'); - $form->addElement(new XoopsFormText(_AM_TDMCREATE_MODULE_SINCE, 'mod_since', 10, 25, $modSince), true); + $tab1->addElement(new XoopsFormText(_AM_TDMCREATE_MODULE_SINCE, 'mod_since', 10, 25, $modSince), true); // $modMinPhp = $isNew ? $set['min_php'] : $this->getVar('mod_min_php'); - $form->addElement(new XoopsFormText(_AM_TDMCREATE_MODULE_MIN_PHP, 'mod_min_php', 10, 25, $modMinPhp), true); + $tab1->addElement(new XoopsFormText(_AM_TDMCREATE_MODULE_MIN_PHP, 'mod_min_php', 10, 25, $modMinPhp), true); // $modMinXoops = $isNew ? $set['min_xoops'] : $this->getVar('mod_min_xoops'); - $form->addElement(new XoopsFormText(_AM_TDMCREATE_MODULE_MIN_XOOPS, 'mod_min_xoops', 10, 25, $modMinXoops), true); + $tab1->addElement(new XoopsFormText(_AM_TDMCREATE_MODULE_MIN_XOOPS, 'mod_min_xoops', 10, 25, $modMinXoops), true); // $modMinAdmin = $isNew ? $set['min_admin'] : $this->getVar('mod_min_admin'); - $form->addElement(new XoopsFormText(_AM_TDMCREATE_MODULE_MIN_ADMIN, 'mod_min_admin', 10, 25, $modMinAdmin), true); + $tab1->addElement(new XoopsFormText(_AM_TDMCREATE_MODULE_MIN_ADMIN, 'mod_min_admin', 10, 25, $modMinAdmin), true); // $modMinMysql = $isNew ? $set['min_mysql'] : $this->getVar('mod_min_mysql'); - $form->addElement(new XoopsFormText(_AM_TDMCREATE_MODULE_MIN_MYSQL, 'mod_min_mysql', 10, 25, $modMinMysql), true); + $tab1->addElement(new XoopsFormText(_AM_TDMCREATE_MODULE_MIN_MYSQL, 'mod_min_mysql', 10, 25, $modMinMysql), true); // Name description $editor_configs = array(); $editor_configs['name'] = 'mod_description'; @@ -224,12 +225,15 @@ $editor_configs['width'] = '50%'; $editor_configs['height'] = '100px'; $editor_configs['editor'] = $this->tdmcreate->getConfig('tdmcreate_editor'); - $form->addElement(new XoopsFormEditor(_AM_TDMCREATE_MODULE_DESCRIPTION, 'mod_description', $editor_configs), true); + $tab1->addElement(new XoopsFormEditor(_AM_TDMCREATE_MODULE_DESCRIPTION, 'mod_description', $editor_configs), true); // Author $modAuthor = $isNew ? $set['author'] : $this->getVar('mod_author'); - $form->addElement(new XoopsFormText(_AM_TDMCREATE_MODULE_AUTHOR, 'mod_author', 50, 255, $modAuthor), true); + $tab1->addElement(new XoopsFormText(_AM_TDMCREATE_MODULE_AUTHOR, 'mod_author', 50, 255, $modAuthor), true); $modLicense = $isNew ? $set['license'] : $this->getVar('mod_license'); - $form->addElement(new XoopsFormText(_AM_TDMCREATE_MODULE_LICENSE, 'mod_license', 50, 255, $modLicense), true); + $tab1->addElement(new XoopsFormText(_AM_TDMCREATE_MODULE_LICENSE, 'mod_license', 50, 255, $modLicense), true); + $tabTray->addElement($tab1); + // + $tab2 = new TDMCreateFormTab(_AM_TDMCREATE_OPTIONS_CHECK, 'options_check'); // $options_tray = new XoopsFormElementTray(_OPTIONS, '<br />'); // @@ -278,9 +282,12 @@ $check_mod_inroot_copy = new XoopsFormCheckBox(' ', 'mod_inroot_copy', $mod_inroot_copy); $check_mod_inroot_copy->addOption(1, _AM_TDMCREATE_MODULE_INROOT_MODULES_COPY); $options_tray->addElement($check_mod_inroot_copy); + + $tab2->addElement($options_tray); + $tabTray->addElement($tab2); + // + $tab3 = new TDMCreateFormTab(_AM_TDMCREATE_CREATE_IMAGE, 'create_image'); // - $form->addElement($options_tray); - // $modImage = $this->getVar('mod_image'); $modImage = $modImage ? $modImage : $set['image']; // @@ -300,7 +307,7 @@ $fileseltray->addElement(new XoopsFormFile(_AM_TDMCREATE_FORMUPLOAD, 'attachedfile', $this->tdmcreate->getConfig('maxsize'))); $fileseltray->addElement(new XoopsFormLabel('')); $imgtray->addElement($fileseltray); - $form->addElement($imgtray); + $tab3->addElement($imgtray); //---------- START LOGO GENERATOR ----------------- $tables_img = $this->getVar('table_image') ?: 'about.png'; $iconsdir = '/Frameworks/moduleclasses/icons/32'; @@ -324,69 +331,73 @@ $buttonLogoGenerator4 = new XoopsFormButton('', 'button4', _AM_TDMCREATE_MODULE_CREATENEWLOGO, 'button'); $buttonLogoGenerator4->setExtra("onclick='createNewModuleLogo(\"" . TDMC_URL . "\")'"); $createLogoTray->addElement($buttonLogoGenerator4); - // - $form->addElement($createLogoTray); + //$options_tray $form->addElement(); + $tab3->addElement($createLogoTray); + $tabTray->addElement($tab3); + // + $tab4 = new TDMCreateFormTab(_AM_TDMCREATE_NOT_IMPORTANT, 'not_important'); //------------ END LOGO GENERATOR -------------------- // - $form->insertBreak('<div class="center"><b>' . _AM_TDMCREATE_MODULE_NOTIMPORTANT . '</b></div>', 'head'); - // $modAuthorMail = $isNew ? $set['author_mail'] : $this->getVar('mod_author_mail'); - $form->addElement(new XoopsFormText(_AM_TDMCREATE_MODULE_AUTHOR_MAIL, 'mod_author_mail', 50, 255, $modAuthorMail)); + $tab4->addElement(new XoopsFormText(_AM_TDMCREATE_MODULE_AUTHOR_MAIL, 'mod_author_mail', 50, 255, $modAuthorMail)); // $modAuthorWebsiteUrl = $isNew ? $set['author_website_url'] : $this->getVar('mod_author_website_url'); - $form->addElement(new XoopsFormText(_AM_TDMCREATE_MODULE_AUTHOR_WEBSITE_URL, 'mod_author_website_url', 50, 255, $modAuthorWebsiteUrl)); + $tab4->addElement(new XoopsFormText(_AM_TDMCREATE_MODULE_AUTHOR_WEBSITE_URL, 'mod_author_website_url', 50, 255, $modAuthorWebsiteUrl)); // $modAuthorWebsiteName = $isNew ? $set['author_website_name'] : $this->getVar('mod_author_website_name'); - $form->addElement(new XoopsFormText(_AM_TDMCREATE_MODULE_AUTHOR_WEBSITE_NAME, 'mod_author_website_name', 50, 255, $modAuthorWebsiteName)); + $tab4->addElement(new XoopsFormText(_AM_TDMCREATE_MODULE_AUTHOR_WEBSITE_NAME, 'mod_author_website_name', 50, 255, $modAuthorWebsiteName)); // $modCredits = $isNew ? $set['credits'] : $this->getVar('mod_credits'); - $form->addElement(new XoopsFormText(_AM_TDMCREATE_MODULE_CREDITS, 'mod_credits', 50, 255, $modCredits)); + $tab4->addElement(new XoopsFormText(_AM_TDMCREATE_MODULE_CREDITS, 'mod_credits', 50, 255, $modCredits)); // $modReleaseInfo = $isNew ? $set['release_info'] : $this->getVar('mod_release_info'); - $form->addElement(new XoopsFormText(_AM_TDMCREATE_MODULE_RELEASE_INFO, 'mod_release_info', 50, 255, $modReleaseInfo)); + $tab4->addElement(new XoopsFormText(_AM_TDMCREATE_MODULE_RELEASE_INFO, 'mod_release_info', 50, 255, $modReleaseInfo)); // $modReleaseFile = $isNew ? $set['release_file'] : $this->getVar('mod_release_file'); - $form->addElement(new XoopsFormText(_AM_TDMCREATE_MODULE_RELEASE_FILE, 'mod_release_file', 50, 255, $modReleaseFile)); + $tab4->addElement(new XoopsFormText(_AM_TDMCREATE_MODULE_RELEASE_FILE, 'mod_release_file', 50, 255, $modReleaseFile)); // $modManual = $isNew ? $set['manual'] : $this->getVar('mod_manual'); - $form->addElement(new XoopsFormText(_AM_TDMCREATE_MODULE_MANUAL, 'mod_manual', 50, 255, $modManual)); + $tab4->addElement(new XoopsFormText(_AM_TDMCREATE_MODULE_MANUAL, 'mod_manual', 50, 255, $modManual)); // $modManualFile = $isNew ? $set['manual_file'] : $this->getVar('mod_manual_file'); - $form->addElement(new XoopsFormText(_AM_TDMCREATE_MODULE_MANUAL_FILE, 'mod_manual_file', 50, 255, $modManualFile)); + $tab4->addElement(new XoopsFormText(_AM_TDMCREATE_MODULE_MANUAL_FILE, 'mod_manual_file', 50, 255, $modManualFile)); // $modDemoSiteUrl = $isNew ? $set['demo_site_url'] : $this->getVar('mod_demo_site_url'); - $form->addElement(new XoopsFormText(_AM_TDMCREATE_MODULE_DEMO_SITE_URL, 'mod_demo_site_url', 50, 255, $modDemoSiteUrl)); + $tab4->addElement(new XoopsFormText(_AM_TDMCREATE_MODULE_DEMO_SITE_URL, 'mod_demo_site_url', 50, 255, $modDemoSiteUrl)); // $modDemoSiteName = $isNew ? $set['demo_site_name'] : $this->getVar('mod_demo_site_name'); - $form->addElement(new XoopsFormText(_AM_TDMCREATE_MODULE_DEMO_SITE_NAME, 'mod_demo_site_name', 50, 255, $modDemoSiteName)); + $tab4->addElement(new XoopsFormText(_AM_TDMCREATE_MODULE_DEMO_SITE_NAME, 'mod_demo_site_name', 50, 255, $modDemoSiteName)); // $modSupportUrl = $isNew ? $set['support_url'] : $this->getVar('mod_support_url'); - $form->addElement(new XoopsFormText(_AM_TDMCREATE_MODULE_SUPPORT_URL, 'mod_support_url', 50, 255, $modSupportUrl)); + $tab4->addElement(new XoopsFormText(_AM_TDMCREATE_MODULE_SUPPORT_URL, 'mod_support_url', 50, 255, $modSupportUrl)); // $modSupportName = $isNew ? $set['support_name'] : $this->getVar('mod_support_name'); - $form->addElement(new XoopsFormText(_AM_TDMCREATE_MODULE_SUPPORT_NAME, 'mod_support_name', 50, 255, $modSupportName)); + $tab4->addElement(new XoopsFormText(_AM_TDMCREATE_MODULE_SUPPORT_NAME, 'mod_support_name', 50, 255, $modSupportName)); // $modWebsiteUrl = $isNew ? $set['website_url'] : $this->getVar('mod_website_url'); - $form->addElement(new XoopsFormText(_AM_TDMCREATE_MODULE_WEBSITE_URL, 'mod_website_url', 50, 255, $modWebsiteUrl)); + $tab4->addElement(new XoopsFormText(_AM_TDMCREATE_MODULE_WEBSITE_URL, 'mod_website_url', 50, 255, $modWebsiteUrl)); // $modWebsiteName = $isNew ? $set['website_name'] : $this->getVar('mod_website_name'); - $form->addElement(new XoopsFormText(_AM_TDMCREATE_MODULE_WEBSITE_NAME, 'mod_website_name', 50, 255, $modWebsiteName)); + $tab4->addElement(new XoopsFormText(_AM_TDMCREATE_MODULE_WEBSITE_NAME, 'mod_website_name', 50, 255, $modWebsiteName)); // $modRelease = $isNew ? $set['release'] : $this->getVar('mod_release'); - $form->addElement(new XoopsFormText(_AM_TDMCREATE_MODULE_RELEASE, 'mod_release', 50, 255, $modRelease)); + $tab4->addElement(new XoopsFormText(_AM_TDMCREATE_MODULE_RELEASE, 'mod_release', 50, 255, $modRelease)); // $modStatus = $isNew ? $set['status'] : $this->getVar('mod_status'); - $form->addElement(new XoopsFormText(_AM_TDMCREATE_MODULE_STATUS, 'mod_status', 50, 255, $modStatus)); + $tab4->addElement(new XoopsFormText(_AM_TDMCREATE_MODULE_STATUS, 'mod_status', 50, 255, $modStatus)); // $modDonations = $isNew ? $set['donations'] : $this->getVar('mod_donations'); - $form->addElement(new XoopsFormText(_AM_TDMCREATE_MODULE_PAYPAL_BUTTON, 'mod_donations', 50, 255, $modDonations)); + $tab4->addElement(new XoopsFormText(_AM_TDMCREATE_MODULE_PAYPAL_BUTTON, 'mod_donations', 50, 255, $modDonations)); // $modSubversion = $isNew ? $set['subversion'] : $this->getVar('mod_subversion'); - $form->addElement(new XoopsFormText(_AM_TDMCREATE_MODULE_SUBVERSION, 'mod_subversion', 50, 255, $modSubversion)); + $tab4->addElement(new XoopsFormText(_AM_TDMCREATE_MODULE_SUBVERSION, 'mod_subversion', 50, 255, $modSubversion)); // - $form->addElement(new XoopsFormHidden('op', 'save')); - $form->addElement(new XoopsFormButton(_REQUIRED . ' <span class="red bold">*</span>', 'submit', _SUBMIT, 'submit')); - + $buttonTray = new XoopsFormElementTray(_REQUIRED . ' <sup class="red bold">*</sup>', ''); + $buttonTray->addElement(new XoopsFormHidden('op', 'save')); + $buttonTray->addElement(new XoopsFormButton('', 'submit', _SUBMIT, 'submit')); + $tab4->addElement($buttonTray); + $tabTray->addElement($tab4); + $form->addElement($tabTray); return $form; } Modified: XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/tables.php =================================================================== --- XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/tables.php 2015-06-03 10:51:58 UTC (rev 13079) +++ XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/tables.php 2015-06-03 12:38:08 UTC (rev 13080) @@ -123,214 +123,223 @@ } $isNew = $this->isNew(); - $table_name = $this->getVar('table_name'); - $table_mid = $this->getVar('table_mid'); + $tableName = $this->getVar('table_name'); + $tableMid = $this->getVar('table_mid'); $title = $isNew ? sprintf(_AM_TDMCREATE_TABLE_NEW) : sprintf(_AM_TDMCREATE_TABLE_EDIT); xoops_load('xoopsformloader'); $form = new XoopsThemeForm($title, 'tableform', $action, 'post', true); $form->setExtra('enctype="multipart/form-data"'); + // + $tabTray = new TDMCreateFormTabTray('', 'uniqueid', xoops_getModuleOption('jquery_theme', 'system')); + // + $tab1 = new TDMCreateFormTab(_AM_TDMCREATE_IMPORTANT, 'important'); // - $modules = $this->tdmcreate->getHandler('modules')->getObjects(null); - $mods_select = new XoopsFormSelect(_AM_TDMCREATE_TABLE_MODULES, 'table_mid', $table_mid); - $mods_select->addOption('', _AM_TDMCREATE_TABLE_MODSELOPT); + $modules = $this->tdmcreate->getHandler('modules')->getObjects(null); + $modulesSelect = new XoopsFormSelect(_AM_TDMCREATE_TABLE_MODULES, 'table_mid', $tableMid); + $modulesSelect->addOption('', _AM_TDMCREATE_TABLE_MODSELOPT); foreach ($modules as $mod) { - //$mods_select->addOptionArray(); - $mods_select->addOption($mod->getVar('mod_id'), $mod->getVar('mod_name')); + //$modulesSelect->addOptionArray(); + $modulesSelect->addOption($mod->getVar('mod_id'), $mod->getVar('mod_name')); } - $form->addElement($mods_select, true); + $tab1->addElement($modulesSelect, true); // - $table_name_field = new XoopsFormText(_AM_TDMCREATE_TABLE_NAME, 'table_name', 40, 150, $table_name); - $table_name_field->setDescription(_AM_TDMCREATE_TABLE_NAME_DESC); - $form->addElement($table_name_field, true); + $tableNameText = new XoopsFormText(_AM_TDMCREATE_TABLE_NAME, 'table_name', 40, 150, $tableName); + $tableNameText->setDescription(_AM_TDMCREATE_TABLE_NAME_DESC); + $tab1->addElement($tableNameText, true); // - $table_solename_field = new XoopsFormText(_AM_TDMCREATE_TABLE_SOLENAME, 'table_solename', 40, 150, $this->getVar('table_solename')); - $table_solename_field->setDescription(_AM_TDMCREATE_TABLE_SOLENAME_DESC); - $form->addElement($table_solename_field, true); + $tableSoleNameText = new XoopsFormText(_AM_TDMCREATE_TABLE_SOLENAME, 'table_solename', 40, 150, $this->getVar('table_solename')); + $tableSoleNameText->setDescription(_AM_TDMCREATE_TABLE_SOLENAME_DESC); + $tab1->addElement($tableSoleNameText, true); // $tablesHandler =& $this->tdmcreate->getHandler('tables'); $criteria = new CriteriaCompo(new Criteria('table_category', 0), 'AND'); - $criteria->add(new Criteria('table_mid', $table_mid), 'AND'); - $criteria->add(new Criteria('table_name', $table_name)); - $table_category = $tablesHandler->getCount($criteria); + $criteria->add(new Criteria('table_mid', $tableMid), 'AND'); + $criteria->add(new Criteria('table_name', $tableName)); + $tableCategory = $tablesHandler->getCount($criteria); unset($criteria); - //if ( ($table_category == 0) || $isNew ) { - $radio_category = $isNew ? 0 : $this->getVar('table_category'); - $category = new XoopsFormRadioYN(_AM_TDMCREATE_TABLE_CATEGORY, 'table_category', $radio_category); + //if ( ($tableCategory == 0) || $isNew ) { + $radioCategory = $isNew ? 0 : $this->getVar('table_category'); + $category = new XoopsFormRadioYN(_AM_TDMCREATE_TABLE_CATEGORY, 'table_category', $radioCategory); $category->setDescription(_AM_TDMCREATE_TABLE_CATEGORY_DESC); - $form->addElement($category); + $tab1->addElement($category); //} // - $table_fieldname = new XoopsFormText(_AM_TDMCREATE_TABLE_FIELDNAME, 'table_fieldname', 30, 50, $this->getVar('table_fieldname')); - $table_fieldname->setDescription(_AM_TDMCREATE_TABLE_FIELDNAME_DESC); - $form->addElement($table_fieldname); + $tableFieldname = new XoopsFormText(_AM_TDMCREATE_TABLE_FIELDNAME, 'table_fieldname', 30, 50, $this->getVar('table_fieldname')); + $tableFieldname->setDescription(_AM_TDMCREATE_TABLE_FIELDNAME_DESC); + $tab1->addElement($tableFieldname); // - $table_nbfield = new XoopsFormText(_AM_TDMCREATE_TABLE_NBFIELDS, 'table_nbfields', 10, 25, $this->getVar('table_nbfields')); - $table_nbfield->setDescription(_AM_TDMCREATE_TABLE_NBFIELDS_DESC); - $form->addElement($table_nbfield, true); + $tableNumbFileds = new XoopsFormText(_AM_TDMCREATE_TABLE_NBFIELDS, 'table_nbfields', 10, 25, $this->getVar('table_nbfields')); + $tableNumbFileds->setDescription(_AM_TDMCREATE_TABLE_NBFIELDS_DESC); + $tab1->addElement($tableNumbFileds, true); // if (!$isNew) { - $table_order = new XoopsFormText(_AM_TDMCREATE_TABLE_ORDER, 'table_order', 5, 10, $this->getVar('table_order')); - $table_order->setDescription(_AM_TDMCREATE_TABLE_ORDER_DESC); - $form->addElement($table_order, true); + $tableOrder = new XoopsFormText(_AM_TDMCREATE_TABLE_ORDER, 'table_order', 5, 10, $this->getVar('table_order')); + $tableOrder->setDescription(_AM_TDMCREATE_TABLE_ORDER_DESC); + $tab1->addElement($tableOrder, true); } // - $get_table_image = $this->getVar('table_image'); - $table_image = $get_table_image ?: 'blank.gif'; - $iconsdir = '/Frameworks/moduleclasses/icons/32'; - $uploads_dir = '/uploads/tdmcreate/images/tables'; - $iconsdirectory = is_dir(XOOPS_ROOT_PATH . $iconsdir) ? $iconsdir : $uploads_dir; + $getTableImage = $this->getVar('table_image'); + $tableImage = $getTableImage ?: 'blank.gif'; + $icons32Directory = '/Frameworks/moduleclasses/icons/32'; + $uploadsDirectory = '/uploads/tdmcreate/images/tables'; + $iconsDirectory = is_dir(XOOPS_ROOT_PATH . $icons32Directory) ? $icons32Directory : $uploadsDirectory; // $imgtray1 = new XoopsFormElementTray(_AM_TDMCREATE_TABLE_IMAGE, '<br />'); - $imgpath1 = sprintf(_AM_TDMCREATE_FORMIMAGE_PATH, ".{$iconsdirectory}/"); - $imageselect1 = new XoopsFormSelect($imgpath1, 'table_image', $table_image, 10); - $image_array1 = XoopsLists::getImgListAsArray(XOOPS_ROOT_PATH . $iconsdirectory); - foreach ($image_array1 as $image1) { - $imageselect1->addOption("{$image1}", $image1); + $imgpath1 = sprintf(_AM_TDMCREATE_FORMIMAGE_PATH, ".{$iconsDirectory}/"); + $imageSelect1 = new XoopsFormSelect($imgpath1, 'table_image', $tableImage, 10); + $imageArray1 = XoopsLists::getImgListAsArray(XOOPS_ROOT_PATH . $iconsDirectory); + foreach ($imageArray1 as $image1) { + $imageSelect1->addOption("{$image1}", $image1); } - $imageselect1->setExtra("onchange='showImgSelected(\"image1\", \"table_image\", \"" . $iconsdirectory . "\", \"\", \"" . XOOPS_URL . "\")'"); - $imgtray1->addElement($imageselect1, false); - $imgtray1->addElement(new XoopsFormLabel('', "<br /><img src='" . XOOPS_URL . "/" . $iconsdirectory . "/" . $table_image . "' name='image1' id='image1' alt='' />")); + $imageSelect1->setExtra("onchange='showImgSelected(\"image1\", \"table_image\", \"" . $iconsDirectory . "\", \"\", \"" . XOOPS_URL . "\")'"); + $imgtray1->addElement($imageSelect1, false); + $imgtray1->addElement(new XoopsFormLabel('', "<br /><img src='" . XOOPS_URL . "/" . $iconsDirectory . "/" . $tableImage . "' name='image1' id='image1' alt='' />")); $fileseltray1 = new XoopsFormElementTray('', '<br />'); $fileseltray1->addElement(new XoopsFormFile(_AM_TDMCREATE_FORMUPLOAD, 'attachedfile', $this->tdmcreate->getConfig('maxsize'))); $fileseltray1->addElement(new XoopsFormLabel('')); $imgtray1->addElement($fileseltray1); $imgtray1->setDescription(_AM_TDMCREATE_TABLE_IMAGE_DESC); - $form->addElement($imgtray1); + $tab1->addElement($imgtray1); // - $table_autoincrement = $this->isNew() ? 1 : $this->getVar('table_autoincrement'); - $check_table_autoincrement = new XoopsFormRadioYN(_AM_TDMCREATE_TABLE_AUTO_INCREMENT, 'table_autoincrement', $table_autoincrement); - $check_table_autoincrement->setDescription(_AM_TDMCREATE_TABLE_AUTO_INCREMENT_DESC); - //$check_table_autoincrement->addOption(1, _AM_TDMCREATE_TABLE_AUTO_INCREMENT_OPTION); - $form->addElement($check_table_autoincrement); + $tableAutoincrement = $this->isNew() ? 1 : $this->getVar('table_autoincrement'); + $checkTableAutoincrement = new XoopsFormRadioYN(_AM_TDMCREATE_TABLE_AUTO_INCREMENT, 'table_autoincrement', $tableAutoincrement); + $checkTableAutoincrement->setDescription(_AM_TDMCREATE_TABLE_AUTO_INCREMENT_DESC); + $tab1->addElement($checkTableAutoincrement); + $tabTray->addElement($tab1); + // + $tab2 = new TDMCreateFormTab(_AM_TDMCREATE_OPTIONS_CHECK, 'options_check'); // - $options_tray = new XoopsFormElementTray(_OPTIONS, '<br />'); + $optionsTray = new XoopsFormElementTray(_OPTIONS, '<br />'); // - $table_checkbox_all = new XoopsFormCheckBox('', "tablebox", 1); - $table_checkbox_all->addOption('allbox', _AM_TDMCREATE_TABLE_ALL); - $table_checkbox_all->setExtra(" onclick='xoopsCheckAll(\"tableform\", \"tablebox\");' "); - $table_checkbox_all->setClass('xo-checkall'); - $options_tray->addElement($table_checkbox_all); + $tableCheckAll = new XoopsFormCheckBox('', "tablebox", 1); + $tableCheckAll->addOption('allbox', _AM_TDMCREATE_TABLE_ALL); + $tableCheckAll->setExtra(" onclick='xoopsCheckAll(\"tableform\", \"tablebox\");' "); + $tableCheckAll->setClass('xo-checkall'); + $optionsTray->addElement($tableCheckAll); // - $table_index = $isNew ? 0 : $this->getVar('table_index'); - $check_table_index = new XoopsFormCheckBox(' ', 'table_index', $table_index); - $check_table_index->addOption(1, _AM_TDMCREATE_TABLE_INDEX); - $options_tray->addElement($check_table_index); + $tableIndex = $isNew ? 0 : $this->getVar('table_index'); + $checkTableIndex = new XoopsFormCheckBox(' ', 'table_index', $tableIndex); + $checkTableIndex->addOption(1, _AM_TDMCREATE_TABLE_INDEX); + $optionsTray->addElement($checkTableIndex); // - $table_blocks = $isNew ? 0 : $this->getVar('table_blocks'); - $check_table_blocks = new XoopsFormCheckBox(' ', 'table_blocks', $table_blocks); - $check_table_blocks->addOption(1, _AM_TDMCREATE_TABLE_BLOCKS); - $options_tray->addElement($check_table_blocks); + $tableBlocks = $isNew ? 0 : $this->getVar('table_blocks'); + $checkTableBlocks = new XoopsFormCheckBox(' ', 'table_blocks', $tableBlocks); + $checkTableBlocks->addOption(1, _AM_TDMCREATE_TABLE_BLOCKS); + $optionsTray->addElement($checkTableBlocks); // - $table_admin = $isNew ? 0 : $this->getVar('table_admin'); - $check_table_admin = new XoopsFormCheckBox(' ', 'table_admin', $table_admin); - $check_table_admin->addOption(1, _AM_TDMCREATE_TABLE_ADMIN); - $options_tray->addElement($check_table_admin); + $tableAdmin = $isNew ? 0 : $this->getVar('table_admin'); + $checkTableAdmin = new XoopsFormCheckBox(' ', 'table_admin', $tableAdmin); + $checkTableAdmin->addOption(1, _AM_TDMCREATE_TABLE_ADMIN); + $optionsTray->addElement($checkTableAdmin); // $table_user = $isNew ? 0 : $this->getVar('table_user'); - $check_table_user = new XoopsFormCheckBox(' ', 'table_user', $table_user); - $check_table_user->addOption(1, _AM_TDMCREATE_TABLE_USER); - $options_tray->addElement($check_table_user); + $checkTableUser = new XoopsFormCheckBox(' ', 'table_user', $table_user); + $checkTableUser->addOption(1, _AM_TDMCREATE_TABLE_USER); + $optionsTray->addElement($checkTableUser); // - $table_submenu = $isNew ? 0 : $this->getVar('table_submenu'); - $check_table_submenu = new XoopsFormCheckBox(' ', 'table_submenu', $table_submenu); - $check_table_submenu->addOption(1, _AM_TDMCREATE_TABLE_SUBMENU); - $options_tray->addElement($check_table_submenu); + $tableSubmenu = $isNew ? 0 : $this->getVar('table_submenu'); + $checkTableSubmenu = new XoopsFormCheckBox(' ', 'table_submenu', $tableSubmenu); + $checkTableSubmenu->addOption(1, _AM_TDMCREATE_TABLE_SUBMENU); + $optionsTray->addElement($checkTableSubmenu); // - $table_submit = $isNew ? 0 : $this->getVar('table_submit'); - $check_table_submit = new XoopsFormCheckBox(' ', 'table_submit', $table_submit); - $check_table_submit->addOption(1, _AM_TDMCREATE_TABLE_SUBMIT); - $options_tray->addElement($check_table_submit); + $tableSubmit = $isNew ? 0 : $this->getVar('table_submit'); + $checkTableSubmit = new XoopsFormCheckBox(' ', 'table_submit', $tableSubmit); + $checkTableSubmit->addOption(1, _AM_TDMCREATE_TABLE_SUBMIT); + $optionsTray->addElement($checkTableSubmit); // - $table_tag = $isNew ? 0 : $this->getVar('table_tag'); - $check_table_tag = new XoopsFormCheckBox(' ', 'table_tag', $table_tag); - $check_table_tag->addOption(1, _AM_TDMCREATE_TABLE_TAG); - $options_tray->addElement($check_table_tag); + $tableTag = $isNew ? 0 : $this->getVar('table_tag'); + $checkTableTag = new XoopsFormCheckBox(' ', 'table_tag', $tableTag); + $checkTableTag->addOption(1, _AM_TDMCREATE_TABLE_TAG); + $optionsTray->addElement($checkTableTag); // - $table_broken = $isNew ? 0 : $this->getVar('table_broken'); - $check_table_broken = new XoopsFormCheckBox(' ', 'table_broken', $table_broken); - $check_table_broken->addOption(1, _AM_TDMCREATE_TABLE_BROKEN); - $options_tray->addElement($check_table_broken); + $tableBroken = $isNew ? 0 : $this->getVar('table_broken'); + $checkTableBroken = new XoopsFormCheckBox(' ', 'table_broken', $tableBroken); + $checkTableBroken->addOption(1, _AM_TDMCREATE_TABLE_BROKEN); + $optionsTray->addElement($checkTableBroken); // $criteria = new CriteriaCompo(new Criteria('table_search', ($isNew ? 0 : 1)), 'AND'); - $criteria->add(new Criteria('table_mid', $table_mid), 'AND'); - $criteria->add(new Criteria('table_name', $table_name)); - $table_comments = $tablesHandler->getCount($criteria); + $criteria->add(new Criteria('table_mid', $tableMid), 'AND'); + $criteria->add(new Criteria('table_name', $tableName)); + $tableComments = $tablesHandler->getCount($criteria); unset($criteria); - //if( ($table_comments == 0) || $isNew ) { - $table_search = $isNew ? 0 : $this->getVar('table_search'); - $check_table_search = new XoopsFormCheckBox(' ', 'table_search', $table_search); - $check_table_search->addOption(1, _AM_TDMCREATE_TABLE_SEARCH); - $options_tray->addElement($check_table_search); + //if( ($tableComments == 0) || $isNew ) { + $tableSearch = $isNew ? 0 : $this->getVar('table_search'); + $checkTableSearch = new XoopsFormCheckBox(' ', 'table_search', $tableSearch); + $checkTableSearch->addOption(1, _AM_TDMCREATE_TABLE_SEARCH); + $optionsTray->addElement($checkTableSearch); //} // $criteria = new CriteriaCompo(new Criteria('table_comments', ($isNew ? 0 : 1)), 'AND'); - $criteria->add(new Criteria('table_mid', $table_mid), 'AND'); - $criteria->add(new Criteria('table_name', $table_name)); - $table_comments = $tablesHandler->getCount($criteria); + $criteria->add(new Criteria('table_mid', $tableMid), 'AND'); + $criteria->add(new Criteria('table_name', $tableName)); + $tableComments = $tablesHandler->getCount($criteria); unset($criteria); - //if ( ($table_comments == 0) || $isNew ) { - $table_comments = $isNew ? 0 : $this->getVar('table_comments'); - $check_table_comments = new XoopsFormCheckBox(' ', 'table_comments', $table_comments); - $check_table_comments->addOption(1, _AM_TDMCREATE_TABLE_COMMENTS); - $options_tray->addElement($check_table_comments); + //if ( ($tableComments == 0) || $isNew ) { + $tableComments = $isNew ? 0 : $this->getVar('table_comments'); + $checkTableComments = new XoopsFormCheckBox(' ', 'table_comments', $tableComments); + $checkTableComments->addOption(1, _AM_TDMCREATE_TABLE_COMMENTS); + $optionsTray->addElement($checkTableComments); //} // - $table_notifications = $isNew ? 0 : $this->getVar('table_notifications'); - $check_table_notifications = new XoopsFormCheckBox(' ', 'table_notifications', $table_notifications); - $check_table_notifications->addOption(1, _AM_TDMCREATE_TABLE_NOTIFICATIONS); - $options_tray->addElement($check_table_notifications); + $tableNotifications = $isNew ? 0 : $this->getVar('table_notifications'); + $checkTableNotifications = new XoopsFormCheckBox(' ', 'table_notifications', $tableNotifications); + $checkTableNotifications->addOption(1, _AM_TDMCREATE_TABLE_NOTIFICATIONS); + $optionsTray->addElement($checkTableNotifications); // $criteria = new CriteriaCompo(new Criteria('table_permissions', ($isNew ? 0 : 1)), 'AND'); - $criteria->add(new Criteria('table_mid', $table_mid), 'AND'); - $criteria->add(new Criteria('table_name', $table_name)); - $table_permissions = $tablesHandler->getCount($criteria); + $criteria->add(new Criteria('table_mid', $tableMid), 'AND'); + $criteria->add(new Criteria('table_name', $tableName)); + $tablePermissions = $tablesHandler->getCount($criteria); unset($criteria); - //if ( ($table_permissions == 0) && ($table_category == 0) || $isNew ) { - $table_permissions = $isNew ? 0 : $this->getVar('table_permissions'); - $check_table_permissions = new XoopsFormCheckBox(' ', 'table_permissions', $table_permissions); - $check_table_permissions->addOption(1, _AM_TDMCREATE_TABLE_PERMISSIONS); - $options_tray->addElement($check_table_permissions); + //if ( ($tablePermissions == 0) && ($tableCategory == 0) || $isNew ) { + $tablePermissions = $isNew ? 0 : $this->getVar('table_permissions'); + $checkTablePermissions = new XoopsFormCheckBox(' ', 'table_permissions', $tablePermissions); + $checkTablePermissions->addOption(1, _AM_TDMCREATE_TABLE_PERMISSIONS); + $optionsTray->addElement($checkTablePermissions); //} // - $table_rate = $isNew ? 0 : $this->getVar('table_rate'); - $check_table_rate = new XoopsFormCheckBox(' ', 'table_rate', $table_rate); - $check_table_rate->addOption(1, _AM_TDMCREATE_TABLE_RATE); - $options_tray->addElement($check_table_rate); + $tableRate = $isNew ? 0 : $this->getVar('table_rate'); + $checkTableRate = new XoopsFormCheckBox(' ', 'table_rate', $tableRate); + $checkTableRate->addOption(1, _AM_TDMCREATE_TABLE_RATE); + $optionsTray->addElement($checkTableRate); // - $table_print = $isNew ? 0 : $this->getVar('table_print'); - $check_table_print = new XoopsFormCheckBox(' ', 'table_print', $table_print); - $check_table_print->addOption(1, _AM_TDMCREATE_TABLE_PRINT); - $options_tray->addElement($check_table_print); + $tablePrint = $isNew ? 0 : $this->getVar('table_print'); + $checkTablePrint = new XoopsFormCheckBox(' ', 'table_print', $tablePrint); + $checkTablePrint->addOption(1, _AM_TDMCREATE_TABLE_PRINT); + $optionsTray->addElement($checkTablePrint); // - $table_pdf = $isNew ? 0 : $this->getVar('table_pdf'); - $check_table_pdf = new XoopsFormCheckBox(' ', 'table_pdf', $table_pdf); - $check_table_pdf->addOption(1, _AM_TDMCREATE_TABLE_PDF); - $options_tray->addElement($check_table_pdf); + $tablePdf = $isNew ? 0 : $this->getVar('table_pdf'); + $checkTablePdf = new XoopsFormCheckBox(' ', 'table_pdf', $tablePdf); + $checkTablePdf->addOption(1, _AM_TDMCREATE_TABLE_PDF); + $optionsTray->addElement($checkTablePdf); // - $table_rss = $isNew ? 0 : $this->getVar('table_rss'); - $check_table_rss = new XoopsFormCheckBox(' ', 'table_rss', $table_rss); - $check_table_rss->addOption(1, _AM_TDMCREATE_TABLE_RSS); - $options_tray->addElement($check_table_rss); + $tableRss = $isNew ? 0 : $this->getVar('table_rss'); + $checkTableRss = new XoopsFormCheckBox(' ', 'table_rss', $tableRss); + $checkTableRss->addOption(1, _AM_TDMCREATE_TABLE_RSS); + $optionsTray->addElement($checkTableRss); // - $table_single = $isNew ? 0 : $this->getVar('table_single'); - $check_table_single = new XoopsFormCheckBox(' ', 'table_single', $table_single); - $check_table_single->addOption(1, _AM_TDMCREATE_TABLE_SINGLE); - $options_tray->addElement($check_table_single); + $tableSingle = $isNew ? 0 : $this->getVar('table_single'); + $checkTableSingle = new XoopsFormCheckBox(' ', 'table_single', $tableSingle); + $checkTableSingle->addOption(1, _AM_TDMCREATE_TABLE_SINGLE); + $optionsTray->addElement($checkTableSingle); // - $table_visit = $isNew ? 0 : $this->getVar('table_visit'); - $check_table_visit = new XoopsFormCheckBox(' ', 'table_visit', $table_visit); - $check_table_visit->addOption(1, _AM_TDMCREATE_TABLE_VISIT); - $options_tray->addElement($check_table_visit); + $tableVisit = $isNew ? 0 : $this->getVar('table_visit'); + $checkTableVisit = new XoopsFormCheckBox(' ', 'table_visit', $tableVisit); + $checkTableVisit->addOption(1, _AM_TDMCREATE_TABLE_VISIT); + $optionsTray->addElement($checkTableVisit); // - $options_tray->setDescription(_AM_TDMCREATE_TABLE_OPTIONS_CHECKS_DESC); + $optionsTray->setDescription(_AM_TDMCREATE_TABLE_OPTIONS_CHECKS_DESC); // - $form->addElement($options_tray); + $tab2->addElement($optionsTray); // - $form->addElement(new XoopsFormHidden('op', 'save')); - $form->addElement(new XoopsFormHidden('table_id', ($isNew ? 0 : $this->getVar('table_id')))); - $form->addElement(new XoopsFormButton(_REQUIRED . ' <sup class="red bold">*</sup>', 'submit', _SUBMIT, 'submit')); - + $buttonTray = new XoopsFormElementTray(_REQUIRED . ' <sup class="red bold">*</sup>', ''); + $buttonTray->addElement(new XoopsFormHidden('op', 'save')); + $buttonTray->addElement(new XoopsFormHidden('table_id', ($isNew ? 0 : $this->getVar('table_id')))); + $buttonTray->addElement(new XoopsFormButton('', 'submit', _SUBMIT, 'submit')); + $tab2->addElement($buttonTray); + $tabTray->addElement($tab2); + $form->addElement($tabTray); return $form; } Modified: XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/language/english/admin.php =================================================================== --- XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/language/english/admin.php 2015-06-03 10:51:58 UTC (rev 13079) +++ XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/language/english/admin.php 2015-06-03 12:38:08 UTC (rev 13080) @@ -369,4 +369,5 @@ define('_AM_TDMCREATE_ABOUT_MAKE_DONATION', "Make a Donation to support this module"); define('_AM_TDMCREATE_IMPORTANT', "Main Settings"); define('_AM_TDMCREATE_OPTIONS_CHECK', "Options Settings"); +define('_AM_TDMCREATE_CREATE_IMAGE', "Create Image Logo"); define('_AM_TDMCREATE_NOT_IMPORTANT', "Secondary Settings"); \ No newline at end of file |
From: <txm...@us...> - 2015-06-03 10:52:01
|
Revision: 13079 http://sourceforge.net/p/xoops/svn/13079 Author: txmodxoops Date: 2015-06-03 10:51:58 +0000 (Wed, 03 Jun 2015) Log Message: ----------- Fix Modified Paths: -------------- XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/fields.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/tables.php Modified: XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/fields.php =================================================================== --- XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/fields.php 2015-06-03 10:42:45 UTC (rev 13078) +++ XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/fields.php 2015-06-03 10:51:58 UTC (rev 13079) @@ -19,6 +19,7 @@ * @version $Id: 1.91 fields.php 12258 2014-01-02 09:33:29Z timgno $ */ defined('XOOPS_ROOT_PATH') or die('Restricted access'); +include __DIR__ . '/autoload.php'; /* * @Class TDMCreateFields * @extends XoopsObject Modified: XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/tables.php =================================================================== --- XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/tables.php 2015-06-03 10:42:45 UTC (rev 13078) +++ XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/tables.php 2015-06-03 10:51:58 UTC (rev 13079) @@ -20,7 +20,7 @@ * @version $Id: 1.91 tables.php 11297 2013-03-24 10:58:10Z timgno $ */ defined('XOOPS_ROOT_PATH') or die('Restricted access'); -include TDMC_CLASSES_PATH . '/autoload.php'; +include __DIR__ . '/autoload.php'; /* * @Class TDMCreateTables * @extends XoopsObject |
From: <txm...@us...> - 2015-06-03 10:42:47
|
Revision: 13078 http://sourceforge.net/p/xoops/svn/13078 Author: txmodxoops Date: 2015-06-03 10:42:45 +0000 (Wed, 03 Jun 2015) Log Message: ----------- Fixed conflict autoload.php Modified Paths: -------------- XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/autoload.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/building.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/fields.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/autoload.php XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/tables.php Modified: XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/autoload.php =================================================================== --- XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/autoload.php 2015-06-03 09:42:10 UTC (rev 13077) +++ XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/autoload.php 2015-06-03 10:42:45 UTC (rev 13078) @@ -16,7 +16,7 @@ * @package tdmcreate * @since 2.5.0 * @author Txmod Xoops http://www.txmodxoops.org - * @version $Id: TDMCreateAutoload.php 12258 2014-01-02 09:33:29Z timgno $ + * @version $Id: autoload.php 12258 2014-01-02 09:33:29Z timgno $ */ defined('XOOPS_ROOT_PATH') or die('Restricted access'); /** @@ -26,31 +26,32 @@ ini_set('display_errors',1); error_reporting(E_ALL|E_STRICT); -function applicationAutoloader($class) { - $classFilename = $class.'.php'; - $cacheFile = __DIR__ . '/cache/classpaths.cache'; - $pathCache = (file_exists($cacheFile)) ? unserialize(file_get_contents($cacheFile)) : array(); - if (!is_array($pathCache)) { $pathCache = array(); } - - if (array_key_exists($class, $pathCache)) { - /* Load class using path from cache file (if the file still exists) */ - if (file_exists($pathCache[$class])) { require_once $pathCache[$class]; } +if(!function_exists('application_autoloader')) { + function application_autoloader($class) { + $classFilename = $class.'.php'; + $cacheFile = __DIR__ . '/cache/classpaths.cache'; + $pathCache = (file_exists($cacheFile)) ? unserialize(file_get_contents($cacheFile)) : array(); + if (!is_array($pathCache)) { $pathCache = array(); } + + if (array_key_exists($class, $pathCache)) { + /* Load class using path from cache file (if the file still exists) */ + if (file_exists($pathCache[$class])) { require_once $pathCache[$class]; } - } else { - /* Determine the location of the file within the $class_root and, if found, load and cache it */ - $directories = new RecursiveDirectoryIterator(__DIR__); - foreach(new RecursiveIteratorIterator($directories) as $file) { - if ($file->getFilename() == $classFilename) { - $fullPath = $file->getRealPath(); - $pathCache[$class] = $fullPath; - require_once $fullPath; - break; - } - } + } else { + /* Determine the location of the file within the $class_root and, if found, load and cache it */ + $directories = new RecursiveDirectoryIterator(__DIR__); + foreach(new RecursiveIteratorIterator($directories) as $file) { + if ($file->getFilename() == $classFilename) { + $fullPath = $file->getRealPath(); + $pathCache[$class] = $fullPath; + require_once $fullPath; + break; + } + } + } + + $serialized_paths = serialize($pathCache); + if ($serialized_paths != $pathCache) { file_put_contents($cacheFile, serialize($pathCache)); } } - - $serialized_paths = serialize($pathCache); - if ($serialized_paths != $pathCache) { file_put_contents($cacheFile, serialize($pathCache)); } -} - -spl_autoload_register('applicationAutoloader'); \ No newline at end of file + spl_autoload_register('application_autoloader'); +} \ No newline at end of file Modified: XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/building.php =================================================================== --- XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/building.php 2015-06-03 09:42:10 UTC (rev 13077) +++ XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/building.php 2015-06-03 10:42:45 UTC (rev 13078) @@ -21,7 +21,7 @@ */ defined('XOOPS_ROOT_PATH') or die('Restricted access'); - +include __DIR__ . '/autoload.php'; /** * Class TDMCreateBuilding */ Modified: XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/fields.php =================================================================== --- XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/fields.php 2015-06-03 09:42:10 UTC (rev 13077) +++ XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/fields.php 2015-06-03 10:42:45 UTC (rev 13078) @@ -19,8 +19,6 @@ * @version $Id: 1.91 fields.php 12258 2014-01-02 09:33:29Z timgno $ */ defined('XOOPS_ROOT_PATH') or die('Restricted access'); -// Autoloader Classes -include __DIR__ . '/autoload.php'; /* * @Class TDMCreateFields * @extends XoopsObject Modified: XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/autoload.php =================================================================== --- XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/autoload.php 2015-06-03 09:42:10 UTC (rev 13077) +++ XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/files/autoload.php 2015-06-03 10:42:45 UTC (rev 13078) @@ -16,7 +16,7 @@ * @package tdmcreate * @since 2.5.0 * @author Txmod Xoops http://www.txmodxoops.org - * @version $Id: TDMCreateAutoload.php 12258 2014-01-02 09:33:29Z timgno $ + * @version $Id: autoload.php 12258 2014-01-02 09:33:29Z timgno $ */ defined('XOOPS_ROOT_PATH') or die('Restricted access'); /** @@ -26,31 +26,32 @@ ini_set('display_errors',1); error_reporting(E_ALL|E_STRICT); -function applicationAutoloader1($class) { - $classFilename = $class.'.php'; - $cacheFile = __DIR__ . '/cache/classpaths.cache'; - $pathCache = (file_exists($cacheFile)) ? unserialize(file_get_contents($cacheFile)) : array(); - if (!is_array($pathCache)) { $pathCache = array(); } - - if (array_key_exists($class, $pathCache)) { - /* Load class using path from cache file (if the file still exists) */ - if (file_exists($pathCache[$class])) { require_once $pathCache[$class]; } +if(!function_exists('application_autoloader')) { + function application_autoloader($class) { + $classFilename = $class.'.php'; + $cacheFile = __DIR__ . '/cache/classpaths.cache'; + $pathCache = (file_exists($cacheFile)) ? unserialize(file_get_contents($cacheFile)) : array(); + if (!is_array($pathCache)) { $pathCache = array(); } + + if (array_key_exists($class, $pathCache)) { + /* Load class using path from cache file (if the file still exists) */ + if (file_exists($pathCache[$class])) { require_once $pathCache[$class]; } - } else { - /* Determine the location of the file within the $class_root and, if found, load and cache it */ - $directories = new RecursiveDirectoryIterator(__DIR__); - foreach(new RecursiveIteratorIterator($directories) as $file) { - if ($file->getFilename() == $classFilename) { - $fullPath = $file->getRealPath(); - $pathCache[$class] = $fullPath; - require_once $fullPath; - break; - } - } + } else { + /* Determine the location of the file within the $class_root and, if found, load and cache it */ + $directories = new RecursiveDirectoryIterator(__DIR__); + foreach(new RecursiveIteratorIterator($directories) as $file) { + if ($file->getFilename() == $classFilename) { + $fullPath = $file->getRealPath(); + $pathCache[$class] = $fullPath; + require_once $fullPath; + break; + } + } + } + + $serialized_paths = serialize($pathCache); + if ($serialized_paths != $pathCache) { file_put_contents($cacheFile, serialize($pathCache)); } } - - $serialized_paths = serialize($pathCache); - if ($serialized_paths != $pathCache) { file_put_contents($cacheFile, serialize($pathCache)); } -} - -spl_autoload_register('applicationAutoloader1'); \ No newline at end of file + spl_autoload_register('application_autoloader'); +} \ No newline at end of file Modified: XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/tables.php =================================================================== --- XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/tables.php 2015-06-03 09:42:10 UTC (rev 13077) +++ XoopsModules/TDMCreate/branches/timgno/1.91a3/tdmcreate/class/tables.php 2015-06-03 10:42:45 UTC (rev 13078) @@ -20,7 +20,7 @@ * @version $Id: 1.91 tables.php 11297 2013-03-24 10:58:10Z timgno $ */ defined('XOOPS_ROOT_PATH') or die('Restricted access'); -include __DIR__ . '/autoload.php'; +include TDMC_CLASSES_PATH . '/autoload.php'; /* * @Class TDMCreateTables * @extends XoopsObject |