[geeklog-cvs] Geeklog-1.x/public_html/admin block.php, 1.123, 1.124 database.php, 1.48, 1.49 group.php, 1.102, 1.103 plugins.php, 1.82, 1.83 story.php, 1.268, 1.269 syndication.php, 1.54, 1.55 trackback.php, 1.53, 1.54 user.php, 1.205, 1.206
Dirk Haun
dhaun at qs1489.pair.com
Sat Jun 7 08:41:47 EDT 2008
Update of /cvsroot/geeklog/Geeklog-1.x/public_html/admin
In directory qs1489.pair.com:/tmp/cvs-serv87291/public_html/admin
Modified Files:
block.php database.php group.php plugins.php story.php
syndication.php trackback.php user.php
Log Message:
Ensure consistent display of the admin screens (bug #0000650)
Index: syndication.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/admin/syndication.php,v
retrieving revision 1.54
retrieving revision 1.55
diff -C2 -d -r1.54 -r1.55
*** syndication.php 18 May 2008 08:19:35 -0000 1.54
--- syndication.php 7 Jun 2008 12:41:44 -0000 1.55
***************
*** 154,157 ****
--- 154,161 ----
'text' => $LANG_ADMIN['admin_home'])
);
+
+ $retval .= COM_startBlock($LANG33[10], '',
+ COM_getBlockTemplate('_admin_block', 'header'));
+
$retval .= ADMIN_createMenu(
$menu_arr,
***************
*** 161,167 ****
$text_arr = array(
! 'has_extras' => true,
! 'title' => $LANG33[10],
! 'form_url' => $_CONF['site_admin_url'] . "/syndication.php"
);
--- 165,170 ----
$text_arr = array(
! 'has_extras' => true,
! 'form_url' => $_CONF['site_admin_url'] . '/syndication.php'
);
***************
*** 170,173 ****
--- 173,177 ----
'query_fields' => array('title', 'filename'),
'default_filter' => '');
+
// this is a dummy variable so we know the form has been used if all feeds
// should be disabled in order to disable the last one.
***************
*** 177,180 ****
--- 181,186 ----
$header_arr, $text_arr, $query_arr, $defsort_arr, '',
$token, '', $form_arr);
+ $retval .= COM_endBlock(COM_getBlockTemplate('_admin_block', 'footer'));
+
return $retval;
}
Index: user.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/admin/user.php,v
retrieving revision 1.205
retrieving revision 1.206
diff -C2 -d -r1.205 -r1.206
*** user.php 22 May 2008 12:06:06 -0000 1.205
--- user.php 7 Jun 2008 12:41:44 -0000 1.206
***************
*** 396,399 ****
--- 396,403 ----
'text' => $LANG_ADMIN['admin_home'])
);
+
+ $retval .= COM_startBlock($LANG28[11], '',
+ COM_getBlockTemplate('_admin_block', 'header'));
+
$retval .= ADMIN_createMenu(
$menu_arr,
***************
*** 403,410 ****
$text_arr = array(
! 'has_extras' => true,
! 'title' => $LANG28[11],
! 'form_url' => $_CONF['site_admin_url'] . "/user.php",
! 'help_url' => ''
);
--- 407,413 ----
$text_arr = array(
! 'has_extras' => true,
! 'form_url' => $_CONF['site_admin_url'] . '/user.php',
! 'help_url' => ''
);
***************
*** 421,426 ****
'default_filter' => "AND {$_TABLES['users']}.uid > 1");
! $retval .= ADMIN_list ("user", "ADMIN_getListField_users", $header_arr, $text_arr,
! $query_arr, $defsort_arr);
return $retval;
}
--- 424,431 ----
'default_filter' => "AND {$_TABLES['users']}.uid > 1");
! $retval .= ADMIN_list('user', 'ADMIN_getListField_users', $header_arr,
! $text_arr, $query_arr, $defsort_arr);
! $retval .= COM_endBlock(COM_getBlockTemplate('_admin_block', 'footer'));
!
return $retval;
}
Index: block.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/admin/block.php,v
retrieving revision 1.123
retrieving revision 1.124
diff -C2 -d -r1.123 -r1.124
*** block.php 18 May 2008 08:19:35 -0000 1.123
--- block.php 7 Jun 2008 12:41:44 -0000 1.124
***************
*** 371,375 ****
global $_CONF, $_TABLES, $LANG_ADMIN, $LANG21, $_IMAGE_TYPE;
! require_once( $_CONF['path_system'] . 'lib-admin.php' );
$token = SEC_createToken();
--- 371,377 ----
global $_CONF, $_TABLES, $LANG_ADMIN, $LANG21, $_IMAGE_TYPE;
! require_once $_CONF['path_system'] . 'lib-admin.php';
!
! $retval = '';
$token = SEC_createToken();
***************
*** 382,386 ****
);
! $retval = ADMIN_createMenu(
$menu_arr,
$LANG21[25],
--- 384,390 ----
);
! $retval .= COM_startBlock($LANG21[19], '',
! COM_getBlockTemplate('_admin_block', 'header'));
! $retval .= ADMIN_createMenu(
$menu_arr,
$LANG21[25],
***************
*** 404,410 ****
$text_arr = array(
! 'has_extras' => true,
! 'title' => $LANG21[19],
! 'form_url' => $_CONF['site_admin_url'] . "/block.php"
);
--- 408,413 ----
$text_arr = array(
! 'has_extras' => true,
! 'form_url' => $_CONF['site_admin_url'] . '/block.php'
);
***************
*** 416,428 ****
);
! // 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
$form_arr = array('bottom' => '<input type="hidden" name="blockenabler" value="1"' . XHTML . '>');
! $retval .= ADMIN_list (
! "blocks", "ADMIN_getListField_blocks", $header_arr, $text_arr,
$query_arr, $defsort_arr, '', $token, '', $form_arr
);
$query_arr = array(
'table' => 'blocks',
--- 419,434 ----
);
! // 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
$form_arr = array('bottom' => '<input type="hidden" name="blockenabler" value="1"' . XHTML . '>');
! $retval .= ADMIN_list(
! 'blocks', 'ADMIN_getListField_blocks', $header_arr, $text_arr,
$query_arr, $defsort_arr, '', $token, '', $form_arr
);
+ $retval .= COM_endBlock(COM_getBlockTemplate('_admin_block', 'footer'));
+
$query_arr = array(
'table' => 'blocks',
***************
*** 433,439 ****
$text_arr = array(
! 'has_extras' => true,
! 'title' => "$LANG21[19] ($LANG21[41])",
! 'form_url' => $_CONF['site_admin_url'] . '/block.php'
);
--- 439,445 ----
$text_arr = array(
! 'has_extras' => true,
! 'title' => "$LANG21[19] ($LANG21[41])",
! 'form_url' => $_CONF['site_admin_url'] . '/block.php'
);
Index: database.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/admin/database.php,v
retrieving revision 1.48
retrieving revision 1.49
diff -C2 -d -r1.48 -r1.49
*** database.php 18 May 2008 11:37:20 -0000 1.48
--- database.php 7 Jun 2008 12:41:44 -0000 1.49
***************
*** 74,77 ****
--- 74,78 ----
{
global $_CONF, $_TABLES, $_IMAGE_TYPE, $LANG08, $LANG_ADMIN, $LANG_DB_BACKUP;
+
require_once $_CONF['path_system'] . 'lib-admin.php';
***************
*** 119,125 ****
'text' => $LANG_ADMIN['admin_home'])
);
$retval .= 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
);
--- 120,129 ----
'text' => $LANG_ADMIN['admin_home'])
);
+ $retval .= COM_startBlock($LANG_DB_BACKUP['last_ten_backups'], '',
+ COM_getBlockTemplate('_admin_block', 'header'));
$retval .= 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
);
***************
*** 131,135 ****
$text_arr = array(
- 'title' => $LANG_DB_BACKUP['last_ten_backups'],
'form_url' => $thisUrl
);
--- 135,138 ----
***************
*** 142,146 ****
$listoptions = array('chkdelete' => true, 'chkminimum' => 0,
'chkfield' => 'filename');
! $retval .= ADMIN_simpleList('', $header_arr, $text_arr, $data_arr, $listoptions, $form_arr);
} else {
$retval .= COM_startBlock($LANG08[06], '',
--- 145,151 ----
$listoptions = array('chkdelete' => true, 'chkminimum' => 0,
'chkfield' => 'filename');
! $retval .= ADMIN_simpleList('', $header_arr, $text_arr, $data_arr,
! $listoptions, $form_arr);
! $retval .= COM_endBlock(COM_getBlockTemplate('_admin_block', 'footer'));
} else {
$retval .= COM_startBlock($LANG08[06], '',
Index: story.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/admin/story.php,v
retrieving revision 1.268
retrieving revision 1.269
diff -C2 -d -r1.268 -r1.269
*** story.php 11 May 2008 22:03:25 -0000 1.268
--- story.php 7 Jun 2008 12:41:44 -0000 1.269
***************
*** 46,56 ****
* Geeklog common function library
*/
! require_once ('../lib-common.php');
! require_once ($_CONF['path_system'] . 'lib-story.php');
/**
* Security check to ensure user even belongs on this page
*/
! require_once ('auth.inc.php');
// Set this to true if you want to have this code output debug messages to
--- 46,56 ----
* Geeklog common function library
*/
! require_once '../lib-common.php';
! require_once $_CONF['path_system'] . 'lib-story.php';
/**
* Security check to ensure user even belongs on this page
*/
! require_once 'auth.inc.php';
// Set this to true if you want to have this code output debug messages to
***************
*** 110,114 ****
$LANG09, $LANG_ADMIN, $LANG_ACCESS, $LANG24;
! require_once( $_CONF['path_system'] . 'lib-admin.php' );
$retval = '';
--- 110,114 ----
$LANG09, $LANG_ADMIN, $LANG_ACCESS, $LANG24;
! require_once $_CONF['path_system'] . 'lib-admin.php';
$retval = '';
***************
*** 184,187 ****
--- 184,191 ----
$menu_arr[] = array('url' => $_CONF['site_admin_url'],
'text' => $LANG_ADMIN['admin_home']);
+
+ $retval .= COM_startBlock($LANG24[22], '',
+ COM_getBlockTemplate('_admin_block', 'header'));
+
$retval .= ADMIN_createMenu(
$menu_arr,
***************
*** 190,196 ****
);
$text_arr = array(
! 'has_extras' => true,
! 'title' => $LANG24[22],
! 'form_url' => $_CONF['site_admin_url'] . "/story.php"
);
--- 194,199 ----
);
$text_arr = array(
! 'has_extras' => true,
! 'form_url' => $_CONF['site_admin_url'] . '/story.php'
);
***************
*** 210,215 ****
);
! $retval .= ADMIN_list ("story", "ADMIN_getListField_stories", $header_arr, $text_arr,
! $query_arr, $defsort_arr, $filter);
return $retval;
}
--- 213,220 ----
);
! $retval .= ADMIN_list('story', 'ADMIN_getListField_stories', $header_arr,
! $text_arr, $query_arr, $defsort_arr, $filter);
! $retval .= COM_endBlock(COM_getBlockTemplate('_admin_block', 'footer'));
!
return $retval;
}
Index: plugins.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/admin/plugins.php,v
retrieving revision 1.82
retrieving revision 1.83
diff -C2 -d -r1.82 -r1.83
*** plugins.php 18 May 2008 16:58:51 -0000 1.82
--- plugins.php 7 Jun 2008 12:41:44 -0000 1.83
***************
*** 386,390 ****
{
global $_CONF, $_TABLES, $LANG32, $LANG_ADMIN, $_IMAGE_TYPE;
! require_once( $_CONF['path_system'] . 'lib-admin.php' );
$retval = '';
--- 386,391 ----
{
global $_CONF, $_TABLES, $LANG32, $LANG_ADMIN, $_IMAGE_TYPE;
!
! require_once $_CONF['path_system'] . 'lib-admin.php';
$retval = '';
***************
*** 402,405 ****
--- 403,410 ----
array('url' => $_CONF['site_admin_url'],
'text' => $LANG_ADMIN['admin_home']));
+
+ $retval .= COM_startBlock($LANG32[5], '',
+ COM_getBlockTemplate('_admin_block', 'header'));
+
$retval .= ADMIN_createMenu(
$menu_arr,
***************
*** 409,416 ****
$text_arr = array(
! 'has_extras' => true,
! 'title' => $LANG32[5],
'instructions' => $LANG32[11],
! 'form_url' => $_CONF['site_admin_url'] . '/plugins.php'
);
--- 414,420 ----
$text_arr = array(
! 'has_extras' => true,
'instructions' => $LANG32[11],
! 'form_url' => $_CONF['site_admin_url'] . '/plugins.php'
);
***************
*** 422,434 ****
'default_filter' => ''
);
! // this is a dummy-variable so we know the form has been used if all plugins should be disabled
! // in order to disable the last one.
$form_arr = array('bottom' => '<input type="hidden" name="pluginenabler" value="true"' . XHTML . '>');
! $retval .= ADMIN_list ('plugins', 'ADMIN_getListField_plugins', $header_arr,
! $text_arr, $query_arr, $defsort_arr, '', $token, '', $form_arr);
return $retval;
-
}
--- 426,439 ----
'default_filter' => ''
);
!
! // this is a dummy variable so we know the form has been used if all plugins
! // should be disabled in order to disable the last one.
$form_arr = array('bottom' => '<input type="hidden" name="pluginenabler" value="true"' . XHTML . '>');
! $retval .= ADMIN_list('plugins', 'ADMIN_getListField_plugins', $header_arr,
! $text_arr, $query_arr, $defsort_arr, '', $token, '', $form_arr);
! $retval .= COM_endBlock(COM_getBlockTemplate('_admin_block', 'footer'));
return $retval;
}
Index: group.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/admin/group.php,v
retrieving revision 1.102
retrieving revision 1.103
diff -C2 -d -r1.102 -r1.103
*** group.php 18 May 2008 11:37:20 -0000 1.102
--- group.php 7 Jun 2008 12:41:44 -0000 1.103
***************
*** 45,54 ****
* Geeklog common function library
*/
! require_once ('../lib-common.php');
/**
* Verifies that current user even has access to the page to this point
*/
! require_once ('auth.inc.php');
// Uncomment the line below if you need to debug the HTTP variables being passed
--- 45,54 ----
* Geeklog common function library
*/
! require_once '../lib-common.php';
/**
* Verifies that current user even has access to the page to this point
*/
! require_once 'auth.inc.php';
// Uncomment the line below if you need to debug the HTTP variables being passed
***************
*** 615,619 ****
global $_CONF, $_TABLES, $LANG28, $LANG_ACCESS, $LANG_ADMIN, $_IMAGE_TYPE;
! require_once( $_CONF['path_system'] . 'lib-admin.php' );
$retval = '';
--- 615,620 ----
global $_CONF, $_TABLES, $LANG28, $LANG_ACCESS, $LANG_ADMIN, $_IMAGE_TYPE;
! require_once $_CONF['path_system'] . 'lib-admin.php';
!
$retval = '';
***************
*** 670,673 ****
--- 671,678 ----
array('url' => $_CONF['site_admin_url'],
'text' => $LANG_ADMIN['admin_home']));
+
+ $retval .= COM_startBlock($headline, '',
+ COM_getBlockTemplate('_admin_block', 'header'));
+
$retval .= ADMIN_createMenu(
$menu_arr,
***************
*** 677,684 ****
$text_arr = array (
! 'has_extras' => true,
! 'title' => $headline,
! 'form_url' => $form_url,
! 'help_url' => ''
);
--- 682,688 ----
$text_arr = array (
! 'has_extras' => true,
! 'form_url' => $form_url,
! 'help_url' => ''
);
***************
*** 705,710 ****
);
! $retval .= ADMIN_list ( 'user', 'ADMIN_getListField_users',
! $header_arr, $text_arr, $query_arr, $defsort_arr);
return $retval;
--- 709,715 ----
);
! $retval .= ADMIN_list('user', 'ADMIN_getListField_users', $header_arr,
! $text_arr, $query_arr, $defsort_arr);
! $retval .= COM_endBlock(COM_getBlockTemplate('_admin_block', 'footer'));
return $retval;
***************
*** 715,719 ****
global $_CONF, $_TABLES, $LANG_ADMIN, $LANG_ACCESS, $LANG28, $_IMAGE_TYPE;
! require_once ($_CONF['path_system'] . 'lib-admin.php');
$retval = '';
--- 720,724 ----
global $_CONF, $_TABLES, $LANG_ADMIN, $LANG_ACCESS, $LANG28, $_IMAGE_TYPE;
! require_once $_CONF['path_system'] . 'lib-admin.php';
$retval = '';
***************
*** 740,743 ****
--- 745,752 ----
'text' => $LANG_ADMIN['admin_home'])
);
+
+ $retval .= COM_startBlock($LANG_ACCESS['groupmanager'], '',
+ COM_getBlockTemplate('_admin_block', 'header'));
+
$retval .= ADMIN_createMenu(
$menu_arr,
***************
*** 747,753 ****
$text_arr = array(
! 'has_extras' => true,
! 'title' => $LANG_ACCESS['groupmanager'],
! 'form_url' => $form_url
);
--- 756,761 ----
$text_arr = array(
! 'has_extras' => true,
! 'form_url' => $form_url
);
***************
*** 792,797 ****
$filter .= $LANG28[48] . '</label></span>';
! $retval .= ADMIN_list ('groups', 'ADMIN_getListField_groups', $header_arr,
! $text_arr, $query_arr, $defsort_arr, $filter);
return $retval;
--- 800,806 ----
$filter .= $LANG28[48] . '</label></span>';
! $retval .= ADMIN_list('groups', 'ADMIN_getListField_groups', $header_arr,
! $text_arr, $query_arr, $defsort_arr, $filter);
! $retval .= COM_endBlock(COM_getBlockTemplate('_admin_block', 'footer'));
return $retval;
Index: trackback.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/admin/trackback.php,v
retrieving revision 1.53
retrieving revision 1.54
diff -C2 -d -r1.53 -r1.54
*** trackback.php 23 May 2008 11:23:43 -0000 1.53
--- trackback.php 7 Jun 2008 12:41:44 -0000 1.54
***************
*** 481,485 ****
*
*/
! function listServices ()
{
global $LANG_ADMIN, $LANG_TRB, $_CONF, $_IMAGE_TYPE, $_TABLES;
--- 481,485 ----
*
*/
! function listServices()
{
global $LANG_ADMIN, $LANG_TRB, $_CONF, $_IMAGE_TYPE, $_TABLES;
***************
*** 504,507 ****
--- 504,511 ----
array('url' => $_CONF['site_admin_url'],
'text' => $LANG_ADMIN['admin_home']));
+
+ $retval .= COM_startBlock($LANG_TRB['services_headline'], '',
+ COM_getBlockTemplate('_admin_block', 'header'));
+
$retval .= ADMIN_createMenu(
$menu_arr,
***************
*** 511,518 ****
$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'
);
--- 515,521 ----
$text_arr = array(
! 'has_extras' => true,
! 'form_url' => $_CONF['site_admin_url'] . '/trackback.php',
! 'help_url' => $_CONF['site_url'] . '/docs/trackback.html#ping'
);
***************
*** 525,530 ****
);
! // this is a dummy-variable so we know the form has been used if all services should be disabled
! // in order to disable the last one.
$form_arr = array('bottom' => '<input type="hidden" name="serviceChanger" value="true"' . XHTML . '>');
--- 528,533 ----
);
! // this is a dummy variable so we know the form has been used if all services
! // should be disabled in order to disable the last one.
$form_arr = array('bottom' => '<input type="hidden" name="serviceChanger" value="true"' . XHTML . '>');
***************
*** 532,535 ****
--- 535,539 ----
$header_arr, $text_arr, $query_arr, $defsort_arr,
'', SEC_createToken(), '', $form_arr);
+ $retval .= COM_endBlock(COM_getBlockTemplate('_admin_block', 'footer'));
if ($_CONF['trackback_enabled']) {
***************
*** 539,542 ****
--- 543,547 ----
$retval .= freshPingback ();
}
+
return $retval;
}
More information about the geeklog-cvs
mailing list