Fix page not refreshing after login

diff --git a/inc/lib_log.php b/inc/lib_log.php
index 3e0d3d1609256b65fc87dc347a7286601d6436fc..1244a44a9355ad785fcc67a225c5e0e61bcaa63c 100755 (executable)
--- a/inc/lib_log.php
+++ b/inc/lib_log.php
@@ -49,7 +49,6 @@ class OC_LOG {
    */
   public static function event($user,$type,$message){
     $result = OC_DB::query('insert into log (timestamp,user,type,message) values ("'.time().'","'.addslashes($user).'","'.addslashes($type).'","'.addslashes($message).'")');
-    OC_DB::free_result($result);
   }
 
 

diff --git a/inc/lib_user.php b/inc/lib_user.php
index e5d994dd02fb6ef159354fadef917925a9d5d758..7a75e02ece2b6466a6b57b7542a8a3818fae3922 100755 (executable)
--- a/inc/lib_user.php
+++ b/inc/lib_user.php
@@ -40,8 +40,16 @@ class OC_USER {
        public static function loginlisener(){
                if(isset($_POST['loginbutton']) and isset($_POST['password']) and isset($_POST['login'])){
                        if(OC_USER::login($_POST['login'],$_POST['password'])){
+                               echo 1;
                                OC_LOG::event($_SESSION['username'],1,'');
-                               return('');
+                               echo 2;
+                               if((isset($CONFIG_HTTPFORCESSL) and $CONFIG_HTTPFORCESSL) or isset($_SERVER['HTTPS']) and $_SERVER['HTTPS'] == 'on') { 
+                                       $url = "https://". $_SERVER['SERVER_NAME'] . $_SERVER['REQUEST_URI']; 
+                               }else{
+                                       $url = "http://". $_SERVER['SERVER_NAME'] . $_SERVER['REQUEST_URI']; 
+                               }
+                               header("Location: $url");
+                               die();
                        }else{
                                return('error');
                        }