Index: /controller/wpsg_AdminController.class.php =================================================================== --- /controller/wpsg_AdminController.class.php (revision 6521) +++ /controller/wpsg_AdminController.class.php (revision 6522) @@ -571,4 +571,15 @@ } + else if (wpsg_isSizedString($_REQUEST['do'], 'installModul')) + { + + $bOK = $this->installModul($_REQUEST['modul']); + + if ($bOK === true) $this->addBackendMessage(__('Modul erfolgreich installiert.', 'wpsg')); + + if (wpsg_isSizedString($_REQUEST['source'], 'licence')) $this->redirect(WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Admin&action=registrierung&subaction=modulactivation'); + else $this->redirect(WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Admin&action=module'); + + } $this->view['actionName'] = 'licence'; @@ -2812,5 +2823,5 @@ $wpsg_update_data = wpsg_get_update_data(); $url = $wpsg_update_data['modulinfo'][$modul_key]['download_url']; - mail("daniel@maenchen1.de", "URLTEST", $url); + if (!wpsg_isSizedString($url)) throw new \Exception("UngÃŒltige Download URL."); Index: /controller/wpsg_ShopController.class.php =================================================================== --- /controller/wpsg_ShopController.class.php (revision 6521) +++ /controller/wpsg_ShopController.class.php (revision 6522) @@ -109,6 +109,6 @@ $this->basketController = new wpsg_BasketController(); - - if ($this->get_option('wpsg_key') !== false) $this->bLicence = true; + + if ($this->get_option('wpsg_key') !== false && $this->get_option('wpsg_key') != '') $this->bLicence = true; $this->arStatus = array( Index: /lib/filter_functions.inc.php =================================================================== --- /lib/filter_functions.inc.php (revision 6521) +++ /lib/filter_functions.inc.php (revision 6522) @@ -39,5 +39,5 @@ $wpsg_update_data = wpsg_get_update_data(); - if (is_object($wpsg_update_data['updateData']) && !preg_match('/wpsg/', $_REQUEST['page'])) + if (is_object($wpsg_update_data['updateData'])) { @@ -75,4 +75,6 @@ if ($GLOBALS['wpsg_sc']->bLicence === true) { + + // LizenzschlÃŒssel wurde eingegeben echo ''; @@ -621,7 +623,7 @@ global $wp_filesystem; - + $wpsg_update_data = wpsg_get_update_data(); - + if ($_REQUEST['plugin'] != WPSG_FOLDERNAME.'/wpshopgermany.php') return; @@ -667,23 +669,9 @@ } - - //wpsg_chmod($path.'/lib/translation.phtml', 0777); - //wpsg_chmod($path.'/lang', 0777); - - /* + $AC = new wpsg_AdminController(); - - // Module nachinstallieren - foreach ((array)$GLOBALS['wpsg_arZusatzModuleInstalled'] as $m_key) - { - - //$AC->installModul($m_key); - - }*/ - - $AC = new wpsg_AdminController(); - + // Module aus Lizenz nachinstallieren - foreach ($wpsg_update_data['updateData']->modulinfo as $modul_key => $modul_info) + foreach ($wpsg_update_data['modulinfo'] as $modul_key => $modul_info) { Index: /views/admin/licence.phtml =================================================================== --- /views/admin/licence.phtml (revision 6521) +++ /views/admin/licence.phtml (revision 6522) @@ -183,84 +183,5 @@
- - - - $modul_info) { if ($modul_info['active'] !== true) unset($wpsg_update_data['modulinfo'][$modul_key]); } ?> - - - - - - - - - - - - $modul_info) { ?> - - - - - - - - -
- - shop->hasModInstalled($modul_key)) { ?> - shop->arAllModule[$modul_key]->version; ?> - - - - - - - - - - - - - - - - - - - shop->hasModInstalled($modul_key) && $modul_info['version'] === $this->shop->arAllModule[$modul_key]->version) - { - - echo ' - '.__('aktuell', 'wpsg').''; - - } - else if (version_compare($modul_info['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['version'], $this->shop->arAllModule[$modul_key]->versio) > 0) - { - - 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/module.phtml =================================================================== --- /views/admin/module.phtml (revision 6521) +++ /views/admin/module.phtml (revision 6522) @@ -117,4 +117,5 @@ + bLicence === true) { ?> [ ] @@ -128,4 +129,7 @@ [ ] + + +
@@ -189,4 +193,5 @@
+ bLicence === true) { ?>
@@ -209,105 +214,17 @@
- + + +

+ + +

- - - - - - - - - - - - - - $modul_info) { ?> - - - - - - - - -
- - hasModInstalled($modul_key)) { ?> - arAllModule[$modul_key]->version; ?> - - - - - - - - - - - - - - - - - - - hasModInstalled($modul_key) && $modul_info['version'] === $this->arAllModule[$modul_key]->version) - { - - echo ' - '.__('aktuell', 'wpsg').''; - - } - else if (version_compare($modul_info['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['version'], $this->arAllModule[$modul_key]->versio) > 0) - { - - 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/modulelist.phtml =================================================================== --- /views/admin/modulelist.phtml (revision 6522) +++ /views/admin/modulelist.phtml (revision 6522) @@ -0,0 +1,141 @@ +shop = &$this; + + } + else + { + + $source = 'licence'; + + } + +?> + + + + $modul_info) { if ($modul_info['active'] !== true) unset($wpsg_update_data['modulinfo'][$modul_key]); } */ ?> + + + + + + + + + + + + $modul_info) { ?> + + + + + + + + +
+ + shop->hasModInstalled($modul_key)) { ?> + shop->arAllModule[$modul_key]->version; ?> + + + + + + + + + + + + + + + + + + + shop->hasModInstalled($modul_key)) { ?> + +
+ + Version installieren', 'wpsg'), WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Admin&action=registrierung&noheader=1&do=installModul&modul='.$modul_key.'&source='.$source); ?> + + Demo installieren', 'wpsg'), WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Admin&action=registrierung&noheader=1&do=installModul&modul='.$modul_key.'&source='.$source); ?> + + + + + 		shop->arAllModule[$modul_key]->version) < 0) + { + + echo $modul_info['version_latest']; + + echo ' - '.__('neue Version verfÃŒgbar', 'wpsg').''; + 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.'&source='.$source); + + echo '

'; + + } + + echo $modul_info['version']; + + if ($this->shop->hasModInstalled($modul_key) && $modul_info['version'] === $this->shop->arAllModule[$modul_key]->version) + { + + echo ' - '.__('aktuell', 'wpsg').''; + + } + else if (version_compare($modul_info['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['version'], $this->shop->arAllModule[$modul_key]->version) > 0) + { + + 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.'&source='.$source); + + } + + } + + ?>
+ + + +

+ + + + + +