Änderungen und Fehlerkorrekturen

git-svn-id: https://[internal]/wordpress/plugins/wpsg4@6005 0d5edaf7-2b12-4e95-93f4-047927463d4b

10 files changed, 137 insertions, 68 deletions

diff --git a/views/admin/form/checkbox.phtml b/views/admin/form/checkbox.phtml
index b1f7bda..8a574f2 100644
--- a/views/admin/form/checkbox.phtml
+++ b/views/admin/form/checkbox.phtml
@@ -27,12 +27,19 @@
 					<?php echo $this->view['field_label']; ?>

 					

 					<?php if (wpsg_isSizedString($this->view['field_config']['help'])) { ?>

-						<a href="#" data-wpsg-tip="<?php echo $this->view['field_config']['help']; ?>" rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=<?php echo $this->view['field_config']['help']; ?>" class="glyphicon glyphicon glyphicon-info-sign form-control-feedback" aria-hidden="true"></a>

+						<?php if (wpsg_isTrue($this->view['field_config']['rAlign'])) { ?>

+							<a href="#" data-wpsg-tip="<?php echo $this->view['field_config']['help']; ?>" rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=<?php echo $this->view['field_config']['help']; ?>"

+							class="glyphicon glyphicon wpsg_glyphicon_right glyphicon-question-sign form-control-feedback" aria-hidden="true" style="float:right;"></a>

+						<?php } else { ?>

+							<a href="#" data-wpsg-tip="<?php echo $this->view['field_config']['help']; ?>" rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=<?php echo $this->view['field_config']['help']; ?>"

+							class="glyphicon glyphicon glyphicon-question-sign form-control-feedback" aria-hidden="true"></a>

+						<?php } ?>

 					<?php } ?>

 					

 				</div>

 				

 			</label>

+			

 		</div>

 		

 	</div>

diff --git a/views/admin/form/input.phtml b/views/admin/form/input.phtml
index 9a5865c..76560da 100644
--- a/views/admin/form/input.phtml
+++ b/views/admin/form/input.phtml
@@ -38,10 +38,10 @@
 			<?php if (wpsg_isSizedString($this->view['field_config']['help'])) { ?>

 				<?php if (wpsg_isTrue($this->view['field_config']['rAlign'])) { ?>

 					<a href="#" data-wpsg-tip="<?php echo $this->view['field_config']['help']; ?>" rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=<?php echo $this->view['field_config']['help']; ?>"

-					class="glyphicon glyphicon glyphicon-info-sign form-control-feedback" aria-hidden="true" style="text-align:right;"></a>

+					class="glyphicon glyphicon glyphicon-question-sign form-control-feedback" aria-hidden="true" style="float:right;"></a>

 				<?php } else { ?>

 					<a href="#" data-wpsg-tip="<?php echo $this->view['field_config']['help']; ?>" rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=<?php echo $this->view['field_config']['help']; ?>"

-					class="glyphicon glyphicon glyphicon-info-sign form-control-feedback" aria-hidden="true"></a>

+					class="glyphicon glyphicon glyphicon-question-sign form-control-feedback" aria-hidden="true"></a>

 				<?php } ?>

 			<?php } ?>

 		</div>

diff --git a/views/admin/form/link.phtml b/views/admin/form/link.phtml
index 711d1e9..f831506 100644
--- a/views/admin/form/link.phtml
+++ b/views/admin/form/link.phtml
@@ -31,7 +31,7 @@
 				><?php echo $this->view['field_link']; ?></a>

 

 			<?php if (wpsg_isSizedString($this->view['field_config']['help'])) { ?>

-				<a href="#" data-wpsg-tip="<?php echo $this->view['field_config']['help']; ?>" rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=<?php echo $this->view['field_config']['help']; ?>" class="glyphicon glyphicon glyphicon-info-sign form-control-feedback" aria-hidden="true"></a>

+				<a href="#" data-wpsg-tip="<?php echo $this->view['field_config']['help']; ?>" rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=<?php echo $this->view['field_config']['help']; ?>" class="glyphicon glyphicon glyphicon-question-sign form-control-feedback" aria-hidden="true"></a>

 			<?php } ?>

 		</div>

 				

diff --git a/views/admin/form/select.phtml b/views/admin/form/select.phtml
index 89a811e..396baa5 100644
--- a/views/admin/form/select.phtml
+++ b/views/admin/form/select.phtml
@@ -80,7 +80,7 @@
 			</select>

 			

 			<?php if (wpsg_isSizedString($this->view['field_config']['help'])) { ?>

-				<a href="#" data-wpsg-tip="<?php echo $this->view['field_config']['help']; ?>" rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=<?php echo $this->view['field_config']['help']; ?>" class="glyphicon glyphicon glyphicon-info-sign form-control-feedback" aria-hidden="true"></a>

+				<a href="#" data-wpsg-tip="<?php echo $this->view['field_config']['help']; ?>" rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=<?php echo $this->view['field_config']['help']; ?>" class="glyphicon glyphicon glyphicon-question-sign form-control-feedback" aria-hidden="true"></a>

 			<?php } ?>

 			

 			<?php if (wpsg_isSizedString($this->view['field_config']['icon'])) { ?>

diff --git a/views/admin/form/text.phtml b/views/admin/form/text.phtml
index cd52dde..50fd204 100644
--- a/views/admin/form/text.phtml
+++ b/views/admin/form/text.phtml
@@ -12,7 +12,7 @@
             <?php } ?>

 				

 			<?php if (wpsg_isSizedString($this->view['field_config']['help'])) { ?>

-				<a href="#" data-wpsg-tip="<?php echo $this->view['field_config']['help']; ?>" rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=<?php echo $this->view['field_config']['help']; ?>" class="glyphicon glyphicon glyphicon-info-sign form-control-feedback" aria-hidden="true"></a>

+				<a href="#" data-wpsg-tip="<?php echo $this->view['field_config']['help']; ?>" rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=<?php echo $this->view['field_config']['help']; ?>" class="glyphicon glyphicon glyphicon-question-sign form-control-feedback" aria-hidden="true"></a>

 			<?php } ?>

 		</div>

 	</div>

diff --git a/views/admin/form/textarea.phtml b/views/admin/form/textarea.phtml
index d016766..87c85df 100644
--- a/views/admin/form/textarea.phtml
+++ b/views/admin/form/textarea.phtml
@@ -15,7 +15,7 @@
 			<textarea class="form-control" id="<?php echo $this->view['field_id']; ?>" name="<?php echo $this->view['field_name']; ?>"><?php echo wpsg_hspc($this->view['field_value']); ?></textarea>

 			

 			<?php if (wpsg_isSizedString($this->view['field_config']['help'])) { ?>

-				<a href="#" data-wpsg-tip="<?php echo $this->view['field_config']['help']; ?>" rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=<?php echo $this->view['field_config']['help']; ?>" class="glyphicon glyphicon glyphicon-info-sign form-control-feedback" aria-hidden="true"></a>

+				<a href="#" data-wpsg-tip="<?php echo $this->view['field_config']['help']; ?>" rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=<?php echo $this->view['field_config']['help']; ?>" class="glyphicon glyphicon glyphicon-question-sign form-control-feedback" aria-hidden="true"></a>

 			<?php } ?>

 		</div>

 				

diff --git a/views/admin/form/upload.phtml b/views/admin/form/upload.phtml
index 8e3c47e..79ef440 100644
--- a/views/admin/form/upload.phtml
+++ b/views/admin/form/upload.phtml
@@ -22,7 +22,7 @@
 				<?php } ?>

 				/>

 			<?php if (wpsg_isSizedString($this->view['field_config']['help'])) { ?>

-				<a href="#" data-wpsg-tip="<?php echo $this->view['field_config']['help']; ?>" rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=<?php echo $this->view['field_config']['help']; ?>" class="glyphicon glyphicon glyphicon-info-sign form-control-feedback" aria-hidden="true"></a>

+				<a href="#" data-wpsg-tip="<?php echo $this->view['field_config']['help']; ?>" rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=<?php echo $this->view['field_config']['help']; ?>" class="glyphicon glyphicon glyphicon-question-sign form-control-feedback" aria-hidden="true"></a>

 			<?php } ?>

 		</div>

 				

diff --git a/views/admin/hilfe.phtml b/views/admin/hilfe.phtml
index 2f24636..24859fc 100644
--- a/views/admin/hilfe.phtml
+++ b/views/admin/hilfe.phtml
@@ -8,24 +8,27 @@
 ?>

 <div class="wpsg_hilfe" style="padding:5px; width:790px;">

 

-	<h1><?php echo __("Hilfe", "wpsg"); ?></h1>

-		

+	<?php echo wpsg_drawForm_AdminboxStart(__('Hilfe', 'wpsg')); ?>

 	<p><?php echo __("Hier ein kleiner Überblick, wo welche Information zu finden ist:", "wpsg"); ?></p>

-		

-	<h2><?php echo __("Tutorials", "wpsg"); ?></h2>		

+	<?php echo wpsg_drawForm_AdminboxEnd(); ?>

+

+	<?php echo wpsg_drawForm_AdminboxStart(__('Tutorials', 'wpsg')); ?>

 	<p><?php echo __("In den Tutorial haben wir praxisnahe Beispiele verwendet, um die einzelnen Funktionen näher zu erklären. Rechts im Menü können die Kategorien näher ausgewählt werden, ganz oben gibt es ein Suchfenster, was ganz sehr gut funktioniert ;)", "wpsg"); ?></p>

 	<a href="http://wpshopgermany.maennchen1.de/category/tutorials/">http://wpshopgermany.maennchen1.de/category/tutorials/</a>

+	<?php echo wpsg_drawForm_AdminboxEnd(); ?>

 

-	<h2><?php echo __("Forum", "wpsg"); ?></h2>

+	<?php echo wpsg_drawForm_AdminboxStart(__('Forum', 'wpsg')); ?>

 	<p><?php echo __("Alle Anfragen hinsichtlich Fehler, Inbetriebnahme und Administration beantworten wir zeitnah (während unserer Geschäftszeiten). Vielleicht ist deine Frage bereits im Forum gestellt und beantwortet worden? Das Suchformular dort ist auch sehr mächtig, probiere es doch mal aus!", "wpsg"); ?></p>

 	<p><?php echo __("Bitte nutze generell das Forum für eine Support-Anfrage, <u>nicht</u> unser Kontaktformular oder Telefon.", "wpsg"); ?></p>

 	<a href="http://forum.maennchen1.de/">http://forum.maennchen1.de/</a>

+	<?php echo wpsg_drawForm_AdminboxEnd(); ?>

 

-	<h2><?php echo __("Feature Wunschliste", "wpsg"); ?></h2>

+	<?php echo wpsg_drawForm_AdminboxStart(__('Feature Wunschliste', 'wpsg')); ?>

 	<p><?php echo __("Wir orientieren uns direkt am Markt. Insofern geben wir dir als User die Möglichkeit mitzuentscheiden, welches Feature wpShopGermany zukünftig haben wird. Du kannst selber einen Feature-Wunsch anlegen, oder für einen bestehenden Wunsch deine Stimme abgeben.", "wpsg"); ?></p>

 	<a href="https://wpshopgermany.uservoice.com/">https://wpshopgermany.uservoice.com/</a>

+	<?php echo wpsg_drawForm_AdminboxEnd(); ?>

 

-	<h2><?php echo __('Import aus wpShopGermany 2.5.8', 'wpsg'); ?></h2>

+	<?php echo wpsg_drawForm_AdminboxStart(__('Import aus wpShopGermany 2.5.8', 'wpsg')); ?>

 	<p><?php echo __('Mit dieser Funktion können sie den Export aus einem wpShopGermany 2.5.8 in diese Version importieren', 'wpsg'); ?></p>

 	<strong class="wpsg_error"><?php echo __('Sichern Sie in jedem Fall vorher ihre Daten!', 'wpsg'); ?></strong>

 		

@@ -75,12 +78,14 @@
 		</ol> 

 	

 	</form>

+	<?php echo wpsg_drawForm_AdminboxEnd(); ?>

 	

-	<h2><?php echo __('Migration der alten Mehrwertsteuersätze', 'wpsg'); ?></h2>

+	<?php echo wpsg_drawForm_AdminboxStart(__('Migration der alten Mehrwertsteuersätze', 'wpsg')); ?>

 	<p><?php echo wpsg_translate(

 		__('Ab Version 3.5 wurden die Mehrwertsteuersätze den Ländern zugeordnet. Die alten Mehrwertsteuersätze können <a href="#1#">hier</a> umgewandelt werden.', 'wpsg'),

 		WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Admin&action=migratemwst'

 	); ?>

+	<?php echo wpsg_drawForm_AdminboxEnd(); ?>

 			

 </div>

 	
\ No newline at end of file
diff --git a/views/admin/news.phtml b/views/admin/news.phtml
index aceb183..ceb4d62 100644
--- a/views/admin/news.phtml
+++ b/views/admin/news.phtml
@@ -15,12 +15,17 @@
 		<?php foreach ($this->view['news'] as $news) { ?>

 		<div class="wpsg_news <?php echo ((wpsg_news::isRead($news['id']))?'wpsg_news_read':''); ?>"> 

 			

-			<h2><a target="_blank" onclick="setTimeout(function() { location.href = location.href; }, 1000); return true;" href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&subaction=news&read=<?php echo rawurlencode($news['id']); ?>&noheader=1"><?php echo wpsg_hspc(wpsg_formatTimestamp($news['date'], true).' - '.$news['title']); ?></a></h2>

+			<?php 

+			$temp = '<a target="_blank" onclick="setTimeout(function() { location.href = location.href; }, 1000); return true;" href="'.WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Admin&subaction=news&read='.rawurlencode($news['id']).'&noheader=1">'.wpsg_hspc(wpsg_formatTimestamp($news['date'], true).' - '.$news['title']).'</a>';

+			echo wpsg_drawForm_AdminboxStart(__($temp, 'wpsg'));

+			

+			?>

 		

 			<div class="markRead">

 				<?php echo __('gelesen', 'wpsg'); ?> <img src="<?php echo $this->getRessourceURL('gfx/tick.png'); ?>" title="<?php echo __('gelesen', 'wpsg'); ?>" alt="<?php echo __('gelesen', 'wpsg'); ?>" />

 			</div>

 			<div class="wpsg_news_content"><?php echo wpsg_news::prepareContent($news); ?></div>

+			<?php echo wpsg_drawForm_AdminboxEnd(); ?>

 			 

 		</div>

 				

diff --git a/views/admin/ueber.phtml b/views/admin/ueber.phtml
index f5cfc01..63c4d43 100644
--- a/views/admin/ueber.phtml
+++ b/views/admin/ueber.phtml
@@ -5,68 +5,120 @@
 	 */

 

 ?>

-<h2><?php echo __('Systemcheck', 'wpsg'); ?></h2>

 

-<div class="wpsg_form_field">

-	<div class="wpsg_form_left">

-		<?php echo __('Template Pfad:', 'wpsg'); ?>

-	</div>

-	<div class="wpsg_form_right">

-		<?php echo WPSG_PATH_USERVIEW; ?>

-	</div>

-	<div class="wpsg_clear"></div>

-</div>

+<div id="wpsg-bs" >

+	<div class="wpsg_admin_submenu" >

+		

+		<div class="list-group" id="wpsg_statistics_tabs">

+			<span class="list-group-head list-group-item"><?php echo __('Auswahl', 'wpsg'); ?></span>

+		

+				<a class="list-group-item <?php echo ((!isset($_REQUEST['subaction']))?'active':''); ?>" 

+				href="<?php echo wpsg_url(WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Admin&action=ueber'); ?>"><?php echo __('Über diese Installation', 'wpsg'); ?></a>

 

-<div class="wpsg_form_field">

-	<div class="wpsg_form_left">

-		<?php echo __('Sprachdatei:', 'wpsg'); ?>

-	</div>

-	<div class="wpsg_form_right">

-		 <?php echo WPSG_PATH_TRANSLATION; ?>

+				<a class="list-group-item <?php echo ((isset($_REQUEST['subaction']) && $_REQUEST['subaction'] == 'phpinfo')?'active':''); ?>" 

+				href="<?php echo wpsg_url(WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Admin&action=ueber&subaction=phpinfo'); ?>"><?php echo __('PHP-Info', 'wpsg'); ?></a>

+

+				<a class="list-group-item <?php echo ((isset($_REQUEST['subaction']) && $_REQUEST['subaction'] == 'systemcheck')?'active':''); ?>" 

+				href="<?php echo wpsg_url(WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Admin&action=ueber&subaction=systemcheck'); ?>"><?php echo __('Systemcheck', 'wpsg'); ?></a>

+		

+		</div>

+

+		<div style="clear:both; margin-bottom:10px; margin-left:0px; margin-right:8px;"></div>

+			

 	</div>

-	<div class="wpsg_clear"></div>

 </div>

+

+

+<div class="wpsg_admin_content">

+

+

+<?php if (!isset($_REQUEST['subaction'])) { ?>

+<?php echo wpsg_drawForm_AdminboxStart(__('Über diese Installation', 'wpsg')); ?>

+	

+	<div class="form-horizontal">

+	

+	<?php 

+	$arModule = array();

+	foreach ($this->arModule as $m_key => $m)

+	{

+	

+		$arModule[] = $m_key.((isset($m->version))?' '.$m->version:'');

+	

+	}

+	?>

 		

-<h2><?php echo __("über diese Installation", "wpsg"); ?></h2>

+	<?php echo wpsg_drawForm_Input('', __('wpShopGermany Version', 'wpsg'), WPSG_VERSION, array('text' => true)); ?>

+	<?php echo wpsg_drawForm_Input('', __('aktivierte wpShopGermany-Module', 'wpsg'), implode(', ', $arModule), array('text' => true)); ?>

+	<?php echo wpsg_drawForm_Input('', __('WordPress Version', 'wpsg'), get_bloginfo('version'), array('text' => true)); ?>

+	<?php echo wpsg_drawForm_Input('', __('PHP Version', 'wpsg'), phpversion(), array('text' => true)); ?>

+	<?php echo wpsg_drawForm_Input('', __('php.ini Einstellungen', 'wpsg'), "post_max_size: ". ini_get('post_max_size') . "<br />". "max_input_time: ". ini_get('max_input_time') . "<br />". "max_execution_time: ". ini_get('max_execution_time') . "<br />". "max_input_vars: ". ini_get('max_input_vars') . "<br />". "upload_max_filesize: ". ini_get('upload_max_filesize') . "<br />". "register_globals: ". ini_get('register_globals') . "<br />". "memory_limit: ". ini_get('memory_limit') . "<br />". "safe_mode: ". ini_get('safe_mode') . "<br />". "include_path: ". ini_get('include_path') . "<br />". "soap.wsdl_cache: ". ini_get('soap.wsdl_cache') . "<br />", array('text' => true, 'nohspc' => true)); ?>

+	<?php echo wpsg_drawForm_Input('', __('geladene PHP Erweiterungen', 'wpsg'), implode(', ',  get_loaded_extensions()), array('text' => true)); ?>

 	

-<?php 

+	<?php wpsg_drawForm_TextStart(); ?>		

+			<?php $arPlugins = $this->get_option('active_plugins'); ?>

+				<?php foreach ((array)$arPlugins as $plugin) { $plugin_data = get_plugin_data(WPSG_PATH_CONTENT.'plugins/'.$plugin); ?>

+				<?php echo $plugin_data['Name']; ?> / <?php echo $plugin_data['Version']; ?><br />

+				<?php } ?>

 

-$arModule = array();

-foreach ($this->arModule as $m_key => $m)

-{

+	<?php echo wpsg_drawForm_TextEnd(__('aktive Wordpress Plugins', 'wpsg')); ?>	

 

-	$arModule[] = $m_key.((isset($m->version))?' '.$m->version:'');

+	<?php wpsg_drawForm_TextStart(); ?>		

+				<?php if (wpsg_isSizedArray($this->get_option('wpsg_plugintest_active_plugins'))) { ?>

+				<a href="<?php echo WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Admin&subaction=plugintest_restore&noheader=1'; ?>"><?php echo __('Vormals aktivierte Module wieder herstellen aus Kompatibilitätstest', 'wpsg'); ?></a>

+				<?php } else { ?>

+				<a href="<?php echo WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Admin&subaction=plugintest_disable&noheader=1'; ?>"><?php echo __('Alle Plugins außer wpShopGermany deaktivieren (Kompatibilitätstest)', 'wpsg'); ?></a>

+				<?php } ?>

+	<?php echo wpsg_drawForm_TextEnd(__('', 'wpsg')); ?>	

+	</div>

+	

+<?php echo wpsg_drawForm_AdminboxEnd(); ?>

+<?php } ?>

 

-}

 

-?>

+<?php if (isset($_REQUEST['subaction']) && $_REQUEST['subaction'] == 'phpinfo') { ?>	

+<?php echo wpsg_drawForm_AdminboxStart(__('PHP-Info', 'wpsg')); ?>

+	<div id="phpinfo" class="form-horizontal" style="max-width:100% !important; ">

+

+	<?php 

+	//echo phpinfo();

+	ob_start();

+	phpinfo();

+	$pinfo = ob_get_contents();

+	ob_end_clean();

 	

-<?php echo wpsg_drawForm_Input('', __('wpShopGermany Version', 'wpsg'), WPSG_VERSION, array('text' => true)); ?>

-<?php echo wpsg_drawForm_Input('', __('aktivierte wpShopGermany-Module', 'wpsg'), implode(', ', $arModule), array('text' => true)); ?>

-<?php echo wpsg_drawForm_Input('', __('WordPress Version', 'wpsg'), get_bloginfo('version'), array('text' => true)); ?>

-<?php echo wpsg_drawForm_Input('', __('PHP Version', 'wpsg'), phpversion(), array('text' => true)); ?>

-<?php echo wpsg_drawForm_Input('', __('php.ini Einstellungen', 'wpsg'), "post_max_size: ". ini_get('post_max_size') . "<br />". "max_input_time: ". ini_get('max_input_time') . "<br />". "max_execution_time: ". ini_get('max_execution_time') . "<br />". "max_input_vars: ". ini_get('max_input_vars') . "<br />". "upload_max_filesize: ". ini_get('upload_max_filesize') . "<br />". "register_globals: ". ini_get('register_globals') . "<br />". "memory_limit: ". ini_get('memory_limit') . "<br />". "safe_mode: ". ini_get('safe_mode') . "<br />". "include_path: ". ini_get('include_path') . "<br />". "soap.wsdl_cache: ". ini_get('soap.wsdl_cache') . "<br />", array('text' => true, 'nohspc' => true)); ?>

-<?php echo wpsg_drawForm_Input('', __('geladene PHP Erweiterungen', 'wpsg'), implode(', ',  get_loaded_extensions()), array('text' => true)); ?>

-

-<div class="wpsg_form_field">

-	<div class="wpsg_form_left">

-		<label for=""><?php echo __('aktive Wordpress Plugins', 'wpsg'); ?>:</label>

+	$pinfo = preg_replace ( '%^.*<body>(.*)</body>.*$%ms', '$1', $pinfo );

+	//echo $pinfo;

+	

+	//$pinfo = preg_replace("/(width):\".*?\"/", "\${1}=\"100%\"", $pinfo);

+	//$pinfo = preg_replace('/(width)(:)"([\d]+)"/', '${1}${2}"100%"', $pinfo);

+	//$pinfo = str_replace('width: 934px;', 'width:100%;', $pinfo);

+	

+	echo $pinfo;

+	//jQuery('#phpinfo').replaceWith($pinfo);

+

+	?>

 	</div>

-	<div class="wpsg_form_right">

-		<?php $arPlugins = $this->get_option('active_plugins'); ?>

-		<p>

-			<?php foreach ((array)$arPlugins as $plugin) { $plugin_data = get_plugin_data(WPSG_PATH_CONTENT.'plugins/'.$plugin); ?>

-			<?php echo $plugin_data['Name']; ?> / <?php echo $plugin_data['Version']; ?><br />

-			<?php } ?>

-		</p>

-		<br />

-		<p>

-			<?php if (wpsg_isSizedArray($this->get_option('wpsg_plugintest_active_plugins'))) { ?>

-			<a href="<?php echo WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Admin&subaction=plugintest_restore&noheader=1'; ?>"><?php echo __('Vormals aktivierte Module wieder herstellen aus Kompatibilitätstest', 'wpsg'); ?></a>

-			<?php } else { ?>

-			<a href="<?php echo WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Admin&subaction=plugintest_disable&noheader=1'; ?>"><?php echo __('Alle Plugins außer wpShopGermany deaktivieren (Kompatibilitätstest)', 'wpsg'); ?></a>

-			<?php } ?>

-		</p>

+<?php echo wpsg_drawForm_AdminboxEnd(); ?>

+<?php } ?>

+

+

+<?php if (isset($_REQUEST['subaction']) && $_REQUEST['subaction'] == 'systemcheck') { ?>	

+<?php echo wpsg_drawForm_AdminboxStart(__('Systemcheck', 'wpsg')); ?>

+

+	<div class="form-horizontal">

+	<?php wpsg_drawForm_TextStart(); ?>		

+	<?php echo WPSG_PATH_USERVIEW; ?>

+

+	<?php echo wpsg_drawForm_TextEnd(__('Template Pfad', 'wpsg')); ?>	

+

+	<?php wpsg_drawForm_TextStart(); ?>		

+	<?php echo WPSG_PATH_TRANSLATION; ?>

+

+	<?php echo wpsg_drawForm_TextEnd(__('Sprachdatei', 'wpsg')); ?>	

 	</div>

-	<div class="wpsg_clear"></div>

+	

+<?php echo wpsg_drawForm_AdminboxEnd(); ?>

+<?php } ?>

+

+

 </div>