From 7b52c0c78c2c53507f1700f4429b1a677e0191e2 Mon Sep 17 00:00:00 2001
From: "Michael Kaufmann (d00p)" <d00p@froxlor.org>
Date: Thu, 8 Mar 2018 17:03:17 +0100
Subject: [PATCH 1/2] fix default value of panel.no_robots settings; add phpdoc
 for Database-class-methods

Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
---
 actions/admin/settings/100.panel.php    | 2 +-
 lib/classes/database/class.Database.php | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/actions/admin/settings/100.panel.php b/actions/admin/settings/100.panel.php
index 49308bed..cae04cf9 100644
--- a/actions/admin/settings/100.panel.php
+++ b/actions/admin/settings/100.panel.php
@@ -71,7 +71,7 @@ return array(
 					'settinggroup' => 'panel',
 					'varname' => 'no_robots',
 					'type' => 'bool',
-					'default' => false,
+					'default' => true,
 					'save_method' => 'storeSettingField',
 					),
 				'panel_paging' => array(
diff --git a/lib/classes/database/class.Database.php b/lib/classes/database/class.Database.php
index 3174c2b3..80ef61bc 100644
--- a/lib/classes/database/class.Database.php
+++ b/lib/classes/database/class.Database.php
@@ -28,6 +28,11 @@
  * @author     Froxlor team <team@froxlor.org> (2010-)
  * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
  * @package    Classes
+ *
+ * @method static \PDOStatement prepare($statement, array $driver_options = null) Prepares a statement for execution and returns a statement object
+ * @method static \PDOStatement query ($statement) Executes an SQL statement, returning a result set as a PDOStatement object
+ * @method static string lastInsertId ($name = null) Returns the ID of the last inserted row or sequence value
+ * @method static string quote ($string, $parameter_type = null) Quotes a string for use in a query.
  */
 class Database {
 

From 349fa7a761029adbaadbb872d1ee9962797d4e9f Mon Sep 17 00:00:00 2001
From: "Michael Kaufmann (d00p)" <d00p@froxlor.org>
Date: Mon, 12 Mar 2018 10:22:50 +0100
Subject: [PATCH 2/2] avoid possible undefined index if no issuer-organisation
 is set in a certificate

Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
---
 templates/Sparkle/ssl_certificates/certs_cert.tpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/Sparkle/ssl_certificates/certs_cert.tpl b/templates/Sparkle/ssl_certificates/certs_cert.tpl
index e383f54f..f0755efc 100644
--- a/templates/Sparkle/ssl_certificates/certs_cert.tpl
+++ b/templates/Sparkle/ssl_certificates/certs_cert.tpl
@@ -8,7 +8,7 @@
 		<if !empty($san_list)><br>SAN: {$san_list}</if>
 	</td>
 	<td>
-		{$cert_data['issuer']['O']}
+		<if isset($cert_data['issuer']['O']) && !empty($cert_data['issuer']['O'])>{$cert_data['issuer']['O']}</if>
 	</td>
 	<td>
 		{$validFrom}