mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-07 07:06:30 +02:00
Code Issues Releases Wiki Activity

More cleanup

Browse Source
This commit is contained in:
Cameron
2019-03-19 15:45:36 -07:00
parent 164465e4dc
commit ce5079b3c1
1 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
e107_admin/users.php
View File

@@ -2170,6 +2170,8 @@ class users_admin_ui extends e_admin_ui
// 'clearemailbounce' - delete email address for any user whose emails bounced // 'clearemailbounce' - delete email address for any user whose emails bounced
// 'delchecked' - delete the emails whose comma-separated IDs are in $bounce_arr // 'delchecked' - delete the emails whose comma-separated IDs are in $bounce_arr
// 'delall' - delete all bounced emails // 'delall' - delete all bounced emails
/*
function check_bounces($bounce_act = 'first_check',$bounce_arr = '') function check_bounces($bounce_act = 'first_check',$bounce_arr = '')
{ {
### old Trigger code for bounce check ### old Trigger code for bounce check
@@ -2262,7 +2264,7 @@ class users_admin_ui extends e_admin_ui
$tot = $obj->getTotalMails(); $tot = $obj->getTotalMails();
$found = false; $found = false;
$DEL = ($pref['mail_bounce_delete']) ? true : false; $DEL = ($pref['mail_bounce_delete']) ? true : false;
$text = "<br /><div><form method='post' action='".e_SELF.$qry."'><table> $text = "<br /><div><form method='post' action='".e_REQUEST_URI."'><table>
<tr><td style='width:5%'>#</td><td>e107-id</td><td>email</td><td>Subject</td><td>Bounce</td></tr>\n"; <tr><td style='width:5%'>#</td><td>e107-id</td><td>email</td><td>Subject</td><td>Bounce</td></tr>\n";
$identifier = deftrue('MAIL_IDENTIFIER', 'X-e107-id'); $identifier = deftrue('MAIL_IDENTIFIER', 'X-e107-id');
@@ -2351,7 +2353,7 @@ class users_admin_ui extends e_admin_ui
$ed = '0'; $ed = '0';
$this->show_message(str_replace(array('[w]','[x]','[y]','[z]'),array($tot,$del_count,$ed,$found),USRLAN_155).$text); $this->show_message(str_replace(array('[w]','[x]','[y]','[z]'),array($tot,$del_count,$ed,$found),USRLAN_155).$text);
} }
*/
// ------- FIXME Prune Users move to cron -------------- // ------- FIXME Prune Users move to cron --------------
// if (isset ($_POST['prune'])) // if (isset ($_POST['prune']))
// { // {
@@ -2439,7 +2441,9 @@ class users_admin_form_ui extends e_admin_form_ui
// e107::getUserExt()->user_extended_edit // e107::getUserExt()->user_extended_edit
// return 'hello'; // return 'hello';
$field = $att['field']; $field = $att['field'];
$extData = $this->getController()->getExtended(); /** @var users_admin_ui $controller */
$controller = $this->getController();
$extData = -$controller->getExtended();
$extData[$field]['user_extended_struct_required'] = 0; $extData[$field]['user_extended_struct_required'] = 0;
return e107::getUserExt()->user_extended_edit($extData[$field],$curval); return e107::getUserExt()->user_extended_edit($extData[$field],$curval);
@@ -2577,7 +2581,7 @@ class users_admin_form_ui extends e_admin_form_ui
}*/ }*/
/*
function user_status($curval,$mode) function user_status($curval,$mode)
{ {
@@ -2617,7 +2621,8 @@ class users_admin_form_ui extends e_admin_form_ui
} }
*/
//TODO Reduce to simple edit/delete buttons only Other options included on edit page or available via inline or batch editing. //TODO Reduce to simple edit/delete buttons only Other options included on edit page or available via inline or batch editing.
function options($val, $mode) // old drop-down options. function options($val, $mode) // old drop-down options.
{ {
@@ -2942,7 +2947,7 @@ class users_admin_form_ui extends e_admin_form_ui
if($attributes['mode'] == 'read') if($attributes['mode'] == 'read')
{ {
parse_str(str_replace('&amp;', '&', e_QUERY), $query); //FIXME - FIX THIS parse_str(str_replace('&amp;', '&', e_QUERY), $query);
$query['action'] = 'edit'; $query['action'] = 'edit';
$query['id'] = $id; $query['id'] = $id;
$query = http_build_query($query, null, '&amp;'); $query = http_build_query($query, null, '&amp;');
@@ -2954,7 +2959,7 @@ class users_admin_form_ui extends e_admin_form_ui
if($special == 0) if($special == 0)
{ {
$text .= $this->submit_image('menu_delete['.$id.']', $id, 'delete', LAN_DELETE.' [ ID: '.$id.' ]', array('class' => 'action delete btn btn-default'.$delcls)); $text .= $this->submit_image('menu_delete['.$id.']', $id, 'delete', LAN_DELETE.' [ ID: '.$id.' ]', array('class' => 'action delete btn btn-default'));
} }
return $text; return $text;