From 67e98f280d8c4d98a10e29aeb12635f891565277 Mon Sep 17 00:00:00 2001 From: DaRock Date: Sun, 19 Jan 2020 17:40:30 +0200 Subject: [PATCH 1/3] Support for OpenCart 3.x added --- app/Http/Middleware/AdminMiddleware.php | 4 +- .../{2.3 => 2.x}/opencore.ocmod.zip | Bin .../controller/extension/module/opencore.php | 0 .../admin/controller/startup/opencore.php | 0 .../en-gb/extension/module/opencore.php | 0 .../ro-ro/extension/module/opencore.php | 0 .../template/extension/module/opencore.tpl | 0 .../catalog/controller/startup/opencore.php | 0 .../upload/system/library/db/corepdo.php | 0 opencart-module/3.x/opencore.ocmod.zip | Bin 0 -> 11279 bytes .../controller/extension/module/opencore.php | 132 +++++++++ .../admin/controller/startup/opencore.php | 86 ++++++ .../en-gb/extension/module/opencore.php | 15 + .../ro-ro/extension/module/opencore.php | 15 + .../template/extension/module/opencore.twig | 33 +++ .../catalog/controller/startup/opencore.php | 56 ++++ .../3.x/upload/system/library/db/corepdo.php | 269 ++++++++++++++++++ support/Opencart/Installer.php | 2 +- 18 files changed, 610 insertions(+), 2 deletions(-) rename opencart-module/{2.3 => 2.x}/opencore.ocmod.zip (100%) rename opencart-module/{2.3 => 2.x}/upload/admin/controller/extension/module/opencore.php (100%) rename opencart-module/{2.3 => 2.x}/upload/admin/controller/startup/opencore.php (100%) rename opencart-module/{2.3 => 2.x}/upload/admin/language/en-gb/extension/module/opencore.php (100%) rename opencart-module/{2.3 => 2.x}/upload/admin/language/ro-ro/extension/module/opencore.php (100%) rename opencart-module/{2.3 => 2.x}/upload/admin/view/template/extension/module/opencore.tpl (100%) rename opencart-module/{2.3 => 2.x}/upload/catalog/controller/startup/opencore.php (100%) rename opencart-module/{2.3 => 2.x}/upload/system/library/db/corepdo.php (100%) create mode 100644 opencart-module/3.x/opencore.ocmod.zip create mode 100644 opencart-module/3.x/upload/admin/controller/extension/module/opencore.php create mode 100644 opencart-module/3.x/upload/admin/controller/startup/opencore.php create mode 100644 opencart-module/3.x/upload/admin/language/en-gb/extension/module/opencore.php create mode 100644 opencart-module/3.x/upload/admin/language/ro-ro/extension/module/opencore.php create mode 100644 opencart-module/3.x/upload/admin/view/template/extension/module/opencore.twig create mode 100644 opencart-module/3.x/upload/catalog/controller/startup/opencore.php create mode 100644 opencart-module/3.x/upload/system/library/db/corepdo.php diff --git a/app/Http/Middleware/AdminMiddleware.php b/app/Http/Middleware/AdminMiddleware.php index deb0ff2..071d1f3 100644 --- a/app/Http/Middleware/AdminMiddleware.php +++ b/app/Http/Middleware/AdminMiddleware.php @@ -29,8 +29,10 @@ public function handle(Request $request, Closure $next) $session = Startup::getRegistry('session'); + $tokenKey = getTokenKey(); + /** check if OpenCart admin token is present and if is valid */ - if(empty($session->data['token']) || empty($request->get('token')) || $session->data['token'] != $request->get('token')) { + if(empty($session->data[$tokenKey]) || empty($request->get($tokenKey)) || $session->data[$tokenKey] != $request->get($tokenKey)) { return redirect(basename(DIR_APPLICATION) . '/login'); } diff --git a/opencart-module/2.3/opencore.ocmod.zip b/opencart-module/2.x/opencore.ocmod.zip similarity index 100% rename from opencart-module/2.3/opencore.ocmod.zip rename to opencart-module/2.x/opencore.ocmod.zip diff --git a/opencart-module/2.3/upload/admin/controller/extension/module/opencore.php b/opencart-module/2.x/upload/admin/controller/extension/module/opencore.php similarity index 100% rename from opencart-module/2.3/upload/admin/controller/extension/module/opencore.php rename to opencart-module/2.x/upload/admin/controller/extension/module/opencore.php diff --git a/opencart-module/2.3/upload/admin/controller/startup/opencore.php b/opencart-module/2.x/upload/admin/controller/startup/opencore.php similarity index 100% rename from opencart-module/2.3/upload/admin/controller/startup/opencore.php rename to opencart-module/2.x/upload/admin/controller/startup/opencore.php diff --git a/opencart-module/2.3/upload/admin/language/en-gb/extension/module/opencore.php b/opencart-module/2.x/upload/admin/language/en-gb/extension/module/opencore.php similarity index 100% rename from opencart-module/2.3/upload/admin/language/en-gb/extension/module/opencore.php rename to opencart-module/2.x/upload/admin/language/en-gb/extension/module/opencore.php diff --git a/opencart-module/2.3/upload/admin/language/ro-ro/extension/module/opencore.php b/opencart-module/2.x/upload/admin/language/ro-ro/extension/module/opencore.php similarity index 100% rename from opencart-module/2.3/upload/admin/language/ro-ro/extension/module/opencore.php rename to opencart-module/2.x/upload/admin/language/ro-ro/extension/module/opencore.php diff --git a/opencart-module/2.3/upload/admin/view/template/extension/module/opencore.tpl b/opencart-module/2.x/upload/admin/view/template/extension/module/opencore.tpl similarity index 100% rename from opencart-module/2.3/upload/admin/view/template/extension/module/opencore.tpl rename to opencart-module/2.x/upload/admin/view/template/extension/module/opencore.tpl diff --git a/opencart-module/2.3/upload/catalog/controller/startup/opencore.php b/opencart-module/2.x/upload/catalog/controller/startup/opencore.php similarity index 100% rename from opencart-module/2.3/upload/catalog/controller/startup/opencore.php rename to opencart-module/2.x/upload/catalog/controller/startup/opencore.php diff --git a/opencart-module/2.3/upload/system/library/db/corepdo.php b/opencart-module/2.x/upload/system/library/db/corepdo.php similarity index 100% rename from opencart-module/2.3/upload/system/library/db/corepdo.php rename to opencart-module/2.x/upload/system/library/db/corepdo.php diff --git a/opencart-module/3.x/opencore.ocmod.zip b/opencart-module/3.x/opencore.ocmod.zip new file mode 100644 index 0000000000000000000000000000000000000000..fc0cf6897208e90d49986d486dbb88fce704d1b7 GIT binary patch literal 11279 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 zk|5@FtgE?P@U^Vpload->language('extension/module/opencore'); + + $this->document->setTitle($this->language->get('heading_title')); + + $data['heading_title'] = $this->language->get('heading_title'); + + $data['breadcrumbs'] = array(); + + $data['breadcrumbs'][] = array( + 'text' => $this->language->get('text_home'), + 'href' => $this->url->link('common/dashboard', 'user_token=' . $this->session->data['user_token'], true) + ); + + $data['breadcrumbs'][] = array( + 'text' => $this->language->get('text_extension'), + 'href' => $this->url->link('extension/extension', 'user_token=' . $this->session->data['user_token'] . '&type=module', true) + ); + + $data['breadcrumbs'][] = array( + 'text' => $this->language->get('heading_title'), + 'href' => $this->url->link('extension/module/opencore', 'user_token=' . $this->session->data['user_token'], true) + ); + + $this->checkInstalation(); + if (empty($this->errors)) { + $data['success_message'] = $this->language->get('text_success'); + } else { + $data['error_instalation_failure'] = $this->language->get('error_instalation_failure'); + $data['errors'] = $this->errors; + } + + $data['header'] = $this->load->controller('common/header'); + $data['column_left'] = $this->load->controller('common/column_left'); + $data['footer'] = $this->load->controller('common/footer'); + + $this->response->setOutput($this->load->view('extension/module/opencore', $data)); + } + + public function install() + { + $this->installHtaccess(); + + $this->installOcmod('opencore'); + $this->refreshOcmod(); + + $this->installEvent('opencore_admin_menu', 'startup/opencore/before_view', 'admin/view/*/before'); + $this->installEvent('opencore_admin_before_c', 'startup/opencore/before_controller', 'admin/controller/*/before'); + $this->installEvent('opencore_catalog_before_c', 'startup/opencore/before_controller', 'catalog/controller/*/before'); + + $this->addPermissions('extension/module/opencore', ['access', 'modify']); + $this->addPermissions('core/*', ['access', 'modify']); + + $this->session->data['success'] = $this->language->get('text_success'); + } + + public function uninstall() + { + $this->removeHtaccess(); + + $this->removeOcmod('opencore'); + $this->refreshOcmod(); + + $this->removeEvent('opencore_admin_menu'); + $this->removeEvent('opencore_admin_before_c'); + $this->removeEvent('opencore_catalog_before_c'); + + $this->removePermissions('extension/module/opencore', ['access', 'modify']); + $this->removePermissions('core/*', ['access', 'modify']); + + $this->session->data['success'] = $this->language->get('text_success'); + + if (isOc3()) { + $route = 'marketplace/extension'; + } else { + $route = 'extension/extension'; + } + + $location = "index.php?route={$route}&" . $this->getTokenStr() . '&type=module'; + die(""); + } + + private function checkInstalation() + { + /* + * Server Requirements + * PHP >= 5.6.4 + * OpenSSL PHP Extension + * PDO PHP Extension + * Mbstring PHP Extension + */ + + //will fail if the before_controller will not be triggered + if (!class_exists('ControllerStartupOpencore')) { + $this->errors[] = $this->language->get('error_router'); + } + + //TODO: need to check event entry/status for opencore_catalog_before_controll & opencore_admin_menu + + $this->load->model('setting/modification'); + $modification = $this->model_setting_modification->getModificationByCode('opencore'); + + if (empty($modification)) { + $this->errors[] = $this->language->get('error_modification_entry'); + } elseif (empty($modification['status'])) { + $this->errors[] = $this->language->get('error_modification_status'); + } elseif (empty($modification['xml'])) { + $this->errors[] = $this->language->get('error_modification_empty_xml'); + } + + //TODO: check if opencore menu event is installed! + if (!file_exists(DIR_APPLICATION . '.htaccess')) { + $this->errors[] = $this->language->get('error_htaccess_not_found'); + } + } +} diff --git a/opencart-module/3.x/upload/admin/controller/startup/opencore.php b/opencart-module/3.x/upload/admin/controller/startup/opencore.php new file mode 100644 index 0000000..b01d755 --- /dev/null +++ b/opencart-module/3.x/upload/admin/controller/startup/opencore.php @@ -0,0 +1,86 @@ +executeIfRouteExists($route, $data, $output); + + /** + * in case the view\/*\/before event is not activated by default we can call + * $this->event->register('view/\*\/before', new Action('startup/opencore/before_view')); + */ + } + + /** + * Adds admin menu entries + * + * @param string $route + * @param array $data + */ + public function before_view($route, &$data) + { + if (isset($this->booted[$route])) { + return; + } + + switch ($route) { + case 'common/column_left': + //adding entries into admin menu for OpenCore panel + $data['menus'][] = [ + 'id' => 'opencore-menu', + 'icon' => 'fa-cube', + 'name' => 'OpenCore', + 'href' => $this->url->link('core/home', $this->getTokenStr()), + 'children' => [] + ]; + break; + case 'user/user_group_form': + //adding permissions into admin user/permissions page for OpenCore panel + $data['permissions'][] = 'core/*'; + + //get modules + $modules = app('modules')->all(); + foreach ($modules as $module) { + if ($module->enabled()) { + $data['permissions'][] = strtolower($module->getName()) . '/*'; + } + } + break; + } + + $this->booted($route); + } + + private function booted($route) + { + $this->booted[$route] = true; + } +} diff --git a/opencart-module/3.x/upload/admin/language/en-gb/extension/module/opencore.php b/opencart-module/3.x/upload/admin/language/en-gb/extension/module/opencore.php new file mode 100644 index 0000000..c198dba --- /dev/null +++ b/opencart-module/3.x/upload/admin/language/en-gb/extension/module/opencore.php @@ -0,0 +1,15 @@ + +
+
+

{{ heading_title }}

+ +
+
+
+ {% if success_message %} +
{{ success_message }} + +
+ {% endif %} + {% if error is defined %} +
{{ error_instalation_failure }} + +
+ {% endif %} + {% if error is defined %} + {% for error in errors %} +
{{ error }} + +
+ {% endfor %} + {% endif %} +
+ +{{ footer }} diff --git a/opencart-module/3.x/upload/catalog/controller/startup/opencore.php b/opencart-module/3.x/upload/catalog/controller/startup/opencore.php new file mode 100644 index 0000000..6f82042 --- /dev/null +++ b/opencart-module/3.x/upload/catalog/controller/startup/opencore.php @@ -0,0 +1,56 @@ +executeIfRouteExists($route, $data, $output); + + /** + * in case the view\/*\/before event is not activated by default we can call + * $this->event->register('view/\*\/before', new Action('startup/opencore/before_view')); + */ + } + + /** + * Before loading views event + * + * @param string $route + * @param array $data + */ + /* public function before_view($route, &$data) + { + return null; + } */ +} diff --git a/opencart-module/3.x/upload/system/library/db/corepdo.php b/opencart-module/3.x/upload/system/library/db/corepdo.php new file mode 100644 index 0000000..3d9a1bc --- /dev/null +++ b/opencart-module/3.x/upload/system/library/db/corepdo.php @@ -0,0 +1,269 @@ + PDO::CASE_NATURAL, + PDO::ATTR_ERRMODE => PDO::ERRMODE_EXCEPTION, + PDO::ATTR_ORACLE_NULLS => PDO::NULL_NATURAL, + PDO::ATTR_STRINGIFY_FETCHES => false, + PDO::ATTR_EMULATE_PREPARES => false, + //PDO::ATTR_PERSISTENT => false, + //PDO::MYSQL_ATTR_SSL_CA => false + ]; + + private $charset = 'utf8mb4'; //original was: utf8 + private $collation = 'utf8mb4_unicode_ci';//original was: utf8_general_ci + + public function __construct($hostname, $username, $password, $database, $port = '3306') + { + try { + $this->connection = new PDO($this->getDsn($hostname, $database, $port), $username, $password, $this->options); + } catch (PDOException $e) { + throw new Exception('Failed to connect to database. Reason: \'' . $e->getMessage() . '\''); + } + + $this->configureEncoding(); + + + // Next, we will check to see if a timezone has been specified in this config + // and if it has we will issue a statement to modify the timezone with the + // database. Setting this DB timezone is an optional configuration item. + $this->configureTimezone(); + + if (defined('DB_MODES')) { + $this->setCustomModes(); + } elseif (defined('DB_STRICT')) { + $this->connection->prepare($this->strictMode())->execute(); + } else { + $this->connection->prepare("set session sql_mode='NO_ENGINE_SUBSTITUTION'")->execute(); + } + } + + /** + * Create a DSN string from a configuration. + * + * Chooses socket or host/port based on the 'unix_socket' config value. + * + * @param array $config + * @return string + */ + protected function getDsn($hostname, $database, $port) + { + return $this->hasSocket() + ? $this->getSocketDsn($database) + : $this->getHostDsn($hostname, $database, $port); + } + + /** + * Determine if the given configuration array has a UNIX socket value. + * + * @param array $config + * @return bool + */ + protected function hasSocket() + { + return defined('DB_UNIX_SOCKET') && ! empty(DB_UNIX_SOCKET); + } + + /** + * Get the DSN string for a socket configuration. + * + * @param array $config + * @return string + */ + protected function getSocketDsn($database) + { + return "mysql:unix_socket=" . DB_UNIX_SOCKET . ";dbname={$database}"; + } + + /** + * Get the DSN string for a host / port configuration. + * + * @param array $config + * @return string + */ + protected function getHostDsn($hostname, $database, $port) + { + return isset($port) + ? "mysql:host={$hostname};port={$port};dbname={$database}" + : "mysql:host={$hostname};dbname={$database}"; + } + + /** + * Set the connection character set and collation. + * + * @return void + */ + protected function configureEncoding() + { + $this->charset = defined('DB_CHARSET') ? DB_CHARSET : $this->charset; + $this->collation = defined('DB_COLLATION') ? DB_COLLATION : $this->collation; + + $this->connection->prepare("set names '{$this->charset}' collate '{$this->collation}'")->execute(); + } + + /** + * Set the timezone on the connection. + * + * @return void + */ + protected function configureTimezone() + { + if (defined('DB_TIMEZONE')) { + $this->connection->prepare('set time_zone="' . DB_TIMEZONE . '"')->execute(); + } + } + + /** + * Get the query to enable strict mode. + * + * @return string + */ + protected function strictMode() + { + if (version_compare($this->connection->getAttribute(PDO::ATTR_SERVER_VERSION), '8.0.11') >= 0) { + return "set session sql_mode='ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION'"; + } + + return "set session sql_mode='ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION'"; + } + + /** + * Set the custom modes on the connection. + * + * @param array $config + * @return void + */ + protected function setCustomModes() + { + $this->connection->prepare("set session sql_mode='" . DB_MODES . "'")->execute(); + } + + public function getConnection() + { + return $this->connection; + } + + public function prepare($sql) + { + $this->statement = $this->connection->prepare($sql); + } + + public function bindParam($parameter, $variable, $data_type = \PDO::PARAM_STR, $length = 0) + { + if ($length) { + $this->statement->bindParam($parameter, $variable, $data_type, $length); + } else { + $this->statement->bindParam($parameter, $variable, $data_type); + } + } + + public function execute() + { + try { + if ($this->statement && $this->statement->execute()) { + $data = array(); + + while ($row = $this->statement->fetch(\PDO::FETCH_ASSOC)) { + $data[] = $row; + } + + $result = new \stdClass(); + $result->row = (isset($data[0])) ? $data[0] : array(); + $result->rows = $data; + $result->num_rows = $this->statement->rowCount(); + } + } catch (PDOException $e) { + throw new Exception('Error: ' . $e->getMessage() . ' Error Code : ' . $e->getCode()); + } + } + + public function query($sql, $params = array()) + { + $this->statement = $this->connection->prepare($sql); + + $result = false; + + try { + if ($this->statement && $this->statement->execute($params)) { + $data = array(); + + while ($row = $this->statement->fetch(PDO::FETCH_ASSOC)) { + $data[] = $row; + } + + $result = new \stdClass(); + $result->row = (isset($data[0]) ? $data[0] : array()); + $result->rows = $data; + $result->num_rows = $this->statement->rowCount(); + } + } catch (PDOException $e) { + throw new Exception('Error: ' . $e->getMessage() . ' Error Code : ' . $e->getCode() . '
' . $sql); + } + + if ($result) { + return $result; + } else { + $result = new \stdClass(); + $result->row = array(); + $result->rows = array(); + $result->num_rows = 0; + return $result; + } + } + + public function escape($value) + { + return str_replace(array("\\", "\0", "\n", "\r", "\x1a", "'", '"'), array("\\\\", "\\0", "\\n", "\\r", "\Z", "\'", '\"'), $value); + } + + public function countAffected() + { + if ($this->statement) { + return $this->statement->rowCount(); + } else { + return 0; + } + } + + public function getLastId() + { + return $this->connection->lastInsertId(); + } + + public function isConnected() + { + if ($this->connection) { + return true; + } else { + return false; + } + } + + public function __destruct() + { + $this->connection = null; + } +} diff --git a/support/Opencart/Installer.php b/support/Opencart/Installer.php index fc6f560..7fa092b 100644 --- a/support/Opencart/Installer.php +++ b/support/Opencart/Installer.php @@ -32,7 +32,7 @@ public function installOcmod($code) ); if (isOc3()) { - $query = $this->db->query('SELECT * FROM `' . DB_PREFIX . 'extension` WHERE ode = "' . $this->db->escape($code) . '"'); + $query = $this->db->query('SELECT * FROM `' . DB_PREFIX . 'extension` WHERE code = "' . $this->db->escape($code) . '"'); $modification_data['extension_install_id'] = $query->num_rows ? (int) $query->row['extension_id'] : 0; From 3e20f47645095c31396c96507356a79c043e287f Mon Sep 17 00:00:00 2001 From: darock Date: Mon, 20 Jan 2020 10:47:31 +0200 Subject: [PATCH 2/3] 3.x css fix & Readme update --- README.md | 15 +++++++++++---- public/css/admin.css | 11 ++++++++++- 2 files changed, 21 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 9d59242..a48369c 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -

OpenCore

+

OpenCore

**An application build on Laravel which can run as a subsystem for OpenCart system.** @@ -51,7 +51,7 @@ admin / setting / server / Use SEO URLs: Yes 6. php artisan key:generate 7. php artisan migrate:install 8. php artisan migrate -9. copy OpenCart extension files from core/opencart-module/2.3/upload to you OpenCart root folder +9. copy OpenCart extension files from core/opencart-module/(2.x|3.x)/upload to you OpenCart root folder 10. go to OpenCart admin panel / extensions / extensions / modules, find OpenCore module and install it 11. click on the OpenCore icon from admin / left column / section "System Requirements" and make sure there's nothing marked with red 12. Optional: in order to enable Developer & Example modules you need to access admin / user / user groups section and add permission for them @@ -117,5 +117,12 @@ MIT license. Please see the [license file](LICENSE) for more information. ## Screenshots - - +OpenCore home OpenCart 2x +OpenCore home OpenCart 3x +System Requirements +OpenCore Modules management +Developer Module +Logs Dashboard +Tasks +Add Task +Example Module diff --git a/public/css/admin.css b/public/css/admin.css index a183737..3cbb242 100644 --- a/public/css/admin.css +++ b/public/css/admin.css @@ -3,7 +3,8 @@ background: -webkit-linear-gradient(left,#a0328c 30%,#7040a4 50%,#4359c7 65%,#0082e6 85%); background: linear-gradient(to right,#a0328c 30%,#7040a4 50%,#4359c7 65%,#0082e6 85%); will-change: transform; - z-index:1 + z-index:1; + min-height: 50px; } .navbar-color .icon-bar { background-color: #fff; @@ -11,6 +12,14 @@ .navbar-color, .navbar-color ul:not(.dropdown-menu) > li > a, .navbar-colorul:not(.dropdown-menu) > li > a:visited, .navbar-color .navbar-header a { color:#fff; } +.navbar-color .navbar-header a { + padding: 16.5px 15px; + line-height: 17px; + height: 50px; +} +.navbar-color .navbar-nav > li > a { + line-height: 20px; +} .navbar-color .nav > li.active, .navbar-color .nav > li:hover { background: rgba(255, 255, 255, 0.1); } From 8ef628016a15aafe96d49b4201727bb873e2d4ae Mon Sep 17 00:00:00 2001 From: darock Date: Mon, 20 Jan 2020 10:51:07 +0200 Subject: [PATCH 3/3] Version update --- support/Opencart/Startup.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/support/Opencart/Startup.php b/support/Opencart/Startup.php index 208bdfc..cf00dc3 100644 --- a/support/Opencart/Startup.php +++ b/support/Opencart/Startup.php @@ -14,7 +14,7 @@ } if (!defined('OPENCORE_VERSION')) { - define('OPENCORE_VERSION', '1.1.0'); + define('OPENCORE_VERSION', '1.2.0'); } require_once __DIR__ . '/../../vendor/autoload.php';