From 59d0c4aa403856b2e66dfe775ff3102093b7a39b Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Mon, 30 May 2016 21:23:55 +0200
Subject: [PATCH] fixed https and project properties

---
 danube/page/default_page/danube.tpl       | 2 +-
 danube/page/default_page/default_page.php | 5 +++--
 nbproject/project.properties              | 5 ++---
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/danube/page/default_page/danube.tpl b/danube/page/default_page/danube.tpl
index 22d1989..4e3a13e 100644
--- a/danube/page/default_page/danube.tpl
+++ b/danube/page/default_page/danube.tpl
@@ -56,7 +56,7 @@
                   </div>
 
                   <div id="fb" style="margin-left: 750px; padding-top: 15px;">
-                        <iframe src="http://www.facebook.com/plugins/like.php?href=http%3A%2F%2Fwww.blue-danube-massage.de&amp;layout=button_count&amp;show_faces=true&amp;width=450&amp;action=like&amp;colorscheme=light&amp;height=80" scrolling="no" frameborder="0" style="border:none; overflow:hidden; height:80px; margin: 0; padding: 0; width: 140px;" allowTransparency="true">                        
+                        <iframe src="https://www.facebook.com/plugins/like.php?href=http%3A%2F%2Fwww.blue-danube-massage.de&amp;layout=button_count&amp;show_faces=true&amp;width=450&amp;action=like&amp;colorscheme=light&amp;height=80" scrolling="no" frameborder="0" style="border:none; overflow:hidden; height:80px; margin: 0; padding: 0; width: 140px;" allowTransparency="true">                        
                         </iframe>
                   </div>
                 </div>               
diff --git a/danube/page/default_page/default_page.php b/danube/page/default_page/default_page.php
index 1014748..b2a813f 100644
--- a/danube/page/default_page/default_page.php
+++ b/danube/page/default_page/default_page.php
@@ -5,8 +5,9 @@ class default_page extends SYSTEM\PAGE\Page {
     private function js(){        
         return  '<script type="text/javascript" language="JavaScript" src="'.SYSTEM\WEBPATH(new PJQUERY(),'jquery-1.9.1.min.js').'"></script>'.
                 '<script type="text/javascript" language="JavaScript" src="'.SYSTEM\WEBPATH(new PBOOTSTRAP(),'js/bootstrap.min.js').'"></script>'.                
-                '<script type="text/javascript" language="JavaScript" src="http://www.openlayers.org/api/OpenLayers.js"></script>'.
-                '<script type="text/javascript" language="JavaScript" src="http://www.openstreetmap.org/openlayers/OpenStreetMap.js"></script>'.
+                //'<script type="text/javascript" language="JavaScript" src="https://www.openlayers.org/api/OpenLayers.js"></script>'.
+                '<script type="text/javascript" language="JavaScript" src="https://cdnjs.cloudflare.com/ajax/libs/openlayers/2.13.1/OpenLayers.js"></script>'.
+                '<script type="text/javascript" language="JavaScript" src="https://www.openstreetmap.org/openlayers/OpenStreetMap.js"></script>'.
                 '<script type="text/javascript" language="JavaScript" src="'.SYSTEM\WEBPATH(new PPAGE(),'default_page/js/loadtexts.js').'"></script>'.
                 '<script type="text/javascript" language="JavaScript" src="'.SYSTEM\WEBPATH(new PPAGE(),'js/lang_switcher.js').'"></script>'.
                 '<script src="'.SYSTEM\WEBPATH(new PPAGE(),'default_page/js/galleria/galleria-1.2.9.min.js').'"></script>';
diff --git a/nbproject/project.properties b/nbproject/project.properties
index b1358e7..e8292bd 100644
--- a/nbproject/project.properties
+++ b/nbproject/project.properties
@@ -2,9 +2,8 @@ auxiliary.org-netbeans-modules-php-smarty.smarty-framework=true
 file.reference.source-system=../../system
 ignore.path=
 include.path=\
-    ${php.global.include.path}:\
-    ${file.reference.source-system}
-php.version=PHP_54
+    ${php.global.include.path}
+php.version=PHP_56
 source.encoding=UTF-8
 src.dir=.
 tags.asp=false