fix first run dialog in konqueror

diff --git a/inc/templates/adminform.php b/inc/templates/adminform.php
index c5e0bca61d3a630c48901081ec5a25f9c65c7e58..7dfdcc65bf4ab0f92d45889b16668b927d050551 100755 (executable)
--- a/inc/templates/adminform.php
+++ b/inc/templates/adminform.php
@@ -56,7 +56,7 @@ if($FIRSTRUN){?>
 }
 ?>
 <tr><td>data directory:</td><td><input type="text" name="datadirectory" size="30" class="formstyle" value="<?php echo($CONFIG_DATADIRECTORY);?>"></input></td></tr>
-<tr><td>force ssl:</td><td><input type="checkbox" name="forcessl" size="30" class="formstyle" value='<?php echo($CONFIG_HTTPFORCESSL);?>'></input></td></tr>
+<tr><td>force ssl:</td><td><input type="checkbox" name="forcessl" size="30" class="formstyle" value='1' <?php if($CONFIG_HTTPFORCESSL) echo 'checked'?>></input></td></tr>
 <tr><td>date format:</td><td><input type="text" name="dateformat" size="30" class="formstyle" value='<?php echo($CONFIG_DATEFORMAT);?>'></input></td></tr>
 <tr><td>database type:</td><td>
 <select id='dbtype' name="dbtype" onchange='dbtypechange()'>

diff --git a/inc/templates/header.php b/inc/templates/header.php
index 8661008d95f2fc20ecfb22657dc494b98b22cab7..3352fcc44911f5feecbde23c90920ede9275d0cc 100755 (executable)
--- a/inc/templates/header.php
+++ b/inc/templates/header.php
@@ -6,6 +6,9 @@
        <base href="<?php echo($WEBROOT); ?>/"/>
        <link rel="stylesheet" type="text/css" href="<?php echo($WEBROOT)?>/css/default.php"/>
        <script type='text/ecmascript' src='<?php echo($WEBROOT)?>/js/lib_ajax.js'></script>
+       <?php
+       global $CONFIG_INSTALLED;
+       if($CONFIG_INSTALLED){//the javascripts somehow breaks the first run wizzard in konqueror?>
        <script type='text/ecmascript' src='<?php echo($WEBROOT)?>/js/lib_timer.js'></script>
        <script type='text/ecmascript' src='<?php echo($WEBROOT)?>/js/lib_notification.js'></script>
        <script type='text/ecmascript' src='<?php echo($WEBROOT)?>/js/lib_xmlloader.js'></script>
@@ -14,9 +17,12 @@
        <script type='text/ecmascript' src='<?php echo($WEBROOT)?>/js/lib_drag.js'></script>
        <script type='text/ecmascript' src='<?php echo($WEBROOT)?>/js/lib_api.js'></script>
        <script type='text/ecmascript' src='<?php echo($WEBROOT)?>/js/filebrowser.js'></script>
+       <?php
+       }
+       ?>
 <?php
 foreach(OC_UTIL::$scripts as $script){
-    echo("<script type='text/ecmascript' src='$WEBROOT/$script'></script>");
+    echo("<script type='text/ecmascript' src='$WEBROOT/$script'></script>\n");
 }
 ?>
        <script type='text/ecmascript'>

diff --git a/js/filebrowser.js b/js/filebrowser.js
index c95e129064250f48d63a4cd53ad7711335190b52..3ec8994c0296f3f9b5bf380c48424f9e664d51f6 100755 (executable)
--- a/js/filebrowser.js
+++ b/js/filebrowser.js
@@ -22,12 +22,14 @@
 OC_FILES.browser=new  Object();
 
 OC_FILES.browser.showInitial=function(){
-       var dir=''
-       var loc=document.location.toString();
-       if(loc.indexOf('#')!=-1){
-               dir=loc.substring(loc.indexOf('#')+1);
+       if(document.getElementById('content')){
+               var dir=''
+               var loc=document.location.toString();
+               if(loc.indexOf('#')!=-1){
+                       dir=loc.substring(loc.indexOf('#')+1);
+               }
+               OC_FILES.getdirectorycontent(dir,OC_FILES.browser.show_callback,true);
        }
-       OC_FILES.getdirectorycontent(dir,OC_FILES.browser.show_callback,true);
 }
 
 OC_FILES.browser.show=function(dir,forceReload){