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. |