It does help if you stage changes from the right machine. This is the rework of the installer for namespace and php8.4

author: lsces <lester@lsces.co.uk> 2026-04-05 15:29:16 +0100
committer: lsces <lester@lsces.co.uk> 2026-04-05 15:29:16 +0100
commit: 516dfc95fcd3558e4dc205f2a2b87b44bf47c4a8 (patch)
tree: 4e5bff0c166142bcd0f1841a3ad6ff14bcd1c260 /templates
parent: a285cd4a2b73315a874627faa9d28ddb538f26da (diff)
download: install-516dfc95fcd3558e4dc205f2a2b87b44bf47c4a8.tar.gz
install-516dfc95fcd3558e4dc205f2a2b87b44bf47c4a8.tar.bz2
install-516dfc95fcd3558e4dc205f2a2b87b44bf47c4a8.zip
14 files changed, 82 insertions, 78 deletions
diff --git a/templates/install.tpl b/templates/install.tpl
index 812b8d8..ee39d1f 100644..100755
--- a/templates/install.tpl
+++ b/templates/install.tpl
@@ -1,6 +1,4 @@
-{if ($gBrowserInfo.browser neq 'ie') or ($gBrowserInfo.browser eq 'ie' and $gBrowserInfo.maj_ver gt 7) }
 <?xml version="1.0" encoding="utf-8"?>
-{/if}
 {strip}
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
@@ -8,28 +6,23 @@
 	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
 	<style type="text/css">
 		{* hidden from 4.x browsers: *}
-		@import "{$smarty.const.CONFIG_PKG_URL}themes/bootstrap/bootstrap.css";
+		@import "{$smarty.const.THEMES_PKG_URL}css/colourstrap-full.css";
 		@import "{$smarty.const.INSTALL_PKG_URL}css/install.css";
 	</style>
 	<title>Install Bitweaver - {$browserTitle}</title>
 	<link rel="shortcut icon" href="{$smarty.const.INSTALL_PKG_URL}favicon.ico" type="image/x-icon" />
 	<link rel="icon" href="{$smarty.const.INSTALL_PKG_URL}favicon.ico" type="image/x-icon" />
 
-	<script type="text/javascript">/* <![CDATA[ */
+	<script>/* <![CDATA[ */
 		var bitCookiePath = "{$smarty.const.BIT_ROOT_URL}";
 		var bitCookieDomain = "";
 		var bitIconDir = "{$smarty.const.LIBERTY_PKG_URL}icons/";
 		var bitRootUrl = "{$smarty.const.BIT_ROOT_URL}";
 	/* ]]> */</script>
-	<script src="//ajax.googleapis.com/ajax/libs/jquery/1.10.1/jquery.js"></script>
-	<script src="//ajax.googleapis.com/ajax/libs/jqueryui/1.9.2/jquery-ui.js"></script>
-	<script type="text/javascript" src="{$smarty.const.CONFIG_PKG_URL}themes/bootstrap/js/bootstrap.js"></script>
-	<script type="text/javascript" src="{$smarty.const.BIT_ROOT_URL}util/javascript/bitweaver.js"></script>
-	{* if $gBrowserInfo.browser eq 'ie'}
-		<!--[if lt IE 7]>
-			<script type="text/javascript" src="{$smarty.const.BIT_ROOT_URL}util/javascript/fixes/ie7/IE8.js"></script>
-		<![endif]-->
-	{/if *}
+	<script src= "{$smarty.const.THEMES_PKG_URL}js/jquery-3.7.1.js"></script>
+	<script src= "{$smarty.const.THEMES_PKG_URL}js/jquery-ui-14.1.js"></script>
+	<script src= "{$smarty.const.THEMES_PKG_URL}js/bootstrap.js"></script>
+	<script src= "{$smarty.const.THEMES_PKG_URL}js/bitweaver.js"></script>
 </head>
 <body id="step{$smarty.request.step}">
 	<header class="container">
@@ -47,7 +40,16 @@
 
 				<nav class="pull-right width60p" style="padding:10px 20px 0 0;">
 					<div class="pull-right">
-						<a href="http://www.bitweaver.org/wiki/index.php?page={$section|default:"Install"}bitweaverDoc">{booticon iname="fa-question-circle"} Help</a>
+						<a href="http://www.bitweaver.org/wiki/index.php?page={$section|default:"Install"}bitweaverDoc"><i class="icon-question-sign"></i> Help</a>
+					</div>
+
+					<div class="pull-right width50p" style="padding:0 10px;">
+						<div class="progress">
+						  <div class="bar bar-success" style="width: {$progress|default:0}%;"></div>
+						</div>
+					</div>
+					<div class="pull-right">
+						<em>{$section|default:"Install"} Progress</em>
 					</div>
 				</nav>
 			</div>
@@ -56,7 +58,7 @@
 					{foreach from=$menu_steps item=step key=key}
 						<li class="{if $smarty.request.step == $key}active{/if}">
 							<a href="{$menu_path|default:$smarty.const.INSTALL_PKG_URL}{$menu_file|default:"install.php"}?step={$key}" {if $step.state eq 'uncompleted'}onclick="return false;"{/if}>
-							{if $step.icon}{booticon iname=$step.icon} {/if}{$step.name}
+							{if $step.icon}<i class="{$step.icon}"></i> {/if} {$step.name}
 							</a>
 						</li>
 					{/foreach}
@@ -74,9 +76,7 @@
 	</div>
 
 	<footer class="container content-center">
-		{if $gBitInstaller->isInstalled()}
-			{include file="bitpackage:kernel/bot_bar.tpl"}
-		{/if}
+		{include file="bitpackage:kernel/bot_bar.tpl"}
 	</footer>
 </body>
 </html>
diff --git a/templates/install_admin_inc.tpl b/templates/install_admin_inc.tpl
index 47f4eeb..e0bb007 100644..100755
--- a/templates/install_admin_inc.tpl
+++ b/templates/install_admin_inc.tpl
@@ -5,7 +5,7 @@
 	<input type="hidden" name="step" value="{$next_step}" />
 
 	<div class="form-group">
-		{formfeedback error=$errors.real_name}
+		{formfeedback error=$errors.real_name ?? ''}
 		{formlabel label="Full Name" for="real_name"}
 		{forminput}
 			<input type="text" class="form-control" name="real_name" id="real_name" value="{$smarty.session.real_name|default:'Administrator'}" />
@@ -14,7 +14,7 @@
 	</div>
 
 	<div class="form-group">
-		{formfeedback error=$errors.login}
+		{formfeedback error=$errors.login ?? ''}
 		{formlabel label="Admin login" for="login"}
 		{forminput}
 			<input type="text" class="form-control" name="login" id="login" value="{$smarty.session.login|default:'admin'}" />
@@ -23,10 +23,10 @@
 	</div>
 
 	<div class="form-group">
-		{formfeedback error=$errors.password}
+		{formfeedback error=$errors.password ?? ''}
 		{formlabel label="Password" for="password"}
 		{forminput}
-			<input type="password" class="form-control" name="password" id="password" maxlength="32" value="{$smarty.session.password}" />
+			<input type="password" class="form-control" name="password" id="password" maxlength="32" value="{$smarty.session.password ?? ''}" />
 			{formhelp note="The administrator's password should be at least 4 characters in length."}
 		{/forminput}
 	</div>
@@ -34,16 +34,16 @@
 	<div class="form-group">
 		{formlabel label="Re-enter password" for="pass_confirm"}
 		{forminput}
-			<input type="password" class="form-control" name="pass_confirm" id="pass_confirm" maxlength="32" value="{$smarty.session.password}" />
+			<input type="password" class="form-control" name="pass_confirm" id="pass_confirm" maxlength="32" value="{$smarty.session.password ?? ''}" />
 			{formhelp note="Please confirm the administrators password."}
 		{/forminput}
 	</div>
 
 	<div class="form-group">
-		{formfeedback error=$errors.email}
+		{formfeedback error=$errors.email ?? ''}
 		{formlabel label="Email" for="email"}
 		{forminput}
-			<input type="text" class="form-control" name="email" id="email" value="{$smarty.session.email}" />
+			<input type="text" class="form-control" name="email" id="email" value="{$smarty.session.email ?? ''}" />
 			{formhelp note="Administrator email address, in case of site malfunction this email will be showen to users."}
 		{/forminput}
 	</div>
@@ -52,7 +52,7 @@
 		{forminput}
 			{forminput label="checkbox"}
 				<input type="checkbox" name="testemail" id="testemail" value="y" checked="checked" />
-				{tr}Test Email Transport{/tr}
+				Test Email Transport
 			{/forminput}
 			{formhelp note="Check this box to send a test email to the above address. This will let you know if the mailing system is working."}
 		{/forminput}
diff --git a/templates/install_admin_inc_done.tpl b/templates/install_admin_inc_done.tpl
index 94605d9..1388d52 100644..100755
--- a/templates/install_admin_inc_done.tpl
+++ b/templates/install_admin_inc_done.tpl
@@ -10,7 +10,9 @@
 			<ul class="result">
 			{foreach from=$warning item=warn}
 				<li class="warning">
-					{booticon iname="fa-triangle-exclamation"} {$warn}
+					{booticon iname="icon-warning-sign"  ipackage="icons"  iexplain=warning}
+					&nbsp;
+					{$warn}
 				</li>
 			{/foreach}
 			</div>
@@ -55,7 +57,7 @@
 			{forminput}
 				{if $mail.warning}
 					{formfeedback error=$mail.warning}
-					{tr}You will have to consult your server adminstrator to fix this issue.{/tr}
+					You will have to consult your server adminstrator to fix this issue.
 				{else}
 					{formfeedback note="`$mail.success` Please check your inbox to confirm that the email was sent."}
 				{/if}
diff --git a/templates/install_beta1_beta2.tpl b/templates/install_beta1_beta2.tpl
index ec52461..e58224c 100644..100755
--- a/templates/install_beta1_beta2.tpl
+++ b/templates/install_beta1_beta2.tpl
@@ -8,7 +8,7 @@
 		<p class="form-group">To upgrade CLYDE Beta 1 to CLYDE Beta 2, you need to upgrade your languages package.<br />We know we said we wouldn't make any rash schema changes, but we thought that since languages weren't working anyway, nobody could possibly loose data. We hope that this does not cause too great of a problem and we appologise for messing with the schema.<p>
 
 		{foreach from=$schema key=package item=item}
-			{if $item.tables || $item.defaults}
+			{if $item.tables or $item.defaults}
 				{if $package eq 'languages'}
 					<div class="form-group">
 						<div class="formlabel">
diff --git a/templates/install_bit_settings.tpl b/templates/install_bit_settings.tpl
index b369843..4152546 100644..100755
--- a/templates/install_bit_settings.tpl
+++ b/templates/install_bit_settings.tpl
@@ -35,19 +35,19 @@
 		{formlabel label="Home Page" for="bit_index"}
 		{forminput}
 			<select name="bit_index" id="bit_index" class="form-control">
-				<option value="my_home"{if $bit_index eq 'my_home'} selected="selected"{/if}>{tr}My home{/tr}</option>
+				<option value="my_home"{if $bit_index eq 'my_home'} selected="selected"{/if}>My home</option>
 				{if $smarty.const.ROLE_MODEL}
-					<option value="role_home"{if $bit_index eq 'role_home'} selected="selected"{/if}>{tr}Role home{/tr}</option>
+					<option value="role_home"{if $bit_index eq 'role_home'} selected="selected"{/if}>Role home</option>
 				{else}
-					<option value="group_home"{if $bit_index eq 'group_home'} selected="selected"{/if}>{tr}Group home{/tr}</option>
+					<option value="group_home"{if $bit_index eq 'group_home'} selected="selected"{/if}>Group home</option>
 				{/if}
 				{foreach key=name item=package from=$schema }
-					{if $package.homeable && $package.installed}
+					{if $package.homeable and $package.installed}
 						<option {if $package.name=='wiki'}selected="selected"{/if} value="{$package.name}">{$package.name}</option>
 					{/if}
 				{/foreach}
 				{if $gBitSystem->isFeatureActive( 'users_custom_home' )}
-					<option value="users_custom_home"{if $bit_index eq $gBitSystem->getConfig('site_url_index')} selected="selected"{/if}>{tr}Custom home{/tr}</option>
+					<option value="users_custom_home"{if $bit_index eq $gBitSystem->getConfig('site_url_index')} selected="selected"{/if}>Custom home</option>
 				{/if}
 			</select>
 			{formhelp note="Pick your site's homepage. This is where users will be redirected, when they access a link to your homepage.
@@ -63,9 +63,9 @@
 		{formlabel label="Site Style" for="site_style"}
 		{forminput}
 			<select name="site_style" id="site_style" class="form-control">
-				{foreach from=$stylesList item=s}
+				{* foreach from=$stylesList item=s}
 						<option value="{$s.style}" {if $s.style eq "basic"}selected="selected"{/if}>{$s.style}</option>
-				{/foreach}
+				{/foreach *}
 			</select>
 			{formhelp note="Pick the look and feel style you wish to use. Custom styles can be added to the config/themes/ directory and then selected in the themes administration panel."}
 		{/forminput}
@@ -96,7 +96,7 @@
 
 	<div class="form-group">
 		{forminput}
-			<input type="submit" class="btn btn-primary" name="bit_settings" value="{tr}Set Preferences{/tr}" />
+			<input type="submit" class="btn btn-primary" name="bit_settings" value="Set Preferences" />
 		{/forminput}
 	</div>
 {/form}
diff --git a/templates/install_cleanup.tpl b/templates/install_cleanup.tpl
index af96f35..b1cf14d 100644..100755
--- a/templates/install_cleanup.tpl
+++ b/templates/install_cleanup.tpl
@@ -25,7 +25,7 @@
 						<ul>
 							{foreach from=$package.tables item=table}
 								<li>
-									<a style="float:right" href="#" onclick="BitBase.toggleElementDisplay('{$table.name}','block');return false">show table details</a> {$table.name}<br />
+									<a style="float:right" href="#" onclick="\Bitweaver\BitBase.toggleElementDisplay('{$table.name}','block');return false">show table details</a> {$table.name}<br />
 									<div id="{$table.name}" style="display:none;">
 										<code>{$table.sql|nl2br}</code>
 									</div>
@@ -78,7 +78,7 @@
 
 
 	{legend legend="Fix Permissioning"}
-		{if $delPerms || $insPerms}
+		{if $delPerms or $insPerms}
 			<p class="alert alert-block">
 				Some permissions require your attention.
 				{if $insPerms}
@@ -129,7 +129,7 @@
 			{/if}
 		</table>
 		{/if}
-		{if empty( $insPerms ) && empty( $delPerms )}
+		{if empty( $insPerms ) and empty( $delPerms )}
 			<p class="alert alert-success">
 				The permissioning system in your installation is up to date and does not require any adjustments. Even though this is true, we recommend you visit the {smartlink ititle="Permission Maintenance" ipackage=users ifile="admin/permissions.php"} page at some point to ensure that all permissions are active.
 			</p>
@@ -178,7 +178,7 @@
 			</p>
 		{/if}
 
-		{if $delPerms || $insPerms || $serviceList}
+		{if $delPerms or $insPerms or $serviceList}
 			<div class="form-group">
 		{forminput}
 					<input type="submit" class="btn btn-primary" name="resolve_conflicts" value="Resolve Issues" />
@@ -187,7 +187,7 @@
 
 			<div class="form-group">
 				{forminput label="checkbox"}
-					<input type="checkbox" name="debug" id="debug" value="true" /> {tr}Debug mode{/tr}
+					<input type="checkbox" name="debug" id="debug" value="true" /> Debug mode
 					{formhelp note="Display SQL statements."}
 				{/forminput}
 			</div>
diff --git a/templates/install_final_done.tpl b/templates/install_final_done.tpl
index 812d479..6dad7c1 100644..100755
--- a/templates/install_final_done.tpl
+++ b/templates/install_final_done.tpl
@@ -29,7 +29,7 @@
 			</li>
 			<li>
 				<strong>bitweaver Configuration</strong>
-				<br />We urge you to look at your <kbd>config/kernel/config_inc.php</kbd> file. It has various useful settings for sites in production. One of these is the <strong>IS_LIVE</strong> parameter. Setting this to <strong>TRUE</strong> will prevent any visible bug reports and will therefore not display sensitive information to the user.
+				<br />We urge you to look at your <kbd>config/kernel/config_inc.php</kbd> file. It has various useful settings for sites in production. One of these is the <strong>IS_LIVE</strong> parameter. Setting this to <strong>true</strong> will prevent any visible bug reports and will therefore not display sensitive information to the user.
 			</li>
 		</ul>
 	</div>
diff --git a/templates/install_login.tpl b/templates/install_login.tpl
index 8df50ac..64ec50c 100644..100755
--- a/templates/install_login.tpl
+++ b/templates/install_login.tpl
@@ -21,7 +21,7 @@
 
 	<div class="form-group">
 		{forminput}
-			<input type="submit" class="btn btn-primary" name="signin" value="{tr}Log in to {$gBitSystem->getConfig('site_title')|default:"this site"}{/tr}" />
+			<input type="submit" class="btn btn-primary" name="signin" value="Log in to {$gBitSystem->getConfig('site_title')|default:"this site"}" />
 		{/forminput}
 	</div>
 {/form}
diff --git a/templates/install_packages.tpl b/templates/install_packages.tpl
index ebf76b7..5c52d1f 100644..100755
--- a/templates/install_packages.tpl
+++ b/templates/install_packages.tpl
@@ -23,13 +23,13 @@
 
 				{* include required packages during first install *}
 				{foreach from=$schema key=package item=item}
-					{if $item.required && !$item.installed}
+					{if $item.required|default:false and !$item.installed}
 						<input type="hidden" name="packages[]" value="{$package}" />
 					{/if}
 				{/foreach}
 
 				{foreach from=$schema key=package item=item}
-					{if !$item.installed and !$item.required}
+					{if !$item.installed and !$item.required|default:false}
 						{assign var=new_packages value=true}
 					{/if}
 				{/foreach}
@@ -43,7 +43,7 @@
 
 					<div class="form-group">
 						{forminput label="checkbox"}
-							<script type="text/javascript">/* <![CDATA[ */
+							<script>/* <![CDATA[ */
 								document.write("<input name=\"switcher\" id=\"switcher\" type=\"checkbox\" checked onclick=\"BitBase.switchCheckboxes(this.form.id,'packages[]','switcher')\" /> Batch (de)select all Packages and Services on this page");
 							/* ]]> */</script>
 						{/forminput}
@@ -51,14 +51,14 @@
 
 					<div class="bit-columns">
 					{foreach from=$schema key=package item=item}
-						{if !$item.installed and !$item.required}
+						{if !$item.installed and !$item.required|default:false}
 							<div class="bit-column-cell">
 							<div class="well">
-								<label class="control-label" for="{$package}">{biticon ipackage=$package iname="pkg_$package" iexplain=$package class="img-responsive"}</label>
+								<label class="control-label" for="{$package}">{biticon ipackage=$package iname="pkg_$package" iexplain=$package}</label>
 								{forminput label="checkbox"}
 									<input type="checkbox" name="packages[]" value="{$package}" id="{$package}" checked="checked" /> <strong>{$package|capitalize}</strong></label>
-									{formhelp note=$item.info is_installer=1}
-									{formhelp note="<strong>Location</strong>: `$item.url`"}
+									{formhelp note=$item.info|default:'' is_installer=1}
+									{formhelp note="<strong>Location</strong>: `$item.url|default:''`"}
 									{formhelp package=$package}
 								{/forminput}
 							</div>
@@ -69,7 +69,7 @@
 					{/legend}
 				{elseif $first_install}
 					<h2>Core System Installation</h2>
-					<p>{tr}Only the core required packages will be installed{/tr}</p>
+					<p>Only the core required packages will be installed</p>
 				{else}
 					<h2>No Additional Packages</h2>
 
@@ -91,7 +91,7 @@
 				{/if}
 				<div class="form-group">
 					{forminput label="checkbox"}
-						<input type="checkbox" name="debug" value="true" /> {tr}Debug mode{/tr}
+						<input type="checkbox" name="debug" value="true" /> Debug mode
 						{formhelp note="Display SQL statements."}
 					{/forminput}
 				</div>
@@ -143,14 +143,14 @@
 
 					<div class="bit-columns">
 					{foreach from=$schema key=package item=item}
-						{if $item.tables || $item.defaults}
-							{if $item.installed and !$item.required}
+						{if !empty($item.tables) or !empty($item.defaults)}
+							{if $item.installed and !$item.required|default:false}
 								<div class="bit-column-cell well">
 									<label for="{$package}">{biticon ipackage=$package iname="pkg_$package" iexplain=$package}</label>
 									{forminput label="checkbox"}
 										<input type="checkbox" name="packages[]" value="{$package}" id="{$package}" /> <strong>{$package|capitalize}</strong>
-										{formhelp note=$item.info is_installer=1}
-										{formhelp note="<strong>Location</strong>: `$item.url`"}
+										{formhelp note=$item.info|default:'' is_installer=1}
+										{formhelp note="<strong>Location</strong>: `$item.url|default:''`"}
 										{formhelp package=$package}
 									{/forminput}
 								</div>
@@ -189,15 +189,15 @@
 
 				<div class="bit-columns">
 				{foreach from=$schema key=package item=item}
-					{if $item.required}
+					{if $item.required|default:false}
 						<div class="bit-column-cell well">
 							<label class="control-label">
 								{biticon ipackage=$package iname="pkg_$package" iexplain=$package}
 							</label>
 							{forminput}
 								<strong>{$package|capitalize}</strong>
-								{formhelp note=$item.info is_installer=1}
-								{formhelp note="<strong>Location</strong>: `$item.url`"}
+								{formhelp note=$item.info|default:'' is_installer=1}
+								{formhelp note="<strong>Location</strong>: `$item.url|default:''`"}
 								{formhelp package=$package}
 							{/forminput}
 						</div>
diff --git a/templates/install_packages_done.tpl b/templates/install_packages_done.tpl
index 6599e05..9615202 100644..100755
--- a/templates/install_packages_done.tpl
+++ b/templates/install_packages_done.tpl
@@ -33,7 +33,7 @@
 			</div>
 		{/if}
 
-		{if $packageList.install}
+		{if !empty($packageList.install)}
 			<h2>Packages that were installed</h2>
 			<ul>
 				{foreach from=$packageList.install item=package}
@@ -44,7 +44,7 @@
 			</ul>
 		{/if}
 
-		{if $packageList.uninstall}
+		{if !empty($packageList.uninstall)}
 			<div class="form-group">
 				{formlabel label="Packages that were uninstalled"}
 				{forminput}
@@ -59,7 +59,7 @@
 			</div>
 		{/if}
 
-		{if $packageList.reinstall}
+		{if !empty($packageList.reinstall)}
 			<div class="form-group">
 				{formlabel label="Packages that were reinstalled"}
 				{forminput}
diff --git a/templates/install_upgrade.tpl b/templates/install_upgrade.tpl
index 861f4c8..3dd0601 100644..100755
--- a/templates/install_upgrade.tpl
+++ b/templates/install_upgrade.tpl
@@ -7,7 +7,7 @@
 
 			{if $packageUpgrades}
 				<h2>Packages and their upgrades</h2>
-				<div class="alert alert-danger"><div class="pull-left">{booticon iname="fa-triangle-exclamation" style="font-size:3em;padding-right:20px;"}</div> You are about to run an upgrade which might make changes to your database. We <strong>strongly</strong> recommend that you back up your database (preferably carry out the entire <a class="external" href="http://www.bitweaver.org/wiki/bitweaverUpgrade#Generalproceduretoupgrade">backup procedure</a>).</div>
+				<div class="alert alert-danger"><div class="pull-left"><i class="icon-warning-sign" style="font-size:3em;padding-right:20px;"></i></div> You are about to run an upgrade which might make changes to your database. We <strong>strongly</strong> recommend that you back up your database (preferably carry out the entire <a class="external" href="http://www.bitweaver.org/wiki/bitweaverUpgrade#Generalproceduretoupgrade">backup procedure</a>).</div>
 				{foreach from=$packageUpgrades item=upgrade key=package}
 					{* users don't have the option to select what packages to upgrade since the code of the package is dependent on this upgrade
 					<h3>{forminput label="checkbox"}<input type="checkbox" name="packages[]" value="{$package}" checked="checked" /> {$package}{/forminput}</h3> *}
@@ -101,7 +101,7 @@
 						<tr class="{$class}">
 							<td>{$dep.requires|ucfirst}</td>
 							<td>{$dep.required_version.min}</td>
-							<td>{$dep.required_version.max}</td>
+							<td>{$dep.required_version.max|default:''}</td>
 							<td>{$dep.version.available}</td>
 							<td>
 								{if $dep.result == 'ok'}
@@ -147,7 +147,7 @@
 					<p class="alert alert-block">At least one required package is in an unknown state. The upgrade may not work because of this. It is probably worth reinstalling the latest version of that package or contacting its developer.</p>
 				{/if}
 
-				{if !$min_dep && !$max_dep && !$missing}
+				{if !$min_dep and !$max_dep and !$missing}
 					<p class="alert alert-success">All package requirements have been met. You can proceed with the installation process.</p>
 				{/if}
 			{/if}
diff --git a/templates/install_version.tpl b/templates/install_version.tpl
index 46f045d..1935e2a 100644..100755
--- a/templates/install_version.tpl
+++ b/templates/install_version.tpl
@@ -27,10 +27,10 @@
 
 
 			<table class="table data">
-				<caption>{tr}Available Permissions{/tr}</caption>
+				<caption>Available Permissions</caption>
 				{capture assign=theader}
 					<tr>
-						<th style="width:30%;">{tr}Permission{/tr}</th>
+						<th style="width:30%;">Permission</th>
 						{foreach from=$allGroups item=group name=groups}
 							<th>
 								<abbr title="{$group.group_name}">{if $smarty.foreach.groups.total > 8}{$group.group_id}{else}{$group.group_name}{/if}</abbr>
diff --git a/templates/install_welcome.tpl b/templates/install_welcome.tpl
index 7045180..ad3d97a 100644..100755
--- a/templates/install_welcome.tpl
+++ b/templates/install_welcome.tpl
@@ -3,7 +3,9 @@
 	<div class="col-md-8">
 		<h1>Welcome to the Bitweaver Installer</h1>
 
-		<p class="alert alert-warning">Since this does not appear to be your first install, you can access various pages of the installer. To install new packages, please visit <strong><a href="install.php?step=3">Packages</a></strong>.</p>
+		{if $gBitUser->isAdmin()}
+			<p class="alert alert-block">Since this does not appear to be your first install, you can access various pages of the installer. To install new packages, please visit <strong><a href="install.php?step=3">Packages</a></strong>.</p>
+		{/if}
 
 		<p>Thank you for choosing Bitweaver. This web content management system offers an unparalleled consonance of simplicity, performance, and flexibility. For questions, comments, and support, please visit <a class="external" href="http://www.bitweaver.org">bitweaver.org</a>.  Help is available via <a class="external" href="http://www.bitweaver.org/">the forum</a> and via <a title="#bitweaver IRC Channel on freenode.net" class="external" href="http://www.bitweaver.org/wiki/Live+Support">#bitweaver chat</a>. Click to begin the install process:</p>
 
@@ -11,9 +13,9 @@
 
 		<div class="form-group">
 			{forminput}
-				{if $gBitInstaller->isInstalled()}
-					<a class="btn btn-default" href="{$smart.const.INSTALL_PKG_URL}?step=4">Upgrade</a> <a class="btn btn-default" href="{$smart.const.INSTALL_PKG_URL}?step=3">Install Packages</a>
-					<a class="btn btn-danger pull-right" href="{$smart.const.INSTALL_PKG_URL}?step=1">Restart Installation</a>
+				{if $gBitUser->isAdmin()}
+					<a class="btn btn-default" href="{$smarty.const.INSTALL_PKG_URL}?step=4">Upgrade</a> <a class="btn" href="{$smarty.const.INSTALL_PKG_URL}?step=3">Install Packages</a>
+					<a class="btn btn-danger pull-right" href="{$smarty.const.INSTALL_PKG_URL}?step=1">Restart Installation</a>
 				{else}
 					<input type="hidden" name="step" value="{$next_step}" />
 					<input type="submit" class="btn btn-primary" name="install" value="Begin the install process" />
diff --git a/templates/migrate_database.tpl b/templates/migrate_database.tpl
index bc7ff01..c213205 100644..100755
--- a/templates/migrate_database.tpl
+++ b/templates/migrate_database.tpl
@@ -73,7 +73,7 @@
 					{formlabel label="Source database name" for="name_src"}
 					{forminput}
 						<input type="text" class="form-control" name="name_src" id="name_src" value="{$name_src}" />
-						{ if ( $fbpath ) }
+						{if ( $fbpath )}
 							{formhelp note="The name of the database where Bitweaver will create tables. You can
 								create a Firebird alias for the Bitweaver database in aliases.conf and then use that
 								aliase as the database name, or provide a full path and file name to create
@@ -88,7 +88,7 @@
 				</div>
 
 				<div class="form-group">
-				{ if ( $fbpath ) }
+				{if ( $fbpath )}
 					{formhelp note="<strong>Do not use prefix with Firebird, as the field and table names are already up to 30 characters.</strong>"}
 				{/if}
 					{formlabel label="Source Database Prefix" for="prefix_src"}
@@ -102,7 +102,7 @@
 					{/forminput}
 				</div>
 
-				{ if ( $fbpath ) }
+				{if ( $fbpath )}
 				<div class="form-group">
 					{formlabel label="Firebird Installation Path" for="fbpath"}
 					{forminput}
@@ -184,7 +184,7 @@
 					{formlabel label="Destination database name" for="name_dst"}
 					{forminput}
 						<input type="text" class="form-control" name="name_dst" id="name_dst" value="{$gBitDbName}" />
-						{ if ( $fbpath ) }
+						{if ( $fbpath )}
 							{formhelp note="The name of the database where Bitweaver will create tables. You can
 								create a Firebird alias for the Bitweaver database in aliases.conf and then use that
 								aliase as the database name, or provide a full path and file name to create
@@ -199,7 +199,7 @@
 				</div>
 
 				<div class="form-group">
-				{ if ( $fbpath ) }
+				{if ( $fbpath )}
 					{formhelp note="<strong>Do not use prefix with Firebird, as the field and table names are already up to 30 characters.</strong>"}
 				{/if}
 					{formlabel label="Destination Database Prefix" for="prefix_dst"}
@@ -213,7 +213,7 @@
 					{/forminput}
 				</div>
 
-				{ if ( $fbpath ) }
+				{if ( $fbpath )}
 				<div class="form-group">
 					{formlabel label="Firebird installation path" for="fbpath"}
 					{forminput}
author	lsces <lester@lsces.co.uk>	2026-04-05 15:29:16 +0100
committer	lsces <lester@lsces.co.uk>	2026-04-05 15:29:16 +0100
commit	516dfc95fcd3558e4dc205f2a2b87b44bf47c4a8 (patch)
tree	4e5bff0c166142bcd0f1841a3ad6ff14bcd1c260 /templates
parent	a285cd4a2b73315a874627faa9d28ddb538f26da (diff)
download	install-516dfc95fcd3558e4dc205f2a2b87b44bf47c4a8.tar.gz install-516dfc95fcd3558e4dc205f2a2b87b44bf47c4a8.tar.bz2 install-516dfc95fcd3558e4dc205f2a2b87b44bf47c4a8.zip