[geeklog-cvs] Geeklog-1.x/public_html/admin block.php, 1.113, 1.114 database.php, 1.40, 1.41 group.php, 1.93, 1.94 moderation.php, 1.108, 1.109 plugins.php, 1.73, 1.74 story.php, 1.260, 1.261 syndication.php, 1.50, 1.51 topic.php, 1.74, 1.75 trackback.php, 1.45, 1.46 user.php, 1.189, 1.190
Oliver
ospiess at qs1489.pair.com
Wed Aug 29 02:55:06 EDT 2007
Update of /usr/home/geeklog2/cvsroot/geeklog/Geeklog-1.x/public_html/admin
In directory qs1489.pair.com:/tmp/cvs-serv10093
Modified Files:
block.php database.php group.php moderation.php plugins.php
story.php syndication.php topic.php trackback.php user.php
Log Message:
de-cluttering the admin lists by outsourcing the top menu into a separate function. It has nothing to do with the list itself as such and can be used in other places now also to preserve formatting and move further HTML into a single template
Index: block.php
===================================================================
RCS file: /usr/home/geeklog2/cvsroot/geeklog/Geeklog-1.x/public_html/admin/block.php,v
retrieving revision 1.113
retrieving revision 1.114
diff -C2 -d -r1.113 -r1.114
*** block.php 23 Jul 2007 01:36:11 -0000 1.113
--- block.php 29 Aug 2007 06:55:04 -0000 1.114
***************
*** 190,198 ****
if (!empty($bid)) {
$sql['mysql'] = "SELECT * FROM {$_TABLES['blocks']} WHERE bid ='$bid'";
!
$sql['mssql'] = "SELECT bid, is_enabled, name, type, title, tid, blockorder, cast(content as text) as content, rdfurl, ";
$sql['mssql'] .= "rdfupdated, rdflimit, onleft, phpblockfn, help, owner_id,group_id, ";
$sql['mssql'] .= "perm_owner, perm_group, perm_members, perm_anon, allow_autotags FROM {$_TABLES['blocks']} WHERE bid ='$bid'";
!
$result = DB_query($sql);
$A = DB_fetchArray($result);
--- 190,198 ----
if (!empty($bid)) {
$sql['mysql'] = "SELECT * FROM {$_TABLES['blocks']} WHERE bid ='$bid'";
!
$sql['mssql'] = "SELECT bid, is_enabled, name, type, title, tid, blockorder, cast(content as text) as content, rdfurl, ";
$sql['mssql'] .= "rdfupdated, rdflimit, onleft, phpblockfn, help, owner_id,group_id, ";
$sql['mssql'] .= "perm_owner, perm_group, perm_members, perm_anon, allow_autotags FROM {$_TABLES['blocks']} WHERE bid ='$bid'";
!
$result = DB_query($sql);
$A = DB_fetchArray($result);
***************
*** 388,398 ****
'text' => $LANG_ADMIN['admin_home'])
);
! $text_arr = array('has_menu' => true,
! 'has_extras' => true,
! 'title' => $LANG21[19], 'instructions' => $LANG21[25],
! 'icon' => $_CONF['layout_url'] . '/images/icons/block.'
! . $_IMAGE_TYPE,
! 'form_url' => $_CONF['site_admin_url'] . "/block.php");
$query_arr = array('table' => 'blocks',
--- 388,402 ----
'text' => $LANG_ADMIN['admin_home'])
);
+ $menu = ADMIN_createMenu(
+ $menu_arr,
+ $LANG21[25],
+ $_CONF['layout_url'] . '/images/icons/block.'. $_IMAGE_TYPE
+ );
! $text_arr = array(
! 'has_extras' => true,
! 'title' => $LANG21[19],
! 'form_url' => $_CONF['site_admin_url'] . "/block.php"
! );
$query_arr = array('table' => 'blocks',
***************
*** 405,409 ****
$retval .= ADMIN_list ("blocks", "ADMIN_getListField_blocks", $header_arr, $text_arr,
! $query_arr, $menu_arr, $defsort_arr, '', '', '', $form_arr);
$query_arr = array('table' => 'blocks',
--- 409,413 ----
$retval .= ADMIN_list ("blocks", "ADMIN_getListField_blocks", $header_arr, $text_arr,
! $query_arr, $defsort_arr, $menu, '', '', '', $form_arr);
$query_arr = array('table' => 'blocks',
***************
*** 412,421 ****
'default_filter' => COM_getPermSql ('AND'));
! $text_arr = array('has_menu' => false,
! 'has_extras' => true,
! 'title' => "$LANG21[19] ($LANG21[41])", 'instructions' => $LANG21[25],
! 'icon' => $_CONF['layout_url'] . '/images/icons/block.'
! . $_IMAGE_TYPE,
! 'form_url' => $_CONF['site_admin_url'] . '/block.php');
// this is a dummy-variable so we know the form has been used if all blocks should be disabled
// on one side in order to disable the last one. The value is the onleft var
--- 416,424 ----
'default_filter' => COM_getPermSql ('AND'));
! $text_arr = array(
! 'has_extras' => true,
! 'title' => "$LANG21[19] ($LANG21[41])",
! 'form_url' => $_CONF['site_admin_url'] . '/block.php');
!
// this is a dummy-variable so we know the form has been used if all blocks should be disabled
// on one side in order to disable the last one. The value is the onleft var
***************
*** 423,427 ****
$retval .= ADMIN_list ('blocks', 'ADMIN_getListField_blocks', $header_arr, $text_arr,
! $query_arr, $menu_arr, $defsort_arr, '', '', '', $form_arr);
return $retval;
--- 426,430 ----
$retval .= ADMIN_list ('blocks', 'ADMIN_getListField_blocks', $header_arr, $text_arr,
! $query_arr, $defsort_arr, '', '', '', '', $form_arr);
return $retval;
Index: syndication.php
===================================================================
RCS file: /usr/home/geeklog2/cvsroot/geeklog/Geeklog-1.x/public_html/admin/syndication.php,v
retrieving revision 1.50
retrieving revision 1.51
diff -C2 -d -r1.50 -r1.51
*** syndication.php 9 Mar 2007 02:40:19 -0000 1.50
--- syndication.php 29 Aug 2007 06:55:04 -0000 1.51
***************
*** 151,160 ****
'text' => $LANG_ADMIN['admin_home'])
);
! $text_arr = array('has_menu' => true,
! 'has_extras' => true,
! 'title' => $LANG33[10], 'instructions' => $LANG33[13],
! 'icon' => $_CONF['layout_url'] . '/images/icons/syndication.' . $_IMAGE_TYPE,
! 'form_url' => $_CONF['site_admin_url'] . "/syndication.php");
$query_arr = array('table' => 'syndication',
--- 151,165 ----
'text' => $LANG_ADMIN['admin_home'])
);
+ $menu = ADMIN_createMenu(
+ $menu_arr,
+ $LANG33[13],
+ $_CONF['layout_url'] . '/images/icons/syndication.' . $_IMAGE_TYPE
+ );
! $text_arr = array(
! 'has_extras' => true,
! 'title' => $LANG33[10],
! 'form_url' => $_CONF['site_admin_url'] . "/syndication.php"
! );
$query_arr = array('table' => 'syndication',
***************
*** 167,171 ****
$retval .= ADMIN_list ("syndication", "ADMIN_getListField_syndication", $header_arr, $text_arr,
! $query_arr, $menu_arr, $defsort_arr, '', '', '', $form_arr);
return $retval;
}
--- 172,176 ----
$retval .= ADMIN_list ("syndication", "ADMIN_getListField_syndication", $header_arr, $text_arr,
! $query_arr, $defsort_arr, $menu, '', '', '', $form_arr);
return $retval;
}
Index: user.php
===================================================================
RCS file: /usr/home/geeklog2/cvsroot/geeklog/Geeklog-1.x/public_html/admin/user.php,v
retrieving revision 1.189
retrieving revision 1.190
diff -C2 -d -r1.189 -r1.190
*** user.php 9 Aug 2007 07:48:20 -0000 1.189
--- user.php 29 Aug 2007 06:55:04 -0000 1.190
***************
*** 384,404 ****
$menu_arr = array (
! array('url' => $_CONF['site_admin_url'] . '/user.php?mode=edit',
! 'text' => $LANG_ADMIN['create_new']),
! array('url' => $_CONF['site_admin_url'] . '/user.php?mode=importform',
! 'text' => $LANG28[23]),
! array('url' => $_CONF['site_admin_url'] . '/user.php?mode=batchdelete',
! 'text' => $LANG28[54]),
! array('url' => $_CONF['site_admin_url'],
! 'text' => $LANG_ADMIN['admin_home'])
);
! $text_arr = array('has_menu' => true,
! 'has_extras' => true,
! 'title' => $LANG28[11],
! 'instructions' => $LANG28[12],
! 'icon' => $_CONF['layout_url'] . '/images/icons/user.' . $_IMAGE_TYPE,
! 'form_url' => $_CONF['site_admin_url'] . "/user.php",
! 'help_url' => ''
);
--- 384,407 ----
$menu_arr = array (
! array('url' => $_CONF['site_admin_url'] . '/user.php?mode=edit',
! 'text' => $LANG_ADMIN['create_new']),
! array('url' => $_CONF['site_admin_url'] . '/user.php?mode=importform',
! 'text' => $LANG28[23]),
! array('url' => $_CONF['site_admin_url'] . '/user.php?mode=batchdelete',
! 'text' => $LANG28[54]),
! array('url' => $_CONF['site_admin_url'],
! 'text' => $LANG_ADMIN['admin_home'])
! );
! $menu = ADMIN_createMenu(
! $menu_arr,
! $LANG28[12],
! $_CONF['layout_url'] . '/images/icons/user.' . $_IMAGE_TYPE
);
! $text_arr = array(
! 'has_extras' => true,
! 'title' => $LANG28[11],
! 'form_url' => $_CONF['site_admin_url'] . "/user.php",
! 'help_url' => ''
);
***************
*** 416,420 ****
$display .= ADMIN_list ("user", "ADMIN_getListField_users", $header_arr, $text_arr,
! $query_arr, $menu_arr, $defsort_arr);
return $display;
}
--- 419,423 ----
$display .= ADMIN_list ("user", "ADMIN_getListField_users", $header_arr, $text_arr,
! $query_arr, $defsort_arr, $menu);
return $display;
}
Index: moderation.php
===================================================================
RCS file: /usr/home/geeklog2/cvsroot/geeklog/Geeklog-1.x/public_html/admin/moderation.php,v
retrieving revision 1.108
retrieving revision 1.109
diff -C2 -d -r1.108 -r1.109
*** moderation.php 29 Aug 2007 02:11:35 -0000 1.108
--- moderation.php 29 Aug 2007 06:55:04 -0000 1.109
***************
*** 144,160 ****
// and finally, add the remaining admin items
$cc_arr = array(
! array('condition' => ($_CONF['allow_mysqldump'] == 1) && ($_DB_dbms == 'mysql') && SEC_inGroup ('Root'),
! 'url' => $_CONF['site_admin_url'] . '/database.php',
! 'lang' => $LANG01[103], 'image' => '/images/icons/database.'),
! array('condition' => ($_CONF['link_documentation'] == 1),
! 'url' => $_CONF['site_url'] . '/docs/',
! 'lang' => $LANG01[113], 'image' => '/images/icons/docs.'),
! array('condition' => (SEC_inGroup ('Root')),
! 'url' => 'http://www.geeklog.net/versionchecker.php?version=' . VERSION,
! 'lang' => $LANG01[107], 'image' => '/images/icons/versioncheck.'),
! array('condition' => (SEC_inGroup ('Root')),
! 'url'=>$_CONF['site_admin_url'] . '/configuration.php',
! 'lang' => $LANG01[129], 'image' => '/images/icons/configuration.')
! );
for ($i = 0; $i < count ($cc_arr); $i++) {
--- 144,160 ----
// and finally, add the remaining admin items
$cc_arr = array(
! array('condition' => ($_CONF['allow_mysqldump'] == 1) && ($_DB_dbms == 'mysql') && SEC_inGroup ('Root'),
! 'url' => $_CONF['site_admin_url'] . '/database.php',
! 'lang' => $LANG01[103], 'image' => '/images/icons/database.'),
! array('condition' => ($_CONF['link_documentation'] == 1),
! 'url' => $_CONF['site_url'] . '/docs/',
! 'lang' => $LANG01[113], 'image' => '/images/icons/docs.'),
! array('condition' => (SEC_inGroup ('Root')),
! 'url' => 'http://www.geeklog.net/versionchecker.php?version=' . VERSION,
! 'lang' => $LANG01[107], 'image' => '/images/icons/versioncheck.'),
! array('condition' => (SEC_inGroup ('Root')),
! 'url'=>$_CONF['site_admin_url'] . '/configuration.php',
! 'lang' => $LANG01[129], 'image' => '/images/icons/configuration.')
! );
for ($i = 0; $i < count ($cc_arr); $i++) {
Index: database.php
===================================================================
RCS file: /usr/home/geeklog2/cvsroot/geeklog/Geeklog-1.x/public_html/admin/database.php,v
retrieving revision 1.40
retrieving revision 1.41
diff -C2 -d -r1.40 -r1.41
*** database.php 6 May 2007 17:37:46 -0000 1.40
--- database.php 29 Aug 2007 06:55:04 -0000 1.41
***************
*** 117,120 ****
--- 117,125 ----
'text' => $LANG_ADMIN['admin_home'])
);
+ $menu = ADMIN_createMenu(
+ $menu_arr,
+ "<p>{$LANG_DB_BACKUP['db_explanation']}</p><p>" . sprintf($LANG_DB_BACKUP['total_number'], $index) . '</p>',
+ $_CONF['layout_url'] . '/images/icons/database.' . $_IMAGE_TYPE
+ );
$header_arr = array( // display 'text' and use table field 'field'
***************
*** 123,132 ****
);
! $text_arr = array('has_menu' => true,
! 'instructions' => '<p>' . $LANG_DB_BACKUP['db_explanation'] . '</p><p>' . sprintf($LANG_DB_BACKUP['total_number'], $index) . '</p>',
! 'icon' => $_CONF['layout_url']
! . '/images/icons/database.' . $_IMAGE_TYPE,
! 'title' => $LANG_DB_BACKUP['last_ten_backups'],
! 'form_url' => $thisUrl
);
$form_arr = array('bottom' => '', 'top' => '');
--- 128,134 ----
);
! $text_arr = array(
! 'title' => $LANG_DB_BACKUP['last_ten_backups'],
! 'form_url' => $thisUrl
);
$form_arr = array('bottom' => '', 'top' => '');
***************
*** 136,140 ****
$listoptions = array('chkdelete' => true, 'chkminimum' => 0,
'chkfield' => 'filename');
! $retval .= ADMIN_simpleList('', $header_arr, $text_arr, $data_arr, $menu_arr, $listoptions, $form_arr);
} else {
$retval .= COM_startBlock($LANG08[06], '',
--- 138,142 ----
$listoptions = array('chkdelete' => true, 'chkminimum' => 0,
'chkfield' => 'filename');
! $retval .= ADMIN_simpleList('', $header_arr, $text_arr, $data_arr, $menu, $listoptions, $form_arr);
} else {
$retval .= COM_startBlock($LANG08[06], '',
Index: story.php
===================================================================
RCS file: /usr/home/geeklog2/cvsroot/geeklog/Geeklog-1.x/public_html/admin/story.php,v
retrieving revision 1.260
retrieving revision 1.261
diff -C2 -d -r1.260 -r1.261
*** story.php 19 Aug 2007 16:28:02 -0000 1.260
--- story.php 29 Aug 2007 06:55:04 -0000 1.261
***************
*** 184,193 ****
$menu_arr[] = array('url' => $_CONF['site_admin_url'],
'text' => $LANG_ADMIN['admin_home']);
!
! $text_arr = array('has_menu' => true,
! 'has_extras' => true,
! 'title' => $LANG24[22], 'instructions' => $LANG24[23],
! 'icon' => $_CONF['layout_url'] . '/images/icons/story.' . $_IMAGE_TYPE,
! 'form_url' => $_CONF['site_admin_url'] . "/story.php");
$sql = "SELECT {$_TABLES['stories']}.*, {$_TABLES['users']}.username, {$_TABLES['users']}.fullname, "
--- 184,197 ----
$menu_arr[] = array('url' => $_CONF['site_admin_url'],
'text' => $LANG_ADMIN['admin_home']);
! $menu = ADMIN_createMenu(
! $menu_arr,
! $LANG24[23],
! $_CONF['layout_url'] . '/images/icons/story.' . $_IMAGE_TYPE
! );
! $text_arr = array(
! 'has_extras' => true,
! 'title' => $LANG24[22],
! 'form_url' => $_CONF['site_admin_url'] . "/story.php"
! );
$sql = "SELECT {$_TABLES['stories']}.*, {$_TABLES['users']}.username, {$_TABLES['users']}.fullname, "
***************
*** 205,209 ****
$retval .= ADMIN_list ("story", "ADMIN_getListField_stories", $header_arr, $text_arr,
! $query_arr, $menu_arr, $defsort_arr, $filter);
return $retval;
}
--- 209,213 ----
$retval .= ADMIN_list ("story", "ADMIN_getListField_stories", $header_arr, $text_arr,
! $query_arr, $defsort_arr, $menu, $filter);
return $retval;
}
Index: plugins.php
===================================================================
RCS file: /usr/home/geeklog2/cvsroot/geeklog/Geeklog-1.x/public_html/admin/plugins.php,v
retrieving revision 1.73
retrieving revision 1.74
diff -C2 -d -r1.73 -r1.74
*** plugins.php 4 Aug 2007 18:31:08 -0000 1.73
--- plugins.php 29 Aug 2007 06:55:04 -0000 1.74
***************
*** 410,413 ****
--- 410,418 ----
array('url' => $_CONF['site_admin_url'],
'text' => $LANG_ADMIN['admin_home']));
+ $menu = ADMIN_createMenu(
+ $menu_arr,
+ $LANG32[11],
+ $_CONF['layout_url'] . '/images/icons/plugins.' . $_IMAGE_TYPE
+ );
$text_arr = array('has_menu' => true,
***************
*** 429,433 ****
return ADMIN_list ('plugins', 'ADMIN_getListField_plugins', $header_arr,
! $text_arr, $query_arr, $menu_arr, $defsort_arr, '', '', '', $form_arr);
}
--- 434,438 ----
return ADMIN_list ('plugins', 'ADMIN_getListField_plugins', $header_arr,
! $text_arr, $query_arr, $defsort_arr, $menu, '', '', '', $form_arr);
}
Index: topic.php
===================================================================
RCS file: /usr/home/geeklog2/cvsroot/geeklog/Geeklog-1.x/public_html/admin/topic.php,v
retrieving revision 1.74
retrieving revision 1.75
diff -C2 -d -r1.74 -r1.75
*** topic.php 28 Apr 2007 19:41:29 -0000 1.74
--- topic.php 29 Aug 2007 06:55:04 -0000 1.75
***************
*** 331,334 ****
--- 331,346 ----
$counter = 1;
+ $menu_arr = array (
+ array('url' => $_CONF['site_admin_url'] . '/topic.php?mode=edit',
+ 'text' => $LANG_ADMIN['create_new']),
+ array('url' => $_CONF['site_admin_url'],
+ 'text' => $LANG_ADMIN['admin_home']));
+ $menu = ADMIN_createMenu(
+ $menu_arr,
+ $LANG27[9],
+ $_CONF['layout_url'] . "/images/icons/topic.png"
+ );
+ $topic_templates->set_var('top_menu', $menu);
+
for ($i = 0; $i < $nrows; $i++) {
$A = DB_fetchArray($result);
Index: group.php
===================================================================
RCS file: /usr/home/geeklog2/cvsroot/geeklog/Geeklog-1.x/public_html/admin/group.php,v
retrieving revision 1.93
retrieving revision 1.94
diff -C2 -d -r1.93 -r1.94
*** group.php 1 Nov 2006 19:38:56 -0000 1.93
--- group.php 29 Aug 2007 06:55:04 -0000 1.94
***************
*** 412,416 ****
* @param string $grp_name Group Name
* @param string $grp_descr Description of group
! * @param boolean $grp_admin Flag that indicates this is an admin use group
* @param boolean $grp_gl_core Flag that indicates if this is a core Geeklog group
* @param array $features Features the group has access to
--- 412,416 ----
* @param string $grp_name Group Name
* @param string $grp_descr Description of group
! * @param boolean $grp_admin Flag that indicates this is an admin use group
* @param boolean $grp_gl_core Flag that indicates if this is a core Geeklog group
* @param array $features Features the group has access to
***************
*** 460,464 ****
$grp_descr = COM_stripslashes ($grp_descr);
$grp_descr = addslashes ($grp_descr);
!
if (empty ($grp_id)) {
DB_save ($_TABLES['groups'], 'grp_name,grp_descr,grp_gl_core',
--- 460,464 ----
$grp_descr = COM_stripslashes ($grp_descr);
$grp_descr = addslashes ($grp_descr);
!
if (empty ($grp_id)) {
DB_save ($_TABLES['groups'], 'grp_name,grp_descr,grp_gl_core',
***************
*** 473,478 ****
$new_group = false;
}
!
! // Use the field grp_gl_core to indicate if this is non-core GL Group is an Admin related group
if ($grp_gl_core != 1 AND $grp_id > 1) {
if (COM_applyFilter($grp_admin,true) == 1) {
--- 473,478 ----
$new_group = false;
}
!
! // Use the field grp_gl_core to indicate if this is non-core GL Group is an Admin related group
if ($grp_gl_core != 1 AND $grp_id > 1) {
if (COM_applyFilter($grp_admin,true) == 1) {
***************
*** 481,485 ****
DB_query("UPDATE {$_TABLES['groups']} SET grp_gl_core=0 WHERE grp_id=$grp_id");
}
! }
// now save the features
--- 481,485 ----
DB_query("UPDATE {$_TABLES['groups']} SET grp_gl_core=0 WHERE grp_id=$grp_id");
}
! }
// now save the features
***************
*** 537,541 ****
}
if ($_POST['chk_showall'] == 1) {
! echo COM_refresh($_CONF['site_admin_url'] . '/group.php?msg=49&showall=1');
} else {
echo COM_refresh($_CONF['site_admin_url'] . '/group.php?msg=49');
--- 537,541 ----
}
if ($_POST['chk_showall'] == 1) {
! echo COM_refresh($_CONF['site_admin_url'] . '/group.php?msg=49&showall=1');
} else {
echo COM_refresh($_CONF['site_admin_url'] . '/group.php?msg=49');
***************
*** 637,641 ****
'direction' => 'asc'
);
!
$form_url = $_CONF['site_admin_url'] . '/group.php?mode=listusers&grp_id='.$grp_id;
if (isset ($_REQUEST['chk_showall']) && ($_REQUEST['chk_showall'] == 1)) {
--- 637,641 ----
'direction' => 'asc'
);
!
$form_url = $_CONF['site_admin_url'] . '/group.php?mode=listusers&grp_id='.$grp_id;
if (isset ($_REQUEST['chk_showall']) && ($_REQUEST['chk_showall'] == 1)) {
***************
*** 646,650 ****
"grp_id = '$grp_id'");
$headline = sprintf ($LANG_ACCESS['usersingroup'], $groupname);
!
$url = $_CONF['site_admin_url'] . '/group.php';
if (isset ($_REQUEST['chk_showall']) && ($_REQUEST['chk_showall'] == 1)) {
--- 646,650 ----
"grp_id = '$grp_id'");
$headline = sprintf ($LANG_ACCESS['usersingroup'], $groupname);
!
$url = $_CONF['site_admin_url'] . '/group.php';
if (isset ($_REQUEST['chk_showall']) && ($_REQUEST['chk_showall'] == 1)) {
***************
*** 655,669 ****
'text' => $LANG28[38]),
array('url' => $_CONF['site_admin_url'],
! 'text' => $LANG_ADMIN['admin_home']));
! $text_arr = array ('has_menu' => true,
! 'has_extras' => true,
! 'title' => $headline,
! 'instructions' => ' ',
! 'icon' => $_CONF['layout_url'] . '/images/icons/group.'
! . $_IMAGE_TYPE,
! 'form_url' => $form_url,
! 'help_url' => ''
! );
$join_userinfo = '';
--- 655,671 ----
'text' => $LANG28[38]),
array('url' => $_CONF['site_admin_url'],
! 'text' => $LANG_ADMIN['admin_home']));
! $menu = ADMIN_createMenu(
! $menu_arr,
! ' ',
! $_CONF['layout_url'] . '/images/icons/group.' . $_IMAGE_TYPE
! );
! $text_arr = array (
! 'has_extras' => true,
! 'title' => $headline,
! 'form_url' => $form_url,
! 'help_url' => ''
! );
$join_userinfo = '';
***************
*** 680,684 ****
."FROM {$_TABLES['group_assignments']},{$_TABLES['users']} $join_userinfo "
."WHERE {$_TABLES['users']}.uid > 1 "
! ."AND {$_TABLES['users']}.uid = {$_TABLES['group_assignments']}.ug_uid "
."AND ({$_TABLES['group_assignments']}.ug_main_grp_id IN ({$groupList}))";
--- 682,686 ----
."FROM {$_TABLES['group_assignments']},{$_TABLES['users']} $join_userinfo "
."WHERE {$_TABLES['users']}.uid > 1 "
! ."AND {$_TABLES['users']}.uid = {$_TABLES['group_assignments']}.ug_uid "
."AND ({$_TABLES['group_assignments']}.ug_main_grp_id IN ({$groupList}))";
***************
*** 689,693 ****
);
! $retval .= ADMIN_list ('user', 'ADMIN_getListField_users', $header_arr, $text_arr, $query_arr, $menu_arr, $defsort_arr);
return $retval;
--- 691,696 ----
);
! $retval .= ADMIN_list ( 'user', 'ADMIN_getListField_users',
! $header_arr, $text_arr, $query_arr, $defsort_arr, $menu);
return $retval;
***************
*** 711,739 ****
$defsort_arr = array('field' => 'grp_name', 'direction' => 'asc');
!
$form_url = $_CONF['site_admin_url'] . '/group.php';
if (isset ($_REQUEST['chk_showall']) && ($_REQUEST['chk_showall'] == 1)) {
$form_url .= '?chk_showall=1';
! }
$menu_arr = array (
! array('url' => $_CONF['site_admin_url'] . '/group.php?mode=edit',
! 'text' => $LANG_ADMIN['create_new']),
! array('url' => $_CONF['site_admin_url'],
! 'text' => $LANG_ADMIN['admin_home']));
! $text_arr = array('has_menu' => true,
! 'has_extras' => true,
! 'title' => $LANG_ACCESS['groupmanager'],
! 'instructions' => $LANG_ACCESS['newgroupmsg'],
! 'icon' => $_CONF['layout_url'] . '/images/icons/group.'
! . $_IMAGE_TYPE,
! 'form_url' => $form_url);
$filter = '<span style="padding-right:20px;">';
!
// Extra test required to handle that different ways this option is passed and need to be able to
// over-ride the option using the posted form when the URL contains the variable as well
! $show_all_groups = false;
if (isset($_POST['q'])) { // Form has been posted - test actual option in this form
if ($_POST['chk_showall'] == 1) {
--- 714,746 ----
$defsort_arr = array('field' => 'grp_name', 'direction' => 'asc');
!
$form_url = $_CONF['site_admin_url'] . '/group.php';
if (isset ($_REQUEST['chk_showall']) && ($_REQUEST['chk_showall'] == 1)) {
$form_url .= '?chk_showall=1';
! }
$menu_arr = array (
! array('url' => $_CONF['site_admin_url'] . '/group.php?mode=edit',
! 'text' => $LANG_ADMIN['create_new']),
! array('url' => $_CONF['site_admin_url'],
! 'text' => $LANG_ADMIN['admin_home'])
! );
! $menu = ADMIN_createMenu(
! $menu_arr,
! $LANG_ACCESS['newgroupmsg'],
! $_CONF['layout_url'] . '/images/icons/group.' . $_IMAGE_TYPE
! );
! $text_arr = array(
! 'has_extras' => true,
! 'title' => $LANG_ACCESS['groupmanager'],
! 'form_url' => $form_url
! );
$filter = '<span style="padding-right:20px;">';
!
// Extra test required to handle that different ways this option is passed and need to be able to
// over-ride the option using the posted form when the URL contains the variable as well
! $show_all_groups = false;
if (isset($_POST['q'])) { // Form has been posted - test actual option in this form
if ($_POST['chk_showall'] == 1) {
***************
*** 763,771 ****
'query_fields' => array('grp_name', 'grp_descr'),
'default_filter' => $grpFilter);
! }
$filter .= $LANG28[48] . '</label></span>';
$retval .= ADMIN_list ('groups', 'ADMIN_getListField_groups', $header_arr,
! $text_arr, $query_arr, $menu_arr, $defsort_arr, $filter);
return $retval;
--- 770,778 ----
'query_fields' => array('grp_name', 'grp_descr'),
'default_filter' => $grpFilter);
! }
$filter .= $LANG28[48] . '</label></span>';
$retval .= ADMIN_list ('groups', 'ADMIN_getListField_groups', $header_arr,
! $text_arr, $query_arr, $defsort_arr, $menu, $filter);
return $retval;
***************
*** 777,781 ****
$retval = '';
!
// Get a list of users in the Root Group and the selected group
$sql = "SELECT DISTINCT uid FROM {$_TABLES['users']} LEFT JOIN {$_TABLES['group_assignments']} ";
--- 784,788 ----
$retval = '';
!
// Get a list of users in the Root Group and the selected group
$sql = "SELECT DISTINCT uid FROM {$_TABLES['users']} LEFT JOIN {$_TABLES['group_assignments']} ";
***************
*** 786,790 ****
while ($A = DB_fetchArray($result)) {
$filteredusers[] = $A['uid'];
! }
$groups = getGroupList ($group_id);
--- 793,797 ----
while ($A = DB_fetchArray($result)) {
$filteredusers[] = $A['uid'];
! }
$groups = getGroupList ($group_id);
***************
*** 802,806 ****
$sql .= " AND uid NOT IN ($filteredusers) ";
}
! $sql .= "ORDER BY username";
$result = DB_query ($sql);
$numUsers = DB_numRows ($result);
--- 809,813 ----
$sql .= " AND uid NOT IN ($filteredusers) ";
}
! $sql .= "ORDER BY username";
$result = DB_query ($sql);
$numUsers = DB_numRows ($result);
***************
*** 840,844 ****
return $retval;
}
!
$group_listing_url = $_CONF['site_admin_url'] . '/group.php';
if ($_REQUEST['chk_showall'] == 1) {
--- 847,851 ----
return $retval;
}
!
$group_listing_url = $_CONF['site_admin_url'] . '/group.php';
if ($_REQUEST['chk_showall'] == 1) {
***************
*** 852,856 ****
$groupmembers->set_var ('site_url', $_CONF['site_url']);
$groupmembers->set_var ('site_admin_url', $_CONF['site_admin_url']);
! $groupmembers->set_var ('group_listing_url', $group_listing_url);
$groupmembers->set_var ('layout_url', $_CONF['layout_url']);
$groupmembers->set_var ('phpself', $_CONF['site_admin_url'] . '/group.php');
--- 859,863 ----
$groupmembers->set_var ('site_url', $_CONF['site_url']);
$groupmembers->set_var ('site_admin_url', $_CONF['site_admin_url']);
! $groupmembers->set_var ('group_listing_url', $group_listing_url);
$groupmembers->set_var ('layout_url', $_CONF['layout_url']);
$groupmembers->set_var ('phpself', $_CONF['site_admin_url'] . '/group.php');
***************
*** 866,870 ****
$groupmembers->set_var('lang_cancel', $LANG_ADMIN['cancel']);
$groupmembers->set_var ('lang_grouplist', $LANG28[38]);
! $groupmembers->set_var('show_all', COM_applyFilter($_GET['chk_showall'],true));
$groupmembers->set_var ('group_id',$group);
$groupmembers->parse ('output', 'groupmembers');
--- 873,877 ----
$groupmembers->set_var('lang_cancel', $LANG_ADMIN['cancel']);
$groupmembers->set_var ('lang_grouplist', $LANG28[38]);
! $groupmembers->set_var('show_all', COM_applyFilter($_GET['chk_showall'],true));
$groupmembers->set_var ('group_id',$group);
$groupmembers->parse ('output', 'groupmembers');
***************
*** 887,891 ****
}
if ($_POST['chk_showall'] == 1) {
! echo COM_refresh($_CONF['site_admin_url'] . '/group.php?msg=49&showall=1');
} else {
echo COM_refresh($_CONF['site_admin_url'] . '/group.php?msg=49');
--- 894,898 ----
}
if ($_POST['chk_showall'] == 1) {
! echo COM_refresh($_CONF['site_admin_url'] . '/group.php?msg=49&showall=1');
} else {
echo COM_refresh($_CONF['site_admin_url'] . '/group.php?msg=49');
***************
*** 925,929 ****
PLG_groupChanged ($grp_id, 'delete');
if ($_POST['chk_showall'] == 1) {
! return COM_refresh($_CONF['site_admin_url'] . '/group.php?msg=50&showall=1');
} else {
return COM_refresh($_CONF['site_admin_url'] . '/group.php?msg=50');
--- 932,936 ----
PLG_groupChanged ($grp_id, 'delete');
if ($_POST['chk_showall'] == 1) {
! return COM_refresh($_CONF['site_admin_url'] . '/group.php?msg=50&showall=1');
} else {
return COM_refresh($_CONF['site_admin_url'] . '/group.php?msg=50');
***************
*** 948,952 ****
$display .= savegroup (COM_applyFilter ($_POST['grp_id'],true),
COM_applyFilter ($_POST['grp_name']),
! $_POST['grp_descr'],
COM_applyFilter($_POST['chk_grpadmin'],true),
COM_applyFilter ($_POST['grp_gl_core']),
--- 955,959 ----
$display .= savegroup (COM_applyFilter ($_POST['grp_id'],true),
COM_applyFilter ($_POST['grp_name']),
! $_POST['grp_descr'],
COM_applyFilter($_POST['chk_grpadmin'],true),
COM_applyFilter ($_POST['grp_gl_core']),
Index: trackback.php
===================================================================
RCS file: /usr/home/geeklog2/cvsroot/geeklog/Geeklog-1.x/public_html/admin/trackback.php,v
retrieving revision 1.45
retrieving revision 1.46
diff -C2 -d -r1.45 -r1.46
*** trackback.php 9 Mar 2007 04:15:57 -0000 1.45
--- trackback.php 29 Aug 2007 06:55:04 -0000 1.46
***************
*** 485,501 ****
$menu_arr = array (
! array('url' => $_CONF['site_admin_url'] . '/trackback.php?mode=editservice',
! 'text' => $LANG_ADMIN['create_new']),
! array('url' => $_CONF['site_admin_url'],
! 'text' => $LANG_ADMIN['admin_home']));
! $text_arr = array('has_menu' => true,
! 'has_extras' => true,
! 'title' => $LANG_TRB['services_headline'],
! 'instructions' => $LANG_TRB['service_explain'],
! 'icon' => $_CONF['layout_url'] . '/images/icons/trackback.'
! . $_IMAGE_TYPE,
! 'form_url' => $_CONF['site_admin_url'] . "/trackback.php",
! 'help_url' => $_CONF['site_url'] . '/docs/trackback.html#ping');
$query_arr = array('table' => 'pingservice',
--- 485,504 ----
$menu_arr = array (
! array('url' => $_CONF['site_admin_url'] . '/trackback.php?mode=editservice',
! 'text' => $LANG_ADMIN['create_new']),
! array('url' => $_CONF['site_admin_url'],
! 'text' => $LANG_ADMIN['admin_home']));
! $menu = ADMIN_createMenu(
! $menu_arr,
! $LANG_TRB['service_explain'],
! $_CONF['layout_url'] . '/images/icons/trackback.' . $_IMAGE_TYPE
! );
! $text_arr = array(
! 'has_extras' => true,
! 'title' => $LANG_TRB['services_headline'],
! 'form_url' => $_CONF['site_admin_url'] . "/trackback.php",
! 'help_url' => $_CONF['site_url'] . '/docs/trackback.html#ping'
! );
$query_arr = array('table' => 'pingservice',
***************
*** 510,514 ****
$retval .= ADMIN_list ("pingservice", "ADMIN_getListField_trackback", $header_arr, $text_arr,
! $query_arr, $menu_arr, $defsort_arr, '', '', '', $form_arr);
if ($_CONF['trackback_enabled']) {
--- 513,517 ----
$retval .= ADMIN_list ("pingservice", "ADMIN_getListField_trackback", $header_arr, $text_arr,
! $query_arr, $defsort_arr, $menu, '', '', '', $form_arr);
if ($_CONF['trackback_enabled']) {
More information about the geeklog-cvs
mailing list