From: <be...@us...> - 2012-06-23 20:42:54
|
Revision: 9694 http://xoops.svn.sourceforge.net/xoops/?rev=9694&view=rev Author: beckmi Date: 2012-06-23 20:42:45 +0000 (Sat, 23 Jun 2012) Log Message: ----------- Updating to 1.08 (converted to XOOPS 2.5.x ModuleAdmin GUI) Modified Paths: -------------- XoopsModules/wflink/trunk/htdocs/modules/wflinks/admin/about.php XoopsModules/wflink/trunk/htdocs/modules/wflinks/admin/admin.php XoopsModules/wflink/trunk/htdocs/modules/wflinks/admin/admin_header.php XoopsModules/wflink/trunk/htdocs/modules/wflinks/admin/altcat.php XoopsModules/wflink/trunk/htdocs/modules/wflinks/admin/brokenlink.php XoopsModules/wflink/trunk/htdocs/modules/wflinks/admin/category.php XoopsModules/wflink/trunk/htdocs/modules/wflinks/admin/index.php XoopsModules/wflink/trunk/htdocs/modules/wflinks/admin/indexpage.php XoopsModules/wflink/trunk/htdocs/modules/wflinks/admin/menu.php XoopsModules/wflink/trunk/htdocs/modules/wflinks/admin/modifications.php XoopsModules/wflink/trunk/htdocs/modules/wflinks/admin/myblocksadmin.php XoopsModules/wflink/trunk/htdocs/modules/wflinks/admin/newlinks.php XoopsModules/wflink/trunk/htdocs/modules/wflinks/admin/permissions.php XoopsModules/wflink/trunk/htdocs/modules/wflinks/admin/upload.php XoopsModules/wflink/trunk/htdocs/modules/wflinks/admin/votedata.php XoopsModules/wflink/trunk/htdocs/modules/wflinks/brokenlink.php XoopsModules/wflink/trunk/htdocs/modules/wflinks/docs/english/__support.html XoopsModules/wflink/trunk/htdocs/modules/wflinks/docs/nederlands/__support.html XoopsModules/wflink/trunk/htdocs/modules/wflinks/include/functions.php XoopsModules/wflink/trunk/htdocs/modules/wflinks/include/linkloadinfo.php XoopsModules/wflink/trunk/htdocs/modules/wflinks/language/english/admin.php XoopsModules/wflink/trunk/htdocs/modules/wflinks/language/english/modinfo.php XoopsModules/wflink/trunk/htdocs/modules/wflinks/sql/wflinks.sql XoopsModules/wflink/trunk/htdocs/modules/wflinks/submit.php XoopsModules/wflink/trunk/htdocs/modules/wflinks/xoops_version.php Added Paths: ----------- XoopsModules/wflink/trunk/htdocs/modules/wflinks/admin/about2.php XoopsModules/wflink/trunk/htdocs/modules/wflinks/admin/admin_footer.php XoopsModules/wflink/trunk/htdocs/modules/wflinks/admin/main.php XoopsModules/wflink/trunk/htdocs/modules/wflinks/docs/changelog.txt XoopsModules/wflink/trunk/htdocs/modules/wflinks/docs/credits.txt XoopsModules/wflink/trunk/htdocs/modules/wflinks/docs/license.txt XoopsModules/wflink/trunk/htdocs/modules/wflinks/docs/readme.txt XoopsModules/wflink/trunk/htdocs/modules/wflinks/images/wfl_slogo.png XoopsModules/wflink/trunk/htdocs/modules/wflinks/language/english/help/ XoopsModules/wflink/trunk/htdocs/modules/wflinks/language/english/help/help.html XoopsModules/wflink/trunk/htdocs/modules/wflinks/language/english/help/index.html Removed Paths: ------------- XoopsModules/wflink/trunk/htdocs/modules/wflinks/bugfixlist.txt XoopsModules/wflink/trunk/htdocs/modules/wflinks/license.txt XoopsModules/wflink/trunk/htdocs/modules/wflinks/readme.txt XoopsModules/wflink/trunk/htdocs/modules/wflinks/xoops_version.php.bak Modified: XoopsModules/wflink/trunk/htdocs/modules/wflinks/admin/about.php =================================================================== --- XoopsModules/wflink/trunk/htdocs/modules/wflinks/admin/about.php 2012-06-23 20:33:48 UTC (rev 9693) +++ XoopsModules/wflink/trunk/htdocs/modules/wflinks/admin/about.php 2012-06-23 20:42:45 UTC (rev 9694) @@ -1,92 +1,29 @@ -<?php -/** - * $Id$ - * Module: WF-Links - * Version: v1.0.3 - * Release Date: 21 June 2005 - * Developer: John N - * Team: WF-Projects - * Licence: GNU - */ - -include 'admin_header.php'; - -global $xoopsModule; - -xoops_cp_header(); - -$module_handler = &xoops_gethandler( 'module' ); -$versioninfo = &$module_handler -> get( $xoopsModule -> getVar( 'mid' ) ); - -wfl_adminmenu( _AM_WFL_MLINKS ); -// Left headings... -echo "<img src='" . XOOPS_URL . "/modules/".$xoopsModule->getVar('dirname')."/" . $versioninfo -> getInfo( 'image' ) . "' alt='' hspace='10' vspace='0' /></a>\n -<div style='margin-top: 10px; color: #33538e; margin-bottom: 4px; font-size: 18px; line-height: 18px; font-weight: bold; display: block;'>" . $versioninfo -> getInfo( 'name' ) . " version " . $versioninfo -> getInfo( 'version' ) . "</div>\n - -<div>\n"; -if ( $versioninfo -> getInfo( 'author_realname' ) != '' ) -{ - $author_name = $versioninfo -> getInfo( 'author' ); // . " (" . $versioninfo -> getInfo( 'author_realname' ) . ")"; -} -else -{ - $author_name = $versioninfo -> getInfo( 'author' ); -} -echo " - </div>\n - <div>" . _MI_WFL_RELEASE . " " . $versioninfo -> getInfo( 'releasedate' ) . "</div>\n - <div>" . _AM_WFL_BY . " " . $author_name . "</div>\n - <div>" . $versioninfo -> getInfo( 'license' ) . "</div><br />\n"; -// Author Information -$sform = new XoopsThemeForm( _MI_WFL_AUTHOR_INFO, "", "" ); -$sform -> addElement( new XoopsFormLabel( _MI_WFL_AUTHOR_NAME, $author_name ) ); -$sform -> addElement( new XoopsFormLabel( _MI_WFL_AUTHOR_WEBSITE, "<a href='" . $versioninfo -> getInfo( 'author_website_url' ) . "' target='_blank'>" . $versioninfo -> getInfo( 'author_website_name' ) . "</a>" ) ); -//$sform -> addElement( new XoopsFormLabel( _MI_WFL_AUTHOR_EMAIL, "<a href='mailto:" . $versioninfo -> getInfo( 'author_email' ) . "'>" . $versioninfo -> getInfo( 'author_email' ) . "</a>" ) ); -$sform -> addElement( new XoopsFormLabel( _MI_WFL_AUTHOR_DEVTEAM, $versioninfo -> getInfo( 'teammembers' ) ) ); -$sform -> display(); -// Author Information -$sform = new XoopsThemeForm( _MI_WFL_MODULE_INFO, "", "" ); -$sform -> addElement( new XoopsFormLabel( _MI_WFL_MODULE_STATUS, $versioninfo -> getInfo( 'status' ) ) ); -$sform -> addElement( new XoopsFormLabel( _MI_WFL_MODULE_SUPPORT, "<a href='" . $versioninfo -> getInfo( 'support_site_url' ) . "' target='_blank'>" . $versioninfo -> getInfo( 'support_site_name' ) . "</a>" ) ); -$sform -> addElement( new XoopsFormLabel( _MI_WFL_MODULE_BUG, "<a href='" . $versioninfo -> getInfo( 'submit_bug' ) . "' target='_blank'>" . "Submit a Bug" . "</a>" ) ); - $sform -> display(); - -$sform = new XoopsThemeForm( _MI_WFL_MODULE_DISCLAIMER, "", "" ); -ob_start(); -echo "<div class='even'>" . $versioninfo -> getInfo( 'warning' ) . "</div>"; -$sform -> addElement( new XoopsFormLabel( _MI_WFL_MODULE_DISCLAIMER, ob_get_contents(), 0 ) ); - -ob_end_clean(); -$sform -> addElement( new XoopsFormLabel( _MI_WFL_COPYRIGHT2, _MI_WFL_COPYRIGHTIMAGE ) ); -$sform -> display(); - -$sform = new XoopsThemeForm( _MI_WFL_AUTHOR_CREDITS, "", "" ); -ob_start(); -echo "<div class='even'>" . $versioninfo -> getInfo( 'author_credits' ) . "</div>"; -$sform -> addElement( new XoopsFormLabel( _MI_WFL_AUTHOR_CREDITS, ob_get_contents(), 0 ) ); -ob_end_clean(); -$sform -> addElement( new XoopsFormLabel( _MI_WFL_ICONS_CREDITS, '<a href="http://www.famfamfam.com" target="_blank">famfamfam.com</a>' ) ); -$sform -> addElement( new XoopsFormLabel( _MI_WFL_VCARD_CREDITS, '<a href="http://www.bitfolge.de/en" target="_blank">Kai Blankenhorn</a>' ) ); -$sform -> addElement( new XoopsFormLabel( _MI_WFL_MOZSHOT_CREDITS, _MI_WFL_MOZSHOT_CREDITSTXT ) ); -$sform -> display(); - -global $wfmyts, $xoopsModule; - -$file = XOOPS_ROOT_PATH . '/modules/' . $xoopsModule -> getVar( 'dirname' ) . '/bugfixlist.txt'; -if ( @file_exists( $file ) ) { - $fp = @fopen( $file, "r" ); - $bugtext = @fread( $fp, filesize( $file ) ); - @fclose( $file ); -} - -$sform = new XoopsThemeForm( _MI_WFL_AUTHOR_BUGFIXES, "", "" ); -ob_start(); -echo "<div class='even'>" . $wfmyts -> displayTarea( $bugtext ) . "</div>"; -$sform -> addElement( new XoopsFormLabel( _MI_WFL_AUTHOR_BUGFIXES, ob_get_contents(), 0 ) ); -ob_end_clean(); -$sform -> display(); -unset( $file ); -echo "<div style='text-align: center;'>" . _MI_WFL_COPYRIGHTIMAGE . "</div>\n"; -xoops_cp_footer(); - -?> \ No newline at end of file +<?php +/** + * Mastop Go2 module + * + * 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://www.xoops.org) + * @license {@link http://www.gnu.org/licenses/gpl-2.0.html GNU Public License} + * @package MastopGo2 + * @since 2.5.0 + * @author Mage, Mamba + * @version $Id $ + **/ + +include_once dirname(__FILE__) . '/admin_header.php'; + +xoops_cp_header(); + +$aboutAdmin = new ModuleAdmin(); + +echo $aboutAdmin->addNavigation('about.php'); +echo $aboutAdmin->renderAbout('6KJ7RW5DR3VTJ', FALSE); + +include 'admin_footer.php'; \ No newline at end of file Added: XoopsModules/wflink/trunk/htdocs/modules/wflinks/admin/about2.php =================================================================== --- XoopsModules/wflink/trunk/htdocs/modules/wflinks/admin/about2.php (rev 0) +++ XoopsModules/wflink/trunk/htdocs/modules/wflinks/admin/about2.php 2012-06-23 20:42:45 UTC (rev 9694) @@ -0,0 +1,93 @@ +<?php +/** + * $Id: about.php, v1.00 21 June 2005 John N Exp $ + * Module: WF-Links + * Version: v1.0.3 + * Release Date: 21 June 2005 + * Developer: John N + * Team: WF-Projects + * Licence: GNU + */ + +include 'admin_header.php'; + +global $xoopsModule; + +xoops_cp_header(); + +$module_handler = &xoops_gethandler( 'module' ); +$versioninfo = &$module_handler -> get( $xoopsModule -> getVar( 'mid' ) ); + +//wfl_adminmenu( _AM_WFL_MLINKS ); +// Left headings... +echo "<img src='" . XOOPS_URL . "/modules/".$xoopsModule->getVar('dirname')."/" . $versioninfo -> getInfo( 'image' ) . "' alt='' hspace='10' vspace='0' /></a>\n +<div style='margin-top: 10px; color: #33538e; margin-bottom: 4px; font-size: 18px; line-height: 18px; font-weight: bold; display: block;'>" . $versioninfo -> getInfo( 'name' ) . " version " . $versioninfo -> getInfo( 'version' ) . "</div>\n + +<div>\n"; +if ( $versioninfo -> getInfo( 'author_realname' ) != '' ) +{ + $author_name = $versioninfo -> getInfo( 'author' ); // . " (" . $versioninfo -> getInfo( 'author_realname' ) . ")"; +} +else +{ + $author_name = $versioninfo -> getInfo( 'author' ); +} +echo " + </div>\n + <div>" . _MI_WFL_RELEASE . " " . $versioninfo -> getInfo( 'releasedate' ) . "</div>\n + <div>" . _AM_WFL_BY . " " . $author_name . "</div>\n + <div>" . $versioninfo -> getInfo( 'license' ) . "</div><br />\n"; +// Author Information +$sform = new XoopsThemeForm( _MI_WFL_AUTHOR_INFO, "", "" ); +$sform -> addElement( new XoopsFormLabel( _MI_WFL_AUTHOR_NAME, $author_name ) ); +$sform -> addElement( new XoopsFormLabel( _MI_WFL_AUTHOR_WEBSITE, "<a href='" . $versioninfo -> getInfo( 'author_website_url' ) . "' target='_blank'>" . $versioninfo -> getInfo( 'author_website_name' ) . "</a>" ) ); +//$sform -> addElement( new XoopsFormLabel( _MI_WFL_AUTHOR_EMAIL, "<a href='mailto:" . $versioninfo -> getInfo( 'author_email' ) . "'>" . $versioninfo -> getInfo( 'author_email' ) . "</a>" ) ); +$sform -> addElement( new XoopsFormLabel( _MI_WFL_AUTHOR_DEVTEAM, $versioninfo -> getInfo( 'teammembers' ) ) ); +$sform -> display(); +// Author Information +$sform = new XoopsThemeForm( _MI_WFL_MODULE_INFO, "", "" ); +$sform -> addElement( new XoopsFormLabel( _MI_WFL_MODULE_STATUS, $versioninfo -> getInfo( 'status' ) ) ); +$sform -> addElement( new XoopsFormLabel( _MI_WFL_MODULE_SUPPORT, "<a href='" . $versioninfo -> getInfo( 'support_site_url' ) . "' target='_blank'>" . $versioninfo -> getInfo( 'support_site_name' ) . "</a>" ) ); +$sform -> addElement( new XoopsFormLabel( _MI_WFL_MODULE_BUG, "<a href='" . $versioninfo -> getInfo( 'submit_bug' ) . "' target='_blank'>" . "Submit a Bug" . "</a>" ) ); + $sform -> display(); + +$sform = new XoopsThemeForm( _MI_WFL_MODULE_DISCLAIMER, "", "" ); +ob_start(); +echo "<div class='even'>" . $versioninfo -> getInfo( 'warning' ) . "</div>"; +$sform -> addElement( new XoopsFormLabel( _MI_WFL_MODULE_DISCLAIMER, ob_get_contents(), 0 ) ); + +ob_end_clean(); +$sform -> addElement( new XoopsFormLabel( _MI_WFL_COPYRIGHT2, _MI_WFL_COPYRIGHTIMAGE ) ); +$sform -> display(); + +$sform = new XoopsThemeForm( _MI_WFL_AUTHOR_CREDITS, "", "" ); +ob_start(); +echo "<div class='even'>" . $versioninfo -> getInfo( 'author_credits' ) . "</div>"; +$sform -> addElement( new XoopsFormLabel( _MI_WFL_AUTHOR_CREDITS, ob_get_contents(), 0 ) ); +ob_end_clean(); +$sform -> addElement( new XoopsFormLabel( _MI_WFL_ICONS_CREDITS, '<a href="http://www.famfamfam.com" target="_blank">famfamfam.com</a>' ) ); +$sform -> addElement( new XoopsFormLabel( _MI_WFL_VCARD_CREDITS, '<a href="http://www.bitfolge.de/en" target="_blank">Kai Blankenhorn</a>' ) ); +$sform -> addElement( new XoopsFormLabel( _MI_WFL_MOZSHOT_CREDITS, _MI_WFL_MOZSHOT_CREDITSTXT ) ); +$sform -> display(); + +global $wfmyts, $xoopsModule; + +$file = XOOPS_ROOT_PATH . '/modules/' . $xoopsModule -> getVar( 'dirname' ) . '/bugfixlist.txt'; +if ( @file_exists( $file ) ) { + $fp = @fopen( $file, "r" ); + $bugtext = @fread( $fp, filesize( $file ) ); + @fclose( $file ); +} + +$sform = new XoopsThemeForm( _MI_WFL_AUTHOR_BUGFIXES, "", "" ); +ob_start(); +echo "<div class='even'>" . $wfmyts -> displayTarea( $bugtext ) . "</div>"; +$sform -> addElement( new XoopsFormLabel( _MI_WFL_AUTHOR_BUGFIXES, ob_get_contents(), 0 ) ); +ob_end_clean(); +$sform -> display(); +unset( $file ); +echo "<div style='text-align: center;'>" . _MI_WFL_COPYRIGHTIMAGE . "</div>\n"; + +include_once 'admin_footer.php'; + +?> \ No newline at end of file Modified: XoopsModules/wflink/trunk/htdocs/modules/wflinks/admin/admin.php =================================================================== --- XoopsModules/wflink/trunk/htdocs/modules/wflinks/admin/admin.php 2012-06-23 20:33:48 UTC (rev 9693) +++ XoopsModules/wflink/trunk/htdocs/modules/wflinks/admin/admin.php 2012-06-23 20:42:45 UTC (rev 9694) @@ -149,7 +149,7 @@ $counter++; } echo '</tr></table>'; - xoops_cp_footer(); + include_once 'admin_footer.php'; } ?> \ No newline at end of file Added: XoopsModules/wflink/trunk/htdocs/modules/wflinks/admin/admin_footer.php =================================================================== --- XoopsModules/wflink/trunk/htdocs/modules/wflinks/admin/admin_footer.php (rev 0) +++ XoopsModules/wflink/trunk/htdocs/modules/wflinks/admin/admin_footer.php 2012-06-23 20:42:45 UTC (rev 9694) @@ -0,0 +1,6 @@ +<?php +echo"<div class='adminfooter'>\n" . " <div style='text-align: center;'>\n" + . " <a href='http://www.xoops.org' target='_blank'><img src='{$pathIcon32}/xoopsmicrobutton.gif' alt='XOOPS' title='XOOPS'></a>\n" + . " </div>\n" . " " . _AM_MODULEADMIN_ADMIN_FOOTER . "\n" . "</div>"; + +xoops_cp_footer(); \ No newline at end of file Modified: XoopsModules/wflink/trunk/htdocs/modules/wflinks/admin/admin_header.php =================================================================== --- XoopsModules/wflink/trunk/htdocs/modules/wflinks/admin/admin_header.php 2012-06-23 20:33:48 UTC (rev 9693) +++ XoopsModules/wflink/trunk/htdocs/modules/wflinks/admin/admin_header.php 2012-06-23 20:42:45 UTC (rev 9694) @@ -1,19 +1,52 @@ <?php /** - * $Id$ - * Module: WF-Links - * Version: v1.0.3 - * Release Date: 21 June 2005 - * Developer: John N - * Team: WF-Projects - * Licence: GNU - */ + * XoopsTube module + * + * 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 http://www.gnu.org/licenses/gpl-2.0.html GNU Public License + * @package xoopstube + * @since 1.0.5 + * @author XOOPS Development Team + * @version $Id $ + **/ $mydirname = basename( dirname( dirname( __FILE__ ) ) ); +$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'; -include '../../../mainfile.php'; -include '../../../include/cp_header.php'; +global $xoopsModule; +$thisModuleDir = $GLOBALS['xoopsModule']->getVar('dirname'); +$thisModulePath = dirname(dirname(__FILE__)); + +//if functions.php file exist +//require_once dirname(dirname(__FILE__)) . '/include/functions.php'; +//require_once $thisModulePath . '/include/functions.php'; + +// Load language files +xoops_loadLanguage('admin', $thisModuleDir); +xoops_loadLanguage('modinfo', $thisModuleDir); +xoops_loadLanguage('main', $thisModuleDir); + +$pathIcon16 = '../' . $xoopsModule->getInfo('icons16'); +$pathIcon32 = '../' . $xoopsModule->getInfo('icons32'); +$pathModuleAdmin = $xoopsModule->getInfo('dirmoduleadmin'); + +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); +} + include XOOPS_ROOT_PATH . '/modules/' . $mydirname . '/include/config.php'; include_once XOOPS_ROOT_PATH . '/modules/' . $mydirname . '/include/functions.php'; include_once XOOPS_ROOT_PATH . '/modules/' . $mydirname . '/class/wfl_lists.php'; @@ -26,25 +59,23 @@ $wfmyts = new wflTextSanitizer(); // MyTextSanitizer object $imagearray = array( - 'editimg' => "<img src='../images/icon/world_edit.png' alt='" . _AM_WFL_ICO_EDIT . "' align='middle'>", - 'deleteimg' => "<img src='../images/icon/world_delete.png' alt='" . _AM_WFL_ICO_DELETE . "' align='middle'>", - 'altcat' => "<img src='../images/icon/folder_add.png' alt='" . _AM_WFL_ALTCAT_CREATEF . "' align='middle'>", - 'online' => "<img src='../images/icon/on.png' alt='" . _AM_WFL_ICO_ONLINE . "' align='middle'>", - 'offline' => "<img src='../images/icon/off.png' alt='" . _AM_WFL_ICO_OFFLINE . "' align='middle'>", + 'editimg' => "<img src='$pathIcon16/edit.png' alt='" . _AM_WFL_ICO_EDIT . "' align='middle'>", + 'deleteimg' => "<img src='$pathIcon16/delete.png' alt='" . _AM_WFL_ICO_DELETE . "' align='middle'>", + 'altcat' => "<img src='$pathIcon16/folder_add.png' alt='" . _AM_WFL_ALTCAT_CREATEF . "' align='middle'>", + 'online' => "<img src='$pathIcon16/1.png' alt='" . _AM_WFL_ICO_ONLINE . "' align='middle'>", + 'offline' => "<img src='$pathIcon16/0.png' alt='" . _AM_WFL_ICO_OFFLINE . "' align='middle'>", 'expired' => "<img src='../images/icon/clock_red.png' alt='" . _AM_WFL_ICO_EXPIRE . "' align='middle'>", - 'approved' => "<img src='../images/icon/on.png' alt=''" . _AM_WFL_ICO_APPROVED . "' align='middle'>", - 'notapproved' => "<img src='../images/icon/off.png' alt='" . _AM_WFL_ICO_NOTAPPROVED . "' align='middle'>", + 'approved' => "<img src='$pathIcon16/1.png' alt=''" . _AM_WFL_ICO_APPROVED . "' align='middle'>", + 'notapproved' => "<img src='$pathIcon16/0.png' alt='" . _AM_WFL_ICO_NOTAPPROVED . "' align='middle'>", 'relatedfaq' => "<img src='../images/icon/link.gif' alt='" . _AM_WFL_ICO_LINK . "' align='absmiddle'>", 'relatedurl' => "<img src='../images/icon/urllink.gif' alt='" . _AM_WFL_ICO_URL . "' align='middle'>", 'addfaq' => "<img src='../images/icon/add.gif' alt='" . _AM_WFL_ICO_ADD . "' align='middle'>", - 'approve' => "<img src='../images/icon/accept.png' alt='" . _AM_WFL_ICO_APPROVE . "' align='middle'>", + 'approve' => "<img src='$pathIcon16/1.png' alt='" . _AM_WFL_ICO_APPROVE . "' align='middle'>", 'statsimg' => "<img src='../images/icon/stats.gif' alt='" . _AM_WFL_ICO_STATS . "' align='middle'>", - 'ignore' => "<img src='../images/icon/cross.png' alt='" . _AM_WFL_ICO_IGNORE . "' align='middle'>", - 'ack_yes' => "<img src='../images/icon/on.png' alt='" . _AM_WFL_ICO_ACK . "' align='middle'>", - 'ack_no' => "<img src='../images/icon/off.png' alt='" . _AM_WFL_ICO_REPORT . "' align='middle'>", - 'con_yes' => "<img src='../images/icon/on.png' alt='" . _AM_WFL_ICO_CONFIRM . "' align='middle'>", - 'con_no' => "<img src='../images/icon/off.png' alt='" . _AM_WFL_ICO_CONBROKEN . "' align='middle'>", - 'view' => "<img src='../images/icon/view.png' alt='" . _AM_WFL_ICO_VIEW . "' align='middle'>" - ); - -?> \ No newline at end of file + 'ignore' => "<img src='$pathIcon16/0.png' alt='" . _AM_WFL_ICO_IGNORE . "' align='middle'>", + 'ack_yes' => "<img src='$pathIcon16/1.png' alt='" . _AM_WFL_ICO_ACK . "' align='middle'>", + 'ack_no' => "<img src='$pathIcon16/0.png' alt='" . _AM_WFL_ICO_REPORT . "' align='middle'>", + 'con_yes' => "<img src='$pathIcon16/1.png' alt='" . _AM_WFL_ICO_CONFIRM . "' align='middle'>", + 'con_no' => "<img src='$pathIcon16/0.png' alt='" . _AM_WFL_ICO_CONBROKEN . "' align='middle'>", + 'view' => "<img src='$pathIcon16/search.png' alt='" . _AM_WFL_ICO_VIEW . "' align='middle'>" + ); \ No newline at end of file Modified: XoopsModules/wflink/trunk/htdocs/modules/wflinks/admin/altcat.php =================================================================== --- XoopsModules/wflink/trunk/htdocs/modules/wflinks/admin/altcat.php 2012-06-23 20:33:48 UTC (rev 9693) +++ XoopsModules/wflink/trunk/htdocs/modules/wflinks/admin/altcat.php 2012-06-23 20:42:45 UTC (rev 9694) @@ -92,7 +92,7 @@ case 'main': default: xoops_cp_header(); - wfl_adminmenu( _AM_WFL_MALTCAT ); + //wfl_adminmenu( _AM_WFL_MALTCAT ); echo " <fieldset style='border: #e8e8e8 1px solid;'><legend style='display: inline; font-weight: bold; color: #0A3760;'>" . _AM_WFL_ALTCAT_MODIFYF . "</legend>\n <div style='padding: 8px;'>" . _AM_WFL_ALTCAT_INFOTEXT . "</div>\n @@ -109,7 +109,7 @@ $mytree = new XoopsTree( $xoopsDB -> prefix( 'wflinks_cat' ), 'cid', 'pid' ); makeTreeCheckTable( $mytree, intval($lid), "title", $altcats ); - xoops_cp_footer(); + include_once 'admin_footer.php'; } ?> \ No newline at end of file Modified: XoopsModules/wflink/trunk/htdocs/modules/wflinks/admin/brokenlink.php =================================================================== --- XoopsModules/wflink/trunk/htdocs/modules/wflinks/admin/brokenlink.php 2012-06-23 20:33:48 UTC (rev 9693) +++ XoopsModules/wflink/trunk/htdocs/modules/wflinks/admin/brokenlink.php 2012-06-23 20:42:45 UTC (rev 9694) @@ -70,7 +70,7 @@ $totalbrokenlinks = $xoopsDB -> getRowsNum( $result ); xoops_cp_header(); - wfl_adminmenu( _AM_WFL_BROKEN_FILE ); + //wfl_adminmenu( _AM_WFL_BROKEN_FILE ); echo " <fieldset> <legend style='font-weight: bold; color: #0A3760;'>" . _AM_WFL_BROKEN_REPORTINFO . "</legend>\n @@ -133,13 +133,13 @@ echo "<td class='even'><a href='brokenlink.php?op=updateNotice&lid=" . $lid . "&con=" . intval( $confirmed ) . "'>" . $con_image . "</a></td>\n"; echo "<td class='even' style='text-align: center;' nowrap>\n"; echo "<a href='brokenlink.php?op=ignoreBrokenlinks&lid=" . $lid . "'>" . $imagearray['ignore'] . "</a>\n"; - echo "<a href='index.php?op=edit&lid=" . $lid . "'>" . $imagearray['editimg'] . "</a>\n"; + echo "<a href='main.php?op=edit&lid=" . $lid . "'>" . $imagearray['editimg'] . "</a>\n"; echo "<a href='brokenlink.php?op=delBrokenlinks&lid=" . $lid . "'>" . $imagearray['deleteimg'] . "</a>\n"; echo "</td></tr>\n"; } } echo"</table>"; } -xoops_cp_footer(); +include_once 'admin_footer.php'; ?> Modified: XoopsModules/wflink/trunk/htdocs/modules/wflinks/admin/category.php =================================================================== --- XoopsModules/wflink/trunk/htdocs/modules/wflinks/admin/category.php 2012-06-23 20:33:48 UTC (rev 9693) +++ XoopsModules/wflink/trunk/htdocs/modules/wflinks/admin/category.php 2012-06-23 20:42:45 UTC (rev 9694) @@ -212,7 +212,7 @@ $cid = (isset($_POST['cid'])) ? $_POST['cid'] : $_GET['cid']; xoops_cp_header(); - wfl_adminmenu(_AM_WFL_MCATEGORY); + //wfl_adminmenu(_AM_WFL_MCATEGORY); include_once XOOPS_ROOT_PATH . '/class/xoopsformloader.php'; $mytree = new XoopsTree($xoopsDB -> prefix('wflinks_cat'), "cid", "pid"); @@ -379,7 +379,7 @@ case "modCat": $cid = (isset($_POST['cid'])) ? $_POST['cid'] : 0; xoops_cp_header(); - wfl_adminmenu(_AM_WFL_MCATEGORY); + //wfl_adminmenu(_AM_WFL_MCATEGORY); createcat($cid); xoops_cp_footer(); break; @@ -387,7 +387,7 @@ case 'main': default: xoops_cp_header(); - wfl_adminmenu(_AM_WFL_MCATEGORY); + //wfl_adminmenu(_AM_WFL_MCATEGORY); include_once XOOPS_ROOT_PATH . '/class/xoopsformloader.php'; $mytree = new XoopsTree($xoopsDB -> prefix('wflinks_cat'), "cid", "pid"); @@ -414,7 +414,7 @@ $sform -> display(); } createcat(0); - xoops_cp_footer(); + include_once 'admin_footer.php'; break; } ?> \ No newline at end of file Modified: XoopsModules/wflink/trunk/htdocs/modules/wflinks/admin/index.php =================================================================== --- XoopsModules/wflink/trunk/htdocs/modules/wflinks/admin/index.php 2012-06-23 20:33:48 UTC (rev 9693) +++ XoopsModules/wflink/trunk/htdocs/modules/wflinks/admin/index.php 2012-06-23 20:42:45 UTC (rev 9694) @@ -1,699 +1,96 @@ -<?php -/** - * $Id$ - * Module: WF-Links - * Version: v1.0.3 - * Release Date: 21 June 2005 - * Developer: John N - * Team: WF-Projects - * Licence: GNU - */ - -include 'admin_header.php'; - -$mytree = new XoopsTree( $xoopsDB -> prefix( 'wflinks_cat' ), 'cid', 'pid' ); - -$op = wfl_cleanRequestVars( $_REQUEST, 'op', '' ); -$lid = intval( wfl_cleanRequestVars( $_REQUEST, 'lid', 0 ) ); - -function edit( $lid = 0 ) { - global $xoopsDB, $wfmyts, $mytree, $imagearray, $xoopsConfig, $xoopsModuleConfig, $xoopsModule, $xoopsUser; - - $sql = "SELECT * FROM " . $xoopsDB -> prefix( 'wflinks_links' ) . " WHERE lid=" . $lid; - if ( !$result = $xoopsDB -> query( $sql ) ) { - XoopsErrorHandler_HandleError( E_USER_WARNING, $sql, __FILE__, __LINE__ ); - return false; - } - $link_array = $xoopsDB -> fetchArray( $xoopsDB -> query( $sql ) ); - - $directory = $xoopsModuleConfig['screenshots']; - $lid = $link_array['lid'] ? $link_array['lid'] : 0; - $cid = $link_array['cid'] ? $link_array['cid'] : 0; - $title = $link_array['title'] ? $wfmyts -> htmlSpecialCharsStrip( $link_array['title'] ) : ''; - $url = $link_array['url'] ? $wfmyts -> htmlSpecialCharsStrip( $link_array['url'] ) : 'http://'; - $publisher = $link_array['publisher'] ? $wfmyts -> htmlSpecialCharsStrip( $link_array['publisher'] ) : ''; - $submitter = $link_array['submitter'] ? $wfmyts -> htmlSpecialCharsStrip( $link_array['submitter'] ) : ''; - $screenshot = $link_array['screenshot'] ? $wfmyts -> htmlSpecialCharsStrip( $link_array['screenshot'] ) : ''; - $descriptionb = $link_array['description'] ? $wfmyts -> htmlSpecialCharsStrip( $link_array['description'] ) : ''; - $published = $link_array['published'] ? $link_array['published'] : time(); - $expired = $link_array['expired'] ? $link_array['expired'] : 0; - $updated = $link_array['updated'] ? $link_array['updated'] : 0; - $offline = $link_array['offline'] ? $link_array['offline'] : 0; - $forumid = $link_array['forumid'] ? $link_array['forumid'] : 0; - $ipaddress = $link_array['ipaddress'] ? $link_array['ipaddress'] : 0; - $notifypub = $link_array['notifypub'] ? $link_array['notifypub'] : 0; - $country = $link_array['country'] ? $wfmyts -> htmlSpecialCharsStrip( $link_array['country'] ) : '-'; - $keywords = $link_array['keywords'] ? $wfmyts -> htmlSpecialCharsStrip( $link_array['keywords'] ) : ''; - $item_tag = $link_array['item_tag'] ? $wfmyts -> htmlSpecialCharsStrip( $link_array['item_tag'] ) : ''; - $googlemap = $link_array['googlemap'] ? $wfmyts -> htmlSpecialCharsStrip( $link_array['googlemap'] ) : 'http://maps.google.com'; - $yahoomap = $link_array['yahoomap'] ? $wfmyts -> htmlSpecialCharsStrip( $link_array['yahoomap'] ) : 'http://maps.yahoo.com'; - $multimap = $link_array['multimap'] ? $wfmyts -> htmlSpecialCharsStrip( $link_array['multimap'] ) : 'http://www.multimap.com'; - $street1 = $link_array['street1'] ? $wfmyts -> htmlSpecialCharsStrip( $link_array['street1'] ) : ''; - $street2 = $link_array['street2'] ? $wfmyts -> htmlSpecialCharsStrip( $link_array['street2'] ) : ''; - $town = $link_array['town'] ? $wfmyts -> htmlSpecialCharsStrip( $link_array['town'] ) : ''; - $state = $link_array['state'] ? $wfmyts -> htmlSpecialCharsStrip( $link_array['state'] ) : ''; - $zip = $link_array['zip'] ? $wfmyts -> htmlSpecialCharsStrip( $link_array['zip'] ) : ''; - $tel = $link_array['tel'] ? $wfmyts -> htmlSpecialCharsStrip( $link_array['tel'] ) : ''; - $mobile = $link_array['mobile'] ? $wfmyts -> htmlSpecialCharsStrip( $link_array['mobile'] ) : ''; - $voip = $link_array['voip'] ? $wfmyts -> htmlSpecialCharsStrip( $link_array['voip'] ) : ''; - $fax = $link_array['fax'] ? $wfmyts -> htmlSpecialCharsStrip( $link_array['fax'] ) : ''; - $email = $link_array['email'] ? $wfmyts -> htmlSpecialCharsStrip( $link_array['email'] ) : ''; - $vat = $link_array['vat'] ? $wfmyts -> htmlSpecialCharsStrip( $link_array['vat'] ) : ''; - - xoops_cp_header(); - wfl_adminmenu( _AM_WFL_MLINKS ); - - if ( $lid > 0 ) { - $_vote_data = wfl_getVoteDetails( $lid ); - $text_info = "<table width='100%'> - <tr> - <td width='33%' valign='top'> - <div><b>" . _AM_WFL_LINK_ID . " </b>" . $lid . "</div> - <div><b>" . _AM_WFL_MINDEX_SUBMITTED . ": </b>" . formatTimestamp( $link_array['date'], $xoopsModuleConfig['dateformat'] ) . "</div> - <div><b>" . _AM_WFL_LINK_SUBMITTER . " </b>" . xoops_getLinkedUnameFromId( $submitter ) . "</div> - <div><b>" . _AM_WFL_LINK_IP . " </b>" . $ipaddress . "</div> - <div><b>" . _AM_WFL_PAGERANK . " </b>" . pagerank($link_array['url']) . "</div> - <div><b>" . _AM_WFL_HITS . " </b>" . $link_array['hits'] . "</div> - - </td> - <td valign='top'> - <div><b>" . _AM_WFL_VOTE_TOTALRATE . ": </b>" . intval( $_vote_data['rate'] ) . "</div> - <div><b>" . _AM_WFL_VOTE_USERAVG . ": </b>" . intval( round( $_vote_data['avg_rate'], 2 ) ) . "</div> - <div><b>" . _AM_WFL_VOTE_MAXRATE . ": </b>" . intval( $_vote_data['min_rate'] ) . "</div> - <div><b>" . _AM_WFL_VOTE_MINRATE . ": </b>" . intval( $_vote_data['max_rate'] ) . "</div> - </td> - <td valign='top'> - <div><b>" . _AM_WFL_VOTE_MOSTVOTEDTITLE . ": </b>" . intval( $_vote_data['max_title'] ) . "</div> - <div><b>" . _AM_WFL_VOTE_LEASTVOTEDTITLE . ": </b>" . intval( $_vote_data['min_title'] ) . "</div> - <div><b>" . _AM_WFL_VOTE_REGISTERED . ": </b>" . ( intval( $_vote_data['rate'] - $_vote_data['null_ratinguser'] ) ) . "</div> - <div><b>" . _AM_WFL_VOTE_NONREGISTERED . ": </b>" . intval( $_vote_data['null_ratinguser'] ) . "</div> - </td> - </tr> - </table>"; - echo "<fieldset style='border: #e8e8e8 1px solid;'><legend style='display: inline; font-weight: bold; color: #0A3760;'>" . _AM_WFL_INFORMATION . "</legend>\n - <div style='padding: 8px;'>" . $text_info . "</div>\n - <!-- <div style='padding: 8px;'><li>" . $imagearray['deleteimg'] . " " . _AM_WFL_VOTE_DELETEDSC . "</li></div>\n --> - </fieldset>\n - <br />\n"; - } - unset( $_vote_data ); - - $caption = ( $lid ) ? _AM_WFL_LINK_MODIFYFILE : _AM_WFL_LINK_CREATENEWFILE; - $sform = new XoopsThemeForm( $caption, "storyform", xoops_getenv( 'PHP_SELF' ) ); - $sform -> setExtra( 'enctype="multipart / form - data"' ); - - if ($submitter == '') { - $sform -> addElement( new XoopsFormHidden( 'submitter', $submitter ) ); - } - -// Link publisher form - if ($publisher) { - $sform -> addElement( new XoopsFormText( _AM_WFL_LINK_PUBLISHER, 'publisher', 70, 255, $publisher ) ); - //$sform -> addElement( new XoopsFormHidden( 'publisher', $publisher ) ) ; - } else { - $publisher = $xoopsUser -> uname(); - $sform -> addElement( new XoopsFormHidden( 'publisher', $publisher ) ); - } - -// Link title form - $sform -> addElement( new XoopsFormText( _AM_WFL_LINK_TITLE, 'title', 70, 255, $title ), true ); - -// Link url form - $url_text = new XoopsFormText('', 'url', 70, 255, $url); - $url_tray = new XoopsFormElementTray(_AM_WFL_LINK_DLURL, ''); - $url_tray -> addElement( $url_text, true) ; - $url_tray -> addElement( new XoopsFormLabel( " <img src='../images/icon/world.png' onClick=\"window.open(document.storyform.url.value,'','');return(false);\" alt='Check URL' />" )); - $sform -> addElement( $url_tray ); - -// Category form - ob_start(); - $mytree -> makeMySelBox( 'title', 'title', $cid, 0 ); - $sform -> addElement( new XoopsFormLabel( _AM_WFL_LINK_CATEGORY, ob_get_contents() ) ); - ob_end_clean(); - -// Link description form - $editor = wfl_getWysiwygForm( _AM_WFL_LINK_DESCRIPTION, 'descriptionb', $descriptionb, 15, 60 ); - $sform -> addElement($editor, false); - -// Meta keywords form - $keywords = new XoopsFormTextArea( _AM_WFL_KEYWORDS, 'keywords', $keywords, 7, 60, false ); - $keywords -> setDescription( "<small>" . _AM_WFL_KEYWORDS_NOTE . "</small>"); - $sform -> addElement($keywords); - -// Insert tags if Tag-module is installed - if (wfl_tag_module_included()) { - include_once XOOPS_ROOT_PATH . "/modules/tag/include/formtag.php"; - $text_tags = new XoopsFormTag("item_tag", 70, 255, $link_array['item_tag'], 0); - $sform -> addElement( $text_tags ); - } else { - $sform -> addElement( new XoopsFormHidden( 'item_tag', $link_array['item_tag'] ) ); - } - -// Screenshot - $graph_array = &wflLists :: getListTypeAsArray( XOOPS_ROOT_PATH . "/" . $xoopsModuleConfig['screenshots'], $type = "images" ); - $indeximage_select = new XoopsFormSelect( '', 'screenshot', $screenshot ); - $indeximage_select -> addOptionArray( $graph_array ); - $indeximage_select -> setExtra( "onchange = 'showImgSelected(\"image\", \"screenshot\", \"" . $xoopsModuleConfig['screenshots'] . "\", \"\", \"" . XOOPS_URL . "\")'" ); - $indeximage_tray = new XoopsFormElementTray( _AM_WFL_LINK_SHOTIMAGE, ' ' ); - $indeximage_tray -> setDescription( sprintf( _AM_WFL_LINK_MUSTBEVALID, "<b>" . $directory . "</b>" )); - $indeximage_tray -> addElement( $indeximage_select ); - if ( !empty( $imgurl ) ) { - $indeximage_tray -> addElement( new XoopsFormLabel( '', " <br /><br />< img src='" . XOOPS_URL . "/" . $xoopsModuleConfig['screenshots'] . "/" . $screenshot . "' name = 'image' id = 'image' alt = '' / > " ) ); - } else { - $indeximage_tray -> addElement( new XoopsFormLabel( '', " <br /><br /><img src='" . XOOPS_URL . "/uploads/blank.gif' name='image' id='image' alt='' / > " ) ); - } - $sform -> addElement( $indeximage_tray ); - -if ($xoopsModuleConfig['useaddress']){ - $sform -> insertBreak( _AM_WFL_LINK_CREATEADDRESS, "bg3" ); -// Google Maps - $googlemap_text = new XoopsFormText( '', 'googlemap', 70, 1024, $googlemap ); - $googlemap_tray = new XoopsFormElementTray( _AM_WFL_LINK_GOOGLEMAP, '' ); - $googlemap_tray -> addElement( $googlemap_text , false ) ; - $googlemap_tray -> addElement( new XoopsFormLabel( " <img src='../images/icon/google_map.png' onClick=\"window.open(document.storyform.googlemap.value,'','');return(false);\" alt='"._AM_WFL_LINK_CHECKMAP."' />" ) ); - $sform -> addElement( $googlemap_tray ); -// Yahoo Maps - $yahoomap_text = new XoopsFormText( '', 'yahoomap', 70, 1024, $yahoomap ); - $yahoomap_tray = new XoopsFormElementTray( _AM_WFL_LINK_YAHOOMAP, '' ); - $yahoomap_tray -> addElement( $yahoomap_text , false ) ; - $yahoomap_tray -> addElement( new XoopsFormLabel( " <img src='../images/icon/yahoo_map.png' onClick=\"window.open(document.storyform.yahoomap.value,'','');return(false);\" alt='"._AM_WFL_LINK_CHECKMAP."' />" ) ); - $sform -> addElement( $yahoomap_tray ); -// MS Live Maps - $multimap_text = new XoopsFormText( '', 'multimap', 70, 1024, $multimap ); - $multimap_tray = new XoopsFormElementTray( _AM_WFL_LINK_MULTIMAP, '' ); - $multimap_tray -> addElement( $multimap_text , false ) ; - $multimap_tray -> addElement( new XoopsFormLabel( " <img src='../images/icon/multimap.png' onClick=\"window.open(document.storyform.multimap.value,'','');return(false);\" alt='"._AM_WFL_LINK_CHECKMAP."' />" ) ); - $sform -> addElement( $multimap_tray ); - -// Address - $street1 = new XoopsFormText( _AM_WFL_STREET1, 'street1', 70, 255, $street1 ); - $sform -> addElement( $street1, false ); - $street2 = new XoopsFormText( _AM_WFL_STREET2, 'street2', 70, 255, $street2 ); - $sform -> addElement( $street2, false ); - $town = new XoopsFormText( _AM_WFL_TOWN, 'town', 70, 255, $town ); - $sform -> addElement( $town, false ); - $state = new XoopsFormText( _AM_WFL_STATE, 'state', 70, 255, $state ); - $sform -> addElement( $state, false ); - $zip = new XoopsFormText( _AM_WFL_ZIPCODE, 'zip', 25, 25, $zip ); - $sform -> addElement( $zip, false ); - $tel = new XoopsFormText( _AM_WFL_TELEPHONE, 'tel', 25, 25, $tel ); - $sform -> addElement( $tel, false ); - $mobile = new XoopsFormText( _AM_WFL_MOBILE, 'mobile', 25, 25, $mobile ); - $sform -> addElement( $mobile, false ); - $voip = new XoopsFormText( _AM_WFL_VOIP, 'voip', 25, 25, $voip ); - $sform -> addElement( $voip, false ); - $fax = new XoopsFormText( _AM_WFL_FAX, 'fax', 25, 25, $fax ); - $sform -> addElement( $fax, false ); - $email = new XoopsFormText( _AM_WFL_EMAIL, 'email', 25, 60, $email ); - $sform -> addElement( $email, false ); - $vat = new XoopsFormText( _AM_WFL_VAT, 'vat', 25, 25, $vat ); - $vat -> setDescription( _AM_WFL_VATWIKI ); - $sform -> addElement( $vat, false ); -// $sform -> addElement( new XoopsFormHidden( 'vat', $link_array['vat'] ) ); /* If you don't want to use the VAT form, */ - /* use this line and comment-out the 3 lines above */ -} - -// Country form - $country_select = new XoopsFormSelectCountry( _AM_WFL_COUNTRY, 'country', $country ); - $sform -> addElement( $country_select, false ); - -// Miscellaneous Link settings - $sform -> insertBreak( _AM_WFL_LINK_MISCLINKSETTINGS, 'bg3' ); - -// Set Publish date - $sform -> addElement( new XoopsFormDateTime( _AM_WFL_LINK_SETPUBLISHDATE, 'published', $size = 15, $published )); - - if ( $lid ) { - $sform -> addElement( new XoopsFormHidden( 'was_published', $published ) ); - $sform -> addElement( new XoopsFormHidden( 'was_expired', $expired ) ); - } - -// Set Expire date - $isexpired = ( $expired > time() ) ? 1: 0 ; - $expiredates = ( $expired > time() ) ? _AM_WFL_LINK_EXPIREDATESET . formatTimestamp( $expired, $xoopsModuleConfig['dateformat'] ) : _AM_WFL_LINK_SETDATETIMEEXPIRE; - $warning = ( $published > $expired && $expired > time() ) ? _AM_WFL_LINK_EXPIREWARNING : ''; - $expiredate_checkbox = new XoopsFormCheckBox( '', 'expiredateactivate', $isexpired ); - $expiredate_checkbox -> addOption( 1, $expiredates . " <br /> <br /> " ); - - $expiredate_tray = new XoopsFormElementTray( _AM_WFL_LINK_EXPIREDATE . $warning, '' ); - $expiredate_tray -> addElement( $expiredate_checkbox ); - $expiredate_tray -> addElement( new XoopsFormDateTime( _AM_WFL_LINK_SETEXPIREDATE . " <br /> ", 'expired', 15, $expired ) ); - $expiredate_tray -> addElement( new XoopsFormRadioYN( _AM_WFL_LINK_CLEAREXPIREDATE, 'clearexpire', 0, ' ' . _YES . '', ' ' . _NO . '' ) ); - $sform -> addElement( $expiredate_tray ); - -// Set Link offline - $linkstatus_radio = new XoopsFormRadioYN( _AM_WFL_LINK_FILESSTATUS, 'offline', $offline, ' ' . _YES . '', ' ' . _NO . '' ); - $sform -> addElement( $linkstatus_radio ); - -// Set Link updated - $up_dated = ( $updated == 0 ) ? 0 : 1; - $link_updated_radio = new XoopsFormRadioYN( _AM_WFL_LINK_SETASUPDATED, 'up_dated', $up_dated, ' ' . _YES . '', ' ' . _NO . '' ); - $sform -> addElement( $link_updated_radio ); - - $result = $xoopsDB -> query( "SELECT COUNT( * ) FROM " . $xoopsDB -> prefix( 'wflinks_broken' ) . " WHERE lid = " . $lid ); - list ( $broken_count ) = $xoopsDB -> fetchRow( $result ); - if ( $broken_count > 0 ) { - $link_updated_radio = new XoopsFormRadioYN( _AM_WFL_LINK_DELEDITMESS, 'delbroken', 1, ' ' . _YES . '', ' ' . _NO . '' ); - $sform -> addElement( $editmess_radio ); - } - -// Select forum - ob_start(); - wflLists :: getforum( $xoopsModuleConfig['selectforum'], $forumid ); - $sform -> addElement( new XoopsFormLabel( _AM_WFL_LINK_DISCUSSINFORUM, ob_get_contents() ) ); - ob_end_clean(); - -//Create News Story - if (wfl_news_module_included()) { - $sform -> insertBreak( _AM_WFL_LINK_CREATENEWSSTORY, "bg3" ); - $submitNews_radio = new XoopsFormRadioYN( _AM_WFL_LINK_SUBMITNEWS, 'submitnews', 0, ' ' . _YES . '', ' ' . _NO . '' ); - $sform -> addElement( $submitNews_radio ); - - include_once XOOPS_ROOT_PATH . '/class/xoopstopic.php'; - $xt = new XoopsTopic( $xoopsDB -> prefix( 'topics' ) ); - ob_start(); - $xt -> makeTopicSelBox( 1, 0, "newstopicid" ); - $sform -> addElement( new XoopsFormLabel( _AM_WFL_LINK_NEWSCATEGORY, ob_get_contents() ) ); - ob_end_clean(); - $sform -> addElement( new XoopsFormText( _AM_WFL_LINK_NEWSTITLE, 'newsTitle', 70, 255, '' ), false ); - } - - if ( $lid && $published == 0 ) { - $approved = ( $published == 0 ) ? 0 : 1; - $approve_checkbox = new XoopsFormCheckBox( _AM_WFL_LINK_EDITAPPROVE, "approved", 1 ); - $approve_checkbox -> addOption( 1, " " ); - $sform -> addElement( $approve_checkbox ); - } - - if ( !$lid ) { - $button_tray = new XoopsFormElementTray( '', '' ); - $button_tray -> addElement( new XoopsFormHidden( 'status', 1 ) ); - $button_tray -> addElement( new XoopsFormHidden( 'notifypub', $notifypub ) ); - $button_tray -> addElement( new XoopsFormHidden( 'op', 'save' ) ); - $button_tray -> addElement( new XoopsFormButton( '', '', _AM_WFL_BSAVE, 'submit' ) ); - $sform -> addElement( $button_tray ); - } else { - $button_tray = new XoopsFormElementTray( '', '' ); - $button_tray -> addElement( new XoopsFormHidden( 'lid', $lid ) ); - $button_tray -> addElement( new XoopsFormHidden( 'status', 2 ) ); - $hidden = new XoopsFormHidden( 'op', 'save' ); - $button_tray -> addElement( $hidden ); - - $butt_dup = new XoopsFormButton( '', '', _AM_WFL_BMODIFY, 'submit' ); - $butt_dup -> setExtra( 'onclick="this . form . elements . op . value = \'save\'"' ); - $button_tray -> addElement( $butt_dup ); - $butt_dupct = new XoopsFormButton( '', '', _AM_WFL_BDELETE, 'submit' ); - $butt_dupct -> setExtra( 'onclick="this.form.elements.op.value=\'delete\'"' ); - $button_tray -> addElement( $butt_dupct ); - $butt_dupct2 = new XoopsFormButton( '', '', _AM_WFL_BCANCEL, 'submit' ); - $butt_dupct2 -> setExtra( 'onclick="this.form.elements.op.value=\'linksConfigMenu\'"' ); - $button_tray -> addElement( $butt_dupct2 ); - $sform -> addElement( $button_tray ); - } - $sform -> display(); - unset( $hidden ); - xoops_cp_footer(); -} - -function fetchURL( $url, $timeout = 2 ) { - $url = urldecode( $url ); - $url_parsed = parse_url( $url ); - if ( !isset( $url_parsed["host"] ) ) { - return ''; - } - - $host = $url_parsed["host"]; - $host = ereg_replace( "http://", "", $host ); - $port = ( isset( $url_parsed["port"] ) ) ? $url_parsed["port"]: 80; - // Open the socket - $handle = @fsockopen( 'http://' . $host, $port, $errno, $errstr, $timeout ); - if ( !$handle ) { - return null; - } else { - // Set read timeout - stream_set_timeout( $handle, $timeout ); - for( $i = 0;$i < 1;$i++ ) { - // Time the responce - list( $usec, $sec ) = explode( " ", microtime( true ) ); - $start = ( float )$usec + ( float )$sec; - // send somthing - $write = fwrite( $handle, "return ping\n" ); - if ( !$write ) { - return ''; - } - fread( $handle, 1024 ); - // Work out if we got a responce and time it - list( $usec, $sec ) = explode( " ", microtime( true ) ); - $laptime = ( ( float )$usec + ( float )$sec ) - $start; - if ( $laptime > $timeout ) { - return 'No Reply'; - } else { - return round( $laptime, 3 ); - } - } - fclose( $handle ); - } -} - -switch ( strtolower( $op ) ) -{ - case "pingtime"; - case "is_broken"; - - $_type = ( $op == "pingtime" ) ? "is_broken" : "pingtime"; - - $start = wfl_cleanRequestVars( $_REQUEST, 'start', 0 ); - $ping = wfl_cleanRequestVars( $_REQUEST, 'ping', 0 ); - $cid = wfl_cleanRequestVars( $_REQUEST, 'cid', 0 ); - - $sql = "SELECT * FROM " . $xoopsDB -> prefix( 'wflinks_links' ); - if ( $cid > 0 ) { - $sql .= " WHERE cid=" . $cid; - } - $sql .= " ORDER BY lid DESC"; - if ( !$result = $xoopsDB -> query( $sql ) ) { - XoopsErrorHandler_HandleError( E_USER_WARNING, $sql, __FILE__, __LINE__ ); - return false; - } - $broken_array = $xoopsDB -> query( $sql, $xoopsModuleConfig['admin_perpage'], $start ); - $broken_array_count = $xoopsDB -> getRowsNum( $result ); - - $heading = ( $op == "pingtime" ) ? _AM_WFL_PINGTIMES : _AM_WFL_LISTBROKEN; - - xoops_cp_header(); - wfl_adminmenu( _AM_WFL_BINDEX, '', $heading ); - echo " - <table width='100%' cellspacing='1' cellpadding='2' border='0' class='outer'>\n - <tr>\n - <th style='text-align: center;'>" . _AM_WFL_MINDEX_ID . "</th>\n - <th style='text-align: left;'><b>" . _AM_WFL_MINDEX_TITLE . "</th>\n - <th style='text-align: center;'>"._AM_WFL_MINDEX_POSTER."</th>\n - <th style='text-align: center;'>" . _AM_WFL_MINDEX_PUBLISHED . "</th>\n - <th style='text-align: center;'>" . _AM_WFL_MINDEX_RESPONSE . "</th>\n - <th style='text-align: center;'>PR</th>\n - <th style='text-align: center;'>" . _AM_WFL_MINDEX_ACTION . "</th>\n - </tr>\n - "; - - if ( $broken_array_count > 0 ) { - while ( $published = $xoopsDB -> fetchArray( $broken_array ) ) { - $_ping_results = fetchURL( $published['url'] ); - - if ( !$_ping_results ) { - $_ping_results = _AM_WFL_LINK_NORESPONSE; - } else { - $_ping_results = $_ping_results . '(s)'; - } - - $lid = $published['lid']; - $cid = $published['cid']; - $title = "<a href='../singlelink.php?cid=" . $published['cid'] . "&lid=" . $published['lid'] . "'>" . $wfmyts -> htmlSpecialCharsStrip( trim( $published['title'] ) ) . "</a>";; - $maintitle = urlencode( $wfmyts -> htmlSpecialChars( trim( $published['title'] ) ) ); - $submitter = xoops_getLinkedUnameFromId( $published['submitter'] ); - $publish = formatTimestamp( $published['published'], $xoopsModuleConfig['dateformatadmin'] ); - $status = ( $published['published'] > 0 ) ? $imagearray['online'] : "<a href='newlinks.php'>" . $imagearray['offline'] . "</a>"; - $icon = "<a href='index.php?op=edit&lid=" . $lid . "'>" . $imagearray['editimg'] . "</a> "; - $icon .= "<a href='index.php?op=delete&lid=" . $lid . "'>" . $imagearray['deleteimg'] . "</a>"; - echo "<tr style='text-align: center;'>\n - <td class='head'><small>" . $lid . "</small></td>\n - <td class='even' style='text-align: left;'><small>" . $title . "</small></td>\n - <td class='even'><small>" . $submitter . "</small></td>\n - <td class='even'><small>" . $publish . "</small></td>\n - <td class='even'><small>" . $_ping_results . "</small></td>\n - <td class='even'><small>" . pagerank($published['url']) . "</small></td>\n - <td class='even'>$icon</td>\n - </tr>\n"; - unset( $published ); - } - } else { - wfl_linklistfooter(); - } - wfl_linklistpagenav( $broken_array_count, $start, 'art', 'op=' . $op ); - xoops_cp_footer(); - break; - - case "edit": - edit( $lid ); - break; - - case "save": - $groups = isset( $_POST['groups'] ) ? $_POST['groups'] : array(); - $lid = ( !empty( $_POST['lid'] ) ) ? $_POST['lid'] : 0; - $cid = ( !empty( $_POST['cid'] ) ) ? $_POST['cid'] : 0; - $urlrating = ( !empty( $_POST['urlrating'] ) ) ? $_POST['urlrating'] : 6; - $status = ( !empty( $_POST['status'] ) ) ? $_POST['status'] : 2; - $url = ( $_POST["url"] != "http://" ) ? $wfmyts -> addslashes( $_POST["url"] ) : ''; - $title = $wfmyts -> addslashes( trim( $_POST["title"] ) ); - -// Get data from form - $screenshot = ( $_POST["screenshot"] != "blank.gif" ) ? $wfmyts -> addslashes( $_POST["screenshot"] ) : ''; - $descriptionb = $wfmyts -> addslashes( trim( $_POST["descriptionb"] ) ); - $country = $wfmyts -> addslashes( trim( $_POST["country"] ) ); - $keywords = $wfmyts -> addslashes( trim(substr($_POST["keywords"], 0, $xoopsModuleConfig['keywordlength']) ) ); - $item_tag = $wfmyts -> addslashes( trim( $_POST["item_tag"] ) ); - $forumid = ( isset( $_POST["forumid"] ) && $_POST["forumid"] > 0 ) ? intval( $_POST["forumid"] ) : 0; - if ($xoopsModuleConfig['useaddress']){ - $googlemap = ( $_POST["googlemap"] != "http://maps.google.com" ) ? $wfmyts -> addslashes( $_POST["googlemap"] ) : ''; - $yahoomap = ( $_POST["yahoomap"] != "http://maps.yahoo.com" ) ? $wfmyts -> addslashes( $_POST["yahoomap"] ) : ''; - $multimap = ( $_POST["multimap"] != "http://www.multimap.com" ) ? $wfmyts -> addslashes( $_POST["multimap"] ) : ''; - $street1 = $wfmyts -> addslashes( trim( $_POST["street1"] ) ); - $street2 = $wfmyts -> addslashes( trim( $_POST["street2"] ) ); - $town = $wfmyts -> addslashes( trim( $_POST["town"] ) ); - $state = $wfmyts -> addslashes( trim( $_POST["state"] ) ); - $zip = $wfmyts -> addslashes( trim( $_POST["zip"] ) ); - $tel = $wfmyts -> addslashes( trim( $_POST["tel"] ) ); - $fax = $wfmyts -> addslashes( trim( $_POST["fax"] ) ); - $voip = $wfmyts -> addslashes( trim( $_POST["voip"] ) ); - $mobile = $wfmyts -> addslashes( trim( $_POST["mobile"] ) ); - $email = emailcnvrt($wfmyts -> addslashes( trim( $_POST["email"] ) )); - $vat = $wfmyts -> addslashes( trim( $_POST["vat"] ) ); - } else { - $googlemap = $yahoomap = $multimap = $street1 = $street2 = $town = $state = $zip = $tel = $fax = $voip = $mobile = $email = $vat = ''; - } - - $submitter = $xoopsUser -> uid(); - $publisher = $wfmyts -> addslashes( trim( $_POST["publisher"] ) ); - - $published = strtotime($_POST['published']['date'] ) + $_POST['published']['time']; - $updated = ( isset( $_POST['was_published'] ) && $_POST['was_published'] == 0 ) ? 0 : time(); - if ( $_POST['up_dated'] == 0 ) { - $updated = 0; - $status = 1; - } - $offline = ( $_POST['offline'] == 1 ) ? 1 : 0; - $approved = ( isset( $_POST['approved'] ) && $_POST['approved'] == 1 ) ? 1 : 0; - $notifypub = ( isset( $_POST['notifypub'] ) && $_POST['notifypub'] == 1 ); - if ( !$lid ) { - $date = time(); - $publishdate = time(); - $expiredate = '0'; - } else { - $publishdate = $_POST['was_published']; - $expiredate = $_POST['was_expired']; - } - if ( $approved == 1 && empty( $publishdate ) ) { - $publishdate = time(); - } - if ( isset( $_POST['expiredateactivate'] ) ) { - $expiredate = strtotime( $_POST['expired']['date'] ) + $_POST['expired']['time']; - } - if ( $_POST['clearexpire'] ) { - $expiredate = '0'; - } - -// Update or insert linkload data into database - if ( !$lid ) { - $date = time(); - $publishdate = time(); - $ipaddress = $_SERVER['REMOTE_ADDR']; - $sql = "INSERT INTO " . $xoopsDB -> prefix( 'wflinks_links' ) . " (lid, cid, title, url, screenshot, submitter, publisher, status, date, hits, rating, votes, comments, forumid, published, expired, updated, offline, description, ipaddress, notifypub, urlrating, country, keywords, item_tag, googlemap, yahoomap, multimap, street1, street2, town, state, zip, tel, fax, voip, mobile, email, vat )"; - $sql .= " VALUES ('', $cid, '$title', '$url', '$screenshot', '$submitter', '$publisher','$status', '$date', 0, 0, 0, 0, '$forumid', '$published', '$expiredate', '$updated', '$offline', '$descriptionb', '$ipaddress', '0', '$urlrating', '$country', '$keywords', '$item_tag', '$googlemap', '$yahoomap', '$multimap', '$street1', '$street2', '$town', '$state', '$zip', '$tel', '$fax', '$voip', '$mobile', '$email', '$vat' )"; - // $newid = $xoopsDB -> getInsertId(); - } else { - $sql = "UPDATE " . $xoopsDB -> prefix( 'wflinks_links' ) . " SET cid = $cid, title='$title', url='$url', screenshot='$screenshot', publisher='$publisher', status='$status', forumid='$forumid', published='$published', expired='$expiredate', updated='$updated', offline='$offline', description='$descriptionb', urlrating='$urlrating', country='$country', keywords='$keywords', item_tag='$item_tag', googlemap='$googlemap', yahoomap='$yahoomap', multimap='$multimap', street1='$street1', street2='$street2', town='$town', state='$state', zip='$zip', tel='$tel', fax='$fax', voip='$voip', mobile='$mobile', email='$email', vat='$vat' WHERE lid=" . $lid; - } - if ( !$result = $xoopsDB -> queryF( $sql ) ) { - XoopsErrorHandler_HandleError( E_USER_WARNING, $sql, __FILE__, __LINE__ ); - return false; - } - - $newid = mysql_insert_id(); - -// Add item_tag to Tag-module - if ( !$lid ) { - $tagupdate = wfl_tagupdate($newid, $item_tag); - } else { - $tagupdate = wfl_tagupdate($lid, $item_tag); - } - -// Send notifications - if ( !$lid ) { - $tags = array(); - $tags['LINK_NAME'] = $title; - $tags['LINK_URL'] = XOOPS_URL . '/modules/' . $xoopsModule -> getVar( 'dirname' ) . '/singlelink.php?cid=' . $cid . '&lid=' . $newid; - $sql = "SELECT title FROM " . $xoopsDB -> prefix( 'wflinks_cat' ) . " WHERE cid=" . $cid; - $result = $xoopsDB -> query( $sql ); - $row = $xoopsDB -> fetchArray( $xoopsDB -> query( $sql ) ); - $tags['CATEGORY_NAME'] = $row['title']; - $tags['CATEGORY_URL'] = XOOPS_URL . '/modules/' . $xoopsModule -> getVar( 'dirname' ) . '/viewcat.php?cid=' . $cid; - $notification_handler = &xoops_gethandler( 'notification' ); - $notification_handler -> triggerEvent( 'global', 0, 'new_link', $tags ); - $notification_handler -> triggerEvent( 'category', $cid, 'new_link', $tags ); - } - if ( $lid && $approved && $notifypub ) { - $tags = array(); - $tags['LINK_NAME'] = $title; - $tags['LINK_URL'] = XOOPS_URL . '/modules/' . $xoopsModule -> getVar( 'dirname' ) . '/singlelink.php?cid=' . $cid . '&lid=' . $lid; - $sql = "SELECT title FROM " . $xoopsDB -> prefix( 'wflinks_cat' ) . " WHERE cid=" . $cid; - $result = $xoopsDB -> query( $sql ); - $row = $xoopsDB -> fetchArray( $result ); - $tags['CATEGORY_NAME'] = $row['title']; - $tags['CATEGORY_URL'] = XOOPS_URL . '/modules/' . $xoopsModule -> getVar( 'dirname' ) . '/viewcat.php?cid=' . $cid; - $notification_handler = &xoops_gethandler( 'notification' ); - $notification_handler -> triggerEvent( 'global', 0, 'new_link', $tags ); - $notification_handler -> triggerEvent( 'category', $cid, 'new_link', $tags ); - $notification_handler -> triggerEvent( 'link', $lid, 'approve', $tags ); - } - $message = ( !$lid ) ? _AM_WFL_LINK_NEWFILEUPLOAD : _AM_WFL_LINK_FILEMODIFIEDUPDATE ; - $message = ( $lid && !$_POST['was_published'] && $approved ) ? _AM_WFL_LINK_FILEAPPROVED : $message; - if ( wfl_cleanRequestVars( $_REQUEST, 'delbroken', 0 ) ) { - $sql = "DELETE FROM " . $xoopsDB -> prefix( 'wflinks_broken' ) . " WHERE lid=" . $lid; - if ( !$result = $xoopsDB -> queryF( $sql ) ) { - XoopsErrorHandler_HandleError( E_USER_WARNING, $sql, __FILE__, __LINE__ ); - return false; - } - } - if ( wfl_cleanRequestVars( $_REQUEST, 'submitnews', 0 ) ) { - include_once "newstory.php"; - } - redirect_header( "index.php", 1, $message ); - break; - - case "delete": - if ( wfl_cleanRequestVars( $_REQUEST, 'confirm', 0 ) ) { - $title = wfl_cleanRequestVars( $_REQUEST, 'title', 0 ); - - // delete link - $sql = "DELETE FROM " . $xoopsDB -> prefix( 'wflinks_links' ) . " WHERE lid=" . $lid; - if ( !$result = $xoopsDB -> query( $sql ) ) { - XoopsErrorHandler_HandleError( E_USER_WARNING, $sql, __FILE__, __LINE__ ); - return false; - } - - // delete from altcat - $sql = "DELETE FROM " . $xoopsDB -> prefix( 'wflinks_altcat' ) . " WHERE lid=" . $lid; - if ( !$result = $xoopsDB -> query( $sql ) ) { - XoopsErrorHandler_HandleError( E_USER_WARNING, $sql, __FILE__, __LINE__ ); - return false; - } - - // delete vote data - $sql = "DELETE FROM " . $xoopsDB -> prefix( 'wflinks_votedata' ) . " WHERE lid=" . $lid; - if ( !$result = $xoopsDB -> query( $sql ) ) { - XoopsErrorHandler_HandleError( E_USER_WARNING, $sql, __FILE__, __LINE__ ); - return false; - } - - // delete comments - xoops_comment_delete( $xoopsModule -> getVar( 'mid' ), $lid ); - redirect_header( "index.php", 1, sprintf( _AM_WFL_LINK_FILEWASDELETED, $title ) ); - exit(); - } else { - $sql = "SELECT lid, title, item_tag, url FROM " . $xoopsDB -> prefix( 'wflinks_links' ) . " WHERE lid=" . $lid; - if ( !$result = $xoopsDB -> query( $sql ) ) { - XoopsErrorHandler_HandleError( E_USER_WARNING, $sql, __FILE__, __LINE__ ); - return false; - } - list( $lid, $title ) = $xoopsDB -> fetchrow( $result ); - $item_tag = $result['item_tag']; - xoops_cp_header(); - wfl_adminmenu( _AM_WFL_BINDEX ); - xoops_confirm( array( 'op' => 'delete', 'lid' ... [truncated message content] |
From: <be...@us...> - 2012-06-26 02:30:17
|
Revision: 9722 http://xoops.svn.sourceforge.net/xoops/?rev=9722&view=rev Author: beckmi Date: 2012-06-26 02:30:10 +0000 (Tue, 26 Jun 2012) Log Message: ----------- - changed editor list selection to dynamic (mamba) - replace http://mozshot.nemui.org with http://open.thumbshots.org for screenshots (Shine) - fixed bug related to $wfmyts constructor overriding (mamba) Modified Paths: -------------- XoopsModules/wflink/trunk/htdocs/modules/wflinks/admin/main.php XoopsModules/wflink/trunk/htdocs/modules/wflinks/class/myts_extended.php XoopsModules/wflink/trunk/htdocs/modules/wflinks/docs/changelog.txt XoopsModules/wflink/trunk/htdocs/modules/wflinks/include/linkloadinfo.php XoopsModules/wflink/trunk/htdocs/modules/wflinks/singlelink.php XoopsModules/wflink/trunk/htdocs/modules/wflinks/submit.php XoopsModules/wflink/trunk/htdocs/modules/wflinks/templates/wflinks_linkload.html XoopsModules/wflink/trunk/htdocs/modules/wflinks/xoops_version.php Modified: XoopsModules/wflink/trunk/htdocs/modules/wflinks/admin/main.php =================================================================== --- XoopsModules/wflink/trunk/htdocs/modules/wflinks/admin/main.php 2012-06-25 19:19:10 UTC (rev 9721) +++ XoopsModules/wflink/trunk/htdocs/modules/wflinks/admin/main.php 2012-06-26 02:30:10 UTC (rev 9722) @@ -133,9 +133,25 @@ ob_end_clean(); // Link description form - $editor = wfl_getWysiwygForm( _AM_WFL_LINK_DESCRIPTION, 'descriptionb', $descriptionb, 15, 60 ); - $sform -> addElement($editor, false); +// $editor = wfl_getWysiwygForm( _AM_WFL_LINK_DESCRIPTION, 'descriptionb', $descriptionb, 15, 60 ); +// $sform -> addElement($editor, false); + $optionsTrayNote = new XoopsFormElementTray(_AM_WFL_LINK_DESCRIPTION, '<br />'); + if (class_exists('XoopsFormEditor')) { + $options['name'] = 'descriptionb'; + $options['value'] = $descriptionb; + $options['rows'] = 5; + $options['cols'] = '100%'; + $options['width'] = '100%'; + $options['height'] = '200px'; + $descriptionb = new XoopsFormEditor('', $xoopsModuleConfig['form_options'], $options, $nohtml = FALSE, $onfailure = 'textarea'); + $optionsTrayNote->addElement($descriptionb); + } else { + $descriptionb = new XoopsFormDhtmlTextArea('', 'descriptionb', $item->getVar('descriptionb', 'e'), '100%', '100%'); + $optionsTrayNote->addElement($descriptionb); + } + $sform->addElement($optionsTrayNote, FALSE); + // Meta keywords form $keywords = new XoopsFormTextArea( _AM_WFL_KEYWORDS, 'keywords', $keywords, 7, 60, false ); $keywords -> setDescription( "<small>" . _AM_WFL_KEYWORDS_NOTE . "</small>"); Modified: XoopsModules/wflink/trunk/htdocs/modules/wflinks/class/myts_extended.php =================================================================== --- XoopsModules/wflink/trunk/htdocs/modules/wflinks/class/myts_extended.php 2012-06-25 19:19:10 UTC (rev 9721) +++ XoopsModules/wflink/trunk/htdocs/modules/wflinks/class/myts_extended.php 2012-06-26 02:30:10 UTC (rev 9722) @@ -11,8 +11,6 @@ */ class wflTextSanitizer extends MyTextSanitizer { - function wflTextSanitizer() { - } function htmlSpecialCharsStrip( $text ) { Modified: XoopsModules/wflink/trunk/htdocs/modules/wflinks/docs/changelog.txt =================================================================== --- XoopsModules/wflink/trunk/htdocs/modules/wflinks/docs/changelog.txt 2012-06-25 19:19:10 UTC (rev 9721) +++ XoopsModules/wflink/trunk/htdocs/modules/wflinks/docs/changelog.txt 2012-06-26 02:30:10 UTC (rev 9722) @@ -1,6 +1,14 @@ -====================================================== -24-06-2012 1.09 Beta -============================================================ +========================================================= +25-06-2012 1.09 Beta 2 +========================================================= + +- changed editor list selection to dynamic (mamba) +- replace http://mozshot.nemui.org with http://open.thumbshots.org for screenshots (Shine) +- fixed bug related to $wfmyts constructor overriding + +========================================================= +24-06-2012 1.09 Beta 1 +========================================================= Shine and Mamba: Fixed: Admin section: - missing image: Frameworks/moduleclasses/icons/16/folder_add.png @@ -11,7 +19,7 @@ 2012-04-25 1.08 Beta 1 ========================================================= -- converted to XOOPS 2.5.x Admin GUI (mamba)- +- converted to XOOPS 2.5.x Admin GUI (mamba) =========================================================== 23-6-2012 1.07 Final Modified: XoopsModules/wflink/trunk/htdocs/modules/wflinks/include/linkloadinfo.php =================================================================== --- XoopsModules/wflink/trunk/htdocs/modules/wflinks/include/linkloadinfo.php 2012-06-25 19:19:10 UTC (rev 9721) +++ XoopsModules/wflink/trunk/htdocs/modules/wflinks/include/linkloadinfo.php 2012-06-26 02:30:10 UTC (rev 9722) @@ -71,6 +71,7 @@ $link['updated'] = formatTimestamp( $time, $xoopsModuleConfig['dateformat'] ); $description = $wfmyts -> displayTarea( $link_arr['description'], 1, 1, 1, 1, 1 ); + $link['description'] = xoops_substr( $description, 0, $xoopsModuleConfig['totalchars'], '...' ); $link['submitter'] = xoops_getLinkedUnameFromId( $link_arr['submitter'] ); @@ -152,5 +153,4 @@ $link['showpagerank'] = $xoopsModuleConfig['showpagerank']; $link['quickview'] = $xoopsModuleConfig['quickview']; $link['comment_rules'] = $xoopsModuleConfig['com_rule']; -$link['autoscrshot'] = $xoopsModuleConfig['useautothumb']; -?> \ No newline at end of file +$link['autoscrshot'] = $xoopsModuleConfig['useautothumb']; \ No newline at end of file Modified: XoopsModules/wflink/trunk/htdocs/modules/wflinks/singlelink.php =================================================================== --- XoopsModules/wflink/trunk/htdocs/modules/wflinks/singlelink.php 2012-06-25 19:19:10 UTC (rev 9721) +++ XoopsModules/wflink/trunk/htdocs/modules/wflinks/singlelink.php 2012-06-26 02:30:10 UTC (rev 9722) @@ -54,7 +54,7 @@ $xoopsTpl -> assign('tagbar', tagBar($link_arr['lid'], 0)); } -$link['imageheader'] = wfl_imageheader(); +//$link['imageheader'] = wfl_imageheader(); $link['id'] = $link_arr['lid']; $link['cid'] = $link_arr['cid']; $link['description2'] = $wfmyts -> displayTarea( $link_arr['description'], 1, 1, 1, 1, 1 ); Modified: XoopsModules/wflink/trunk/htdocs/modules/wflinks/submit.php =================================================================== --- XoopsModules/wflink/trunk/htdocs/modules/wflinks/submit.php 2012-06-25 19:19:10 UTC (rev 9721) +++ XoopsModules/wflink/trunk/htdocs/modules/wflinks/submit.php 2012-06-26 02:30:10 UTC (rev 9722) @@ -274,9 +274,26 @@ ob_end_clean(); // Link description form - $editor = wfl_getWysiwygForm( _MD_WFL_DESCRIPTIONC, 'descriptionb', $descriptionb, 15, 60 ); - $sform -> addElement($editor,false); +// $editor = wfl_getWysiwygForm( _MD_WFL_DESCRIPTIONC, 'descriptionb', $descriptionb, 15, 60 ); +// $sform -> addElement($editor,false); +$optionsTrayNote = new XoopsFormElementTray(_MD_WFL_DESCRIPTIONC, '<br />'); + if (class_exists('XoopsFormEditor')) { + $options['name'] = 'descriptionb'; + $options['value'] = $descriptionb; + $options['rows'] = 5; + $options['cols'] = '100%'; + $options['width'] = '100%'; + $options['height'] = '200px'; + $editor = new XoopsFormEditor('', $xoopsModuleConfig['form_optionsuser'], $options, $nohtml = FALSE, $onfailure = 'textarea'); + $optionsTrayNote->addElement($editor); + } else { + $editor = new XoopsFormDhtmlTextArea('', 'descriptionb', $item->getVar('descriptionb', 'e'), '100%', '100%'); + $optionsTrayNote->addElement($editor); + } + + $sform->addElement($optionsTrayNote, FALSE); + // Keywords form $keywords = new XoopsFormTextArea( _MD_WFL_KEYWORDS, 'keywords', $keywords, 7, 60, false ); $keywords -> setDescription( "<small>" . _MD_WFL_KEYWORDS_NOTE . "</small>"); Modified: XoopsModules/wflink/trunk/htdocs/modules/wflinks/templates/wflinks_linkload.html =================================================================== --- XoopsModules/wflink/trunk/htdocs/modules/wflinks/templates/wflinks_linkload.html 2012-06-25 19:19:10 UTC (rev 9721) +++ XoopsModules/wflink/trunk/htdocs/modules/wflinks/templates/wflinks_linkload.html 2012-06-26 02:30:10 UTC (rev 9722) @@ -25,7 +25,7 @@ <td width="65%" valign="top"> <{if $wfllink.autoscrshot == 0}> <{if $show_screenshot == true}> <{if $wfllink.screenshot_full != ''}> <div> <a href="<{$xoops_url}>/modules/<{$wfllink.module_dir}>/visit.php?cid=<{$wfllink.cid}>&lid=<{$wfllink.id}>" target="_blank"><img src="<{$wfllink.screenshot_thumb}>" alt="" hspace="7" vspace="3" border="0" align="right" /></a> </div> <{/if}> <{/if}> <{/if}> -<{if $wfllink.autoscrshot == 1}> <div> <a href="<{$xoops_url}>/modules/<{$wfllink.module_dir}>/visit.php?cid=<{$wfllink.cid}>&lid=<{$wfllink.id}>" target="_blank"><img src="http://mozshot.nemui.org/shot/128x128?<{$wfllink.url}>" align="right" /></a> </div> <{/if}> + <{if $wfllink.autoscrshot == 1}> <div> <a href="<{$xoops_url}>/modules/<{$wfllink.module_dir}>/visit.php?cid=<{$wfllink.cid}>&lid=<{$wfllink.id}>" target="_blank"><img src="http://open.thumbshots.org/image.pxf?url=<{$wfllink.url}>" align="right" /></a> </div> <{/if}> <div style="margin-left: 6px;" align="left"> <a href="<{$xoops_url}>/modules/<{$wfllink.module_dir}>/visit.php?cid=<{$wfllink.cid}>&lid=<{$wfllink.id}>" target="_blank"> <img src="<{$xoops_url}>/modules/<{$wfllink.module_dir}>/images/icon/links.gif" alt="" align="absmiddle" /> Modified: XoopsModules/wflink/trunk/htdocs/modules/wflinks/xoops_version.php =================================================================== --- XoopsModules/wflink/trunk/htdocs/modules/wflinks/xoops_version.php 2012-06-25 19:19:10 UTC (rev 9721) +++ XoopsModules/wflink/trunk/htdocs/modules/wflinks/xoops_version.php 2012-06-26 02:30:10 UTC (rev 9722) @@ -50,10 +50,10 @@ $modversion['icons32'] = '../../Frameworks/moduleclasses/icons/32'; //about -$modversion['release_date'] = '2012/06/23'; +$modversion['release_date'] = '2012/06/25'; $modversion["module_website_url"] = "www.xoops.org/"; $modversion["module_website_name"] = "XOOPS"; -$modversion["module_status"] = "Beta 1"; +$modversion["module_status"] = "Beta 2"; $modversion['min_php'] = '5.2'; $modversion['min_xoops'] = "2.5"; $modversion['min_admin'] = '1.1'; @@ -285,38 +285,67 @@ $modversion['config'][$i]['formtype'] = 'yesno'; $modversion['config'][$i]['valuetype'] = 'int'; $modversion['config'][$i]['default'] = 0; +//-------------------------------------------------------------------- +//$i++; +//$modversion['config'][$i]['name'] = 'form_options'; +//$modversion['config'][$i]['title'] = '_MI_WFL_EDITOR'; +//$modversion['config'][$i]['description'] = '_MI_WFL_EDITORCHOICE'; +//$modversion['config'][$i]['formtype'] = 'select'; +//$modversion['config'][$i]['valuetype'] = 'text'; +//$modversion['config'][$i]['default'] = 'dhtml'; +//$modversion['config'][$i]['options'] = array( _MI_WFL_FORM_DHTML => 'dhtml', +// _MI_WFL_FORM_DHTMLEXT => 'dhtmlext', +// _MI_WFL_FORM_COMPACT => 'textarea', +// _MI_WFL_FORM_HTMLAREA => 'htmlarea', +// _MI_WFL_FORM_KOIVI => 'koivi', +// _MI_WFL_FORM_FCK => 'fck', +// _MI_WFL_FORM_TINYEDITOR => 'tinyeditor', +// _MI_WFL_FORM_TINYMCE => 'tinymce' +// ); +//$i++; +//$modversion['config'][$i]['name'] = 'form_optionsuser'; +//$modversion['config'][$i]['title'] = '_MI_WFL_EDITORUSER'; +//$modversion['config'][$i]['description'] = '_MI_WFL_EDITORCHOICEUSER'; +//$modversion['config'][$i]['formtype'] = 'select'; +//$modversion['config'][$i]['valuetype'] = 'text'; +//$modversion['config'][$i]['default'] = 'dhtml'; +//$modversion['config'][$i]['options'] = array( _MI_WFL_FORM_DHTML => 'dhtml', +// _MI_WFL_FORM_DHTMLEXT => 'dhtmlext', +// _MI_WFL_FORM_COMPACT => 'textarea', +// _MI_WFL_FORM_HTMLAREA => 'htmlarea', +// _MI_WFL_FORM_KOIVI => 'koivi', +// _MI_WFL_FORM_FCK => 'fck', +// _MI_WFL_FORM_TINYEDITOR => 'tinyeditor', +// _MI_WFL_FORM_TINYMCE => 'tinymce' +// ); +//-------------------------------------------------------------------- $i++; -$modversion['config'][$i]['name'] = 'form_options'; -$modversion['config'][$i]['title'] = '_MI_WFL_EDITOR'; -$modversion['config'][$i]['description'] = '_MI_WFL_EDITORCHOICE'; -$modversion['config'][$i]['formtype'] = 'select'; -$modversion['config'][$i]['valuetype'] = 'text'; -$modversion['config'][$i]['default'] = 'dhtml'; -$modversion['config'][$i]['options'] = array( _MI_WFL_FORM_DHTML => 'dhtml', - _MI_WFL_FORM_DHTMLEXT => 'dhtmlext', - _MI_WFL_FORM_COMPACT => 'textarea', - _MI_WFL_FORM_HTMLAREA => 'htmlarea', - _MI_WFL_FORM_KOIVI => 'koivi', - _MI_WFL_FORM_FCK => 'fck', - _MI_WFL_FORM_TINYEDITOR => 'tinyeditor', - _MI_WFL_FORM_TINYMCE => 'tinymce' - ); +xoops_load('XoopsEditorHandler'); +$editor_handler = XoopsEditorHandler::getInstance(); +$editorList = array_flip($editor_handler->getList()); + +$modversion['config'][$i] = array( + 'name' => 'form_options', + 'title' => '_MI_WFL_EDITOR', + 'description' => '_MI_WFL_EDITORCHOICE', + 'formtype' => 'select', + 'valuetype' => 'text', + 'options' => $editorList, + 'default' => 'dhtmltextarea' +); + + $i++; -$modversion['config'][$i]['name'] = 'form_optionsuser'; -$modversion['config'][$i]['title'] = '_MI_WFL_EDITORUSER'; -$modversion['config'][$i]['description'] = '_MI_WFL_EDITORCHOICEUSER'; -$modversion['config'][$i]['formtype'] = 'select'; -$modversion['config'][$i]['valuetype'] = 'text'; -$modversion['config'][$i]['default'] = 'dhtml'; -$modversion['config'][$i]['options'] = array( _MI_WFL_FORM_DHTML => 'dhtml', - _MI_WFL_FORM_DHTMLEXT => 'dhtmlext', - _MI_WFL_FORM_COMPACT => 'textarea', - _MI_WFL_FORM_HTMLAREA => 'htmlarea', - _MI_WFL_FORM_KOIVI => 'koivi', - _MI_WFL_FORM_FCK => 'fck', - _MI_WFL_FORM_TINYEDITOR => 'tinyeditor', - _MI_WFL_FORM_TINYMCE => 'tinymce' - ); +$modversion['config'][$i] = array( + 'name' => 'form_optionsuser', + 'title' => '_MI_WFL_EDITORUSER', + 'description' => '_MI_WFL_EDITORCHOICEUSER', + 'formtype' => 'select', + 'valuetype' => 'text', + 'options' => $editorList, + 'default' => 'dhtmltextarea' +); + $i++; $modversion['config'][$i]['name'] = 'screenshot'; $modversion['config'][$i]['title'] = '_MI_WFL_USESHOTS'; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <be...@us...> - 2012-06-26 09:34:20
|
Revision: 9723 http://xoops.svn.sourceforge.net/xoops/?rev=9723&view=rev Author: beckmi Date: 2012-06-26 09:34:10 +0000 (Tue, 26 Jun 2012) Log Message: ----------- fixing deprecated xoops_getLinkedUnameFromId() Modified Paths: -------------- XoopsModules/wflink/trunk/htdocs/modules/wflinks/admin/main.php XoopsModules/wflink/trunk/htdocs/modules/wflinks/admin/modifications.php XoopsModules/wflink/trunk/htdocs/modules/wflinks/admin/newlinks.php XoopsModules/wflink/trunk/htdocs/modules/wflinks/brokenlink.php XoopsModules/wflink/trunk/htdocs/modules/wflinks/docs/changelog.txt XoopsModules/wflink/trunk/htdocs/modules/wflinks/include/functions.php XoopsModules/wflink/trunk/htdocs/modules/wflinks/include/linkloadinfo.php Modified: XoopsModules/wflink/trunk/htdocs/modules/wflinks/admin/main.php =================================================================== --- XoopsModules/wflink/trunk/htdocs/modules/wflinks/admin/main.php 2012-06-26 02:30:10 UTC (rev 9722) +++ XoopsModules/wflink/trunk/htdocs/modules/wflinks/admin/main.php 2012-06-26 09:34:10 UTC (rev 9723) @@ -62,6 +62,7 @@ include 'admin_header.php'; xoops_cp_header(); + xoops_load('XoopsUserUtility'); //wfl_adminmenu( _AM_WFL_MLINKS ); if ( $lid > 0 ) { @@ -71,7 +72,7 @@ <td width='33%' valign='top'> <div><b>" . _AM_WFL_LINK_ID . " </b>" . $lid . "</div> <div><b>" . _AM_WFL_MINDEX_SUBMITTED . ": </b>" . formatTimestamp( $link_array['date'], $xoopsModuleConfig['dateformat'] ) . "</div> - <div><b>" . _AM_WFL_LINK_SUBMITTER . " </b>" . xoops_getLinkedUnameFromId( $submitter ) . "</div> + <div><b>" . _AM_WFL_LINK_SUBMITTER . " </b>" . XoopsUserUtility::getUnameFromId( $submitter ) . "</div> <div><b>" . _AM_WFL_LINK_IP . " </b>" . $ipaddress . "</div> <div><b>" . _AM_WFL_PAGERANK . " </b>" . pagerank($link_array['url']) . "</div> <div><b>" . _AM_WFL_HITS . " </b>" . $link_array['hits'] . "</div> @@ -427,7 +428,7 @@ $cid = $published['cid']; $title = "<a href='../singlelink.php?cid=" . $published['cid'] . "&lid=" . $published['lid'] . "'>" . $wfmyts -> htmlSpecialCharsStrip( trim( $published['title'] ) ) . "</a>";; $maintitle = urlencode( $wfmyts -> htmlSpecialChars( trim( $published['title'] ) ) ); - $submitter = xoops_getLinkedUnameFromId( $published['submitter'] ); + $submitter = XoopsUserUtility::getUnameFromId( $published['submitter'] ); $publish = formatTimestamp( $published['published'], $xoopsModuleConfig['dateformatadmin'] ); $status = ( $published['published'] > 0 ) ? $imagearray['online'] : "<a href='newlinks.php'>" . $imagearray['offline'] . "</a>"; $icon = "<a href='main.php?op=edit&lid=" . $lid . "'>" . $imagearray['editimg'] . "</a> "; Modified: XoopsModules/wflink/trunk/htdocs/modules/wflinks/admin/modifications.php =================================================================== --- XoopsModules/wflink/trunk/htdocs/modules/wflinks/admin/modifications.php 2012-06-26 02:30:10 UTC (rev 9722) +++ XoopsModules/wflink/trunk/htdocs/modules/wflinks/admin/modifications.php 2012-06-26 09:34:10 UTC (rev 9723) @@ -12,7 +12,7 @@ include 'admin_header.php'; global $mytree, $xoopsModuleConfig; - +xoops_load('XoopsUserUtility'); $op = wfl_cleanRequestVars( $_REQUEST, 'op', '' ); $requestid = wfl_cleanRequestVars( $_REQUEST, 'requestid', 0 ); @@ -31,7 +31,7 @@ unset( $sql ); $orig_user = new XoopsUser( $orig_array['submitter'] ); - $submittername = xoops_getLinkedUnameFromId( $orig_array['submitter'] ); + $submittername = XoopsUserUtility::getUnameFromId( $orig_array['submitter'] ); $submitteremail = $orig_user -> getUnameFromId( "email" ); echo "<div><b>" . _AM_WFL_MOD_MODPOSTER . "</b> $submittername</div>"; @@ -70,7 +70,7 @@ $sform -> display(); $orig_user = new XoopsUser( $mod_array['modifysubmitter'] ); - $submittername = xoops_getLinkedUnameFromId( $mod_array['modifysubmitter'] ); + $submittername = XoopsUserUtility::getUnameFromId( $mod_array['modifysubmitter'] ); $submitteremail = $orig_user -> getUnameFromId( "email" ); echo "<div><b>" . _AM_WFL_MOD_MODIFYSUBMITTER . "</b> $submittername</div>"; @@ -196,7 +196,7 @@ $path = str_replace( "/", "", $path ); $path = str_replace( ":", "", trim( $path ) ); $title = trim( $path ); - $submitter = xoops_getLinkedUnameFromId( $link_arr['modifysubmitter'] );; + $submitter = XoopsUserUtility::getUnameFromId( $link_arr['modifysubmitter'] );; $requestdate = formatTimestamp( $link_arr['requestdate'], $xoopsModuleConfig['dateformatadmin'] ); echo "<tr style='text-align: center;'>\n"; Modified: XoopsModules/wflink/trunk/htdocs/modules/wflinks/admin/newlinks.php =================================================================== --- XoopsModules/wflink/trunk/htdocs/modules/wflinks/admin/newlinks.php 2012-06-26 02:30:10 UTC (rev 9722) +++ XoopsModules/wflink/trunk/htdocs/modules/wflinks/admin/newlinks.php 2012-06-26 09:34:10 UTC (rev 9723) @@ -56,7 +56,7 @@ default: global $xoopsModuleConfig; - + xoops_load('XoopsUserUtility'); $start = wfl_cleanRequestVars( $_REQUEST, 'start', 0 ); $sql = "SELECT * FROM " . $xoopsDB -> prefix( 'wflinks_links' ) . " WHERE published = 0 ORDER BY lid DESC" ; if ( !$result = $xoopsDB -> query( $sql ) ) { @@ -92,7 +92,7 @@ $title = $wfmyts -> htmlSpecialCharsStrip( $new['title'] ); $url = urldecode( $wfmyts -> htmlSpecialCharsStrip( $new['url'] ) ); $logourl = $wfmyts -> htmlSpecialCharsStrip( $new['screenshot'] ); - $submitter = xoops_getLinkedUnameFromId( $new['submitter'] ); + $submitter = XoopsUserUtility::getUnameFromId( $new['submitter'] ); $datetime = formatTimestamp( $new['date'], $xoopsModuleConfig['dateformatadmin'] ); $icon = ( $new['published'] ) ? $approved : "<a href='newlinks.php?op=approve&lid=" . $lid . "'>" . $imagearray['approve'] . "</a> "; Modified: XoopsModules/wflink/trunk/htdocs/modules/wflinks/brokenlink.php =================================================================== --- XoopsModules/wflink/trunk/htdocs/modules/wflinks/brokenlink.php 2012-06-26 02:30:10 UTC (rev 9722) +++ XoopsModules/wflink/trunk/htdocs/modules/wflinks/brokenlink.php 2012-06-26 09:34:10 UTC (rev 9723) @@ -89,6 +89,7 @@ $xoopsOption['template_main'] = 'wflinks_brokenlink.html'; include XOOPS_ROOT_PATH . '/header.php'; + xoops_load('XoopsUserUtility'); $catarray['imageheader'] = wfl_imageheader(); $catarray['letters'] = wfl_letters(); @@ -105,7 +106,7 @@ if ( is_array( $broke_arr ) ) { $broken['title'] = $wfmyts -> htmlSpecialCharsStrip( $link_arr['title'] ); $broken['id'] = $broke_arr['reportid']; - $broken['reporter'] = xoops_getLinkedUnameFromId( $broke_arr['sender'] ); + $broken['reporter'] = XoopsUserUtility::getUnameFromId( $broke_arr['sender'] ); $broken['date'] = formatTimestamp( $broke_arr['date'], $xoopsModuleConfig['dateformat'] ); $broken['acknowledged'] = ( $broke_arr['acknowledged'] == 1 ) ? _YES : _NO ; $broken['confirmed'] = ( $broke_arr['confirmed'] == 1 ) ? _YES : _NO ; @@ -122,7 +123,7 @@ $time = ( $link_arr['published'] > 0 ) ? $link_arr['published'] : $link_arr['updated']; $link['updated'] = formatTimestamp( $time, $xoopsModuleConfig['dateformat'] ); $is_updated = ( $link_arr['updated'] != 0 ) ? _MD_WFL_UPDATEDON : _MD_WFL_SUBMITDATE; - $link['publisher'] = xoops_getLinkedUnameFromId($link_arr['submitter'] ); + $link['publisher'] = XoopsUserUtility::getUnameFromId($link_arr['submitter'] ); $xoopsTpl -> assign( 'link_id', intval($lid) ); $xoopsTpl -> assign( 'lang_subdate' , $is_updated ); Modified: XoopsModules/wflink/trunk/htdocs/modules/wflinks/docs/changelog.txt =================================================================== --- XoopsModules/wflink/trunk/htdocs/modules/wflinks/docs/changelog.txt 2012-06-26 02:30:10 UTC (rev 9722) +++ XoopsModules/wflink/trunk/htdocs/modules/wflinks/docs/changelog.txt 2012-06-26 09:34:10 UTC (rev 9723) @@ -4,7 +4,7 @@ - changed editor list selection to dynamic (mamba) - replace http://mozshot.nemui.org with http://open.thumbshots.org for screenshots (Shine) -- fixed bug related to $wfmyts constructor overriding +- fixed bug related to $wfmyts constructor overriding (mamba) ========================================================= 24-06-2012 1.09 Beta 1 Modified: XoopsModules/wflink/trunk/htdocs/modules/wflinks/include/functions.php =================================================================== --- XoopsModules/wflink/trunk/htdocs/modules/wflinks/include/functions.php 2012-06-26 02:30:10 UTC (rev 9722) +++ XoopsModules/wflink/trunk/htdocs/modules/wflinks/include/functions.php 2012-06-26 09:34:10 UTC (rev 9723) @@ -778,14 +778,14 @@ function wfl_linklistbody( $published ) { global $wfmyts, $imagearray, $xoopsModuleConfig, $xoopsModule; - + xoops_load('XoopsUserUtility'); $lid = $published['lid']; $cid = $published['cid']; $title = "<a href='../singlelink.php?cid=" . $published['cid'] . "&lid=" . $published['lid'] . "'>" . $wfmyts -> htmlSpecialCharsStrip( trim( $published['title'] ) ) . "</a>";; $maintitle = urlencode( $wfmyts -> htmlSpecialChars( trim( $published['title'] ) ) ); $cattitle = wfl_cattitle($published['cid']); - $submitter = xoops_getLinkedUnameFromId( $published['submitter'] ); + $submitter = XoopsUserUtility::getUnameFromId( $published['submitter'] ); $hwhoisurl = str_replace( 'http://', '', $published['url']); $submitted = formatTimestamp( $published['date'], $xoopsModuleConfig['dateformat'] ); $publish = ( $published['published'] > 0 ) ? formatTimestamp( $published['published'], $xoopsModuleConfig['dateformatadmin'] ): 'Not Published'; Modified: XoopsModules/wflink/trunk/htdocs/modules/wflinks/include/linkloadinfo.php =================================================================== --- XoopsModules/wflink/trunk/htdocs/modules/wflinks/include/linkloadinfo.php 2012-06-26 02:30:10 UTC (rev 9722) +++ XoopsModules/wflink/trunk/htdocs/modules/wflinks/include/linkloadinfo.php 2012-06-26 09:34:10 UTC (rev 9723) @@ -73,8 +73,8 @@ $description = $wfmyts -> displayTarea( $link_arr['description'], 1, 1, 1, 1, 1 ); $link['description'] = xoops_substr( $description, 0, $xoopsModuleConfig['totalchars'], '...' ); - -$link['submitter'] = xoops_getLinkedUnameFromId( $link_arr['submitter'] ); +xoops_load('XoopsUserUtility'); +$link['submitter'] = XoopsUserUtility::getUnameFromId( $link_arr['submitter'] ); $link['publisher'] = ( isset( $link_arr['publisher'] ) && !empty( $link_arr['publisher'] ) ) ? $wfmyts -> htmlSpecialCharsStrip( $link_arr['publisher'] ) : _MD_WFL_NOTSPECIFIED; $country = $link_arr['country']; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |