update #562

sp-framework · Aug 18, 2024 · 3dc37f8 · 3dc37f8
1 parent ae290b7
commit 3dc37f8
Show file tree

Hide file tree

Showing 14 changed files with 30 additions and 30 deletions.
diff --git a/apps/Core/Views/Default/html/auth/agent.html b/apps/Core/Views/Default/html/auth/agent.html
@@ -52,7 +52,7 @@
                 </div>
                 <div class="login-footer text-sm text-center">
                     <b>
-                        <a class="text-teal" href="https://www.bazaari.com.au">Bazaari E Trade Pty. Ltd.</a>
+                        <a class="text-teal" href="https://github.com/sp-framework/core">SP Framework</a>
                     </b>
                     <br>
                     Copyright © 2014-{{date("Y")}}. All rights reserved.

diff --git a/apps/Core/Views/Default/html/domains/form/info.html b/apps/Core/Views/Default/html/domains/form/info.html
@@ -109,7 +109,7 @@
                 'fieldId'                        : 'is_internal',
                 'fieldLabel'                     : 'Domain is internal?',
                 'fieldHelp'                      : true,
-                'fieldHelpTooltipContent'        : 'Is this domain not a public domain? example: localhost, bazaari.local',
+                'fieldHelpTooltipContent'        : 'Is this domain not a public domain? example: localhost, sp.local',
                 'fieldType'                      : 'checkbox',
                 'fieldCheckboxType'              : 'info',
                 'fieldCheckboxChecked'           : internalChecked,

diff --git a/apps/Core/Views/Default/html/layouts/auth.html b/apps/Core/Views/Default/html/layouts/auth.html
@@ -19,7 +19,7 @@
         <script>
 /* globals dataCollection */
 if (!window.dataCollection) {
-    window.name = 'Bazaari';
+    window.name = 'SP';
     //For all data collection. Section Data collection, has list of fields, whole section HTML, section fields data
     window.dataCollection = { };
     dataCollection = window.dataCollection;

diff --git a/apps/Core/Views/Default/html/layouts/default.html b/apps/Core/Views/Default/html/layouts/default.html
@@ -22,7 +22,7 @@
         <script>
 /* globals dataCollection */
 if (!window.dataCollection) {
-    window.name = 'Bazaari';
+    window.name = 'SP';
     //For all data collection. Section Data collection, has list of fields, whole section HTML, section fields data
     window.dataCollection = { };
     dataCollection = window.dataCollection;

diff --git a/apps/Core/Views/Default/html/layouts/topnav.html b/apps/Core/Views/Default/html/layouts/topnav.html
@@ -22,7 +22,7 @@
         <script>
 /* globals dataCollection */
 if (!window.dataCollection) {
-    window.name = 'Bazaari';
+    window.name = 'SP';
     //For all data collection. Section Data collection, has list of fields, whole section HTML, section fields data
     window.dataCollection = { };
     dataCollection = window.dataCollection;

diff --git a/apps/Core/Views/Default/html/layouts/topnavsidebar.html b/apps/Core/Views/Default/html/layouts/topnavsidebar.html
@@ -22,7 +22,7 @@
         <script>
 /* globals dataCollection */
 if (!window.dataCollection) {
-    window.name = 'Bazaari';
+    window.name = 'SP';
     //For all data collection. Section Data collection, has list of fields, whole section HTML, section fields data
     window.dataCollection = { };
     dataCollection = window.dataCollection;

diff --git a/apps/Core/Views/Default/view.json b/apps/Core/Views/Default/view.json
@@ -1,6 +1,6 @@
 {
     "name": "Default",
-    "display_name": "Bazaari Core Default View",
+    "display_name": "SP Framework Core Default View",
     "description": "Default Core View",
     "module_type": "views",
     "app_type": "core",
@@ -67,14 +67,14 @@
         "head":
         {
             "doctype": "XHTML5",
-            "title": "Bazaari Core",
+            "title": "SP Framework Core",
             "meta":
             {
                 "author": "[email protected]",
                 "charset": "UTF-8",
                 "keywords": "HTML, CSS, JavaScript",
                 "viewport": "width=device-width, initial-scale=1, shrink-to-fit=no",
-                "description": "Bazaari Core Views"
+                "description": "SP Framework Core Views"
             },
             "link":
             {
@@ -126,8 +126,8 @@
             "copyright":
             {
                 "fromYear": "2014",
-                "site": "https://www.bazaari.com.au",
-                "name": "Bazaari E Trade Pty. Ltd."
+                "site": "https://github.com/sp-framework/core",
+                "name": "SP Framework"
             },
             "script":
             {

diff --git a/system/Base/Installer/Packages/Setup.php b/system/Base/Installer/Packages/Setup.php
@@ -408,7 +408,7 @@ protected function cleanOldBackupsFiles($files)
 
 	protected function cleanOldCookies()
 	{
-		$cookieKey = 'Bazaari';
+		$cookieKey = 'SP';
 
 		//Set cookies to 1 second so browser removes them.
 		$this->cookies->set(

diff --git a/system/Base/Installer/Packages/Setup/Register/Modules/Packages/Providers/Core/package.json b/system/Base/Installer/Packages/Setup/Register/Modules/Packages/Providers/Core/package.json
@@ -1,7 +1,7 @@
 {
 	"name" : "Core",
-	"display_name" : "Bazaari Core",
-	"description" : "Bazaari Framework Core Module",
+	"display_name" : "SP Framework Core",
+	"description" : "SP Framework Core Module",
 	"module_type" : "packages",
 	"app_type" : "core",
 	"category" : "providers",

diff --git a/system/Base/Installer/View/setup.phtml b/system/Base/Installer/View/setup.phtml
@@ -5,7 +5,7 @@
         <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
         <meta name="description" content="">
         <meta name="author" content="">
-        <title>Bazaari Framework Core Setup</title>
+        <title>SP Framework Core Setup</title>
         <link rel="stylesheet" type="text/css" href="/core/default/css/core.css">
         <link rel="stylesheet" type="text/css" href="/core/default/css/plugins.css">
         <script src="/core/default/js/header/jsHeaderDependencies.js"></script>
@@ -42,9 +42,9 @@
                         <div class="card mt-2 mb-2">
                             <form autocomplete="off">
                                 <?php if ($onlyUpdateDb) { ?>
-                                    <div class="card-header bg-primary text-white text-center font-weight-bold text-uppercase rounded-0">Bazaari Framework Database Update</div>
+                                    <div class="card-header bg-primary text-white text-center font-weight-bold text-uppercase rounded-0">SP Framework Database Update</div>
                                 <?php } else { ?>
-                                    <div class="card-header bg-primary text-white text-center font-weight-bold text-uppercase rounded-0">Bazaari Framework Core Setup</div>
+                                    <div class="card-header bg-primary text-white text-center font-weight-bold text-uppercase rounded-0">SP Framework Core Setup</div>
                                 <?php } ?>
                                 <div class="card-body bg-white">
                                     <?php if (!$precheckFail) { ?>
@@ -320,7 +320,7 @@
                                                 </div>
                                             <?php } else { ?>
                                                 <div class="col">
-                                                    Bazaari Framework requires some external dependencies which are not available on this system. You can either install those dependencies using CLI if you have access to the server using the command <span class="text-info">./composer install"</span> in the <span class="text-info">external/ folder</span>. That will install the required dependencies and you can then run this setup again.<br><br>
+                                                    SP Framework requires some external dependencies which are not available on this system. You can either install those dependencies using CLI if you have access to the server using the command <span class="text-info">./composer install"</span> in the <span class="text-info">external/ folder</span>. That will install the required dependencies and you can then run this setup again.<br><br>
                                                     If in case you do not have access to the server via CLI, you can click "Download & Install Dependencies" button and the framework will try and install the files for you.
                                                 </div>
                                             <?php } ?>
@@ -385,7 +385,7 @@
             </div>
         </div>
         <footer class="footer text-center m-2">
-            Copyright © <strong><a target="_blank" href="https://www.bazaari.com.au/">Bazaari E Trade Pty Ltd.</a></strong> 2014-<?php echo date("Y"); ?> All rights reserved.
+            Copyright © <strong><a target="_blank" href="https://github.com/sp-framework/core">SP Framework</a></strong> 2014-<?php echo date("Y"); ?> All rights reserved.
             <script src="/core/default/js/footer/jsFooterDependencies.js"></script>
             <script src="/core/default/js/footer/jsFooterCore.js"></script>
             <script src="/core/default/js/footer/jsFooterPlugins.js"></script>

diff --git a/system/Base/Providers/BasepackagesServiceProvider/Packages/Messenger.php b/system/Base/Providers/BasepackagesServiceProvider/Packages/Messenger.php
@@ -164,7 +164,7 @@ protected function checkSession($cookies)
     {
         if ($this->accountsObj->sessions) {
             foreach ($this->accountsObj->sessions as $key => $session) {
-                if ($session->session_id === $cookies['Bazaari']) {
+                if ($session->session_id === $cookies['SP']) {
                     return true;
                 }
             }

diff --git a/system/Base/Providers/BasepackagesServiceProvider/Packages/Pusher.php b/system/Base/Providers/BasepackagesServiceProvider/Packages/Pusher.php
@@ -172,17 +172,17 @@ protected function checkAccount($conn)
             // return false;//Disconnect as we didnt receive appRoute
         }
 
-        if (!isset($cookies['Bazaari'])) {
+        if (!isset($cookies['SP'])) {
             $this->access->ipFilter->bumpFilterHitCounter(null, false, true, $this->appRoute);
 
-            $this->logger->log->debug($conn->httpRequest->getHeader('X-Forwarded-For')[0] . ' Bazaari Cookie not set. Disconnecting websocket.');
+            $this->logger->log->debug($conn->httpRequest->getHeader('X-Forwarded-For')[0] . ' SP Cookie not set. Disconnecting websocket.');
 
             return false;
         }
 
         //For Installer Progress
         if (isset($cookies['Installer']) &&
-            $cookies['Installer'] === $cookies['Bazaari']
+            $cookies['Installer'] === $cookies['SP']
         ) {
             $this->opCache->setCache('InstallerResourceId', $conn->resourceId, 'pusher');
 
@@ -250,7 +250,7 @@ protected function checkAccount($conn)
                                         [
                                             'conditions'    => 'session_id = :sid: AND account_id = :aid: AND verified = :ver: user_agent AND :agent:',
                                             'bind'          => [
-                                                'sid'       => $cookies['Bazaari'],
+                                                'sid'       => $cookies['SP'],
                                                 'aid'       => $this->account['id'],
                                                 'ver'       => '1',
                                                 'user_agent'=> $agent
@@ -269,7 +269,7 @@ protected function checkAccount($conn)
 
                                 $agents = $agentsStore->findOneBy(
                                     [
-                                        ['session_id', '=', $cookies['Bazaari']],
+                                        ['session_id', '=', $cookies['SP']],
                                         ['account_id', '=', $this->account['id']],
                                         ['verified', '=', true],
                                         ['user_agent', '=', $agent]
@@ -331,15 +331,15 @@ protected function checkSession($cookies)
         if ($this->config->databasetype === 'db') {
             if ($this->accountsObj && $this->accountsObj->sessions) {
                 foreach ($this->accountsObj->sessions as $key => $session) {
-                    if ($session->session_id === $cookies['Bazaari']) {
+                    if ($session->session_id === $cookies['SP']) {
                         return true;
                     }
                 }
             }
         } else {
             if ($this->account && count($this->account['sessions']) > 0) {
                 foreach ($this->account['sessions'] as $key => $session) {
-                    if ($session['session_id'] === $cookies['Bazaari']) {
+                    if ($session['session_id'] === $cookies['SP']) {
                         return true;
                     }
                 }

diff --git a/system/Base/Providers/BasepackagesServiceProvider/Packages/Templates.php b/system/Base/Providers/BasepackagesServiceProvider/Packages/Templates.php
@@ -183,11 +183,11 @@ protected function getHeader($css = '', $js = '')
             <html lang="en">
                 <head>
                     <meta charset="UTF-8">
-                    <meta name="description" content="Bazaari">
+                    <meta name="description" content="SP Framework">
                     <meta name="keywords" content="HTML, CSS, JavaScript">
                     <meta name="author" content="Guru">
                     <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
-                    <title>Bazaari</title>' .
+                    <title>SP Framework</title>' .
                     $css .
                     $js .
                 '</head>

diff --git a/system/Base/Providers/SessionServiceProvider/Session.php b/system/Base/Providers/SessionServiceProvider/Session.php
@@ -30,7 +30,7 @@ public function init()
         );
 
         $this->session->setAdapter($sessionFiles);
-        $this->session->setName('Bazaari');
+        $this->session->setName('SP');
 
         return $this->session;
     }