SD-SimpleDesk

@@ -0,0 +1,28 @@

+<?xml version="1.0"?>

+<!DOCTYPE modification SYSTEM "http://www.simplemachines.org/xml/modification">

+<modification xmlns="http://www.simplemachines.org/xml/modification" xmlns:smf="http://www.simplemachines.org/">

+	<id>SimpleDeskTeam:SimpleDesk</id>

+	<version>2.0</version>

+

+	<file name="$sourcedir/Subs.php"><!-- bbcode handler changes -->

+		<operation><!-- expand the quote link= parameter -->

+			<search position="before"><![CDATA[(?:topic|threadid)=[\dmsg#\./]{1,40}(?:;start=[\dmsg#\./]{1,40})?]]></search>

+			<add><![CDATA[|action=helpdesk;sa=ticket;ticket=[\dmsg#\./]{1,40}(?:;start=[\dmsg#\./]{1,40})?]]></add>

+		</operation>

+		<operation><!-- Force the log of disabled tags to be reset if we're calling it in such a condition as it is being re-evaluated anyway -->

+			<search position="before"><![CDATA[		if (!empty($modSettings['disabledBBC']))

+		{]]></search>

+			<add><![CDATA[

+			$disabled = array(); // SimpleDesk added! Forces reset of $disabled if we're calling in an unusual way

+]]></add>

+		</operation>

+		<operation><!-- Add wikistyle links for tickets -->

+			<search position="after"><![CDATA[	// Shall we take the time to cache this?]]></search>

+			<add><![CDATA[	// Add SimpleDesk wikilinks

+	if (!empty($modSettings['helpdesk_active']) && !empty($modSettings['shd_allow_wikilinks']) && function_exists('shd_parse_wikilinks'))

+		shd_parse_wikilinks($message);

+

+]]></add>

+		</operation>

+	</file>

+</modification>

\ No newline at end of file

@@ -166,20 +166,6 @@

 		</operation>

 	</file>

-	<file name="$sourcedir/Subs.php"><!-- reconfigure the main menu somewhat -->

-		<operation><!-- expand the quote link= parameter -->

-			<search position="before"><![CDATA[(?:topic|threadid)=[\dmsg#\./]{1,40}(?:;start=[\dmsg#\./]{1,40})?]]></search>

-			<add><![CDATA[|action=helpdesk;sa=ticket;ticket=[\dmsg#\./]{1,40}(?:;start=[\dmsg#\./]{1,40})?]]></add>

-		</operation>

-		<operation><!-- Force the log of disabled tags to be reset if we're calling it in such a condition as it is being re-evaluated anyway -->

-			<search position="before"><![CDATA[		if (!empty($modSettings['disabledBBC']))

-		{]]></search>

-			<add><![CDATA[

-			$disabled = array(); // SimpleDesk added! Forces reset of $disabled if we're calling in an unusual way

-]]></add>

-		</operation>

-	</file>

-

 	<file name="$sourcedir/Profile-Modify.php"><!-- Ensure things get uncached if we change groups (which means permissions) -->

 		<operation>

 			<search position="after"><![CDATA[	// The account page allows the change of your id_group - but not to a protected group!]]></search>

@@ -19,6 +19,7 @@

 		<modification format="xml" type="file">install-xml/install-attachments.xml</modification>

 		<modification format="xml" type="file">install-xml/install-trackip.xml</modification>

 		<modification format="xml" type="file">install-xml/install-packages.xml</modification>

+		<modification format="xml" type="file">install-xml/install-parsebbc.xml</modification>

 		<!-- language files -->

 		<require-dir name="sd_language" destination="$themes_dir/default/languages" />

@@ -65,6 +66,7 @@

 		<modification format="xml" type="file" reverse="true">install-xml/install-attachments.xml</modification>

 		<modification format="xml" type="file" reverse="true">install-xml/install-trackip.xml</modification>

 		<modification format="xml" type="file" reverse="true">install-xml/install-packages.xml</modification>

+		<modification format="xml" type="file" reverse="true">install-xml/install-parsebbc.xml</modification>

 		<!-- language files, removed -->

 		<remove-dir name="$themes_dir/default/languages/sd_language" />

@@ -772,11 +772,12 @@ function shd_load_ticket($ticket = 0)

 function shd_format_text($text, $smileys = true, $cache = '')

 {

 	global $modSettings, $scripturl, $smcFunc;

-	static $wikilinks = array();

 	static $smf_disabled = false, $shd_disabled = false;

 	if (empty($modSettings['shd_allow_ticket_bbc']))

 	{

+		if (!empty($modSettings['shd_allow_wikilinks']))

+			shd_parse_wikilinks($text);

 		if (!empty($modSettings['shd_allow_ticket_smileys']) && $smileys)

 			parsesmileys($text);

 	}

@@ -825,11 +826,21 @@ function shd_format_text($text, $smileys = true, $cache = '')

 		}

 	}

-	if (!empty($modSettings['shd_allow_wikilinks']))

-	{

-		// Check for wiki syntax links - first figure out what links match in this text

-		preg_match_all('~\[\[ticket\:([0-9]+)\]\]~iU', $text, $matches, PREG_SET_ORDER);

+	return $text;

+}

+/**

+ *	Processes the incoming message for wiki-links.

+ *

+ *	@param string &$message The message to be parsed.

+ *	@since 2.0

+*/

+function shd_parse_wikilinks(&$message)

+{

+	global $modSettings, $smcFunc, $scripturl;

+	static $wikilinks = array();

+	if (preg_match_all('~\[\[ticket\:([0-9]+)\]\]~iU', $message, $matches, PREG_SET_ORDER))

+	{

 		// Step through the matches, check if it's one we already had in $wikilinks (where persists through the life of this page)

 		$ticketlist = array();

 		$ticketcount = count($matches);

@@ -871,10 +882,8 @@ function shd_format_text($text, $smileys = true, $cache = '')

 				$replacements[$matches[$i][0]] = '<a href="' . $scripturl . '?action=helpdesk;sa=ticket;ticket=' . $id . '.0">[' . str_pad($id, $modSettings['shd_zerofill'], '0', STR_PAD_LEFT) . '] ' . $wikilinks[$id] . '</a>';

 		}

-		$text = str_replace(array_keys($replacements), array_values($replacements), $text);

+		$message = str_replace(array_keys($replacements), array_values($replacements), $message);

 	}

-

-	return $text;

 }

 /**