Browse Source

More formatting fixes

Nathaniel van Diepen 10 years ago
parent
commit
f7384bdea8
2 changed files with 40 additions and 46 deletions
  1. 36 42
      shims/mybb/shim.php
  2. 4 4
      shims/smf/shim.php

+ 36 - 42
shims/mybb/shim.php

@@ -1,46 +1,40 @@
-<?PHP
-error_reporting(E_ALL);
-ini_set('display_errors', '1');
-$encriptKeyToUse = "key from Config.php (created while installation)";
-function base64_url_encode($input){
-	return strtr(base64_encode($input), '+/=', '-_,');
-}
-function base64_url_decode($input){
-	return base64_decode(strtr($input, '-_,', '+/=')); 
-}
-define("IN_MYBB", 1);
-define("NO_ONLINE", 1);
-require_once "./global.php";
-ob_start();
-if(!isset($_GET['op'])){
-	if(isset($_GET['txt'])){
-		header('Content-type: text/plain');
-	}elseif(!isset($_GET['textmode'])){
-		header('Content-type: text/javascript');
-	}
-	if($mybb->user['username']=="" || $mybb->user['isbannedgroup']){
-		$nick = "Guest";
-		$signature = "";
-	}else{
-		$nick = $mybb->user['username'];
-		$signature = base64_url_encode(mcrypt_encrypt ( MCRYPT_RIJNDAEL_256 , $encriptKeyToUse , $nick , MCRYPT_MODE_ECB));
+<?php
+	error_reporting(E_ALL);
+	ini_set('display_errors', '1');
+	$encriptKeyToUse = "key from Config.php (created while installation)";
+	define("IN_MYBB", 1);
+	define("NO_ONLINE", 1);
+	require_once "./global.php";
+	ob_start();
+	if(!isset($_GET['op'])){
+		if(isset($_GET['txt'])){
+			header('Content-type: text/plain');
+		}elseif(!isset($_GET['textmode'])){
+			header('Content-type: text/javascript');
+		}
+		if($mybb->user['username']=="" || $mybb->user['isbannedgroup']){
+			$nick = "Guest";
+			$signature = "";
+		}else{
+			$nick = $mybb->user['username'];
+			$signature = strtr(base64_encode((mcrypt_encrypt(MCRYPT_RIJNDAEL_256,$encriptKeyToUse,$nick,MCRYPT_MODE_ECB))),'+/=','-_,');
+		}
 	}
-}
-ob_end_clean();
-if(isset($_GET['op'])){
-	header('Content-type: text/plain');
-	$id = $_GET['u'];
-	$user = get_user((int) $id);
-	if (base64_url_decode($_GET['nick'])==$user['username']){
-		echo $user['usergroup'];
-	}
-}else{
-	if(isset($_GET['txt'])){
-		echo $signature."\n".$nick."\n".$mybb->user['uid'];
-	}elseif(isset($_GET['textmode'])){
-		header('Location: http://chat.forum.acr.victorz.ca/textmode.php?login&nick='.urlencode($nick).'&sig='.urlencode($signature).'&id='.$mybb->user['uid']);
+	ob_end_clean();
+	if(isset($_GET['op'])){
+		header('Content-type: text/plain');
+		$id = $_GET['u'];
+		$user = get_user((int) $id);
+		if (base64_decode(strtr(($_GET['nick'],'-_,','+/='))==$user['username']){
+			echo $user['usergroup'];
+		}
 	}else{
-		echo "signCallback('$signature','$nick','".$mybb->user['uid']."');";
+		if(isset($_GET['txt'])){
+			echo $signature."\n".$nick."\n".$mybb->user['uid'];
+		}elseif(isset($_GET['textmode'])){
+			header('Location: http://chat.forum.acr.victorz.ca/textmode.php?login&nick='.urlencode($nick).'&sig='.urlencode($signature).'&id='.$mybb->user['uid']);
+		}else{
+			echo "signCallback('$signature','$nick','".$mybb->user['uid']."');";
+		}
 	}
-}
 ?>

+ 4 - 4
shims/smf/shim.php

@@ -1,13 +1,13 @@
 <?PHP
 	$encriptKeyToUse = "key from Config.php (created while installation)";
 	function base64_url_encode($input){
-		return strtr(base64_encode($input), '+/=', '-_,');
+		return strtr(base64_encode($input),'+/=','-_,');
 	}
 	function base64_url_decode($input){
-		return base64_decode(strtr($input, '-_,', '+/=')); 
+		return base64_decode(strtr($input,'-_,','+/=')); 
 	}
 	$ssi_guest_access = true;
-	@require(dirname(__FILE__) . '/SSI.php');
+	@require(dirname(__FILE__).'/SSI.php');
 	ob_start();
 	if(isset($_GET['txt'])){
 		header('Content-type: text/plain');
@@ -19,7 +19,7 @@
 		$signature = "";
 	}else{
 		$nick = $user_info['name'];
-		$signature = base64_url_encode(mcrypt_encrypt(MCRYPT_RIJNDAEL_256 , $encriptKeyToUse , $nick , MCRYPT_MODE_ECB));
+		$signature = base64_url_encode(mcrypt_encrypt(MCRYPT_RIJNDAEL_256,$encriptKeyToUse,$nick,MCRYPT_MODE_ECB));
 	}
 	ob_end_clean();
 	if(isset($_GET['txt'])){