Check values exist before using, and add tk token manually as the smarty added on is not currently workingV5-php84

5 files changed, 17 insertions, 15 deletions

diff --git a/admin/index.php b/admin/index.php
index 55dca04..d78c8a7 100755
--- a/admin/index.php
+++ b/admin/index.php
@@ -51,6 +51,7 @@ if( isset($_REQUEST["newuser"] ) ) {
 	} else {
 		$gBitSystem->setBrowserTitle( 'Assume User Identity' );
 		$formHash['assume_user'] = $_REQUEST['assume_user'];
+		$formHash['tk'] = $_REQUEST['tk'];
 		$msgHash = [
 			'confirm_item' => KernelTools::tra( 'This will log you in as the user' ) . " <strong>$userInfo[real_name] ($userInfo[login])</strong>",
 		];
diff --git a/includes/register_inc.php b/includes/register_inc.php
index 903e921..2b6b374 100755
--- a/includes/register_inc.php
+++ b/includes/register_inc.php
@@ -1,5 +1,5 @@
 <?php
-
+namespace Bitweaver\Users;
 use Bitweaver\HttpStatusCodes;
 use Bitweaver\KernelTools;
 use Bitweaver\Wiki\BitPage;
diff --git a/templates/center_user_wiki_page.tpl b/templates/center_user_wiki_page.tpl
index 58f5ec6..ec2104b 100644
--- a/templates/center_user_wiki_page.tpl
+++ b/templates/center_user_wiki_page.tpl
@@ -7,10 +7,10 @@
 				{if $gBitSystem->isPackageActive( 'bitcommerce' ) && $gBitUser->hasPermission( 'p_commerce_admin' )}
 					{smartlink ipackage=bitcommerce ifile="admin/list_orders.php" user_id=$userInfo.user_id ititle="Orders" booticon="fa-shopping-cart"}
 				{/if}
-				{smartlink ipackage=users ifile="admin/index.php" assume_user=$userInfo.user_id ititle="Assume user identity" booticon="fa-user-doctor"}
+				{smartlink ipackage=users ifile="admin/index.php" assume_user=$userInfo.user_id tk=$gBitUser->mTicket ititle="Assume user identity" booticon="fa-user-doctor"}
 				{smartlink ipackage=users ifile="admin/assign_user.php" assign_user=$userInfo.user_id ititle="Assign Group" booticon="fa-key"}
 				{smartlink ipackage=users ifile="admin/user_activity.php" user_id=$userInfo.user_id ititle="User Activity" booticon="fa-bolt"}
-				{if $users[user].user_id != $smarty.const.ANONYMOUS_USER_ID}
+				{if $userInfo.user_id != $smarty.const.ANONYMOUS_USER_ID}
 					{smartlink ipackage=liberty ifile="list_content.php" user_id=$userInfo.user_id ititle="User Content" booticon="fa-square-list"}
 					{smartlink ipackage=users ifile="admin/index.php" action=delete user_id=$userInfo.user_id ititle="Remove" booticon="fa-trash"}
 				{/if}
@@ -28,7 +28,7 @@
 			{/if}
 		</div>
 	{/if}
-	{if $userInfo.logo_url}
+	{if !empty($userInfo.logo_url)}
 		<div style="text-align:center;">
 			<img src="{$userInfo.logo_url}" class="icon" title="{tr}Logo{/tr}" alt="{$gBitUser->getDisplayName()} {tr}Logo{/tr}" />
 		</div>
diff --git a/templates/change_password.tpl b/templates/change_password.tpl
index 01a9f39..ba5d6a0 100644
--- a/templates/change_password.tpl
+++ b/templates/change_password.tpl
@@ -8,7 +8,7 @@
 	<div class="body">
 		{form ipackage=users ifile="change_password.php" secure=$gBitSystem->isFeatureActive("site_https_login_required")}
 			<input type="hidden" name="user_id" value="{$userInfo.user_id}" />
-			{if $userInfo.provpass}
+			{if !empty($userInfo.provpass)}
 				<input type="hidden" name="provpass" value="{$userInfo.provpass|escape}" />
 			{/if}
 
@@ -19,7 +19,7 @@
 				{/forminput}
 			</div>
 
-			{if !$userInfo.provpass}
+			{if empty($userInfo.provpass)}
 				<div class="form-group">
 					{formlabel label="Old Password" for="oldpass"}
 					{forminput}
diff --git a/templates/edit_personal_page.tpl b/templates/edit_personal_page.tpl
index 5c8cfbb..1bfcee6 100644
--- a/templates/edit_personal_page.tpl
+++ b/templates/edit_personal_page.tpl
@@ -7,7 +7,7 @@
 		<h1>
 			{* this weird dual assign thing is cause smarty wont interpret backticks to object in assign tag - spiderr *}
 			{assign var=conDescr value=$gContent->getContentTypeName()}
-			{if $pageInfo.page_id}
+			{if !empty($pageInfo.page_id )}
 				{assign var=editLabel value="{tr}Edit{/tr} $conDescr"}
 				{tr}{tr}Edit{/tr} {$pageInfo.original_title}{/tr}
 			{else}
@@ -18,7 +18,7 @@
 	</div>
 
 	{* Check to see if there is an editing conflict *}
-	{if $errors.edit_conflict}
+	{if !empty($errors.edit_conflict)}
 		<script>/* <![CDATA[ */
 			alert( "{$errors.edit_conflict|strip_tags}" );
 		/* ]]> */</script>
@@ -26,7 +26,7 @@
 	{/if}
 
 	<div class="body">
-		{if $translateFrom}
+		{if !empty($translateFrom)}
 			<div class="translate">
 
 				{if $translateFrom->mInfo.google_guess}
@@ -59,7 +59,7 @@
 			</div>
 		{/if}
 
-		{if $page eq 'SandBox'}
+		{if $page ?? '' eq 'SandBox'}
 			<div class="admin box">{tr}The SandBox is a page where you can practice your editing skills, use the preview feature to preview the appeareance of the page, no versions are stored for this page.{/tr}</div>
 		{/if}
 
@@ -67,10 +67,11 @@
 			{jstabs}
 				{jstab title="$editLabel Body"}
 					{legend legend="`$editLabel` Body"}
-						<input type="hidden" name="page_id" value="{$pageInfo.page_id}" />
+						<input type="hidden" name="page_id" value="{$pageInfo.page_id ?? 0}" />
+						<input type="hidden" name="tk" value="{$gBitUser->mTicket}" />
 
 						<div class="form-group">
-							{formfeedback warning=$errors.title}
+							{formfeedback warning=$errors.title ?? ''}
 							{formlabel label="$conDescr Title" for="title"}
 							{forminput}
 								{if $gBitUser->hasPermission( 'p_wiki_rename_page' ) || !$pageInfo.page_id}
@@ -91,7 +92,7 @@
 							</div>
 						{/if}
 
-						{if $pageInfo.edit_section == 1}
+						{if $pageInfo.edit_section ?? 0 == 1}
 							<input type="hidden" name="section" value="{$pageInfo.section}" />
 						{/if}
 
@@ -107,11 +108,11 @@
 							</div>
 						{/if}
 
-						{if $page ne 'SandBox'}
+						{if $page ?? '' ne 'SandBox'}
 							<div class="form-group">
 								{formlabel label="Comment" for="edit_comment"}
 								{forminput}
-									<input size="50" type="text" name="edit_comment" id="edit_comment" value="{$pageInfo.edit_comment}" />
+									<input size="50" type="text" name="edit_comment" id="edit_comment" value="{$pageInfo.edit_comment ?? ''}" />
 									{formhelp note="Add a comment to illustrate your most recent changes."}
 								{/forminput}
 							</div>