Index: /controller/wpsg_AdminController.class.php =================================================================== --- /controller/wpsg_AdminController.class.php (revision 6483) +++ /controller/wpsg_AdminController.class.php (revision 6484) @@ -330,5 +330,5 @@ { - if ($_REQUEST['do'] === 'activatemodul') + if (wpsg_isSizedString($_REQUEST['do'], 'activatemodul')) { @@ -345,10 +345,5 @@ { - $api_return = @json_decode($GLOBALS['wpsg_sc']->get_url_post_content('https://api.maennchen1.de/', array( - 'f' => 'registerModule', - 'data' => array( - 'wpsg', $this->get_option('wpsg_key'), $_SERVER['HTTP_HOST'], $_REQUEST['modulcode'] - ) - )), true); + $api_return = wpsg_api_call('registerModule', array($_REQUEST['modulcode'])); if (!wpsg_isSizedArray($api_return) || !isset($api_return['returnCode'])) @@ -388,10 +383,5 @@ else if ($api_return['returnCode'] === 4) { - - $api_return['wpsg_update_data']['updateData'] = (object)$api_return['wpsg_update_data']['updateData']; - - $GLOBALS['wpsg_sc']->update_option('wpsg_lastupdate', strval(time()), true); - $GLOBALS['wpsg_sc']->update_option('wpsg_updatedata', $api_return['wpsg_update_data'], true); - + $this->addBackendMessage(__('Modul wurde fÃŒr diesen LizenzschlÃŒssel aktiviert.', 'wpsg')); @@ -423,4 +413,130 @@ } + else if (wpsg_isSizedString($_REQUEST['do'], 'saveRegister')) + { + + $api_return = wpsg_api_call('updateRegisterData', array($_REQUEST['register'])); + + try + { + + if ($api_return['returnCode'] === 0) + { + + throw new \Exception(__('Ihre Lizenz ist ungÃŒltig.', 'wpsg')); + + } + else if ($api_return['returnCode'] === 1) + { + + $this->addBackendMessage(__('Daten erfolgreich aktualisiert.', 'wpsg')); + $this->redirect(WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Admin&action=registrierung'); + + } + else + { + + throw new \Exception(__('Nicht definierte API Antwort.')); + + } + + } + catch (Exception $e) + { + + $this->addBackendError($e->getMessage()); + $this->redirect(WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Admin&action=registrierung'); + + } + + } + else if (wpsg_isSizedString($_REQUEST['do'], 'domainRegister')) + { + + $api_return = wpsg_api_call('domainRegister', array($_SERVER['HTTP_HOST'])); + + try + { + + if ($api_return['returnCode'] === 1) + { + + $this->addBackendMessage(__('Domain erfolgreich registriert.', 'wpsg')); + $this->redirect(WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Admin&action=registrierung&subaction=domaindata'); + + } + else if ($api_return['returnCode'] === -1) + { + + throw new \Exception(__('Ihre Lizenz ist ungÃŒltig.', 'wpsg')); + + } + else if ($api_return['returnCode'] === -2) + { + + throw new \Exception(__('Diese Domain ist schon auf Ihren SchlÃŒssel registriert.', 'wpsg')); + + } + else + { + + throw new \Exception(__('Nicht definierte API Antwort.')); + + } + + } + catch (Exception $e) + { + + $this->addBackendError($e->getMessage()); + $this->redirect(WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Admin&action=registrierung&subaction=domaindata'); + + } + + } + else if (wpsg_isSizedString($_REQUEST['do'], 'domainDeRegister')) + { + + $api_return = wpsg_api_call('domainDeRegister', array($_SERVER['HTTP_HOST'])); + + try + { + + if ($api_return['returnCode'] === 1) + { + + $this->addBackendMessage(__('Domain erfolgreich unregistriert.', 'wpsg')); + $this->redirect(WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Admin&action=registrierung&subaction=domaindata'); + + } + else if ($api_return['returnCode'] === -1) + { + + throw new \Exception(__('Ihre Lizenz ist ungÃŒltig.', 'wpsg')); + + } + else if ($api_return['returnCode'] === -2) + { + + throw new \Exception(__('Diese Domain ist nicht auf Ihren SchlÃŒssel registriert.', 'wpsg')); + + } + else + { + + throw new \Exception(__('Nicht definierte API Antwort.')); + + } + + } + catch (Exception $e) + { + + $this->addBackendError($e->getMessage()); + $this->redirect(WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Admin&action=registrierung&subaction=domaindata'); + + } + + } $this->view['actionName'] = 'licence'; @@ -429,7 +545,5 @@ else $this->view['subaction'] = 'registerdata'; - $this->render(WPSG_PATH_VIEW.'/admin/licence.phtml'); - - return "K"; + $this->render(WPSG_PATH_VIEW.'/admin/licence.phtml'); //return $this->shop->callMod('wpsg_mod_core', 'admin_registrierung'); Index: /controller/wpsg_ShopController.class.php =================================================================== --- /controller/wpsg_ShopController.class.php (revision 6483) +++ /controller/wpsg_ShopController.class.php (revision 6484) @@ -620,4 +620,6 @@ { + wpsg_debug_console($this->get_option('wp_installed')); + if (is_admin() && defined('FORCE_SSL_ADMIN') && FORCE_SSL_ADMIN == true) { Index: /controller/wpsg_SystemController.class.php =================================================================== --- /controller/wpsg_SystemController.class.php (revision 6483) +++ /controller/wpsg_SystemController.class.php (revision 6484) @@ -435,4 +435,5 @@ $this->bMessageOut = true; + $GLOBALS['wpsg_sc']->bMessageOut = true; $strOut = ''; Index: /lib/filter_functions.inc.php =================================================================== --- /lib/filter_functions.inc.php (revision 6483) +++ /lib/filter_functions.inc.php (revision 6484) @@ -59,4 +59,6 @@ } + + echo $GLOBALS['wpsg_sc']->writeBackendMessage(); } @@ -345,4 +347,52 @@ } + function wpsg_api_call($func, $arParam = array(), $key = false) + { + + wpsg_debug_console('ApiCall:'.$func); + + $plugin_data = get_plugin_data(dirname(__FILE__).'/../wpshopgermany.php'); + + if ($key === false) $key = $GLOBALS['wpsg_sc']->get_option('wpsg_key'); + + $api_return = $GLOBALS['wpsg_sc']->get_url_post_content('https://api.maennchen1.de/', array( + 'f' => $func, + 'app' => 'wpsg', + 'key' => $key, + 'version' => $plugin_data['Version'], + 'host' => $_SERVER['HTTP_HOST'], + 'data' => $arParam + )); + + $api_return_json = json_decode($api_return, true); + + if (wpsg_isSizedArray($api_return_json)) + { + + // In der Antwort waren gleich aktualisierte Daten enthalten + if (isset($api_return_json['wpsg_update_data']['updateData'])) + { + + $api_return_json['wpsg_update_data']['updateData'] = (object)$api_return_json['wpsg_update_data']['updateData']; + + $GLOBALS['wpsg_sc']->update_option('wpsg_lastupdate', strval(time()), true); + $GLOBALS['wpsg_sc']->update_option('wpsg_updatedata', $api_return_json['wpsg_update_data'], true); + + $GLOBALS['wpsg_sc']->update_option('wp_installed', (($api_return_json['wpsg_update_data']['returnCode'] != '0')?'1':'0')); + + } + + return $api_return_json; + + } + else + { + + return false; + + } + + } + function wpsg_get_update_data($key = false, $force = false) { @@ -355,27 +405,16 @@ if ($force === true) $wpsg_lastupdate = false; - $min = 5; - $min = 0.1; - + $min = 15; + $min = 0.2; + if ($wpsg_lastupdate == false || $wpsg_lastupdate < time() - 60 * $min || !wpsg_isSizedArray($wpsg_update_data)) { - $plugin_data = get_plugin_data(dirname(__FILE__).'/../wpshopgermany.php'); - try { - $api_return = $GLOBALS['wpsg_sc']->get_url_post_content('https://api.maennchen1.de/', array( - 'f' => 'checkUpdate', - 'data' => array( - 'wpsg', $key, $plugin_data['Version'], $_SERVER['HTTP_HOST'] - ) - )); - - $wpsg_update_data_return = json_decode($api_return, true); - - //die(wpsg_debug($wpsg_update_data_return)); - - if (wpsg_isSizedArray($wpsg_update_data) && isset($wpsg_update_data['returnCode'])) + $wpsg_update_data_return = wpsg_api_call('checkUpdate'); + + if (wpsg_isSizedArray($wpsg_update_data_return) && isset($wpsg_update_data_return['returnCode'])) { @@ -385,4 +424,6 @@ $GLOBALS['wpsg_sc']->update_option('wpsg_lastupdate', strval(time()), true); $GLOBALS['wpsg_sc']->update_option('wpsg_updatedata', $wpsg_update_data, true); + + $GLOBALS['wpsg_sc']->update_option('wp_installed', (($wpsg_update_data['returnCode'] != '0')?'1':'0')); } Index: /views/admin/index.phtml =================================================================== --- /views/admin/index.phtml (revision 6483) +++ /views/admin/index.phtml (revision 6484) @@ -39,6 +39,6 @@ - writeBackendMessage(); ?> - +
+
view['subTemplate'])) { ?> Index: /views/admin/licence.phtml =================================================================== --- /views/admin/licence.phtml (revision 6483) +++ /views/admin/licence.phtml (revision 6484) @@ -4,4 +4,8 @@ * Template fÃŒr die Lizenzverwaltung */ + + $wpsg_update_data = wpsg_get_update_data(); + + if (!is_array($wpsg_update_data) || !current_user_can('wpsg_lizence')) die(); ?> @@ -19,5 +23,5 @@ - + @@ -39,5 +43,5 @@ writeBackendMessage(); ?> - +
@@ -69,13 +73,114 @@ view['subaction'] === 'registerdata') { ?> - +
+ + + + + + + +
+ + + + + + + + __('Deutschland', 'wpsg'), + '2' => __('Österreich', 'wpsg'), + '3' => __('Schweiz', 'wpsg'), + '4' => __('Niederlande', 'wpsg'), + '5' => __('Belgien', 'wpsg') + ), $wpsg_update_data['registerData']['country']); ?> + + +
+ + + +
view['subaction'] === 'domaindata') { ?> - + + + + + + + + + + + + + + + + + + +
+ + + +
+ + + +

+ + + +
+ + + +

+ +
+ + + + + +

+ + + +

+ + + view['subaction'] === 'modulactivation') { ?> shop->loadModule(true); ?> - + +
+ +
+ + +
+
+ + + +
+
+ + + +
+
+
+ +
+ +
+ @@ -87,5 +192,5 @@ - + @@ -112,7 +217,7 @@ - + - + @@ -139,7 +244,14 @@ { - echo ' - '.__('neue Version verfÃŒgbar', 'wpsg').'
'; - echo wpsg_translate(__('Version installieren.', 'wpsg'), WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Admin&action=registrierung&noheader=1&do=installModul&modul='.$modul_key); - + echo ' - '.__('neue Version verfÃŒgbar', 'wpsg').''; + + if ($modul_info['active'] === true) + { + + echo '
'; + echo wpsg_translate(__('Version installieren.', 'wpsg'), WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Admin&action=registrierung&noheader=1&do=installModul&modul='.$modul_key); + + } + } @@ -151,26 +263,5 @@ - -
- -
- - -
-
- - - -
-
- - - -
-
-
- -
- + Index: /views/admin/module.phtml =================================================================== --- /views/admin/module.phtml (revision 6483) +++ /views/admin/module.phtml (revision 6484) @@ -5,4 +5,10 @@ * Sollte nicht angepasst werden */ + + $wpsg_update_data = wpsg_get_update_data(); + if (wpsg_isSizedArray($wpsg_update_data['modulinfo'])) $modul_info = $wpsg_update_data['modulinfo']; + else $modul_info = array(); + + //wpsg_debug($modul_info); ?> @@ -51,21 +57,77 @@ arAllModule[$_REQUEST['modul']]->version)) { ?> - arAllModule[$_REQUEST['modul']]->version, array('text' => true)); ?> - - arAllModule[$_REQUEST['modul']]->free) && $this->arAllModule[$_REQUEST['modul']]->free === true) { ?> - - - arLizenz) && in_array($_REQUEST['modul'], (array)$this->arLizenz['mods'])) { ?> - - - arAllModule[$_REQUEST['modul']]->getDemoDays() > 0) { ?> - arAllModule[$_REQUEST['modul']]->getDemoDays()); ?> - - - - - - + + + + arAllModule[$_REQUEST['modul']]->version; + + if (wpsg_isSizedArray($modul_info[$_REQUEST['modul']])) + { + + $modul_info_modul = $modul_info[$_REQUEST['modul']]; + + if ($modul_info_modul['version'] === $this->shop->arAllModule[$_REQUEST['modul']]->version) + { + + echo ' - '.__('aktuell', 'wpsg').''; + + } + else if (version_compare($modul_info_modul['version'], WPSG_VERSION) > 0) + { + + echo ' - '.__('neue Version verfÃŒgbar', 'wpsg').'
'.wpsg_translate(__('wpShopGermany Update notwendig', 'wpsg'), WPSG_URL_WP.'wp-admin/plugins.php'); + + } + else if (version_compare($modul_info_modul['version'], $this->shop->arAllModule[$_REQUEST['modul']]->versio) > 0) + { + + echo ' - '.__('neue Version verfÃŒgbar', 'wpsg').''; + + if ($modul_info_modul['active'] === true) + { + + echo '
'; + echo wpsg_translate(__('Version installieren.', 'wpsg'), WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Admin&action=registrierung&noheader=1&do=installModul&modul='.$_REQUEST['modul']); + + } + + } + + } + + ?> + + + + + + + + + + + + + + + + [ ] + + [ ] + + [ ] + + + + + + + + +
+ @@ -141,5 +203,5 @@ - + @@ -176,7 +238,7 @@ - + - + @@ -203,6 +265,13 @@ { - echo ' - '.__('neue Version verfÃŒgbar', 'wpsg').'
'; - echo wpsg_translate(__('Version installieren.', 'wpsg'), WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Admin&action=registrierung&noheader=1&do=installModul&modul='.$modul_key); + echo ' - '.__('neue Version verfÃŒgbar', 'wpsg').''; + + if ($modul_info['active'] === true) + { + + echo '
'; + echo wpsg_translate(__('Version installieren.', 'wpsg'), WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Admin&action=registrierung&noheader=1&do=installModul&modul='.$modul_key); + + } } Index: /views/admin/news.phtml =================================================================== --- /views/admin/news.phtml (revision 6483) +++ /views/admin/news.phtml (revision 6484) @@ -8,7 +8,5 @@ view['news'])) { ?> - -
- +
Index: /views/css/admin.css =================================================================== --- /views/css/admin.css (revision 6483) +++ /views/css/admin.css (revision 6484) @@ -42,5 +42,5 @@ #wpsg-bs .form-group-sm .form-control { padding-left:8px; } #wpsg-bs .form-group-text { position:relative; } -#wpsg-bs .form-group-text p { padding-top:8px; line-height:100%; min-height:18px; } +#wpsg-bs .form-group-text p { padding-top:5px; line-height:150%; min-height:18px; } #wpsg-bs .form-select .form-control { padding-left:5px; } #wpsg-bs .form-group-sm .form-control-static { padding-left:10px; height:auto; } @@ -58,4 +58,6 @@ #wpsg-bs .wpsg_table_wrap { max-width:100%; overflow-x:auto; margin-bottom:1rem; } #wpsg-bs .wpsg-bs-toggle-nav { float:right; line-height:50px; font-size:25px; text-decoration:none; } +#wspg-bs #message, +#wpsg-bs .wpsg_banner { margin-right:20px; } /* Allgemeine Klassen */ @@ -195,5 +197,12 @@ .wpsg_modul_onlyactive_glyphicon { position:absolute !important; right:5px; top:7px !important; color:#3c763d; } .wpsg_modul_search_wrap input[type="checkbox"] { right:25px; top:3px; position:absolute; } -#wpsg-bs .modultable td { padding:4px 8px !important; } +#wpsg-bs .modultable td { padding:4px 8px !important; font-size:1.2rem; } +#wpsg-bs .modultable tr > *:nth-child(2) { width:100px; } +#wpsg-bs .modultable tr > *:nth-child(3) { width:175px; } +#wpsg-bs .modultable tr > *:nth-child(4) { width:200px; } + +/* Domainverwaltung */ +#wpsg-bs .domaintable td { padding:4px 8px !important; vertical-align:middle; } +#wpsg-bs .domaintable td.col_action { text-align:right; } /* Verwaltung Versandzonen */ @@ -322,4 +331,7 @@ .wpsg_ov_table .wpsg_label { text-align:left; } +/* News Bereich Backend */ +.wpsg_news_wrap { margin-right:20px; } + /* Statistikmodul */ .wpsg_mod_statistics_totals_row { width:100%; }