https://github.com/opencart/opencart/issues/13454

rahulabs · Jun 16, 2024 · fbc3a48 · fbc3a48
1 parent 632b46f
commit fbc3a48
Show file tree

Hide file tree

Showing 16 changed files with 54 additions and 131 deletions.
diff --git a/upload/admin/controller/catalog/product.php b/upload/admin/controller/catalog/product.php
@@ -14,8 +14,6 @@ class Product extends \Opencart\System\Engine\Controller {
 	public function index(): void {
 		$this->load->language('catalog/product');
 
-		$this->document->setTitle($this->language->get('heading_title'));
-
 		if (isset($this->request->get['filter_name'])) {
 			$filter_name = $this->request->get['filter_name'];
 		} else {
@@ -46,6 +44,8 @@ public function index(): void {
 			$filter_status = '';
 		}
 
+		$this->document->setTitle($this->language->get('heading_title'));
+
 		$url = '';
 
 		if (isset($this->request->get['filter_name'])) {

diff --git a/upload/admin/controller/catalog/review.php b/upload/admin/controller/catalog/review.php
@@ -14,8 +14,6 @@ class Review extends \Opencart\System\Engine\Controller {
 	public function index(): void {
 		$this->load->language('catalog/review');
 
-		$this->document->setTitle($this->language->get('heading_title'));
-
 		if (isset($this->request->get['filter_product'])) {
 			$filter_product = $this->request->get['filter_product'];
 		} else {
@@ -46,6 +44,8 @@ public function index(): void {
 			$filter_date_to = '';
 		}
 
+		$this->document->setTitle($this->language->get('heading_title'));
+
 		$url = '';
 
 		if (isset($this->request->get['filter_product'])) {

diff --git a/upload/admin/controller/common/authorize.php b/upload/admin/controller/common/authorize.php
@@ -14,14 +14,14 @@ class Authorize extends \Opencart\System\Engine\Controller {
 	public function index(): void {
 		$this->load->language('common/authorize');
 
-		$this->document->setTitle($this->language->get('heading_title'));
-
 		if (isset($this->request->cookie['authorize'])) {
 			$token = $this->request->cookie['authorize'];
 		} else {
 			$token = '';
 		}
 
+		$this->document->setTitle($this->language->get('heading_title'));
+
 		// Check to see if user is using incorrect token
 		if (isset($this->session->data['error'])) {
 			$data['error_warning'] = $this->session->data['error'];

diff --git a/upload/admin/controller/localisation/zone.php b/upload/admin/controller/localisation/zone.php
@@ -14,8 +14,6 @@ class Zone extends \Opencart\System\Engine\Controller {
 	public function index(): void {
 		$this->load->language('localisation/zone');
 
-		$this->document->setTitle($this->language->get('heading_title'));
-
 		if (isset($this->request->get['filter_name'])) {
 			$filter_name = (string)$this->request->get['filter_name'];
 		} else {
@@ -34,6 +32,8 @@ public function index(): void {
 			$filter_code = '';
 		}
 
+		$this->document->setTitle($this->language->get('heading_title'));
+
 		$url = '';
 
 		if (isset($this->request->get['sort'])) {

diff --git a/upload/admin/controller/marketing/affiliate.php b/upload/admin/controller/marketing/affiliate.php
@@ -14,8 +14,6 @@ class Affiliate extends \Opencart\System\Engine\Controller {
 	public function index(): void {
 		$this->load->language('marketing/affiliate');
 
-		$this->document->setTitle($this->language->get('heading_title'));
-
 		if (isset($this->request->get['filter_customer'])) {
 			$filter_customer = $this->request->get['filter_customer'];
 		} else {
@@ -64,6 +62,8 @@ public function index(): void {
 			$limit = $this->config->get('config_pagination');
 		}
 
+		$this->document->setTitle($this->language->get('heading_title'));
+
 		$url = '';
 
 		if (isset($this->request->get['filter_customer'])) {

diff --git a/upload/admin/controller/marketing/marketing.php b/upload/admin/controller/marketing/marketing.php
@@ -14,8 +14,6 @@ class Marketing extends \Opencart\System\Engine\Controller {
 	public function index(): void {
 		$this->load->language('marketing/marketing');
 
-		$this->document->setTitle($this->language->get('heading_title'));
-
 		if (isset($this->request->get['filter_name'])) {
 			$filter_name = $this->request->get['filter_name'];
 		} else {
@@ -40,6 +38,8 @@ public function index(): void {
 			$filter_date_to = '';
 		}
 
+		$this->document->setTitle($this->language->get('heading_title'));
+
 		$url = '';
 
 		if (isset($this->request->get['filter_name'])) {

diff --git a/upload/admin/controller/marketplace/marketplace.php b/upload/admin/controller/marketplace/marketplace.php
@@ -14,8 +14,6 @@ class Marketplace extends \Opencart\System\Engine\Controller {
 	public function index(): void {
 		$this->load->language('marketplace/marketplace');
 
-		$this->document->setTitle($this->language->get('heading_title'));
-
 		if (isset($this->request->get['filter_search'])) {
 			$filter_search = (string)$this->request->get['filter_search'];
 		} else {
@@ -64,6 +62,8 @@ public function index(): void {
 			$page = 1;
 		}
 
+		$this->document->setTitle($this->language->get('heading_title'));
+
 		$url = '';
 
 		if (isset($this->request->get['filter_search'])) {

diff --git a/upload/admin/controller/sale/order.php b/upload/admin/controller/sale/order.php
@@ -14,8 +14,6 @@ class Order extends \Opencart\System\Engine\Controller {
 	public function index(): void {
 		$this->load->language('sale/order');
 
-		$this->document->setTitle($this->language->get('heading_title'));
-
 		if (isset($this->request->get['filter_order_id'])) {
 			$filter_order_id = (int)$this->request->get['filter_order_id'];
 		} else {
@@ -70,6 +68,9 @@ public function index(): void {
 			$filter_date_to = '';
 		}
 
+
+		$this->document->setTitle($this->language->get('heading_title'));
+
 		$url = '';
 
 		if (isset($this->request->get['filter_order_id'])) {

diff --git a/upload/admin/controller/sale/returns.php b/upload/admin/controller/sale/returns.php
@@ -14,8 +14,6 @@ class Returns extends \Opencart\System\Engine\Controller {
 	public function index(): void {
 		$this->load->language('sale/returns');
 
-		$this->document->setTitle($this->language->get('heading_title'));
-
 		if (isset($this->request->get['filter_return_id'])) {
 			$filter_return_id = (int)$this->request->get['filter_return_id'];
 		} else {
@@ -64,6 +62,8 @@ public function index(): void {
 			$filter_date_to = '';
 		}
 
+		$this->document->setTitle($this->language->get('heading_title'));
+
 		$url = '';
 
 		if (isset($this->request->get['filter_return_id'])) {

diff --git a/upload/admin/controller/sale/subscription.php b/upload/admin/controller/sale/subscription.php
@@ -14,8 +14,6 @@ class Subscription extends \Opencart\System\Engine\Controller {
 	public function index(): void {
 		$this->load->language('sale/subscription');
 
-		$this->document->setTitle($this->language->get('heading_title'));
-
 		if (isset($this->request->get['filter_subscription_id'])) {
 			$filter_subscription_id = (int)$this->request->get['filter_subscription_id'];
 		} else {
@@ -52,6 +50,8 @@ public function index(): void {
 			$filter_date_to = '';
 		}
 
+		$this->document->setTitle($this->language->get('heading_title'));
+
 		$url = '';
 
 		if (isset($this->request->get['filter_subscription_id'])) {

diff --git a/upload/catalog/controller/account/authorize.php b/upload/catalog/controller/account/authorize.php
@@ -12,14 +12,14 @@ class Authorize extends \Opencart\System\Engine\Controller {
 	public function index(): void {
 		$this->load->language('account/authorize');
 
-		$this->document->setTitle($this->language->get('heading_title'));
-
 		if (isset($this->request->cookie['authorize'])) {
 			$token = $this->request->cookie['authorize'];
 		} else {
 			$token = '';
 		}
 
+		$this->document->setTitle($this->language->get('heading_title'));
+
 		// Check to see if user is using incorrect token
 		if (isset($this->session->data['error'])) {
 			$data['error_warning'] = $this->session->data['error'];

diff --git a/upload/install/controller/install/step_3.php b/upload/install/controller/install/step_3.php
@@ -6,11 +6,6 @@
  * @package Opencart\Install\Controller\Install
  */
 class Step3 extends \Opencart\System\Engine\Controller {
-	/**
-	 * @var array<string, string>
-	 */
-	private array $error = [];
-
 	/**
 	 * @return void
 	 */
@@ -31,15 +26,14 @@ public function index(): void {
 		$data['text_db_connection'] = $this->language->get('text_db_connection');
 		$data['text_db_advanced'] = $this->language->get('text_db_advanced');
 		$data['text_db_administration'] = $this->language->get('text_db_administration');
+		$data['text_db_ssl'] = $this->language->get('text_db_ssl');
 		$data['text_mysqli'] = $this->language->get('text_mysqli');
 		$data['text_mpdo'] = $this->language->get('text_mpdo');
 		$data['text_help'] = $this->language->get('text_help');
 		$data['text_cpanel'] = $this->language->get('text_cpanel');
 		$data['text_plesk'] = $this->language->get('text_plesk');
-		$data['text_db_ssl'] = $this->language->get('text_db_ssl');
 
 		$data['entry_db_driver'] = $this->language->get('entry_db_driver');
-		$data['entry_db_driver_select'] = $this->language->get('entry_db_driver_select');
 		$data['entry_db_hostname'] = $this->language->get('entry_db_hostname');
 		$data['entry_db_username'] = $this->language->get('entry_db_username');
 		$data['entry_db_password'] = $this->language->get('entry_db_password');

diff --git a/upload/install/language/en-gb/install/step_3.php b/upload/install/language/en-gb/install/step_3.php
@@ -30,9 +30,6 @@
 $_['entry_password']         = 'Password';
 $_['entry_email']            = 'E-Mail';
 
-// Help
-
-
 // Error
 $_['error_db_driver']        = 'Database Driver required!';
 $_['error_db_hostname']      = 'Hostname required!';

diff --git a/upload/install/view/stylesheet/stylesheet.css b/upload/install/view/stylesheet/stylesheet.css
@@ -122,69 +122,6 @@ div.required .form-label:not(span):before, td.required:before {
     margin-left: 4px;
 }
 
-input[type="radio"], .radio input[type="radio"], .radio-inline input[type="radio"], input[type="checkbox"], .checkbox input[type="checkbox"], .checkbox-inline input[type="checkbox"] {
-    position: relative;
-    width: 13px;
-    width: 16px \0;
-    height: 13px;
-    height: 16px \0;
-    -webkit-appearance: none;
-    background: white;
-    border: 1px solid #dcdcdc;
-    border: 1px solid transparent \0;
-    border-radius: 1px;
-}
-
-input[type="radio"]:focus, .radio input[type="radio"]:focus, .radio-inline input[type="radio"]:focus, input[type="checkbox"]:focus, .checkbox input[type="checkbox"]:focus, .checkbox-inline input[type="checkbox"]:focus {
-    border-color: #4d90fe;
-    outline: 0;
-}
-
-input[type="radio"]:active, .radio input[type="radio"]:active, .radio-inline input[type="radio"]:active, input[type="checkbox"]:active, .checkbox input[type="checkbox"]:active, .checkbox-inline input[type="checkbox"]:active {
-    background-color: #ebebeb;
-    border-color: #c6c6c6;
-}
-
-input[type="radio"]:checked, .radio input[type="radio"]:checked, .radio-inline input[type="radio"]:checked, input[type="checkbox"]:checked, .checkbox input[type="checkbox"]:checked, .checkbox-inline input[type="checkbox"]:checked {
-    background: #fff;
-}
-
-input[type="radio"], .radio input[type="radio"], .radio-inline input[type="radio"] {
-    width: 15px;
-    width: 18px \0;
-    height: 15px;
-    height: 18px \0;
-    border-radius: 1em;
-}
-
-input[type="radio"]:checked::after, .radio input[type="radio"]:checked::after, .radio-inline input[type="radio"]:checked::after {
-    position: relative;
-    top: 3px;
-    left: 3px;
-    display: block;
-    width: 7px;
-    height: 7px;
-    content: '';
-    background: #666;
-    border-radius: 1em;
-}
-
-input[type="checkbox"]:hover, .checkbox input[type="checkbox"]:hover, .checkbox-inline input[type="checkbox"]:hover {
-    border-color: #c6c6c6;
-    -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, .1);
-    -webkit-box-shadow: none \9;
-    box-shadow: inset 0 1px 1px rgba(0, 0, 0, .1);
-    box-shadow: none \9;
-}
-
-input[type="checkbox"]:checked::after, .checkbox input[type="checkbox"]:checked::after, .checkbox-inline input[type="checkbox"]:checked::after {
-    position: absolute;
-    top: -6px;
-    left: -5px;
-    display: block;
-    content: url('../image/checkmark.png');
-}
-
 .table thead td {
     font-weight: bold;
 }

diff --git a/upload/install/view/template/install/step_2.twig b/upload/install/view/template/install/step_2.twig
@@ -7,12 +7,10 @@
     </div>
   </div>
   <div class="container">
-
     <div class="card">
       <div class="card-header"><i class="fa-solid fa-pencil"></i> {{ text_step_2 }}</div>
       <div class="card-body">
         <form id="form-step-2">
-
           <fieldset>
             <legend>{{ text_install_php }}</legend>
             <table class="table table-bordered">
@@ -97,7 +95,6 @@
               </tbody>
             </table>
           </fieldset>
-
           <fieldset>
             <legend>{{ text_install_extension }}</legend>
             <table class="table table-bordered">
@@ -213,7 +210,6 @@
               </tbody>
             </table>
           </fieldset>
-
           <fieldset>
             <legend>{{ text_install_file }}</legend>
             <table class="table table-bordered">
@@ -243,12 +239,10 @@
               </tbody>
             </table>
           </fieldset>
-
           <div class="row mt-3">
             <div class="col"><a href="{{ back }}" class="btn btn-light">{{ button_back }}</a></div>
             <div class="col text-end"><input type="submit" id="button-continue" value="{{ button_continue }}" class="btn btn-primary"/></div>
           </div>
-
         </form>
       </div>
     </div>