mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-03 13:17:24 +02:00
Code Issues Releases Wiki Activity

Event calendar GUI clean-up and fixed issue #43

Browse Source
This commit is contained in:
Tijn Kuyper
2012-12-06 22:38:28 +01:00
parent d0eb844488
commit cb9af73de1
3 changed files with 42 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

82
e107_plugins/calendar_menu/admin_config.php
View File

@@ -47,7 +47,9 @@ $calendarmenu_msg = '';
// identifies changes, writes back the changes, makes admin log entry // identifies changes, writes back the changes, makes admin log entry
function logPrefChanges(&$prefList, $logRef) function logPrefChanges(&$prefList, $logRef)
{ {
global $pref, $tp, $admin_log; global $admin_log;
$pref = e107::getPref();
$tp = e107::getParser();
$prefChanges = array(); $prefChanges = array();
foreach ($prefList as $prefName => $process) foreach ($prefList as $prefName => $process)
{ {
@@ -229,12 +231,12 @@ if ($action == 'confdel')
<form method='post' action='".e_SELF."?backdel.{$ec_qs[1]}'> <form method='post' action='".e_SELF."?backdel.{$ec_qs[1]}'>
<table style='width:97%' class='fborder'> <table style='width:97%' class='fborder'>
<tr> <tr>
<td class='forumheader3' style='width:100%;vertical-align:top;rext-align:center;'>".EC_ADLAN_A150.$old_string." </td> <td style='width:100%;vertical-align:top;rext-align:center;'>".EC_ADLAN_A150.$old_string." </td>
</tr> </tr>
<tr><td colspan='2' style='text-align:center' class='fcaption'><input class='button' type='submit' name='confirmdeleteold' value='".EC_ADLAN_A205."' /></td></tr> <tr><td colspan='2' style='text-align:center'>".$frm->admin_button('confirmdeleteold', EC_ADLAN_A205, 'submit')."</td></tr>
</table></form></div>"; </table></form></div>";
$ns->tablerender("<div style='text-align:center'>".EC_ADLAN_A205."</div>", $text); $ns->tablerender("<div style='text-align:center'>".EC_ADLAN_A205."</div>", $text); // TODO
} }
@@ -245,12 +247,12 @@ if ($action == 'confcache')
<form method='post' action='".e_SELF."?cachedel'> <form method='post' action='".e_SELF."?cachedel'>
<table style='width:97%' class='fborder'> <table style='width:97%' class='fborder'>
<tr> <tr>
<td class='forumheader3' style='width:100%;vertical-align:top;rext-align:center;'>".EC_ADLAN_A162." </td> <td style='width:100%;vertical-align:top;rext-align:center;'>".EC_ADLAN_A162." </td>
</tr> </tr>
<tr><td colspan='2' style='text-align:center' class='fcaption'><input class='button' type='submit' name='confirmdelcache' value='".EC_ADLAN_A205."' /></td></tr> <tr><td colspan='2' style='text-align:center'><input class='button' type='submit' name='confirmdelcache' value='".EC_ADLAN_A205."' /></td></tr>
</table></form></div>"; </table></form></div>";
$ns->tablerender("<div style='text-align:center'>".EC_ADLAN_A205."</div>", $text); $ns->tablerender("<div style='text-align:center'>".EC_ADLAN_A205."</div>", $text); // TODO
} }
@@ -266,7 +268,7 @@ if (isset($ec_qs[2]) && isset($ec_qs[3]) && ($action == 'subs') && ($ec_qs[2] ==
if (isset($message) && ($message != "")) if (isset($message) && ($message != ""))
{ {
$ns->tablerender('', "<div style='text-align:center'><b>{$message}</b></div>"); $ns->tablerender('', "<div style='text-align:center'><b>{$message}</b></div>"); // TODO
$message = ''; $message = '';
} }
@@ -316,24 +318,24 @@ if($action == 'cat')
{ // New record so add it { // New record so add it
if ($calendarmenu_db->db_Insert("event_cat", $calPars)) if ($calendarmenu_db->db_Insert("event_cat", $calPars))
{ {
$calendarmenu_msg .= "<tr><td class='forumheader3' colspan='2'><strong>".EC_ADLAN_A26."</strong></td></tr>"; $calendarmenu_msg .= "<tr><td colspan='2'><strong>".EC_ADLAN_A26."</strong></td></tr>";
$admin_log->log_event(EC_ADM_08,$calPars['event_cat_name'],''); $admin_log->log_event(EC_ADM_08,$calPars['event_cat_name'],'');
} }
else else
{ {
$calendarmenu_msg .= "<tr><td class='forumheader3' colspan='2'><strong>".EC_ADLAN_A27."</strong></td></tr>"; $calendarmenu_msg .= "<tr><td colspan='2'><strong>".EC_ADLAN_A27."</strong></td></tr>";
} }
} }
else else
{ // Update existing { // Update existing
if ($calendarmenu_db->db_UpdateArray("event_cat", $calPars, 'WHERE `event_cat_id` = '.$calendarmenu_id)) if ($calendarmenu_db->db_UpdateArray("event_cat", $calPars, 'WHERE `event_cat_id` = '.$calendarmenu_id))
{ // Changes saved { // Changes saved
$calendarmenu_msg .= "<tr><td class='forumheader3' colspan='2'><b>".EC_ADLAN_A28."</b></td></tr>"; $calendarmenu_msg .= "<tr><td colspan='2'><b>".EC_ADLAN_A28."</b></td></tr>";
$admin_log->log_event(EC_ADM_09,'ID: '.$calendarmenu_id.', '.$calPars['event_cat_name'],''); $admin_log->log_event(EC_ADM_09,'ID: '.$calendarmenu_id.', '.$calPars['event_cat_name'],'');
} }
else else
{ {
$calendarmenu_msg .= "<tr><td class='forumheader3' colspan='2'><b>".EC_ADLAN_A29."</b></td></tr>"; $calendarmenu_msg .= "<tr><td colspan='2'><b>".EC_ADLAN_A29."</b></td></tr>";
} }
} }
// Now see if we need to send a test email // Now see if we need to send a test email
@@ -391,9 +393,9 @@ if($action == 'cat')
$user_name = USERNAME; $user_name = USERNAME;
$send_result = sendemail($user_email, $cal_title, $cal_msg, $user_name, $pref['eventpost_mailaddress'], $pref['eventpost_mailfrom']); $send_result = sendemail($user_email, $cal_title, $cal_msg, $user_name, $pref['eventpost_mailaddress'], $pref['eventpost_mailfrom']);
if ($send_result) if ($send_result)
$calendarmenu_msg .= "<tr><td class='forumheader3' colspan='2'><strong>".EC_ADLAN_A187.$ecal_send_email."</strong></td></tr>"; $calendarmenu_msg .= "<tr><td colspan='2'><strong>".EC_ADLAN_A187.$ecal_send_email."</strong></td></tr>";
else else
$calendarmenu_msg .= "<tr><td class='forumheader3' colspan='2'><strong>".EC_ADLAN_A188.$ecal_send_email."</strong></td></tr>"; $calendarmenu_msg .= "<tr><td colspan='2'><strong>".EC_ADLAN_A188.$ecal_send_email."</strong></td></tr>";
} }
break; break;
@@ -430,7 +432,7 @@ if($action == 'cat')
if ($calendarmenu_db->db_Delete('event_cat', 'event_cat_id='.$calendarmenu_id)) if ($calendarmenu_db->db_Delete('event_cat', 'event_cat_id='.$calendarmenu_id))
{ {
$admin_log->log_event(EC_ADM_10,'ID: '.$calendarmenu_id,''); $admin_log->log_event(EC_ADM_10,'ID: '.$calendarmenu_id,'');
$calendarmenu_msg .= "<tr><td class='forumheader3' colspan='2'><strong>".EC_ADLAN_A30."</strong></td></tr>"; $calendarmenu_msg .= "<tr><td colspan='2'><strong>".EC_ADLAN_A30."</strong></td></tr>";
} }
else else
{ {
@@ -454,14 +456,14 @@ if($action == 'cat')
$calendarmenu_text .= " $calendarmenu_text .= "
<form id='calformupdate' method='post' action='".e_SELF."?cat'> <form id='calformupdate' method='post' action='".e_SELF."?cat'>
<fieldset id='plugin-ecal-categories'> <fieldset id='plugin-ecal-categories'>
<table class='adminform'> <table class=' tableadminform'>
<colgroup span='2'> <colgroup span='2'>
<col style = 'width:20%;' class='col-label' /> <col style = 'width:20%;' class='col-label' />
<col style = 'width:80%;' class='col-control' /> <col style = 'width:80%;' class='col-control' />
</colgroup> </colgroup>
<tbody> <tbody>
<tr> <tr>
<th colspan='2' class='fcaption' style='text-align:center'>{$calendarmenu_cap1} <th colspan='2' style='text-align:center'>{$calendarmenu_cap1}
<input type='hidden' value='{$calendarmenu_id}' name='calendarmenu_id' /> <input type='hidden' value='{$calendarmenu_id}' name='calendarmenu_id' />
<input type='hidden' value='update' name='calendarmenu_action' /> <input type='hidden' value='update' name='calendarmenu_action' />
</th> </th>
@@ -550,7 +552,7 @@ if($action == 'cat')
$calendarmenu_text .= " $calendarmenu_text .= "
</td> </td>
</tr> </tr>
<tr><td colspan='2' style='text-align:center' class='fcaption'><input type='submit' name='submits' value='".EC_ADLAN_A218."' class='button' /></td></tr> <tr><td colspan='2' style='text-align:center'><input type='submit' name='submits' value='".EC_ADLAN_A218."' class='button' /></td></tr>
</tbody> </tbody>
</table> </table>
@@ -579,33 +581,30 @@ if($action == 'cat')
$calendarmenu_text .= " $calendarmenu_text .= "
<form id='calform' method='post' action='".e_SELF."?cat'> <form id='calform' method='post' action='".e_SELF."?cat'>
<table width='97%' class='fborder'> <table class='table adminform'>
<tr>
<td colspan='2' class='fcaption'>".EC_ADLAN_A11."<input type='hidden' value='dothings' name='calendarmenu_action' /></td>
</tr>
{$calendarmenu_msg} {$calendarmenu_msg}
<tr> <tr>
<td style='width:20%' class='forumheader3'>".EC_ADLAN_A11."</td> <td>".EC_ADLAN_A11."<input type='hidden' value='dothings' name='calendarmenu_action' /></td>
<td class='forumheader3'><select name='calendarmenu_selcat' class='tbox'>{$calendarmenu_catopt}</select></td> <td><select name='calendarmenu_selcat' class='tbox'>{$calendarmenu_catopt}</select></td>
</tr> </tr>
<tr> <tr>
<td style='width:20%' class='forumheader3'>".EC_ADLAN_A18."</td> <td>".EC_ADLAN_A18."</td>
<td class='forumheader3'> <td>
<input type='radio' name='calendarmenu_recdel' value='1' checked='checked' /> ".EC_ADLAN_A13."<br /> <input type='radio' name='calendarmenu_recdel' value='1' checked='checked' /> ".EC_ADLAN_A13."<br />
<input type='radio' name='calendarmenu_recdel' value='2' /> ".EC_ADLAN_A14."<br /> <input type='radio' name='calendarmenu_recdel' value='2' /> ".EC_ADLAN_A14."<br />
<input type='radio' name='calendarmenu_recdel' value='3' /> ".EC_ADLAN_A15." <input type='radio' name='calendarmenu_recdel' value='3' /> ".EC_ADLAN_A15."
<input type='checkbox' name='calendarmenu_okdel' value='1' />".EC_ADLAN_A16." <input type='checkbox' name='calendarmenu_okdel' value='1' />".EC_ADLAN_A16."
</td> </td>
</tr> </tr>
<tr>
<td colspan='2' class='fcaption'><input type='submit' name='submits' value='".EC_ADLAN_A17."' class='tbox' /></td>
</tr>
</table> </table>
<div class='buttons-bar center'>
".$frm->admin_button('submits', EC_ADLAN_A17, 'submit')."
</div>
</form>"; </form>";
} }
if(isset($calendarmenu_text)) if(isset($calendarmenu_text))
{ {
$ns->tablerender("<div style='text-align:center'>".EC_ADLAN_1.' - '.EC_ADLAN_A19.'</div>', $calendarmenu_text); $ns->tablerender(EC_ADLAN_1." - ".EC_ADLAN_A19, $calendarmenu_text);
} }
} }
@@ -796,7 +795,7 @@ if($action == 'subs')
$text = "<div style='text-align:center'> $text = "<div style='text-align:center'>
<form method='post' action='".e_SELF."?subs.".$from."'> <form method='post' action='".e_SELF."?subs.".$from."'>
<fieldset id='plugin-ecal-subscriptions'> <fieldset id='plugin-ecal-subscriptions'>
<table cellpadding='0' cellspacing='0' class='adminform'> <table class='table adminform'>
<colgroup> <colgroup>
<col style='width:10%; vertical-align:top;' /> <col style='width:10%; vertical-align:top;' />
<col style='width:20%; vertical-align:top;' /> <col style='width:20%; vertical-align:top;' />
@@ -872,17 +871,14 @@ if($action == 'config')
} }
$text = "<div style='text-align:center'> $text = "
<form method='post' action='".e_SELF."'> <form method='post' action='".e_SELF."'>
<fieldset id='plugin-ecal-prefs'> <fieldset id='plugin-ecal-prefs'>
<table cellpadding='0' cellspacing='0' class='adminform'> <table class='table adminform'>
<colgroup> <colgroup>
<col style='width:40%;vertical-align:top;' /> <col style='width:40%;' />
<col style='width:60%;vertical-align:top;' /> <col style='width:60%;' />
</colgroup> </colgroup>
<thead>
<tr><th style='vertical-align:top;' colspan='2'>".EC_ADLAN_A207." </th></tr></thead>
<tbody>
<tr> <tr>
<td>".EC_ADLAN_A208." </td> <td>".EC_ADLAN_A208." </td>
<td>". $uc->uc_dropdown('eventpost_admin', $pref['eventpost_admin'], 'public, nobody, member, admin, classes')." <td>". $uc->uc_dropdown('eventpost_admin', $pref['eventpost_admin'], 'public, nobody, member, admin, classes')."
@@ -1119,15 +1115,15 @@ $text .= "
</select> </select>
</td> </td>
</tr> </tr>
<tr><td colspan='2' style='text-align:center'><input class='button' type='submit' name='updatesettings' value='".EC_ADLAN_A218."' /></td></tr>
</tbody>
</table> </table>
<div class='buttons-bar center'>
".$frm->admin_button('updatesettings',LAN_UPDATE, 'update')."
</div>
</fieldset> </fieldset>
</form> </form>
</div>"; ";
$ns->tablerender("<div style='text-align:center'>".EC_ADLAN_1." - ".EC_ADLAN_A207."</div>", $text); $ns->tablerender(EC_ADLAN_1." - ".EC_ADLAN_A207, $text);
} }

2
e107_plugins/calendar_menu/event.php
View File

@@ -24,6 +24,8 @@
require_once('../../class2.php'); require_once('../../class2.php');
$e107 = e107::getInstance(); $e107 = e107::getInstance();
$frm = e107::getForm();
if (!$e107->isInstalled('calendar_menu')) if (!$e107->isInstalled('calendar_menu'))
{ {
header('Location: '.e_BASE.'index.php'); header('Location: '.e_BASE.'index.php');

2
e107_plugins/calendar_menu/languages/English_admin_calendar_menu.php
View File

@@ -377,7 +377,7 @@ define('EC_ADLAN_A214', 'Length of daynames (characters)');
define('EC_ADLAN_A215', 'Date format in calendar header:'); define('EC_ADLAN_A215', 'Date format in calendar header:');
define('EC_ADLAN_A216', 'month/year'); define('EC_ADLAN_A216', 'month/year');
define('EC_ADLAN_A217', 'year/month'); define('EC_ADLAN_A217', 'year/month');
define('EC_ADLAN_A218', 'Update Settings'); //define('EC_ADLAN_A218', 'Update Settings');
define('EC_ADLAN_A219', 'Icon:'); define('EC_ADLAN_A219', 'Icon:');
define('EC_ADLAN_A220', 'Choose'); define('EC_ADLAN_A220', 'Choose');