Clean up general.lib.php and ui.lib.php: remove unused functions, group related

functions, simplify implementation of some functions.

4 files changed, 13 insertions, 13 deletions

diff --git a/templates/show_debug.inc.php b/templates/show_debug.inc.php
index f575850f..38b978cb 100644
--- a/templates/show_debug.inc.php
+++ b/templates/show_debug.inc.php
@@ -59,7 +59,7 @@
 </tr>
 <tr class="<?php echo flip_class(); ?>">
 	<td><?php echo _('Safe Mode'); ?></td>
-	<td><?php echo print_boolean(ini_get('safe_mode')); ?></td>
+	<td><?php echo print_bool(ini_get('safe_mode')); ?></td>
 </tr>
 <tr class="<?php echo flip_class(); ?>">
 	<td>Open Basedir</td>
@@ -67,19 +67,19 @@
 </tr>
 <tr class="<?php echo flip_class(); ?>">
 	<td><?php echo _('Zlib Support'); ?></td>
-	<td><?php echo print_boolean(function_exists('gzcompress')); ?></td>
+	<td><?php echo print_bool(function_exists('gzcompress')); ?></td>
 </tr>
 <tr class="<?php echo flip_class(); ?>">
 	<td><?php echo _('GD Support'); ?></td>
-	<td><?php echo print_boolean(function_exists('ImageCreateFromString')); ?></td>
+	<td><?php echo print_bool(function_exists('ImageCreateFromString')); ?></td>
 </tr>
 <tr class="<?php echo flip_class(); ?>">
 	<td><?php echo _('Iconv Support'); ?></td>
-	<td><?php echo print_boolean(function_exists('iconv')); ?></td>
+	<td><?php echo print_bool(function_exists('iconv')); ?></td>
 </tr>
 <tr class="<?php echo flip_class(); ?>">
 	<td><?php echo _('Gettext Support'); ?></td>
-	<td><?php echo print_boolean(function_exists('bindtextdomain')); ?></td>
+	<td><?php echo print_bool(function_exists('bindtextdomain')); ?></td>
 </tr>
 </table>
 <?php show_box_bottom(); ?>
@@ -104,7 +104,7 @@
 		$value = $string;
 	}
 	if (Preference::is_boolean($key)) {
-		$value = print_boolean($value);
+		$value = print_bool($value);
 	}
 ?>
 <tr class="<?php echo flip_class(); ?>">
diff --git a/templates/show_install_check.inc.php b/templates/show_install_check.inc.php
index db67fdc2..08952496 100644
--- a/templates/show_install_check.inc.php
+++ b/templates/show_install_check.inc.php
@@ -20,7 +20,7 @@
  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 ?>
-<?php if (INSTALL != '1') { exit; } ?>
+<?php if (!defined('INSTALL')) { exit; } ?>
 <h4><?php echo _('Required'); ?></h4>
 <table border="0" cellspacing="0" cellpadding="3">
 <tr>
@@ -49,7 +49,7 @@
 		else {
 			$version_string = phpversion() . " ";
 		}
-		$string = $version_string . _('Hash Function Exists') . " " . print_boolean(function_exists('hash_algos')) . " " . _('SHA256 Support') . " " . print_boolean(in_array('sha256',$algos));
+		$string = $version_string . _('Hash Function Exists') . " " . print_bool(function_exists('hash_algos')) . " " . _('SHA256 Support') . " " . print_bool(in_array('sha256',$algos));
 		echo debug_result($string,false);
 		Error::add('install',_('PHP Version'));
 	}
diff --git a/templates/show_localplay_status.inc.php b/templates/show_localplay_status.inc.php
index 3117efc1..173d9124 100644
--- a/templates/show_localplay_status.inc.php
+++ b/templates/show_localplay_status.inc.php
@@ -35,13 +35,13 @@ $now_playing = $status['track_title'] ? $status['track_title'] . ' - ' . $status
 <?php echo _('Volume'); ?>:<?php echo $status['volume']; ?>%
 </li>
 <li>
-	<?php echo print_boolean($status['repeat']); ?> |
-	<?php echo Ajax::text('?page=localplay&action=repeat&value=' . invert_boolean($status['repeat']),print_boolean(invert_boolean($status['repeat'])),'localplay_repeat'); ?>
+	<?php echo print_bool($status['repeat']); ?> |
+	<?php echo Ajax::text('?page=localplay&action=repeat&value=' . invert_bool($status['repeat']), print_bool(invert_bool($status['repeat'])), 'localplay_repeat'); ?>
 	<?php echo _('Repeat'); ?>
 </li>
 <li>
-	<?php echo print_boolean($status['random']); ?> |
-	<?php echo Ajax::text('?page=localplay&action=random&value=' . invert_boolean($status['random']),print_boolean(invert_boolean($status['random'])),'localplay_random'); ?>
+	<?php echo print_bool($status['random']); ?> |
+	<?php echo Ajax::text('?page=localplay&action=random&value=' . invert_bool($status['random']), print_bool(invert_bool($status['random'])), 'localplay_random'); ?>
 	<?php echo _('Random'); ?>
 </li>
 <li>
diff --git a/templates/show_test.inc.php b/templates/show_test.inc.php
index 20fe97c5..cbf97f0f 100644
--- a/templates/show_test.inc.php
+++ b/templates/show_test.inc.php
@@ -49,7 +49,7 @@
 		if (!check_php_ver()) {
 			echo debug_result('',false);
 			if (function_exists('hash_algos')) { $algos = hash_algos(); }
-			$string = "<strong>" .  phpversion() . " " . _('Hash Function Exists') . " " . print_boolean(function_exists('hash_algos')) . " " . _('SHA256 Support') . " " . print_boolean(in_array('sha256',$algos)) . "</strong>";
+			$string = "<strong>" .  phpversion() . " " . _('Hash Function Exists') . " " . print_bool(function_exists('hash_algos')) . " " . _('SHA256 Support') . " " . print_bool(in_array('sha256',$algos)) . "</strong>";
 		}
 		else {
 			echo debug_result('',true);