mmainstreet / jodel-web

vote-ajax.php

Spacing +3 added lines, -3 removed lines

@@ -3,8 +3,8 @@ 
 $config = parse_ini_file('config/config.ini.php');
 if(!isset($_GET['pw']) || $config['pw'] != $_GET['pw'])
 {
-	error_log($_SERVER['REMOTE_ADDR']  . ' used a wrong password on vote-ajax.php');
-	$respone = array("message" => $_SERVER['REMOTE_ADDR']  . ' used a wrong password on vote-ajax.php',"success" => false);
+	error_log($_SERVER['REMOTE_ADDR'] . ' used a wrong password on vote-ajax.php');
+	$respone = array("message" => $_SERVER['REMOTE_ADDR'] . ' used a wrong password on vote-ajax.php', "success" => false);
 	echo json_encode($response);
 	
 	die();
@@ -70,7 +70,7 @@ 
 		}
 	}
 
-if (isset($captcha))
+if(isset($captcha))
 {
 	$response = array("success" => $success, "message" => $message, "captcha" => $captcha, "accessToken" => $token);
 }

index.php

Switch Indentation +1 added lines, -101 removed lines

@@ -416,104 +416,4 @@
 
 				var win = $(window);
 				var lastPostId = "<?php echo $lastPostId; ?>";
-				var view = "<?php echo $view; ?>"
-				var old_lastPostId = "";
-				var morePostsAvailable = true;
-
-				if(window.location.hash)
-				{
-					var hash = window.location.hash.slice(1);
-
-					if(!$("article[id='"+ hash +"']").length)
-					{
-						for (var i = 5; i >= 0; i--)
-						{
-							if(!$("article[id='"+ hash +"']").length)
-							{
-								$.ajax({
-									url: 'get-posts-ajax.php?lastPostId=' + lastPostId + '&view=' + view,
-									dataType: 'html',
-									async: false,
-									success: function(html) {
-										var div = document.createElement('div');
-										div.innerHTML = html;
-										var elements = div.childNodes;
-										old_lastPostId = lastPostId;
-										lastPostId = elements[3].textContent;
-										lastPostId = lastPostId.replace(/\s+/g, '');
-										//alert('Neu: ' + lastPostId + " Alt: " + old_lastPostId);
-										if(lastPostId == old_lastPostId) {
-											
-											//morePostsAvailable = false;
-										}
-										else {
-											//alert(elements[3].textContent);
-											$('#posts').append(elements[1].innerHTML);
-											$('#posts').hide().show(0);
-										}
-										$('#loading').hide();
-									}
-								});
-
-								$('.jodel > content').Emoji();
-							}
-							
-						}
-						scrollToAnchor(hash);
-
-					}						
-				}
-
-				// Each time the user scrolls
-				win.scroll(function() {
-
-
-					// End of the document reached?
-					if ($(window).scrollTop() + $(window).height() > $(document).height() - 100 && morePostsAvailable)
-					{
-						$('#loading').show();
-
-						$.ajax({
-							url: 'get-posts-ajax.php?lastPostId=' + lastPostId + '&view=' + view,
-							dataType: 'html',
-							async: false,
-							success: function(html) {
-								var div = document.createElement('div');
-								div.innerHTML = html;
-								var elements = div.childNodes;
-								old_lastPostId = lastPostId;
-								lastPostId = elements[3].textContent;
-								lastPostId = lastPostId.replace(/\s+/g, '');
-								//alert('Neu: ' + lastPostId + " Alt: " + old_lastPostId);
-								if(lastPostId == old_lastPostId)
-								{
-									
-									//morePostsAvailable = false;
-								}
-								else
-								{
-									//alert(elements[3].textContent);
-									$('#posts').append(elements[1].innerHTML);
-								}
-								$('#loading').hide();
-							}
-						});
-
-						$('.jodel > content').Emoji();
-					}
-				});
-			<?php } ?>
-			});	
-
-		</script>
-
-		<?php  
-			if(is_file('./piwik-script.html'))
-			{
-			    require_once('./piwik-script.html');
-			}
-		?>
-
-	</body>
-</html>
-
+				var view = "<?php echo $view
\ No newline at end of file

Spacing +5 added lines, -105 removed lines

@@ -36,8 +36,8 @@ 
 		if(!isset($_COOKIE['JodelDeviceId']) || !isDeviceUidInDatabase($_COOKIE['JodelDeviceId']))
 		{
 			$deviceUid = createAccount();
-			setcookie('JodelDeviceId', $deviceUid, time()+60*60*24*365*10);
-			error_log('Created account with JodelDeviceId:' . $deviceUid .  ' for [' . $_SERVER ['HTTP_USER_AGENT'] . ']');
+			setcookie('JodelDeviceId', $deviceUid, time() + 60 * 60 * 24 * 365 * 10);
+			error_log('Created account with JodelDeviceId:' . $deviceUid . ' for [' . $_SERVER ['HTTP_USER_AGENT'] . ']');
 			
 		}
 		else
@@ -57,7 +57,7 @@ 
 	//Set View
 	if(isset($_GET['view']))
 	{
-		switch ($_GET['view']) {
+		switch($_GET['view']) {
 			case 'comment':
 				$view = 'comment';
 				break;
@@ -91,7 +91,7 @@ 
 	//Vote
 	if(isset($_GET['vote']) && isset($_GET['postID']))
 	{
-<<<<<<< HEAD
+<< << <<< HEAD
 		if(!deviceUidHasVotedThisPostId($deviceUid_forId1, $_GET['postID']))
 		{
 			if($_GET['vote'] == "up")
@@ -416,104 +416,4 @@ 
 
 				var win = $(window);
 				var lastPostId = "<?php echo $lastPostId; ?>";
-				var view = "<?php echo $view; ?>"
-				var old_lastPostId = "";
-				var morePostsAvailable = true;
-
-				if(window.location.hash)
-				{
-					var hash = window.location.hash.slice(1);
-
-					if(!$("article[id='"+ hash +"']").length)
-					{
-						for (var i = 5; i >= 0; i--)
-						{
-							if(!$("article[id='"+ hash +"']").length)
-							{
-								$.ajax({
-									url: 'get-posts-ajax.php?lastPostId=' + lastPostId + '&view=' + view,
-									dataType: 'html',
-									async: false,
-									success: function(html) {
-										var div = document.createElement('div');
-										div.innerHTML = html;
-										var elements = div.childNodes;
-										old_lastPostId = lastPostId;
-										lastPostId = elements[3].textContent;
-										lastPostId = lastPostId.replace(/\s+/g, '');
-										//alert('Neu: ' + lastPostId + " Alt: " + old_lastPostId);
-										if(lastPostId == old_lastPostId) {
-											
-											//morePostsAvailable = false;
-										}
-										else {
-											//alert(elements[3].textContent);
-											$('#posts').append(elements[1].innerHTML);
-											$('#posts').hide().show(0);
-										}
-										$('#loading').hide();
-									}
-								});
-
-								$('.jodel > content').Emoji();
-							}
-							
-						}
-						scrollToAnchor(hash);
-
-					}						
-				}
-
-				// Each time the user scrolls
-				win.scroll(function() {
-
-
-					// End of the document reached?
-					if ($(window).scrollTop() + $(window).height() > $(document).height() - 100 && morePostsAvailable)
-					{
-						$('#loading').show();
-
-						$.ajax({
-							url: 'get-posts-ajax.php?lastPostId=' + lastPostId + '&view=' + view,
-							dataType: 'html',
-							async: false,
-							success: function(html) {
-								var div = document.createElement('div');
-								div.innerHTML = html;
-								var elements = div.childNodes;
-								old_lastPostId = lastPostId;
-								lastPostId = elements[3].textContent;
-								lastPostId = lastPostId.replace(/\s+/g, '');
-								//alert('Neu: ' + lastPostId + " Alt: " + old_lastPostId);
-								if(lastPostId == old_lastPostId)
-								{
-									
-									//morePostsAvailable = false;
-								}
-								else
-								{
-									//alert(elements[3].textContent);
-									$('#posts').append(elements[1].innerHTML);
-								}
-								$('#loading').hide();
-							}
-						});
-
-						$('.jodel > content').Emoji();
-					}
-				});
-			<?php } ?>
-			});	
-
-		</script>
-
-		<?php  
-			if(is_file('./piwik-script.html'))
-			{
-			    require_once('./piwik-script.html');
-			}
-		?>
-
-	</body>
-</html>
-
+				var view = "<?php echo $view
\ No newline at end of file