diff --git a/e107_plugins/linkwords/admin_config.php b/e107_plugins/linkwords/admin_config.php index 8300fb10a..8a6e43bae 100644 --- a/e107_plugins/linkwords/admin_config.php +++ b/e107_plugins/linkwords/admin_config.php @@ -1,209 +1,190 @@ array( + 'controller' => 'linkwords_ui', + 'path' => null, + 'ui' => 'linkwords_form_ui', + 'uipath' => null + ), + ); + protected $adminMenu = array( + 'main/list' => array('caption'=> LAN_MANAGE, 'perm' => 'P'), + 'main/create' => array('caption'=> LAN_CREATE, 'perm' => 'P'), + 'main/prefs' => array('caption'=> LAN_PREFS, 'perm' => 'P'), + // 'main/custom' => array('caption'=> 'Custom Page', 'perm' => 'P') + ); - class linkwords_admin extends e_admin_dispatcher + protected $adminMenuAliases = array( + 'main/edit' => 'main/list' + ); + + protected $menuTitle = LAN_PLUGIN_LINKWORDS_NAME; +} + + +class linkwords_ui extends e_admin_ui +{ + protected $pluginTitle = 'Linkwords'; + protected $pluginName = 'linkwords'; + // protected $eventName = 'linkwords-linkwords'; // remove comment to enable event triggers in admin. + protected $table = 'linkwords'; + protected $pid = 'linkword_id'; + protected $perPage = 10; + protected $batchDelete = true; + // protected $batchCopy = true; + // protected $sortField = 'somefield_order'; + // protected $orderStep = 10; + // protected $tabs = array('Tabl 1','Tab 2'); // Use 'tab'=>0 OR 'tab'=>1 in the $fields below to enable. + + // protected $listQry = "SELECT * FROM `#tableName` WHERE field != '' "; // Example Custom Query. LEFT JOINS allowed. Should be without any Order or Limit. + + protected $listOrder = 'linkword_id DESC'; + + protected $fields = array ( + 'checkboxes' => array ( 'title' => '', 'type' => null, 'data' => null, 'width' => '5%', 'thclass' => 'center', 'forced' => '1', 'class' => 'center', 'toggle' => 'e-multiselect', ), + 'linkword_id' => array ( 'title' => LAN_ID, 'data' => 'int', 'width' => '5%', 'help' => '', 'readParms' => '', 'writeParms' => '', 'class' => 'left', 'thclass' => 'left', ), + 'linkword_word' => array ( 'title' => LWLAN_21, 'type' => 'tags', 'data' => 'str', 'width' => 'auto', 'inline' => true, 'help' => '', 'readParms' => '', 'writeParms' => '', 'class' => 'left', 'thclass' => 'left', ), + 'linkword_link' => array ( 'title' => LWLAN_6, 'type' => 'text', 'data' => 'str', 'width' => 'auto', 'inline' => true, 'help' => '', 'readParms' => '', 'writeParms' => 'size=xxlarge', 'class' => 'left', 'thclass' => 'left', ), + 'linkword_active' => array ( 'title' => LAN_ACTIVE, 'type' => 'dropdown', 'data' => 'int', 'width' => 'auto', 'batch' => true, 'filter' => true, 'inline' => true, 'help' => '', 'readParms' => '', 'writeParms' => array(), 'left' => 'center', 'thclass' => 'left', ), + 'linkword_tooltip' => array ( 'title' => LWLAN_50, 'type' => 'textarea', 'data' => 'str', 'width' => 'auto', 'inline' => true, 'help' => '', 'readParms' => '', 'writeParms' => array('size'=>'xxlarge'), 'class' => 'left', 'thclass' => 'left', ), + 'linkword_limit' => array ( 'title' => "Max. links/tips", 'type' => 'number', 'data' => 'int', 'width' => '10%', 'help' => LWLAN_63, 'readParms' => '', 'writeParms' => array('default'=>3), 'class' => 'right', 'thclass' => 'right', ), + 'linkword_tip_id' => array ( 'title' => LAN_ID, 'type' => 'number', 'data' => 'int', 'width' => '5%', 'help' => LWLAN_63, 'readParms' => '', 'writeParms' => '', 'class' => 'right', 'thclass' => 'right', ), + 'linkword_newwindow' => array ( 'title' => LWLAN_55, 'type' => 'boolean', 'data' => 'int', 'width' => 'auto', 'inline' => true, 'help' => '', 'filter'=>true, 'readParms' => '', 'writeParms' => '', 'class' => 'center', 'thclass' => 'center', ), + 'options' => array ( 'title' => LAN_OPTIONS, 'type' => null, 'data' => null, 'width' => '10%', 'thclass' => 'center last', 'class' => 'center last', 'forced' => '1', ), + ); + + protected $fieldpref = array(); + + protected $prefs = array( + 'lw_context_visibility' => array('title'=> LWLAN_26, 'type'=>'checkboxes', 'help'=>''), + 'lw_ajax_enable' => array('title'=> LWLAN_59, 'type'=>'boolean', 'data' => 'string','help'=>''), + 'lw_notsamepage' => array('title'=> LWLAN_64, 'type'=>'boolean', 'data' => 'string','help'=>LWLAN_65), + 'linkword_omit_pages' => array('title'=> LWLAN_28, 'type'=>'textarea', 'data' => 'string','help'=>''), + // 'lw_max_per_word' => array('title'=> "Maximum links/tips per word", 'type'=>'number', 'data' => 'string','help'=>'If the same word is found multiple times in a piece of text.'), + 'lw_custom_class' => array('title'=> "Custom CSS Class", 'type'=>'text', 'writeParms'=>array('placeholder'=> LAN_OPTIONAL ), 'data' => 'string','help'=>'Will add this class to all generated links.'), + ); + + public function init() { - protected $modes = array( - - 'main' => array( - 'controller' => 'linkwords_ui', - 'path' => null, - 'ui' => 'linkwords_form_ui', - 'uipath' => null - ), - - - ); - - - protected $adminMenu = array( - - 'main/list' => array('caption'=> LAN_MANAGE, 'perm' => 'P'), - 'main/create' => array('caption'=> LAN_CREATE, 'perm' => 'P'), - - 'main/prefs' => array('caption'=> LAN_PREFS, 'perm' => 'P'), - - // 'main/custom' => array('caption'=> 'Custom Page', 'perm' => 'P') - ); - - protected $adminMenuAliases = array( - 'main/edit' => 'main/list' - ); - - protected $menuTitle = LAN_PLUGIN_LINKWORDS_NAME; - } - - - - - - class linkwords_ui extends e_admin_ui - { - - protected $pluginTitle = 'Linkwords'; - protected $pluginName = 'core'; - // protected $eventName = 'linkwords-linkwords'; // remove comment to enable event triggers in admin. - protected $table = 'linkwords'; - protected $pid = 'linkword_id'; - protected $perPage = 10; - protected $batchDelete = true; - // protected $batchCopy = true; - // protected $sortField = 'somefield_order'; - // protected $orderStep = 10; - // protected $tabs = array('Tabl 1','Tab 2'); // Use 'tab'=>0 OR 'tab'=>1 in the $fields below to enable. - - // protected $listQry = "SELECT * FROM `#tableName` WHERE field != '' "; // Example Custom Query. LEFT JOINS allowed. Should be without any Order or Limit. - - protected $listOrder = 'linkword_id DESC'; - - protected $fields = array ( 'checkboxes' => array ( 'title' => '', 'type' => null, 'data' => null, 'width' => '5%', 'thclass' => 'center', 'forced' => '1', 'class' => 'center', 'toggle' => 'e-multiselect', ), - 'linkword_id' => array ( 'title' => LAN_ID, 'data' => 'int', 'width' => '5%', 'help' => '', 'readParms' => '', 'writeParms' => '', 'class' => 'left', 'thclass' => 'left', ), - 'linkword_word' => array ( 'title' => LWLAN_21, 'type' => 'tags', 'data' => 'str', 'width' => 'auto', 'inline' => true, 'help' => '', 'readParms' => '', 'writeParms' => '', 'class' => 'left', 'thclass' => 'left', ), - 'linkword_link' => array ( 'title' => LWLAN_6, 'type' => 'text', 'data' => 'str', 'width' => 'auto', 'inline' => true, 'help' => '', 'readParms' => '', 'writeParms' => 'size=xxlarge', 'class' => 'left', 'thclass' => 'left', ), - 'linkword_active' => array ( 'title' => LAN_ACTIVE, 'type' => 'dropdown', 'data' => 'int', 'width' => 'auto', 'batch' => true, 'filter' => true, 'inline' => true, 'help' => '', 'readParms' => '', 'writeParms' => array(), 'left' => 'center', 'thclass' => 'left', ), - - 'linkword_tooltip' => array ( 'title' => LWLAN_50, 'type' => 'textarea', 'data' => 'str', 'width' => 'auto', 'inline' => true, 'help' => '', 'readParms' => '', 'writeParms' => array('size'=>'xxlarge'), 'class' => 'left', 'thclass' => 'left', ), - 'linkword_limit' => array ( 'title' => "Max. links/tips", 'type' => 'number', 'data' => 'int', 'width' => '10%', 'help' => LWLAN_63, 'readParms' => '', 'writeParms' => array('default'=>3), 'class' => 'right', 'thclass' => 'right', ), - - 'linkword_tip_id' => array ( 'title' => LAN_ID, 'type' => 'number', 'data' => 'int', 'width' => '5%', 'help' => LWLAN_63, 'readParms' => '', 'writeParms' => '', 'class' => 'right', 'thclass' => 'right', ), - 'linkword_newwindow' => array ( 'title' => LWLAN_55, 'type' => 'boolean', 'data' => 'int', 'width' => 'auto', 'inline' => true, 'help' => '', 'filter'=>true, 'readParms' => '', 'writeParms' => '', 'class' => 'center', 'thclass' => 'center', ), - - 'options' => array ( 'title' => LAN_OPTIONS, 'type' => null, 'data' => null, 'width' => '10%', 'thclass' => 'center last', 'class' => 'center last', 'forced' => '1', ), - ); - - protected $fieldpref = array(); - - - protected $prefs = array( - 'lw_context_visibility' => array('title'=> LWLAN_26, 'type'=>'checkboxes', 'help'=>''), - 'lw_ajax_enable' => array('title'=> LWLAN_59, 'type'=>'boolean', 'data' => 'string','help'=>''), - 'lw_notsamepage' => array('title'=> LWLAN_64, 'type'=>'boolean', 'data' => 'string','help'=>LWLAN_65), - 'linkword_omit_pages' => array('title'=> LWLAN_28, 'type'=>'textarea', 'data' => 'string','help'=>''), - // 'lw_max_per_word' => array('title'=> "Maximum links/tips per word", 'type'=>'number', 'data' => 'string','help'=>'If the same word is found multiple times in a piece of text.'), - 'lw_custom_class' => array('title'=> "Custom CSS Class", 'type'=>'text', 'writeParms'=>array('placeholder'=> LAN_OPTIONAL ), 'data' => 'string','help'=>'Will add this class to all generated links.'), - - ); - - - public function init() + if($this->getAction() == 'list') { - - if($this->getAction() == 'list') - { - $this->fields['linkword_word']['title'] = LWLAN_5; - } - - // Set drop-down values (if any). - $this->fields['linkword_active']['writeParms']['optArray'] = array(1=>LAN_INACTIVE, 0=>LWLAN_52, 2=>LWLAN_53, 3=>LWLAN_54); - $this->prefs['lw_context_visibility']['writeParms']['optArray'] = array('TITLE' => LWLAN_33,'SUMMARY' => LWLAN_34, 'BODY' => LWLAN_35, 'DESCRIPTION' => LWLAN_36,'USER_TITLE' => LWLAN_40, 'USER_BODY' => LWLAN_41); - - if(!empty($_POST['etrigger_save'])) - { - e107::getCache()->clear_sys(LW_CACHE_TAG); - } + $this->fields['linkword_word']['title'] = LWLAN_5; } + // Set drop-down values (if any). + $this->fields['linkword_active']['writeParms']['optArray'] = array( + 1 => LAN_INACTIVE, + 0 => LWLAN_52, + 2 => LWLAN_53, + 3 => LWLAN_54 + ); - // ------- Customize Create -------- + $this->prefs['lw_context_visibility']['writeParms']['optArray'] = array( + 'TITLE' => LWLAN_33, + 'SUMMARY' => LWLAN_34, + 'BODY' => LWLAN_35, + 'DESCRIPTION' => LWLAN_36, + 'USER_TITLE' => LWLAN_40, + 'USER_BODY' => LWLAN_41 + ); - public function beforeCreate($new_data, $old_data) - { - return $new_data; - } - - public function afterCreate($new_data, $old_data, $id) + if(!empty($_POST['etrigger_save'])) { e107::getCache()->clear_sys(LW_CACHE_TAG); - // do something } - - public function onCreateError($new_data, $old_data) - { - // do something - } - - - // ------- Customize Update -------- - - public function beforeUpdate($new_data, $old_data, $id) - { - return $new_data; - } - - public function afterUpdate($new_data, $old_data, $id) - { - e107::getCache()->clear_sys(LW_CACHE_TAG); - // do something - } - - public function onUpdateError($new_data, $old_data, $id) - { - // do something - } - - - public function afterDelete($deleted_data, $id, $deleted_check) - { - e107::getCache()->clear_sys(LW_CACHE_TAG); - - } - - - /* - // optional - a custom page. - public function customPage() - { - $ns = e107::getRender(); - $text = 'Hello World!'; - $ns->tablerender('Hello',$text); - - } - */ - } + // ------- Customize Create -------- - class linkwords_form_ui extends e_admin_form_ui + public function beforeCreate($new_data, $old_data) { + return $new_data; + } + public function afterCreate($new_data, $old_data, $id) + { + e107::getCache()->clear_sys(LW_CACHE_TAG); + // do something + } + + public function onCreateError($new_data, $old_data) + { + // do something } - new linkwords_admin(); + // ------- Customize Update -------- - require_once(e_ADMIN."auth.php"); - e107::getAdminUI()->runPage(); + public function beforeUpdate($new_data, $old_data, $id) + { + return $new_data; + } - require_once(e_ADMIN."footer.php"); - exit; + public function afterUpdate($new_data, $old_data, $id) + { + e107::getCache()->clear_sys(LW_CACHE_TAG); + // do something + } + public function onUpdateError($new_data, $old_data, $id) + { + // do something + } + + + public function afterDelete($deleted_data, $id, $deleted_check) + { + e107::getCache()->clear_sys(LW_CACHE_TAG); + + } + +} + + + +class linkwords_form_ui extends e_admin_form_ui +{ + +} + +new linkwords_admin(); + +require_once(e_ADMIN."auth.php"); +e107::getAdminUI()->runPage(); + +require_once(e_ADMIN."footer.php"); +exit; @@ -216,7 +197,7 @@ e107::lan('linkwords', true); // e_PLUGIN.'linkwords/languages/'.e_LANGUAGE.'_ad define('LW_CACHE_TAG', 'nomd5_linkwords'); - $pref = e107::getConfig()->getPref(); +$pref = e107::getConfig()->getPref(); // print_a($pref['lw_context_visibility']); @@ -226,17 +207,17 @@ $tp = e107::getParser(); $frm = e107::getForm(); $lw_context_areas = array( - 'TITLE' => LWLAN_33, - 'SUMMARY' => LWLAN_34, - 'BODY' => LWLAN_35, - 'DESCRIPTION' => LWLAN_36, - 'USER_TITLE' => LWLAN_40, - 'USER_BODY' => LWLAN_41 - // Don't do the next three - linkwords are meaningless on them + 'TITLE' => LWLAN_33, + 'SUMMARY' => LWLAN_34, + 'BODY' => LWLAN_35, + 'DESCRIPTION' => LWLAN_36, + 'USER_TITLE' => LWLAN_40, + 'USER_BODY' => LWLAN_41 + // Don't do the next three - linkwords are meaningless on them // 'olddefault' => LWLAN_37, // 'linktext' => LWLAN_38, // 'rawtext' => LWLAN_39' - ); + ); // Yes, I know its a silly order - but that's history! $lwaction_vals = array(1=>LAN_INACTIVE, 0=>LWLAN_52, 2=>LWLAN_53, 3=>LWLAN_54); @@ -244,126 +225,126 @@ $frm = e107::getForm(); // Generate dropdown for possible actions on finding a linkword function lw_act_opts($curval) { - global $lwaction_vals; - $ret = ''; - foreach ($lwaction_vals as $opt => $val) - { - $selected = ($curval == $opt ? "selected='selected'" : ''); - $ret .= "\n"; - } - return $ret; +global $lwaction_vals; +$ret = ''; +foreach ($lwaction_vals as $opt => $val) +{ +$selected = ($curval == $opt ? "selected='selected'" : ''); +$ret .= "\n"; +} +return $ret; } - + $deltest = array_flip($_POST); if(isset($deltest[LAN_DELETE])) { - $delete_id = intval(str_replace('delete_', '', $deltest[LAN_DELETE])); +$delete_id = intval(str_replace('delete_', '', $deltest[LAN_DELETE])); - if ($sql->db_Count('linkwords', '(*)', "WHERE linkword_id = ".$delete_id)) - { - $sql->db_Delete('linkwords', 'linkword_id='.$delete_id); - e107::getLog()->add('LINKWD_03','ID: '.$delete_id,''); - $e107->ecache->clear_sys(LW_CACHE_TAG); - //$message = LWLAN_19; - $mes->addSuccess(LAN_DELETED); - } +if ($sql->db_Count('linkwords', '(*)', "WHERE linkword_id = ".$delete_id)) +{ + $sql->db_Delete('linkwords', 'linkword_id='.$delete_id); + e107::getLog()->add('LINKWD_03','ID: '.$delete_id,''); + $e107->ecache->clear_sys(LW_CACHE_TAG); + //$message = LWLAN_19; + $mes->addSuccess(LAN_DELETED); +} } if(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 = intval($lw_qs[1]); +$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 = intval($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, - 'USER_TITLE' => FALSE, - 'SUMMARY' => FALSE, - 'BODY' => FALSE, - 'USER_BODY' => FALSE, - 'DESCRIPTION' => FALSE, - 'LINKTEXT' => FALSE, - 'RAWTEXT' => FALSE - ); - foreach ($_POST['lw_visibility_area'] as $can_see) +// Array of context flags +$pref['lw_context_visibility'] = array( + 'OLDDEFAULT' => FALSE, + 'TITLE' => FALSE, + 'USER_TITLE' => FALSE, + 'SUMMARY' => FALSE, + 'BODY' => FALSE, + 'USER_BODY' => FALSE, + 'DESCRIPTION' => FALSE, + 'LINKTEXT' => FALSE, + 'RAWTEXT' => FALSE + ); +foreach ($_POST['lw_visibility_area'] as $can_see) +{ + if (key_exists($can_see,$lw_context_areas)) { - if (key_exists($can_see,$lw_context_areas)) - { - $pref['lw_context_visibility'][$can_see] = TRUE; - } + $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' - $pref['lw_ajax_enable'] = isset($_POST['lw_ajax_enable']); - $pref['lw_notsamepage'] = isset($_POST['lw_notsamepage']); - save_prefs(); - $logString = implode(', ',$pref['lw_context_visibility']).'[!br!]'.$pref['lw_page_visibility'].'[!br!]'.$pref['lw_ajax_enable'].'[!br!]'.$pref['lw_notsamepage']; - e107::getCache()->clear_sys(LW_CACHE_TAG); - e107::getLog()->add('LINKWD_04',$logString,''); +} +// 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' +$pref['lw_ajax_enable'] = isset($_POST['lw_ajax_enable']); +$pref['lw_notsamepage'] = isset($_POST['lw_notsamepage']); +save_prefs(); +$logString = implode(', ',$pref['lw_context_visibility']).'[!br!]'.$pref['lw_page_visibility'].'[!br!]'.$pref['lw_ajax_enable'].'[!br!]'.$pref['lw_notsamepage']; +e107::getCache()->clear_sys(LW_CACHE_TAG); +e107::getLog()->add('LINKWD_04',$logString,''); } if (isset($_POST['submit_linkword']) || isset($_POST['update_linkword'])) { - if(!$_POST['linkwords_word'] && $_POST['linkwords_url']) - { // Key fields empty - $mes->addError(LAN_REQUIRED_BLANK); - } - else +if(!$_POST['linkwords_word'] && $_POST['linkwords_url']) +{ // Key fields empty + $mes->addError(LAN_REQUIRED_BLANK); +} +else +{ + $data['linkword_word'] = $tp->toDB($_POST['linkword_word']); + $data['linkword_link'] = $tp->toDB($_POST['linkword_link']); + $data['linkword_tooltip'] = $tp->toDB($_POST['linkword_tooltip']); + $data['linkword_tip_id'] = intval($_POST['linkword_tip_id']); + $data['linkword_active'] = intval($_POST['linkword_active']); + $data['linkword_newwindow'] = isset($_POST['linkword_newwindow']) ? 1 : 0; + + $logString = implode('[!br!]',$data); + if (isset($_POST['submit_linkword'])) { - $data['linkword_word'] = $tp->toDB($_POST['linkword_word']); - $data['linkword_link'] = $tp->toDB($_POST['linkword_link']); - $data['linkword_tooltip'] = $tp->toDB($_POST['linkword_tooltip']); - $data['linkword_tip_id'] = intval($_POST['linkword_tip_id']); - $data['linkword_active'] = intval($_POST['linkword_active']); - $data['linkword_newwindow'] = isset($_POST['linkword_newwindow']) ? 1 : 0; - - $logString = implode('[!br!]',$data); - if (isset($_POST['submit_linkword'])) + if ($sql->db_Insert('linkwords', $data)) { - if ($sql->db_Insert('linkwords', $data)) - { - e107::getLog()->add('LINKWD_01',$logString,''); - $mes->addSuccess(LAN_CREATED); - } - else - { - //$message = LWLAN_57; - $mes->addError(LAN_CREATED_FAILED); - } + e107::getLog()->add('LINKWD_01',$logString,''); + $mes->addSuccess(LAN_CREATED); } - elseif (isset($_POST['update_linkword'])) + else { - $id = intval(varset($_POST['lw_edit_id'],0)); - if (($id > 0) && $sql->db_UpdateArray('linkwords', $data, ' WHERE `linkword_id`='.$id)) - { - $mes->addSuccess(LAN_UPDATED); - $logString = 'ID: '.$id.'[!br!]'.$logString; - e107::getLog()->add('LINKWD_02',$logString,''); - } - else - { - $mes->addError(LAN_UPDATED_FAILED); - } + //$message = LWLAN_57; + $mes->addError(LAN_CREATED_FAILED); } - - e107::getCache()->clear_sys(LW_CACHE_TAG); } + elseif (isset($_POST['update_linkword'])) + { + $id = intval(varset($_POST['lw_edit_id'],0)); + if (($id > 0) && $sql->db_UpdateArray('linkwords', $data, ' WHERE `linkword_id`='.$id)) + { + $mes->addSuccess(LAN_UPDATED); + $logString = 'ID: '.$id.'[!br!]'.$logString; + e107::getLog()->add('LINKWD_02',$logString,''); + } + else + { + $mes->addError(LAN_UPDATED_FAILED); + } + } + + e107::getCache()->clear_sys(LW_CACHE_TAG); +} } $ns->tablerender($caption, $mes->render() . $text); @@ -372,69 +353,69 @@ $ns->tablerender($caption, $mes->render() . $text); $chkNewWindow = " checked='checked'"; // Open links in new window by default if($action == "edit") { - if($sql -> db_Select("linkwords", "*", "linkword_id=".$id)) - { - $row = $sql -> db_Fetch(); - extract($row); - $chkNewWindow = $row['linkword_newwindow'] ? " checked='checked'" : ''; // Open links in new window by default - define("LW_EDIT", TRUE); - } +if($sql -> db_Select("linkwords", "*", "linkword_id=".$id)) +{ +$row = $sql -> db_Fetch(); +extract($row); +$chkNewWindow = $row['linkword_newwindow'] ? " checked='checked'" : ''; // Open links in new window by default +define("LW_EDIT", TRUE); +} } else { - $linkword_word = ''; - $linkword_link = ''; - $linkword_active = ''; - $linkword_tooltip = ''; - $linkword_tip_id = ''; +$linkword_word = ''; +$linkword_link = ''; +$linkword_active = ''; +$linkword_tooltip = ''; +$linkword_tip_id = ''; } if (($action == 'words') || ($action == 'edit')) { - + $text = "
- - - - ++ + + - + - - + + - - + + - - + + - - + +
".LWLAN_21." - - + +
".LWLAN_6." -
- ".LWLAN_55." - 		".LWLAN_6." +
+ ".LWLAN_55." +
".LWLAN_50." - - ".LWLAN_50." + +
".LWLAN_62." - ".LWLAN_63." - ".LWLAN_62." + ".LWLAN_63." +
".LWLAN_22." - - ".LWLAN_22." + +
@@ -451,114 +432,114 @@ if (($action == 'words') || ($action == 'edit')) { - $text = "
\n"; - if(!$sql -> db_Select("linkwords")) - { - //$text .= LWLAN_4; - $mes->addInfo(LWLAN_4); - } - else - { - $text = " - - - - - - - - - - - +$text = "
\n"; +if(!$sql -> db_Select("linkwords")) +{ +//$text .= LWLAN_4; +$mes->addInfo(LWLAN_4); +} +else +{ +$text = " +
+ + + + + + + + + + + + + + + + + + + +\n"; + +while($row = $sql->db_Fetch()) +{ + $text .= " - - - - - - - - - \n"; + + + + + + + + + + "; +} +$text .= "
".LAN_ID."".LWLAN_5."".LWLAN_6."".LWLAN_56."".LWLAN_50."".LWLAN_60."".LWLAN_7."".LAN_OPTIONS."
".LAN_ID."".LWLAN_5."".LWLAN_6."".LWLAN_56."".LWLAN_50."".LWLAN_60."".LWLAN_7."".LAN_OPTIONS."
{$row['linkword_id']}{$row['linkword_word']}{$row['linkword_link']}".($row['linkword_newwindow'] ? LAN_YES : LAN_NO)."{$row['linkword_tooltip']}".($row['linkword_tip_id'] > 0 ? $row['linkword_tip_id'] : '')."".$lwaction_vals[$row['linkword_active']]." + +
+ + +
+ \n +
"; +} - while($row = $sql->db_Fetch()) - { - $text .= " - - {$row['linkword_id']} - {$row['linkword_word']} - {$row['linkword_link']} - ".($row['linkword_newwindow'] ? LAN_YES : LAN_NO)." - {$row['linkword_tooltip']} - ".($row['linkword_tip_id'] > 0 ? $row['linkword_tip_id'] : '')." - ".$lwaction_vals[$row['linkword_active']]." - -
-
- - -
-
\n - - - "; - } - $text .= ""; - } - - $ns->tablerender(LWLAN_11, $mes->render() . $text); +$ns->tablerender(LWLAN_11, $mes->render() . $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); - $AjaxEnable = varset($pref['lw_ajax_enable'],0); - $text = " -
-
- - - - - - - - +$menu_pages = substr($pref['lw_page_visibility'],2); // Knock off the 'show/hide' flag +$menu_pages = str_replace("|", "\n", $menu_pages); +$AjaxEnable = varset($pref['lw_ajax_enable'],0); +$text = " +
+ +
".LWLAN_26.""; - foreach ($lw_context_areas as $lw_key=>$lw_desc) - { - $checked = $pref['lw_context_visibility'][$lw_key] ? "checked='checked'" : ''; - $text .= " {$lw_desc}
"; - } - $text .= "".LWLAN_27."
+++ + + + + - - - - "; + + + +"; - $checked = varset($pref['lw_ajax_enable'],0) ? 'checked=checked' : ''; - $text .= " - - - - "; +$checked = varset($pref['lw_ajax_enable'],0) ? 'checked=checked' : ''; +$text .= " + + + +"; - $checked = varset($pref['lw_notsamepage'],0) ? 'checked=checked' : ''; - $text .= " - - - - +$checked = varset($pref['lw_notsamepage'],0) ? 'checked=checked' : ''; +$text .= " + + + +
".LWLAN_26.""; +foreach ($lw_context_areas as $lw_key=>$lw_desc) +{ +$checked = $pref['lw_context_visibility'][$lw_key] ? "checked='checked'" : ''; +$text .= " {$lw_desc}
"; +} +$text .= "".LWLAN_27."
".LWLAN_28."".LWLAN_29." -
".LWLAN_28."".LWLAN_29." +
".LWLAN_59."
".LWLAN_59."
".LWLAN_64."".LWLAN_65."
".LWLAN_64."".LWLAN_65."
- ".$frm->admin_button('saveopts_linkword','no-value','submit', LAN_UPDATE)." +".$frm->admin_button('saveopts_linkword','no-value','submit', LAN_UPDATE)."
\n"; @@ -570,25 +551,25 @@ $ns -> tablerender(LAN_OPTIONS, $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'] = LAN_OPTIONS; - $var['options']['link'] ="admin_config.php?options"; - - show_admin_menu(LWLAN_23, $action, $var); +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'] = LAN_OPTIONS; +$var['options']['link'] ="admin_config.php?options"; + +show_admin_menu(LWLAN_23, $action, $var); } - + require_once(e_ADMIN."footer.php"); */ ?> \ No newline at end of file diff --git a/e107_plugins/linkwords/e_header.php b/e107_plugins/linkwords/e_header.php index 0ab15b985..a92655e4d 100644 --- a/e107_plugins/linkwords/e_header.php +++ b/e107_plugins/linkwords/e_header.php @@ -1,9 +1,6 @@ lw_enabled = true; } - - public function setWordData($arr = array()) { foreach($arr as $val) @@ -73,7 +60,6 @@ class e_tohtml_linkwords } } - public function setAreaOpts($arr = array()) { $this->area_opts = $arr; @@ -89,12 +75,9 @@ class e_tohtml_linkwords /* constructor */ function __construct() { - - - - $tp = e107::getParser(); - $pref = e107::pref('core'); - $frm = e107::getForm(); + $tp = e107::getParser(); + $pref = e107::pref('core'); + $frm = e107::getForm(); // $this->maxPerWord = vartrue($pref['lw_max_per_word'], 25); $this->customClass = vartrue($pref['lw_custom_class'],''); @@ -243,14 +226,13 @@ class e_tohtml_linkwords $this->area_opts = array(); } - if (!$this->lw_enabled || empty($this->area_opts) || !array_key_exists($area,$this->area_opts) || !$this->area_opts[$area]) { - // e107::getDebug()->log("Link words skipped on ".substr($text, 0, 50)); + // e107::getDebug()->log("Link words skipped on ".substr($text, 0, 50)); return $text; // No linkwords in disabled areas } -// Split up by HTML tags and process the odd bits here + // Split up by HTML tags and process the odd bits here $ptext = ""; $lflag = FALSE; @@ -274,9 +256,10 @@ class e_tohtml_linkwords else { if (trim($cont)) - { // Some non-white space - worth word matching + { + // Some non-white space - worth word matching $ptext .= $this->linksproc($cont,0,count($this->word_list)); -// echo "Check linkwords: ".count($this->word_list).'
'; + // echo "Check linkwords: ".count($this->word_list).'
'; } else { @@ -304,7 +287,7 @@ class e_tohtml_linkwords $doSamePage = !e107::getPref('lw_notsamepage'); // Consider next line - stripos is PHP5, and mb_stripos is PHP >= 5.2 - so may well often require handling -// while (($first < $limit) && (stripos($text,$this->word_list[$first]) === FALSE)) { $first++; }; // *utf (stripos is PHP5 - compatibility handler implements) + // while (($first < $limit) && (stripos($text,$this->word_list[$first]) === FALSE)) { $first++; }; // *utf (stripos is PHP5 - compatibility handler implements) @@ -327,13 +310,11 @@ class e_tohtml_linkwords $ret = ''; $linkwd = ''; $linkrel = array(); -// $linkwd = "href='#' "; // Not relevant for Prototype, but needed with 'pure' JS to make tooltip stuff work - doesn't find link elements without href + // $linkwd = "href='#' "; // Not relevant for Prototype, but needed with 'pure' JS to make tooltip stuff work - doesn't find link elements without href $lwClass = array(); $lw = $this->word_list[$first]; // This is the word we're matching - in lower case in our 'master' list $tooltip = ''; - - if ($this->tip_list[$first]) { // Got tooltip if ($this->lwAjaxEnabled) @@ -365,8 +346,9 @@ class e_tohtml_linkwords if (!count($lwClass)) { - // return $this->linksproc($sl,$first+1,$limit); // Nothing to do - move on to next word (shouldn't really get here) + // return $this->linksproc($sl,$first+1,$limit); // Nothing to do - move on to next word (shouldn't really get here) } + if (count($linkrel)) { $linkwd .= " rel='".implode(' ',$linkrel)."'"; @@ -374,7 +356,7 @@ class e_tohtml_linkwords // This splits the text into blocks, some of which will precisely contain a linkword $split_line = preg_split('#\b('.$lw.')(\s|\b)#i'.$this->utfMode, $text, -1, PREG_SPLIT_NO_EMPTY | PREG_SPLIT_DELIM_CAPTURE ); // *utf (selected) - // $class = "".implode(' ',$lwClass)."' "; + // $class = "".implode(' ',$lwClass)."' "; $class = implode(' ',$lwClass); $hash = md5($lw); @@ -386,10 +368,8 @@ class e_tohtml_linkwords foreach ($split_line as $count=>$sl) { - if ($tp->ustrtolower($sl) == $lw && $this->wordCount[$hash] < (int) $this->word_limit[$first]) // Do linkword replace // We know the linkword is already lower case // *utf { - $this->wordCount[$hash]++; $classCount = " lw-".$this->wordCount[$hash]; @@ -417,7 +397,4 @@ class e_tohtml_linkwords } } - - - ?> \ No newline at end of file diff --git a/e107_plugins/linkwords/languages/English_admin.php b/e107_plugins/linkwords/languages/English_admin.php index 8fba2efc9..f7864507e 100644 --- a/e107_plugins/linkwords/languages/English_admin.php +++ b/e107_plugins/linkwords/languages/English_admin.php @@ -8,7 +8,6 @@ * * Linkwords plugin - language file (only needed for admin) * - * $Id* */ //define("LWLAN_1", "Field(s) left blank."); @@ -55,7 +54,6 @@ define("LWLAN_41", "User-entered body text (e.g. forum)"); // Reserve numbers for further context strings - define("LWLAN_50", "Tooltip"); define("LWLAN_51", "Inactive"); define("LWLAN_52", "Linkword only"); @@ -74,14 +72,6 @@ define("LWLAN_64", "Suppress link on current page"); define("LWLAN_65", "When checked, suppresses clickable link if points to current page"); -// Installation-related -//define("LWLANINS_1", "Linkwords"); -//define("LWLANINS_2", "This plugin links specified words with a defined link and/or tooltip"); -//define("LWLANINS_3", "Configure LinkWords"); -//define("LWLANINS_4", "To configure please click on the link in the plugins section of the admin front page"); -//define("LWLANINS_5", "Upgrade complete"); - - // Help text define("LAN_LW_HELP_00","Linkwords Help"); define("LAN_LW_HELP_01"," @@ -107,10 +97,4 @@ define("LAN_LW_HELP_02","Define the words which become clickable links, or which This defines an optional numeric ID to be used with Ajax processing. If blank, the database record number is used.

Activate?
Defines which options are active. - "); - - - - - -?> \ No newline at end of file + "); \ No newline at end of file diff --git a/e107_plugins/linkwords/languages/English_global.php b/e107_plugins/linkwords/languages/English_global.php index f80fb6f3c..8d3d262a5 100644 --- a/e107_plugins/linkwords/languages/English_global.php +++ b/e107_plugins/linkwords/languages/English_global.php @@ -3,4 +3,4 @@ define("LAN_PLUGIN_LINKWORDS_NAME", "Linkwords"); define("LAN_PLUGIN_LINKWORDS_DESCRIPTION", "This plugin will link specified words with a defined link and/or tooltip."); -?> +?> \ No newline at end of file diff --git a/e107_plugins/linkwords/languages/English_log.php b/e107_plugins/linkwords/languages/English_log.php index 2d665d562..bcb325231 100644 --- a/e107_plugins/linkwords/languages/English_log.php +++ b/e107_plugins/linkwords/languages/English_log.php @@ -1,6 +1,5 @@ \ No newline at end of file diff --git a/e107_plugins/linkwords/linkwords.php b/e107_plugins/linkwords/linkwords.php index ac4fabddb..3f8f43f5c 100644 --- a/e107_plugins/linkwords/linkwords.php +++ b/e107_plugins/linkwords/linkwords.php @@ -6,25 +6,11 @@ * Released under the terms and conditions of the * GNU General Public License (http://www.gnu.org/licenses/gpl.txt) * - * - * - * $Source: /cvs_backup/e107_0.8/e107_plugins/linkwords/linkwords.php,v $ - * $Revision$ - * $Date$ - * $Author$ */ -/* -| -| This is just a stub so that systems migrated from 0.7 don't crash -| It auto-updates the prefs so that the newer routine is called in future. -| -+----------------------------------------------------------------------------+ -*/ if (!defined('e107_INIT')) { exit; } // if (!e107::isInstalled('linkwords')) exit; // This will break a site completely under some circumstance. - class e_linkwords { function e_linkwords() @@ -33,13 +19,15 @@ class e_linkwords /* constructor */ // Do an auto-update on the variable used to hook parsers - so we should only be called once - e107::lan('linkwords',e_LANGUAGE); // e_PLUGIN."linkwords/languages/".e_LANGUAGE.".php" + e107::lan('linkwords', e_LANGUAGE); // e_PLUGIN."linkwords/languages/".e_LANGUAGE.".php" - $hooks = explode(",",$pref['tohtml_hook']); - if (($key=array_search('linkwords',$hooks)) !== FALSE) + $hooks = explode(",", $pref['tohtml_hook']); + + if(($key=array_search('linkwords',$hooks)) !== FALSE) { unset($hooks[$key]); } + if (count($hooks) == 0) { unset($pref['tohtml_hook']); @@ -48,14 +36,17 @@ class e_linkwords { $pref['tohtml_hook'] = implode(',',$hooks); } + if (!isset($pref['e_tohtml_list'])) { $pref['e_tohtml_list'] = array(); } + if (!in_array('linkwords',$pref['e_tohtml_list'])) { $pref['e_tohtml_list'][] = 'linkwords'; } + save_prefs(); e107::getLog()->add('LINKWD_05',LWLAN_58.'[!br!]'.$pref['tohtml_hook'],''); // Log that the update was done return;