Index: /controller/wpsg_ShopController.class.php =================================================================== --- /controller/wpsg_ShopController.class.php (revision 6474) +++ /controller/wpsg_ShopController.class.php (revision 6475) @@ -2105,4 +2105,14 @@ } // public function hasMod($mod_name) + + /* + * PrÃŒft ob eine Moduldatei vorhanden ist + */ + public function hasModInstalled($mod_key) + { + + return array_key_exists($mod_key, $this->arAllModule); + + } /** Index: /lib/filter_functions.inc.php =================================================================== --- /lib/filter_functions.inc.php (revision 6474) +++ /lib/filter_functions.inc.php (revision 6475) @@ -355,6 +355,7 @@ if ($force === true) $wpsg_lastupdate = false; - $min = 30; - + $min = 5; + $min = 0.1; + if ($wpsg_lastupdate == false || $wpsg_lastupdate < time() - 60 * $min || !wpsg_isSizedArray($wpsg_update_data)) { @@ -373,6 +374,8 @@ $wpsg_update_data_return = json_decode($api_return, true); - - if (wpsg_isSizedArray($wpsg_update_data)) + + //die(wpsg_debug($wpsg_update_data_return)); + + if (wpsg_isSizedArray($wpsg_update_data) && isset($wpsg_update_data['returnCode'])) { Index: ds/wpsg_mod_keygen.class.php =================================================================== --- /mods/wpsg_mod_keygen.class.php (revision 6474) +++ (revision ) @@ -1,119 +1,0 @@ -name = __('Keygen', 'wpsg'); - $this->group = __('Sonstiges', 'wpsg'); - $this->desc = __('Erlaubt das generieren von Keys.', 'wpsg'); - - } // public function __construct() - - public function settings_save() - { - - if (file_exists(@$_FILES['testkey']['tmp_name'])) - { - - if (!class_exists('Crypt_RSA')) - { - - @set_include_path(WPSG_PATH.'/lib/phpseclib0.3.0/'.PATH_SEPARATOR.get_include_path()); - require_once(WPSG_PATH.'/lib/phpseclib0.3.0/Crypt/RSA.php'); - - } - - $rsa = new Crypt_RSA(); - $rsa->loadKey(file_get_contents(WPSG_PATH.'/lib/.htpublic')); - - $arKey = @unserialize($rsa->decrypt(base64_decode(file_get_contents($_FILES['testkey']['tmp_name'])))); - - $this->shop->addBackendMessage('nohspc_Testkey: 
'.print_r($arKey, 1).'
'); - - } - - if ($_REQUEST['wpsg_genkey'] == '1') - { - - $_SESSION['wpsg_mod_keygen'] = wpsg_xss($_REQUEST['wpsg_mod_keygen']); - - if ($_REQUEST['wpsg_mod_keygen']['wpsg_mod_keygen_nr'] <= 0) - { - - $this->shop->addBackendError(__('Bitte eine SchlÃŒsselnummer angeben.', 'wpsg')); - return; - - } - - if (!preg_match('/\d{2}\.\d{2}\.\d{4}/', $_REQUEST['wpsg_mod_keygen']['wpsg_mod_keygen_date'])) - { - - $this->shop->addBackendError(__('Bitte ein gÃŒltiges GÃŒltigkeitsdatum angeben.', 'wpsg')); - return; - - } - - if (!preg_match('/\d+\.\d+\.\d+/', $_REQUEST['wpsg_mod_keygen']['wpsg_mod_keygen_maxver'])) - { - - $this->shop->addBackendError(__('Bitte eine gÃŒltige Maximale Versionsnummer angeben.', 'wpsg')); - return; - - } - - // Key generiere - if (!class_exists('Crypt_RSA')) - { - - @set_include_path(get_include_path().PATH_SEPARATOR.WPSG_PATH.'/lib/phpseclib0.3.0/'); - require_once(WPSG_PATH.'/lib/phpseclib0.3.0/Crypt/RSA.php'); - - } - - $rsa = new Crypt_RSA(); - $rsa->loadKey(file_get_contents(WPSG_PATH.'/mods/mod_keygen/.htprivate')); - - $key = base64_encode($rsa->encrypt(serialize(array( - "anwendung" => $_REQUEST['wpsg_mod_keygen']['wpsg_mod_keygen_anwendung'], - "l" => $_REQUEST['wpsg_mod_keygen']['wpsg_mod_keygen_lizenz'], - "nr" => $_REQUEST['wpsg_mod_keygen']['wpsg_mod_keygen_nr'], - "date" => $_REQUEST['wpsg_mod_keygen']['wpsg_mod_keygen_date'], - "version" => $_REQUEST['wpsg_mod_keygen']['wpsg_mod_keygen_maxver'], - "mods" => $_REQUEST['wpsg_mod_keygen']['mods'] - )))); - - header('Content-type: text/html'); - header('Content-Disposition: attachment; filename="key.txt"'); - - die($key); - - } - - } // public function settings_save() - - public function settings_edit() - { - - $this->shop->render(WPSG_PATH_VIEW.'/mods/mod_keygen/settings_edit.phtml'); - unset($_SESSION['wpsg_mod_keygen']['wpsg_mod_keygen_key']); - - } - - } // class wpsg_mod_keygen extends wpsg_mod_basic - -?> Index: /system/old/mod_core/admin_licence.phtml =================================================================== --- /system/old/mod_core/admin_licence.phtml (revision 6475) +++ /system/old/mod_core/admin_licence.phtml (revision 6475) @@ -0,0 +1,7 @@ + +

+ +

Diese können sie unter shop.maennchen1.de erwerben und anschließend in der Plugin Verwaltung installieren.', 'wpsg'); ?>

Index: /system/old/mod_core/admin_register.phtml =================================================================== --- /system/old/mod_core/admin_register.phtml (revision 6475) +++ /system/old/mod_core/admin_register.phtml (revision 6475) @@ -0,0 +1,120 @@ + + +
+
+ +
+ + + + + + + + +
+ +
+ +
+
+ + +
+ + + + +
+ + view['typ'], array('readonly' => true, 'disabled' => true)); ?> + +
+
+ + view['data']['vname']); ?> + view['data']['name']); ?> + view['data']['plz']); ?> + view['data']['ort']); ?> + view['data']['strasse']); ?> + view['data']['lander'], $this->view['data']['land']); ?> + view['data']['email']); ?> + +
+ + +
+
+ + + + + + + +
+ + view['data']['domains']) <= 0) { ?> +

+ + :

+ view['data']['domains'] as $d) { ?> +

+  [] +
+ + + +
+ view['data']['registred'] === true) { ?> +

+ + +

+ + view['data']['domains']) > 0 && $this->arLizenz['l'] != 3) { ?> +

+ +

+ +
+
+ +
+ + +
+ + + + + + +
+ +

weitere Module installieren und ihrer bestehenden wpShopGermany-Lizenz hinzufÃŒgen.', 'wpsg'), WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Admin&action=module'); ?>

+ +
+
+ + get_option('wpsg_modulkey')); ?> + +
+ + +
+
+ + + +
Index: /system/old/mod_core/module_index.phtml =================================================================== --- /system/old/mod_core/module_index.phtml (revision 6475) +++ /system/old/mod_core/module_index.phtml (revision 6475) @@ -0,0 +1,79 @@ + +
+ +
+
+

+
+
+ +

+ + view['arOnlineModule'])) { ?> + + + + + + + + + + view['arOnlineModule'] as $modul) { ?> + + + + + + + + + +
+ + + + + + + + + + arLizenz['mods'])) { ?> + + + + + + + + + + + + + + (aktuell) + 0) { ?> + wpShopGermany Update notwendig)', 'wpsg'), WPSG_URL_WP.'wp-admin/plugins.php'); ?> + 0) { ?> + installiere #2#', 'wpsg'), WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Admin&action=registrierung&noheader=1&do=installModul&modul='.$modul['key'], $modul['version']); ?> + + + + +
+ + + + +
+
+ +
Index: /system/old/mod_keygen/.htprivate =================================================================== --- /system/old/mod_keygen/.htprivate (revision 6475) +++ /system/old/mod_keygen/.htprivate (revision 6475) @@ -0,0 +1,15 @@ +-----BEGIN RSA PRIVATE KEY----- +MIICXQIBAAKBgQC9hSDz+Lm9jQJwtIudmgM3ZjBR7ZS8i3Rm0sau6q1VVGRlBmDZ +d5zMlElMorrrzzUMZITOsDTIdDGXk4z0vmT3gp89KGnCSkYW6NoGbshPhNKOhBHg +tTrCXBupaIWgLAyOcnRc1ik7crd9BZaCU5K8OZczFsNek0wuYNO6ipZ6HwIDAQAB +AoGADdWaAjU12dBhTTjguDB166VaAaEGKn1Dkf3w4vPek0wFyBofF8DTgVuRvjZi +zrPhe3Ya+7uBHuDcfeQXdgYv+IEhB9U1b1LXtTNFOmgjoZDdrm5VdR8MPzwigwnH +k+gL4a9y82mMPhoXaGOnbHzMMEgeswYfOvH5IZv0GVX8XYECQQDtXbAbGUZmT9nk +6K+tFdTxzXDoWeRkMEiIBw4eAo4xBGc2fdZz3BLPppaMO6MDyVgNMFuUSDaf6D36 +Phri850zAkEAzGXjMWujsDbg0N6gh5TZXtU08EXthTHz0I/xG7W1iFBojeisPlwp +J3rvTNfeOsYfcqniYdNJRxQfOAt+lH63ZQJBAL0Pqn1rHE/RulRBoevTP9F5OT1Y +nDnQ23S9adktX+RbBXq5sF6II9ORdMgtmCIj9SZMJiVtf1TOvs7bOL8cG1ECQQCs +ah21KGkRUZleVwzukT6y4gIf07zBqBtUiLcHesXAUKOBYQ06JR+J8Ac/uK/6v/jz +Dh6qCkI7tNuIuRlzRViJAkBZA+9SH/pt9W55TdmWntDBAuznqmrGmUpf5jph/OcN ++cg4hSq9Sk5DQ3UjPnP7P/1ChQQCboaOAkYs5h5XH5d/ +-----END RSA PRIVATE KEY----- Index: /system/old/mod_keygen/mod_keygen/settings_edit.phtml =================================================================== --- /system/old/mod_keygen/mod_keygen/settings_edit.phtml (revision 6475) +++ /system/old/mod_keygen/mod_keygen/settings_edit.phtml (revision 6475) @@ -0,0 +1,66 @@ + + +
+ + __('wpShopGermany', 'wpsg'), 'wpNewsletterGermany' => __('wpNewsletterGermany', 'wpsg')), ((isset($_SESSION['wpsg_mod_keygen']['wpsg_mod_keygen_anwendung']))?$_SESSION['wpsg_mod_keygen']['wpsg_mod_keygen_anwendung']:'')); ?> + + 'Light', '2' => 'Pro', '3' => 'Enterprise'), ((isset($_SESSION['wpsg_mod_keygen']['wpsg_mod_keygen_lizenz']))?$_SESSION['wpsg_mod_keygen']['wpsg_mod_keygen_lizenz']:'1')); ?> + + + + true)); + + echo wpsg_drawForm_TextStart(); + $i = 0; + // Lizenz = 1 Light Version + // Lizenz = 2 Pro Version + // Lizenz = 3 Enterprise Version + foreach ($arModule as $k => $v) { $i ++; + $mname = $k; + //$lic = $v->lizenz; + //if ((key_exists('name', $v)) && ($lic == 1)) + //if ((key_exists('name', $v))) + { + //$vname = $v->name; + + $chk = (@key_exists($mname, $_SESSION['wpsg_mod_keygen']['mods'] == '1'))?1:0; + echo wpsg_drawForm_Checkbox('wpsg_mod_keygen[mods][]', __($mname, 'wpsg'), + $chk, array('value' => wpsg_hspc($mname), + 'noHidden' => true, + 'fullWidth' => true + )); + } + + } + echo wpsg_drawForm_TextEnd(__('', 'wpsg'), array('noP' => true)); + ?> + + + + + +

+ +
+ +
+ + + + + true)); ?> + + + +

+ +

Index: /system/old/wpsg_mod_keygen.class.php =================================================================== --- /system/old/wpsg_mod_keygen.class.php (revision 6475) +++ /system/old/wpsg_mod_keygen.class.php (revision 6475) @@ -0,0 +1,119 @@ +name = __('Keygen', 'wpsg'); + $this->group = __('Sonstiges', 'wpsg'); + $this->desc = __('Erlaubt das generieren von Keys.', 'wpsg'); + + } // public function __construct() + + public function settings_save() + { + + if (file_exists(@$_FILES['testkey']['tmp_name'])) + { + + if (!class_exists('Crypt_RSA')) + { + + @set_include_path(WPSG_PATH.'/lib/phpseclib0.3.0/'.PATH_SEPARATOR.get_include_path()); + require_once(WPSG_PATH.'/lib/phpseclib0.3.0/Crypt/RSA.php'); + + } + + $rsa = new Crypt_RSA(); + $rsa->loadKey(file_get_contents(WPSG_PATH.'/lib/.htpublic')); + + $arKey = @unserialize($rsa->decrypt(base64_decode(file_get_contents($_FILES['testkey']['tmp_name'])))); + + $this->shop->addBackendMessage('nohspc_Testkey: 
'.print_r($arKey, 1).'
'); + + } + + if ($_REQUEST['wpsg_genkey'] == '1') + { + + $_SESSION['wpsg_mod_keygen'] = wpsg_xss($_REQUEST['wpsg_mod_keygen']); + + if ($_REQUEST['wpsg_mod_keygen']['wpsg_mod_keygen_nr'] <= 0) + { + + $this->shop->addBackendError(__('Bitte eine SchlÃŒsselnummer angeben.', 'wpsg')); + return; + + } + + if (!preg_match('/\d{2}\.\d{2}\.\d{4}/', $_REQUEST['wpsg_mod_keygen']['wpsg_mod_keygen_date'])) + { + + $this->shop->addBackendError(__('Bitte ein gÃŒltiges GÃŒltigkeitsdatum angeben.', 'wpsg')); + return; + + } + + if (!preg_match('/\d+\.\d+\.\d+/', $_REQUEST['wpsg_mod_keygen']['wpsg_mod_keygen_maxver'])) + { + + $this->shop->addBackendError(__('Bitte eine gÃŒltige Maximale Versionsnummer angeben.', 'wpsg')); + return; + + } + + // Key generiere + if (!class_exists('Crypt_RSA')) + { + + @set_include_path(get_include_path().PATH_SEPARATOR.WPSG_PATH.'/lib/phpseclib0.3.0/'); + require_once(WPSG_PATH.'/lib/phpseclib0.3.0/Crypt/RSA.php'); + + } + + $rsa = new Crypt_RSA(); + $rsa->loadKey(file_get_contents(WPSG_PATH.'/mods/mod_keygen/.htprivate')); + + $key = base64_encode($rsa->encrypt(serialize(array( + "anwendung" => $_REQUEST['wpsg_mod_keygen']['wpsg_mod_keygen_anwendung'], + "l" => $_REQUEST['wpsg_mod_keygen']['wpsg_mod_keygen_lizenz'], + "nr" => $_REQUEST['wpsg_mod_keygen']['wpsg_mod_keygen_nr'], + "date" => $_REQUEST['wpsg_mod_keygen']['wpsg_mod_keygen_date'], + "version" => $_REQUEST['wpsg_mod_keygen']['wpsg_mod_keygen_maxver'], + "mods" => $_REQUEST['wpsg_mod_keygen']['mods'] + )))); + + header('Content-type: text/html'); + header('Content-Disposition: attachment; filename="key.txt"'); + + die($key); + + } + + } // public function settings_save() + + public function settings_edit() + { + + $this->shop->render(WPSG_PATH_VIEW.'/mods/mod_keygen/settings_edit.phtml'); + unset($_SESSION['wpsg_mod_keygen']['wpsg_mod_keygen_key']); + + } + + } // class wpsg_mod_keygen extends wpsg_mod_basic + +?> Index: /views/admin/module.phtml =================================================================== --- /views/admin/module.phtml (revision 6474) +++ /views/admin/module.phtml (revision 6475) @@ -104,22 +104,79 @@ - hasMod('wpsg_mod_core')) { ?> - callMod('wpsg_mod_core', 'module_index'); ?> - - -
- -

-

- -

wpShopGermany Vollversion erwerben und weitere Funktionen freischalten. [ Vollversion kaufen ] [ Weitere Infos ]', 'wpsg'), - 'http://shop.maennchen1.de/produkte/wpshopgermany-lizenzkey/', - 'http://wpshopgermany.de/' - ); ?>

- -
- - +
+
+
+

+
+
+ + + + + + + + + + + + + + + $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 ' '.wpsg_translate(__('neue Version verfÃŒgbar (wpShopGermany Update notwendig)', 'wpsg'), WPSG_URL_WP.'wp-admin/plugins.php'); + + } + + ?>
+ + + +

+ Lizenz aktivieren +

+ + + +
+
+