mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-04-20 04:32:01 +02:00
Code Issues Releases Wiki Activity

More icon cleanup, also reworked the $frm->thead function to automatically generate sorting-links based on a query-pattern. (ie. no need to enter urls into the field array)

Browse Source
This commit is contained in:
CaMer0n 2009-07-17 07:53:13 +00:00
parent 659d272865
commit 9ab872b199
16 changed files with 363 additions and 271 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
e107_admin/banlist.php
View File

@ -9,9 +9,9 @@
* Ban List Management
*
* $Source: /cvs_backup/e107_0.8/e107_admin/banlist.php,v $
* $Revision: 1.15 $
* $Date: 2009-06-11 20:42:32 $
* $Author: e107steved $
* $Revision: 1.16 $
* $Date: 2009-07-17 07:53:13 $
* $Author: e107coders $
*
*/
@ -729,8 +729,8 @@ switch($action)
case 'ban_options':
$row_class = ' class="center"';
$val = "
<a class='action edit' href='".e_SELF."?{$edit_action}-{$banlist_ip}'><img class='icon action S16' src='".$images_path."edit_16.png' alt='".LAN_EDIT."' title='".LAN_EDIT."' /></a>
<input class='action delete no-confirm' name='delete_ban_entry' value='".e_SELF."?{$del_action}-{$banlist_ip}' type='image' src='".$images_path."delete_16.png' alt='".LAN_DELETE."' title='".$tp->toJS(LAN_CONFIRMDEL." [".$e107->ipDecode($banlist_ip)."]")."' />";
<a class='action edit' href='".e_SELF."?{$edit_action}-{$banlist_ip}'>".ADMIN_EDIT_ICON."</a>
<input class='action delete no-confirm' name='delete_ban_entry' value='".e_SELF."?{$del_action}-{$banlist_ip}' type='image' src='".ADMIN_DELETE_ICON_PATH."' alt='".LAN_DELETE."' title='".$tp->toJS(LAN_CONFIRMDEL." [".$e107->ipDecode($banlist_ip)."]")."' />";
break;
case 'banlist_notes':
default:

15
e107_admin/cpage.php
View File

@ -9,8 +9,8 @@
* Custom Menus/Pages Administration
*
* $Source: /cvs_backup/e107_0.8/e107_admin/cpage.php,v $
* $Revision: 1.16 $
* $Date: 2009-07-14 11:05:48 $
* $Revision: 1.17 $
* $Date: 2009-07-17 07:53:13 $
* $Author: e107coders $
*
*/
@ -161,12 +161,11 @@ class page
$text .= "<form method='post' action='".e_SELF."?".e_QUERY."'>
<fieldset id='core-cpage-list'>
<legend class='e-hideme'>".CUSLAN_5."</legend>
<table cellpadding='0' cellspacing='0' class='adminlist'>
<colgroup span='".count($this->fieldpref)."'>".$frm->colGroup($this->fields,$this->fieldpref)."</colgroup>
<thead>
<tr>".$frm->thead($this->fields,$this->fieldpref)."</tr>
</thead>
<tbody>";
<table cellpadding='0' cellspacing='0' class='adminlist'>".
$frm->colGroup($this->fields,$this->fieldpref).
$frm->thead($this->fields,$this->fieldpref).
"<tbody>";
if(!$sql->db_Select("page", "*", "ORDER BY page_datestamp DESC", "nowhere"))
{

10
e107_admin/frontpage.php
View File

@ -9,9 +9,9 @@
* Administration Area - Front page
*
* $Source: /cvs_backup/e107_0.8/e107_admin/frontpage.php,v $
* $Revision: 1.10 $
* $Date: 2008-12-21 11:47:29 $
* $Author: secretr $
* $Revision: 1.11 $
* $Date: 2009-07-17 07:53:13 $
* $Author: e107coders $
*
*/
@ -317,8 +317,8 @@ class frontpage
<td>".$this->lookup_path($current_value['page'])."</td>
<td>".$this->lookup_path($current_value['force'])."</td>
<td class='center'>
<input class='image' type='image' src='".e_IMAGE_ABS."admin_images/up.png' title='".FRTLAN_47."' value='".$order."' name='fp_inc' />
<input class='image' type='image' src='".e_IMAGE_ABS."admin_images/down.png' title='".FRTLAN_48."' value='".$order."' name='fp_dec' />
<input class='image' type='image' src='".ADMIN_UP_ICON_PATH."' title='".FRTLAN_47."' value='".$order."' name='fp_inc' />
<input class='image' type='image' src='".ADMIN_DOWN_ICON_PATH."' title='".FRTLAN_48."' value='".$order."' name='fp_dec' />
<input class='image edit' type='image' title='".LAN_EDIT."' name='fp_edit_rule[".$order."]' src='".ADMIN_EDIT_ICON_PATH."' />
<input class='image delete' type='image' title='".LAN_DELETE."' name='fp_delete_rule[".$order."]' src='".ADMIN_DELETE_ICON_PATH."' />
</td>

14
e107_admin/header.php
View File

@ -12,8 +12,8 @@
| GNU General Public License (http://gnu.org).
|
| $Source: /cvs_backup/e107_0.8/e107_admin/header.php,v $
| $Revision: 1.36 $
| $Date: 2009-07-17 03:53:14 $
| $Revision: 1.37 $
| $Date: 2009-07-17 07:53:13 $
| $Author: e107coders $
+---------------------------------------------------------------+
*/
@ -157,8 +157,14 @@ if (!defined('ADMIN_INFO_ICON'))
if (!defined('ADMIN_CONFIGURE_ICON'))
{
define("ADMIN_CONFIGURE_ICON", "<img class='icon action S16' src='".e_IMAGE_ABS."admin_images/cat_tools_16.png' alt='' />");
define("ADMIN_CONFIGURE_ICON_PATH", e_IMAGE."admin_images/cat_tools_16.png");
define("ADMIN_CONFIGURE_ICON", "<img class='icon action S16' src='".e_IMAGE_ABS."admin_images/configure_16.png' alt='' />");
define("ADMIN_CONFIGURE_ICON_PATH", e_IMAGE."admin_images/configure_16.png");
}
if (!defined('ADMIN_ADD_ICON'))
{
define("ADMIN_ADD_ICON", "<img class='icon action S16' src='".e_IMAGE_ABS."admin_images/add_16.png' alt='' />");
define("ADMIN_ADD_ICON_PATH", e_IMAGE."admin_images/add_16.png");
}
if (!defined('ADMIN_VIEW_ICON'))

30
e107_admin/links.php
View File

@ -9,8 +9,8 @@
* Administration Area - Site Links
*
* $Source: /cvs_backup/e107_0.8/e107_admin/links.php,v $
* $Revision: 1.24 $
* $Date: 2009-07-17 03:53:14 $
* $Revision: 1.25 $
* $Date: 2009-07-17 07:53:13 $
* $Author: e107coders $
*
*/
@ -341,18 +341,19 @@ class links
<col style='width: 5%' />
<col style='width: 60%' />
<col style='width: 15%' />
<col style='width: 5%' />
<col style='width: 5%' />
<col style='width: 10%' />
<col style='width: 5%' />
<col style='width: 5%' />
</colgroup>
<thead>
<tr>
<th class='center'>".LCLAN_89."</th>
<th>".LCLAN_15."</th>
<th class='center'>".LAN_OPTIONS."</th>
<th class='center'>".LCLAN_95."</th>
<th class='center'>".LCLAN_95."</th>
<th class='center'>".LCLAN_91."</th>
<th class='center last'>".LAN_ORDER."</th>
<th class='center'>".LAN_OPTIONS."</th>
</tr>
</thead>
<tbody>
@ -406,7 +407,7 @@ class links
<col style='width: 5%' />
<col style='width: 60%' />
<col style='width: 15%' />
<col style='width: 10%' />
<col style='width: 10%' />
<col style='width: 5%' />
<col style='width: 5%' />
</colgroup>
@ -414,7 +415,7 @@ class links
<tr>
<th class='center'>".LCLAN_89."</th>
<th>".LCLAN_15." (".LCLAN_12.": ".$link_category.")</th>
<th class='center'>".LAN_OPTIONS."</th>
<th class='center'>".LAN_OPTIONS." hihihi</th>
<th class='center'>".LCLAN_95."</th>
<th class='center'>".LCLAN_91."</th>
<th class='center last'>".LAN_ORDER."</th>
@ -437,7 +438,7 @@ class links
if($indent)
{
$subimage = "<img class='icon S16' src='".e_IMAGE_ABS."admin_images/sublink.png' alt='' />";
$subimage = "<img src='".e_IMAGE."generic/branchbottom.gif' alt='' />";
$subspacer = ($indent > 1) ? " style='padding-left: ".(($indent - 1) * 16)."px'" : "";
}
@ -453,11 +454,7 @@ class links
</td>
";
$text .= "
<td class='center'>
<a href='".e_SELF."?create.sub.{$link_id}'><img class='icon action S16' src='".e_IMAGE_ABS."admin_images/sublink_16.png' title='".LINKLAN_10."' alt='".LINKLAN_10."' /></a>&nbsp;
<a href='".e_SELF."?create.edit.{$link_id}'>".ADMIN_EDIT_ICON."</a>&nbsp;
<input class='action delete' type='image' name='main_delete_{$link_id}' src='".ADMIN_DELETE_ICON_PATH."' title='".$tp->toJS(LCLAN_58." [ $link_name ]")."' />
</td>
<td>".r_userclass("link_class[".$link_id."]", $link_class, "off", "public,guest,nobody,member,main,admin,classes")."</td>
<td class='center'>
";
@ -473,6 +470,11 @@ class links
$text .= "
</select>
</td>
<td class='center'>
<a href='".e_SELF."?create.sub.{$link_id}' title='".LINKLAN_10."'>".ADMIN_ADD_ICON."</a>&nbsp;
<a href='".e_SELF."?create.edit.{$link_id}'>".ADMIN_EDIT_ICON."</a>&nbsp;
<input class='action delete' type='image' name='main_delete_{$link_id}' src='".ADMIN_DELETE_ICON_PATH."' title='".$tp->toJS(LCLAN_58." [ $link_name ]")."' />
</td>
</tr>
";

22
e107_admin/newspost.php
View File

@ -9,8 +9,8 @@
* News Administration
*
* $Source: /cvs_backup/e107_0.8/e107_admin/newspost.php,v $
* $Revision: 1.43 $
* $Date: 2009-07-14 11:05:50 $
* $Revision: 1.44 $
* $Date: 2009-07-17 07:53:13 $
* $Author: e107coders $
*/
require_once("../class2.php");
@ -164,9 +164,11 @@ class admin_newspost
var $_fields;
var $_sort_order;
var $_sort_link;
var $fieldpref;
function admin_newspost($qry, $pstobj)
{
global $user_pref;
$this->parseRequest($qry);
require_once(e_HANDLER."calendar/calendar_class.php");
@ -174,6 +176,8 @@ class admin_newspost
$this->_pst = &$pstobj;
$this->fieldpref = $user_pref['admin_news_columns'];
$this->_fields = array(
"checkboxes" => array("title" => "", "forced"=> TRUE, "width" => "3%", "thclass" => "center first", "url" => ""),
"news_id" => array("title" => LAN_NEWS_45, "type"=>"number", "width" => "5%", "thclass" => "center", "url" => e_SELF."?main.news_id.".$this->_sort_link.".".$this->getFrom()),
@ -187,7 +191,7 @@ class admin_newspost
"news_sticky" => array("title" => LAN_NEWS_28, "type"=>"boolean", "width" => "auto", "thclass" => "", "url" => ""),
"news_allow_comments" => array("title" => NWSLAN_15, "type"=>"boolean", "width" => "auto", "thclass" => "", "url" => ""),
"news_comment_total" => array("title" => LAN_NEWS_60, "type"=>"number", "width" => "auto", "thclass" => "", "url" => ""),
"options" => array("title" => LAN_OPTIONS, "width" => "300px", "thclass" => "center last", "url" => "")
"options" => array("title" => LAN_OPTIONS, "width" => "10%", "thclass" => "center last", "url" => "", 'forced'=>TRUE)
);
@ -588,6 +592,7 @@ class admin_newspost
global $user_pref,$admin_log;
$user_pref['admin_news_columns'] = $_POST['e-columns'];
save_prefs('user');
$this->fieldpref = $user_pref['admin_news_columns'];
}
function show_existing_items()
@ -610,8 +615,6 @@ class admin_newspost
$field_columns = $this->_fields;
$field_count = count($field_columns);
$e107 = &e107::getInstance();
// Grab news Category Names;
@ -668,12 +671,9 @@ class admin_newspost
<fieldset id='core-newspost-list'>
<legend class='e-hideme'>".NWSLAN_4."</legend>
<table cellpadding='0' cellspacing='0' class='adminlist'>
<colgroup span='".$field_count."'>".$frm->colGroup($this->_fields,$user_pref['admin_news_columns'])."</colgroup>
<thead>
<tr>".$frm->thead($this->_fields,$user_pref['admin_news_columns'])."</tr>
</thead>
<tbody>
";
".$frm->colGroup($this->_fields,$this->fieldpref).
$frm->thead($this->_fields,$this->fieldpref,"main.[FIELD].[ASC].[FROM]")."
<tbody>";
$ren_type = array("default","title","other-news","other-news 2");

10
e107_admin/plugin.php
View File

@ -11,8 +11,8 @@
| GNU General Public License (http://gnu.org).
|
| $Source: /cvs_backup/e107_0.8/e107_admin/plugin.php,v $
| $Revision: 1.33 $
| $Date: 2009-07-17 03:53:14 $
| $Revision: 1.34 $
| $Date: 2009-07-17 07:53:13 $
| $Author: e107coders $
+----------------------------------------------------------------------------+
*/
@ -671,10 +671,8 @@ class pluginManager{
<fieldset id='core-newspost-list'>
<legend class='e-hideme'>".NWSLAN_4."</legend>
<table cellpadding='0' cellspacing='0' class='adminlist'>
<colgroup span='".count($this->fieldpref)."'>".$frm->colGroup($this->fields,$this->fieldpref)."</colgroup>
<thead>
<tr>".$frm->thead($this->fields,$this->fieldpref)."</tr>
</thead>
".$frm->colGroup($this->fields,$this->fieldpref).
$frm->thead($this->fields,$this->fieldpref)."
<tbody>
";

351
e107_admin/users.php
View File

@ -9,8 +9,8 @@
* Administration Area - Users
*
* $Source: /cvs_backup/e107_0.8/e107_admin/users.php,v $
* $Revision: 1.39 $
* $Date: 2009-07-08 10:31:52 $
* $Revision: 1.40 $
* $Date: 2009-07-17 07:53:13 $
* $Author: e107coders $
*
*/
@ -658,6 +658,10 @@ class users
var $fields = array();
var $fieldpref = array();
var $sortorder = "asc";
var $sortorderrev = "desc";
var $sortfield = "user_id";
var $from = 0;
function users()
@ -668,19 +672,39 @@ class users
if(isset($pref['admin_user_disp']))
{
$user_pref['admin_users_columns'] = ($pref['admin_user_disp']) ? explode("|",$pref['admin_user_disp']) : array('user_name', 'user_class');
$user_pref['admin_users_columns'] = ($pref['admin_user_disp']) ? explode("|",$pref['admin_user_disp']) : array('user_status', 'user_name', 'user_class');
save_prefs('user');
unset($pref['admin_user_disp']);
save_prefs;
save_prefs();
}
$this->usersSaveColumnPref();
$this->fieldpref = (!$user_pref['admin_users_columns']) ? array('user_name', 'user_class') : $user_pref['admin_users_columns'];
/* if (e_QUERY)
{
$tmp = explode('.', e_QUERY);
$action = $tmp[0]; // main
$sub_action = varset($tmp[1],'');
$id = varset($tmp[2],0);
$from = varset($tmp[3],0);
unset($tmp);
}*/
global $sub_action, $id, $from;
if($from)
{
$this->sortfield = $sub_action;
$this->sortorder = $id;
$this->sortorderrev = ($this->sortorder == 'asc') ? 'desc' : 'asc';
$this->from = $from;
}
$this->fields = array(
'user_id' => array('title'=> 'Id', 'width'=>'5%', 'forced'=> TRUE),
'user_status' => array('title'=> ADLAN_134, 'forced'=> TRUE),
'user_name' => array('title'=> LAN_USER_01, 'type' => 'text', 'width' => 'auto', 'thclass' => 'left first'), // Display name
'user_status' => array('title'=> ADLAN_134, 'width'=>'auto'),
'user_name' => array('title'=> LAN_USER_01, 'type' => 'text', 'width' => 'auto', 'thclass' => 'left first' ), // Display name
'user_loginname' => array('title'=> LAN_USER_02, 'type' => 'text', 'width' => 'auto'), // User name
'user_login' => array('title'=> LAN_USER_03, 'type' => 'text', 'width' => 'auto'), // Real name (no real vetting)
'user_customtitle' => array('title'=> LAN_USER_04, 'type' => 'text', 'width' => 'auto'), // No real vetting
@ -702,8 +726,7 @@ class users
'user_visits' => array('title' => LAN_USER_21, 'width'=> 'auto'),
'user_admin' => array('title' => LAN_USER_22, 'width'=> 'auto'),
'user_perms' => array('title' => LAN_USER_23, 'width'=> 'auto'),
'user_pwchange' => array('title' => LAN_USER_24, 'width'=> 'auto')
'user_pwchange' => array('title' => LAN_USER_24, 'width'=> 'auto'),
);
@ -716,7 +739,7 @@ class users
$this->fields[$field] = array('title'=>$title,'width'=>'auto');
}
$this->fields['options'] = array('title' => LAN_OPTIONS, 'width'=>'10%', "thclass" => "center last");
$this->fields['options'] = array('title' => LAN_OPTIONS, 'width'=>'10%', "thclass" => "center last", 'forced'=>TRUE);
}
@ -730,171 +753,33 @@ class users
}
}
function show_existing_users($action, $sub_action, $id, $from, $amount)
function showUserStatus($row)
{
global $sql, $frm, $ns, $tp, $mySQLdefaultdb,$pref,$unverified, $userMethods;
$e107 = e107::getInstance();
$text = "<div style='text-align:center'>";
if (isset($_POST['searchquery']) && $_POST['searchquery'] != "")
{
$_POST['searchquery'] = $tp->toDB(trim($_POST['searchquery']));
$query = 'WHERE '.
$query .= (strpos($_POST['searchquery'], "@") !== FALSE) ? "user_email REGEXP('".$_POST['searchquery']."') OR ": "";
$query .= (strpos($_POST['searchquery'], ".") !== FALSE) ? "user_ip REGEXP('".$_POST['searchquery']."') OR ": "";
foreach($this->fieldpref as $disp)
{
$query .= $disp." REGEXP('".$_POST['searchquery']."') OR ";
}
$query .= "user_login REGEXP('".$_POST['searchquery']."') OR ";
$query .= "user_name REGEXP('".$_POST['searchquery']."') ";
if($action == 'unverified')
{
$query .= ' AND user_ban = 2 ';
}
$query .= ' ORDER BY user_id';
}
else
{
$query = '';
if($action == 'unverified')
{
$query = 'WHERE user_ban = 2 ';
}
$query .= 'ORDER BY '.($sub_action ? $sub_action : 'user_id').' '.($id ? $id : 'DESC')." LIMIT $from, $amount";
}
// $user_total = db_Count($table, $fields = '(*)',
$qry_insert = 'SELECT u.*, ue.* FROM `#user` AS u LEFT JOIN `#user_extended` AS ue ON ue.user_extended_id = u.user_id ';
if ($user_total = $sql->db_Select_gen($qry_insert. $query))
{
$text .= "<form method='post' action='".e_SELF."?".e_QUERY."'>
<fieldset id='core-users-list'>
<legend class='e-hideme'>".NWSLAN_4."</legend>
<table cellpadding='0' cellspacing='0' class='adminlist'>
<colgroup span='".count($this->fieldpref)."'>".$frm->colGroup($this->fields,$this->fieldpref)."</colgroup>
<thead>
<tr>".$frm->thead($this->fields,$this->fieldpref)."</tr>
</thead>
<tbody>";
/* <thead>
<tr>
<th style='width:5%'><a href='".e_SELF."?main.user_id.".($id == "desc" ? "asc" : "desc").".$from'>ID</a></th>
<th style='width:10%'><a href='".e_SELF."?main.user_ban.".($id == "desc" ? "asc" : "desc").".$from'>".USRLAN_79."</a></th>";
// Search Display Column header.
$display_lan = $userMethods->getNiceNames(TRUE); // List of field names and descriptive names
foreach($this->fieldpref as $disp)
{
if (isset($display_lan[$disp]))
{
$text .= "<th style='width:15%'><a href='".e_SELF."?main.$disp.".($id == "desc" ? "asc" : "desc").".$from'>".$display_lan[$disp]."</a></th>";
}
else
{
$text .= "<th style='width:15%'><a href='".e_SELF."?main.$disp.".($id == "desc" ? "asc" : "desc").".$from'>".ucwords(str_replace("_"," ",$disp))."</a></th>";
}
}
// ------------------------------
$text .= "<th style='width:30%'>".LAN_OPTIONS."</th>
</tr>
</thead><tbody>";*/
while ($row = $sql->db_Fetch())
{
extract($row);
$text .= "<tr>
<td style='width:5%; text-align:center' >{$user_id}</td>
<td style='width:10%'>";
if ($user_perms == "0") {
if ($row['user_perms'] == "0") {
$text .= "<div class='fcaption' style='padding-left:3px;padding-right:3px;text-align:center;white-space:nowrap'>".LAN_MAINADMIN."</div>";
}
else if($user_admin) {
else if($row['user_admin']) {
$text .= "<div class='fcaption' style='padding-left:3px;padding-right:3px;;text-align:center'><a href='".e_SELF."?main.user_admin.".($id == "desc" ? "asc" : "desc")."'>".LAN_ADMIN."</a></div>";
}
else if($user_ban == 1) {
else if($row['user_ban'] == 1) {
$text .= "<div class='fcaption' style='padding-left:3px;padding-right:3px;text-align:center;white-space:nowrap'><a href='".e_SELF."?main.user_ban.".($id == "desc" ? "asc" : "desc")."'>".LAN_BANNED."</a></div>";
}
else if($user_ban == 2) {
else if($row['user_ban'] == 2) {
$text .= "<div class='fcaption' style='padding-left:3px;padding-right:3px;text-align:center;white-space:nowrap' >".LAN_NOTVERIFIED."</div>";
}
else if($user_ban == 3) {
else if($row['user_ban'] == 3) {
$text .= "<div class='fcaption' style='padding-left:3px;padding-right:3px;text-align:center;white-space:nowrap' >".LAN_BOUNCED."</div>";
} else {
$text .= "&nbsp;";
}
return $text;
$text .= "</td>";
}
// Display Chosen options
$datefields = array("user_lastpost","user_lastvisit","user_join","user_currentvisit");
$boleanfields = array("user_admin","user_hideemail","user_ban");
foreach($this->fieldpref as $disp)
{
$text .= "<td style='white-space:nowrap'>";
if($disp == 'user_class')
{
if ($user_class)
{
$tmp = explode(",", $user_class);
while (list($key, $class_id) = each($tmp))
{
$text .= $e107->user_class->uc_get_classname($class_id)."<br />\n";
}
}
else
{
$text .= "&nbsp;";
}
}
elseif($disp == 'user_ip')
{
$text .= $e107->ipDecode($user_ip);
}
elseif (in_array($disp,$boleanfields))
{
$text .= ($row[$disp]) ? ADMIN_TRUE_ICON : '';
}
elseif(in_array($disp,$datefields))
{
$text .= ($row[$disp]) ? strftime($pref['shortdate'],$row[$disp]).'&nbsp;' : '&nbsp';
}
elseif($disp == 'user_name')
{
$text .= "<a href='".$e107->url->getUrl('core:user', 'main', 'func=profile&id='.$row['user_id'])."'>{$row['user_name']}</a>";
}
else
{
$text .= $row[$disp].'&nbsp;';
}
if(!in_array($disp,$boleanfields) && isset($prev[$disp]) && $row[$disp] == $prev[$disp] && $prev[$disp] != "")
{ // show matches
$text .= " <b>*</b>";
}
$text .= "</td>";
$prev[$disp] = $row[$disp];
}
// -------------------------------------------------------------
$qry = (e_QUERY) ? "?".e_QUERY : "";
$text .= "
<td style='width:30%' class='center'>
<div>
function showUserOptions($row)
{
extract($row);
$text .= "<div>
<input type='hidden' name='userid[{$user_id}]' value='{$user_id}' />
<input type='hidden' name='userip[{$user_id}]' value='{$user_ip}' />
@ -950,7 +835,153 @@ class users
$text .= "<option value='deluser'>".LAN_DELETE."</option>\n";
}
$text .= "</select></div>";
$text .= "</td></tr>";
return $text;
}
function show_existing_users($action, $sub_action, $id, $from, $amount)
{
global $sql, $frm, $ns, $tp, $mySQLdefaultdb,$pref,$unverified, $userMethods;
$e107 = e107::getInstance();
$text = "<div style='text-align:center'>";
if (isset($_POST['searchquery']) && $_POST['searchquery'] != "")
{
$_POST['searchquery'] = $tp->toDB(trim($_POST['searchquery']));
$query = 'WHERE '.
$query .= (strpos($_POST['searchquery'], "@") !== FALSE) ? "user_email REGEXP('".$_POST['searchquery']."') OR ": "";
$query .= (strpos($_POST['searchquery'], ".") !== FALSE) ? "user_ip REGEXP('".$_POST['searchquery']."') OR ": "";
foreach($this->fieldpref as $disp)
{
$query .= $disp." REGEXP('".$_POST['searchquery']."') OR ";
}
$query .= "user_login REGEXP('".$_POST['searchquery']."') OR ";
$query .= "user_name REGEXP('".$_POST['searchquery']."') ";
if($action == 'unverified')
{
$query .= ' AND user_ban = 2 ';
}
$query .= ' ORDER BY user_id';
}
else
{
$query = '';
if($action == 'unverified')
{
$query = 'WHERE user_ban = 2 ';
}
$query .= 'ORDER BY '.($sub_action ? $sub_action : 'user_id').' '.($id ? $id : 'DESC')." LIMIT $from, $amount";
}
// $user_total = db_Count($table, $fields = '(*)',
$qry_insert = 'SELECT u.*, ue.* FROM `#user` AS u LEFT JOIN `#user_extended` AS ue ON ue.user_extended_id = u.user_id ';
if ($user_total = $sql->db_Select_gen($qry_insert. $query))
{
$text .= "<form method='post' action='".e_SELF."?".e_QUERY."'>
<fieldset id='core-users-list'>
<legend class='e-hideme'>".NWSLAN_4."</legend>
<table cellpadding='0' cellspacing='0' class='adminlist'>".
$frm->colGroup($this->fields,$this->fieldpref).
$frm->thead($this->fields,$this->fieldpref,"main.[FIELD].[ASC].[FROM]").
"<tbody>";
/* <thead>
<tr>
<th style='width:5%'><a href='".e_SELF."?main.user_id.".($id == "desc" ? "asc" : "desc").".$from'>ID</a></th>
<th style='width:10%'><a href='".e_SELF."?main.user_ban.".($id == "desc" ? "asc" : "desc").".$from'>".USRLAN_79."</a></th>";
// Search Display Column header.
$display_lan = $userMethods->getNiceNames(TRUE); // List of field names and descriptive names
foreach($this->fieldpref as $disp)
{
if (isset($display_lan[$disp]))
{
$text .= "<th style='width:15%'><a href='".e_SELF."?main.$disp.".($id == "desc" ? "asc" : "desc").".$from'>".$display_lan[$disp]."</a></th>";
}
else
{
$text .= "<th style='width:15%'><a href='".e_SELF."?main.$disp.".($id == "desc" ? "asc" : "desc").".$from'>".ucwords(str_replace("_"," ",$disp))."</a></th>";
}
}
// ------------------------------
$text .= "<th style='width:30%'>".LAN_OPTIONS."</th>
</tr>
</thead><tbody>";*/
while ($row = $sql->db_Fetch())
{
extract($row);
$text .= "<tr>
<td style='width:5%; text-align:center' >{$user_id}</td>";
// Display Chosen options
$datefields = array("user_lastpost","user_lastvisit","user_join","user_currentvisit");
$boleanfields = array("user_admin","user_hideemail","user_ban");
foreach($this->fieldpref as $disp)
{
$text .= "<td style='white-space:nowrap'>";
if($disp == 'user_class')
{
if ($user_class)
{
$tmp = explode(",", $user_class);
while (list($key, $class_id) = each($tmp))
{
$text .= $e107->user_class->uc_get_classname($class_id)."<br />\n";
}
}
else
{
$text .= "&nbsp;";
}
}
elseif($disp == 'user_ip')
{
$text .= $e107->ipDecode($user_ip);
}
elseif (in_array($disp,$boleanfields))
{
$text .= ($row[$disp]) ? ADMIN_TRUE_ICON : '';
}
elseif(in_array($disp,$datefields))
{
$text .= ($row[$disp]) ? strftime($pref['shortdate'],$row[$disp]).'&nbsp;' : '&nbsp';
}
elseif($disp == 'user_name')
{
$text .= "<a href='".$e107->url->getUrl('core:user', 'main', 'func=profile&id='.$row['user_id'])."'>{$row['user_name']}</a>";
}
elseif($disp == "user_status")
{
$text .= $this->showUserStatus($row);
}
else
{
$text .= $row[$disp].'&nbsp;';
}
if(!in_array($disp,$boleanfields) && isset($prev[$disp]) && $row[$disp] == $prev[$disp] && $prev[$disp] != "")
{ // show matches
$text .= " <b>*</b>";
}
$text .= "</td>";
$prev[$disp] = $row[$disp];
}
// -------------------------------------------------------------
$qry = (e_QUERY) ? "?".e_QUERY : "";
$text .= "
<td style='width:30%' class='center'>".$this->showUserOptions($row)."</td></tr>";
}
$text .= "</tbody></table></fieldset> ";

36
e107_admin/wmessage.php
View File

@ -11,8 +11,8 @@
| GNU General Public License (http://gnu.org).
|
| $Source: /cvs_backup/e107_0.8/e107_admin/wmessage.php,v $
| $Revision: 1.4 $
| $Date: 2009-07-14 11:05:51 $
| $Revision: 1.5 $
| $Date: 2009-07-17 07:53:13 $
| $Author: e107coders $
+----------------------------------------------------------------------------+
*/
@ -111,28 +111,38 @@ if ($action == "main" || $action == "")
$wmList = $sql->db_getList();
$text = $rs->form_open("post", e_SELF, "myform_{$gen_id}", "", "");
$text .= "<div style='text-align:center'>
<table class='adminlist'>
<table cellpadding='0' cellspacing='0' class='adminlist'>
<colgroup span='4'>
<col style='width:5%' />
<col style='width:60%' />
<col style='width:20%' />
<col style='width:10%' />
</colgroup>
<thead>
<tr>
<td style='width:5%'>ID</td>
<td style='width:70%'>".WMLAN_02."</td>
<td style='width:20%'>".WMLAN_03."</td>
<td style='width:15%'>".LAN_OPTIONS."</td>
</tr>";
<th>ID</th>
<th>".WMLAN_02."</th>
<th class='center'>".WMLAN_03."</th>
<th class='center'>".LAN_OPTIONS."</th>
</tr>
</thead>
<tbody>";
foreach($wmList as $row)
{
$text .= "
<tr>
<td style='width:5%; text-align: center; vertical-align: middle'>".$row['gen_id']."</td>
<td style='width:70%'>".strip_tags($tp->toHTML($row['gen_ip']))."</td>
<td style='width:70%'>".r_userclass_name($row['gen_intdata'])."</td>
<td style='width:15%; text-align:center; white-space: nowrap'>
<td class='center' style='text-align: center; vertical-align: middle'>".$row['gen_id']."</td>
<td>".strip_tags($tp->toHTML($row['gen_ip']))."</td>
<td>".r_userclass_name($row['gen_intdata'])."</td>
<td class='center nowrap'>
<a href='".e_SELF."?create.edit.{$row['gen_id']}'>".ADMIN_EDIT_ICON."</a>
<input type='image' title='".LAN_DELETE."' name='main_delete[".$row['gen_id']."]' src='".ADMIN_DELETE_ICON_PATH."' onclick=\"return jsconfirm('".LAN_CONFIRMDEL." [ID: {$row['gen_id']} ]')\"/>
</td>
</tr>";
}
$text .= "</table></div>";
$text .= "</tbody></table></div>";
$text .= $rs->form_close();
} else {
$text .= "<div style='text-align:center'>".WMLAN_09."</div>";

58
e107_handlers/form_handler.php
View File

@ -9,8 +9,8 @@
* Form Handler
*
* $Source: /cvs_backup/e107_0.8/e107_handlers/form_handler.php,v $
* $Revision: 1.35 $
* $Date: 2009-07-17 03:53:14 $
* $Revision: 1.36 $
* $Date: 2009-07-17 07:53:13 $
* $Author: e107coders $
*
*/
@ -606,36 +606,78 @@ class e_form
function colGroup($fieldarray,$columnPref='')
{
$text = "";
$count = 0;
foreach($fieldarray as $key=>$val)
{
if(in_array($key,$columnPref) || $key=='options' || varsettrue($val['forced']))
{
$text .= "\n<col style='width: ".$val['width'].";'></col>";
$count++;
}
}
return $text;
return "<colgroup span='".$count."'>\n".$text."\n</colgroup>\n";
}
function thead($fieldarray,$columnPref='')
function thead($fieldarray,$columnPref='',$querypattern = '')
{
$text = "";
$tmp = explode(".",e_QUERY);
$etmp = explode(".",$querypattern);
// Note: this function should probably be adapted to ALSO deal with $_GET. eg. ?mode=main&field=user_name&asc=desc&from=100
// or as a pattern: ?mode=main&field=[FIELD]&asc=[ASC]&from=[FROM]
foreach($etmp as $key=>$val) // I'm sure there's a more efficient way to do this, but too tired to see it right now!.
{
if($val == "[FIELD]")
{
$field = $tmp[$key];
}
if($val == "[ASC]")
{
$ascdesc = $tmp[$key];
}
if($val == "[FROM]")
{
$fromval = $tmp[$key];
}
}
if(!$fromval){ $fromval = 0; }
$ascdesc = ($ascdesc == 'desc') ? 'asc' : 'desc';
foreach($fieldarray as $key=>$val)
{
if(in_array($key,$columnPref) || $key == "options" || (varsettrue($val['forced'])))
{
$cl = (varset($val['thclass'])) ? "class='".$val['thclass']."'" : "";
$text .= "\n\t<th id='$key' {$cl}>";
$text .= "\n\t<th id='e-column-".$key."' {$cl}>";
if($querypattern!="" && !varsettrue($val['nosort']) && $key != "options")
{
$from = ($key == $field) ? $fromval : 0;
$srch = array("[FIELD]","[ASC]","[FROM]");
$repl = array($key,$ascdesc,$from);
$val['url'] = e_SELF."?".str_replace($srch,$repl,$querypattern);
}
$text .= (varset($val['url'])) ? "<a href='".$val['url']."'>" : ""; // Really this column-sorting link should be auto-generated, or be autocreated via unobtrusive js.
$text .= $val['title'];
$text .= ($val['url']) ? "</a>" : "";
$text .= ($key == "options") ? $this->columnSelector($fieldarray,$columnPref) : "";
$text .= ($val['url']) ? "</a>" : "";
$text .= "</th>";
}
}
return $text;
return "<thead>\n<tr>\n".$text."\n</tr>\n</thead>\n\n";
}

BIN
e107_images/admin_images/configure_16.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 980 B

BIN
e107_images/admin_images/configure_32.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.9 KiB

BIN
e107_images/admin_images/info_16.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 978 B

52
e107_plugins/download/handlers/adminDownload_class.php
View File

@ -11,8 +11,8 @@
| GNU General Public License (http://gnu.org).
|
| $Source: /cvs_backup/e107_0.8/e107_plugins/download/handlers/adminDownload_class.php,v $
| $Revision: 1.7 $
| $Date: 2009-07-17 02:28:49 $
| $Revision: 1.8 $
| $Date: 2009-07-17 07:53:13 $
| $Author: e107coders $
|
+----------------------------------------------------------------------------+
@ -193,26 +193,26 @@ class adminDownload extends download
$sort_link = $sortdirection == 'asc' ? 'desc' : 'asc';
$columnInfo = array(
"download_id" => array("title"=>DOWLAN_67, "type"=>"", "width"=>"auto", "thclass"=>"center first", "url"=>e_SELF."?main.download_id.{$sort_link}.{$from}", "forced"=>true),
"download_name" => array("title"=>DOWLAN_12, "type"=>"", "width"=>"auto", "thclass"=>"", "url"=>e_SELF."?main.download_name.{$sort_link}.{$from}"),
"download_url" => array("title"=>DOWLAN_13, "type"=>"", "width"=>"auto", "thclass"=>"", "url"=>e_SELF."?main.download_url.{$sort_link}.{$from}"),
"download_author" => array("title"=>DOWLAN_15, "type"=>"", "width"=>"auto", "thclass"=>"", "url"=>e_SELF."?main.download_author.{$sort_link}.{$from}"),
"download_author_email" => array("title"=>DOWLAN_16, "type"=>"", "width"=>"auto", "thclass"=>"", "url"=>e_SELF."?main.download_author_email.{$sort_link}.{$from}"),
"download_author_website" => array("title"=>DOWLAN_17, "type"=>"", "width"=>"auto", "thclass"=>"", "url"=>e_SELF."?main.download_author_website.{$sort_link}.{$from}"),
"download_description" => array("title"=>DOWLAN_18, "type"=>"", "width"=>"auto", "thclass"=>"", "url"=>e_SELF."?main.download_description.{$sort_link}.{$from}"),
"download_filesize" => array("title"=>DOWLAN_66, "type"=>"", "width"=>"auto", "thclass"=>"right", "url"=>e_SELF."?main.download_filesize.{$sort_link}.{$from}"),
"download_requested" => array("title"=>DOWLAN_29, "type"=>"", "width"=>"auto", "thclass"=>"center", "url"=>e_SELF."?main.download_requested.{$sort_link}.{$from}"),
"download_category" => array("title"=>DOWLAN_11, "type"=>"", "width"=>"auto", "thclass"=>"", "url"=>e_SELF."?main.download_category.{$sort_link}.{$from}"),
"download_active" => array("title"=>DOWLAN_21, "type"=>"", "width"=>"auto", "thclass"=>"center", "url"=>e_SELF."?main.download_active.{$sort_link}.{$from}"),
"download_datestamp" => array("title"=>DOWLAN_182, "type"=>"", "width"=>"auto", "thclass"=>"", "url"=>e_SELF."?main.download_datestamp.{$sort_link}.{$from}"),
"download_thumb" => array("title"=>DOWLAN_20, "type"=>"", "width"=>"auto", "thclass"=>"center", "url"=>e_SELF."?main.download_thumb.{$sort_link}.{$from}"),
"download_image" => array("title"=>DOWLAN_19, "type"=>"", "width"=>"auto", "thclass"=>"", "url"=>e_SELF."?main.download_image.{$sort_link}.{$from}"),
"download_comment" => array("title"=>DOWLAN_102, "type"=>"", "width"=>"auto", "thclass"=>"center", "url"=>e_SELF."?main.download_comment.{$sort_link}.{$from}"),
"download_class" => array("title"=>DOWLAN_113, "type"=>"", "width"=>"auto", "thclass"=>"", "url"=>e_SELF."?main.download_class.{$sort_link}.{$from}"),
"download_mirror" => array("title"=>DOWLAN_128, "type"=>"", "width"=>"auto", "thclass"=>"", "url"=>e_SELF."?main.download_mirror.{$sort_link}.{$from}"),
"download_mirror_type" => array("title"=>DOWLAN_195, "type"=>"", "width"=>"auto", "thclass"=>"", "url"=>e_SELF."?main.download_mirror_type.{$sort_link}.{$from}"),
"download_visible" => array("title"=>DOWLAN_43, "type"=>"", "width"=>"auto", "thclass"=>"", "url"=>e_SELF."?main.download_visible.{$sort_link}.{$from}"),
"options" => array("title"=>LAN_OPTIONS, "width"=>"auto", "thclass"=>"center last", "url"=>"", "forced"=>true)
"download_id" => array("title"=>DOWLAN_67, "type"=>"", "width"=>"auto", "thclass"=>"center first", "forced"=>true),
"download_name" => array("title"=>DOWLAN_12, "type"=>"", "width"=>"auto", "thclass"=>""),
"download_url" => array("title"=>DOWLAN_13, "type"=>"", "width"=>"auto", "thclass"=>""),
"download_author" => array("title"=>DOWLAN_15, "type"=>"", "width"=>"auto", "thclass"=>""),
"download_author_email" => array("title"=>DOWLAN_16, "type"=>"", "width"=>"auto", "thclass"=>""),
"download_author_website" => array("title"=>DOWLAN_17, "type"=>"", "width"=>"auto", "thclass"=>""),
"download_description" => array("title"=>DOWLAN_18, "type"=>"", "width"=>"auto", "thclass"=>""),
"download_filesize" => array("title"=>DOWLAN_66, "type"=>"", "width"=>"auto", "thclass"=>"right"),
"download_requested" => array("title"=>DOWLAN_29, "type"=>"", "width"=>"auto", "thclass"=>"center"),
"download_category" => array("title"=>DOWLAN_11, "type"=>"", "width"=>"auto", "thclass"=>""),
"download_active" => array("title"=>DOWLAN_21, "type"=>"", "width"=>"auto", "thclass"=>"center"),
"download_datestamp" => array("title"=>DOWLAN_182, "type"=>"", "width"=>"auto", "thclass"=>""),
"download_thumb" => array("title"=>DOWLAN_20, "type"=>"", "width"=>"auto", "thclass"=>"center"),
"download_image" => array("title"=>DOWLAN_19, "type"=>"", "width"=>"auto", "thclass"=>""),
"download_comment" => array("title"=>DOWLAN_102, "type"=>"", "width"=>"auto", "thclass"=>"center"),
"download_class" => array("title"=>DOWLAN_113, "type"=>"", "width"=>"auto", "thclass"=>""),
"download_mirror" => array("title"=>DOWLAN_128, "type"=>"", "width"=>"auto", "thclass"=>""),
"download_mirror_type" => array("title"=>DOWLAN_195, "type"=>"", "width"=>"auto", "thclass"=>""),
"download_visible" => array("title"=>DOWLAN_43, "type"=>"", "width"=>"auto", "thclass"=>""),
"options" => array("title"=>LAN_OPTIONS, "width"=>"10%", "thclass"=>"center last", "forced"=>true)
);
$filterColumns = ($user_pref['admin_download_disp']) ? $user_pref['admin_download_disp'] : array("download_name","download_class");
@ -292,11 +292,9 @@ class adminDownload extends download
if ($dl_count = $sql->db_Select_gen($query))
{
$text .= $rs->form_open("post", e_SELF."?".e_QUERY, "myform")."
<table class='adminlist' style='width:100%'>
<colgroup span='".count($filterColumns)."'>".$eform->colGroup($columnInfo,$filterColumns)."</colgroup>
<thead>
<tr>".$eform->thead($columnInfo,$filterColumns)."</tr>
</thead>
<table class='adminlist'>
".$eform->colGroup($columnInfo,$filterColumns)
.$eform->thead($columnInfo,$filterColumns,"main.[FIELD].[ASC].[FROM]")."
<tbody>
";

12
e107_plugins/gsitemap/admin_config.php
View File

@ -9,8 +9,8 @@
* Plugin Administration - gsitemap
*
* $Source: /cvs_backup/e107_0.8/e107_plugins/gsitemap/admin_config.php,v $
* $Revision: 1.6 $
* $Date: 2009-07-07 06:50:55 $
* $Revision: 1.7 $
* $Date: 2009-07-17 07:53:13 $
* $Author: e107coders $
*
*/
@ -125,11 +125,11 @@ class gsitemap
<colgroup span='2'>
<col style='width:5%' />
<col style='width:10%' />
<col style='width:40%' />
<col style='width:35%' />
<col style='width:20%' />
<col style='width:10%' />
<col style='width:10%' />
<col style='width:5%' />
<col style='width:10%' />
</colgroup>
<thead>
<tr class='first last' >
@ -161,8 +161,8 @@ class gsitemap
<td class='center' style='white-space:nowrap'>
<div>
<input type='image' name='edit[{$row2['gsitemap_id']}]' value='edit' src='".e_IMAGE."admin_images/edit_16.png' alt='".LAN_EDIT."' title='".LAN_EDIT."' style='border:0px' />
<input type='image' name='delete[{$row2['gsitemap_id']}]' value='del' onclick=\"return jsconfirm('".$tp->toJS(LAN_CONFIRMDEL." [".$row2['gsitemap_name']."]")."') \" src='".e_IMAGE."admin_images/delete_16.png' alt='".LAN_DELETE."' title='".LAN_DELETE."' style='border:0px' />
<input type='image' name='edit[{$row2['gsitemap_id']}]' value='edit' src='".ADMIN_EDIT_ICON_PATH."' alt='".LAN_EDIT."' title='".LAN_EDIT."' style='border:0px' />
<input type='image' name='delete[{$row2['gsitemap_id']}]' value='del' onclick=\"return jsconfirm('".$tp->toJS(LAN_CONFIRMDEL." [".$row2['gsitemap_name']."]")."') \" src='".ADMIN_DELETE_ICON_PATH."' alt='".LAN_DELETE."' title='".LAN_DELETE."' style='border:0px' />
</div>
</td>
</tr>

14
e107_themes/_blank/admin_template.php
View File

@ -9,8 +9,8 @@
* Admin template - _blank theme
*
* $Source: /cvs_backup/e107_0.8/e107_themes/_blank/admin_template.php,v $
* $Revision: 1.13 $
* $Date: 2009-07-17 03:53:14 $
* $Revision: 1.14 $
* $Date: 2009-07-17 07:53:13 $
* $Author: e107coders $
*
*/
@ -50,6 +50,12 @@ if (!defined('ADMIN_WARNING_ICON'))
define("ADMIN_WARNING_ICON_PATH", e_IMAGE."admin_images/warning_32.png");
}
if (!defined('ADMIN_ADD_ICON'))
{
define("ADMIN_ADD_ICON", "<img class='icon action S32' src='".e_IMAGE_ABS."admin_images/add_32.png' alt='' />");
define("ADMIN_ADD_ICON_PATH", e_IMAGE."admin_images/add_32.png");
}
if (!defined('ADMIN_INFO_ICON'))
{
define("ADMIN_INFO_ICON", "<img class='icon action S32' src='".e_IMAGE_ABS."admin_images/info_32.png' alt='' />");
@ -58,8 +64,8 @@ if (!defined('ADMIN_INFO_ICON'))
if (!defined('ADMIN_CONFIGURE_ICON'))
{
define("ADMIN_CONFIGURE_ICON", "<img class='icon action S32' src='".e_IMAGE_ABS."admin_images/cat_tools_32.png' alt='' />");
define("ADMIN_CONFIGURE_ICON_PATH", e_IMAGE."admin_images/cat_tools_32.png");
define("ADMIN_CONFIGURE_ICON", "<img class='icon action S32' src='".e_IMAGE_ABS."admin_images/configure_32.png' alt='' />");
define("ADMIN_CONFIGURE_ICON_PATH", e_IMAGE."admin_images/configure_32.png");
}
if (!defined('ADMIN_VIEW_ICON'))