[Weberp-svn] SF.net SVN: weberp:[9570] trunk
Brought to you by:
sotandeka,
tim_schofield
Menu
▾
▴
[Weberp-svn] SF.net SVN: weberp:[9570] trunk
|
From: <tim...@us...> - 2012-08-27 12:33:08
|
Revision: 9570
http://weberp.svn.sourceforge.net/weberp/?rev=9570&view=rev
Author: tim_schofield
Date: 2012-08-27 12:32:57 +0000 (Mon, 27 Aug 2012)
Log Message:
-----------
Replace <a tags with new InternalLink() function
Modified Paths:
--------------
trunk/FTP_RadioBeacon.php
trunk/FixedAssetCategories.php
trunk/FixedAssetDepreciation.php
trunk/FixedAssetItems.php
trunk/FixedAssetLocations.php
trunk/FreightCosts.php
trunk/GeocodeSetup.php
Modified: trunk/FTP_RadioBeacon.php
===================================================================
--- trunk/FTP_RadioBeacon.php 2012-08-27 11:17:24 UTC (rev 9569)
+++ trunk/FTP_RadioBeacon.php 2012-08-27 12:32:57 UTC (rev 9570)
@@ -79,48 +79,27 @@
$ModifyPage = $rootpath . 'SelectOrderItems.php?&ModifyOrderNumber=' . $myrow['orderno'];
if ($myrow['printedpackingslip'] ==1){
- printf('<td><font size="2"><a href="%s">%s</a></font></td>
+ echo '<td><font size="2">' . InternalLink('', $ModifyPage, $myrow['orderno']) . '</font></td>
<td><font color="red" size="2">' . _('Already') . '<br />' . _('Sent') . '</font></td>
- <td><font size="2">%s</font></td>
- <td><font size="2">%s</font></td>
- <td><font size="2">%s</font></td>
- <td><font size="2">%s</font></td>
- <td><font size="2">%s</font></td>
- <td><font size="2">%s</font></td>
- <td class="number"><font size="2">%s</font></td>
- <td><font size="2">%s</font></td></tr>',
- $ModifyPage,
- $myrow['orderno'],
- $myrow['name'],
- $myrow['brname'],
- $myrow['customerref'],
- $FormatedOrderDate,
- $FormatedDelDate,
- $myrow['deliverto'],
- $FormatedOrderValue,
- $FormatedDateLastSent);
+ <td><font size="2">' . $myrow['name'] . '</font></td>
+ <td><font size="2">' . $myrow['brname'] . '</font></td>
+ <td><font size="2">' . $myrow['customerref'] . '</font></td>
+ <td><font size="2">' . $FormatedOrderDate . '</font></td>
+ <td><font size="2">' . $FormatedDelDate . '</font></td>
+ <td><font size="2">' . $myrow['deliverto'] . '</font></td>
+ <td class="number"><font size="2">' . $FormatedOrderValue . '</font></td>
+ <td><font size="2">' . $FormatedDateLastSent . '</font></td></tr>';
} else {
- printf('<td><font size="2"><a href="%s">%s</a></font></td>
- <td><font size="2"><a href="%s">' . _('Send') . '</a></font></td>
- <td><font size="2">%s</font></td>
- <td><font size="2">%s</font></td>
- <td><font size="2">%s</font></td>
- <td><font size="2">%s</font></td>
- <td><font size="2">%s</font></td>
- <td><font size="2">%s</font></td>
- <td class="number"><font size="2">%s</font></td>
- <td><font size="2">%s</font></td></tr>',
- $ModifyPage,
- $myrow['orderno'],
- $FTPDispatchNote,
- $myrow['name'],
- $myrow['brname'],
- $myrow['customerref'],
- $FormatedOrderDate,
- $FormatedDelDate,
- $myrow['deliverto'],
- $FormatedOrderValue,
- $FormatedDateLastSent);
+ echo '<td><font size="2">' . InternalLink('', $ModifyPage, $myrow['orderno']) . '</font></td>
+ <td><font size="2">' . InternalLink('', $FTPDispatchNote, _('Send')) . '</font></td>
+ <td><font size="2">' . $myrow['name'] . '</font></td>
+ <td><font size="2">' . $myrow['brname'] . '</font></td>
+ <td><font size="2">' . $myrow['customerref'] . '</font></td>
+ <td><font size="2">' . $FormatedOrderDate . '</font></td>
+ <td><font size="2">' . $FormatedDelDate . '</font></td>
+ <td><font size="2">' . $myrow['deliverto'] . '</font></td>
+ <td class="number"><font size="2">' . $FormatedOrderValue . '</font></td>
+ <td><font size="2">' . $FormatedDateLastSent . '</font></td></tr>';
}
$j++;
if ($j == 12){
@@ -183,9 +162,8 @@
$myrow = DB_fetch_array($result);
if ($myrow['printedpackingslip']==1){
prnMsg(_('Order Number') . ' ' . $_GET['OrderNo'] . ' ' . _('has previously been sent to Radio Beacon') . '. ' . _('It was sent on') . ' ' . ConvertSQLDate($myrow['datepackingslipprinted']) . '<br />' . _('To re-send the order with the balance not previously dispatched and invoiced the order must be modified to allow a reprint (or re-send)') . '.<br />' . _('This check is there to ensure that duplication of dispatches to the customer are avoided'),'warn');
- echo '<p><a href="'.$rootpath.'/SelectOrderItems.php?ModifyOrderNumber=' . $_GET['OrderNo'] . '">' .
- _('Modify the order to allow a re-send or reprint') . ' (' . _('Select Delivery Details') . ')' . '</a></p>';
- echo '<p><a href="'.$rootpath.'/index.php">' . _('Back to the menu') . '</a></p>';
+ echo '<p>' . InternalLink($rootpath, 'SelectOrderItems.php?ModifyOrderNumber=' . $_GET['OrderNo'], _('Modify the order to allow a re-send or reprint') . ' (' . _('Select Delivery Details') . ')' ) . '</p>';
+ echo '<p>' . InternalLink($rootpath, 'index.php', _('Back to the menu')) . '</p>';
include('includes/footer.inc');
exit;
}
Modified: trunk/FixedAssetCategories.php
===================================================================
--- trunk/FixedAssetCategories.php 2012-08-27 11:17:24 UTC (rev 9569)
+++ trunk/FixedAssetCategories.php 2012-08-27 12:32:57 UTC (rev 9570)
@@ -172,31 +172,21 @@
echo '<tr class="OddTableRows">';
$k=1;
}
- printf('<td>%s</td>
- <td>%s</td>
- <td class="number">%s</td>
- <td class="number">%s</td>
- <td class="number">%s</td>
- <td class="number">%s</td>
- <td><a href="%sSelectedCategory=%s">' . _('Edit') . '</a></td>
- <td><a href="%sSelectedCategory=%s&delete=yes" onclick="return confirm(\'' . _('Are you sure you wish to delete this fixed asset category? Additional checks will be performed before actual deletion to ensure data integrity is not compromised.') . '\');">' . _('Delete') . '</a></td>
- </tr>',
- $myrow['categoryid'],
- $myrow['categorydescription'],
- $myrow['costact'],
- $myrow['depnact'],
- $myrow['disposalact'],
- $myrow['accumdepnact'],
- htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '?',
- $myrow['categoryid'],
- htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '?',
- $myrow['categoryid']);
+ echo '<td>' . $myrow['categoryid'] . '</td>
+ <td>' . $myrow['depnact'] . '</td>
+ <td class="number">' . $myrow['categorydescription'] . '</td>
+ <td class="number">' . $myrow['costact'] . '</td>
+ <td class="number">' . $myrow['disposalact'] . '</td>
+ <td class="number">' . $myrow['accumdepnact'] . '</td>
+ <td>' . InternalLink('', htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '?SelectedCategory=' . $myrow['categoryid'], _('Edit')) . '</td>
+ <td>' . InternalLink('', htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '?SelectedCategory=' . $myrow['categoryid'] . '&delete=yes', _('Delete')) . '</td>
+ </tr>';
}
//END WHILE LIST LOOP
- } // End DB_num_rows() check.
- else {
- echo '<tr><td style="text-align:center;" colspan="0">' . _('No Fixed Asset Categories Found') . '</td></tr>';
- }
+ } // End DB_num_rows() check.
+ else {
+ echo '<tr><td style="text-align:center;" colspan="0">' . _('No Fixed Asset Categories Found') . '</td></tr>';
+ }
echo '</table>';
}
@@ -204,7 +194,7 @@
//end of ifs and buts!
if (isset($SelectedCategory)) {
- echo '<br /><div class="centre"><a href="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '">' ._('Show All Fixed Asset Categories') . '</a></div><br />';
+ echo '<br /><div class="centre">' . InternalLink('', htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8'), _('Show All Fixed Asset Categories')) . '</div><br />';
}
echo '<form onsubmit="return SubmitForm(this, \'\')" name="CategoryForm" method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '">';
Modified: trunk/FixedAssetDepreciation.php
===================================================================
--- trunk/FixedAssetDepreciation.php 2012-08-27 11:17:24 UTC (rev 9569)
+++ trunk/FixedAssetDepreciation.php 2012-08-27 12:32:57 UTC (rev 9570)
@@ -260,7 +260,7 @@
$result = DB_Txn_Commit($db);
prnMsg(_('Depreciation') . ' ' . $TransNo . ' ' . _('has been successfully entered'),'success');
unset($_POST['ProcessDate']);
- echo '<br /><a href="index.php' . '">' ._('Return to main menu').'</a>';
+ echo '<br />' . InternalLink('', 'index.php', _('Return to main menu'));
/*And post the journal too */
include ('includes/GLPostings.inc');
} else {
Modified: trunk/FixedAssetItems.php
===================================================================
--- trunk/FixedAssetItems.php 2012-08-27 11:17:24 UTC (rev 9569)
+++ trunk/FixedAssetItems.php 2012-08-27 12:32:57 UTC (rev 9570)
@@ -7,7 +7,7 @@
include('includes/header.inc');
include('includes/SQL_CommonFunctions.inc');
-echo '<a href="' . $rootpath . '/SelectAsset.php">' . _('Back to Select') . '</a><br />' . "\n";
+echo InternalLink($rootpath, 'SelectAsset.php', _('Back to Select')) . '<br />' . "\n";
echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/money_add.png" title="' . _('Fixed Asset Items') . '" alt="" />' . ' ' . $title . '</p>';
@@ -61,7 +61,7 @@
if ($UploadTheFile=='Yes'){
$result = move_uploaded_file($_FILES['ItemPicture']['tmp_name'], $filename);
- $message = ($result)?_('File url') ."<a href='". $filename ."'>" . $filename . '</a>' : _('Something is wrong with uploading a file');
+ $message = ($result)?_('File url') . InternalLink('', $filename, $filename) : _('Something is wrong with uploading a file');
}
/* EOR Add Image upload for New Item - by Ori */
}
@@ -504,7 +504,7 @@
}
$category=$myrow['categoryid'];
}
-echo '</select><a target="_blank" href="'. $rootpath . '/FixedAssetCategories.php">'.' ' . _('Add or Modify Asset Categories') . '</a></td></tr>';
+echo '</select>' . InternalLink($rootpath, 'FixedAssetCategories.php', ' ' . _('Add or Modify Asset Categories')) . '</td></tr>';
if (!isset($_POST['AssetCategoryID'])) {
$_POST['AssetCategoryID']=$category;
}
@@ -526,7 +526,7 @@
echo '<option value="' . $myrow['locationid'] .'">' . $myrow['locationdescription'] . '</option>';
}
}
- echo '</select><a target="_blank" href="'. $rootpath . '/FixedAssetLocations.php">'.' ' . _('Add Asset Location') . '</a></td></tr>';
+ echo '</select>'. InternalLink($rootpath, 'FixedAssetLocations.php', ' ' . _('Add Asset Location')) . '</td></tr>';
echo '<tr><td>' . _('Bar Code') . ':</td><td><input ' . (in_array('BarCode',$Errors) ? 'class="inputerror"' : '' ) .' type="text" name="BarCode" size="22" maxlength="20" value="' . $_POST['BarCode'] . '" /></td></tr>';
Modified: trunk/FixedAssetLocations.php
===================================================================
--- trunk/FixedAssetLocations.php 2012-08-27 11:17:24 UTC (rev 9569)
+++ trunk/FixedAssetLocations.php 2012-08-27 12:32:57 UTC (rev 9570)
@@ -103,7 +103,7 @@
$parentresult=DB_query($parentsql, $db);
$parentrow=DB_fetch_array($parentresult);
echo '<td>'.$parentrow['locationdescription'].'</td>';
- echo '<td><a href="'.htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '?SelectedLocation='.$myrow['locationid'].'">' . _('Edit') . '</td>';
+ echo '<td>' . InternalLink('', htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '?SelectedLocation='.$myrow['locationid'], _('Edit')) . '</td>';
}
echo '</table><br />';
Modified: trunk/FreightCosts.php
===================================================================
--- trunk/FreightCosts.php 2012-08-27 11:17:24 UTC (rev 9569)
+++ trunk/FreightCosts.php 2012-08-27 12:32:57 UTC (rev 9570)
@@ -227,30 +227,16 @@
}
- printf('<td>%s</td>
- <td class="number">%s</td>
- <td class="number">%s</td>
- <td class="number">%s</td>
- <td class="number">%s</td>
- <td class="number">%s</td>
- <td class="number">%s</td>
- <td><a href="%sSelectedFreightCost=%s&LocationFrom=%s&ShipperID=%s">' . _('Edit') . '</td>
- <td><a href="%sSelectedFreightCost=%s&LocationFrom=%s&ShipperID=%s&delete=yes">' . _('Delete') . '</td></tr>',
- $myrow[1],
- $myrow[2],
- $myrow[3],
- $myrow[4],
- $myrow[5],
- $myrow[6],
- $myrow[7],
- htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '?',
- $myrow[0],
- $LocationFrom,
- $ShipperID,
- htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '?',
- $myrow[0],
- $LocationFrom,
- $ShipperID);
+ echo '<td>' . $myrow[1] . '</td>
+ <td class="number">' . $myrow[2] . '</td>
+ <td class="number">' . $myrow[3] . '</td>
+ <td class="number">' . $myrow[4] . '</td>
+ <td class="number">' . $myrow[5] . '</td>
+ <td class="number">' . $myrow[6] . '</td>
+ <td class="number">' . $myrow[7] . '</td>
+ <td>' . InternalLink('', htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '?SelectedFreightCost=' . $myrow[0] . '&LocationFrom=' . $LocationFrom . '&ShipperID=' . $ShipperID, _('Edit')) . '</td>
+ <td>' . InternalLink('', htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '?SelectedFreightCost=' . $myrow[0] . '&LocationFrom=' . $LocationFrom . '&ShipperID=' . $ShipperID . '&delete=yes', _('Delete')) . '</td>
+ </tr>';
}
@@ -261,7 +247,7 @@
//end of ifs and buts!
if (isset($SelectedFreightCost)) {
- echo '<div class="centre"><a href="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '?LocationFrom=' . $LocationFrom . '&ShipperID=' . $ShipperID . '">' . _('Show all freight costs for') . ' ' . $ShipperName . ' ' . _('from') . ' ' . $LocationName . '</a></div>';
+ echo '<div class="centre">' . InternalLink('', htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '?LocationFrom=' . $LocationFrom . '&ShipperID=' . $ShipperID, _('Show all freight costs for') . ' ' . $ShipperName . ' ' . _('from') . ' ' . $LocationName) . '</div>';
}
if (isset($LocationFrom) AND isset($ShipperID)) {
Modified: trunk/GeocodeSetup.php
===================================================================
--- trunk/GeocodeSetup.php 2012-08-27 11:17:24 UTC (rev 9569)
+++ trunk/GeocodeSetup.php 2012-08-27 12:32:57 UTC (rev 9570)
@@ -137,7 +137,7 @@
echo '<div class="page_help_text">'. _('Get a google API key at ') .
ExternalLink('http://code.google.com/apis/maps/signup.html', 'http://code.google.com/apis/maps/signup.html') . '</div>';
echo '<br /><div class="page_help_text">'. _('Find the lat/long for your map center point at ') .
- ExternalLink('http://www.batchgeocode.com/lookup/', 'http://www.batchgeocode.com/lookup/' . '</div><br />';
+ ExternalLink('http://www.batchgeocode.com/lookup/', 'http://www.batchgeocode.com/lookup/') . '</div><br />';
prnMsg(_('Set the maps centre point using the Center Longitude and Center Latitude. Set the maps screen size using the height and width in pixels (px)'),'info');
echo '</div><br />';
echo '<table class="selection">';
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
