Speed up linkword processing a bit, clarify text etc

e107_plugins/linkwords/admin_config.php

@@ -11,9 +11,9 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.8/e107_plugins/linkwords/admin_config.php,v $
-|     $Revision: 1.1.1.1 $
+|     $Revision: 1.2 $
-|     $Date: 2006-12-02 04:35:24 $
+|     $Date: 2007-02-07 21:48:26 $
-|     $Author: mcfly_e107 $
+|     $Author: e107steved $
 +----------------------------------------------------------------------------+
 */
 require_once("../../class2.php");
@@ -25,6 +25,17 @@ require_once(e_ADMIN."auth.php");
 @include_once(e_PLUGIN."linkwords/languages/".e_LANGUAGE.".php");
 @include_once(e_PLUGIN."linkwords/languages/English.php");
 
+$lw_context_areas = array(
+			'title' => 'Title areas',
+			'summary' => 'Item summaries',
+			'body' => 'Body text',
+			'description' => 'Descriptions (links etc)'
+			// Don't do the next three - linkwords are meaningless on them
+//			'olddefault' => 'Legacy areas',
+//			'linktext' => 'Clickable links',
+//			'rawtext' => 'Unprocessed text'
+		);
+		
 $deltest = array_flip($_POST);
 
 if(isset($deltest[LWLAN_17]))
@@ -40,8 +51,43 @@ if(isset($deltest[LWLAN_17]))
 
 if(e_QUERY)
 {
-	list($action, $id) = explode(".", e_QUERY);
+  $lw_qs = explode(".", e_QUERY);
+  if (!isset($lw_qs[0])) $lw_qs[0] = 'words';
+  if (!isset($lw_qs[1])) $lw_qs[1] = -1;
+  $action = $lw_qs[0];
+  $id = $lw_qs[1];
 }
+if (!isset($action)) $action = 'words';
+
+if (isset($_POST['saveopts_linkword']))
+{  // Save options page
+  // Array of context flags
+	$pref['lw_context_visibility'] = array(			
+			'olddefault' => FALSE,
+			'title' => FALSE,
+			'summary' => FALSE,
+			'body' => FALSE,
+			'description' => FALSE,
+			'linktext' => FALSE,
+			'rawtext' => FALSE
+			);
+  foreach ($_POST['lw_visibility_area'] as $can_see)
+  {
+    if (key_exists($can_see,$lw_context_areas))
+	{
+	  $pref['lw_context_visibility'][$can_see] = TRUE;
+	}
+  }
+  // Text area for 'exclude' pages - use same method as for menus
+  $pagelist = explode("\r\n", $_POST['linkword_omit_pages']);
+  for ($i = 0 ; $i < count($pagelist) ; $i++) 
+  {
+	$pagelist[$i] = trim($pagelist[$i]);
+  }
+  $pref['lw_page_visibility'] = '2-'.implode("|", $pagelist);		// '2' for 'hide on specified pages'
+  save_prefs();
+}
+
 
 if (isset($_POST['submit_linkword']))
 {
@@ -77,19 +123,21 @@ if (isset($_POST['update_linkword']))
 }
 
 
-if (isset($message)) {
+if (isset($message)) 
+{
 	$ns->tablerender("", "<div style='text-align:center'><b>".$message."</b></div>");
 }
 
 
-
+if (($action == 'words') || ($action == 'edit'))
-$text = "<div class='center'>\n";
-if(!$sql -> db_Select("linkwords"))
 {
+  $text = "<div class='center'>\n";
+  if(!$sql -> db_Select("linkwords"))
+  {
 	$text .= LWLAN_4;
-}
+  }
-else
+  else
-{
+  {
 	$text = "
 	<table style='".ADMIN_WIDTH."' class='fborder'>
 	<tr>
@@ -117,35 +165,34 @@ else
 		</form>\n";
 	}
 	$text .= "</table>";
-}
+  }
 
-$text .= "</div>";
+  $text .= "</div>";
-$ns -> tablerender(LWLAN_11, $text);
+  $ns -> tablerender(LWLAN_11, $text);
+}
 
 
 if($action == "edit")
 {
-
+  if($sql -> db_Select("linkwords", "*", "linkword_id=".$id))
-	if($sql -> db_Select("linkwords", "*", "linkword_id=".$id))
+  {
-	{
+	$row = $sql -> db_Fetch();
-		$row = $sql -> db_Fetch();
+	extract($row);
-		extract($row);
+	define("LW_EDIT", TRUE);
-		define("EDIT", TRUE);
+  }
-	}
 }
 else
 {
-	unset($linkword_word, $linkword_link, $linkword_active);
+  unset($linkword_word, $linkword_link, $linkword_active);
 }
 
 
 
-
+if (($action == 'words') || ($action == 'edit'))
-
+{
-
 $text = "
 <div class='center'>
-<form method='post' action='".e_SELF."'>
+<form method='post' action='".e_SELF."?words'>
 <table style='".ADMIN_WIDTH."' class='fborder'>
 
 <tr>
@@ -158,7 +205,7 @@ $text = "
 <tr>
 <td style='width:50%' class='forumheader3'>".LWLAN_6."</td>
 <td style='width:50%' class='forumheader3'>
-<input class='tbox' type='text' name='linkword_link' size='40' value='".$linkword_link."' maxlength='150' />
+<input class='tbox' type='text' name='linkword_link' size='60' value='".$linkword_link."' maxlength='150' />
 </td>
 </tr>
 
@@ -172,14 +219,83 @@ $text = "
 
 <tr>
 <td colspan='2' style='text-align:center' class='forumheader'>".
-(defined("EDIT") ? "<input class='button' type='submit' name='update_linkword' value='".LWLAN_15."' /><input type='hidden' name='id' value='$id' />" : "<input class='button' type='submit' name='submit_linkword' value='".LWLAN_14."' />")."
+(defined("LW_EDIT") ? "<input class='button' type='submit' name='update_linkword' value='".LWLAN_15."' /><input type='hidden' name='id' value='$id' />" : "<input class='button' type='submit' name='submit_linkword' value='".LWLAN_14."' />")."
 </td>
 </tr>
 </table>
 </form>
 </div>\n";
 
-$ns -> tablerender($caption, $text);
+$ns -> tablerender(LWLAN_31, $text);
+}
+
+
+
+if ($action=='options')
+{
+  $menu_pages = substr($pref['lw_page_visibility'],2);    // Knock off the 'show/hide' flag
+  $menu_pages = str_replace("|", "\n", $menu_pages);
+  $text = "
+  <div class='center'>
+  <form method='post' action='".e_SELF."?options'>
+  <table style='".ADMIN_WIDTH."' class='fborder'>
+	<colgroup>
+	<col style='width: 30%; vertical-align:top;' />
+	<col style='width: 40%; vertical-align:top;' />
+	<col style='width: 30%; vertical-align:top;' />
+	</colgroup>
+  <tr>
+  <td class='forumheader3'>".LWLAN_26."</td>
+  <td class='forumheader3'>";
+  foreach ($lw_context_areas as $lw_key=>$lw_desc)
+  {
+    $checked = $pref['lw_context_visibility'][$lw_key] ? 'checked=checked' : '';
+	$text .= "<input type='checkbox' name='lw_visibility_area[]' value={$lw_key} {$checked} />{$lw_desc}<br />";
+  }
+  $text .= "</td>
+  <td class='forumheader3'>".LWLAN_27."
+  </tr>
+
+  <tr>
+  <td class='forumheader3'>".LWLAN_28."</td>
+  <td class='forumheader3'><textarea rows='5' cols='60' class='tbox' name='linkword_omit_pages' >".$menu_pages."</textarea>
+  </td>
+  <td class='forumheader3'>".LWLAN_29."
+  </tr>
+
+<tr>
+<td colspan='3' style='text-align:center' class='forumheader'>
+<input class='button' type='submit' name='saveopts_linkword' value='".LWLAN_30."' />
+</td>
+</tr>
+</table>
+</form>
+</div>\n";
+
+$ns -> tablerender(LWLAN_32, $text);
+}
+
+
+
+function admin_config_adminmenu()
+{
+  if (e_QUERY) 
+  {
+	$tmp = explode(".", e_QUERY);
+	$action = $tmp[0];
+  }
+  if (!isset($action) || ($action == ""))
+  {
+	$action = "words";
+  }
+  $var['words']['text'] = LWLAN_24;
+  $var['words']['link'] = "admin_config.php";
+	
+  $var['options']['text'] = LWLAN_25;
+  $var['options']['link'] ="admin_config.php?options";
+	
+  show_admin_menu(LWLAN_23, $action, $var);
+}
 
 	
 require_once(e_ADMIN."footer.php");

e107_plugins/linkwords/languages/English.php

@@ -4,7 +4,7 @@ define("LWLAN_1", "Field(s) left blank.");
 define("LWLAN_2", "Link word saved.");
 define("LWLAN_3", "Link word updated.");
 define("LWLAN_4", "No link words defined yet.");
-define("LWLAN_5", "Word");
+define("LWLAN_5", "Words");
 define("LWLAN_6", "Link");
 define("LWLAN_7", "Active?");
 define("LWLAN_8", "Options");
@@ -20,8 +20,18 @@ define("LWLAN_17", "Delete");
 define("LWLAN_18", "Are you sure you want to delete this linkword?");
 define("LWLAN_19", "Linkword deleted.");
 define("LWLAN_20", "Unable to find that linkword entry.");
-define("LWLAN_21","Word to autolink");
+define("LWLAN_21", "Word to autolink (or comma-separated list of words)");
-define("LWLAN_22","Activate?");
+define("LWLAN_22", "Activate?");
+define("LWLAN_23", "Linkwords Administration");
+define("LWLAN_24", "Manage Words");
+define("LWLAN_25", "Options");
+define("LWLAN_26", "Areas in which to enable linkwords");
+define("LWLAN_27", "This is the 'context' of the displayed text");
+define("LWLAN_28", "Pages on which to disable linkwords");
+define("LWLAN_29", "Same format as menu visibility control. One match per line. Specify a partial or complete URL. End with '!' for exact match of the end part of the link");
+define("LWLAN_30", "Save options");
+define("LWLAN_31", "Add/edit linkword");
+define("LWLAN_32", "Linkword Options");
 
 define("LWLANINS_1", "Linkwords");
 define("LWLANINS_2", "This plugin will link specified words with a defined link");

e107_plugins/linkwords/linkwords.php

@@ -11,8 +11,8 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.8/e107_plugins/linkwords/linkwords.php,v $
-|     $Revision: 1.5 $
+|     $Revision: 1.6 $
-|     $Date: 2007-01-24 20:58:50 $
+|     $Date: 2007-02-07 21:48:26 $
 |     $Author: e107steved $
 |
 +----------------------------------------------------------------------------+
@@ -23,29 +23,41 @@ if (!defined('e107_INIT')) { exit; }
 
 class e_linkwords
 {
+	var $lw_enabled = FALSE;		// Default to disabled to start
 	var $word_list = array();		// List of link words/phrases
 	var $link_list = array();		// Corresponding list of links to apply
 	var $tip_list  = array();
-	var $area_opts = array(
+	var $area_opts = array();		// Process flags for the various contexts
-			'olddefault' => FALSE,
+	var $block_list = array();		// Array of 'blocked' pages
-			'title' => FALSE,
-			'summary' => TRUE,
-			'body' => TRUE,
-			'description' => TRUE,
-			'linktext' => FALSE,
-			'rawtext' => FALSE
-			);						// We can set this from prefs later
-	var $block_list = array(
-//			'page.php?3',
-//			'page.php?31!'
-			);
 	
 	function e_linkwords()
 	{
+	  global $pref;
 		/* constructor */
-		$link_sql = new db;
+	// See whether they should be active on this page - if not, no point doing anything!
-		if($link_sql -> db_Select("linkwords", "*", "linkword_active=0"))
+	  if ((strpos(e_SELF, ADMINDIR) !== FALSE) || (strpos(e_PAGE, "admin_") !== FALSE)) return;   // No linkwords on admin directories
+
+// Now see if disabled on specific pages
+	  $check_url = e_SELF.(e_QUERY ? "?".e_QUERY : '');
+	  $this->block_list = explode("|",substr($pref['lw_page_visibility'],2));    // Knock off the 'show/hide' flag
+	  foreach ($this->block_list as $p)
+	  {
+		if(substr($p, -1) == '!')
 		{
+		  $p = substr($p, 0, -1);
+		  if(substr($check_url, strlen($p)*-1) == $p) return;
+		}
+		else 
+		{
+		  if(strpos($check_url, $p) !== FALSE) return;
+		}
+	  }
+
+	  // Will probably need linkwords on this page - so get the info
+	  $this->lw_enabled = TRUE;
+	  $link_sql = new db;
+	  if($link_sql -> db_Select("linkwords", "*", "linkword_active=0"))
+	  {
 		  while ($row = $link_sql->db_Fetch())
 		  {
 		    $lw = trim(strtolower($row['linkword_word']));
@@ -64,29 +76,15 @@ class e_linkwords
 			  $this->link_list[] = $row['linkword_link'];
 			}
 		  }
-		}
+	  }
+	  $this->area_opts = $pref['lw_context_visibility'];
 	}
 
 
-	function linkwords($text,$area = '')
+	function linkwords($text,$area = 'olddefault')
 	{
-	  if ((strpos(e_SELF, ADMINDIR) !== FALSE) || (strpos(e_PAGE, "admin_") !== FALSE)) return $text;   // No linkwords on admin directories
+	  if (!$this->lw_enabled || !array_key_exists($area,$this->area_opts) || !$this->area_opts[$area]) return $text;		// No linkwords in disabled areas
-	  if (($area != '') && (!array_key_exists($area,$this->area_opts) || !$this->area_opts[$area])) return $text;		// No linkwords in disabled areas
 
-// Now see if disabled on specific pages
-	  $check_url = e_SELF.(e_QUERY ? "?".e_QUERY : '');
-	  foreach ($this->block_list as $p)
-	  {
-		if(substr($p, -1) == '!')
-		{
-		  $p = substr($p, 0, -1);
-		  if(substr($check_url, strlen($p)*-1) == $p) return $text;
-		}
-		else 
-		{
-		  if(strpos($check_url, $p) !== FALSE) return $text;
-		}
-	  }
 
 // Split up by HTML tags and process the odd bits here
 	  $ptext = "";

e107_plugins/linkwords/plugin.php

@@ -11,9 +11,9 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.8/e107_plugins/linkwords/plugin.php,v $
-|     $Revision: 1.1.1.1 $
+|     $Revision: 1.2 $
-|     $Date: 2006-12-02 04:35:24 $
+|     $Date: 2007-02-07 21:48:26 $
-|     $Author: mcfly_e107 $
+|     $Author: e107steved $
 +----------------------------------------------------------------------------+
 */
 
@@ -24,7 +24,7 @@ if (!defined('e107_INIT')) { exit; }
 
 // Plugin info -------------------------------------------------------------------------------------------------------
 $eplug_name = "LWLANINS_1";
-$eplug_version = "1.0";
+$eplug_version = "1.1";
 $eplug_author = "jalist";
 $eplug_url = "http://e107.org";
 $eplug_email = "jalist@e107.org";
@@ -52,6 +52,18 @@ $eplug_caption = LWLANINS_3;
 $eplug_array_pref = array(
 	'tohtml_hook' => 'linkwords'
 	);
+$eplug_prefs = array(
+	'lw_page_visibility'=>'',
+	'lw_context_visibility'=>array(			
+			'olddefault' => FALSE,
+			'title' => FALSE,
+			'summary' => TRUE,
+			'body' => TRUE,
+			'description' => TRUE,
+			'linktext' => FALSE,
+			'rawtext' => FALSE
+			)
+	);
 
 // List of table names -----------------------------------------------------------------------------------------------
 $eplug_table_names = array(
@@ -83,7 +95,18 @@ $eplug_done = LWLANINS_4;
 
 // upgrading ... //
 
-$upgrade_add_prefs = "";
+$upgrade_add_prefs = array(
+	'lw_page_visibility'=>'', 
+	'lw_context_visibility'=>array(			
+			'olddefault' => FALSE,
+			'title' => FALSE,
+			'summary' => TRUE,
+			'body' => TRUE,
+			'description' => TRUE,
+			'linktext' => FALSE,
+			'rawtext' => FALSE
+			)
+);
 
 $upgrade_remove_prefs = "";