Rebuild 1.0.3

deschutesdesigngroupllc · Jun 8, 2023 · 826b026 · 826b026
1 parent e9a5a42
commit 826b026
Show file tree

Hide file tree

Showing 7 changed files with 31 additions and 27 deletions.
diff --git a/data/furl.json b/data/furl.json
@@ -2,26 +2,12 @@
   "topLevel": "",
   "pages": {
     "stripeverification_verify": {
-      "friendly": "verifications/verify/{#member}",
-      "real": "app=stripeverification&module=system&controller=verification&do=verify",
-      "seoTitles": [
-        {
-          "class": "\\IPS\\Member",
-          "queryParam": "member",
-          "property": "id"
-        }
-      ]
+      "friendly": "verifications/verify",
+      "real": "app=stripeverification&module=system&controller=verification&do=verify"
     },
     "stripeverification_unverify": {
-      "friendly": "verifications/unverify/{#member}",
-      "real": "app=stripeverification&module=system&controller=verification&do=unverify",
-      "seoTitles": [
-        {
-          "class": "\\IPS\\Member",
-          "queryParam": "member",
-          "property": "id"
-        }
-      ]
+      "friendly": "verifications/unverify",
+      "real": "app=stripeverification&module=system&controller=verification&do=unverify"
     },
     "modcp_stripeverification": {
       "friendly": "modcp/verifications",

diff --git a/data/theme.xml b/data/theme.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <theme name="Default" author_name="Invision Power Services, Inc" author_url="https://www.invisioncommunity.com">
- <template template_group="modcp" template_name="unverifyButton" template_data="$member" template_location="front" template_app="stripeverification"><![CDATA[<a class="ipsButton ipsButton_small ipsButton_link" target="self" href='{url="app=stripeverification&module=system&controller=verification&do=unverify&member=$member" seoTemplate="stripeverification_unverify" seoTitle="$member"}'>{lang="modcp_stripeverification_unverify"}</a>]]></template>
+ <template template_group="modcp" template_name="unverifyButton" template_data="$member" template_location="front" template_app="stripeverification"><![CDATA[<a class="ipsButton ipsButton_small ipsButton_link" target="self" href='{url="app=stripeverification&module=system&controller=verification&do=unverify" seoTemplate="stripeverification_unverify"}'>{lang="modcp_stripeverification_unverify"}</a>]]></template>
  <template template_group="modcp" template_name="verifications" template_data="$table" template_location="front" template_app="stripeverification"><![CDATA[<div class='ipsBox'>
     <h2 class="ipsType_sectionTitle ipsType_reset">{lang="modcp_stripeverification"}</h2>
 	<div class='ipsClear'>
 		{$table|raw}
 	</div>
 </div>]]></template>
- <template template_group="modcp" template_name="verifyButton" template_data="$member" template_location="front" template_app="stripeverification"><![CDATA[<a class="ipsButton ipsButton_small ipsButton_link" target="self" href='{url="app=stripeverification&module=system&controller=verification&do=verify&member=$member" seoTemplate="stripeverification_verify" seoTitle="$member"}'>{lang="modcp_stripeverification_verify"}</a>]]></template>
+ <template template_group="modcp" template_name="verifyButton" template_data="$member" template_location="front" template_app="stripeverification"><![CDATA[<a class="ipsButton ipsButton_small ipsButton_link" target="self" href='{url="app=stripeverification&module=system&controller=verification&do=verify" seoTemplate="stripeverification_verify"}'>{lang="modcp_stripeverification_verify"}</a>]]></template>
  <template template_group="verification" template_name="check" template_data="$member, $size=null" template_location="front" template_app="stripeverification"><![CDATA[{{if $member->verified}}
     <span style="color: {setting='stripeverification_icon_color'}; margin: 0px; padding: 0px; background: none;">
         <i style="margin: 2px; {{if $size}}font-size: {$size}px;{{endif}}" class="{setting='stripeverification_icon'}"></i>

diff --git a/dev/html/front/modcp/unverifyButton.phtml b/dev/html/front/modcp/unverifyButton.phtml
@@ -1,2 +1,2 @@
 <ips:template parameters="$member" />
-<a class="ipsButton ipsButton_small ipsButton_link" target="self" href='{url="app=stripeverification&module=system&controller=verification&do=unverify&member=$member" seoTemplate="stripeverification_unverify" seoTitle="$member"}'>{lang="modcp_stripeverification_unverify"}</a>
+<a class="ipsButton ipsButton_small ipsButton_link" target="self" href='{url="app=stripeverification&module=system&controller=verification&do=unverify" seoTemplate="stripeverification_unverify"}'>{lang="modcp_stripeverification_unverify"}</a>
diff --git a/dev/html/front/modcp/verifyButton.phtml b/dev/html/front/modcp/verifyButton.phtml
@@ -1,2 +1,2 @@
 <ips:template parameters="$member" />
-<a class="ipsButton ipsButton_small ipsButton_link" target="self" href='{url="app=stripeverification&module=system&controller=verification&do=verify&member=$member" seoTemplate="stripeverification_verify" seoTitle="$member"}'>{lang="modcp_stripeverification_verify"}</a>
+<a class="ipsButton ipsButton_small ipsButton_link" target="self" href='{url="app=stripeverification&module=system&controller=verification&do=verify" seoTemplate="stripeverification_verify"}'>{lang="modcp_stripeverification_verify"}</a>
diff --git a/modules/front/system/verification.php b/modules/front/system/verification.php
@@ -71,8 +71,7 @@ protected function finish()
      */
     protected function verify()
     {
-        $member = \IPS\Member::load(\IPS\Request::i()->member);
-
+        $member = \IPS\Member::loggedIn();
         $member->markMemberVerified();
 
         \IPS\Output::i()->redirect(\IPS\Http\Url::internal('app=core&module=modcp&controller=modcp&tab=stripeverification', 'front', 'modcp_stripeverification'), 'modcp_stripeverification_verified');
@@ -83,8 +82,7 @@ protected function verify()
      */
     protected function unverify()
     {
-        $member = \IPS\Member::load(\IPS\Request::i()->member);
-
+        $member = \IPS\Member::loggedIn();
         $member->markMemberUnverified();
 
         \IPS\Output::i()->redirect(\IPS\Http\Url::internal('app=core&module=modcp&controller=modcp&tab=stripeverification', 'front', 'modcp_stripeverification'), 'modcp_stripeverification_unverified');

diff --git a/setup/upg_10003/data.json b/setup/upg_10003/data.json
@@ -4,7 +4,7 @@
     "steps": {
         "queries": false,
         "lang": false,
-        "theme": false,
+        "theme": true,
         "themeSettings": false,
         "javascript": false,
         "emailTemplates": false,

diff --git a/setup/upg_10003/theme.json b/setup/upg_10003/theme.json
@@ -0,0 +1,20 @@
+{
+    "html": {
+        "added": [],
+        "edited": [
+            "front\/modcp\/unverifyButton",
+            "front\/modcp\/verifyButton"
+        ],
+        "removed": []
+    },
+    "css": {
+        "added": [],
+        "edited": [],
+        "removed": []
+    },
+    "resources": {
+        "added": [],
+        "edited": [],
+        "removed": []
+    }
+}