From 5a500a2455c6dde0cb61e3b35eb3f6a0b1409f4b Mon Sep 17 00:00:00 2001
From: Robin <robin@Amaya.(none)>
Date: Sun, 2 May 2010 14:39:58 +0200
Subject: [PATCH] fix first run dialog in konqueror
---
inc/templates/adminform.php | 2 +-
inc/templates/header.php | 8 +++++++-
js/filebrowser.js | 12 +++++++-----
3 files changed, 15 insertions(+), 7 deletions(-)
diff --git a/inc/templates/adminform.php b/inc/templates/adminform.php
index c5e0bca61d..7dfdcc65bf 100755
--- 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 8661008d95..3352fcc449 100755
--- 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 c95e129064..3ec8994c02 100755
--- 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){
--
GitLab