cleanup

5 files changed, 4 insertions, 244 deletions

diff --git a/done b/done
index 867890ba0..e84bd20d2 100644
--- a/done
+++ b/done
@@ -47,7 +47,6 @@ include/
   items.php
 + js_strings.php
 + language.php
-  lock.php
   message.php
 - msgclean.php
 ? nav.php
@@ -64,7 +63,6 @@ include/
   profile_selectors.php
   queue_fn.php
   queue.php
-  quoteconvert.php
 - salmon.php
   Scrape.php
 + security.php
@@ -126,7 +124,6 @@ mod/
 + manage.php
   match.php
   message.php
-  modexp.php
 ? mood.php
   msearch.php
 ? network.php
diff --git a/include/lock.php b/include/lock.php
deleted file mode 100644
index 707e33609..000000000
--- a/include/lock.php
+++ /dev/null
@@ -1,75 +0,0 @@
-<?php
-
-// Provide some ability to lock a PHP function so that multiple processes
-// can't run the function concurrently
-if(! function_exists('lock_function')) {
-function lock_function($fn_name, $block = true, $wait_sec = 2, $timeout = 30) {
-	if( $wait_sec == 0 )
-		$wait_sec = 2;	// don't let the user pick a value that's likely to crash the system
-
-	$got_lock = false;
-	$start = time();
-
-	do {
-		q("LOCK TABLE locks WRITE");
-		$r = q("SELECT locked FROM locks WHERE name = '%s' LIMIT 1",
-			dbesc($fn_name)
-		);
-
-		if((count($r)) && (! $r[0]['locked'])) {
-			q("UPDATE locks SET locked = 1 WHERE name = '%s' LIMIT 1",
-				dbesc($fn_name)
-			);
-			$got_lock = true;
-		}
-		elseif(! $r) { // the Boolean value for count($r) should be equivalent to the Boolean value of $r
-			q("INSERT INTO locks ( name, locked ) VALUES ( '%s', 1 )",
-				dbesc($fn_name)
-			);
-			$got_lock = true;
-		}
-
-		q("UNLOCK TABLES");
-
-		if(($block) && (! $got_lock))
-			sleep($wait_sec);
-
-	} while(($block) && (! $got_lock) && ((time() - $start) < $timeout));
-
-	logger('lock_function: function ' . $fn_name . ' with blocking = ' . $block . ' got_lock = ' . $got_lock . ' time = ' . (time() - $start), LOGGER_DEBUG);
-	
-	return $got_lock;
-}}
-
-
-if(! function_exists('block_on_function_lock')) {
-function block_on_function_lock($fn_name, $wait_sec = 2, $timeout = 30) {
-	if( $wait_sec == 0 )
-		$wait_sec = 2;	// don't let the user pick a value that's likely to crash the system
-
-	$start = time();
-
-	do {
-		$r = q("SELECT locked FROM locks WHERE name = '%s' LIMIT 1",
-				dbesc($fn_name)
-		     );
-
-		if(count($r) && $r[0]['locked'])
-			sleep($wait_sec);
-
-	} while(count($r) && $r[0]['locked'] && ((time() - $start) < $timeout));
-
-	return;
-}}
-
-
-if(! function_exists('unlock_function')) {
-function unlock_function($fn_name) {
-	$r = q("UPDATE locks SET locked = 0 WHERE name = '%s' LIMIT 1",
-			dbesc($fn_name)
-	     );
-
-	logger('unlock_function: released lock for function ' . $fn_name, LOGGER_DEBUG);
-
-	return;
-}}
diff --git a/include/quoteconvert.php b/include/quoteconvert.php
deleted file mode 100644
index 2a6d28370..000000000
--- a/include/quoteconvert.php
+++ /dev/null
@@ -1,132 +0,0 @@
-<?php
-function convertquote($body, $reply)
-{
-	// Convert Quotes
-	$arrbody = explode("\n", trim($body));
-	$arrlevel = array();
-
-	for ($i = 0; $i < count($arrbody); $i++) {
-		$quotelevel = 0;
-		$quoteline = $arrbody[$i];
-
-		while ((strlen($quoteline)>0) and ((substr($quoteline, 0, 1) == '>')
-			or (substr($quoteline, 0, 1) == ' '))) {
-			if (substr($quoteline, 0, 1) == '>')
-				$quotelevel++;
-
-			$quoteline = ltrim(substr($quoteline, 1));
-		}
-
-		//echo $quotelevel.'*'.$quoteline."\r\n";
-
-		$arrlevel[$i] = $quotelevel;
-		$arrbody[$i] = $quoteline;
-	}
-
-	$quotelevel = 0;
-	$previousquote = 0;
-	$arrbodyquoted = array();
-
-	for ($i = 0; $i < count($arrbody); $i++) {
-
-		$previousquote = $quotelevel;
-		$quotelevel = $arrlevel[$i];
-		$currline = $arrbody[$i];
-
-		while ($previousquote < $quotelevel) {
-			if ($sender != '') {
-				$quote = "[quote title=$sender]";
-				$sender = '';
-			} else
-				$quote = "[quote]";
-
-			$arrbody[$i] = $quote.$arrbody[$i];
-			$previousquote++;
-		}
-
-		while ($previousquote > $quotelevel) {
-			$arrbody[$i] = '[/quote]'.$arrbody[$i];
-			$previousquote--;
-		}
-
-		$arrbodyquoted[] = $arrbody[$i];
-	}
-	while ($quotelevel > 0) {
-		$arrbodyquoted[] = '[/quote]';
-		$quotelevel--;
-	}
-
-	$body = implode("\n", $arrbodyquoted);
-
-	if (strlen($body) > 0)
-		$body = $body."\n\n";
-
-	if ($reply)
-		$body = removetofu($body);
-
-	return($body);
-}
-
-function removetofu($message)
-{
-	$message = trim($message);
-
-	do {
-		$oldmessage = $message;
-		$message = preg_replace('=\[/quote\][\s](.*?)\[quote\]=i', '$1', $message);
-		$message = str_replace("[/quote][quote]", "", $message);
-	} while ($message != $oldmessage);
-
-	$quotes = array();
-
-	$startquotes = 0;
-
-	$start = 0;
-
-	while(($pos = strpos($message, '[quote', $start)) > 0) {
-		$quotes[$pos] = -1;
-		$start = $pos + 7;
-		$startquotes++;
-	}
-
-	$endquotes = 0;
-	$start = 0;
-
-	while(($pos = strpos($message, '[/quote]', $start)) > 0) {
-		$start = $pos + 7;
-		$endquotes++;
-	}
-
-	while ($endquotes < $startquotes) {
-		$message .= '[/quote]';
-		++$endquotes;
-	}
-
-	$start = 0;
-
-	while(($pos = strpos($message, '[/quote]', $start)) > 0) {
-		$quotes[$pos] = 1;
-		$start = $pos + 7;
-	}
-
-	if (strtolower(substr($message, -8)) != '[/quote]')
-		return($message);
-
-	krsort($quotes);
-
-	$quotelevel = 0;
-	$quotestart = 0;
-	foreach ($quotes as $index => $quote) {
-		$quotelevel += $quote;
-
-		if (($quotelevel == 0) and ($quotestart == 0))
-			$quotestart = $index;
-	}
-
-	if ($quotestart != 0) {
-		$message = trim(substr($message, 0, $quotestart))."\n[spoiler]".substr($message, $quotestart+7, -8).'[/spoiler]';
-	}
-
-	return($message);
-}
-?>
diff --git a/mod/modexp.php b/mod/modexp.php
deleted file mode 100644
index a869fc1f9..000000000
--- a/mod/modexp.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-
-require_once('library/asn1.php');
-
-function modexp_init(&$a) {
-
-	if($a->argc != 2)
-		killme();
-
-	$nick = $a->argv[1];
-	$r = q("SELECT `pubkey` FROM `user` WHERE `nickname` = '%s' LIMIT 1",
-			dbesc($nick)
-	);
-
-	if(! count($r))
-		killme();
-
-	$lines = explode("\n",$r[0]['pubkey']);
-	unset($lines[0]);
-	unset($lines[count($lines)]);
-	$x = base64_decode(implode('',$lines));
-
-	$r = ASN_BASE::parseASNString($x);
-
-	$m = $r[0]->asnData[1]->asnData[0]->asnData[0]->asnData;
-	$e = $r[0]->asnData[1]->asnData[0]->asnData[1]->asnData;
-
-	header("Content-type: application/magic-public-key");
-	echo 'RSA' . '.' . $m . '.' . $e ;
-
-	killme();
-
-}
-
diff --git a/mod/mood.php b/mod/mood.php
index ddd721823..98064beab 100755
--- a/mod/mood.php
+++ b/mod/mood.php
@@ -96,6 +96,10 @@ function mood_init(&$a) {
 	}
 
 	call_hooks('post_local_end', $arr);
+
+	if($_SESSION['return_url'])
+		goaway(z_root() . '/' . $_SESSION['return_url']);
+
 	return;
 }