Skip to content

Commit

Permalink
Issue #90 - Linkwords plugin (also #6 and GUI styling)
Browse files Browse the repository at this point in the history
  • Loading branch information
@Moc
Moc committed Feb 6, 2013
1 parent c923ed8 commit da62465
Show file tree
Hide file tree
Showing 3 changed files with 46 additions and 40 deletions.
1 change: 1 addition & 0 deletions e107_languages/English/admin/lan_admin.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -236,6 +236,7 @@
define("LAN_DELETED_FAILED","Deletion Unsuccessful");
define("LAN_UPDATED_FAILED","Update Unsuccessful");
define("LAN_NO_CHANGE","Nothing updated as no changes were made.");
define("LAN_REQUIRED_BLANK", "Required field(s) left blank.");
define("LAN_TRY_AGAIN","Please try again.");
define("LAN_NEVER", "Never");
define("LAN_PRUNE", "Prune");
Expand Down
55 changes: 30 additions & 25 deletions e107_plugins/linkwords/admin_config.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,11 @@
include_lan(e_PLUGIN.'linkwords/languages/'.e_LANGUAGE.'_admin_linkwords.php');
define('LW_CACHE_TAG', 'nomd5_linkwords');

require_once(e_HANDLER.'message_handler.php');
$mes = e107::getMessage();

$tp = e107::getParser();

$lw_context_areas = array(
'TITLE' => LWLAN_33,
'SUMMARY' => LWLAN_34,
Expand Down Expand Up @@ -54,16 +59,17 @@ function lw_act_opts($curval)

$deltest = array_flip($_POST);

if(isset($deltest[LWLAN_17]))
if(isset($deltest[LAN_DELETE]))
{
$delete_id = intval(str_replace('delete_', '', $deltest[LWLAN_17]));
$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);
$admin_log->log_event('LINKWD_03','ID: '.$delete_id,'');
$e107->ecache->clear_sys(LW_CACHE_TAG);
$message = LWLAN_19;
//$message = LWLAN_19;
$mes->addSuccess(LAN_DELETED);
}
}

Expand Down Expand Up @@ -116,55 +122,54 @@ function lw_act_opts($curval)

if (isset($_POST['submit_linkword']) || isset($_POST['update_linkword']))
{
if(!$_POST['linkwords_word'] && $_POST['linkwords_url'])
if(!$_POST['linkwords_word'] && $_POST['linkwords_url']) // TODO FIX check is not functional
{ // Key fields empty
$message = LWLAN_1;
$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_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))
{
$message = LWLAN_2; // TODO FIX $emessage style
$admin_log->log_event('LINKWD_01',$logString,'');
$mes->addSuccess(LAN_CREATED);
}
else
{
$message = LWLAN_57;
//$message = LWLAN_57;
$mes->addError(LAN_CREATED_FAILED);
}
}
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))
if (($id > 0) && $sql->db_UpdateArray('linkwords', $data, ' WHERE `linkword_id`='.$id))
{
$message = LWLAN_3; // TODO FIX $emessage style
//$message = LWLAN_3;
$mes->addSuccess(LAN_UPDATED);
$logString = 'ID: '.$id.'[!br!]'.$logString;
$admin_log->log_event('LINKWD_02',$logString,'');
}
else
{
$message = LWLAN_57;
//$message = LWLAN_57;
$mes->addError(LAN_UPDATED_FAILED);
}
}
$e107->ecache->clear_sys(LW_CACHE_TAG);
}
}


if (isset($message))
{
$ns->tablerender("", "<div style='text-align:center'><b>".$message."</b></div>");
}
$ns->tablerender($caption, $mes->render() . $text);


$chkNewWindow = " checked='checked'"; // Open links in new window by default
Expand Down Expand Up @@ -271,17 +276,17 @@ function lw_act_opts($curval)
<col style='width: 15%; vertical-align:top; text-align: center;' />
</colgroup>
<tr>
<td>".LWLAN_61."</td>
<td>".LAN_ID."</td>
<td>".LWLAN_5."</td>
<td>".LWLAN_6."</td>
<td>".LWLAN_56."</td>
<td>".LWLAN_50."</td>
<td>".LWLAN_60."</td>
<td>".LWLAN_7."</td>
<td>".LWLAN_8."</td>
<td>".LAN_OPTIONS."</td>
</tr>\n";

while($row = $sql -> db_Fetch())
while($row = $sql->db_Fetch())
{
$text .= "
<tr>
Expand All @@ -306,7 +311,7 @@ function lw_act_opts($curval)
$text .= "</table>";
}

$ns -> tablerender(LWLAN_11, $text);
$ns->tablerender(LWLAN_11, $mes->render() . $text);
}


Expand Down Expand Up @@ -362,7 +367,7 @@ function lw_act_opts($curval)
</form>
</div>\n";

$ns -> tablerender(LWLAN_32, $text);
$ns -> tablerender(LAN_OPTIONS, $text);
}


Expand All @@ -381,7 +386,7 @@ function admin_config_adminmenu() // TODO FIX v2 style
$var['words']['text'] = LWLAN_24;
$var['words']['link'] = "admin_config.php";

$var['options']['text'] = LWLAN_25;
$var['options']['text'] = LAN_OPTIONS;
$var['options']['link'] ="admin_config.php?options";

show_admin_menu(LWLAN_23, $action, $var);
Expand Down
30 changes: 15 additions & 15 deletions e107_plugins/linkwords/languages/English_admin_linkwords.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,38 +11,38 @@
* $Id*
*/

define("LWLAN_1", "Field(s) left blank.");
define("LWLAN_2", "Link word saved.");
define("LWLAN_3", "Link word updated.");
//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", "Words");
define("LWLAN_6", "Link");
define("LWLAN_7", "Active?");
define("LWLAN_8", "Options");
define("LWLAN_9", "yes");
define("LWLAN_10", "no");
//define("LWLAN_8", "Options");
//define("LWLAN_9", "yes");
//define("LWLAN_10", "no");
define("LWLAN_11", "Existing Linkwords");
define("LWLAN_12", "Yes");
define("LWLAN_13", "No");
define("LWLAN_14", "Submit LinkWord");
define("LWLAN_15", "Update LinkWord");
//define("LWLAN_12", "Yes");
//define("LWLAN_13", "No");
//define("LWLAN_14", "Submit LinkWord");
//define("LWLAN_15", "Update LinkWord");
//define("LWLAN_16", "Edit");
//define("LWLAN_17", "Delete");
define("LWLAN_18", "Are you sure you want to delete this linkword?");
define("LWLAN_19", "Linkword deleted.");
//define("LWLAN_19", "Linkword deleted.");
define("LWLAN_20", "Unable to find that linkword entry.");
define("LWLAN_21", "Word to autolink (or comma-separated list of words)");
define("LWLAN_22", "Activate?");
define("LWLAN_23", "Linkwords Administration");
define("LWLAN_24", "Manage Words");
define("LWLAN_25", "Options");
//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("LWLAN_32", "Linkword Options");
define("LWLAN_33", 'Title areas');
define("LWLAN_34", 'Item summaries');
define("LWLAN_35", 'Body text');
Expand Down Expand Up @@ -70,11 +70,11 @@
define('LWLAN_54', 'Linkword and Tooltip');
define('LWLAN_55', 'Open link in new window');
define('LWLAN_56', 'Open in new page');
define('LWLAN_57', 'Error writing new values');
//define('LWLAN_57', 'Error writing new values');
define('LWLAN_58', 'Pref hook converted to 0.8 format'); // Used in 0.7-compatible stub only
define('LWLAN_59', 'Enable Ajax functionality');
define('LWLAN_60', 'LW ID');
define('LWLAN_61', 'ID');
//define('LWLAN_61', 'ID');
define('LWLAN_62', 'Tooltip ID (LW ID)');
define('LWLAN_63', 'Positive integers only');
define('LWLAN_64', 'Suppress link on current page');
Expand Down

0 comments on commit da62465

Please sign in to comment.