Fix printf/sprintf mixups.

8 files changed, 14 insertions, 14 deletions

diff --git a/usr/local/www/pkg_mgr_settings.php b/usr/local/www/pkg_mgr_settings.php
index 650a4ab..99bf636 100644
--- a/usr/local/www/pkg_mgr_settings.php
+++ b/usr/local/www/pkg_mgr_settings.php
@@ -109,7 +109,7 @@ function enable_altpkgrepourl(enable_over) {
 			<tr><td><?=gettext("Base URL");?>:</td><td><input name="pkgrepourl" type="input" class="formfld url" id="pkgrepourl" size="64" value="<?php if($curcfg['xmlrpcbaseurl']) echo $curcfg['xmlrpcbaseurl']; else echo $g['']; ?>"></td></tr>
 			</table>
 			<span class="vexpl">
-				<?=sprintf(gettext("This is where %s will check for packages when the"),$g['product_name']);?>, <a href="pkg_mgr.php"><?=gettext("System: Packages");?></a> <?=gettext("page is viewed");?>.
+				<?=printf(gettext("This is where %s will check for packages when the"),$g['product_name']);?>, <a href="pkg_mgr.php"><?=gettext("System: Packages");?></a> <?=gettext("page is viewed");?>.
 				</span>
 				</td>
 	</tr>
diff --git a/usr/local/www/services_captiveportal_vouchers_edit.php b/usr/local/www/services_captiveportal_vouchers_edit.php
index 932837e..bd9ad73 100644
--- a/usr/local/www/services_captiveportal_vouchers_edit.php
+++ b/usr/local/www/services_captiveportal_vouchers_edit.php
@@ -116,7 +116,7 @@ if ($_POST) {
             $rollent['active'] = array();
             voucher_write_used_db($rollent['number'], $rollent['used']);
             voucher_write_active_db($rollent['number'], array());   // create empty DB
-            voucher_log(LOG_INFO,printf(gettext("All %s vouchers from Roll %s marked unused"), $rollent['count'], $rollent['number']));
+            voucher_log(LOG_INFO,sprintf(gettext("All %s vouchers from Roll %s marked unused"), $rollent['count'], $rollent['number']));
         } else {
             // existing roll has been modified but without changing the count
             // read active and used DB from ramdisk and store it in XML config
diff --git a/usr/local/www/services_dhcp.php b/usr/local/www/services_dhcp.php
index dd64b82..3a0502c 100755
--- a/usr/local/www/services_dhcp.php
+++ b/usr/local/www/services_dhcp.php
@@ -248,7 +248,7 @@ if ($_POST) {
 			foreach($config['virtualip']['vip'] as $vip) {
 				if($vip['interface'] == $if)
 					if($vip['subnet'] && is_inrange($vip['subnet'], $_POST['range_from'], $_POST['range_to']))
-						$input_errors[] = printf(gettext("The subnet range cannot overlap with virtual IP address %s."),$vip['subnet']);
+						$input_errors[] = sprintf(gettext("The subnet range cannot overlap with virtual IP address %s."),$vip['subnet']);
 			}
 		}
 
@@ -274,7 +274,7 @@ if ($_POST) {
 
 			/* make sure that the DHCP Relay isn't enabled on this interface */
 			if (isset($config['dhcrelay'][$if]['enable']))
-				$input_errors[] = printf(gettext("You must disable the DHCP relay on the %s interface before enabling the DHCP server."),$iflist[$if]);
+				$input_errors[] = sprintf(gettext("You must disable the DHCP relay on the %s interface before enabling the DHCP server."),$iflist[$if]);
 		}
 	}
 
diff --git a/usr/local/www/status_rrd_graph_img.php b/usr/local/www/status_rrd_graph_img.php
index bc974b1..6414a9c 100644
--- a/usr/local/www/status_rrd_graph_img.php
+++ b/usr/local/www/status_rrd_graph_img.php
@@ -189,7 +189,7 @@ $rrdcolors = "./themes/{$g['theme']}/rrdcolors.inc.php";
 if(file_exists($rrdcolors)) {
 	include($rrdcolors);
 } else {
-	log_error(printf(gettext("rrdcolors.inc.php for theme %s does not exist, using defaults!"),$g['theme']));
+	log_error(sprintf(gettext("rrdcolors.inc.php for theme %s does not exist, using defaults!"),$g['theme']));
 	$colortrafficup = array("666666", "CCCCCC");
 	$colortrafficdown = array("990000", "CC0000");
 	$colorpacketsup = array("666666", "CCCCCC");
@@ -910,7 +910,7 @@ elseif((strstr($curdatabase, "-cellular.rrd")) && (file_exists("$rrddbpath$curda
 }
 else {
 	$data = false;
-	log_error(printf(gettext("Sorry we do not have data to graph for %s"),$curdatabase));
+	log_error(sprintf(gettext("Sorry we do not have data to graph for %s"),$curdatabase));
 } 
 
 /* check modification time to see if we need to generate image */
@@ -930,16 +930,16 @@ if (file_exists("$rrdtmppath$curdatabase-$curgraph.png")) {
 		usleep(500);
 }
 if(($graphcmdreturn <> 0) || (! $data)) {
-	log_error(printf(gettext("Failed to create graph with error code %s, the error is: %s"),$graphcmdreturn,$graphcmdoutput));
+	log_error(sprintf(gettext("Failed to create graph with error code %s, the error is: %s"),$graphcmdreturn,$graphcmdoutput));
 	if(strstr($curdatabase, "queues")) {
-		log_error(printf(gettext("failed to create graph from %s%s, removing database"),$rrddbpath,$curdatabase));
+		log_error(sprintf(gettext("failed to create graph from %s%s, removing database"),$rrddbpath,$curdatabase));
 		exec("/bin/rm -f $rrddbpath$curif$queues");
 		flush();
 		usleep(500);
 		enable_rrd_graphing();
 	}
 	if(strstr($curdatabase, "queuesdrop")) {
-		log_error(printf(gettext("failed to create graph from %s%s, removing database"),$rrddbpath,$curdatabase));
+		log_error(sprintf(gettext("failed to create graph from %s%s, removing database"),$rrddbpath,$curdatabase));
 		exec("/bin/rm -f $rrddbpath$curdatabase");
 		flush();
 		usleep(500);
diff --git a/usr/local/www/system.php b/usr/local/www/system.php
index 69a8f70..a9f55a5 100755
--- a/usr/local/www/system.php
+++ b/usr/local/www/system.php
@@ -334,7 +334,7 @@ include("head.inc");
 								<?=gettext("Allow DNS server list to be overridden by DHCP/PPP on WAN"); ?>
 							</strong>
 							<br/>
-							<?php sprintf(gettext("If this option is set, '%s' will " .
+							<?php printf(gettext("If this option is set, '%s' will " .
 							"use DNS servers assigned by a DHCP/PPP server on WAN " .
 							"for its own purposes (including the DNS forwarder). " .
 							"However, they will not be assigned to DHCP and PPTP " .
diff --git a/usr/local/www/system_advanced_admin.php b/usr/local/www/system_advanced_admin.php
index e0e69a2..b8af888 100644
--- a/usr/local/www/system_advanced_admin.php
+++ b/usr/local/www/system_advanced_admin.php
@@ -325,7 +325,7 @@ function prot_change() {
 									<input name="noantilockout" type="checkbox" id="noantilockout" value="yes" <?php if ($pconfig['noantilockout']) echo "checked"; ?> />
 									<strong><?=gettext("Disable webConfigurator anti-lockout rule"); ?></strong>
 									<br/>
-									<?php sprintf(gettext("When this is unchecked, access to the webConfigurator " .
+									<?php printf(gettext("When this is unchecked, access to the webConfigurator " .
 									"on the %s interface is always permitted, regardless of the user-defined firewall " .
 									"rule set. Check this box to disable this automatically added rule, so access " .
 									"to the webConfigurator is controlled by the user-defined firewall rules " .
diff --git a/usr/local/www/wizard.php b/usr/local/www/wizard.php
index 0f2c319..66ea9ea 100755
--- a/usr/local/www/wizard.php
+++ b/usr/local/www/wizard.php
@@ -74,7 +74,7 @@ if(empty($xml)) {
 }
 
 if (!is_array($pkg)) {
-	print_info_box_np(printf(gettext("ERROR: Could not parse %s/wizards/%s file."),$g['www_path'],$xml));
+	print_info_box_np(sprintf(gettext("ERROR: Could not parse %s/wizards/%s file."),$g['www_path'],$xml));
 	die;
 }
 
diff --git a/usr/local/www/xmlrpc.php b/usr/local/www/xmlrpc.php
index 950469c..d7b7e88 100755
--- a/usr/local/www/xmlrpc.php
+++ b/usr/local/www/xmlrpc.php
@@ -158,7 +158,7 @@ function restore_config_section_xmlrpc($raw_params) {
 	if(!xmlrpc_auth($params)) return $xmlrpc_g['return']['authfail'];
 	$config = array_merge($config, $params[0]);
 	$mergedkeys = implode(",", array_keys($params[0]));
-	write_config(printf(gettext("Merged in config (%s sections) from XMLRPC client."),$mergedkeys));
+	write_config(sprintf(gettext("Merged in config (%s sections) from XMLRPC client."),$mergedkeys));
 	return $xmlrpc_g['return']['true'];
 }
 
@@ -181,7 +181,7 @@ function merge_installedpackages_section_xmlrpc($raw_params) {
 	if(!xmlrpc_auth($params)) return $xmlrpc_g['return']['authfail'];
 	$config['installedpackages'] = array_merge($config['installedpackages'], $params[0]);
 	$mergedkeys = implode(",", array_keys($params[0]));
-	write_config(printf(gettext("Merged in config (%s sections) from XMLRPC client."),$mergedkeys));
+	write_config(sprintf(gettext("Merged in config (%s sections) from XMLRPC client."),$mergedkeys));
 	return $xmlrpc_g['return']['true'];
 }