From: <be...@us...> - 2015-08-08 22:38:26
|
Revision: 13139 http://sourceforge.net/p/xoops/svn/13139 Author: beckmi Date: 2015-08-08 22:38:21 +0000 (Sat, 08 Aug 2015) Log Message: ----------- cosmetic changes Modified Paths: -------------- XoopsModules/tdmlinks/trunk/tdmlinks/admin/about.php XoopsModules/tdmlinks/trunk/tdmlinks/admin/admin_header.php XoopsModules/tdmlinks/trunk/tdmlinks/admin/broken.php XoopsModules/tdmlinks/trunk/tdmlinks/admin/category.php XoopsModules/tdmlinks/trunk/tdmlinks/admin/field.php XoopsModules/tdmlinks/trunk/tdmlinks/admin/import.php XoopsModules/tdmlinks/trunk/tdmlinks/admin/index.php XoopsModules/tdmlinks/trunk/tdmlinks/admin/links.php XoopsModules/tdmlinks/trunk/tdmlinks/admin/menu.php XoopsModules/tdmlinks/trunk/tdmlinks/admin/modified.php XoopsModules/tdmlinks/trunk/tdmlinks/admin/permissions.php XoopsModules/tdmlinks/trunk/tdmlinks/blocks/tdmlinks_search.php XoopsModules/tdmlinks/trunk/tdmlinks/blocks/tdmlinks_top.php XoopsModules/tdmlinks/trunk/tdmlinks/brokenlink.php XoopsModules/tdmlinks/trunk/tdmlinks/class/tdmlinks_broken.php XoopsModules/tdmlinks/trunk/tdmlinks/class/tdmlinks_cat.php XoopsModules/tdmlinks/trunk/tdmlinks/class/tdmlinks_field.php XoopsModules/tdmlinks/trunk/tdmlinks/class/tdmlinks_fielddata.php XoopsModules/tdmlinks/trunk/tdmlinks/class/tdmlinks_linklimit.php XoopsModules/tdmlinks/trunk/tdmlinks/class/tdmlinks_links.php XoopsModules/tdmlinks/trunk/tdmlinks/class/tdmlinks_mod.php XoopsModules/tdmlinks/trunk/tdmlinks/class/tdmlinks_modfielddata.php XoopsModules/tdmlinks/trunk/tdmlinks/class/tdmlinks_purchase.php XoopsModules/tdmlinks/trunk/tdmlinks/class/tdmlinks_votedata.php XoopsModules/tdmlinks/trunk/tdmlinks/class/tree.php XoopsModules/tdmlinks/trunk/tdmlinks/comment_delete.php XoopsModules/tdmlinks/trunk/tdmlinks/comment_edit.php XoopsModules/tdmlinks/trunk/tdmlinks/comment_new.php XoopsModules/tdmlinks/trunk/tdmlinks/comment_post.php XoopsModules/tdmlinks/trunk/tdmlinks/comment_reply.php XoopsModules/tdmlinks/trunk/tdmlinks/css/styles.css XoopsModules/tdmlinks/trunk/tdmlinks/docs/changelog.txt XoopsModules/tdmlinks/trunk/tdmlinks/docs/htaccess.tdmlinks XoopsModules/tdmlinks/trunk/tdmlinks/header.php XoopsModules/tdmlinks/trunk/tdmlinks/include/comment_functions.php XoopsModules/tdmlinks/trunk/tdmlinks/include/functions.php XoopsModules/tdmlinks/trunk/tdmlinks/include/notification.inc.php XoopsModules/tdmlinks/trunk/tdmlinks/include/search.inc.php XoopsModules/tdmlinks/trunk/tdmlinks/index.php XoopsModules/tdmlinks/trunk/tdmlinks/language/english/admin.php XoopsModules/tdmlinks/trunk/tdmlinks/language/english/blocks.php XoopsModules/tdmlinks/trunk/tdmlinks/language/english/changelog.txt XoopsModules/tdmlinks/trunk/tdmlinks/language/english/main.php XoopsModules/tdmlinks/trunk/tdmlinks/language/english/modinfo.php XoopsModules/tdmlinks/trunk/tdmlinks/language/italian/admin.php XoopsModules/tdmlinks/trunk/tdmlinks/language/italian/blocks.php XoopsModules/tdmlinks/trunk/tdmlinks/language/italian/main.php XoopsModules/tdmlinks/trunk/tdmlinks/language/italian/modinfo.php XoopsModules/tdmlinks/trunk/tdmlinks/list.tag.php XoopsModules/tdmlinks/trunk/tdmlinks/modlink.php XoopsModules/tdmlinks/trunk/tdmlinks/notification_update.php XoopsModules/tdmlinks/trunk/tdmlinks/plugins/sitemap/TDMLinks.php XoopsModules/tdmlinks/trunk/tdmlinks/plugins/tag/TDMDownloads.php XoopsModules/tdmlinks/trunk/tdmlinks/plugins/tag/TDMLinks.php XoopsModules/tdmlinks/trunk/tdmlinks/plugins/waiting/TDMLinks.php XoopsModules/tdmlinks/trunk/tdmlinks/plugins/whatsnew/TDMLinks/data.inc.php XoopsModules/tdmlinks/trunk/tdmlinks/ratelink.php XoopsModules/tdmlinks/trunk/tdmlinks/rss.php XoopsModules/tdmlinks/trunk/tdmlinks/search.php XoopsModules/tdmlinks/trunk/tdmlinks/singlelink.php XoopsModules/tdmlinks/trunk/tdmlinks/submit.php XoopsModules/tdmlinks/trunk/tdmlinks/view.tag.php XoopsModules/tdmlinks/trunk/tdmlinks/viewcat.php XoopsModules/tdmlinks/trunk/tdmlinks/visit.php XoopsModules/tdmlinks/trunk/tdmlinks/xoops_version.php Added Paths: ----------- XoopsModules/tdmlinks/trunk/tdmlinks/assets/ XoopsModules/tdmlinks/trunk/tdmlinks/assets/css/ XoopsModules/tdmlinks/trunk/tdmlinks/assets/css/index.html XoopsModules/tdmlinks/trunk/tdmlinks/assets/images/ XoopsModules/tdmlinks/trunk/tdmlinks/assets/images/admin/ XoopsModules/tdmlinks/trunk/tdmlinks/assets/images/admin/about.png XoopsModules/tdmlinks/trunk/tdmlinks/assets/images/admin/add.png XoopsModules/tdmlinks/trunk/tdmlinks/assets/images/admin/addlink.png XoopsModules/tdmlinks/trunk/tdmlinks/assets/images/admin/bg_button.gif XoopsModules/tdmlinks/trunk/tdmlinks/assets/images/admin/broken.png XoopsModules/tdmlinks/trunk/tdmlinks/assets/images/admin/category.png XoopsModules/tdmlinks/trunk/tdmlinks/assets/images/admin/field.png XoopsModules/tdmlinks/trunk/tdmlinks/assets/images/admin/home.png XoopsModules/tdmlinks/trunk/tdmlinks/assets/images/admin/import.png XoopsModules/tdmlinks/trunk/tdmlinks/assets/images/admin/index.html XoopsModules/tdmlinks/trunk/tdmlinks/assets/images/admin/list.png XoopsModules/tdmlinks/trunk/tdmlinks/assets/images/admin/modified.png XoopsModules/tdmlinks/trunk/tdmlinks/assets/images/admin/permissions.png XoopsModules/tdmlinks/trunk/tdmlinks/assets/images/admin/xoopsmicrobutton.gif XoopsModules/tdmlinks/trunk/tdmlinks/assets/images/arrow.gif XoopsModules/tdmlinks/trunk/tdmlinks/assets/images/blank.gif XoopsModules/tdmlinks/trunk/tdmlinks/assets/images/bookmarks/ XoopsModules/tdmlinks/trunk/tdmlinks/assets/images/bookmarks/balatarin.png XoopsModules/tdmlinks/trunk/tdmlinks/assets/images/bookmarks/blinklist.gif XoopsModules/tdmlinks/trunk/tdmlinks/assets/images/bookmarks/delicious.gif XoopsModules/tdmlinks/trunk/tdmlinks/assets/images/bookmarks/designfloat.png XoopsModules/tdmlinks/trunk/tdmlinks/assets/images/bookmarks/diggman.gif XoopsModules/tdmlinks/trunk/tdmlinks/assets/images/bookmarks/facebook_share_icon.gif XoopsModules/tdmlinks/trunk/tdmlinks/assets/images/bookmarks/fark.gif XoopsModules/tdmlinks/trunk/tdmlinks/assets/images/bookmarks/furl.gif XoopsModules/tdmlinks/trunk/tdmlinks/assets/images/bookmarks/google-icon.png XoopsModules/tdmlinks/trunk/tdmlinks/assets/images/bookmarks/google-reader-icon.png XoopsModules/tdmlinks/trunk/tdmlinks/assets/images/bookmarks/google_buzz_icon.png XoopsModules/tdmlinks/trunk/tdmlinks/assets/images/bookmarks/index.html XoopsModules/tdmlinks/trunk/tdmlinks/assets/images/bookmarks/mixx.png XoopsModules/tdmlinks/trunk/tdmlinks/assets/images/bookmarks/myspace.jpg XoopsModules/tdmlinks/trunk/tdmlinks/assets/images/bookmarks/newsvine.gif XoopsModules/tdmlinks/trunk/tdmlinks/assets/images/bookmarks/reddit.gif XoopsModules/tdmlinks/trunk/tdmlinks/assets/images/bookmarks/scriptandstyle.png XoopsModules/tdmlinks/trunk/tdmlinks/assets/images/bookmarks/simpy.png XoopsModules/tdmlinks/trunk/tdmlinks/assets/images/bookmarks/spurl.gif XoopsModules/tdmlinks/trunk/tdmlinks/assets/images/bookmarks/stumbleupon.png XoopsModules/tdmlinks/trunk/tdmlinks/assets/images/bookmarks/technorati.png XoopsModules/tdmlinks/trunk/tdmlinks/assets/images/bookmarks/twitter_share_icon.gif XoopsModules/tdmlinks/trunk/tdmlinks/assets/images/bookmarks/yahoomyweb.gif XoopsModules/tdmlinks/trunk/tdmlinks/assets/images/cats/ XoopsModules/tdmlinks/trunk/tdmlinks/assets/images/cats/blank.gif XoopsModules/tdmlinks/trunk/tdmlinks/assets/images/cats/index.html XoopsModules/tdmlinks/trunk/tdmlinks/assets/images/deco/ XoopsModules/tdmlinks/trunk/tdmlinks/assets/images/deco/arrow.gif XoopsModules/tdmlinks/trunk/tdmlinks/assets/images/deco/bg.png XoopsModules/tdmlinks/trunk/tdmlinks/assets/images/deco/date.gif XoopsModules/tdmlinks/trunk/tdmlinks/assets/images/deco/dateout.gif XoopsModules/tdmlinks/trunk/tdmlinks/assets/images/deco/favoris.png XoopsModules/tdmlinks/trunk/tdmlinks/assets/images/deco/favorisout.png XoopsModules/tdmlinks/trunk/tdmlinks/assets/images/deco/index.html XoopsModules/tdmlinks/trunk/tdmlinks/assets/images/deco/info.png XoopsModules/tdmlinks/trunk/tdmlinks/assets/images/deco/left_both.png XoopsModules/tdmlinks/trunk/tdmlinks/assets/images/deco/more.png XoopsModules/tdmlinks/trunk/tdmlinks/assets/images/deco/right_both.png XoopsModules/tdmlinks/trunk/tdmlinks/assets/images/deco/tableft4.gif XoopsModules/tdmlinks/trunk/tdmlinks/assets/images/deco/tabright4.gif XoopsModules/tdmlinks/trunk/tdmlinks/assets/images/deco/tdmlinks_search.png XoopsModules/tdmlinks/trunk/tdmlinks/assets/images/down.gif XoopsModules/tdmlinks/trunk/tdmlinks/assets/images/editicon.png XoopsModules/tdmlinks/trunk/tdmlinks/assets/images/field/ XoopsModules/tdmlinks/trunk/tdmlinks/assets/images/field/blank.gif XoopsModules/tdmlinks/trunk/tdmlinks/assets/images/field/homepage.png XoopsModules/tdmlinks/trunk/tdmlinks/assets/images/field/index.html XoopsModules/tdmlinks/trunk/tdmlinks/assets/images/field/platform.png XoopsModules/tdmlinks/trunk/tdmlinks/assets/images/field/size.png XoopsModules/tdmlinks/trunk/tdmlinks/assets/images/field/version.png XoopsModules/tdmlinks/trunk/tdmlinks/assets/images/icon/ XoopsModules/tdmlinks/trunk/tdmlinks/assets/images/icon/author.png XoopsModules/tdmlinks/trunk/tdmlinks/assets/images/icon/comments.png XoopsModules/tdmlinks/trunk/tdmlinks/assets/images/icon/date.png XoopsModules/tdmlinks/trunk/tdmlinks/assets/images/icon/delete.png XoopsModules/tdmlinks/trunk/tdmlinks/assets/images/icon/edit.png XoopsModules/tdmlinks/trunk/tdmlinks/assets/images/icon/hits.png XoopsModules/tdmlinks/trunk/tdmlinks/assets/images/icon/homepage.png XoopsModules/tdmlinks/trunk/tdmlinks/assets/images/icon/ignore_mini.png XoopsModules/tdmlinks/trunk/tdmlinks/assets/images/icon/index.html XoopsModules/tdmlinks/trunk/tdmlinks/assets/images/icon/link.png XoopsModules/tdmlinks/trunk/tdmlinks/assets/images/icon/off.png XoopsModules/tdmlinks/trunk/tdmlinks/assets/images/icon/on.png XoopsModules/tdmlinks/trunk/tdmlinks/assets/images/icon/platform.png XoopsModules/tdmlinks/trunk/tdmlinks/assets/images/icon/rss.gif XoopsModules/tdmlinks/trunk/tdmlinks/assets/images/icon/size.png XoopsModules/tdmlinks/trunk/tdmlinks/assets/images/icon/tomodify.png XoopsModules/tdmlinks/trunk/tdmlinks/assets/images/icon/torate.png XoopsModules/tdmlinks/trunk/tdmlinks/assets/images/icon/toreport.png XoopsModules/tdmlinks/trunk/tdmlinks/assets/images/icon/totell.png XoopsModules/tdmlinks/trunk/tdmlinks/assets/images/icon/version.png XoopsModules/tdmlinks/trunk/tdmlinks/assets/images/icon/view_mini.png XoopsModules/tdmlinks/trunk/tdmlinks/assets/images/icon/visit-now.png XoopsModules/tdmlinks/trunk/tdmlinks/assets/images/icon/votes.png XoopsModules/tdmlinks/trunk/tdmlinks/assets/images/icons/ XoopsModules/tdmlinks/trunk/tdmlinks/assets/images/icons/16/ XoopsModules/tdmlinks/trunk/tdmlinks/assets/images/icons/16/index.html XoopsModules/tdmlinks/trunk/tdmlinks/assets/images/icons/32/ XoopsModules/tdmlinks/trunk/tdmlinks/assets/images/icons/32/index.html XoopsModules/tdmlinks/trunk/tdmlinks/assets/images/icons/index.html XoopsModules/tdmlinks/trunk/tdmlinks/assets/images/index.html XoopsModules/tdmlinks/trunk/tdmlinks/assets/images/link.png XoopsModules/tdmlinks/trunk/tdmlinks/assets/images/liste.png XoopsModules/tdmlinks/trunk/tdmlinks/assets/images/logo-en.gif XoopsModules/tdmlinks/trunk/tdmlinks/assets/images/module_logo.png XoopsModules/tdmlinks/trunk/tdmlinks/assets/images/rss.gif XoopsModules/tdmlinks/trunk/tdmlinks/assets/images/shots/ XoopsModules/tdmlinks/trunk/tdmlinks/assets/images/shots/blank.gif XoopsModules/tdmlinks/trunk/tdmlinks/assets/images/shots/index.html XoopsModules/tdmlinks/trunk/tdmlinks/assets/images/up.gif XoopsModules/tdmlinks/trunk/tdmlinks/assets/index.html XoopsModules/tdmlinks/trunk/tdmlinks/assets/js/ XoopsModules/tdmlinks/trunk/tdmlinks/assets/js/index.html XoopsModules/tdmlinks/trunk/tdmlinks/include/oninstall.php XoopsModules/tdmlinks/trunk/tdmlinks/include/onupdate.php XoopsModules/tdmlinks/trunk/tdmlinks/templates/blocks/tdmlinks_block_new.tpl XoopsModules/tdmlinks/trunk/tdmlinks/templates/blocks/tdmlinks_block_random.tpl XoopsModules/tdmlinks/trunk/tdmlinks/templates/blocks/tdmlinks_block_rating.tpl XoopsModules/tdmlinks/trunk/tdmlinks/templates/blocks/tdmlinks_block_search.tpl XoopsModules/tdmlinks/trunk/tdmlinks/templates/blocks/tdmlinks_block_top.tpl XoopsModules/tdmlinks/trunk/tdmlinks/templates/tdmlinks_brokenlink.tpl XoopsModules/tdmlinks/trunk/tdmlinks/templates/tdmlinks_index.tpl XoopsModules/tdmlinks/trunk/tdmlinks/templates/tdmlinks_link.tpl XoopsModules/tdmlinks/trunk/tdmlinks/templates/tdmlinks_liste.tpl XoopsModules/tdmlinks/trunk/tdmlinks/templates/tdmlinks_modlink.tpl XoopsModules/tdmlinks/trunk/tdmlinks/templates/tdmlinks_ratelink.tpl XoopsModules/tdmlinks/trunk/tdmlinks/templates/tdmlinks_rss.tpl XoopsModules/tdmlinks/trunk/tdmlinks/templates/tdmlinks_singlelink.tpl XoopsModules/tdmlinks/trunk/tdmlinks/templates/tdmlinks_submit.tpl XoopsModules/tdmlinks/trunk/tdmlinks/templates/tdmlinks_viewcat.tpl XoopsModules/tdmlinks/trunk/tdmlinks/tests/ XoopsModules/tdmlinks/trunk/tdmlinks/tests/index.html Removed Paths: ------------- XoopsModules/tdmlinks/trunk/tdmlinks/images/ XoopsModules/tdmlinks/trunk/tdmlinks/include/install.php XoopsModules/tdmlinks/trunk/tdmlinks/include/update.php XoopsModules/tdmlinks/trunk/tdmlinks/templates/blocks/tdmlinks_block_new.html XoopsModules/tdmlinks/trunk/tdmlinks/templates/blocks/tdmlinks_block_random.html XoopsModules/tdmlinks/trunk/tdmlinks/templates/blocks/tdmlinks_block_rating.html XoopsModules/tdmlinks/trunk/tdmlinks/templates/blocks/tdmlinks_block_search.html XoopsModules/tdmlinks/trunk/tdmlinks/templates/blocks/tdmlinks_block_top.html XoopsModules/tdmlinks/trunk/tdmlinks/templates/tdmlinks_brokenlink.html XoopsModules/tdmlinks/trunk/tdmlinks/templates/tdmlinks_index.html XoopsModules/tdmlinks/trunk/tdmlinks/templates/tdmlinks_link.html XoopsModules/tdmlinks/trunk/tdmlinks/templates/tdmlinks_liste.html XoopsModules/tdmlinks/trunk/tdmlinks/templates/tdmlinks_modlink.html XoopsModules/tdmlinks/trunk/tdmlinks/templates/tdmlinks_ratelink.html XoopsModules/tdmlinks/trunk/tdmlinks/templates/tdmlinks_rss.html XoopsModules/tdmlinks/trunk/tdmlinks/templates/tdmlinks_singlelink.html XoopsModules/tdmlinks/trunk/tdmlinks/templates/tdmlinks_submit.html XoopsModules/tdmlinks/trunk/tdmlinks/templates/tdmlinks_viewcat.html Modified: XoopsModules/tdmlinks/trunk/tdmlinks/admin/about.php =================================================================== --- XoopsModules/tdmlinks/trunk/tdmlinks/admin/about.php 2015-08-08 22:04:32 UTC (rev 13138) +++ XoopsModules/tdmlinks/trunk/tdmlinks/admin/about.php 2015-08-08 22:38:21 UTC (rev 13139) @@ -1,26 +1,25 @@ -<?php -/** - * TDMLink - * - * 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 Gregory Mage (Aka Mage) - * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html) - * @author Gregory Mage (Aka Mage) - */ - -include 'admin_header.php'; -xoops_cp_header(); -if (TDMLinks_checkModuleAdmin()){ - $about_admin = new ModuleAdmin(); - - echo $about_admin->addNavigation('about.php'); - echo $about_admin->renderabout('9MYQB7GUK5MCS', true); -} -xoops_cp_footer(); -?> \ No newline at end of file +<?php +/** + * TDMLink + * + * 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 Gregory Mage (Aka Mage) + * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html) + * @author Gregory Mage (Aka Mage) + */ + +include 'admin_header.php'; +xoops_cp_header(); +if (TDMLinks_checkModuleAdmin()) { + $about_admin = new ModuleAdmin(); + + echo $about_admin->addNavigation('about.php'); + echo $about_admin->renderabout('9MYQB7GUK5MCS', true); +} +xoops_cp_footer(); Modified: XoopsModules/tdmlinks/trunk/tdmlinks/admin/admin_header.php =================================================================== --- XoopsModules/tdmlinks/trunk/tdmlinks/admin/admin_header.php 2015-08-08 22:04:32 UTC (rev 13138) +++ XoopsModules/tdmlinks/trunk/tdmlinks/admin/admin_header.php 2015-08-08 22:38:21 UTC (rev 13139) @@ -14,26 +14,29 @@ * @author Gregory Mage (Aka Mage) */ +$moduleDirName = basename(dirname(__DIR__)); + // Include xoops admin header -include_once '../../../include/cp_header.php'; +include_once dirname(dirname(dirname(__DIR__))) . '/mainfile.php'; +include_once $GLOBALS['xoops']->path('www/include/cp_header.php'); -include_once(XOOPS_ROOT_PATH."/class/xoopsmodule.php"); -include_once XOOPS_ROOT_PATH."/class/xoopsformloader.php"; -include_once XOOPS_ROOT_PATH."/class/tree.php"; -include_once XOOPS_ROOT_PATH."/class/xoopslists.php"; -include_once XOOPS_ROOT_PATH.'/class/pagenav.php'; -include_once XOOPS_ROOT_PATH.'/class/xoopsform/grouppermform.php'; +include_once(XOOPS_ROOT_PATH . '/kernel/module.php'); +include_once XOOPS_ROOT_PATH . '/class/xoopsformloader.php'; +include_once XOOPS_ROOT_PATH . '/class/tree.php'; +include_once XOOPS_ROOT_PATH . '/class/xoopslists.php'; +include_once XOOPS_ROOT_PATH . '/class/pagenav.php'; +include_once XOOPS_ROOT_PATH . '/class/xoopsform/grouppermform.php'; -include_once("../include/functions.php"); +include_once('../include/functions.php'); -if ( $xoopsUser ) { - $xoopsModule = XoopsModule::getByDirname("TDMLinks"); - if ( !$xoopsUser->isAdmin($xoopsModule->mid()) ) { - redirect_header(XOOPS_URL."/",3,_NOPERM); +if ($xoopsUser) { + $xoopsModule = XoopsModule::getByDirname($moduleDirName); + if (!$xoopsUser->isAdmin($xoopsModule->mid())) { + redirect_header(XOOPS_URL . '/', 3, _NOPERM); exit(); } } else { - redirect_header(XOOPS_URL."/",3,_NOPERM); + redirect_header(XOOPS_URL . '/', 3, _NOPERM); exit(); } @@ -42,28 +45,27 @@ xoops_loadLanguage('admin', $xoopsModule->getVar('dirname', 'e')); xoops_loadLanguage('modinfo', $xoopsModule->getVar('dirname', 'e')); -//param\xE8tres: -// pour les images des cat\xE9gories: -$uploaddir = XOOPS_ROOT_PATH . '/uploads/TDMLinks/images/cats/'; -$uploadurl = XOOPS_URL . '/uploads/TDMLinks/images/cats/'; -// pour les fichiers -$uploaddir_links = XOOPS_ROOT_PATH . '/uploads/TDMLinks/links/'; -$uploadurl_links = XOOPS_URL . '/uploads/TDMLinks/links/'; -// pour les captures d'\xE9cran fichiers -$uploaddir_shots = XOOPS_ROOT_PATH . '/uploads/TDMLinks/images/shots/'; -$uploadurl_shots = XOOPS_URL . '/uploads/TDMLinks/images/shots/'; -// pour les images des champs: -$uploaddir_field = XOOPS_ROOT_PATH . '/uploads/TDMLinks/images/field/'; -$uploadurl_field = XOOPS_URL . '/uploads/TDMLinks/images/field/'; +//parameters: +// for images of categories: +$uploaddir = XOOPS_ROOT_PATH . '/uploads/tdmlinks/images/cats/'; +$uploadurl = XOOPS_URL . '/uploads/tdmlinks/images/cats/'; +// for links +$uploaddir_links = XOOPS_ROOT_PATH . '/uploads/tdmlinks/links/'; +$uploadurl_links = XOOPS_URL . '/uploads/tdmlinks/links/'; +// for screenshots +$uploaddir_shots = XOOPS_ROOT_PATH . '/uploads/tdmlinks/images/shots/'; +$uploadurl_shots = XOOPS_URL . '/uploads/tdmlinks/images/shots/'; +// for field images: +$uploaddir_field = XOOPS_ROOT_PATH . '/uploads/tdmlinks/images/field/'; +$uploadurl_field = XOOPS_URL . '/uploads/tdmlinks/images/field/'; ///////////// -//appel des class -$linkscat_Handler =& xoops_getModuleHandler('tdmlinks_cat', 'TDMLinks'); -$links_Handler =& xoops_getModuleHandler('tdmlinks_links', 'TDMLinks'); -$linksvotedata_Handler =& xoops_getModuleHandler('tdmlinks_votedata', 'TDMLinks'); -$linksfield_Handler =& xoops_getModuleHandler('tdmlinks_field', 'TDMLinks'); -$linksfielddata_Handler =& xoops_getModuleHandler('tdmlinks_fielddata', 'TDMLinks'); -$linksbroken_Handler =& xoops_getModuleHandler('tdmlinks_broken', 'TDMLinks'); -$linksmod_Handler =& xoops_getModuleHandler('tdmlinks_mod', 'TDMLinks'); -$linksfieldmoddata_Handler =& xoops_getModuleHandler('tdmlinks_modfielddata', 'TDMLinks'); -?> \ No newline at end of file +//class handlers +$linkscat_Handler =& xoops_getModuleHandler('tdmlinks_cat', $moduleDirName); +$links_Handler =& xoops_getModuleHandler('tdmlinks_links', $moduleDirName); +$linksvotedata_Handler =& xoops_getModuleHandler('tdmlinks_votedata', $moduleDirName); +$linksfield_Handler =& xoops_getModuleHandler('tdmlinks_field', $moduleDirName); +$linksfielddata_Handler =& xoops_getModuleHandler('tdmlinks_fielddata', $moduleDirName); +$linksbroken_Handler =& xoops_getModuleHandler('tdmlinks_broken', $moduleDirName); +$linksmod_Handler =& xoops_getModuleHandler('tdmlinks_mod', $moduleDirName); +$linksfieldmoddata_Handler =& xoops_getModuleHandler('tdmlinks_modfielddata', $moduleDirName); Modified: XoopsModules/tdmlinks/trunk/tdmlinks/admin/broken.php =================================================================== --- XoopsModules/tdmlinks/trunk/tdmlinks/admin/broken.php 2015-08-08 22:04:32 UTC (rev 13138) +++ XoopsModules/tdmlinks/trunk/tdmlinks/admin/broken.php 2015-08-08 22:38:21 UTC (rev 13139) @@ -20,81 +20,80 @@ $op = TDMLinks_CleanVars($_REQUEST, 'op', 'list', 'string'); //Les valeurs de op qui vont permettre d'aller dans les differentes parties de la page -switch ($op) -{ +switch ($op) { // Vue liste case "list": //Affichage de la partie haute de l'administration de Xoops xoops_cp_header(); - if (TDMLinks_checkModuleAdmin()){ + if (TDMLinks_checkModuleAdmin()) { $broken_admin = new ModuleAdmin(); echo $broken_admin->addNavigation('broken.php'); } $criteria = new CriteriaCompo(); if (isset($_REQUEST['limit'])) { - $criteria->setLimit($_REQUEST['limit']); - $limit = $_REQUEST['limit']; - } else { - $criteria->setLimit($xoopsModuleConfig['perpageadmin']); - $limit = $xoopsModuleConfig['perpageadmin']; - } + $criteria->setLimit($_REQUEST['limit']); + $limit = $_REQUEST['limit']; + } else { + $criteria->setLimit($xoopsModuleConfig['perpageadmin']); + $limit = $xoopsModuleConfig['perpageadmin']; + } if (isset($_REQUEST['start'])) { $criteria->setStart($_REQUEST['start']); $start = $_REQUEST['start']; } else { $criteria->setStart(0); - $start = 0; - } + $start = 0; + } $criteria->setSort('reportid'); $criteria->setOrder('ASC'); //pour faire une jointure de table - $linksbroken_Handler->table_link = $linksbroken_Handler->db->prefix("tdmlinks_links"); // Nom de la table en jointure - $linksbroken_Handler->field_link = "lid"; // champ de la table en jointure + $linksbroken_Handler->table_link = $linksbroken_Handler->db->prefix("tdmlinks_links"); // Nom de la table en jointure + $linksbroken_Handler->field_link = "lid"; // champ de la table en jointure $linksbroken_Handler->field_object = "lid"; // champ de la table courante - $linksbroken_arr = $linksbroken_Handler->getByLink($criteria); - $numrows = $linksbroken_Handler->getCount($criteria); - if ( $numrows > $limit ) { + $linksbroken_arr = $linksbroken_Handler->getByLink($criteria); + $numrows = $linksbroken_Handler->getCount($criteria); + if ($numrows > $limit) { $pagenav = new XoopsPageNav($numrows, $limit, $start, 'start', 'op=list&limit=' . $limit); - $pagenav = $pagenav->renderNav(4); - } else { - $pagenav = ''; - } + $pagenav = $pagenav->renderNav(4); + } else { + $pagenav = ''; + } //Affichage du tableau des téléchargements brisés if ($numrows > 0) { echo '<table width="100%" cellspacing="1" class="outer">'; echo '<tr>'; - echo '<th align="center" width="10%">'._AM_TDMLINKS_FORMFILE.'</th>'; + echo '<th align="center" width="10%">' . _AM_TDMLINKS_FORMFILE . '</th>'; echo '<th align="center">' . _AM_TDMLINKS_FORMTITLE . '</th>'; echo '<th align="center" width="20%">' . _AM_TDMLINKS_BROKEN_SENDER . '</th>'; - echo '<th align="center" width="15%">'._AM_TDMLINKS_FORMACTION.'</th>'; + echo '<th align="center" width="15%">' . _AM_TDMLINKS_FORMACTION . '</th>'; echo '</tr>'; $class = 'odd'; foreach (array_keys($linksbroken_arr) as $i) { - $class = ($class == 'even') ? 'odd' : 'even'; - $links_lid = $linksbroken_arr[$i]->getVar('lid'); - $links_reportid = $linksbroken_arr[$i]->getVar('reportid'); - $links_title = $linksbroken_arr[$i]->getVar('title'); - $links_cid = $linksbroken_arr[$i]->getVar('cid'); - $links_poster = XoopsUser::getUnameFromId($linksbroken_arr[$i]->getVar('sender')); + $class = ($class == 'even') ? 'odd' : 'even'; + $links_lid = $linksbroken_arr[$i]->getVar('lid'); + $links_reportid = $linksbroken_arr[$i]->getVar('reportid'); + $links_title = $linksbroken_arr[$i]->getVar('title'); + $links_cid = $linksbroken_arr[$i]->getVar('cid'); + $links_poster = XoopsUser::getUnameFromId($linksbroken_arr[$i]->getVar('sender')); $links_poster_ip = $linksbroken_arr[$i]->getVar('ip'); - echo '<tr class="'.$class.'">'; + echo '<tr class="' . $class . '">'; echo '<td align="center">'; - echo '<a href="../visit.php?cid=' . $links_cid . '&lid=' . $links_lid . '" target="_blank"><img src="../images/icon/link.png" alt="link ' . $links_title . '" title="link ' . $links_title . '"></a>'; + echo '<a href="../visit.php?cid=' . $links_cid . '&lid=' . $links_lid . '" target="_blank"><img src="../assets/images/icon/link.png" alt="link ' . $links_title . '" title="link ' . $links_title . '"></a>'; echo '</td>'; echo '<td align="center">' . $links_title . '</td>'; echo '<td align="center"><b>' . $links_poster . '</b> (' . $links_poster_ip . ')</td>'; echo '<td align="center" width="15%">'; - echo '<a href="links.php?op=view_links&links_lid=' . $links_lid . '"><img src="../images/icon/view_mini.png" alt="' . _AM_TDMLINKS_FORMDISPLAY . '" title="' . _AM_TDMLINKS_FORMDISPLAY . '"></a> '; - echo '<a href="links.php?op=edit_links&links_lid=' . $links_lid . '"><img src="../images/icon/edit.png" alt="' . _AM_TDMLINKS_FORMEDIT . '" title="' . _AM_TDMLINKS_FORMEDIT . '"></a> '; - echo '<a href="broken.php?op=del_brokenlinks&broken_id=' . $links_reportid . '"><img src="../images/icon/ignore_mini.png" alt="' . _AM_TDMLINKS_FORMIGNORE . '" title="' . _AM_TDMLINKS_FORMIGNORE . '"></a>'; + echo '<a href="links.php?op=view_links&links_lid=' . $links_lid . '"><img src="../assets/images/icon/view_mini.png" alt="' . _AM_TDMLINKS_FORMDISPLAY . '" title="' . _AM_TDMLINKS_FORMDISPLAY . '"></a> '; + echo '<a href="links.php?op=edit_links&links_lid=' . $links_lid . '"><img src="../assets/images/icon/edit.png" alt="' . _AM_TDMLINKS_FORMEDIT . '" title="' . _AM_TDMLINKS_FORMEDIT . '"></a> '; + echo '<a href="broken.php?op=del_brokenlinks&broken_id=' . $links_reportid . '"><img src="../assets/images/icon/ignore_mini.png" alt="' . _AM_TDMLINKS_FORMIGNORE . '" title="' . _AM_TDMLINKS_FORMIGNORE . '"></a>'; echo '</td>'; - } - echo '</table><br />'; - echo '<br /><div align=right>' . $pagenav . '</div><br />'; - }else{ + } + echo '</table><br />'; + echo '<br /><div align=right>' . $pagenav . '</div><br />'; + } else { echo '<div class="errorMsg" style="text-align: center;">' . _AM_TDMLINKS_ERREUR_NOBROKENLINKS . '</div>'; } - break; + break; // permet de suprimmer le rapport de téléchargment brisé case "del_brokenlinks": @@ -110,15 +109,14 @@ } else { //Affichage de la partie haute de l'administration de Xoops xoops_cp_header(); - if (TDMLinks_checkModuleAdmin()){ + if (TDMLinks_checkModuleAdmin()) { $broken_admin = new ModuleAdmin(); $broken_admin->addItemButton(_MI_TDMLINKS_ADMENU4, 'broken.php', 'list'); echo $broken_admin->renderButton(); } xoops_confirm(array('ok' => 1, 'broken_id' => $_REQUEST['broken_id'], 'op' => 'del_brokenlinks'), $_SERVER['REQUEST_URI'], _AM_TDMLINKS_BROKEN_SURDEL . '<br>'); } - break; + break; } //Affichage de la partie basse de l'administration de Xoops xoops_cp_footer(); -?> \ No newline at end of file Modified: XoopsModules/tdmlinks/trunk/tdmlinks/admin/category.php =================================================================== --- XoopsModules/tdmlinks/trunk/tdmlinks/admin/category.php 2015-08-08 22:04:32 UTC (rev 13138) +++ XoopsModules/tdmlinks/trunk/tdmlinks/admin/category.php 2015-08-08 22:38:21 UTC (rev 13139) @@ -19,13 +19,12 @@ $op = TDMLinks_CleanVars($_REQUEST, 'op', 'list', 'string'); //Les valeurs de op qui vont permettre d'aller dans les differentes parties de la page -switch ($op) -{ +switch ($op) { // Vue liste case "list": //Affichage de la partie haute de l'administration de Xoops xoops_cp_header(); - if (TDMLinks_checkModuleAdmin()){ + if (TDMLinks_checkModuleAdmin()) { $category_admin = new ModuleAdmin(); echo $category_admin->addNavigation('category.php'); $category_admin->addItemButton(_AM_TDMLINKS_CAT_NEW, 'category.php?op=new_cat', 'add'); @@ -36,7 +35,7 @@ $criteria->setOrder('ASC'); $links_cat = $linkscat_Handler->getall($criteria); //Affichage du tableau - if (count($links_cat)>0) { + if (count($links_cat) > 0) { echo '<table width="100%" cellspacing="1" class="outer">'; echo '<tr>'; echo '<th align="left" width="25%">' . _AM_TDMLINKS_FORMTITLE . '</th>'; @@ -46,49 +45,49 @@ echo '<th align="center" width="8%">' . _AM_TDMLINKS_FORMACTION . '</th>'; echo '</tr>'; $class = 'odd'; - include_once XOOPS_ROOT_PATH."/modules/TDMLinks/class/tree.php"; - $mytree = new TDMObjectTree($links_cat, 'cat_cid', 'cat_pid'); - $category_ArrayTree = $mytree->makeArrayTree('cat_title','<img src="../images/deco/arrow.gif">'); + include_once XOOPS_ROOT_PATH . "/modules/tdmlinks/class/tree.php"; + $mytree = new TDMObjectTree($links_cat, 'cat_cid', 'cat_pid'); + $category_ArrayTree = $mytree->makeArrayTree('cat_title', '<img src="../assets/images/deco/arrow.gif">'); foreach (array_keys($category_ArrayTree) as $i) { - echo '<tr class="'.$class.'">'; - echo '<td align="left" ><a href="' . XOOPS_URL . '/modules/TDMLinks/viewcat.php?cid=' . $i . '">' . $category_ArrayTree[$i] . '</a></td>'; + echo '<tr class="' . $class . '">'; + echo '<td align="left" ><a href="' . XOOPS_URL . '/modules/tdmlinks/viewcat.php?cid=' . $i . '">' . $category_ArrayTree[$i] . '</a></td>'; echo '<td align="center">'; echo '<img src="' . $uploadurl . $links_cat[$i]->getVar('cat_imgurl') . '" alt="" title="" height="60">'; echo '</td>'; echo '<td align="left">' . $links_cat[$i]->getVar('cat_description_main') . '</td>'; echo '<td align="center">' . $links_cat[$i]->getVar('cat_weight') . '</td>'; echo '<td align="center">'; - echo '<a href="category.php?op=edit_cat&linkscat_cid=' . $i . '"><img src="../images/icon/edit.png" alt="'._AM_TDMLINKS_FORMEDIT.'" title="'._AM_TDMLINKS_FORMEDIT.'"></a> '; - echo '<a href="category.php?op=del_cat&linkscat_cid=' . $i . '"><img src="../images/icon/delete.png" alt="'._AM_TDMLINKS_FORMDEL.'" title="'._AM_TDMLINKS_FORMDEL.'"></a>'; + echo '<a href="category.php?op=edit_cat&linkscat_cid=' . $i . '"><img src="../assets/images/icon/edit.png" alt="' . _AM_TDMLINKS_FORMEDIT . '" title="' . _AM_TDMLINKS_FORMEDIT . '"></a> '; + echo '<a href="category.php?op=del_cat&linkscat_cid=' . $i . '"><img src="../assets/images/icon/delete.png" alt="' . _AM_TDMLINKS_FORMDEL . '" title="' . _AM_TDMLINKS_FORMDEL . '"></a>'; echo '</td>'; echo '</tr>'; $class = ($class == 'even') ? 'odd' : 'even'; } echo '</table>'; } - break; + break; // vue création case "new_cat": //Affichage de la partie haute de l'administration de Xoops xoops_cp_header(); - if (TDMLinks_checkModuleAdmin()){ + if (TDMLinks_checkModuleAdmin()) { $category_admin = new ModuleAdmin(); echo $category_admin->addNavigation('category.php'); $category_admin->addItemButton(_AM_TDMLINKS_CAT_LIST, 'category.php?op=list', 'list'); echo $category_admin->renderButton(); } //Affichage du formulaire de création des catégories - $obj =& $linkscat_Handler->create(); + $obj =& $linkscat_Handler->create(); $form = $obj->getForm(); $form->display(); - break; + break; // Pour éditer une catégorie case "edit_cat": //Affichage de la partie haute de l'administration de Xoops xoops_cp_header(); - if (TDMLinks_checkModuleAdmin()){ + if (TDMLinks_checkModuleAdmin()) { $category_admin = new ModuleAdmin(); echo $category_admin->addNavigation('category.php'); $category_admin->addItemButton(_AM_TDMLINKS_CAT_NEW, 'category.php?op=new_cat', 'add'); @@ -97,16 +96,16 @@ } //Affichage du formulaire de création des catégories $linkscat_cid = TDMLinks_CleanVars($_REQUEST, 'linkscat_cid', 0, 'int'); - $obj = $linkscat_Handler->get($linkscat_cid); - $form = $obj->getForm(); + $obj = $linkscat_Handler->get($linkscat_cid); + $form = $obj->getForm(); $form->display(); - break; + break; // Pour supprimer une catégorie case "del_cat": global $xoopsModule; $linkscat_cid = TDMLinks_CleanVars($_REQUEST, 'linkscat_cid', 0, 'int'); - $obj =& $linkscat_Handler->get($linkscat_cid); + $obj =& $linkscat_Handler->get($linkscat_cid); if (isset($_REQUEST['ok']) && $_REQUEST['ok'] == 1) { if (!$GLOBALS['xoopsSecurity']->check()) { redirect_header('category.php', 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors())); @@ -130,29 +129,29 @@ $links_broken = $linksbroken_Handler->getall($criteria_2); foreach (array_keys($links_broken) as $j) { $objbroken =& $linksbroken_Handler->get($links_broken[$j]->getVar('reportid')); - $linksbroken_Handler->delete($objbroken ) or $objbroken ->getHtmlErrors(); + $linksbroken_Handler->delete($objbroken) or $objbroken->getHtmlErrors(); } // supression des data des champs sup. $criteria_3 = new CriteriaCompo(); $criteria_3->add(new Criteria('lid', $links_arr[$i]->getVar('lid'))); $links_fielddata = $linksfielddata_Handler->getall($criteria_3); - if ($linksfielddata_Handler->getCount( $criteria_3 ) > 0){ + if ($linksfielddata_Handler->getCount($criteria_3) > 0) { foreach (array_keys($links_fielddata) as $j) { $objfielddata =& $linksfielddata_Handler->get($links_fielddata[$j]->getVar('iddata')); $linksfielddata_Handler->delete($objfielddata) or $objvfielddata->getHtmlErrors(); } } // supression des commentaires - if ($links_arr[$i]->getVar('comments') > 0){ + if ($links_arr[$i]->getVar('comments') > 0) { xoops_comment_delete($xoopsModule->getVar('mid'), $links_arr[$i]->getVar('lid')); } //supression des tags - if (($xoopsModuleConfig['usetag'] == 1) and (is_dir('../../tag'))){ + if (($xoopsModuleConfig['usetag'] == 1) and (is_dir('../../tag'))) { $tag_handler = xoops_getmodulehandler('link', 'tag'); - $criteria = new CriteriaCompo(); + $criteria = new CriteriaCompo(); $criteria->add(new Criteria('tag_itemid', $links_arr[$i]->getVar('lid'))); - $links_tags = $tag_handler->getall( $criteria ); - if (count($links_tags) > 0){ + $links_tags = $tag_handler->getall($criteria); + if (count($links_tags) > 0) { foreach (array_keys($links_tags) as $j) { $objtags =& $tag_handler->get($links_tags[$j]->getVar('tl_id')); $tag_handler->delete($objtags) or $objtags->getHtmlErrors(); @@ -161,10 +160,10 @@ } // supression du fichier // pour extraire le nom du fichier - $urlfile = substr_replace($links_arr[$i]->getVar('url'),'',0,strlen($uploadurl_LINKS)); + $urlfile = substr_replace($links_arr[$i]->getVar('url'), '', 0, strlen($uploadurl_LINKS)); // chemin du fichier $urlfile = $uploaddir_LINKS . $urlfile; - if (is_file($urlfile)){ + if (is_file($urlfile)) { chmod($urlfile, 0777); unlink($urlfile); } @@ -173,9 +172,9 @@ $links_Handler->delete($objlinks) or $objlinks->getHtmlErrors(); } // supression des sous catégories avec leurs téléchargements - $linkscat_arr = $linkscat_Handler->getall(); - $mytree = new XoopsObjectTree($linkscat_arr, 'cat_cid', 'cat_pid'); - $links_childcat=$mytree->getAllChild($linkscat_cid); + $linkscat_arr = $linkscat_Handler->getall(); + $mytree = new XoopsObjectTree($linkscat_arr, 'cat_cid', 'cat_pid'); + $links_childcat = $mytree->getAllChild($linkscat_cid); foreach (array_keys($links_childcat) as $i) { // supression de la catégorie $objchild =& $linkscat_Handler->get($links_childcat[$i]->getVar('cat_cid')); @@ -183,12 +182,12 @@ // supression des téléchargements associés $criteria = new CriteriaCompo(); $criteria->add(new Criteria('cid', $links_childcat[$i]->getVar('cat_cid'))); - $links_arr = $links_Handler->getall( $criteria ); + $links_arr = $links_Handler->getall($criteria); foreach (array_keys($links_arr) as $i) { // supression des votes $criteria = new CriteriaCompo(); $criteria->add(new Criteria('lid', $links_arr[$i]->getVar('lid'))); - $links_votedata = $linksvotedata_Handler->getall( $criteria ); + $links_votedata = $linksvotedata_Handler->getall($criteria); foreach (array_keys($links_votedata) as $j) { $objvotedata =& $linksvotedata_Handler->get($links_votedata[$j]->getVar('ratingid')); $linksvotedata_Handler->delete($objvotedata) or $objvotedata->getHtmlErrors(); @@ -196,30 +195,30 @@ // supression des rapports de fichier brisé $criteria = new CriteriaCompo(); $criteria->add(new Criteria('lid', $links_arr[$i]->getVar('lid'))); - $links_broken = $linksbroken_Handler->getall( $criteria ); + $links_broken = $linksbroken_Handler->getall($criteria); foreach (array_keys($links_broken) as $j) { $objbroken =& $linksbroken_Handler->get($links_broken[$j]->getVar('reportid')); - $linksbroken_Handler->delete($objbroken ) or $objbroken ->getHtmlErrors(); + $linksbroken_Handler->delete($objbroken) or $objbroken->getHtmlErrors(); } // supression des data des champs sup. $criteria = new CriteriaCompo(); $criteria->add(new Criteria('lid', $links_arr[$i]->getVar('lid'))); - $links_fielddata = $linksfielddata_Handler->getall( $criteria ); + $links_fielddata = $linksfielddata_Handler->getall($criteria); foreach (array_keys($links_fielddata) as $j) { $objfielddata =& $linksfielddata_Handler->get($links_fielddata[$j]->getVar('iddata')); $linksfielddata_Handler->delete($objfielddata) or $objvfielddata->getHtmlErrors(); } // supression des commentaires - if ($links_arr[$i]->getVar('comments') > 0){ + if ($links_arr[$i]->getVar('comments') > 0) { xoops_comment_delete($xoopsModule->getVar('mid'), $links_arr[$i]->getVar('lid')); } //supression des tags - if (($xoopsModuleConfig['usetag'] == 1) and (is_dir('../../tag'))){ + if (($xoopsModuleConfig['usetag'] == 1) and (is_dir('../../tag'))) { $tag_handler = xoops_getmodulehandler('link', 'tag'); - $criteria = new CriteriaCompo(); + $criteria = new CriteriaCompo(); $criteria->add(new Criteria('tag_itemid', $links_arr[$i]->getVar('lid'))); - $links_tags = $tag_handler->getall( $criteria ); - if (count($links_tags) > 0){ + $links_tags = $tag_handler->getall($criteria); + if (count($links_tags) > 0) { foreach (array_keys($links_tags) as $j) { $objtags =& $tag_handler->get($links_tags[$j]->getVar('tl_id')); $tag_handler->delete($objtags) or $objtags->getHtmlErrors(); @@ -227,9 +226,9 @@ } } // supression du fichier - $urlfile = substr_replace($links_arr[$i]->getVar('url'),'',0,strlen($uploadurl_LINKS)); // pour extraire le nom du fichier + $urlfile = substr_replace($links_arr[$i]->getVar('url'), '', 0, strlen($uploadurl_LINKS)); // pour extraire le nom du fichier $urlfile = $uploaddir_LINKS . $urlfile; // chemin du fichier - if (is_file($urlfile)){ + if (is_file($urlfile)) { chmod($urlfile, 0777); unlink($urlfile); } @@ -244,39 +243,39 @@ echo $obj->getHtmlErrors(); } } else { - $message = ''; + $message = ''; $criteria = new CriteriaCompo(); $criteria->add(new Criteria('cid', $linkscat_cid)); - $links_arr = $links_Handler->getall( $criteria ); + $links_arr = $links_Handler->getall($criteria); if (count($links_arr) > 0) { - $message .= _AM_TDMLINKS_DELLINKS .'<br>'; + $message .= _AM_TDMLINKS_DELLINKS . '<br>'; foreach (array_keys($links_arr) as $i) { $message .= '<span style="color : Red">' . $links_arr[$i]->getVar('title') . '</span><br>'; } } - $linkscat_arr = $linkscat_Handler->getall(); - $mytree = new XoopsObjectTree($linkscat_arr, 'cat_cid', 'cat_pid'); - $links_childcat=$mytree->getAllChild($linkscat_cid); + $linkscat_arr = $linkscat_Handler->getall(); + $mytree = new XoopsObjectTree($linkscat_arr, 'cat_cid', 'cat_pid'); + $links_childcat = $mytree->getAllChild($linkscat_cid); if (count($links_childcat) > 0) { - $message .=_AM_TDMLINKS_DELSOUSCAT . ' <br><br>'; + $message .= _AM_TDMLINKS_DELSOUSCAT . ' <br><br>'; foreach (array_keys($links_childcat) as $i) { $message .= '<b><span style="color : Red">' . $links_childcat[$i]->getVar('cat_title') . '</span></b><br>'; $criteria = new CriteriaCompo(); $criteria->add(new Criteria('cid', $links_childcat[$i]->getVar('cat_cid'))); - $links_arr = $links_Handler->getall( $criteria ); + $links_arr = $links_Handler->getall($criteria); if (count($links_arr) > 0) { - $message .= _AM_TDMLINKS_DELLINKS .'<br>'; + $message .= _AM_TDMLINKS_DELLINKS . '<br>'; foreach (array_keys($links_arr) as $i) { $message .= '<span style="color : Red">' . $links_arr[$i]->getVar('title') . '</span><br>'; } } } - }else{ - $message.=''; + } else { + $message .= ''; } //Affichage de la partie haute de l'administration de Xoops xoops_cp_header(); - if (TDMLinks_checkModuleAdmin()){ + if (TDMLinks_checkModuleAdmin()) { $category_admin = new ModuleAdmin(); $category_admin->addItemButton(_AM_TDMLINKS_CAT_NEW, 'category.php?op=new_cat', 'add'); $category_admin->addItemButton(_AM_TDMLINKS_CAT_LIST, 'category.php?op=list', 'list'); @@ -285,31 +284,31 @@ xoops_confirm(array('ok' => 1, 'linkscat_cid' => $linkscat_cid, 'op' => 'del_cat'), $_SERVER['REQUEST_URI'], sprintf(_AM_TDMLINKS_FORMSUREDEL, $obj->getVar('cat_title')) . '<br><br>' . $message); } - break; + break; // Pour sauver une catégorie case "save_cat": if (!$GLOBALS['xoopsSecurity']->check()) { - redirect_header('category.php', 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors())); + redirect_header('category.php', 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors())); } $cat_cid = TDMLinks_CleanVars($_REQUEST, 'cat_cid', 0, 'int'); if (isset($_REQUEST['cat_cid'])) { - $obj =& $linkscat_Handler->get($cat_cid); + $obj =& $linkscat_Handler->get($cat_cid); } else { - $obj =& $linkscat_Handler->create(); + $obj =& $linkscat_Handler->create(); } - $erreur = false; + $erreur = false; $message_erreur = ''; // Récupération des variables: // Pour l'image - include_once XOOPS_ROOT_PATH.'/class/uploader.php'; + include_once XOOPS_ROOT_PATH . '/class/uploader.php'; $uploader = new XoopsMediaUploader($uploaddir, array('image/gif', 'image/jpeg', 'image/pjpeg', 'image/x-png', 'image/png'), $xoopsModuleConfig['maxuploadsize'], null, null); if ($uploader->fetchMedia($_POST['xoops_upload_file'][0])) { - $uploader->setPrefix('links_') ; + $uploader->setPrefix('links_'); $uploader->fetchMedia($_POST['xoops_upload_file'][0]); if (!$uploader->upload()) { $errors = $uploader->getErrors(); - redirect_header("javascript:history.go(-1)",3, $errors); + redirect_header("javascript:history.go(-1)", 3, $errors); } else { $obj->setVar('cat_imgurl', $uploader->getSavedFileName()); } @@ -321,68 +320,68 @@ $obj->setVar('cat_title', $_POST['cat_title']); $obj->setVar('cat_description_main', $_POST['cat_description_main']); $obj->setVar('cat_weight', $_POST["cat_weight"]); - if (intval($_REQUEST['cat_weight'])==0 && $_REQUEST['cat_weight'] != '0'){ - $erreur=true; + if ((int)($_REQUEST['cat_weight']) == 0 && $_REQUEST['cat_weight'] != '0') { + $erreur = true; $message_erreur = _AM_TDMLINKS_ERREUR_WEIGHT . '<br>'; } - if (isset($_REQUEST['cat_cid'])){ - if ($cat_cid == $_REQUEST['cat_pid']){ - $erreur=true; + if (isset($_REQUEST['cat_cid'])) { + if ($cat_cid == $_REQUEST['cat_pid']) { + $erreur = true; $message_erreur .= _AM_TDMLINKS_ERREUR_CAT; } } - if ($erreur==true){ + if ($erreur == true) { echo '<div class="errorMsg" style="text-align: left;">' . $message_erreur . '</div>'; - }else{ + } else { if ($linkscat_Handler->insert($obj)) { $newcat_cid = $obj->get_new_enreg(); //permission pour voir - $perm_id = isset($_REQUEST['cat_cid']) ? $cat_cid : $newcat_cid; + $perm_id = isset($_REQUEST['cat_cid']) ? $cat_cid : $newcat_cid; $gperm_handler = &xoops_gethandler('groupperm'); - $criteria = new CriteriaCompo(); + $criteria = new CriteriaCompo(); $criteria->add(new Criteria('gperm_itemid', $perm_id, '=')); - $criteria->add(new Criteria('gperm_modid', $xoopsModule->getVar('mid'),'=')); + $criteria->add(new Criteria('gperm_modid', $xoopsModule->getVar('mid'), '=')); $criteria->add(new Criteria('gperm_name', 'tdmlinks_view', '=')); $gperm_handler->deleteAll($criteria); - if(isset($_POST['groups_view'])) { - foreach($_POST['groups_view'] as $onegroup_id) { + if (isset($_POST['groups_view'])) { + foreach ($_POST['groups_view'] as $onegroup_id) { $gperm_handler->addRight('tdmlinks_view', $perm_id, $onegroup_id, $xoopsModule->getVar('mid')); } } //permission pour editer - $perm_id = isset($_REQUEST['cat_cid']) ? $cat_cid : $newcat_cid; + $perm_id = isset($_REQUEST['cat_cid']) ? $cat_cid : $newcat_cid; $gperm_handler = &xoops_gethandler('groupperm'); - $criteria = new CriteriaCompo(); + $criteria = new CriteriaCompo(); $criteria->add(new Criteria('gperm_itemid', $perm_id, '=')); - $criteria->add(new Criteria('gperm_modid', $xoopsModule->getVar('mid'),'=')); + $criteria->add(new Criteria('gperm_modid', $xoopsModule->getVar('mid'), '=')); $criteria->add(new Criteria('gperm_name', 'TDMLinks_submit', '=')); $gperm_handler->deleteAll($criteria); - if(isset($_POST['groups_submit'])) { - foreach($_POST['groups_submit'] as $onegroup_id) { + if (isset($_POST['groups_submit'])) { + foreach ($_POST['groups_submit'] as $onegroup_id) { $gperm_handler->addRight('TDMLinks_submit', $perm_id, $onegroup_id, $xoopsModule->getVar('mid')); } } //permission pour télécharger if ($xoopsModuleConfig['permission_link'] == 1) { - $perm_id = isset($_REQUEST['cat_cid']) ? $cat_cid : $newcat_cid; + $perm_id = isset($_REQUEST['cat_cid']) ? $cat_cid : $newcat_cid; $gperm_handler = &xoops_gethandler('groupperm'); - $criteria = new CriteriaCompo(); + $criteria = new CriteriaCompo(); $criteria->add(new Criteria('gperm_itemid', $perm_id, '=')); - $criteria->add(new Criteria('gperm_modid', $xoopsModule->getVar('mid'),'=')); + $criteria->add(new Criteria('gperm_modid', $xoopsModule->getVar('mid'), '=')); $criteria->add(new Criteria('gperm_name', 'TDMLinks_link', '=')); $gperm_handler->deleteAll($criteria); - if(isset($_POST['groups_link'])) { - foreach($_POST['groups_link'] as $onegroup_id) { + if (isset($_POST['groups_link'])) { + foreach ($_POST['groups_link'] as $onegroup_id) { $gperm_handler->addRight('TDMLinks_link', $perm_id, $onegroup_id, $xoopsModule->getVar('mid')); } } } //notification if (!isset($_REQUEST['categorie_modified'])) { - $tags = array(); + $tags = array(); $tags['CATEGORY_NAME'] = $_POST['cat_title']; - $tags['CATEGORY_URL'] = XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/viewcat.php?cid=' . $newcat_cid; - $notification_handler =& xoops_gethandler('notification'); + $tags['CATEGORY_URL'] = XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/viewcat.php?cid=' . $newcat_cid; + $notification_handler =& xoops_gethandler('notification'); $notification_handler->triggerEvent('global', 0, 'new_category', $tags); } redirect_header('category.php?op=list', 1, _AM_TDMLINKS_REDIRECT_SAVE); @@ -391,8 +390,7 @@ } $form =& $obj->getForm(); $form->display(); - break; + break; } //Affichage de la partie basse de l'administration de Xoops xoops_cp_footer(); -?> \ No newline at end of file Modified: XoopsModules/tdmlinks/trunk/tdmlinks/admin/field.php =================================================================== --- XoopsModules/tdmlinks/trunk/tdmlinks/admin/field.php 2015-08-08 22:04:32 UTC (rev 13138) +++ XoopsModules/tdmlinks/trunk/tdmlinks/admin/field.php 2015-08-08 22:38:21 UTC (rev 13139) @@ -19,13 +19,12 @@ $op = TDMLinks_CleanVars($_REQUEST, 'op', 'list', 'string'); //Les valeurs de op qui vont permettre d'aller dans les differentes parties de la page -switch ($op) -{ +switch ($op) { // Vue liste case "list": //Affichage de la partie haute de l'administration de Xoops xoops_cp_header(); - if (TDMLinks_checkModuleAdmin()){ + if (TDMLinks_checkModuleAdmin()) { $field_admin = new ModuleAdmin(); echo $field_admin->addNavigation('field.php'); $field_admin->addItemButton(_AM_TDMLINKS_FIELD_NEW, 'field.php?op=new_field', 'add'); @@ -36,9 +35,9 @@ $criteria->setSort('weight ASC, title'); $criteria->setOrder('ASC'); $links_field = $linksfield_Handler->getall($criteria); - $numrows = count($links_field); + $numrows = count($links_field); //Affichage du tableau - if ($numrows>0) { + if ($numrows > 0) { echo '<table width="100%" cellspacing="1" class="outer">'; echo '<tr>'; echo '<th align="left">' . _AM_TDMLINKS_FORMTITLE . '</th>'; @@ -51,27 +50,27 @@ $class = 'odd'; foreach (array_keys($links_field) as $i) { $linksfield_fid = $links_field[$i]->getVar('fid'); - echo '<tr class="'.$class.'">'; + echo '<tr class="' . $class . '">'; echo '<td align="left">' . $links_field[$i]->getVar('title') . '</a></td>'; echo '<td align="center" width="10%">'; echo '<img src="' . $uploadurl_field . $links_field[$i]->getVar('img') . '" alt="" title="" height="16">'; echo '</td>'; echo '<td align="center" width="10%">' . $links_field[$i]->getVar('weight') . '</td>'; - echo '<td align="center" width="10%"><a href="field.php?op=update_status&fid=' . $linksfield_fid . '&aff=' . ($links_field[$i]->getVar('status') == 1 ? '0"><img src="../images/icon/on.png"></a>' : '1"><img src="../images/icon/off.png"></a>') . '</td>'; - echo '<td align="center" width="10%"><a href="field.php?op=update_search&fid=' . $linksfield_fid . '&aff=' . ($links_field[$i]->getVar('search') == 1 ? '0"><img src="../images/icon/on.png"></a>' : '1"><img src="../images/icon/off.png"></a>') . '</td>'; + echo '<td align="center" width="10%"><a href="field.php?op=update_status&fid=' . $linksfield_fid . '&aff=' . ($links_field[$i]->getVar('status') === 1 ? '0"><img src="../assets/images/icon/on.png"></a>' : '1"><img src="../assets/images/icon/off.png"></a>') . '</td>'; + echo '<td align="center" width="10%"><a href="field.php?op=update_search&fid=' . $linksfield_fid . '&aff=' . ($links_field[$i]->getVar('search') === 1 ? '0"><img src="../assets/images/icon/on.png"></a>' : '1"><img src="../assets/images/icon/off.png"></a>') . '</td>'; echo '<td align="center" width="10%">'; - echo '<a href="field.php?op=edit_field&fid=' . $linksfield_fid . '"><img src="../images/icon/edit.png" alt="' . _AM_TDMLINKS_FORMEDIT . '" title="' . _AM_TDMLINKS_FORMEDIT . '"></a> '; - if ($links_field[$i]->getVar('status_def') == 0){ - echo '<a href="field.php?op=del_field&fid=' . $linksfield_fid . '"><img src="../images/icon/delete.png" alt="' . _AM_TDMLINKS_FORMDEL . '" title="' . _AM_TDMLINKS_FORMDEL . '"></a>'; + echo '<a href="field.php?op=edit_field&fid=' . $linksfield_fid . '"><img src="../assets/images/icon/edit.png" alt="' . _AM_TDMLINKS_FORMEDIT . '" title="' . _AM_TDMLINKS_FORMEDIT . '"></a> '; + if ($links_field[$i]->getVar('status_def') === 0) { + echo '<a href="field.php?op=del_field&fid=' . $linksfield_fid . '"><img src="../assets/images/icon/delete.png" alt="' . _AM_TDMLINKS_FORMDEL . '" title="' . _AM_TDMLINKS_FORMDEL . '"></a>'; } echo '</td>'; echo '</tr>'; - $class = ($class == 'even') ? 'odd' : 'even'; + $class = ($class === 'even') ? 'odd' : 'even'; ... [truncated message content] |