mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-07-31 03:40:37 +02:00
Code Issues Releases Wiki Activity

Poll Plugin - Minor GUI changes (#90). More LAN work needed

Browse Source
This commit is contained in:
Tijn Kuyper
2013-02-08 15:40:03 +01:00
parent 44dba93c1a
commit d6825155ea
3 changed files with 44 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
e107_plugins/poll/admin_config.php
View File

@@ -2,16 +2,12 @@
/* /*
* e107 website system * e107 website system
* *
* Copyright (C) 2008-2009 e107 Inc (e107.org) * Copyright (C) 2008-2013 e107 Inc (e107.org)
* Released under the terms and conditions of the * Released under the terms and conditions of the
* GNU General Public License (http://www.gnu.org/licenses/gpl.txt) * GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
* *
* * $URL$
* * $Id$
* $Source: /cvs_backup/e107_0.8/e107_plugins/poll/admin_config.php,v $
* $Revision$
* $Date$
* $Author$
*/ */
require_once("../../class2.php"); require_once("../../class2.php");
@@ -27,6 +23,7 @@ include_lan(e_PLUGIN.'poll/languages/'.e_LANGUAGE.'_admin_poll.php');
require_once(e_ADMIN."auth.php"); require_once(e_ADMIN."auth.php");
require_once(e_PLUGIN."poll/poll_class.php"); require_once(e_PLUGIN."poll/poll_class.php");
require_once(e_HANDLER."form_handler.php"); require_once(e_HANDLER."form_handler.php");
require_once(e_HANDLER."message_handler.php");
require_once(e_HANDLER."userclass_class.php"); require_once(e_HANDLER."userclass_class.php");
if(isset($_POST)) if(isset($_POST))
@@ -36,6 +33,8 @@ if(isset($_POST))
$rs = new form; $rs = new form;
$poll = new poll; $poll = new poll;
$frm = e107::getForm();
$mes = e107::getMessage();
if (isset($_POST['reset'])) if (isset($_POST['reset']))
{ {
@@ -43,12 +42,13 @@ if (isset($_POST['reset']))
define("RESET", TRUE); define("RESET", TRUE);
} }
//$emessage = eMessage::getInstance();
$emessage = eMessage::getInstance();
if (varset($_POST['delete'])) if (varset($_POST['delete']))
{ {
$message = $poll->delete_poll(key($_POST['delete'])); //$message = $poll->delete_poll(key($_POST['delete']));
$poll->delete_poll(key($_POST['delete'])); // TODO check security?
$mes->addSuccess(LAN_DELETED);
unset($poll_id, $_POST['poll_title'], $_POST['poll_option'], $_POST['activate']); unset($poll_id, $_POST['poll_title'], $_POST['poll_option'], $_POST['activate']);
$_GET['mode']='list'; $_GET['mode']='list';
} }
@@ -59,12 +59,15 @@ if (isset($_POST['submit']))
if($_POST['poll_title']) if($_POST['poll_title'])
{ {
define("POLLID",$_POST['poll_id']); define("POLLID",$_POST['poll_id']);
$emessage->add($poll -> submit_poll(), E_MESSAGE_SUCCESS); //$emessage->add($poll -> submit_poll(), E_MESSAGE_SUCCESS);
$poll -> submit_poll();
$mes->addSuccess(LAN_CREATED);
unset($_POST['poll_title'], $_POST['poll_option'], $_POST['activate'], $_POST['poll_comment']); unset($_POST['poll_title'], $_POST['poll_option'], $_POST['activate'], $_POST['poll_comment']);
} }
else else
{ {
$emessage->add(POLLAN_46, E_MESSAGE_SUCCESS); //$emessage->add(POLLAN_46, E_MESSAGE_SUCCESS);
$mes->addError(LAN_REQUIRED_BLANK);
} }
$_GET['mode']='list'; $_GET['mode']='list';
@@ -88,16 +91,17 @@ if (varset($_POST['edit']) || varset($_GET['mode'])=='create' && !varset($_POST[
$poll_total = $sql->db_Select("polls"); $poll_total = $sql->db_Select("polls");
$text = $poll -> renderPollForm(); $text = $poll -> renderPollForm();
$ns->tablerender(POLLAN_MENU_CAPTION." :: ".POLLAN_2, $text); $ns->tablerender(POLLAN_MENU_CAPTION." - ".POLLAN_2, $mes->render() . $text);
} }
/*
if (isset($message)) if (isset($message))
{ {
$emessage->add($message, E_MESSAGE_SUCCESS); $emessage->add($message, E_MESSAGE_SUCCESS);
} }
*/
if(!varset($_POST['edit']) && ($_GET['mode']=="list" || !$_GET['mode'])) if(!varset($_POST['edit']) && ($_GET['mode']=="list" || !$_GET['mode']))
{ {
@@ -159,8 +163,8 @@ function poll_list()
$sql = e107::getDb(); $sql = e107::getDb();
$ns = e107::getRender(); $ns = e107::getRender();
$tp = e107::getParser(); $tp = e107::getParser();
$frm = new e_form(true); $frm = e107::getForm();
$mes = e107::getMessage();
global $user_pref; global $user_pref;
if(isset($_POST['etrigger_ecolumns'])) //TODO User if(isset($_POST['etrigger_ecolumns'])) //TODO User
@@ -173,7 +177,7 @@ function poll_list()
//TODO Add more column options. //TODO Add more column options.
$fields = array( $fields = array(
'poll_id' => array('title'=> ID, 'width'=>'5%', 'forced'=> TRUE), 'poll_id' => array('title'=> LAN_ID, 'width'=>'5%', 'forced'=> TRUE),
'poll_title' => array('title'=> POLLAN_3, 'width'=>'auto'), 'poll_title' => array('title'=> POLLAN_3, 'width'=>'auto'),
'poll_options' => array('title'=> POLLAN_4, 'type' => 'text', 'width' => 'auto', 'thclass' => 'center' ), // No real vetting 'poll_options' => array('title'=> POLLAN_4, 'type' => 'text', 'width' => 'auto', 'thclass' => 'center' ), // No real vetting
// 'poll_start_datestamp' => array('title'=> LAN_AUTHOR, 'type' => 'text', 'width' => 'auto', 'thclass' => 'left first'), // Display name // 'poll_start_datestamp' => array('title'=> LAN_AUTHOR, 'type' => 'text', 'width' => 'auto', 'thclass' => 'left first'), // Display name
@@ -189,7 +193,7 @@ function poll_list()
$text = "<div style='text-align:center'><div> $text = "
<form action='".e_SELF."' method='post' id='del_poll'>"; <form action='".e_SELF."' method='post' id='del_poll'>";
if ($poll_total = $sql->db_Select("polls", "*", "poll_type=1")) if ($poll_total = $sql->db_Select("polls", "*", "poll_type=1"))
@@ -201,9 +205,10 @@ function poll_list()
while ($row = $sql->db_Fetch()) while ($row = $sql->db_Fetch())
{ {
extract($row); extract($row); // FIXME
$text .= "<tr> $text .= "
<tr>
<td>$poll_id</td>"; <td>$poll_id</td>";
$text .= (in_array("poll_title",$fieldpref)) ? "<td class='left'>".$tp -> toHTML($poll_title, TRUE,"no_hook, emotes_off, defs")."</td>" : ""; $text .= (in_array("poll_title",$fieldpref)) ? "<td class='left'>".$tp -> toHTML($poll_title, TRUE,"no_hook, emotes_off, defs")."</td>" : "";
$text .= (in_array("poll_options",$fieldpref)) ? "<td class='left'>".(str_replace(chr(1),"<br />",$poll_options))."</td>" : ""; $text .= (in_array("poll_options",$fieldpref)) ? "<td class='left'>".(str_replace(chr(1),"<br />",$poll_options))."</td>" : "";
@@ -215,19 +220,20 @@ function poll_list()
<input type='image' name='edit[{$poll_id}]' value='edit' src='".ADMIN_EDIT_ICON_PATH."' alt='".LAN_EDIT."' title='".LAN_EDIT."' style='border:0px' /> <input type='image' name='edit[{$poll_id}]' value='edit' src='".ADMIN_EDIT_ICON_PATH."' alt='".LAN_EDIT."' title='".LAN_EDIT."' style='border:0px' />
<input type='image' name='delete[$poll_id]' value='del' onclick=\"return jsconfirm('".$tp->toJS(LAN_CONFIRMDEL." [".$poll_id."]")."') \" src='".ADMIN_DELETE_ICON_PATH."' alt='".LAN_DELETE."' title='".LAN_DELETE."' style='border:0px' /> <input type='image' name='delete[$poll_id]' value='del' onclick=\"return jsconfirm('".$tp->toJS(LAN_CONFIRMDEL." [".$poll_id."]")."') \" src='".ADMIN_DELETE_ICON_PATH."' alt='".LAN_DELETE."' title='".LAN_DELETE."' style='border:0px' />
</td> </td>
</tr>"; </tr>";
} }
$text .= "</tbody></table>"; $text .= "</tbody></table>";
} }
else else
{ {
$text .= "<div style='text-align:center'>".POLLAN_7."</div>"; //$text .= "<div style='text-align:center'>".POLLAN_7."</div>";
$mes->addInfo(POLLAN_7);
} }
$text .= "</form></div></div>"; $text .= "</form>";
$emessage = eMessage::getInstance(); //$emessage = eMessage::getInstance();
$ns->tablerender(POLLAN_MENU_CAPTION." :: ".POLLAN_1,$emessage->render(). $text); $ns->tablerender(POLLAN_MENU_CAPTION." - ".POLLAN_1, $mes->render(). $text);
} }

14
e107_plugins/poll/languages/English_admin_poll.php
View File

@@ -2,16 +2,12 @@
/* /*
* e107 website system * e107 website system
* *
* Copyright (C) 2008-2009 e107 Inc (e107.org) * Copyright (C) 2008-2013 e107 Inc (e107.org)
* Released under the terms and conditions of the * Released under the terms and conditions of the
* GNU General Public License (http://www.gnu.org/licenses/gpl.txt) * GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
* *
* * $URL$
* * $Id$
* $Source: /cvs_backup/e107_0.8/e107_plugins/poll/languages/English_admin_poll.php,v $
* $Revision$
* $Date$
* $Author$
*/ */
//define("POLL_ADLAN01", "Poll"); //define("POLL_ADLAN01", "Poll");
@@ -22,7 +18,7 @@ define("POLL_ADLAN04", "The poll plugin has been successfully installed. To add
define("POLL_ADLAN05", "Main Poll: "); define("POLL_ADLAN05", "Main Poll: ");
define("POLL_ADLAN06", "Forum Thread: "); define("POLL_ADLAN06", "Forum Thread: ");
define("POLL_ADLAN07", "Type"); define("POLL_ADLAN07", "Type");
define("POLL_ADLAN08", "Poll deleted"); //define("POLL_ADLAN08", "Poll deleted");
define("POLLAN_MENU_CAPTION", "Poll"); define("POLLAN_MENU_CAPTION", "Poll");
@@ -73,7 +69,7 @@ define("POLLAN_43", "You do not have the required permissions to vote in this po
define("POLLAN_44", "Delete this poll?"); define("POLLAN_44", "Delete this poll?");
*/ */
define("POLLAN_46", "Field(s) left blank"); //define("POLLAN_46", "Field(s) left blank");
// Log messages // Log messages
define('LAN_AL_POLL_01','Poll deleted'); define('LAN_AL_POLL_01','Poll deleted');

20
e107_plugins/poll/poll_class.php
View File

@@ -2,16 +2,12 @@
/* /*
* e107 website system * e107 website system
* *
* Copyright (C) 2008-2009 e107 Inc (e107.org) * Copyright (C) 2008-2013 e107 Inc (e107.org)
* Released under the terms and conditions of the * Released under the terms and conditions of the
* GNU General Public License (http://www.gnu.org/licenses/gpl.txt) * GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
* *
* * $URL$
* * $Id$
* $Source: /cvs_backup/e107_0.8/e107_plugins/poll/poll_class.php,v $
* $Revision$
* $Date$
* $Author$
*/ */
if (!defined('e107_INIT')) { exit; } if (!defined('e107_INIT')) { exit; }
@@ -67,8 +63,8 @@ class poll
{ {
admin_purge_related("poll", $existing); admin_purge_related("poll", $existing);
} }
$admin_log->log_event('POLL_01',POLL_ADLAN08.': '.$existing,''); $admin_log->log_event('POLL_01',LAN_AL_POLL_01.': '.$existing,'');
return POLL_ADLAN08; //return POLL_ADLAN08;
} }
} }
@@ -126,7 +122,7 @@ class poll
} }
$admin_log->log_event('POLL_02','ID: '.POLLID.' - '.$poll_title,''); $admin_log->log_event('POLL_02','ID: '.POLLID.' - '.$poll_title,'');
$message = POLLAN_45; //$message = POLLAN_45;
} }
else else
{ {
@@ -629,13 +625,13 @@ class poll
if (POLLACTION == 'edit') if (POLLACTION == 'edit')
{ {
$text .= $frm->admin_button('submit',POLLAN_22,'submit')." $text .= $frm->admin_button('submit', LAN_UPDATE, 'update')."
<input type='hidden' name='poll_id' value='".intval($_POST['poll_id'])."' /> "; <input type='hidden' name='poll_id' value='".intval($_POST['poll_id'])."' /> ";
} }
else else
{ {
$text .= $frm->admin_button('submit','no-value','submit',POLLAN_23); $text .= $frm->admin_button('submit','no-value','submit', LAN_CREATE);
// $text .= "<input class='button' type='submit' name='submit' value='".POLLAN_23."' /> "; // $text .= "<input class='button' type='submit' name='submit' value='".POLLAN_23."' /> ";
} }
} }