Index: /controller/wpsg_AdminController.class.php
===================================================================
--- /controller/wpsg_AdminController.class.php	(revision 6477)
+++ /controller/wpsg_AdminController.class.php	(revision 6479)
@@ -333,75 +333,103 @@
 			{
 				
-				if (!wpsg_isSizedString($_REQUEST['modulcode']))
-				{
-					
-					$this->addBackendError(__('Bitte einen Modulcode angeben.', 'wpsg'));
-					$this->redirect(WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Admin&action=module');
-					
-				}
-				else
-				{
-					 
-					$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); 
-					
-					if (!wpsg_isSizedArray($api_return) || !isset($api_return['returnCode']))
+				try
+				{
+				
+					if (!wpsg_isSizedString($_REQUEST['modulcode']))
 					{
 						
-						// API Fehler
-						$this->addBackendError(__('Registrierungsserver antwortet nicht.', 'wpsg'));
-						$this->redirect(WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Admin&action=module');
-					
+						throw new \Exception(WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Admin&action=module');
+						
 					}
 					else
 					{
+						 
+						$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); 
 						
-						if ($api_return['returnCode'] === 0)
+						if (!wpsg_isSizedArray($api_return) || !isset($api_return['returnCode']))
 						{
 							
-							$this->addBackendError(__('Ihre Lizenz ist ungÃŒltig.', 'wpsg'));
-							$this->redirect(WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Admin&action=module');
-							
-						}
-						else if ($api_return['returnCode'] === 1)
-						{
-							
-							$this->addBackendError(__('Modulcode wurde nicht akzeptiert.', 'wpsg'));
-							$this->redirect(WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Admin&action=module');
-							
-						}
-						else if ($api_return['returnCode'] === 2)
-						{
-							
-							$this->addBackendError(__('Modulcode wurde bereits verbraucht.', 'wpsg'));
-							$this->redirect(WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Admin&action=module');
-							
-						}
-						else if ($api_return['returnCode'] === 3)
-						{
-							
-							$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'));
-							$this->redirect(WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Admin&action=module');
-							
+							// API Fehler
+							throw new \Exception(__('Registrierungsserver antwortet nicht.', 'wpsg'));
+						
 						}
 						else
 						{
-							die("I");
-						}
+							
+							if ($api_return['returnCode'] === 0)
+							{
+								
+								throw new \Exception(__('Ihre Lizenz ist ungÃŒltig.', 'wpsg'));
+								
+							}
+							else if ($api_return['returnCode'] === 1)
+							{
+								
+								throw new \Exception(__('Modulcode wurde nicht akzeptiert.', 'wpsg'));
+								
+							}
+							else if ($api_return['returnCode'] === 2)
+							{
+								
+								throw new \Exception(__('Modulcode wurde bereits verbraucht.', 'wpsg'));
+								
+							}
+							else if ($api_return['returnCode'] === 3)
+							{
+								
+								throw new \Exception(__('Modulcode wurde bereits fÃŒr diesen SchlÃŒssel verbraucht.', 'wpsg'));
+								
+							}
+							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'));
+								
+								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');
+								
+							}
+							else
+							{
+								
+								throw new \Exception(__('Nicht definierte API Antwort.'));
+								
+							}
+							
+						}  
 						
-					}  
+					}
 					
 				}
+				catch (Exception $e)
+				{
+					
+					$this->addBackendError($e->getMessage());
+					
+					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';
+
+			if (wpsg_isSizedString($_REQUEST['subaction'])) $this->view['subaction'] = $_REQUEST['subaction'];
+			else $this->view['subaction'] = 'registerdata';
+			
+			$this->render(WPSG_PATH_VIEW.'/admin/licence.phtml');
+			
+			return "K";			
 			
 			//return $this->shop->callMod('wpsg_mod_core', 'admin_registrierung');
Index: /views/admin/index.phtml
===================================================================
--- /views/admin/index.phtml	(revision 6477)
+++ /views/admin/index.phtml	(revision 6479)
@@ -20,5 +20,5 @@
 					<li role="presentation" class="<?php echo (($this->view['actionName'] == "module")?'active':''); ?>"><a href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&amp;action=module"><?php echo __("Module", "wpsg"); ?></a></li>
 						
-					<?php if (current_user_can('wpsg_lizence') && $this->hasMod('wpsg_mod_core')) { ?>			
+					<?php if (current_user_can('wpsg_lizence') && is_array(wpsg_get_update_data())) { ?>			
 					<li role="presentation" class="<?php echo (($this->view['actionName'] == "registrierung")?'active':''); ?>"><a href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&amp;action=registrierung"><?php echo __("Lizenzverwaltung", "wpsg"); ?></a></li>
 					<?php } ?>
Index: /views/admin/licence.phtml
===================================================================
--- /views/admin/licence.phtml	(revision 6479)
+++ /views/admin/licence.phtml	(revision 6479)
@@ -0,0 +1,184 @@
+<?php
+
+    /**
+     * Template fÃŒr die Lizenzverwaltung
+     */
+
+?>
+
+<div class="wpsg_admin" id="wpsg-bs">
+
+	<nav class="navbar navbar-default">
+		<div class="container-fluid">
+			<div class="navbar-header">
+				<a class="navbar-brand" href="#"><?php echo __('wpShopGermany', 'wpsg'); ?></a>
+			</div>
+			<div class="collapse navbar-collapse">
+				<ul class="nav navbar-nav">
+			 		<li role="presentation" class="<?php echo (($this->view['actionName'] == "index")?'active':''); ?>"><a href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin"><?php echo __("Einstellungen", "wpsg"); ?></a></li>
+					<li role="presentation" class="<?php echo (($this->view['actionName'] == "module")?'active':''); ?>"><a href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&amp;action=module"><?php echo __("Module", "wpsg"); ?></a></li>
+						
+					<?php if (current_user_can('wpsg_lizence') && is_array(wpsg_get_update_data())) { ?>			
+					<li role="presentation" class="<?php echo (($this->view['actionName'] == "licence")?'active':''); ?>"><a href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&amp;action=registrierung"><?php echo __("Lizenzverwaltung", "wpsg"); ?></a></li>
+					<?php } ?>
+					
+					<li role="presentation" class="<?php echo (($this->view['actionName'] == 'news')?'active':''); ?>"><a href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=news">
+						<?php echo __('Aktuelles', 'wpsg'); ?>
+						<?php $wpsg_news_unread = wpsg_news::countUnreadNews(); if (wpsg_isSizedInt($wpsg_news_unread)) { ?>
+						<span class="badge" style="background-color:#D9534F;"><?php echo sizeof($wpsg_news_unread); ?></span>
+						<?php } ?>			
+					</a></li>
+				</ul>
+				<ul class="nav navbar-nav navbar-right">				
+					<li role="presentation" class="<?php echo (($this->view['actionName'] == "hilfe")?'active':''); ?>"><a href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&amp;action=hilfe"><?php echo __("Hilfe", "wpsg"); ?></a></li>
+					<li role="presentation" class="<?php echo (($this->view['actionName'] == "ueber")?'active':''); ?>"><a href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&amp;action=ueber"><?php echo __("Über", "wpsg"); ?></a></li>
+			 	</ul>
+			</div>
+		</div>		
+	</nav>
+	
+	<?php echo $this->writeBackendMessage(); ?>
+			  	
+	<div class="wpsg_admin_wrap">
+		
+        <div class="wpsg_admin_submenu">
+	
+            <div class="list-group">
+                <span class="list-group-head list-group-item"><?php echo __('Lizenzverwaltung'); ?></span>	 
+                <a class="list-group-item <?php echo (($this->view['subaction'] == 'registerdata')?'active':''); ?>" href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=registrierung&subaction=registerdata"><?php echo __('Registrierungsdaten', 'wpsg'); ?></a>
+                <a class="list-group-item <?php echo (($this->view['subaction'] == 'domaindata')?'active':''); ?>" href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=registrierung&subaction=domaindata"><?php echo __('Domainverwaltung', 'wpsg'); ?></a>
+                <a class="list-group-item <?php echo (($this->view['subaction'] == 'modulactivation')?'active':''); ?>" href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=registrierung&subaction=modulactivation"><?php echo __('Modulaktivierung', 'wpsg'); ?></a>
+            </div> 
+            
+        </div>
+                
+        <div class="wpsg_admin_content form-horizontal">
+             
+            <div class="panel panel-default">
+                <div class="panel-heading clearfix">
+                    <h3 class="panel-title">  
+                        
+                        <?php if ($this->view['subaction'] === 'registerdata') { ?><?php echo __('Registrierungsdaten', 'wpsg'); ?>
+                        <?php } else if ($this->view['subaction'] === 'domaindata') { ?><?php echo __('Domainverwaltung', 'wpsg'); ?>
+                        <?php } else if ($this->view['subaction'] === 'modulactivation') { ?><?php echo __('Modulaktivierung', 'wpsg'); ?><?php } ?>
+                        
+                    </h3>
+                </div>
+                <div class="panel-body">
+            
+                    <?php if ($this->view['subaction'] === 'registerdata') { ?>
+                    
+                        
+                        
+                    <?php } else if ($this->view['subaction'] === 'domaindata') { ?>
+                    
+                    <?php } else if ($this->view['subaction'] === 'modulactivation') { ?>
+                    
+                        <?php $this->shop->loadModule(true); ?>
+                        <?php $wpsg_update_data = wpsg_get_update_data(); ?>
+                                                
+                        <?php if (wpsg_isSizedArray($wpsg_update_data)) { ?>
+                        
+                            <?php // Ich zeige hier nur die Aktiven Module an ?>
+                            <?php foreach ($wpsg_update_data['modulinfo'] as $modul_key => $modul_info) { if ($modul_info['active'] !== true) unset($wpsg_update_data['modulinfo'][$modul_key]); } ?>
+                            
+                            <table class="table modultable">
+                                <thead>
+                                    <tr>
+                                        <th><?php echo __('Modulname', 'wpsg'); ?></th>
+                                        <th><?php echo __('installierte Version', 'wpsg'); ?></th>
+                                        <th><?php echo __('Lizenz', 'wpsg');  ?></th>
+                                        <th><?php echo __('verfÃŒgbare Version', 'wpsg'); ?></th>
+                                    </tr>
+                                </thead>
+                                <tbody>
+                                    <?php foreach ($wpsg_update_data['modulinfo'] as $modul_key => $modul_info) { ?>
+                                    <tr style="font-style:normal;" class="success">
+                                        <td><?php echo $modul_info['label']; ?></td>
+                                        <td>
+                                            
+                                            <?php if ($this->shop->hasModInstalled($modul_key)) { ?>
+                                                <?php echo $this->shop->arAllModule[$modul_key]->version; ?>
+                                            <?php } ?>
+                                            
+                                        </td>								
+                                        <td>
+                                            
+                                            <?php if ($modul_info['free'] === true) { ?>
+                                                <?php echo __('kostenlos', 'wpsg'); ?>
+                                            <?php } else if ($modul_info['active'] === true) { ?>
+                                                <?php echo __('enthalten', 'wpsg'); ?>
+                                            <?php } else { ?>
+                                                
+                                                <?php if (wpsg_isSizedString($modul_info['url_shop'])) { ?>
+                                                <a href="<?php echo $modul_info['url_shop']; ?>" target="_blank"><?php echo __('Modulcode hier erwerben', 'wpsg'); ?></a>
+                                                <?php } else { ?>
+                                                <a href="https://shop.maennchen1.de" target="_blank"><?php echo __('Modulcode hier erwerben', 'wpsg'); ?></a>
+                                                <?php } ?>
+                                                
+                                            <?php } ?>
+                                            
+                                        </td>
+                                        <td><?php 
+                                                                            
+                                            echo $modul_info['version'];
+                                             
+                                            if ($this->shop->hasModInstalled($modul_key) && $modul_info['version'] === $this->shop->arAllModule[$modul_key]->version)
+                                            {
+                                                
+                                                echo ' - <strong class="wpsg_message_ok">'.__('aktuell', 'wpsg').'</strong>';
+                                                
+                                            }
+                                            else if (version_compare($modul_info['version'], WPSG_VERSION) > 0) 
+                                            {
+                                                
+                                                echo ' - <strong class="wpsg_error">'.__('neue Version verfÃŒgbar', 'wpsg').'</strong><br />'.wpsg_translate(__('<a href="#1#">wpShopGermany Update</a> notwendig', 'wpsg'), WPSG_URL_WP.'wp-admin/plugins.php');
+                                                
+                                            }
+                                            else if (version_compare($modul_info['version'], $this->shop->arAllModule[$modul_key]->versio) > 0) 
+                                            {
+                                                
+                                                echo ' - <strong class="wpsg_error">'.__('neue Version verfÃŒgbar', 'wpsg').'</strong><br />';
+                                                echo wpsg_translate(__('Version <a href="#1#">installieren</a>.', 'wpsg'), WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Admin&action=registrierung&noheader=1&do=installModul&modul='.$modul_key); 
+                                            
+                                            }
+                                            
+                                        ?></td>
+                                    </tr>
+                                    <?php } ?>
+                                </tbody>
+                            </table>
+                                                
+                        <?php } ?>
+                        
+                        <form method="POST" action="<?php echo WPSG_URL_WP ?>wp-admin/admin.php?page=wpsg-Admin&action=registrierung&noheader=1&do=activatemodul&source=licence">
+						
+                            <fieldset>
+                                <legend style="padding-top:0px;"><?php echo __('Modulcode aktivieren', 'wpsg'); ?></legend>
+                                                
+                                <div class="row">
+                                    <div class="col-xs-10">
+                                        
+                                        <input required="required" type="text" class="form-control" name="modulcode" id="modulcode" />
+                                        
+                                    </div>
+                                    <div class="col-xs-2">
+                                        
+                                        <input class="btn btn-primary btn-block" type="submit" class="form-control" value="<?php echo __('PrÃŒfen', 'wpsg'); ?>" />
+                                        
+                                    </div>
+                                </div>
+                            </fieldset>
+                            
+                        </form>
+                                                
+                    <?php } ?>
+                    
+                </div>
+            </div>
+            
+        </div>
+        
+	</div>
+	
+</div>