From 053bd3970942011e7fe4d5d5a6bb1ca6ba3ca30a Mon Sep 17 00:00:00 2001 From: "Mr. Timothy Glenn Webb Sr" Date: Sun, 4 Oct 2020 19:11:27 +0000 Subject: [PATCH] Removed bb-modules/Serviceyouhosting/ Updated composer.lock --- .../Serviceyouhosting/Api/Admin.php | 163 ------ .../Serviceyouhosting/Api/Client.php | 187 ------ .../Serviceyouhosting/Api/Guest.php | 128 ----- src/bb-modules/Serviceyouhosting/Service.php | 530 ------------------ .../Serviceyouhosting/Youhosting.php | 307 ---------- .../mod_serviceyouhosting_config.phtml | 22 - .../mod_serviceyouhosting_manage.phtml | 38 -- .../mod_serviceyouhosting_order.phtml | 58 -- .../mod_serviceyouhosting_settings.phtml | 137 ----- .../mod_serviceyouhosting_manage.phtml | 235 -------- .../mod_serviceyouhosting_order.phtml | 117 ---- .../mod_serviceyouhosting_order_form.phtml | 47 -- .../mod_serviceyouhosting_activated.phtml | 75 --- .../mod_serviceyouhosting_canceled.phtml | 20 - .../mod_serviceyouhosting_renewed.phtml | 21 - .../mod_serviceyouhosting_suspended.phtml | 20 - .../mod_serviceyouhosting_unsuspended.phtml | 15 - src/bb-modules/Serviceyouhosting/icon.png | Bin 4069 -> 0 bytes .../Serviceyouhosting/manifest.json | 12 - src/composer.lock | 294 ++++++---- 20 files changed, 179 insertions(+), 2247 deletions(-) delete mode 100644 src/bb-modules/Serviceyouhosting/Api/Admin.php delete mode 100644 src/bb-modules/Serviceyouhosting/Api/Client.php delete mode 100644 src/bb-modules/Serviceyouhosting/Api/Guest.php delete mode 100644 src/bb-modules/Serviceyouhosting/Service.php delete mode 100644 src/bb-modules/Serviceyouhosting/Youhosting.php delete mode 100644 src/bb-modules/Serviceyouhosting/html_admin/mod_serviceyouhosting_config.phtml delete mode 100644 src/bb-modules/Serviceyouhosting/html_admin/mod_serviceyouhosting_manage.phtml delete mode 100644 src/bb-modules/Serviceyouhosting/html_admin/mod_serviceyouhosting_order.phtml delete mode 100644 src/bb-modules/Serviceyouhosting/html_admin/mod_serviceyouhosting_settings.phtml delete mode 100644 src/bb-modules/Serviceyouhosting/html_client/mod_serviceyouhosting_manage.phtml delete mode 100644 src/bb-modules/Serviceyouhosting/html_client/mod_serviceyouhosting_order.phtml delete mode 100644 src/bb-modules/Serviceyouhosting/html_client/mod_serviceyouhosting_order_form.phtml delete mode 100644 src/bb-modules/Serviceyouhosting/html_email/mod_serviceyouhosting_activated.phtml delete mode 100644 src/bb-modules/Serviceyouhosting/html_email/mod_serviceyouhosting_canceled.phtml delete mode 100644 src/bb-modules/Serviceyouhosting/html_email/mod_serviceyouhosting_renewed.phtml delete mode 100644 src/bb-modules/Serviceyouhosting/html_email/mod_serviceyouhosting_suspended.phtml delete mode 100644 src/bb-modules/Serviceyouhosting/html_email/mod_serviceyouhosting_unsuspended.phtml delete mode 100644 src/bb-modules/Serviceyouhosting/icon.png delete mode 100644 src/bb-modules/Serviceyouhosting/manifest.json diff --git a/src/bb-modules/Serviceyouhosting/Api/Admin.php b/src/bb-modules/Serviceyouhosting/Api/Admin.php deleted file mode 100644 index 29606aacf..000000000 --- a/src/bb-modules/Serviceyouhosting/Api/Admin.php +++ /dev/null @@ -1,163 +0,0 @@ -getService()->sync($data['order_id']); - - $this->di['logger']->info('Synchronized YouHosting account with order %s', $data['order_id']); - - return true; - } - - /** - * Return plans - * - * @return array - */ - public function get_plans($data) - { - $plans = $this->getService()->getApi()->call('Settings.plans'); - $result = array(); - foreach ($plans as $plan) { - $result[$plan['id']] = $plan['name']; - } - - return $result; - } - - /** - * Get login to cpanel url - */ - public function cpanel_url($data) - { - $order = $this->di['db']->getExistingModelById('ClientOrder', $data['order_id'], 'Order not found'); - $order = $this->di['mod_service']('order')->toApiArray($order); - - $params = array( - 'id' => $order['meta']['yh_account_id'], - ); - - return $this->getService()->getApi()->call('Account.getLoginUrl', $params); - } - - /** - * Import YouHosting accounts as BoxBilling orders - * - * Import clients before calling this action - */ - public function import_accounts($data) - { - if (!isset($data['page'])) { - throw new \Exception('Page parameter is missing'); - } - - $log = array(); - $service = $this->getService(); - $lastPage = $service->getLastClientAccountImportPage(); - $page = ($lastPage > $data['page']) ? $lastPage : $data['page']; - - $periods = array('none' => null, 'monthly' => '1M', 'quarterly' => '3M', 'biannually' => '6M', 'annually' => '1Y', 'biennially' => '2Y', 'triennially' => '3Y'); - - $items = $service->getApi()->call('Account.getList', array('page' => $page, 'per_page' => 50, 'status' => 'active')); - $pages = $items['pages']; - - //do import - foreach ($items['list'] as $account) { - - if ($service->isYHAccountImported($account['id'])) { - $log[] = 'Skipped already imported account #' . $account['id']; - continue; - } - - try { - $id = $service->importYouhostingAccount($account); - $log[] = 'Imported order #' . $id . ' Youhosting account ' . $account['domain']; - } catch (\Exception $e) { - $log[] = $e->getMessage(); - } - - } - - $service->setLastClientAccountImportPage($page); - - return array( - 'log' => implode(PHP_EOL, $log), - 'current' => $page, - 'next' => $page + 1, - 'total' => $pages, - 'continue' => ($page <= $pages), - ); - } - - /** - * Import clients from YouHosting to BoxBilling - * - * @return array - log message - * - * @throws \Exception - */ - public function import_clients($data) - { - if (!isset($data['page'])) { - throw new \Exception('Page parameter is missing'); - } - - $log = array(); - $service = $this->getService(); - $lastPage = $service->getLastClientImportPage(); - $page = ($lastPage > $data['page']) ? $lastPage : $data['page']; - - $clients = $this->getService()->getApi()->call('Client.getList', array('page' => $page, 'per_page' => 100)); - $pages = $clients['pages']; - - foreach ($clients['list'] as $client) { - try { - $service->importYouhostingClient($client); - $log[] = 'Imported client ' . $client['email']; - } catch (\Exception $e) { - $log[] = $e->getMessage(); - } - } - - $service->setLastClientImportPage($page); - - return array( - 'log' => implode(PHP_EOL, $log), - 'current' => $page, - 'next' => $page + 1, - 'total' => $pages, - 'continue' => ($page <= $pages), - ); - } -} - diff --git a/src/bb-modules/Serviceyouhosting/Api/Client.php b/src/bb-modules/Serviceyouhosting/Api/Client.php deleted file mode 100644 index fd1f4d1e6..000000000 --- a/src/bb-modules/Serviceyouhosting/Api/Client.php +++ /dev/null @@ -1,187 +0,0 @@ -getService()->getYouhostingClientId($this->getIdentity()->id); - - return (bool)$id; - } - - /** - * Get order info - * - * @return bool - * - * @throws \Exception - */ - public function info($data) - { - if (!isset($data['order_id'])) { - throw new \Exception('order_id is missing'); - } - - $id = $this->getService()->getYouhostingClientId($this->getIdentity()->id); - $result = array( - 'is_youhosting_client' => (bool)$id, - ); - - $order = $this->di['db']->getExistingModelById('ClientOrder', $data['order_id'], 'Order not found'); - $order = $this->di['mod_service']('order')->toApiArray($order); - - - if (isset($order['meta']['yh_account_id']) && $order['meta']['yh_account_id']) { - $info = $this->getService()->getApi()->call('Account.get', array('id' => $order['meta']['yh_account_id'])); - $result['account'] = $info; - $result['ns'] = $this->getService()->getApi()->call('Settings.nameservers'); - } - - return $result; - } - - /** - * Get captcha information - * - * @return mixed - */ - public function captcha() - { - return $this->getService()->getApi()->call('Captcha.generate'); - } - - /** - * Signup as youhosting client - * - * @param $data - * @return bool - * @throws \Exception - */ - public function signup($data) - { - if (!isset($data['captcha_id'])) { - throw new \Exception('Captcha id is missing'); - } - - if (!isset($data['captcha_solution'])) { - throw new \Exception('captcha_solution is missing'); - } - - $cp = array( - 'id' => $data['captcha_id'], - 'solution' => $data['captcha_solution'], - ); - - $this->getService()->getApi()->call('Captcha.verify', $cp); - - $client = $this->getIdentity(); - - $params = array( - 'first_name' => $client->first_name, - 'last_name' => $client->last_name, - 'email' => $client->email, - 'password' => $this->di['tools']->generatePassword(), - 'captcha_id' => $data['captcha_id'], - ); - - $id = null; - - try { - $result = $this->getService()->getApi()->call('Client.create', $params); - $id = $result['id']; - - } catch (\Exception $e) { - if ($e->getCode() == 5108) { - - $yh_clients = $this->getService()->getApi()->call('Client.getList', array('email' => $client->email)); - if ($yh_clients['total']) { - $id = $yh_clients['list'][0]['id']; - } else { - error_log($e); - } - } else { - throw $e; - } - } - - $this->getService()->storeYouhostingClientId($this->getIdentity()->id, $id); - - return true; - } - - /** - * Get cpanel login url - * - * @param $data - * @return mixed - * @throws \Exception - */ - public function cpanel_url($data) - { - if (!isset($data['order_id'])) { - throw new \Exception('order_id is missing'); - } - - $order = $this->di['db']->getExistingModelById('ClientOrder', $data['order_id'], 'Order not found'); - $order = $this->di['mod_service']('order')->toApiArray($order); - $params = array( - 'id' => $order['meta']['yh_account_id'], - ); - - return $this->getService()->getApi()->call('Account.getLoginUrl', $params); - } - - /** - * Activate order - * - * @param int $captcha_id - captcha id - * @param int $order_id - order id - * @param string $captcha_solution - captcha solution - * - * @return bool - * @throws \Exception - */ - public function activate($data) - { - if (!isset($data['captcha_id'])) { - throw new \Exception('Captcha id is missing'); - } - - if (!isset($data['order_id'])) { - throw new \Exception('order_id is missing'); - } - - if (!isset($data['captcha_solution'])) { - throw new \Exception('captcha_solution is missing'); - } - - $cp = array( - 'id' => $data['captcha_id'], - 'solution' => $data['captcha_solution'], - ); - $this->getService()->getApi()->call('Captcha.verify', $cp); - - $order = $this->di['db']->getExistingModelById('ClientOrder', $data['order_id'], 'Order not found'); - - $orderService = $this->di['mod_service']('order'); - $orderService->updateOrder($order, array('meta' => array('order_captcha_id' => $data['captcha_id']))); - $orderService->activateOrder($order); - - return true; - } -} diff --git a/src/bb-modules/Serviceyouhosting/Api/Guest.php b/src/bb-modules/Serviceyouhosting/Api/Guest.php deleted file mode 100644 index d6e887faa..000000000 --- a/src/bb-modules/Serviceyouhosting/Api/Guest.php +++ /dev/null @@ -1,128 +0,0 @@ -di['logger']->info('YouHosting WebHook: ' . print_r($data, 1)); - - $config = $this->di['mod_config']('serviceyouhosting'); - - if (isset($config['yh_ips'])) { - $allowed_ips = explode(PHP_EOL, $config['yh_ips']); - array_walk($allowed_ips, function(&$val){ - $val = trim($val); - }); - } else { - $allowed_ips = array( - '212.1.209.2', - ); - } - - if (!in_array($this->di['request']->getClientAddress(), $allowed_ips)) { - throw new \Exception('IP not allowed'); - } - - if (!isset($data['yh_event'])) { - throw new \Exception('Event name is missing'); - } - - $account_id = $this->di['array_get']($data, 'yh_account_id', null); - $client_id = $this->di['array_get']($data, 'yh_client_id', null); - - $service = $this->getService(); - $orderService = $this->di['mod_service']('order'); - - switch ($data['yh_event']) { - case 'CREATE_ACCOUNT': - $bb_order_id = $service->isYHAccountImported($account_id); - if (!$bb_order_id) { - $account = $service->getApi()->call('Account.get', array('id' => $account_id)); - $service->importYouhostingAccount($account); - - $this->di['logger']->info('Imported YouHosting account. Invoked by WebHook'); - } - - break; - - case 'SUSPEND_ACCOUNT': - $bb_order_id = $service->isYHAccountImported($account_id); - $order = $this->di['db']->getExistingModelById('ClientOrder', $data['order_id'], 'Order not found'); - if ($order->status == 'active') { - $orderService->suspendFromOrder($order, 'Auto-Suspend'); - $this->di['logger']->info('Suspended YouHosting account. Invoked by WebHook'); - } - break; - - case 'UNSUSPEND_ACCOUNT': - $bb_order_id = $service->isYHAccountImported($account_id); - $order = $this->di['db']->getExistingModelById('ClientOrder', $data['order_id'], 'Order not found'); - if ($order->status == 'suspended') { - $orderService->unsuspendFromOrder($order); - $this->di['logger']->info('Unsuspended YouHosting account. Invoked by WebHook'); - } - break; - - case 'REMOVE_ACCOUNT': - $bb_order_id = $service->isYHAccountImported($account_id); - $order = $this->di['db']->getExistingModelById('ClientOrder', $data['order_id'], 'Order not found'); - if ($order->status == 'active') { - $orderService->cancelFromOrder($order, 'Auto-Suspend'); - $this->di['logger']->info('Canceled YouHosting account. Invoked by WebHook'); - } - break; - - default: - break; - } - - return true; - } - - /** - * Return master_domains - * - * @return array - */ - public function master_domains($data) - { - $key = 'settings_subdomains'; - - $cache = $this->di['cache']; - if ($cache->exists($key)) { - return $cache->get($key); - } - - try { - $result = $this->getService()->getApi()->call('Settings.subdomains'); - $cache->set($key, $result); - } catch (\Exception $e) { - error_log($e->getMessage()); - $result = array(); - } - - return $result; - } -} \ No newline at end of file diff --git a/src/bb-modules/Serviceyouhosting/Service.php b/src/bb-modules/Serviceyouhosting/Service.php deleted file mode 100644 index 34d8d9a16..000000000 --- a/src/bb-modules/Serviceyouhosting/Service.php +++ /dev/null @@ -1,530 +0,0 @@ -di = $di; - } - - /** - * @return mixed - */ - public function getDi() - { - return $this->di; - } - - public $mod = null; - - public function __construct() - { - $this->mod = new \Box_Mod('serviceyouhosting'); - } - - public function getCartProductTitle($product, array $data) - { - if ($data['domain_type'] == 'subdomain') { - if (!isset($data['subdomain']) || empty($data['subdomain'])) { - throw new \Box_Exception('Please enter subdomain', null, 7102); - } - - if (!isset($data['master_domain']) || empty($data['master_domain'])) { - throw new \Box_Exception('Please select master domain', null, 7103); - } - - $domain = $data['subdomain'] . '.' . $data['master_domain']; - } - - if ($data['domain_type'] == 'domain') { - if (!isset($data['domain'])) { - throw new \Box_Exception('Please enter domain value', null, 7104); - } - - $domain = $data['domain']; - } - - return __(':product for :domain', array(':domain' => $domain, ':product' => $product['title'])); - } - - public function validateOrderData(array &$data) - { - if (!isset($data['domain_type']) || empty($data['domain_type'])) { - throw new \Box_Exception('Unknown domain type.', null, 7101); - } - - if ($data['domain_type'] == 'subdomain') { - if (!isset($data['subdomain']) || empty($data['subdomain'])) { - throw new \Box_Exception('Please enter subdomain', null, 7102); - } - - if (!isset($data['master_domain']) || empty($data['master_domain'])) { - throw new \Box_Exception('Please select master domain', null, 7103); - } - - $data['master_domain'] = strtolower($data['master_domain']); - $data['subdomain'] = strtolower($data['subdomain']); - $domain = $data['master_domain']; - $full_domain = $data['subdomain'] . '.' . $data['master_domain']; - } - - if ($data['domain_type'] == 'domain') { - if (!isset($data['domain']) || empty($data['domain'])) { - throw new \Box_Exception('Please enter domain value', null, 7104); - } - - $domain = strtolower($data['domain']); - $full_domain = $domain; - } - - if (!isset($data['skip_domain_check'])) { - $check_data = array( - 'type' => $data['domain_type'], - 'domain' => $domain, - 'subdomain' => $this->di['array_get']($data, 'subdomain', null), - ); - $this->getApi()->call('Account.check', $check_data); - } - - $data['full_domain'] = $full_domain; - } - - public function activate($order) - { - $order = $this->di['db']->getExistingModelById('ClientOrder', $order->id, 'Order not found'); - $orderService = $this->di['mod_service']('order'); - $o = $orderService->toApiArray($order); - - $yh_client_id = $this->getYouhostingClientId($o['client_id']); - if (!$yh_client_id) { - throw new \Exception('Client must confirm his account before activating order'); - } - - if (!isset($o['meta']['order_captcha_id'])) { - throw new \Exception('Captcha must be solved by client before activating YouHosting account'); - } - - $product = $this->di['db']->getExistingModelById('Product', $order->product_id, 'Product not found'); - $productService = $this->di['mod_service']('product'); - $product = $productService->toApiArray($product); - - - $password = $this->di['tools']->generatePassword(); - $params = array( - 'client_id' => $yh_client_id, - 'captcha_id' => $o['meta']['order_captcha_id'], - 'plan_id' => $product['config']['plan_id'], - 'type' => $o['config']['domain_type'], - 'domain' => ($o['config']['domain_type'] == 'subdomain') ? $o['config']['master_domain'] : $o['config']['domain'], - 'subdomain' => isset($o['config']['subdomain']) ? $o['config']['subdomain'] : null, - 'password' => $password, - ); - - $account = $this->getApi()->call('Account.create', $params); - - $orderService = $this->di['mod_service']('order'); - $orderService->updateOrder($o, array('id' => $order->id, 'meta' => array('yh_account_id' => $account['id'], 'password' => $password))); - - return array( - 'account' => $account, - 'ns' => $this->getApi()->call('Settings.nameservers'), - ); - } - - /** - * Suspend service - * - * @param $order - * @return boolean - */ - public function suspend($order) - { - $order = $this->di['db']->getExistingModelById('ClientOrder', $order->id, 'Order not found'); - $orderService = $this->di['mod_service']('order'); - $orderArr = $orderService->toApiArray($order); - - $params = array('id' => $orderArr['meta']['yh_account_id']); - - try { - $this->getApi()->call('Account.suspend', $params); - } catch (\Exception $e) { - //6401 = Account not found - if ($e->getCode() == 6401) { - return true; - } - throw $e; - } - - return true; - } - - /** - * @param $order - * @return boolean - */ - public function unsuspend($order) - { - $order = $this->di['db']->getExistingModelById('ClientOrder', $order['id'], 'Order not found'); - $orderService = $this->di['mod_service']('order'); - $orderArr = $orderService->toApiArray($order); - - $params = array('id' => $orderArr['meta']['yh_account_id']); - $this->getApi()->call('Account.unsuspend', $params); - - return true; - } - - /** - * @param $order - * @return boolean - */ - public function cancel($order) - { - return $this->suspend($order); - } - - /** - * - * @param $order - * @return boolean - */ - public function uncancel($order) - { - return $this->unsuspend($order); - } - - /** - * @param $order - * @return boolean - */ - public function delete($order) - { - try { - $o = $this->di['db']->getExistingModelById('ClientOrder', $order['id'], 'Order not found'); - - $params = array('id' => $o['meta']['yh_account_id']); - $this->getApi()->call('Account.delete', $params); - } catch (\Exception $e) { - error_log($e); - } - - return true; - } - - public function sync($order_id) - { - $order = $this->di['db']->getExistingModelById('ClientOrder', $order_id, 'Order not found'); - $orderArr = $this->di['mod_service']('order')->toApiArray($order); - - $account = $this->getApi()->call('Account.get', array('id' => $orderArr['meta']['yh_account_id'])); - - $orderService = $this->di['mod_service']('order'); - $orderService->updateOrder($order, array( - 'id' => $order_id, - 'status' => $account['status'], - 'created_at' => $account['created_at'] - )); - } - - public function getLastClientAccountImportPage($default = 1) - { - $value = $this->di['db']->getCell(" - SELECT meta_value - FROM extension_meta - WHERE - extension = 'mod_serviceyouhosting' - AND meta_key = 'last_account_page' - "); - - if ($value) { - return $value; - } - - return $default; - } - - public function setLastClientAccountImportPage($page) - { - $meta = $this->di['db']->findOne('extension_meta', " - extension = 'mod_serviceyouhosting' - AND meta_key = 'last_account_page' - "); - - if (!$meta) { - $meta = $this->di['db']->dispense('extension_meta'); - $meta->extension = 'mod_serviceyouhosting'; - $meta->meta_key = 'last_account_page'; - $meta->created_at = date('Y-m-d H:i:s'); - } - - $meta->meta_value = $page; - $meta->updated_at = date('Y-m-d H:i:s'); - $this->di['db']->store($meta); - } - - public function getLastClientImportPage($default = 1) - { - $value = $this->di['db']->getCell(" - SELECT meta_value - FROM extension_meta - WHERE - extension = 'mod_serviceyouhosting' - AND meta_key = 'last_client_page' - "); - - if ($value) { - return $value; - } - - return $default; - } - - public function setLastClientImportPage($page) - { - $meta = $this->di['db']->findOne('extension_meta', " - extension = 'mod_serviceyouhosting' - AND meta_key = 'last_client_page' - "); - - if (!$meta) { - $meta = $this->di['db']->dispense('extension_meta'); - $meta->extension = 'mod_serviceyouhosting'; - $meta->meta_key = 'last_client_page'; - $meta->created_at = date('Y-m-d H:i:s'); - } - - $meta->meta_value = $page; - $meta->updated_at = date('Y-m-d H:i:s'); - $this->di['db']->store($meta); - } - - public function storeYouhostingClientId($client_id, $yh_client_id) - { - //remove all null values if present - $this->di['db']->exec(" - DELETE FROM extension_meta - WHERE extension = 'mod_serviceyouhosting' - AND meta_key = 'yh_client_id' - AND client_id = :client_id", - array('client_id'=>$client_id) - ); - - $meta = $this->di['db']->dispense('extension_meta'); - $meta->extension = 'mod_serviceyouhosting'; - $meta->client_id = $client_id; - $meta->meta_key = 'yh_client_id'; - $meta->meta_value = $yh_client_id; - $meta->created_at = date('Y-m-d H:i:s'); - $meta->updated_at = date('Y-m-d H:i:s'); - $this->di['db']->store($meta); - } - - public function isYHAccountImported($yh_account_id) - { - $id = $this->di['db']->getCell(" - SELECT client_order_id - FROM client_order_meta - WHERE name = 'yh_account_id' - AND value = :yh_account_id - ", array('yh_account_id' => $yh_account_id)); - - if ($id) { - return $id; - } - - return null; - } - - public function isYHClientBBClient($yh_client_id) - { - $id = $this->di['db']->getCell(" - SELECT client_id - FROM extension_meta - WHERE - extension = 'mod_serviceyouhosting' - AND meta_key = 'yh_client_id' - AND meta_value = :yh_client_id", - array('yh_client_id'=>$yh_client_id)); - - if ($id) { - return $id; - } - - return null; - } - - public function getYouhostingClientId($client_id) - { - - $id = $this->di['db']->getCell(" - SELECT meta_value - FROM extension_meta - WHERE - extension = 'mod_serviceyouhosting' - AND meta_key = 'yh_client_id' - AND client_id = :id", - array('id'=>$client_id)); - - if ($id) { - return $id; - } - - return null; - } - - public function getOrCreateProductForHostingPlan($plan_id) - { - $id = $this->di['db']->getCell(" - SELECT id - FROM `product` - WHERE type = 'youhosting' - AND `config` LIKE :config - LIMIT 1", - array('config' => '%' . $plan_id . '%') - ); - if ($id) { - return $id; - } - - $title = 'Youhosting ' . $plan_id; - $type = 'youhosting'; - - $productService = $this->di['mod_service']('product'); - - $id = $productService->createProduct($title, $type); - - - $product = $this->di['db']->getExistingModelById('Product', $id, 'Product not found'); - $productService->updateProduct($product, array( - 'config' => array('plan_id' => $plan_id,) - )); - - return $id; - } - - public function importYouhostingClient($yh_client_data) - { - if ($this->isYHClientBBClient($yh_client_data['id'])) { - throw new \Exception('Skipping already imported client #' . $yh_client_data['id']); - } - - $cdata = array( - 'aid' => $yh_client_data['id'], - 'email' => $yh_client_data['email'], - 'first_name' => $yh_client_data['first_name'], - 'last_name' => $yh_client_data['last_name'], - 'company' => $yh_client_data['company'], - 'address_1' => $yh_client_data['address_1'], - 'address_2' => $yh_client_data['address_2'], - 'city' => $yh_client_data['city'], - 'country' => $yh_client_data['country'], - 'state' => $yh_client_data['state'], - 'postcode' => $yh_client_data['zip'], - 'phone' => $yh_client_data['phone'], - 'phone_cc' => $yh_client_data['phone_cc'], - 'created_at' => $yh_client_data['created_at'], - ); - - $clientService = $this->di['mod_service']('client'); - - $validator = $this->di['validator']; - $validator->isEmailValid($yh_client_data['email']); - - if ($clientService->emailAreadyRegistered($yh_client_data['email'])) { - throw new \Box_Exception('Email is already registered.'); - } - - $cid = $clientService->adminCreateClient($cdata); - - $this->storeYouhostingClientId($cid, $yh_client_data['id']); - - return $cid; - } - - public function importYouhostingAccount($account) - { - if ($this->isYHAccountImported($account['id'])) { - return false; - } - - $client_id = $this->isYHClientBBClient($account['client_id']); - if (!$client_id) { - $yhc = $this->getApi()->call('Client.getList', array('page' => 1, 'per_page' => 1, 'id' => $account['client_id'])); - - if ($yhc['total'] == 1) { - $c = $yhc['list'][0]; - try { - $client_id = $this->importYouhostingClient($c); - } catch (\Exception $e) { - error_log($e->getMessage()); - } - } - } - - $product_id = $this->getOrCreateProductForHostingPlan($account['plan_id']); - $period = $this->di['array_get']($periods, $account['period']); - - $odata = array( - 'client_id' => $client_id, - 'product_id' => $product_id, - 'title' => $account['domain'], - 'period' => $period, - 'activate' => false, - 'invoice_option' => 'no-invoice', - 'created_at' => $account['created_at'], - 'meta' => array( - 'yh_account_id' => $account['id'], - ), - 'config' => array( - 'skip_domain_check' => true, - 'domain_type' => 'domain', - 'domain' => $account['domain'], - ), - ); - - $client = $this->di['db']->getExistingModelById('Client', $odata['client_id'], 'Client not found'); - $product = $this->di['db']->getExistingModelById('Product', $odata['product_id'], 'Product not found'); - - $orderService = $this->di['mod_service']('order'); - $id = $orderService->createOrder($client, $product, $odata); - - $order = $this->di['db']->getExistingModelById('ClientOrder', $id, 'Order not found'); - - $orderService->updateOrder($order, array('status' => 'active')); - - return $id; - } - - public function getApi() - { - if (!$this->di['license']->isPro()) { - throw new \Exception('YouHosting module can only be used by PRO license owners. Get PRO license key at http://www.boxbilling.com/order', 509); - } - - $config = $this->di['mod_config']('serviceyouhosting'); - require_once 'Youhosting.php'; - $a = array( - 'api_key' => $config['api_key'], - 'boxbilling' => array('license' => $this->di['config']['license']), - ); - - return new Youhosting_Api($a); - } -} diff --git a/src/bb-modules/Serviceyouhosting/Youhosting.php b/src/bb-modules/Serviceyouhosting/Youhosting.php deleted file mode 100644 index b8bd1571d..000000000 --- a/src/bb-modules/Serviceyouhosting/Youhosting.php +++ /dev/null @@ -1,307 +0,0 @@ -config = $config; - } - - public function call($resource, $params = array()) - { - list($class, $method) = explode('.', $resource); - $version = isset($this->config['version']) ? $this->config['version'] : 'V1'; - $r = '\Box\Mod\Serviceyouhosting\Youhosting_Api_' . $version . '_' . $class; - - $reflection = new \ReflectionClass($r); - - if (!$reflection->hasMethod($method)) { - throw new \Exception("Resource $resource is not valid. (Hint: Check resource method)", 101); - } - - - $m = $reflection->getMethod($method); - - return $m->invoke(new $r($this->config), $params); - } -} - -class Youhosting_Api_V1 -{ - const VERSION = '1.0.0'; - - private $config; - private $apiBase = 'https://rest.main-hosting.com/v1/'; - - public function __construct($config) - { - if (!isset($config['api_key'])) { - throw new \Exception('No API key provided'); - } - $this->config = $config; - } - - /** - * @param string $url - */ - protected function _post($url, array $params = array()) - { - return $this->_request($url, $params, 'POST'); - } - - /** - * @param string $url - */ - protected function _get($url, array $params = array()) - { - return $this->_request($url, $params, 'GET'); - } - - /** - * @param string $url - */ - protected function _delete($url, array $params = array()) - { - return $this->_request($url, $params, 'DELETE'); - } - - private function _request($url, array $params = array(), $meth = 'POST') - { - $client = self::VERSION; - $absUrl = $this->apiBase . $url; - - $params['client_ip'] = isset($_SERVER['REMOTE_ADDR']) ? $_SERVER['REMOTE_ADDR'] : $this->config['ip']; - - $langVersion = phpversion(); - $uname = php_uname(); - $ua = array( - 'bindings_version' => $client, - 'lang' => 'php', - 'lang_version' => $langVersion, - 'publisher' => 'youhosting', - 'uname' => $uname - ); - $headers = array( - 'X-Youhosting-Client-User-Agent: ' . json_encode($ua), - 'User-Agent: YouHosting/PHP/' . $client, - 'Authorization: Basic ' . base64_encode('reseller:' . $this->config['api_key']), - ); - - if (isset($this->config['boxbilling'])) { - $headers[] = 'X-BoxBilling: ' . json_encode($this->config['boxbilling']); - } - - list($rbody, $rcode) = $this->_curlRequest($meth, $absUrl, $headers, $params); - - $result = json_decode($rbody, true); - if ($result['error']) { - throw new \Exception($result['error']['message'], $result['error']['code']); - } - - return $result['result']; - } - - /** - * @param string $meth - * @param string $absUrl - * @param string[] $headers - */ - private function _curlRequest($meth, $absUrl, $headers, $params) - { - $curl = curl_init(); - $meth = strtolower($meth); - $opts = array(); - if ($meth == 'get') { - $opts[CURLOPT_HTTPGET] = 1; - if (count($params) > 0) { - $encoded = $this->_encode($params); - $absUrl = "$absUrl?$encoded"; - } - } else if ($meth == 'post') { - $opts[CURLOPT_POST] = 1; - $opts[CURLOPT_POSTFIELDS] = $this->_encode($params); - } else if ($meth == 'delete') { - $opts[CURLOPT_CUSTOMREQUEST] = 'DELETE'; - if (count($params) > 0) { - $encoded = $this->_encode($params); - $absUrl = "$absUrl?$encoded"; - } - } else { - throw new \Exception("Unrecognized method $meth"); - } - - $absUrl = $this->_utf8($absUrl); - $opts[CURLOPT_URL] = $absUrl; - $opts[CURLOPT_RETURNTRANSFER] = true; - $opts[CURLOPT_CONNECTTIMEOUT] = 30; - $opts[CURLOPT_TIMEOUT] = 80; - $opts[CURLOPT_HTTPHEADER] = $headers; - $opts[CURLOPT_SSL_VERIFYPEER] = false; - - curl_setopt_array($curl, $opts); - $rbody = curl_exec($curl); - $errno = curl_errno($curl); - - if ($rbody === false) { - $errno = curl_errno($curl); - $message = curl_error($curl); - curl_close($curl); - $this->_handleCurlError($errno, $message); - } - - $rcode = curl_getinfo($curl, CURLINFO_HTTP_CODE); - curl_close($curl); - - return array($rbody, $rcode); - } - - /** - * @param integer $errno - * @param string $message - */ - private function _handleCurlError($errno, $message) - { - $supportEmail = 'support@youhosting.com'; - $apiBase = $this->apiBase; - switch ($errno) { - case CURLE_COULDNT_CONNECT: - case CURLE_COULDNT_RESOLVE_HOST: - case CURLE_OPERATION_TIMEOUTED: - $msg = "Could not connect to Youhosting ($apiBase). Please check your internet connection and try again. If this problem persists, you should check YouHosting's service status at https://twitter.com/youhostingstatus, or let us know at $supportEmail."; - break; - case CURLE_SSL_CACERT: - case CURLE_SSL_PEER_CERTIFICATE: - $msg = "Could not verify Youhosting's SSL certificate. Please make sure that your network is not intercepting certificates. (Try going to $apiBase in your browser.) If this problem persists, let us know at $supportEmail."; - break; - default: - $msg = "Unexpected error communicating with Youhosting. If this problem persists, let us know at $supportEmail."; - } - - $msg .= "\n\n(Network error [errno $errno]: $message)"; - throw new \Exception($msg, (int)$errno); - } - - private function _utf8($value) - { - if (is_string($value)) - return utf8_encode($value); - else - return $value; - } - - private function _encode($d) - { - return http_build_query($d, null, '&'); - } -} - -class Youhosting_Api_V1_Captcha extends Youhosting_Api_V1 -{ - public function generate() - { - return $this->_post('captcha'); - } - - public function verify($params) - { - return $this->_post('captcha/' . $params['id'], $params); - } -} - -class Youhosting_Api_V1_Client extends Youhosting_Api_V1 -{ - public function create($params) - { - return $this->_post('client', $params); - } - - public function get($params) - { - return $this->_get('client/' . $params['id'], $params); - } - - public function getList($params) - { - return $this->_get('client/list', $params); - } - - public function getLoginUrl($params) - { - return $this->_get('client/' . $params['id'] . '/login-url', $params); - } -} - -class Youhosting_Api_V1_Account extends Youhosting_Api_V1 -{ - public function check($params) - { - return $this->_get('account/check', $params); - } - - public function create($params) - { - return $this->_post('account', $params); - } - - public function get($params) - { - return $this->_get('account/' . $params['id'], $params); - } - - public function getList($params) - { - return $this->_get('account/list', $params); - } - - public function suspend($params) - { - return $this->_post('account/' . $params['id'] . '/suspend', $params); - } - - public function unsuspend($params) - { - return $this->_post('account/' . $params['id'] . '/unsuspend', $params); - } - - public function delete($params) - { - return $this->_delete('account/' . $params['id'], $params); - } - - public function getLoginUrl($params) - { - return $this->_get('account/' . $params['id'] . '/login-url', $params); - } -} - -class Youhosting_Api_V1_Settings extends Youhosting_Api_V1 -{ - public function plans() - { - return $this->_get('settings/plans'); - } - - public function subdomains() - { - return $this->_get('settings/subdomains'); - } - - public function nameservers() - { - return $this->_get('settings/nameservers'); - } -} diff --git a/src/bb-modules/Serviceyouhosting/html_admin/mod_serviceyouhosting_config.phtml b/src/bb-modules/Serviceyouhosting/html_admin/mod_serviceyouhosting_config.phtml deleted file mode 100644 index dd3c5fb68..000000000 --- a/src/bb-modules/Serviceyouhosting/html_admin/mod_serviceyouhosting_config.phtml +++ /dev/null @@ -1,22 +0,0 @@ -
-
{% trans 'YouHosting specifict settings' %}
-
- - -
- -
- -
- -
- {{ mf.selectbox('config[plan_id]', admin.serviceyouhosting_get_plans, product.config.plan_id, 0, 'Select hosting plan') }} -
-
-
- - - -
- -
\ No newline at end of file diff --git a/src/bb-modules/Serviceyouhosting/html_admin/mod_serviceyouhosting_manage.phtml b/src/bb-modules/Serviceyouhosting/html_admin/mod_serviceyouhosting_manage.phtml deleted file mode 100644 index 1ecf812dc..000000000 --- a/src/bb-modules/Serviceyouhosting/html_admin/mod_serviceyouhosting_manage.phtml +++ /dev/null @@ -1,38 +0,0 @@ -
-

{% trans 'Details' %}

-
- - - - - - - - - - - - - - - - - - - -
{% trans 'Domain' %}: - {{ order.config.full_domain }} -
{% trans 'Account Id' %}:{{ order.meta.yh_account_id }}
- -
- - diff --git a/src/bb-modules/Serviceyouhosting/html_admin/mod_serviceyouhosting_order.phtml b/src/bb-modules/Serviceyouhosting/html_admin/mod_serviceyouhosting_order.phtml deleted file mode 100644 index 6186e003c..000000000 --- a/src/bb-modules/Serviceyouhosting/html_admin/mod_serviceyouhosting_order.phtml +++ /dev/null @@ -1,58 +0,0 @@ -
- -
- - -
-
-
- - - -
- -
- -
-
-
- -
- -
- Due to huge amount of spam accounts on YouHosting every new account must be approved (captcha solved) by {{ client.first_name }} {{ client.last_name }} before order can be activated. -
-
-
- - - \ No newline at end of file diff --git a/src/bb-modules/Serviceyouhosting/html_admin/mod_serviceyouhosting_settings.phtml b/src/bb-modules/Serviceyouhosting/html_admin/mod_serviceyouhosting_settings.phtml deleted file mode 100644 index f1ce7d8e6..000000000 --- a/src/bb-modules/Serviceyouhosting/html_admin/mod_serviceyouhosting_settings.phtml +++ /dev/null @@ -1,137 +0,0 @@ -{% extends request.ajax ? "layout_blank.phtml" : "layout_default.phtml" %} -{% import "macro_functions.phtml" as mf %} -{% block meta_title %}YouHosting{% endblock %} -{% set active_menu = 'system' %} - -{% block breadcrumbs %} - -{% endblock %} - -{% block content %} -{% set params = admin.extension_config_get({"ext":"mod_serviceyouhosting"}) %} -
- -
- - - -
-
- -
-
-
- -
- {{ admin.system_env({'ip':1}) }} -
-
-
- -
- -
- {{ 'api/guest/serviceyouhosting/webhook' | link }} -
-
-
- -
- -
- -
-
-
- - - - -
- -
-

-    
- -
-
-
- -
- -
-
-
- - -
-
- -
-
- - -
-{% endblock %} - -{% block js %} - -{% endblock %} diff --git a/src/bb-modules/Serviceyouhosting/html_client/mod_serviceyouhosting_manage.phtml b/src/bb-modules/Serviceyouhosting/html_client/mod_serviceyouhosting_manage.phtml deleted file mode 100644 index 9729b15af..000000000 --- a/src/bb-modules/Serviceyouhosting/html_client/mod_serviceyouhosting_manage.phtml +++ /dev/null @@ -1,235 +0,0 @@ -{% set yh = client.serviceyouhosting_info({'order_id':order.id}) %} - -{% if order.status == 'pending_setup' %} -
-

{% trans 'Order activation process will start after confirmation' %}

-
-{% endif %} - - -{% if not yh.is_youhosting_client %} -
-
-
-
-

{% trans 'Solve captcha to activate order' %}

-
-
-
-
- {% set captcha = client.serviceyouhosting_captcha({"for_client":1}) %} -
-
- Captcha -
-
-
-
- -
-
-
-
- -
-
- -
-
-
-
-
-
-{% endif %} - -{% if order.status == 'failed_setup' %} - - -
-
-
-
-

{% trans 'Order activation captcha' %}

-
-
-
-
- {% set captcha = client.serviceyouhosting_captcha %} -
-
- Captcha -
-
-
-
- -
-
-
-
- -
-
- - -
-
-
-
-
-
-{% endif %} - -{% if order.status == 'active' %} - -{% set product = guest.product_get({"id":order.product_id}) %} -
-
-
-
-

{% trans 'Hosting management' %}

- -
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
{% trans 'Hostname' %}: - {{ yh.account.domain }} -
{% trans 'Account status' %}: - - {{ yh.account.status | title }} -
{% trans 'Account ID' %}: - - {{ yh.account.id }} -
{% trans 'Username' %}: - {{ yh.account.username }} -
{% trans 'IP' %}: - {{ yh.account.ip }} -
- - -
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
{% trans 'FTP IP' %}{{ yh.account.ip }}
{% trans 'FTP Hostname' %}{{ yh.account.domain }}
{% trans 'FTP Username' %}{{ yh.account.username }}
{% trans 'FTP Password' %}••••••••••
{% trans 'FTP Port' %}21
{% trans 'Folder to Upload Files' %}public_html
{% trans 'Recommended FTP Clients' %}{% trans 'SmartFTP' %} {% trans 'or' %} {% trans 'FileZilla' %} -
-
- -
- - - - - - - - - - - - - - - - - - - - - - - - - -
{{ yh.ns.ns1 }}{{ yh.ns.ip1 }}
{{ yh.ns.ns2 }}{{ yh.ns.ip2 }}
{{ yh.ns.ns3 }}{{ yh.ns.ip3 }}
{{ yh.ns.ns4 }}{{ yh.ns.ip4 }}
-
-
- - - -{% endif %} \ No newline at end of file diff --git a/src/bb-modules/Serviceyouhosting/html_client/mod_serviceyouhosting_order.phtml b/src/bb-modules/Serviceyouhosting/html_client/mod_serviceyouhosting_order.phtml deleted file mode 100644 index d921a1a4d..000000000 --- a/src/bb-modules/Serviceyouhosting/html_client/mod_serviceyouhosting_order.phtml +++ /dev/null @@ -1,117 +0,0 @@ -{% extends request.ajax ? "layout_blank.phtml" : "layout_default.phtml" %} -{% import "macro_functions.phtml" as mf %} -{% block meta_title %}{{product.title}}{% endblock %} - -{% block content_before %} - {% include "partial_steps.phtml" with {'selected': 2} %} -{% endblock %} - -{% block content %} - - {% set periods = guest.system_periods %} - {% set pricing = product.pricing %} - -
- -
-
-
2
-

{{ product.title }}

-

{% trans 'Please configure domain for your hosting account' %}

- {#{ product.description|bbmd }#} -
-
- -
-
-
-
-

{% trans 'Domain' %}

-
- - - -
-
-
- . - -
-
- -
-
- -
-
-
-
-
- -
- {% include 'partial_pricing.phtml' with {'product': product} %} -
- -
-
-
- - {% include 'partial_addons.phtml' with {'product': product} %} - - - -
-{% endblock %} - -{% block sidebar2 %} - {% include 'partial_currency.phtml' %} -{% endblock %} - -{% block js %} - - {% set currency = guest.cart_get_currency %} - -{% endblock %} \ No newline at end of file diff --git a/src/bb-modules/Serviceyouhosting/html_client/mod_serviceyouhosting_order_form.phtml b/src/bb-modules/Serviceyouhosting/html_client/mod_serviceyouhosting_order_form.phtml deleted file mode 100644 index 39dfbb046..000000000 --- a/src/bb-modules/Serviceyouhosting/html_client/mod_serviceyouhosting_order_form.phtml +++ /dev/null @@ -1,47 +0,0 @@ -{% set periods = guest.system_periods %} -{% set pricing = product.pricing %} -
-
-
{{ product.title }}
- {% trans 'Domain configuration' %} -
- - - - - -
-
-
- \ No newline at end of file diff --git a/src/bb-modules/Serviceyouhosting/html_email/mod_serviceyouhosting_activated.phtml b/src/bb-modules/Serviceyouhosting/html_email/mod_serviceyouhosting_activated.phtml deleted file mode 100644 index 92fe0535c..000000000 --- a/src/bb-modules/Serviceyouhosting/html_email/mod_serviceyouhosting_activated.phtml +++ /dev/null @@ -1,75 +0,0 @@ -{% apply markdown %} - -Hello {{ c.first_name }} {{ c.last_name }}, - -Thank you for ordering with us! Your hosting account has now been set up. This email contains all the information you will need in order to begin using your service. - -If you have requested a domain name during the signup, please keep in mind that -your domain name will not be visible on the internet instantly. -This process is called propagation and can take up to 48 hours. -Your website and email will not function until your domain has propagated. - -**{{ order.title }}** - -Activated: {{ order.activated_at|bb_date }} -{% if order.expires_at %}Expires: {{ order.expires_at | date }} {% endif %} -{% if order.total %}Amount: {{ order.total | money(order.currency) }} {% endif %} -{% if order.period %} Billing period: {{ order.period | period_title }} {% endif %} - -**New Account Information** - -Hosting Package: {{ order.title }} - -Domain: {{ account.domain }} - -IP Address: {{ account.ip }} - - -**Control Panel Login Details** - -Username: {{ account.username }} - -Password: {{ password }} - - -**Server Information** - -Server IP: {{ account.ip }} - -If you are using an existing domain with your new hosting account, you will -need to update the domain settings to point it to the nameservers listed below. - -Nameserver 1: {{ ns.ns1 }} {{ ns.ip1 }} - -Nameserver 2: {{ ns.ns2 }} {{ ns.ip2 }} - -{% if ns.ns3 %}Nameserver 3: {{ ns.ns3 }} {{ ns.ip3 }} {% endif %} - -{% if ns.ns4 %}Nameserver 4: {{ ns.ns4 }} {{ ns.ip4 }} {% endif %} - -**Uploading Your Website** - - -You may use one of the addresses given below to manage your web site: - - -Temporary FTP Hostname: {{ account.ip }} - -Full FTP Hostname: {{ account.domain }} - -FTP Username: {{ account.username }} - -FTP Password: {{ account.password }} - -You must upload files to the **public_html** folder! -Thank you for choosing us. - -**Members area** - -Login to members area: {{'login'|link({'email' : c.email }) }} - -Manage order: {{ 'order/service/manage'|link }}/{{ order.id }} - -{{ guest.system_company.signature }} - -{% endapply %} \ No newline at end of file diff --git a/src/bb-modules/Serviceyouhosting/html_email/mod_serviceyouhosting_canceled.phtml b/src/bb-modules/Serviceyouhosting/html_email/mod_serviceyouhosting_canceled.phtml deleted file mode 100644 index b4d8fa559..000000000 --- a/src/bb-modules/Serviceyouhosting/html_email/mod_serviceyouhosting_canceled.phtml +++ /dev/null @@ -1,20 +0,0 @@ -{% block subject %}[{{ guest.system_company.name }}] {{ order.title }} Canceled{% endblock %} -{% block content %} -{% apply markdown %} - -Hello {{ c.first_name }} {{ c.last_name }}, - -Your *{{ order.title }}* that was activated at *{{ order.activated_at|bb_date }}* is now canceled. -{% if order.reason %} Reason: - -**{{ order.reason }}** {% endif %} - -If you have any questions regarding this message please login to the members area and submit a support ticket. - -Login to members area: {{'login'|link({'email' : c.email }) }} -Submit support ticket: {{ 'support'|link({'ticket' : 1}) }} - -{{ guest.system_company.signature }} - -{% endapply %} -{% endblock %} diff --git a/src/bb-modules/Serviceyouhosting/html_email/mod_serviceyouhosting_renewed.phtml b/src/bb-modules/Serviceyouhosting/html_email/mod_serviceyouhosting_renewed.phtml deleted file mode 100644 index 8df02a25a..000000000 --- a/src/bb-modules/Serviceyouhosting/html_email/mod_serviceyouhosting_renewed.phtml +++ /dev/null @@ -1,21 +0,0 @@ -{% block subject %}[{{ guest.system_company.name }}] {{ order.title }} Renewed{% endblock %} -{% block content %} -{% apply markdown %} - -Hello {{ c.first_name }} {{ c.last_name }}, - -Your **{{ order.title }}** has been renewed. - -{% if order.expires_at %} - -Next renewal date: {{ order.expires_at|bb_date }} - -{% endif %} - -Login to members area: {{'login'|link({'email' : c.email }) }} -Manage order: {{ 'order/service/manage'|link }}/{{ order.id }} - -{{ guest.system_company.signature }} - -{% endapply %} -{% endblock %} diff --git a/src/bb-modules/Serviceyouhosting/html_email/mod_serviceyouhosting_suspended.phtml b/src/bb-modules/Serviceyouhosting/html_email/mod_serviceyouhosting_suspended.phtml deleted file mode 100644 index f505fb23c..000000000 --- a/src/bb-modules/Serviceyouhosting/html_email/mod_serviceyouhosting_suspended.phtml +++ /dev/null @@ -1,20 +0,0 @@ -{% block subject %}[{{ guest.system_company.name }}] {{ order.title }} Suspended{% endblock %} -{% block content %} -{% apply markdown %} - -Hello {{ c.first_name }} {{ c.last_name }}, - -Your *{{ order.title }}* that was activated at *{{ order.activated_at|bb_date }}* is now suspended. -{% if order.reason %} Reason: - -**{{ order.reason }}** {% endif %} - -If you have any questions regarding this message please login to the members area and submit a support ticket. - -Login to members area: {{'login'|link({'email' : c.email }) }} -Submit support ticket: {{ 'support'|link({'ticket' : 1}) }} - -{{ guest.system_company.signature }} - -{% endapply %} -{% endblock %} diff --git a/src/bb-modules/Serviceyouhosting/html_email/mod_serviceyouhosting_unsuspended.phtml b/src/bb-modules/Serviceyouhosting/html_email/mod_serviceyouhosting_unsuspended.phtml deleted file mode 100644 index 6600331c2..000000000 --- a/src/bb-modules/Serviceyouhosting/html_email/mod_serviceyouhosting_unsuspended.phtml +++ /dev/null @@ -1,15 +0,0 @@ -{% block subject %}[{{ guest.system_company.name }}] {{ order.title }} Reactivated{% endblock %} -{% block content %} -{% apply markdown %} - -Hello {{ c.first_name }} {{ c.last_name }}, - -Your *{{ order.title }}* has been reactivated. - -Login to members area: {{'login'|link({'email' : c.email }) }} -Manage order: {{ 'order/service/manage'|link }}/{{ order.id }} - -{{ guest.system_company.signature }} - -{% endapply %} -{% endblock %} diff --git a/src/bb-modules/Serviceyouhosting/icon.png b/src/bb-modules/Serviceyouhosting/icon.png deleted file mode 100644 index eddc8eb412981fda83447c223f6151284bf91934..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4069 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.5.0" + "php": ">=5.5" }, "require-dev": { - "phpunit/phpunit": "^4.0" + "symfony/phpunit-bridge": "^4.4 || ^5.1" }, "type": "library", "extra": { @@ -276,20 +276,20 @@ "keywords": [ "promise" ], - "time": "2016-12-20T10:07:11+00:00" + "time": "2020-09-30T07:37:28+00:00" }, { "name": "guzzlehttp/psr7", - "version": "1.6.1", + "version": "1.7.0", "source": { "type": "git", "url": "https://github.com/guzzle/psr7.git", - "reference": "239400de7a173fe9901b9ac7c06497751f00727a" + "reference": "53330f47520498c0ae1f61f7e2c90f55690c06a3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/psr7/zipball/239400de7a173fe9901b9ac7c06497751f00727a", - "reference": "239400de7a173fe9901b9ac7c06497751f00727a", + "url": "https://api.github.com/repos/guzzle/psr7/zipball/53330f47520498c0ae1f61f7e2c90f55690c06a3", + "reference": "53330f47520498c0ae1f61f7e2c90f55690c06a3", "shasum": "" }, "require": { @@ -302,15 +302,15 @@ }, "require-dev": { "ext-zlib": "*", - "phpunit/phpunit": "~4.8.36 || ^5.7.27 || ^6.5.8" + "phpunit/phpunit": "~4.8.36 || ^5.7.27 || ^6.5.14 || ^7.5.20 || ^8.5.8 || ^9.3.10" }, "suggest": { - "zendframework/zend-httphandlerrunner": "Emit PSR-7 responses" + "laminas/laminas-httphandlerrunner": "Emit PSR-7 responses" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.6-dev" + "dev-master": "1.7-dev" } }, "autoload": { @@ -347,7 +347,7 @@ "uri", "url" ], - "time": "2019-07-01T23:21:34+00:00" + "time": "2020-09-30T07:37:11+00:00" }, { "name": "ircmaxell/password-compat", @@ -392,24 +392,143 @@ "time": "2014-11-20T16:49:30+00:00" }, { - "name": "maxmind-db/reader", - "version": "v1.7.0", + "name": "laminas/laminas-httphandlerrunner", + "version": "1.2.0", "source": { "type": "git", - "url": "https://github.com/maxmind/MaxMind-DB-Reader-php.git", - "reference": "942553da239f12051275f9c666538b5dd09e2908" + "url": "https://github.com/laminas/laminas-httphandlerrunner.git", + "reference": "e1a5dad040e0043135e8095ee27d1fbf6fb640e1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/maxmind/MaxMind-DB-Reader-php/zipball/942553da239f12051275f9c666538b5dd09e2908", - "reference": "942553da239f12051275f9c666538b5dd09e2908", + "url": "https://api.github.com/repos/laminas/laminas-httphandlerrunner/zipball/e1a5dad040e0043135e8095ee27d1fbf6fb640e1", + "reference": "e1a5dad040e0043135e8095ee27d1fbf6fb640e1", + "shasum": "" + }, + "require": { + "laminas/laminas-zendframework-bridge": "^1.0", + "php": "^7.1", + "psr/http-message": "^1.0", + "psr/http-message-implementation": "^1.0", + "psr/http-server-handler": "^1.0" + }, + "replace": { + "zendframework/zend-httphandlerrunner": "^1.1.0" + }, + "require-dev": { + "laminas/laminas-coding-standard": "~1.0.0", + "laminas/laminas-diactoros": "^1.7 || ^2.1.1", + "phpunit/phpunit": "^7.0.2" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.2.x-dev", + "dev-develop": "1.3.x-dev" + }, + "laminas": { + "config-provider": "Laminas\\HttpHandlerRunner\\ConfigProvider" + } + }, + "autoload": { + "psr-4": { + "Laminas\\HttpHandlerRunner\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "description": "Execute PSR-15 RequestHandlerInterface instances and emit responses they generate.", + "homepage": "https://laminas.dev", + "keywords": [ + "components", + "laminas", + "mezzio", + "psr-15", + "psr-7" + ], + "funding": [ + { + "url": "https://funding.communitybridge.org/projects/laminas-project", + "type": "community_bridge" + } + ], + "time": "2020-06-03T15:52:17+00:00" + }, + { + "name": "laminas/laminas-zendframework-bridge", + "version": "1.1.1", + "source": { + "type": "git", + "url": "https://github.com/laminas/laminas-zendframework-bridge.git", + "reference": "6ede70583e101030bcace4dcddd648f760ddf642" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/laminas/laminas-zendframework-bridge/zipball/6ede70583e101030bcace4dcddd648f760ddf642", + "reference": "6ede70583e101030bcace4dcddd648f760ddf642", + "shasum": "" + }, + "require": { + "php": "^5.6 || ^7.0 || ^8.0" + }, + "require-dev": { + "phpunit/phpunit": "^5.7 || ^6.5 || ^7.5 || ^8.1 || ^9.3", + "squizlabs/php_codesniffer": "^3.5" + }, + "type": "library", + "extra": { + "laminas": { + "module": "Laminas\\ZendFrameworkBridge" + } + }, + "autoload": { + "files": [ + "src/autoload.php" + ], + "psr-4": { + "Laminas\\ZendFrameworkBridge\\": "src//" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "description": "Alias legacy ZF class names to Laminas Project equivalents.", + "keywords": [ + "ZendFramework", + "autoloading", + "laminas", + "zf" + ], + "funding": [ + { + "url": "https://funding.communitybridge.org/projects/laminas-project", + "type": "community_bridge" + } + ], + "time": "2020-09-14T14:23:00+00:00" + }, + { + "name": "maxmind-db/reader", + "version": "v1.8.0", + "source": { + "type": "git", + "url": "https://github.com/maxmind/MaxMind-DB-Reader-php.git", + "reference": "b566d429ac9aec10594b0935be8ff38302f8d5c8" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/maxmind/MaxMind-DB-Reader-php/zipball/b566d429ac9aec10594b0935be8ff38302f8d5c8", + "reference": "b566d429ac9aec10594b0935be8ff38302f8d5c8", "shasum": "" }, "require": { "php": ">=7.2" }, "conflict": { - "ext-maxminddb": "<1.7.0,>=2.0.0" + "ext-maxminddb": "<1.8.0,>=2.0.0" }, "require-dev": { "friendsofphp/php-cs-fixer": "2.*", @@ -449,31 +568,31 @@ "geolocation", "maxmind" ], - "time": "2020-08-07T22:10:05+00:00" + "time": "2020-10-01T17:30:21+00:00" }, { "name": "maxmind/web-service-common", - "version": "v0.7.0", + "version": "v0.8.0", "source": { "type": "git", "url": "https://github.com/maxmind/web-service-common-php.git", - "reference": "74c996c218ada5c639c8c2f076756e059f5552fc" + "reference": "ba67d9532cfaf499bd71774b8170d05df4f75fb7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/maxmind/web-service-common-php/zipball/74c996c218ada5c639c8c2f076756e059f5552fc", - "reference": "74c996c218ada5c639c8c2f076756e059f5552fc", + "url": "https://api.github.com/repos/maxmind/web-service-common-php/zipball/ba67d9532cfaf499bd71774b8170d05df4f75fb7", + "reference": "ba67d9532cfaf499bd71774b8170d05df4f75fb7", "shasum": "" }, "require": { "composer/ca-bundle": "^1.0.3", "ext-curl": "*", "ext-json": "*", - "php": ">=5.6" + "php": ">=7.2" }, "require-dev": { "friendsofphp/php-cs-fixer": "2.*", - "phpunit/phpunit": "^4.8.36 || ^5.7 || ^6.5 || ^7.0", + "phpunit/phpunit": "^8.0 || ^9.0", "squizlabs/php_codesniffer": "3.*" }, "type": "library", @@ -495,7 +614,7 @@ ], "description": "Internal MaxMind Web Service API", "homepage": "https://github.com/maxmind/web-service-common-php", - "time": "2020-05-06T14:07:26+00:00" + "time": "2020-10-01T15:28:36+00:00" }, { "name": "michelf/php-markdown", @@ -1496,6 +1615,7 @@ "i18n", "text" ], + "abandoned": true, "time": "2018-12-05T18:34:18+00:00" }, { @@ -1572,62 +1692,6 @@ } ], "time": "2020-08-05T15:09:04+00:00" - }, - { - "name": "zendframework/zend-httphandlerrunner", - "version": "1.1.0", - "source": { - "type": "git", - "url": "https://github.com/zendframework/zend-httphandlerrunner.git", - "reference": "75fb12751fe9d6e392cce1ee0d687dacae2db787" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/zendframework/zend-httphandlerrunner/zipball/75fb12751fe9d6e392cce1ee0d687dacae2db787", - "reference": "75fb12751fe9d6e392cce1ee0d687dacae2db787", - "shasum": "" - }, - "require": { - "php": "^7.1", - "psr/http-message": "^1.0", - "psr/http-message-implementation": "^1.0", - "psr/http-server-handler": "^1.0" - }, - "require-dev": { - "phpunit/phpunit": "^7.0.2", - "zendframework/zend-coding-standard": "~1.0.0", - "zendframework/zend-diactoros": "^1.7 || ^2.1.1" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.1.x-dev", - "dev-develop": "1.2.x-dev" - }, - "zf": { - "config-provider": "Zend\\HttpHandlerRunner\\ConfigProvider" - } - }, - "autoload": { - "psr-4": { - "Zend\\HttpHandlerRunner\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "description": "Execute PSR-15 RequestHandlerInterface instances and emit responses they generate.", - "keywords": [ - "ZendFramework", - "components", - "expressive", - "psr-15", - "psr-7", - "zf" - ], - "abandoned": "laminas/laminas-httphandlerrunner", - "time": "2019-02-19T18:20:34+00:00" } ], "packages-dev": [ @@ -2067,16 +2131,16 @@ }, { "name": "phpunit/php-code-coverage", - "version": "9.1.11", + "version": "9.2.0", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-code-coverage.git", - "reference": "c9394cb9d07ecfa9351b96f2e296bad473195f4d" + "reference": "53a4b737e83be724efd2bc4e7b929b9a30c48972" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/c9394cb9d07ecfa9351b96f2e296bad473195f4d", - "reference": "c9394cb9d07ecfa9351b96f2e296bad473195f4d", + "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/53a4b737e83be724efd2bc4e7b929b9a30c48972", + "reference": "53a4b737e83be724efd2bc4e7b929b9a30c48972", "shasum": "" }, "require": { @@ -2104,7 +2168,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "9.1-dev" + "dev-master": "9.2-dev" } }, "autoload": { @@ -2136,7 +2200,7 @@ "type": "github" } ], - "time": "2020-09-19T05:29:17+00:00" + "time": "2020-10-02T03:37:32+00:00" }, { "name": "phpunit/php-file-iterator", @@ -2365,16 +2429,16 @@ }, { "name": "phpunit/phpunit", - "version": "9.3.11", + "version": "9.4.0", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "f7316ea106df7c9507f4fdaa88c47bc10a3b27a1" + "reference": "ef533467a7974c4b6c354f3eff42a115910bd4e5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/f7316ea106df7c9507f4fdaa88c47bc10a3b27a1", - "reference": "f7316ea106df7c9507f4fdaa88c47bc10a3b27a1", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/ef533467a7974c4b6c354f3eff42a115910bd4e5", + "reference": "ef533467a7974c4b6c354f3eff42a115910bd4e5", "shasum": "" }, "require": { @@ -2390,7 +2454,7 @@ "phar-io/version": "^3.0.2", "php": ">=7.3", "phpspec/prophecy": "^1.11.1", - "phpunit/php-code-coverage": "^9.1.11", + "phpunit/php-code-coverage": "^9.2", "phpunit/php-file-iterator": "^3.0.4", "phpunit/php-invoker": "^3.1", "phpunit/php-text-template": "^2.0.2", @@ -2421,7 +2485,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "9.3-dev" + "dev-master": "9.4-dev" } }, "autoload": { @@ -2460,7 +2524,7 @@ "type": "github" } ], - "time": "2020-09-24T08:08:49+00:00" + "time": "2020-10-02T03:54:37+00:00" }, { "name": "sebastian/cli-parser", @@ -2516,16 +2580,16 @@ }, { "name": "sebastian/code-unit", - "version": "1.0.6", + "version": "1.0.7", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/code-unit.git", - "reference": "d3a241b6028ff9d8e97d2b6ebd4090d01f92fad8" + "reference": "59236be62b1bb9919e6d7f60b0b832dc05cef9ab" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/code-unit/zipball/d3a241b6028ff9d8e97d2b6ebd4090d01f92fad8", - "reference": "d3a241b6028ff9d8e97d2b6ebd4090d01f92fad8", + "url": "https://api.github.com/repos/sebastianbergmann/code-unit/zipball/59236be62b1bb9919e6d7f60b0b832dc05cef9ab", + "reference": "59236be62b1bb9919e6d7f60b0b832dc05cef9ab", "shasum": "" }, "require": { @@ -2564,7 +2628,7 @@ "type": "github" } ], - "time": "2020-09-28T05:28:46+00:00" + "time": "2020-10-02T14:47:54+00:00" }, { "name": "sebastian/code-unit-reverse-lookup", @@ -2619,16 +2683,16 @@ }, { "name": "sebastian/comparator", - "version": "4.0.4", + "version": "4.0.5", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/comparator.git", - "reference": "e717aabeafe4eac045d3e947dad3207118664c72" + "reference": "7a8ff306445707539c1a6397372a982a1ec55120" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/e717aabeafe4eac045d3e947dad3207118664c72", - "reference": "e717aabeafe4eac045d3e947dad3207118664c72", + "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/7a8ff306445707539c1a6397372a982a1ec55120", + "reference": "7a8ff306445707539c1a6397372a982a1ec55120", "shasum": "" }, "require": { @@ -2685,7 +2749,7 @@ "type": "github" } ], - "time": "2020-09-28T05:31:46+00:00" + "time": "2020-09-30T06:47:25+00:00" }, { "name": "sebastian/complexity",