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

GUI fixes

Browse Source
This commit is contained in:
Cameron
2015-02-07 12:56:16 -08:00
parent 25b96411e0
commit 2d29b7a739
6 changed files with 177 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
e107_admin/admin_log.php
View File

@@ -110,6 +110,23 @@ class adminlog_admin extends e_admin_dispatcher
); );
protected $menuTitle = ADLAN_155; protected $menuTitle = ADLAN_155;
function init()
{
e107::css('inline', "
.fa { font-size:130% }
.fa-question-circle { }
.fa-exclamation-circle { color: #FAA732 }
.fa-warning { color: red }
");
}
} }
@@ -487,6 +504,7 @@ class admin_log_form_ui extends e_admin_form_ui
// Custom Method/Function // Custom Method/Function
function dblog_type($curVal,$mode) function dblog_type($curVal,$mode)
{ {
$tp = e107::getParser();
/* /*
define("E_LOG_INFORMATIVE", 0); // Minimal Log Level, including really minor stuff define("E_LOG_INFORMATIVE", 0); // Minimal Log Level, including really minor stuff
define("E_LOG_NOTICE", 1); // More important than informative, but less important than notice define("E_LOG_NOTICE", 1); // More important than informative, but less important than notice
@@ -503,8 +521,9 @@ class admin_log_form_ui extends e_admin_form_ui
' ' // Plugin information - Deprecated - Leave empty. ' ' // Plugin information - Deprecated - Leave empty.
); );
$array[1] = $tp->toGlyph('fa-question-circle');
$array[2] = $tp->toGlyph('fa-exclamation-circle');
$array[3] = $tp->toGlyph('fa-warning');
switch($mode) switch($mode)
{ {

248
e107_admin/banlist.php
View File

@@ -103,8 +103,8 @@ class banlist_ui extends e_admin_ui
'banlist_datestamp' => array ( 'title' => LAN_DATESTAMP, 'type' => 'datestamp', 'data' => 'int', 'width' => 'auto', 'filter' => true, 'help' => '', 'readParms' => '', 'writeParms' => 'auto=1&hidden=1&readonly=1', 'class' => 'left', 'thclass' => 'left', ), 'banlist_datestamp' => array ( 'title' => LAN_DATESTAMP, 'type' => 'datestamp', 'data' => 'int', 'width' => 'auto', 'filter' => true, 'help' => '', 'readParms' => '', 'writeParms' => 'auto=1&hidden=1&readonly=1', 'class' => 'left', 'thclass' => 'left', ),
'banlist_banexpires' => array ( 'title' => 'Expires', 'type' => 'method', 'data' => 'int', 'inline'=>true, 'width' => 'auto', 'batch' => true, 'filter' => true, 'help' => '', 'readParms' => '', 'writeParms' => '', 'class' => 'left', 'thclass' => 'left', ), 'banlist_banexpires' => array ( 'title' => 'Expires', 'type' => 'method', 'data' => 'int', 'inline'=>true, 'width' => 'auto', 'batch' => true, 'filter' => true, 'help' => '', 'readParms' => '', 'writeParms' => '', 'class' => 'left', 'thclass' => 'left', ),
'banlist_admin' => array ( 'title' => 'Admin', 'type' => 'boolean', 'data' => 'int', 'width' => 'auto', 'help' => '', 'readParms' => '', 'writeParms' => '', 'class' => 'center', 'thclass' => 'center', ), 'banlist_admin' => array ( 'title' => 'Admin', 'type' => 'boolean', 'data' => 'int', 'width' => 'auto', 'help' => '', 'readParms' => '', 'writeParms' => '', 'class' => 'center', 'thclass' => 'center', ),
'banlist_reason' => array ( 'title' => 'Reason', 'type' => 'text', 'data' => 'str', 'inline'=>true, 'width' => 'auto', 'help' => '', 'readParms' => '', 'writeParms' => '', 'class' => 'center', 'thclass' => 'center', ), 'banlist_reason' => array ( 'title' => 'Reason', 'type' => 'text', 'data' => 'str', 'inline'=>true, 'width' => 'auto', 'help' => '', 'readParms' => '', 'writeParms' => '', 'class' => 'left', 'thclass' => 'left', ),
'banlist_notes' => array ( 'title' => 'Notes', 'type' => 'text', 'data' => 'str', 'inline'=>true, 'width' => 'auto', 'help' => '', 'readParms' => '', 'writeParms' => '', 'class' => 'center', 'thclass' => 'center', ), 'banlist_notes' => array ( 'title' => 'Notes', 'type' => 'text', 'data' => 'str', 'inline'=>true, 'width' => 'auto', 'help' => '', 'readParms' => '', 'writeParms' => '', 'class' => 'left', 'thclass' => 'left', ),
'options' => array ( 'title' => LAN_OPTIONS, 'type' => '', 'data' => '', 'width' => '10%', 'thclass' => 'center last', 'class' => 'center last', 'forced' => '1', ), 'options' => array ( 'title' => LAN_OPTIONS, 'type' => '', 'data' => '', 'width' => '10%', 'thclass' => 'center last', 'class' => 'center last', 'forced' => '1', ),
); );
@@ -127,6 +127,17 @@ class banlist_ui extends e_admin_ui
{ {
//$this->processSomething(); //$this->processSomething();
} }
if (isset($_POST['update_ban_prefs'])) // Update ban messages
{
$this->timesPageSave();
}
} }
@@ -143,9 +154,127 @@ class banlist_ui extends e_admin_ui
//FIXME Put Import code in here. //FIXME Put Import code in here.
} }
private function timesPageSave()
{
$ipAdministrator = new banlistManager;
$tp = e107::getParser();
$changed = FALSE;
foreach ($ipAdministrator->getValidReasonList() as $bt)
{
$i = abs($bt) + 1; // Forces a single-digit positive number for part of field name
$t1 = $tp->toDB(varset($_POST['ban_text_'.($i)],''));
$t2 = intval(varset($_POST['ban_time_'.($i)],0));
if (!isset($pref['ban_messages'][$bt]) || ($pref['ban_messages'][$bt] != $t1))
{
$pref['ban_messages'][$bt] = $t1;
$changed = TRUE;
}
if (!isset($pref['ban_durations'][$bt]) || ($pref['ban_durations'][$bt] != $t2))
{
$pref['ban_durations'][$bt] = $t2;
$changed = TRUE;
}
}
if ($changed)
{
// @todo write actual prefs changes to log file (different methods for prefs?)
e107::getConfig()->setPref($pref)->save();
// save_prefs();
/*****************************************
Write messages and times to disc file
*****************************************/
$ipAdministrator->writeBanMessageFile();
banlist_adminlog('08','');
//$ns->tablerender(BANLAN_9, "<div style='text-align:center'>".BANLAN_33.'</div>');
// $mes->addSuccess(BANLAN_33);
}
}
public function timesPage() public function timesPage()
{ {
//FIXME Put Times code in here. if (!getperms('0'))
{
return;
}
$pref = e107::getPref();
$tp = e107::getParser();
$frm = e107::getForm();
$mes = e107::getMessage();
$ipAdministrator = new banlistManager;
$text = '';
if ((!isset($pref['ban_messages'])) || !is_array($pref['ban_messages']))
{
foreach ($ipAdministrator->getValidReasonList() as $bt)
{
$pref['ban_messages'][$bt] = '';
}
}
if ((!isset($pref['ban_durations'])) || !is_array($pref['ban_durations']))
{
foreach ($ipAdministrator->getValidReasonList() as $bt)
{
$pref['ban_durations'][$bt] = 0;
}
}
$text .= "
<form method='post' action='".e_SELF.'?'.e_QUERY."' id='ban_options'>
<fieldset id='core-banlist-times'>
<legend class='e-hideme'>".BANLAN_77."</legend>
<table class='table adminlist'>
<colgroup>
<col style='width: 20%' />
<col style='width: 65%' />
<col style='width: 15%' />
</colgroup>
<thead>
<tr>
<th>".BANLAN_28."</th>
<th>".BANLAN_29."<br />".BANLAN_31."</th>
<th class='center last'>".BANLAN_30."</th>
</tr>
</thead>
<tbody>
";
foreach ($ipAdministrator->getValidReasonList() as $bt)
{
$i = abs($bt) + 1; // Forces a single-digit positive number
$text .= "
<tr>
<td>
<strong>".$ipAdministrator->getBanTypeString($bt, FALSE)."</strong>
<div class='field-help'>".$ipAdministrator->getBanTypeString($bt, TRUE)."</div>
</td>
<td class='left'>
".$frm->textarea('ban_text_'.($i), $pref['ban_messages'][$bt], 4, 15)."
</td>
<td class='center'>".ban_time_dropdown('', BANLAN_32, $pref['ban_durations'][$bt], 'ban_time_'.($i))."</td>
</tr>
";
}
$text .= "
</tbody>
</table>
<div class='buttons-bar center'>
".$frm->admin_button('update_ban_prefs', LAN_UPDATE, 'update')."
<input type='hidden' name='e-token' value='".e_TOKEN."' />
</div>
</fieldset>
</form>
";
echo $mes->render().$text;
} }
@@ -321,39 +450,7 @@ if($_GET['action']) // Temporary Fix.
$action = $_GET['action']; $action = $_GET['action'];
} }
if (isset($_POST['update_ban_prefs'])) // Update ban messages
{
$changed = FALSE;
foreach ($ipAdministrator->getValidReasonList() as $bt)
{
$i = abs($bt) + 1; // Forces a single-digit positive number for part of field name
$t1 = $tp->toDB(varset($_POST['ban_text_'.($i)],''));
$t2 = intval(varset($_POST['ban_time_'.($i)],0));
if (!isset($pref['ban_messages'][$bt]) || ($pref['ban_messages'][$bt] != $t1))
{
$pref['ban_messages'][$bt] = $t1;
$changed = TRUE;
}
if (!isset($pref['ban_durations'][$bt]) || ($pref['ban_durations'][$bt] != $t2))
{
$pref['ban_durations'][$bt] = $t2;
$changed = TRUE;
}
}
if ($changed)
{
// @todo write actual prefs changes to log file (different methods for prefs?)
save_prefs();
/*****************************************
Write messages and times to disc file
*****************************************/
$ipAdministrator->writeBanMessageFile();
banlist_adminlog('08','');
//$ns->tablerender(BANLAN_9, "<div style='text-align:center'>".BANLAN_33.'</div>');
$mes->addSuccess(BANLAN_33);
}
}
@@ -642,7 +739,8 @@ switch ($action)
$text .= "&nbsp;&nbsp;&nbsp;".str_replace('--NUM--', $num_entry, BANLAN_87); $text .= "&nbsp;&nbsp;&nbsp;".str_replace('--NUM--', $num_entry, BANLAN_87);
} }
e107::getRender()->tablerender(BANLAN_16.SEP.BANLAN_86, $text); echo $text;
// e107::getRender()->tablerender(BANLAN_16.SEP.BANLAN_86, $text);
break; break;
@@ -749,75 +847,16 @@ switch ($action)
</fieldset> </fieldset>
</form> </form>
"; ";
e107::getRender()->tablerender(BANLAN_16.SEP.LAN_OPTIONS, $mes->render().$text);
echo $mes->render().$text;
// e107::getRender()->tablerender(BANLAN_16.SEP.LAN_OPTIONS, $mes->render().$text);
break; break;
case 'times' : case 'times' :
if (!getperms('0'))
exit();
$text = '';
if ((!isset($pref['ban_messages'])) || !is_array($pref['ban_messages']))
{
foreach ($ipAdministrator->getValidReasonList() as $bt)
{
$pref['ban_messages'][$bt] = '';
}
}
if ((!isset($pref['ban_durations'])) || !is_array($pref['ban_durations']))
{
foreach ($ipAdministrator->getValidReasonList() as $bt)
{
$pref['ban_durations'][$bt] = 0;
}
}
$text .= "
<form method='post' action='".e_SELF.'?'.e_QUERY."' id='ban_options'>
<fieldset id='core-banlist-times'>
<legend class='e-hideme'>".BANLAN_77."</legend>
<table class='table adminlist'>
<colgroup>
<col style='width: 20%' />
<col style='width: 65%' />
<col style='width: 15%' />
</colgroup>
<thead>
<tr>
<th>".BANLAN_28."</th>
<th>".BANLAN_29."<br />".BANLAN_31."</th>
<th class='center last'>".BANLAN_30."</th>
</tr>
</thead>
<tbody>
";
foreach ($ipAdministrator->getValidReasonList() as $bt)
{
$i = abs($bt) + 1; // Forces a single-digit positive number
$text .= "
<tr>
<td>
<strong>".$ipAdministrator->getBanTypeString($bt, FALSE)."</strong>
<div class='field-help'>".$ipAdministrator->getBanTypeString($bt, TRUE)."</div>
</td>
<td class='center'>
".$frm->textarea('ban_text_'.($i), $pref['ban_messages'][$bt], 4, 15)."
</td>
<td class='center'>".ban_time_dropdown('', BANLAN_32, $pref['ban_durations'][$bt], 'ban_time_'.($i))."</td>
</tr>
";
}
$text .= "
</tbody>
</table>
<div class='buttons-bar center'>
".$frm->admin_button('update_ban_prefs', LAN_UPDATE, 'update')."
<input type='hidden' name='e-token' value='".e_TOKEN."' />
</div>
</fieldset>
</form>
";
e107::getRender()->tablerender(BANLAN_16.SEP.BANLAN_77, $mes->render().$text); // e107::getRender()->tablerender(BANLAN_16.SEP.BANLAN_77, $mes->render().$text);
break; break;
case 'edit' : // Edit an existing ban case 'edit' : // Edit an existing ban
@@ -948,7 +987,8 @@ switch ($action)
</form> </form>
"; ";
e107::getRender()->tablerender($page_title[$action], $mes->render().$text); echo $mes->render().$text;
// e107::getRender()->tablerender($page_title[$action], $mes->render().$text);
break; // End of 'Add' and 'Edit' break; // End of 'Add' and 'Edit'
@@ -1068,7 +1108,8 @@ switch ($action)
</form> </form>
"; ";
e107::getRender()->tablerender(BANLAN_16.SEP.BANLAN_35, $mes->render().$text); echo $mes->render().$text;
// e107::getRender()->tablerender(BANLAN_16.SEP.BANLAN_35, $mes->render().$text);
break; // End case 'transfer' break; // End case 'transfer'
case 'list' : case 'list' :
@@ -1194,7 +1235,8 @@ switch ($action)
</form> </form>
"; ";
e107::getRender()->tablerender(($action == 'list' ? BANLAN_3 : BANLAN_61), $mes->render().$text); echo $mes->render().$text;
// e107::getRender()->tablerender(($action == 'list' ? BANLAN_3 : BANLAN_61), $mes->render().$text);
// End of case 'list' and the default case // End of case 'list' and the default case
} // End switch ($action) } // End switch ($action)

2
e107_admin/fla.php
View File

@@ -68,7 +68,7 @@ class generic_ui extends e_admin_ui
protected $table = 'generic'; protected $table = 'generic';
protected $pid = 'gen_id'; protected $pid = 'gen_id';
protected $perPage = 10; protected $perPage = 10;
protected $listQry = "SELECT * FROM #generic WHERE gen_type='failed_login' ORDER BY gen_datestamp DESC"; protected $listQry = "SELECT * FROM `#generic` WHERE gen_type='failed_login' ORDER BY gen_datestamp DESC";
protected $fields = array ( 'checkboxes' => array ( 'title' => '', 'type' => null, 'data' => null, 'width' => '5%', 'thclass' => 'center', 'forced' => '1', 'class' => 'center', 'toggle' => 'e-multiselect', ), protected $fields = array ( 'checkboxes' => array ( 'title' => '', 'type' => null, 'data' => null, 'width' => '5%', 'thclass' => 'center', 'forced' => '1', 'class' => 'center', 'toggle' => 'e-multiselect', ),
'gen_id' => array ( 'title' => LAN_ID, 'nolist'=>true, 'data' => 'int', 'width' => '5%', 'help' => '', 'readParms' => '', 'writeParms' => '', 'class' => 'left', 'thclass' => 'left', ), 'gen_id' => array ( 'title' => LAN_ID, 'nolist'=>true, 'data' => 'int', 'width' => '5%', 'help' => '', 'readParms' => '', 'writeParms' => '', 'class' => 'left', 'thclass' => 'left', ),

4
e107_admin/newspost.php
View File

@@ -202,8 +202,8 @@ class news_sub_ui extends e_admin_ui
// 'submitnews_item' => array('title'=> LAN_DESCRIPTION, 'type' => 'method', 'width' => 'auto', 'thclass' => 'left','readParms' => 'expand=...&truncate=150&bb=1', 'readonly'=>TRUE), // 'submitnews_item' => array('title'=> LAN_DESCRIPTION, 'type' => 'method', 'width' => 'auto', 'thclass' => 'left','readParms' => 'expand=...&truncate=150&bb=1', 'readonly'=>TRUE),
'submitnews_name' => array('title'=> LAN_AUTHOR, 'type' => 'text', 'width' => 'auto', 'thclass' => 'left', 'readonly'=>TRUE), 'submitnews_name' => array('title'=> LAN_AUTHOR, 'type' => 'text', 'width' => 'auto', 'thclass' => 'left', 'readonly'=>TRUE),
'submitnews_ip' => array('title'=> "IP", 'type' => 'text', 'width' => 'auto', 'thclass' => 'left', 'readonly'=>TRUE), 'submitnews_ip' => array('title'=> "IP", 'type' => 'text', 'width' => 'auto', 'thclass' => 'left', 'readonly'=>TRUE),
'submitnews_auth' => array('title'=> "User", 'type' => 'user', 'width' => 'auto', 'thclass' => 'right', 'class'=> 'right' ), 'submitnews_auth' => array('title'=> "User", 'type' => 'user', 'width' => 'auto', 'thclass' => 'left', 'class'=> 'left' ),
'options' => array('title'=> LAN_OPTIONS, 'type' => "method", 'width' => '10%', 'forced'=>TRUE, 'thclass' => 'center last', 'class' => 'center') 'options' => array('title'=> LAN_OPTIONS, 'type' => "method", 'width' => '10%', 'forced'=>TRUE, 'thclass' => 'center last', 'class' => 'right')
); );
protected $fieldpref = array('checkboxes', 'submitnews_id', 'submitnews_title', 'submitnews_category', 'options'); protected $fieldpref = array('checkboxes', 'submitnews_id', 'submitnews_title', 'submitnews_category', 'options');

2
e107_admin/users.php
View File

@@ -174,7 +174,7 @@ class users_admin_ui extends e_admin_ui
protected $table = "user"; protected $table = "user";
// protected $listQry = "SELECT SQL_CALC_FOUND_ROWS * FROM #users"; // without any Order or Limit. // protected $listQry = "SELECT SQL_CALC_FOUND_ROWS * FROM #users"; // without any Order or Limit.
protected $listQry = "SELECT SQL_CALC_FOUND_ROWS u.*,ue.* from #user AS u left join #user_extended AS ue ON u.user_id = ue.user_extended_id "; // without any Order or Limit. protected $listQry = "SELECT SQL_CALC_FOUND_ROWS u.*,ue.* from #user AS u LEFT JOIN #user_extended AS ue ON u.user_id = ue.user_extended_id "; // without any Order or Limit.
protected $editQry = "SELECT u.*,ue.* FROM #user AS u left join #user_extended AS ue ON u.user_id = ue.user_extended_id WHERE user_id = {ID}"; protected $editQry = "SELECT u.*,ue.* FROM #user AS u left join #user_extended AS ue ON u.user_id = ue.user_extended_id WHERE user_id = {ID}";

8
e107_core/shortcodes/batch/admin_shortcodes.php
View File

@@ -1066,7 +1066,7 @@ class admin_shortcodes
$pref = e107::getPref(); $pref = e107::getPref();
$members = $sql->count('user'); $members = $sql->count('user', '(*)', 'WHERE user_ban=0');
$unverified = $sql->count('user', '(*)', 'WHERE user_ban=2'); $unverified = $sql->count('user', '(*)', 'WHERE user_ban=2');
$banned = $sql->count('user', '(*)', 'WHERE user_ban=1'); $banned = $sql->count('user', '(*)', 'WHERE user_ban=1');
$comments = $sql->count('comments'); $comments = $sql->count('comments');
@@ -1087,9 +1087,9 @@ class admin_shortcodes
// for BC only. // for BC only.
$oldconfigs['e-user'][0] = array('icon'=>E_16_USER, 'title'=>ADLAN_110, 'url'=> e_ADMIN_ABS."users.php?filter=0", 'total'=>$members); $oldconfigs['e-user'][0] = array('icon'=>E_16_USER, 'title'=>ADLAN_110, 'url'=> e_ADMIN_ABS."users.php?searchquery=&amp;filter_options=user_ban__0", 'total'=>$members);
$oldconfigs['e-user'][1] = array('icon'=>E_16_USER, 'title'=>ADLAN_111, 'url'=> e_ADMIN."users.php?searchquery=&amp;filter_options=user_ban__2&amp;filter=unverified", 'total'=>$unverified); $oldconfigs['e-user'][1] = array('icon'=>E_16_USER, 'title'=>ADLAN_111, 'url'=> e_ADMIN."users.php?searchquery=&amp;filter_options=user_ban__2", 'total'=>$unverified);
$oldconfigs['e-user'][2] = array('icon'=>E_16_BANLIST, 'title'=>ADLAN_112, 'url'=> e_ADMIN."users.php?searchquery=&filter_options=user_ban__1&filter=banned", 'total'=>$banned); $oldconfigs['e-user'][2] = array('icon'=>E_16_BANLIST, 'title'=>ADLAN_112, 'url'=> e_ADMIN."users.php?searchquery=&filter_options=user_ban__1", 'total'=>$banned);
$oldconfigs['e-comments'][0] = array('icon'=>E_16_COMMENT, 'title'=>ADLAN_114, 'url'=> e_ADMIN_ABS."comment.php", 'total'=>$comments); $oldconfigs['e-comments'][0] = array('icon'=>E_16_COMMENT, 'title'=>ADLAN_114, 'url'=> e_ADMIN_ABS."comment.php", 'total'=>$comments);
if($flo = $sql->count('generic', '(*)', "WHERE gen_type='failed_login'")) if($flo = $sql->count('generic', '(*)', "WHERE gen_type='failed_login'"))