Bringing Role admin pages into working order as need for latest website clinet.

4 files changed, 34 insertions, 32 deletions

diff --git a/templates/admin_assign_role_user.tpl b/templates/admin_assign_role_user.tpl
index 016c8c5..82e501b 100755
--- a/templates/admin_assign_role_user.tpl
+++ b/templates/admin_assign_role_user.tpl
@@ -12,6 +12,7 @@
 	<div class="body">
 		{form legend="User Information" action="`$smarty.const.USERS_PKG_URL`admin/assign_role_user.php"}
 			<input type="hidden" value="{$assignUser->mUserId}" name="assign_user" />
+			<input type="hidden" name="tk" value="{$gBitUser->mTicket}" />
 
 			<div class="form-group">
 				{formlabel label="Username"}
@@ -35,7 +36,6 @@
 			</div>
 
 			{if $gBitSystem->isPackageActive('quota')}
-			{include_php file="`$smarty.const.QUOTA_PKG_INCLUDE_PATH`quota_inc.php"}
 			<div class="form-group">
 				{formlabel label="Quota"}
 				{forminput}
@@ -73,7 +73,7 @@
 			</div>
 
 			<div class="form-group submit">
-				<input type="submit" class="btn btn-default" value="{tr}set{/tr}" name="set_default" />
+				<input type="submit" class="btn btn-default" value="{tr}Set{/tr}" name="set_default" />
 			</div>
 		{/form}
 
@@ -87,21 +87,22 @@
 			</tr>
 			{cycle values="even,odd" print=false}
 			{foreach from=$roles key=roleId item=role}
-				{if !$assignUser->mRoles.$roleId && $roleId != -1}
+				{if empty($assignUser->mRoles.$roleId) && $roleId != -1}
 					<tr class="{cycle}">
 						<td>{$role.role_name}</td>
 						<td>{$role.role_desc}</td>
 						<td class="actionicon">
-							<a href="{$smarty.const.USERS_PKG_URL}admin/assign_role_user.php?offset={$offset}&amp;sort_mode={$sort_mode}&amp;action=assign&amp;role_id={$roleId}&amp;assign_user={$assignUser->mUserId}">
+							<a href="{$smarty.const.USERS_PKG_URL}admin/assign_role_user.php?offset={$offset}&amp;sort_mode={$sort_mode}&amp;action=assign&amp;role_id={$roleId}&amp;assign_user={$assignUser->mUserId}&amp;tk={$gBitUser->mTicket}">
 								{booticon iname="fa-key" iexplain="assign"}
 							</a>
 						</td>
 					</tr>
 				{/if}
 			{/foreach}
+
 		</table>
 
-		{pagination assign_user=$assign_user}
+		{* pagination assign_user=$assign_user *}
 
 	</div><!-- end .body -->
 </div><!-- end .users -->
diff --git a/templates/admin_login.tpl b/templates/admin_login.tpl
index 2bfa005..51c42e4 100644
--- a/templates/admin_login.tpl
+++ b/templates/admin_login.tpl
@@ -21,11 +21,11 @@
 						{else}
 							<input type="text" class="form-control" name="{$feature}" id="{$feature}" value="{$gBitSystem->getConfig($feature)|escape}" />
 						{/if}
-						{formhelp note=$output.note page=$output.page link=$output.link}
+						{formhelp note=$output.note page=$output.page ?? '' link=$output.link ?? ''}
 					{else}
 						{forminput label="checkbox"}
 							{html_checkboxes name="$feature" values="y" checked=$gBitSystem->getConfig($feature) labels=false id=$feature} {tr}{$output.label}{/tr}
-							{formhelp note=$output.note page=$output.page link=$output.link}
+							{formhelp note=$output.note page=$output.page ?? '' link=$output.link ?? ''}
 						{/forminput}
 					{/if}
 				{/forminput}
@@ -98,7 +98,7 @@
 
 	{jstab title="Single Sign On"}
 		<div class="form-group">
-			{formfeedback hash=$authSettings.err}
+			{formfeedback hash=$authSettings.err ?? ''}
 
 			{formlabel label="Authentication method"}
 			{forminput}
@@ -159,12 +159,12 @@
 					{forminput}
 						{formlabel label=$output.label for=$feature}
 						<input type="text" class="form-control" name="{$feature}" id="{$feature}" value="{$gBitSystem->getConfig($feature)|escape}" />
-						{formhelp note=$output.note page=$output.page link=$output.link}
+						{formhelp note=$output.note page=$output.page ?? '' link=$output.link ?? ''}
 					{/forminput}
 				{else}
 					{forminput label="checkbox"}
 						{html_checkboxes name="$feature" values="y" checked=$gBitSystem->getConfig($feature) labels=false id=$feature} {tr}{$output.label}{/tr}
-						{formhelp note=$output.note page=$output.page link=$output.link}
+						{formhelp note=$output.note page=$output.page ?? '' link=$output.link ?? ''}
 					{/forminput}
 				{/if}
 			</div>
@@ -182,19 +182,19 @@
 					{forminput}
 						{formlabel label=$output.label for=$feature}
 						<input type="text" class="form-control" name="{$feature}" id="{$feature}" value="{$gBitSystem->getConfig($feature)|escape}" />
-						{formhelp note=$output.note page=$output.page link=$output.link}
+						{formhelp note=$output.note page=$output.page ?? '' link=$output.link ?? ''}
 					{/forminput}
 				{else}
 					{forminput label="checkbox"}
 						{html_checkboxes name="$feature" values="y" checked=$gBitSystem->getConfig($feature) labels=false id=$feature} {tr}{$output.label}{/tr}
-						{formhelp note=$output.note page=$output.page link=$output.link}
+						{formhelp note=$output.note page=$output.page ?? '' link=$output.link ?? ''}
 					{/forminput}
 				{/if}
 			</div>
 		{/foreach}
 	{/jstab}
 	{foreach from=$authSettings.avail item='method' key='meth_name'}
-		{if $method.options}
+		{if !empty($method.options)}
 			{jstab title=$method.name}
 				<input type="hidden" name="page" value="{$page}" />
 				{foreach from=$method.options item='output' key='op_id'}
@@ -212,7 +212,7 @@
 							{else}
 								<input type="text" class="form-control" name="{$op_id}" id="{$op_id}" value="{$output.value|escape}" />
 							{/if}
-							{formhelp note=$output.note page=$output.page link=$output.link}
+							{formhelp note=$output.note page=$output.page ?? '' link=$output.link ?? ''}
 						{/forminput}
 					</div>
 				{/foreach}
diff --git a/templates/admin_role_edit.tpl b/templates/admin_role_edit.tpl
index 3d29954..d832b44 100644..100755
--- a/templates/admin_role_edit.tpl
+++ b/templates/admin_role_edit.tpl
@@ -10,7 +10,7 @@
 
 <div class="admin roles">
 	<div class="header">
-		<h1>{if $roleInfo.role_name}{tr}Administer Role{/tr}: {$roleInfo.role_name}{else}{tr}Create New Role{/tr}{/if}</h1>
+		<h1>{if !empty($roleInfo.role_name)}{tr}Administer Role{/tr}: {$roleInfo.role_name}{else}{tr}Create New Role{/tr}{/if}</h1>
 	</div>
 
 	<div class="body">
@@ -19,30 +19,31 @@
 		{jstabs}
 			{jstab title="Edit Role"}
 				{form legend="Add or Edit a Role"}
-					<input type="hidden" name="role_id" value="{$roleInfo.role_id}" />
+					<input type="hidden" name="role_id" value="{$roleInfo.role_id ?? 0}" />
+					<input type="hidden" name="tk" value="{$gBitUser->mTicket}" />
 					<div class="form-group">
 						{formlabel label="Role" for="roles_role"}
 						{forminput}
-							<input type="text" name="name" id="roles_role" size="30" maxlength="30" value="{$roleInfo.role_name}" />
+							<input type="text" name="name" id="roles_role" size="30" maxlength="30" value="{$roleInfo.role_name ?? ''}" />
 						{/forminput}
 					</div>
 
 					<div class="form-group">
 						{formlabel label="Description" for="role_desc"}
 						{forminput}
-							<textarea rows="5" cols="20" name="desc" id="role_desc">{$roleInfo.role_desc}</textarea>
+							<textarea rows="5" cols="20" name="desc" id="role_desc">{$roleInfo.role_desc ?? ''}</textarea>
 						{/forminput}
 					</div>
 
 					<div class="form-group">
 						{formlabel label="Role home page" for="role_home"}
 						{forminput}
-							<input type="text" name="home" id="role_home" value="{$roleInfo.role_home|escape}" />
+							<input type="text" name="home" id="role_home" value="{$roleInfo.role_home|default:''|escape}" />
 							{formhelp note="Here you can enter the content id of any page, the wiki page name or the absolute path of any page you wish to use as a role home page. For this to work set the site homepage to <strong>Role Home</strong>" link="kernel/admin/index.php?page=features/General Settings"}
 
 							Search for Content:<br/>
 							{html_options options=$contentTypes name=content_type_guid selected=$contentSelect}
-							<input type="hidden" name="role_home_lookup_hidden" id="role_home_lookup_hidden" value="{$roleInfo.role_home|escape}" />
+							<input type="hidden" name="role_home_lookup_hidden" id="role_home_lookup_hidden" value="{$roleInfo.role_home|default:''|escape}" />
 							<input type="text" id="role_home_lookup" name="role_home_name">
 						{formhelp note="Enter the title of the content you are looking for to receive an auto-suggest list of possibilities."}
 {*
@@ -57,28 +58,28 @@
 					<div class="form-group">
 						{formlabel label="After registration page" for="after_registration_page"}
 						{forminput}
-							<input type="text" name="after_registration_page" id="after_registration_page" value="{$roleInfo.after_registration_page|escape}" />
+							<input type="text" name="after_registration_page" id="after_registration_page" value="{$roleInfo.after_registration_page|default:''|escape}" />
 							{formhelp note="The same format than the Role home page. Used to redirect a user after his registration if other that the default after login page."}
 						{/forminput}
 					</div>
 
 					<div class="form-group">
 						{forminput label="checkbox"}
-							<input type="checkbox" id="default_home" name="default_home_role" {if $roleInfo.role_id eq $defaultRoleId}checked="checked"{/if} value="y" />Default home page
+							<input type="checkbox" id="default_home" name="default_home_role" {if $roleInfo.role_id ?? '' eq $defaultRoleId}checked="checked"{/if} value="y" />Default home page
 							{formhelp note="This is the home page if a user belongs to many roles. Only one role may be the default home. If none is selected, users/my.php is the default."}
 						{/forminput}
 					</div>
 
 					<div class="form-group">
 						{forminput label="checkbox"}
-							<input type="checkbox" name="is_default" value="y" {if $roleInfo.is_default eq 'y'}checked="checked"{/if} id="is_default" />Auto members
+							<input type="checkbox" name="is_default" value="y" {if $roleInfo.is_default ?? 'n' eq 'y'}checked="checked"{/if} id="is_default" />Auto members
 							{formhelp note="Users are automatically added to this role when registering at your site."}
 						{/forminput}
 					</div>
 
 					<div class="form-group">
 						{forminput label="checkbox"}
-							<input type="checkbox" name="is_public" value="y" {if $roleInfo.is_public eq 'y'}checked="checked"{/if} id="is_public" />Is public
+							<input type="checkbox" name="is_public" value="y" {if $roleInfo.is_public ?? 'n' eq 'y'}checked="checked"{/if} id="is_public" />Is public
 							{formhelp note="A user will be able to select this role at registration."}
 						{/forminput}
 					</div>
@@ -90,11 +91,11 @@
 				{/form}
 			{/jstab}
 
-			{if $roleInfo.role_id}
+			{if !empty($roleInfo.role_id)}
 				{jstab title="Assign Permissions"}
 					{form legend="Assign permissions"}
 						<input type="hidden" name="role_id" value="{$roleInfo.role_id}" />
-						<input type="hidden" name="package" value="{$smarty.request.package|escape}" />
+						<input type="hidden" name="package" value="{$smarty.request.package|default:''|escape}" />
 						<input type="hidden" name="perm_name[{$perms[user].perm_name}]" />
 
 						<div class="form-group">
@@ -113,14 +114,14 @@
 							<table class="table data">
 								<tr>
 									<th>&nbsp;</th>
-									<th>{smartlink ititle="Name" isort="up.perm_name" role_id=$roleInfo.role_id offset=$offset package=$smarty.request.package}</th>
-									<th>{smartlink ititle="Package" isort=package role_id=$roleInfo.role_id offset=$offset package=$smarty.request.package}</th>
-									<th>{smartlink ititle="User Class" isort=perm_level role_id=$roleInfo.level offset=$offset package=$smarty.request.level}</th>
-									<th>{smartlink ititle="Description" isort="up.perm_desc" role_id=$roleInfo.role_id offset=$offset package=$smarty.request.package}</th>
+									<th>{smartlink ititle="Name" isort="up.perm_name" role_id=$roleInfo.role_id offset=$offset package=$smarty.request.package ?? ''}</th>
+									<th>{smartlink ititle="Package" isort=package role_id=$roleInfo.role_id offset=$offset package=$smarty.request.package ?? ''}</th>
+									<th>{smartlink ititle="User Class" isort=perm_level role_id=$roleInfo.level ?? '' offset=$offset package=$smarty.request.level ?? ''}</th>
+									<th>{smartlink ititle="Description" isort="up.perm_desc" role_id=$roleInfo.role_id offset=$offset package=$smarty.request.package ?? ''}</th>
 								</tr>
 								{foreach key=permName item=perm from=$allPerms}
 									<tr class="{cycle values="even,odd"}">
-										<td><input type="checkbox" id="{$permName}" name="perm[{$permName}]" {if $roleInfo.perms.$permName} checked="checked"{/if} /></td>
+										<td><input type="checkbox" id="{$permName}" name="perm[{$permName}]" {if !empty($roleInfo.perms.$permName)} checked="checked"{/if} /></td>
 										<td><label for="{$permName}">{$permName}</label></td>
 										<td>{tr}{$perm.package}{/tr}</td>
 										<td>{tr}{$perm.perm_level}{/tr}</td>
diff --git a/templates/admin_users.tpl b/templates/admin_users.tpl
index 1b2a3fc..69edcd2 100644..100755
--- a/templates/admin_users.tpl
+++ b/templates/admin_users.tpl
@@ -17,7 +17,7 @@
 			{formlabel label=$output.label for=$feature}
 			{forminput}
 				{html_checkboxes name="settings[$feature]" values="y" checked=$gBitSystem->getConfig($feature) labels=false id=$feature}
-				{formhelp note=$output.note page=$output.link}
+				{formhelp note=$output.note page=$output.link|default:''}
 			{/forminput}
 		</div>
 	{/foreach}