From 1076a7784027ed3af2e118bcf4366a81badb2d7c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?= <thomas.mueller@tmit.eu>
Date: Thu, 30 Oct 2014 14:59:13 +0100
Subject: [PATCH] fix loading of more log entries

---
 settings/admin.php           |  2 +-
 settings/js/admin.js         | 10 +++---
 settings/js/log.js           | 62 +++++++++++++++++++-----------------
 settings/templates/admin.php |  2 +-
 4 files changed, 39 insertions(+), 37 deletions(-)

diff --git a/settings/admin.php b/settings/admin.php
index 292bf2b0ff..d58b9a597b 100644
--- a/settings/admin.php
+++ b/settings/admin.php
@@ -109,7 +109,7 @@ $formsAndMore[] = array('anchor' => 'backgroundjobs', 'section-name' => $l->t('C
 $formsAndMore[] = array('anchor' => 'shareAPI', 'section-name' => $l->t('Sharing'));
 $formsAndMore[] = array('anchor' => 'security', 'section-name' => $l->t('Security'));
 $formsAndMore[] = array('anchor' => 'mail_general_settings', 'section-name' => $l->t('Email Server'));
-$formsAndMore[] = array('anchor' => 'log', 'section-name' => $l->t('Log'));
+$formsAndMore[] = array('anchor' => 'log-section', 'section-name' => $l->t('Log'));
 
 $template->assign('forms', $formsAndMore);
 
diff --git a/settings/js/admin.js b/settings/js/admin.js
index 09e8a1d691..e3a092f71b 100644
--- a/settings/js/admin.js
+++ b/settings/js/admin.js
@@ -3,7 +3,8 @@ $(document).ready(function(){
 
 	// Hack to add a trusted domain
 	if (params.trustDomain) {
-		OC.dialogs.confirm(t('core', 'Are you really sure you want add "{domain}" as trusted domain?', {domain: params.trustDomain}),
+		OC.dialogs.confirm(t('core', 'Are you really sure you want add "{domain}" as trusted domain?',
+				{domain: params.trustDomain}),
 			t('core', 'Add trusted domain'), function(answer) {
 				if(answer) {
 					$.ajax({
@@ -52,14 +53,13 @@ $(document).ready(function(){
 	});
 
 	$('#shareAPI input:not(#excludedGroups)').change(function() {
+		var value = $(this).val();
 		if ($(this).attr('type') === 'checkbox') {
 			if (this.checked) {
-				var value = 'yes';
+				value = 'yes';
 			} else {
-				var value = 'no';
+				value = 'no';
 			}
-		} else {
-			var value = $(this).val();
 		}
 		OC.AppConfig.setValue('core', $(this).attr('name'), value);
 	});
diff --git a/settings/js/log.js b/settings/js/log.js
index 197fef907a..46d1bfefd5 100644
--- a/settings/js/log.js
+++ b/settings/js/log.js
@@ -5,75 +5,77 @@
  * See the COPYING-README file.
  */
 
-OC.Log={
-	reload:function(count){
-		if(!count){
-			count=OC.Log.loaded;
+/* global formatDate */
+
+OC.Log = {
+	reload: function (count) {
+		if (!count) {
+			count = OC.Log.loaded;
 		}
-		OC.Log.loaded=0;
+		OC.Log.loaded = 0;
 		$('#log tbody').empty();
 		OC.Log.getMore(count);
 	},
-	levels:['Debug','Info','Warning','Error','Fatal'],
-	loaded:3,//are initially loaded
-	getMore:function(count){
+	levels: ['Debug', 'Info', 'Warning', 'Error', 'Fatal'],
+	loaded: 3,//are initially loaded
+	getMore: function (count) {
 		count = count || 10;
-		$.get(OC.filePath('settings','ajax','getlog.php'),{offset:OC.Log.loaded,count:count},function(result){
-			if(result.status === 'success'){
+		$.get(OC.filePath('settings', 'ajax', 'getlog.php'), {offset: OC.Log.loaded, count: count}, function (result) {
+			if (result.status === 'success') {
 				OC.Log.addEntries(result.data);
-				if(!result.remain){
+				if (!result.remain) {
 					$('#moreLog').hide();
 				}
 				$('#lessLog').show();
 			}
 		});
 	},
-	showLess:function(count){
+	showLess: function (count) {
 		count = count || 10;
 		//calculate remaining items - at least 3
-		OC.Log.loaded = Math.max(3,OC.Log.loaded-count);
+		OC.Log.loaded = Math.max(3, OC.Log.loaded - count);
 		$('#moreLog').show();
 		// remove all non-remaining items
 		$('#log tr').slice(OC.Log.loaded).remove();
-		if(OC.Log.loaded <= 3) {
+		if (OC.Log.loaded <= 3) {
 			$('#lessLog').hide();
 		}
 	},
-	addEntries:function(entries){
-		for(var i=0;i<entries.length;i++){
-			var entry=entries[i];
-			var row=$('<tr/>');
-			var levelTd=$('<td/>');
+	addEntries: function (entries) {
+		for (var i = 0; i < entries.length; i++) {
+			var entry = entries[i];
+			var row = $('<tr/>');
+			var levelTd = $('<td/>');
 			levelTd.text(OC.Log.levels[entry.level]);
 			row.append(levelTd);
 
-			var appTd=$('<td/>');
+			var appTd = $('<td/>');
 			appTd.text(entry.app);
 			row.append(appTd);
 
-			var messageTd=$('<td/>');
+			var messageTd = $('<td/>');
 			messageTd.text(entry.message);
 			row.append(messageTd);
 
-			var timeTd=$('<td/>');
+			var timeTd = $('<td/>');
 			timeTd.addClass('date');
-			if(isNaN(entry.time)){
+			if (isNaN(entry.time)) {
 				timeTd.text(entry.time);
 			} else {
-				timeTd.text(formatDate(entry.time*1000));
+				timeTd.text(formatDate(entry.time * 1000));
 			}
 			row.append(timeTd);
 			$('#log').append(row);
 		}
 		OC.Log.loaded += entries.length;
 	}
-}
+};
 
-$(document).ready(function(){
-	$('#moreLog').click(function(){
+$(document).ready(function () {
+	$('#moreLog').click(function () {
 		OC.Log.getMore();
-	})
-	$('#lessLog').click(function(){
+	});
+	$('#lessLog').click(function () {
 		OC.Log.showLess();
-	})
+	});
 });
diff --git a/settings/templates/admin.php b/settings/templates/admin.php
index 4f37a15875..f02dedbbc8 100644
--- a/settings/templates/admin.php
+++ b/settings/templates/admin.php
@@ -444,7 +444,7 @@ if ($_['suggestedOverwriteWebroot']) {
 	<span id="sendtestmail_msg" class="msg"></span>
 </div>
 
-<div class="section" id="log">
+<div class="section" id="log-section">
 	<h2><?php p($l->t('Log'));?></h2>
 	<?php p($l->t('Log level'));?> <select name='loglevel' id='loglevel'>
 <?php for ($i = 0; $i < 5; $i++):