Merge pull request #411 from jgen/develop

Chatbox is broken on develop branch
shish · Apr 20, 2014 · ef3daaf · ef3daaf
2 parents dc6653d + 60980c8
commit ef3daaf
Show file tree

Hide file tree

Showing 13 changed files with 23 additions and 176 deletions.
diff --git a/ext/chatbox/cp/ajax.php b/ext/chatbox/cp/ajax.php
@@ -1,4 +1,4 @@
-<?
+<?php
 error_reporting(E_ALL);
 $kioskMode = false;
 

diff --git a/ext/chatbox/cp/index.php b/ext/chatbox/cp/index.php
@@ -1,4 +1,4 @@
-<?
+<?php
 	include 'ajax.php'; 
 ?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
@@ -8,7 +8,8 @@
 		<meta http-equiv="content-type" content="text/html; charset=utf-8" />
 		<title>YShout: Admin CP</title>
 		<link rel="stylesheet" type="text/css" href="css/style.css" />
-		<script type="text/javascript" src="../js/jquery.js"></script>
+		<script src="//code.jquery.com/jquery-1.11.0.min.js"></script>
+		<script src="//code.jquery.com/jquery-migrate-1.2.1.min.js"></script>
 		<script type="text/javascript" src="js/admincp.js"></script>
 	</head>
 	<body>
@@ -33,7 +34,7 @@
 						<span id="login-loading">Loading...</span>
 					</form>
 				</div>
-				<?
+				<?php
 					if (loggedIn()) echo cp();
 				?>
 			</div>

diff --git a/ext/chatbox/history/index.php b/ext/chatbox/history/index.php
@@ -90,7 +90,8 @@
 	<head>
 		<meta http-equiv="content-type" content="text/html; charset=utf-8" />
 		<title>YShout: History</title>
-		<script type="text/javascript" src="../js/jquery.js"></script>
+		<script src="//code.jquery.com/jquery-1.11.0.min.js"></script>
+		<script src="//code.jquery.com/jquery-migrate-1.2.1.min.js"></script>
 		<script type="text/javascript" src="js/history.js"></script>
 
 		<link rel="stylesheet" href="../example/css/example.yshout.css" />

diff --git a/ext/chatbox/include.php b/ext/chatbox/include.php
@@ -1,4 +1,4 @@
-<?
+<?php
 	$null = null;
 	include 'php/filestorage.class.php';
 	include 'preferences.php';

diff --git a/ext/chatbox/js/jquery.js b/ext/chatbox/js/jquery.js
diff --git a/ext/chatbox/js/yshout.js b/ext/chatbox/js/yshout.js
@@ -374,13 +374,12 @@ YShout.prototype = {
 		if (!$.browser.safari) return;
 
 		var same = [];
-		for (var i = 0; i < this.p.length; i++) {
+		for (var i = 0; i < this.p.length; i++)
 			if (this.p[i].adminInfo.ip == ip) 
 				same.push(this.p[i]);
-		}
-
-		for (var j = 0; j < same.length; j++) {
-			$('#' + same[j].id).fadeTo(this.animSpeed, 0.8).fadeTo(this.animSpeed, 1);
+
+		for (var i = 0; i < same.length; i++) {
+			$('#' + same[i].id).fadeTo(this.animSpeed, .8).fadeTo(this.animSpeed, 1);
 		}
 	},
 

diff --git a/ext/chatbox/main.php b/ext/chatbox/main.php
@@ -14,18 +14,18 @@ public function onPageRequest(PageRequestEvent $event) {
 
 		// Adds header to enable chatbox
 		$root = get_base_href();
-		$yPath = "$root/ext/chatbox/";
+		$yPath = make_http("") . "/ext/chatbox/";
 		$page->add_html_header("
-				<script src=\"$root/ext/chatbox/js/jquery.js\" type=\"text/javascript\"></script>
+				<script src=\"http://code.jquery.com/jquery-migrate-1.2.1.js\" type=\"text/javascript\"></script>
 				<script src=\"$root/ext/chatbox/js/yshout.js\" type=\"text/javascript\"></script>
 
 				<link rel=\"stylesheet\" href=\"$root/ext/chatbox/css/dark.yshout.css\" />
 
 				<script type=\"text/javascript\">
-				nickname = '{$user->name}';
-				new YShout({ yPath: '$yPath' });
+					nickname = '{$user->name}';
+					new YShout({ yPath: '$yPath' });
 				</script>
-		");
+		", 500);
 
 		// loads the chatbox at the set location    
 		$html = "<div id=\"yshout\"></div>";

diff --git a/ext/chatbox/php/ajaxcall.class.php b/ext/chatbox/php/ajaxcall.class.php
@@ -1,4 +1,4 @@
-<?
+<?php
 	class AjaxCall {
 		function AjaxCall($log = null) {
 			header('Content-type: application/json');

diff --git a/ext/chatbox/php/filestorage.class.php b/ext/chatbox/php/filestorage.class.php
@@ -1,4 +1,4 @@
-<?
+<?php
 
 class FileStorage {
 

diff --git a/ext/chatbox/php/functions.php b/ext/chatbox/php/functions.php
@@ -1,4 +1,4 @@
-<?
+<?php
 
 	function cookie($name, $data) {
 		return setcookie($name, $data, time() + 60 * 60 * 24 * 30, '/');

diff --git a/ext/chatbox/php/yshout.class.php b/ext/chatbox/php/yshout.class.php
@@ -1,4 +1,4 @@
-<?
+<?php
 
 class YShout {
 

diff --git a/ext/chatbox/preferences.php b/ext/chatbox/preferences.php
@@ -1,4 +1,4 @@
-<?
+<?php
 	// If you want to change the nickname, the line below is the one to modify.
 	// Simply set $overrideNickname to whatever variable you want to appear as the nickname,
 	// or leave it null to use the set nicknames.

diff --git a/ext/chatbox/yshout.php b/ext/chatbox/yshout.php
@@ -1,4 +1,4 @@
-<?
+<?php
 error_reporting(E_ALL);
 ob_start();
 set_error_handler('errorOccurred');
-Original file line number
+Diff line change
@@ -1,4 +1,4 @@
-    <?
+    <?php
     class FileStorage {
@@ Expand Down @@